From e84a906a5eaab43f5a3e5397dbe4fbb8781e157ba01368103b2091776b05e759 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <prusnak@opensuse.org>
Date: Wed, 25 Aug 2010 13:29:12 +0000
Subject: [PATCH 1/3] - correct fix for CVE-2009-3995 [bnc#625547]

OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libmikmod?expand=0&rev=10
---
 libmikmod-3.1.12-CVE-2009-3995,3996.diff | 30 ++++++++++++++----------
 libmikmod.changes                        |  5 ++++
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/libmikmod-3.1.12-CVE-2009-3995,3996.diff b/libmikmod-3.1.12-CVE-2009-3995,3996.diff
index 1d2b7ad..932896e 100644
--- a/libmikmod-3.1.12-CVE-2009-3995,3996.diff
+++ b/libmikmod-3.1.12-CVE-2009-3995,3996.diff
@@ -2,18 +2,24 @@ Index: loaders/load_it.c
 ===================================================================
 --- loaders/load_it.c.orig
 +++ loaders/load_it.c
-@@ -862,6 +862,11 @@ BOOL IT_Load(BOOL curious)
- #endif
- 
- 				IT_ProcessEnvelope(vol);
-+			
-+				// Secunia SA37775
-+				if (ih.volpts>= ENVPOINTS)
-+					ih.volpts = ENVPOINTS-1;
-+				
- 				for(u=0;u<ih.volpts;u++)
- 					d->volenv[u].val=(ih.volnode[u]<<2);
- 
+@@ -747,6 +747,8 @@ BOOL IT_Load(BOOL curious)
+ 				ih. name##end   =_mm_read_UBYTE(modreader);				\
+ 				ih. name##susbeg=_mm_read_UBYTE(modreader);				\
+ 				ih. name##susend=_mm_read_UBYTE(modreader);				\
++				if (ih. name##pts>= ITENVCNT) \
++					ih. name##pts = ITENVCNT-1; \
+ 				for(lp=0;lp<ITENVCNT;lp++) {							\
+ 					ih. name##node[lp]=_mm_read_##type (modreader);		\
+ 					ih. name##tick[lp]=_mm_read_I_UWORD(modreader);		\
+@@ -760,6 +762,8 @@ BOOL IT_Load(BOOL curious)
+ 				ih. name/**/end   =_mm_read_UBYTE(modreader);			\
+ 				ih. name/**/susbeg=_mm_read_UBYTE(modreader);			\
+ 				ih. name/**/susend=_mm_read_UBYTE(modreader);			\
++				if (ih. name/**/pts>= ITENVCNT) \
++					ih. name/**/pts = ITENVCNT-1; \
+ 				for(lp=0;lp<ITENVCNT;lp++) {							\
+ 					ih. name/**/node[lp]=_mm_read_/**/type (modreader);	\
+ 					ih. name/**/tick[lp]=_mm_read_I_UWORD(modreader);	\
 Index: loaders/load_ult.c
 ===================================================================
 --- loaders/load_ult.c.orig
diff --git a/libmikmod.changes b/libmikmod.changes
index a881433..c5989e0 100644
--- a/libmikmod.changes
+++ b/libmikmod.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Aug 25 13:26:22 UTC 2010 - prusnak@opensuse.org
+
+- correct fix for CVE-2009-3995 [bnc#625547]
+
 -------------------------------------------------------------------
 Fri Apr 23 01:29:56 CEST 2010 - prusnak@suse.cz
 

From 136bb09759c4207b8b4987ae9e39cfb957f13919115570ee348f37798c89b016 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Fri, 27 Aug 2010 12:29:36 +0000
Subject: [PATCH 2/3] Accepting request 46212 from multimedia:libs

checked in (request 46212)

OBS-URL: https://build.opensuse.org/request/show/46212
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libmikmod?expand=0&rev=11
---
 libmikmod-3.1.12-CVE-2009-3995,3996.diff | 8 ++++----
 libmikmod.changes                        | 5 -----
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/libmikmod-3.1.12-CVE-2009-3995,3996.diff b/libmikmod-3.1.12-CVE-2009-3995,3996.diff
index 932896e..57e90a7 100644
--- a/libmikmod-3.1.12-CVE-2009-3995,3996.diff
+++ b/libmikmod-3.1.12-CVE-2009-3995,3996.diff
@@ -6,8 +6,8 @@ Index: loaders/load_it.c
  				ih. name##end   =_mm_read_UBYTE(modreader);				\
  				ih. name##susbeg=_mm_read_UBYTE(modreader);				\
  				ih. name##susend=_mm_read_UBYTE(modreader);				\
-+				if (ih. name##pts>= ITENVCNT) \
-+					ih. name##pts = ITENVCNT-1; \
++				if (ih. name##pts>= ENVPOINTS) \
++					ih. name##pts = ENVPOINTS-1; \
  				for(lp=0;lp<ITENVCNT;lp++) {							\
  					ih. name##node[lp]=_mm_read_##type (modreader);		\
  					ih. name##tick[lp]=_mm_read_I_UWORD(modreader);		\
@@ -15,8 +15,8 @@ Index: loaders/load_it.c
  				ih. name/**/end   =_mm_read_UBYTE(modreader);			\
  				ih. name/**/susbeg=_mm_read_UBYTE(modreader);			\
  				ih. name/**/susend=_mm_read_UBYTE(modreader);			\
-+				if (ih. name/**/pts>= ITENVCNT) \
-+					ih. name/**/pts = ITENVCNT-1; \
++				if (ih. name/**/pts>= ENVPOINTS) \
++					ih. name/**/pts = ENVPOINTS-1; \
  				for(lp=0;lp<ITENVCNT;lp++) {							\
  					ih. name/**/node[lp]=_mm_read_/**/type (modreader);	\
  					ih. name/**/tick[lp]=_mm_read_I_UWORD(modreader);	\
diff --git a/libmikmod.changes b/libmikmod.changes
index c5989e0..a881433 100644
--- a/libmikmod.changes
+++ b/libmikmod.changes
@@ -1,8 +1,3 @@
--------------------------------------------------------------------
-Wed Aug 25 13:26:22 UTC 2010 - prusnak@opensuse.org
-
-- correct fix for CVE-2009-3995 [bnc#625547]
-
 -------------------------------------------------------------------
 Fri Apr 23 01:29:56 CEST 2010 - prusnak@suse.cz
 

From 18dbcdb249f435bcebe31d8ca6abc2573c7cb1adbc3b30da69b0cc484a692a93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Sat, 19 Nov 2011 21:04:16 +0000
Subject: [PATCH 3/3] Accepting request 92543 from home:coolo:removelibtool

- add libtool as buildrequire to avoid implicit dependency

OBS-URL: https://build.opensuse.org/request/show/92543
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libmikmod?expand=0&rev=12
---
 libmikmod-3.1.12-CVE-2009-3995,3996.diff |  8 ++++----
 libmikmod.changes                        | 10 ++++++++++
 libmikmod.spec                           |  8 ++++----
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/libmikmod-3.1.12-CVE-2009-3995,3996.diff b/libmikmod-3.1.12-CVE-2009-3995,3996.diff
index 57e90a7..932896e 100644
--- a/libmikmod-3.1.12-CVE-2009-3995,3996.diff
+++ b/libmikmod-3.1.12-CVE-2009-3995,3996.diff
@@ -6,8 +6,8 @@ Index: loaders/load_it.c
  				ih. name##end   =_mm_read_UBYTE(modreader);				\
  				ih. name##susbeg=_mm_read_UBYTE(modreader);				\
  				ih. name##susend=_mm_read_UBYTE(modreader);				\
-+				if (ih. name##pts>= ENVPOINTS) \
-+					ih. name##pts = ENVPOINTS-1; \
++				if (ih. name##pts>= ITENVCNT) \
++					ih. name##pts = ITENVCNT-1; \
  				for(lp=0;lp<ITENVCNT;lp++) {							\
  					ih. name##node[lp]=_mm_read_##type (modreader);		\
  					ih. name##tick[lp]=_mm_read_I_UWORD(modreader);		\
@@ -15,8 +15,8 @@ Index: loaders/load_it.c
  				ih. name/**/end   =_mm_read_UBYTE(modreader);			\
  				ih. name/**/susbeg=_mm_read_UBYTE(modreader);			\
  				ih. name/**/susend=_mm_read_UBYTE(modreader);			\
-+				if (ih. name/**/pts>= ENVPOINTS) \
-+					ih. name/**/pts = ENVPOINTS-1; \
++				if (ih. name/**/pts>= ITENVCNT) \
++					ih. name/**/pts = ITENVCNT-1; \
  				for(lp=0;lp<ITENVCNT;lp++) {							\
  					ih. name/**/node[lp]=_mm_read_/**/type (modreader);	\
  					ih. name/**/tick[lp]=_mm_read_I_UWORD(modreader);	\
diff --git a/libmikmod.changes b/libmikmod.changes
index a881433..e2c46fc 100644
--- a/libmikmod.changes
+++ b/libmikmod.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sat Nov 19 20:41:22 UTC 2011 - coolo@suse.com
+
+- add libtool as buildrequire to avoid implicit dependency
+
+-------------------------------------------------------------------
+Wed Aug 25 13:26:22 UTC 2010 - prusnak@opensuse.org
+
+- correct fix for CVE-2009-3995 [bnc#625547]
+
 -------------------------------------------------------------------
 Fri Apr 23 01:29:56 CEST 2010 - prusnak@suse.cz
 
diff --git a/libmikmod.spec b/libmikmod.spec
index 076672b..325f283 100644
--- a/libmikmod.spec
+++ b/libmikmod.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package libmikmod (Version 3.1.12)
+# spec file for package libmikmod
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,13 +19,13 @@
 
 
 Name:           libmikmod
-BuildRequires:  esound-devel
+BuildRequires:  esound-devel libtool
 Url:            http://mikmod.raphnet.net/
 License:        LGPLv2.1+
 Group:          System/Libraries
 Summary:        MikMod Sound Library
 Version:        3.1.12
-Release:        3
+Release:        8
 # bug437293
 %ifarch ppc64
 Obsoletes:      libmikmod-64bit