diff options
| author | Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com> | 2021-02-20 16:02:15 -0800 |
|---|---|---|
| committer | Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com> | 2021-02-20 16:02:15 -0800 |
| commit | 5d8d4fbbcb5c5de9370711c19bb3510210989a98 (patch) | |
| tree | d0754921833f413b7eb93fb6bb1b1c8a22fb0498 /libs/libmad | |
| parent | d651082447b4392399a40ea1ae11d0bce4bfe83a (diff) | |
treewide: Run refresh on all packages
The crude loop I wrote to come up with this changeset:
find -L package/feeds/packages/ -name patches | \
sed 's/patches$/refresh/' | sort | xargs make
Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
Diffstat (limited to 'libs/libmad')
3 files changed, 21 insertions, 33 deletions
diff --git a/libs/libmad/patches/001-mips_removal_h_constraint.patch b/libs/libmad/patches/001-mips_removal_h_constraint.patch index b65555e1f..6b129c1cf 100644 --- a/libs/libmad/patches/001-mips_removal_h_constraint.patch +++ b/libs/libmad/patches/001-mips_removal_h_constraint.patch @@ -1,7 +1,6 @@ -diff -ur libmad-0.15.1b-orig/fixed.h libmad-0.15.1b/fixed.h ---- libmad-0.15.1b-orig/fixed.h 2004-02-17 12:32:03.000000000 +1030 -+++ libmad-0.15.1b/fixed.h 2009-08-05 10:46:30.000000000 +0930 -@@ -299,6 +299,23 @@ +--- a/fixed.h ++++ b/fixed.h +@@ -299,6 +299,23 @@ mad_fixed_t mad_f_mul_inline(mad_fixed_t # elif defined(FPM_MIPS) @@ -25,7 +24,7 @@ diff -ur libmad-0.15.1b-orig/fixed.h libmad-0.15.1b/fixed.h /* * This MIPS version is fast and accurate; the disposition of the least * significant bit depends on OPT_ACCURACY via mad_f_scale64(). -@@ -328,6 +345,7 @@ +@@ -328,6 +345,7 @@ mad_fixed_t mad_f_mul_inline(mad_fixed_t : "%r" ((x) >> 12), "r" ((y) >> 16)) # define MAD_F_MLZ(hi, lo) ((mad_fixed_t) (lo)) # endif @@ -33,10 +32,9 @@ diff -ur libmad-0.15.1b-orig/fixed.h libmad-0.15.1b/fixed.h # if defined(OPT_SPEED) # define mad_f_scale64(hi, lo) \ -diff -ur libmad-0.15.1b-orig/mad.h libmad-0.15.1b/mad.h ---- libmad-0.15.1b-orig/mad.h 2004-02-17 13:25:44.000000000 +1030 -+++ libmad-0.15.1b/mad.h 2009-08-05 10:42:40.000000000 +0930 -@@ -344,6 +344,23 @@ +--- a/mad.h ++++ b/mad.h +@@ -344,6 +344,23 @@ mad_fixed_t mad_f_mul_inline(mad_fixed_t # elif defined(FPM_MIPS) @@ -60,7 +58,7 @@ diff -ur libmad-0.15.1b-orig/mad.h libmad-0.15.1b/mad.h /* * This MIPS version is fast and accurate; the disposition of the least * significant bit depends on OPT_ACCURACY via mad_f_scale64(). -@@ -373,6 +390,7 @@ +@@ -373,6 +390,7 @@ mad_fixed_t mad_f_mul_inline(mad_fixed_t : "%r" ((x) >> 12), "r" ((y) >> 16)) # define MAD_F_MLZ(hi, lo) ((mad_fixed_t) (lo)) # endif diff --git a/libs/libmad/patches/101-CVE-2017-8374-length-check.patch b/libs/libmad/patches/101-CVE-2017-8374-length-check.patch index 80e48469e..872a43ed4 100644 --- a/libs/libmad/patches/101-CVE-2017-8374-length-check.patch +++ b/libs/libmad/patches/101-CVE-2017-8374-length-check.patch @@ -6,10 +6,8 @@ There are various cases where it attemps to read past the end of the buffer using mad_bit_read(). Most functions didn't even know the size of the buffer they were reading from. -Index: libmad-0.15.1b/bit.c -=================================================================== ---- libmad-0.15.1b.orig/bit.c -+++ libmad-0.15.1b/bit.c +--- a/bit.c ++++ b/bit.c @@ -138,6 +138,9 @@ unsigned long mad_bit_read(struct mad_bi { register unsigned long value; @@ -20,10 +18,8 @@ Index: libmad-0.15.1b/bit.c if (bitptr->left == CHAR_BIT) bitptr->cache = *bitptr->byte; -Index: libmad-0.15.1b/frame.c -=================================================================== ---- libmad-0.15.1b.orig/frame.c -+++ libmad-0.15.1b/frame.c +--- a/frame.c ++++ b/frame.c @@ -120,11 +120,18 @@ static int decode_header(struct mad_header *header, struct mad_stream *stream) { @@ -85,10 +81,8 @@ Index: libmad-0.15.1b/frame.c ptr = stream->next_frame = stream->this_frame + 1; goto sync; } -Index: libmad-0.15.1b/layer12.c -=================================================================== ---- libmad-0.15.1b.orig/layer12.c -+++ libmad-0.15.1b/layer12.c +--- a/layer12.c ++++ b/layer12.c @@ -72,10 +72,18 @@ mad_fixed_t const linear_table[14] = { * DESCRIPTION: decode one requantized Layer I sample from a bitstream */ @@ -343,10 +337,8 @@ Index: libmad-0.15.1b/layer12.c for (ch = 0; ch < nch; ++ch) { for (s = 0; s < 3; ++s) { -Index: libmad-0.15.1b/layer3.c -=================================================================== ---- libmad-0.15.1b.orig/layer3.c -+++ libmad-0.15.1b/layer3.c +--- a/layer3.c ++++ b/layer3.c @@ -598,7 +598,8 @@ enum mad_error III_sideinfo(struct mad_b static unsigned int III_scalefactors_lsf(struct mad_bitptr *ptr, @@ -806,7 +798,7 @@ Index: libmad-0.15.1b/layer3.c } mad_bit_finish(&peek); -@@ -2653,7 +2733,7 @@ int mad_layer_III(struct mad_stream *str +@@ -2645,7 +2725,7 @@ int mad_layer_III(struct mad_stream *str /* decode main_data */ if (result == 0) { diff --git a/libs/libmad/patches/102-CVE-2017-8373-CVE-2017-8372-md-size.patch b/libs/libmad/patches/102-CVE-2017-8373-CVE-2017-8372-md-size.patch index 657b5ffdb..bedc86552 100644 --- a/libs/libmad/patches/102-CVE-2017-8373-CVE-2017-8372-md-size.patch +++ b/libs/libmad/patches/102-CVE-2017-8373-CVE-2017-8372-md-size.patch @@ -26,11 +26,9 @@ stream->md_len bytes. If stream->md_len is larger than the data we need from the previous frame (si.main_data_begin) it still wouldn't fit in the buffer, so just keep the data that we need. -Index: libmad-0.15.1b/layer3.c -=================================================================== ---- libmad-0.15.1b.orig/layer3.c -+++ libmad-0.15.1b/layer3.c -@@ -2608,6 +2608,11 @@ int mad_layer_III(struct mad_stream *str +--- a/layer3.c ++++ b/layer3.c +@@ -2688,6 +2688,11 @@ int mad_layer_III(struct mad_stream *str next_md_begin = 0; md_len = si.main_data_begin + frame_space - next_md_begin; @@ -42,7 +40,7 @@ Index: libmad-0.15.1b/layer3.c frame_used = 0; -@@ -2625,8 +2630,11 @@ int mad_layer_III(struct mad_stream *str +@@ -2705,8 +2710,11 @@ int mad_layer_III(struct mad_stream *str } } else { |
