Add patch for corner case of bad file open. From Vincent via bug #160795

Package-Manager: portage-2.1.1-r2

4 files changed, 40 insertions, 31 deletions

diff --git a/media-libs/smpeg/ChangeLog b/media-libs/smpeg/ChangeLog
index 0fc289815084..0b471d775410 100644
--- a/media-libs/smpeg/ChangeLog
+++ b/media-libs/smpeg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/smpeg
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/smpeg/ChangeLog,v 1.46 2006/10/15 17:54:54 tester Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/smpeg/ChangeLog,v 1.47 2007/01/09 09:28:03 mr_bones_ Exp $
+
+  09 Jan 2007; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/smpeg-0.4.4-missing-init.patch, smpeg-0.4.4-r8.ebuild:
+  Add patch for corner case of bad file open.  From Vincent via bug #160795
 
   15 Oct 2006; Olivier Crête <tester@gentoo.org> smpeg-0.4.4-r8.ebuild:
   Stable on amd64 per bug #150341
diff --git a/media-libs/smpeg/Manifest b/media-libs/smpeg/Manifest
index 4aee14e67ff7..e92a7bfdb98e 100644
--- a/media-libs/smpeg/Manifest
+++ b/media-libs/smpeg/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX smpeg-0.4.4-PIC.patch 9472 RMD160 c0ee00ca02c1ed2f5ce1890065864175f6cb8eb1 SHA1 ca210893cfd50554730918e572dc6d48192aa3f4 SHA256 a9fd3b892e06a00e31fedf719df0ff2bccac0542da9d1008d90712086ccc310f
 MD5 3ab2c17a1fa8a3c293ec83d7f4d45515 files/smpeg-0.4.4-PIC.patch 9472
 RMD160 c0ee00ca02c1ed2f5ce1890065864175f6cb8eb1 files/smpeg-0.4.4-PIC.patch 9472
@@ -33,6 +30,10 @@ AUX smpeg-0.4.4-malloc.patch 640 RMD160 1c2eb29efb5ffb9c5c86d344d5ee0591b1278e44
 MD5 d815117eecd706999e8b77de627e869e files/smpeg-0.4.4-malloc.patch 640
 RMD160 1c2eb29efb5ffb9c5c86d344d5ee0591b1278e44 files/smpeg-0.4.4-malloc.patch 640
 SHA256 7936cff7f0fe65929317bdad7c2711b35487af06e9dae9e0d9e91a77df13689b files/smpeg-0.4.4-malloc.patch 640
+AUX smpeg-0.4.4-missing-init.patch 266 RMD160 1f53a986425b9b5aeaf1cd8e6e5e5d273e7d8913 SHA1 e8c5c4c12b32dac35bf66446bb19aa31fbb75555 SHA256 ade458fa654dd8c9da5be4a613c5bc1521a50cc39fa58a89a6fa60f885f7b0c9
+MD5 61302e7d812069194f82f92cbfb99f06 files/smpeg-0.4.4-missing-init.patch 266
+RMD160 1f53a986425b9b5aeaf1cd8e6e5e5d273e7d8913 files/smpeg-0.4.4-missing-init.patch 266
+SHA256 ade458fa654dd8c9da5be4a613c5bc1521a50cc39fa58a89a6fa60f885f7b0c9 files/smpeg-0.4.4-missing-init.patch 266
 AUX smpeg-0.4.4-mmx.patch 352 RMD160 b0be5ec35a0b3bfce513285bc346b70b1989e4a8 SHA1 23c5a0cb58952998fc8507406459703de742aac2 SHA256 2dbcce8253b16b8882e491787d28a3410eb8e0ec29a300fed258bd899ac24248
 MD5 4c9d4090c519892a955e89a57c07889c files/smpeg-0.4.4-mmx.patch 352
 RMD160 b0be5ec35a0b3bfce513285bc346b70b1989e4a8 files/smpeg-0.4.4-mmx.patch 352
@@ -47,14 +48,14 @@ EBUILD smpeg-0.4.4-r7.ebuild 1674 RMD160 8c66184d53df3ff8a095f778794e0b43bbb587a
 MD5 dd3146be1ad3ec1283ecdbb9cee5bc5a smpeg-0.4.4-r7.ebuild 1674
 RMD160 8c66184d53df3ff8a095f778794e0b43bbb587a8 smpeg-0.4.4-r7.ebuild 1674
 SHA256 45aefac2ba712751228df618e93716e4032d4737c169cbf529e4af83711a9924 smpeg-0.4.4-r7.ebuild 1674
-EBUILD smpeg-0.4.4-r8.ebuild 1829 RMD160 4f7861da56ca7b47d69c8e1da6b8124aa6471860 SHA1 512f15ab5fb54dcffce53195d2e002ea50baab71 SHA256 e5d9c3f7cd43a5d7699f9dd509492f31b0d6f17e627ab1e921e634d8d2286e0a
-MD5 a5bb99c0349cb9ab34f18da211db9326 smpeg-0.4.4-r8.ebuild 1829
-RMD160 4f7861da56ca7b47d69c8e1da6b8124aa6471860 smpeg-0.4.4-r8.ebuild 1829
-SHA256 e5d9c3f7cd43a5d7699f9dd509492f31b0d6f17e627ab1e921e634d8d2286e0a smpeg-0.4.4-r8.ebuild 1829
-MISC ChangeLog 6439 RMD160 7d1b378e93f978cd6a67a94158aeddaff66cb36c SHA1 d6f7943f088504bb20a3b830242290f3fd1a9741 SHA256 bb5ff07cb0dbe7c91bf92dbbaf883a13441374a4ea5d78fcae0292b8f722ed0c
-MD5 e6b1c557d3b1537367244e73d678367c ChangeLog 6439
-RMD160 7d1b378e93f978cd6a67a94158aeddaff66cb36c ChangeLog 6439
-SHA256 bb5ff07cb0dbe7c91bf92dbbaf883a13441374a4ea5d78fcae0292b8f722ed0c ChangeLog 6439
+EBUILD smpeg-0.4.4-r8.ebuild 1842 RMD160 75b4e2f64902b864f07685e5263a32a9eb814214 SHA1 22d1e25d90ab84603f254bace36a85ffa68eabb3 SHA256 23cbddbc510de2265a6a8aad4f9b2af56bb5c293ddc6513e469eb9cef3307396
+MD5 9a4eafecfda11c74e2b1813534ae576b smpeg-0.4.4-r8.ebuild 1842
+RMD160 75b4e2f64902b864f07685e5263a32a9eb814214 smpeg-0.4.4-r8.ebuild 1842
+SHA256 23cbddbc510de2265a6a8aad4f9b2af56bb5c293ddc6513e469eb9cef3307396 smpeg-0.4.4-r8.ebuild 1842
+MISC ChangeLog 6638 RMD160 e01da7e7a6f31b53f913c1170e384b39bd4cc564 SHA1 3657594920ed17277d65172eae0dfbd83e49d722 SHA256 1462df77f21e57d2922496b880ae8bc004f1f8f637e06f454ed8975c5faaf6de
+MD5 82d31a4dd706c872aa7ba9cccd466a71 ChangeLog 6638
+RMD160 e01da7e7a6f31b53f913c1170e384b39bd4cc564 ChangeLog 6638
+SHA256 1462df77f21e57d2922496b880ae8bc004f1f8f637e06f454ed8975c5faaf6de ChangeLog 6638
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -68,10 +69,3 @@ SHA256 1559afb84e0cc3bc6594906c50af3def3857f43b47c70e85a1307251c22c45e8 files/di
 MD5 6b606861eac5335ad46ca2e733526c08 files/digest-smpeg-0.4.4-r8 491
 RMD160 b0ef3b2169ce6cea8dae35661784c36a9dfb8d2c files/digest-smpeg-0.4.4-r8 491
 SHA256 0cc8ff5615246cee27638772b835648ad0a3d811c8279e19c772d447cdfff809 files/digest-smpeg-0.4.4-r8 491
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFUBXzamhnQswr0vIRAkOLAJ9bsiK9EJvzlqp+akX+iBQHRXv7ewCeN1JV
-wk83ukI8UXenPnMrR11GJMU=
-=QAhz
------END PGP SIGNATURE-----
diff --git a/media-libs/smpeg/files/smpeg-0.4.4-missing-init.patch b/media-libs/smpeg/files/smpeg-0.4.4-missing-init.patch
new file mode 100644
index 000000000000..594c5546ebf7
--- /dev/null
+++ b/media-libs/smpeg/files/smpeg-0.4.4-missing-init.patch
@@ -0,0 +1,10 @@
+--- MPEG_old.cpp	2007-01-07 23:24:45.000000000 +0100
++++ MPEG.cpp	2007-01-07 23:25:11.000000000 +0100
+@@ -133,6 +133,7 @@
+     video = NULL;
+     system = NULL;
+     error = NULL;
++    source = NULL;
+ 
+     audiostream = videostream = NULL;
+     audioaction = NULL;
diff --git a/media-libs/smpeg/smpeg-0.4.4-r8.ebuild b/media-libs/smpeg/smpeg-0.4.4-r8.ebuild
index 598a65fa089a..4e7e277d75b0 100644
--- a/media-libs/smpeg/smpeg-0.4.4-r8.ebuild
+++ b/media-libs/smpeg/smpeg-0.4.4-r8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/smpeg/smpeg-0.4.4-r8.ebuild,v 1.15 2006/11/07 05:12:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/smpeg/smpeg-0.4.4-r8.ebuild,v 1.16 2007/01/09 09:28:03 mr_bones_ Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -30,15 +30,16 @@ DEPEND=">=media-libs/libsdl-1.2.0
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-m4.patch
-	epatch "${FILESDIR}"/${P}-gnu-stack.patch
-	epatch "${FILESDIR}"/${P}-config.patch
-	epatch "${FILESDIR}"/${P}-PIC.patch
-	epatch "${FILESDIR}"/${P}-gcc41.patch
-	epatch "${FILESDIR}"/${P}-flags.patch
-	epatch "${FILESDIR}"/${P}-automake.patch
-	epatch "${FILESDIR}"/${P}-mmx.patch
-	epatch "${FILESDIR}"/${P}-malloc.patch
+	epatch "${FILESDIR}"/${P}-m4.patch \
+		"${FILESDIR}"/${P}-gnu-stack.patch \
+		"${FILESDIR}"/${P}-config.patch \
+		"${FILESDIR}"/${P}-PIC.patch \
+		"${FILESDIR}"/${P}-gcc41.patch \
+		"${FILESDIR}"/${P}-flags.patch \
+		"${FILESDIR}"/${P}-automake.patch \
+		"${FILESDIR}"/${P}-mmx.patch \
+		"${FILESDIR}"/${P}-malloc.patch \
+		"${FILESDIR}"/${P}-missing-init.patch
 
 	cd "${WORKDIR}"
 	epatch "${DISTDIR}"/${P}-gtkm4.patch.bz2