diff options
-rw-r--r-- | meta-oe/recipes-multimedia/mikmod/libmikmod/CVE-2010-2971.patch | 24 | ||||
-rw-r--r-- | meta-oe/recipes-multimedia/mikmod/libmikmod/ldflags.patch | 4 | ||||
-rw-r--r-- | meta-oe/recipes-multimedia/mikmod/libmikmod_3.2.0.bb (renamed from meta-oe/recipes-multimedia/mikmod/libmikmod_3.1.12.bb) | 7 |
3 files changed, 5 insertions, 30 deletions
diff --git a/meta-oe/recipes-multimedia/mikmod/libmikmod/CVE-2010-2971.patch b/meta-oe/recipes-multimedia/mikmod/libmikmod/CVE-2010-2971.patch deleted file mode 100644 index 94ea8f52a..000000000 --- a/meta-oe/recipes-multimedia/mikmod/libmikmod/CVE-2010-2971.patch +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | --- | ||
2 | loaders/load_it.c | 4 ++++ | ||
3 | 1 file changed, 4 insertions(+) | ||
4 | |||
5 | --- libmikmod-3.1.12.orig/loaders/load_it.c | ||
6 | +++ libmikmod-3.1.12/loaders/load_it.c | ||
7 | @@ -743,6 +743,8 @@ BOOL IT_Load(BOOL curious) | ||
8 | #define IT_LoadEnvelope(name,type) \ | ||
9 | ih. name##flg =_mm_read_UBYTE(modreader); \ | ||
10 | ih. name##pts =_mm_read_UBYTE(modreader); \ | ||
11 | + if (ih. name##pts > ITENVCNT) \ | ||
12 | + ih. name##pts = ITENVCNT; \ | ||
13 | ih. name##beg =_mm_read_UBYTE(modreader); \ | ||
14 | ih. name##end =_mm_read_UBYTE(modreader); \ | ||
15 | ih. name##susbeg=_mm_read_UBYTE(modreader); \ | ||
16 | @@ -756,6 +758,8 @@ BOOL IT_Load(BOOL curious) | ||
17 | #define IT_LoadEnvelope(name,type) \ | ||
18 | ih. name/**/flg =_mm_read_UBYTE(modreader); \ | ||
19 | ih. name/**/pts =_mm_read_UBYTE(modreader); \ | ||
20 | + if (ih. name/**/pts > ITENVCNT) \ | ||
21 | + ih. name/**/pts = ITENVCNT; \ | ||
22 | ih. name/**/beg =_mm_read_UBYTE(modreader); \ | ||
23 | ih. name/**/end =_mm_read_UBYTE(modreader); \ | ||
24 | ih. name/**/susbeg=_mm_read_UBYTE(modreader); \ | ||
diff --git a/meta-oe/recipes-multimedia/mikmod/libmikmod/ldflags.patch b/meta-oe/recipes-multimedia/mikmod/libmikmod/ldflags.patch index 4261379ee..de3113967 100644 --- a/meta-oe/recipes-multimedia/mikmod/libmikmod/ldflags.patch +++ b/meta-oe/recipes-multimedia/mikmod/libmikmod/ldflags.patch | |||
@@ -5,8 +5,8 @@ diff -urN libmikmod-3.1.12.orig/libmikmod/Makefile.in libmikmod-3.1.12/libmikmod | |||
5 | rm -f Makefile | 5 | rm -f Makefile |
6 | 6 | ||
7 | $(LIB): $(OBJ) | 7 | $(LIB): $(OBJ) |
8 | - $(LIBTOOL) --mode=link $(CC) -version-info 2:4:0 -o $@ $(OBJ) $(LIBRARY_LIB) -rpath $(DESTDIR)$(libdir) | 8 | - $(LIBTOOL) --mode=link $(CC) -version-info 3:0:0 -o $@ $(OBJ) $(LIBRARY_LIB) -rpath $(DESTDIR)$(libdir) |
9 | + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info 2:4:0 -o $@ $(OBJ) $(LIBRARY_LIB) -rpath $(DESTDIR)$(libdir) | 9 | + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info 3:0:0 -o $@ $(OBJ) $(LIBRARY_LIB) -rpath $(DESTDIR)$(libdir) |
10 | 10 | ||
11 | dl_hpux.lo: $(top_srcdir)/dlapi/dl_hpux.c \ | 11 | dl_hpux.lo: $(top_srcdir)/dlapi/dl_hpux.c \ |
12 | $(top_srcdir)/dlapi/dlfcn.h | 12 | $(top_srcdir)/dlapi/dlfcn.h |
diff --git a/meta-oe/recipes-multimedia/mikmod/libmikmod_3.1.12.bb b/meta-oe/recipes-multimedia/mikmod/libmikmod_3.2.0.bb index e6bdcbe13..b1ebf9705 100644 --- a/meta-oe/recipes-multimedia/mikmod/libmikmod_3.1.12.bb +++ b/meta-oe/recipes-multimedia/mikmod/libmikmod_3.2.0.bb | |||
@@ -6,16 +6,15 @@ LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=b2b941d484c442e5c031a51463d8e11b" | |||
6 | DEPENDS = "alsa-lib texinfo" | 6 | DEPENDS = "alsa-lib texinfo" |
7 | 7 | ||
8 | SRC_URI = "\ | 8 | SRC_URI = "\ |
9 | ${SOURCEFORGE_MIRROR}/mikmod/libmikmod-${PV}.tar.gz \ | 9 | http://mikmod.shlomifish.org/files/${P}.tar.gz \ |
10 | file://m4.patch \ | 10 | file://m4.patch \ |
11 | file://autofoo.patch \ | 11 | file://autofoo.patch \ |
12 | file://ldflags.patch \ | 12 | file://ldflags.patch \ |
13 | file://CVE-2010-2971.patch \ | ||
14 | file://obsolete_automake_macros.patch \ | 13 | file://obsolete_automake_macros.patch \ |
15 | " | 14 | " |
16 | 15 | ||
17 | SRC_URI[md5sum] = "9f3c740298260d5f88981fc0d51f6f16" | 16 | SRC_URI[md5sum] = "96e9820d72a41fe27ff304071739696c" |
18 | SRC_URI[sha256sum] = "891a2b780306e6ef86e381f459e71a085d4e7f56c970a879d3bf341c01bdfc32" | 17 | SRC_URI[sha256sum] = "734c8490bbf9b0c587920b92414dcfa3c2267838a0cdf698d5f1fb6bba8f661e" |
19 | 18 | ||
20 | inherit autotools binconfig lib_package | 19 | inherit autotools binconfig lib_package |
21 | 20 | ||