libmikmod: add patch to fix libmikmod-config for SYSROOT

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

5 files changed, 82 insertions, 40 deletions

diff --git a/patches/libmikmod-3.1.12/ldflags.patch b/patches/libmikmod-3.1.12/0001-libmikmod-add-LDFLAGS.patch
index 41a097e58..ee7e244f0 100644
--- a/patches/libmikmod-3.1.12/ldflags.patch
+++ b/patches/libmikmod-3.1.12/0001-libmikmod-add-LDFLAGS.patch
@@ -1,14 +1,19 @@
 From: Wolfram Sang <w.sang@pengutronix.de>
-Subject: libmikmod: add LDFLAGS
+Date: Wed, 21 Nov 2012 18:56:36 +0100
+Subject: [PATCH] libmikmod: add LDFLAGS
 
 Taken from OpenEmbedded (c7a2bcb77ed92c0731bb696e0909ef3184a568e7)
 
 Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
+---
+ libmikmod/Makefile.in |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-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 @@
+diff --git a/libmikmod/Makefile.in b/libmikmod/Makefile.in
+index 634acf4..a0743dd 100644
+--- a/libmikmod/Makefile.in
++++ b/libmikmod/Makefile.in
+@@ -72,7 +72,7 @@ distclean:	clean
  	rm -f Makefile
  
  $(LIB): $(OBJ)
diff --git a/patches/libmikmod-3.1.12/0002-libmikmod-apply-patch-for-CVE-2010-2971.patch b/patches/libmikmod-3.1.12/0002-libmikmod-apply-patch-for-CVE-2010-2971.patch
new file mode 100644
index 000000000..3402e5737
--- /dev/null
+++ b/patches/libmikmod-3.1.12/0002-libmikmod-apply-patch-for-CVE-2010-2971.patch
@@ -0,0 +1,35 @@
+From: Wolfram Sang <w.sang@pengutronix.de>
+Date: Wed, 21 Nov 2012 18:59:12 +0100
+Subject: [PATCH] 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(+)
+
+diff --git a/loaders/load_it.c b/loaders/load_it.c
+index de40bb6..ca82613 100644
+--- a/loaders/load_it.c
++++ b/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/0003-teach-libmikmod-config-about-sysroot.patch b/patches/libmikmod-3.1.12/0003-teach-libmikmod-config-about-sysroot.patch
new file mode 100644
index 000000000..c3bae2067
--- /dev/null
+++ b/patches/libmikmod-3.1.12/0003-teach-libmikmod-config-about-sysroot.patch
@@ -0,0 +1,31 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Wed, 21 Nov 2012 19:01:03 +0100
+Subject: [PATCH] teach libmikmod-config about sysroot
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ libmikmod-config.in |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libmikmod-config.in b/libmikmod-config.in
+index 8698715..a7146cd 100644
+--- a/libmikmod-config.in
++++ b/libmikmod-config.in
+@@ -41,7 +41,7 @@ while test $# -gt 0 ; do
+ 	--cflags)
+ 		includedir=${prefix}/include
+ 		if test $includedir != /usr/include ; then
+-			includes=-I$includedir
++			includes=-I${SYSROOT}$includedir
+ 		fi
+ 		echo $includes @REENTRANT@
+ 	;;
+@@ -49,7 +49,7 @@ while test $# -gt 0 ; do
+ 		echo @LIB_LDADD@
+ 	;;
+ 	--libs)
+-		libdir=-L${exec_prefix}/lib
++		libdir=-L${SYSROOT}${exec_prefix}/lib
+ 		echo $libdir -lmikmod @LIBRARY_LIB@
+ 	;;
+ 	*)
diff --git a/patches/libmikmod-3.1.12/CVE-2010-2971.patch b/patches/libmikmod-3.1.12/CVE-2010-2971.patch
deleted file mode 100644
index e712ed03d..000000000
--- a/patches/libmikmod-3.1.12/CVE-2010-2971.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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/series b/patches/libmikmod-3.1.12/series
index d9210864d..821404436 100644
--- a/patches/libmikmod-3.1.12/series
+++ b/patches/libmikmod-3.1.12/series
@@ -1,2 +1,6 @@
-ldflags.patch
-CVE-2010-2971.patch
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-libmikmod-add-LDFLAGS.patch
+0002-libmikmod-apply-patch-for-CVE-2010-2971.patch
+0003-teach-libmikmod-config-about-sysroot.patch
+# 66203e135151daf9ec17be64d76ab600  - git-ptx-patches magic