diff options
| author | Wolfram Sang <w.sang@pengutronix.de> | 2012-03-14 11:40:39 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2012-03-15 11:24:56 +0100 |
| commit | e55f77ced277b3522733a3849e39de723e55d6ab (patch) | |
| tree | e34fe2558e1a7d600d01a1fa7614503baeff1627 /patches/libmikmod-3.1.12 | |
| parent | 15d4b8c965eb20b3fdf95f892902157fa3515ac5 (diff) | |
| download | ptxdist-e55f77ced277b3522733a3849e39de723e55d6ab.tar.gz ptxdist-e55f77ced277b3522733a3849e39de723e55d6ab.tar.xz | |
libmikmod: add package
needed to extend SDL capabilities for tracker music.
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/libmikmod-3.1.12')
| -rw-r--r-- | patches/libmikmod-3.1.12/CVE-2010-2971.patch | 33 | ||||
| -rw-r--r-- | patches/libmikmod-3.1.12/ldflags.patch | 19 | ||||
| -rw-r--r-- | patches/libmikmod-3.1.12/series | 2 |
3 files changed, 54 insertions, 0 deletions
diff --git a/patches/libmikmod-3.1.12/CVE-2010-2971.patch b/patches/libmikmod-3.1.12/CVE-2010-2971.patch new file mode 100644 index 000000000..e712ed03d --- /dev/null +++ b/patches/libmikmod-3.1.12/CVE-2010-2971.patch @@ -0,0 +1,33 @@ +From: Wolfram Sang <w.sang@pengutronix.de> +Subject: libmikmod: apply patch for CVE-2010-2971 + +Signed-off-by: Chris Larson <chris_larson@mentor.com> + +Taken from OpenEmbedded (4880cfd0217466c737c14f5fe7687baa0a01c00d) + +Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> + +--- + loaders/load_it.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- libmikmod-3.1.12.orig/loaders/load_it.c ++++ libmikmod-3.1.12/loaders/load_it.c +@@ -743,6 +743,8 @@ BOOL IT_Load(BOOL curious) + #define IT_LoadEnvelope(name,type) \ + ih. name##flg =_mm_read_UBYTE(modreader); \ + ih. name##pts =_mm_read_UBYTE(modreader); \ ++ if (ih. name##pts > ITENVCNT) \ ++ ih. name##pts = ITENVCNT; \ + ih. name##beg =_mm_read_UBYTE(modreader); \ + ih. name##end =_mm_read_UBYTE(modreader); \ + ih. name##susbeg=_mm_read_UBYTE(modreader); \ +@@ -756,6 +758,8 @@ BOOL IT_Load(BOOL curious) + #define IT_LoadEnvelope(name,type) \ + ih. name/**/flg =_mm_read_UBYTE(modreader); \ + ih. name/**/pts =_mm_read_UBYTE(modreader); \ ++ if (ih. name/**/pts > ITENVCNT) \ ++ ih. name/**/pts = ITENVCNT; \ + ih. name/**/beg =_mm_read_UBYTE(modreader); \ + ih. name/**/end =_mm_read_UBYTE(modreader); \ + ih. name/**/susbeg=_mm_read_UBYTE(modreader); \ diff --git a/patches/libmikmod-3.1.12/ldflags.patch b/patches/libmikmod-3.1.12/ldflags.patch new file mode 100644 index 000000000..41a097e58 --- /dev/null +++ b/patches/libmikmod-3.1.12/ldflags.patch @@ -0,0 +1,19 @@ +From: Wolfram Sang <w.sang@pengutronix.de> +Subject: libmikmod: add LDFLAGS + +Taken from OpenEmbedded (c7a2bcb77ed92c0731bb696e0909ef3184a568e7) + +Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> + +diff -urN libmikmod-3.1.12.orig/libmikmod/Makefile.in libmikmod-3.1.12/libmikmod/Makefile.in +--- libmikmod-3.1.12.orig/libmikmod/Makefile.in 2004-01-21 17:43:52.000000000 +0000 ++++ libmikmod-3.1.12/libmikmod/Makefile.in 2009-04-02 11:28:01.000000000 +0000 +@@ -72,7 +72,7 @@ + rm -f Makefile + + $(LIB): $(OBJ) +- $(LIBTOOL) --mode=link $(CC) -version-info 2:4:0 -o $@ $(OBJ) $(LIBRARY_LIB) -rpath $(DESTDIR)$(libdir) ++ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info 2:4:0 -o $@ $(OBJ) $(LIBRARY_LIB) -rpath $(DESTDIR)$(libdir) + + dl_hpux.lo: $(top_srcdir)/dlapi/dl_hpux.c \ + $(top_srcdir)/dlapi/dlfcn.h diff --git a/patches/libmikmod-3.1.12/series b/patches/libmikmod-3.1.12/series new file mode 100644 index 000000000..d9210864d --- /dev/null +++ b/patches/libmikmod-3.1.12/series @@ -0,0 +1,2 @@ +ldflags.patch +CVE-2010-2971.patch |