Added patch by kevquinn to make test succeed on hardened, Bug #130831.

Package-Manager: portage-2.1.1

4 files changed, 51 insertions, 13 deletions

diff --git a/media-libs/libmpeg2/ChangeLog b/media-libs/libmpeg2/ChangeLog
index 632fde1c9407..df7872d4b670 100644
--- a/media-libs/libmpeg2/ChangeLog
+++ b/media-libs/libmpeg2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libmpeg2
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg2/ChangeLog,v 1.47 2006/07/09 20:27:19 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg2/ChangeLog,v 1.48 2006/09/13 16:17:27 zzam Exp $
+
+  13 Sep 2006; Matthias Schwarzott <zzam@gentoo.org>
+  +files/libmpeg2-0.4.0b-use-readelf-for-test.patch, libmpeg2-0.4.0b.ebuild:
+  Added patch by kevquinn to make test succeed on hardened, Bug #130831.
 
   09 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> libmpeg2-0.4.0b.ebuild:
   Pinpoint virtual/x11 version to less than 7.
diff --git a/media-libs/libmpeg2/Manifest b/media-libs/libmpeg2/Manifest
index b1586575f045..1e9e541f33a0 100644
--- a/media-libs/libmpeg2/Manifest
+++ b/media-libs/libmpeg2/Manifest
@@ -9,15 +9,19 @@ AUX gcc34-inline-fix-0.4.0b.diff 513 RMD160 5351fe7b55f23cc48961cec7202c945d4fa1
 MD5 b76ada2d9c18a21260a268f4e3018e6a files/gcc34-inline-fix-0.4.0b.diff 513
 RMD160 5351fe7b55f23cc48961cec7202c945d4fa1a656 files/gcc34-inline-fix-0.4.0b.diff 513
 SHA256 dae6bf3af6f7453309b563a9fe9512defd84cb57cf14f03b214321292ba51444 files/gcc34-inline-fix-0.4.0b.diff 513
+AUX libmpeg2-0.4.0b-use-readelf-for-test.patch 869 RMD160 55939dd2417015c1bf8052fe506495d55514337b SHA1 6476adaecd05519941cc70c14daeab27732e4d51 SHA256 56d43bb88a4179dbc3859c77ca445b89bbdd1223ee8d78bcc7d7148dee7ae534
+MD5 3dc94b993fe05f0b8f600a7d11f5bf61 files/libmpeg2-0.4.0b-use-readelf-for-test.patch 869
+RMD160 55939dd2417015c1bf8052fe506495d55514337b files/libmpeg2-0.4.0b-use-readelf-for-test.patch 869
+SHA256 56d43bb88a4179dbc3859c77ca445b89bbdd1223ee8d78bcc7d7148dee7ae534 files/libmpeg2-0.4.0b-use-readelf-for-test.patch 869
 DIST mpeg2dec-0.4.0b.tar.gz 473846 RMD160 44df6c21e88d2c3029ef418ea46e2d6796c90004 SHA1 7ad99a810802f216893022fa14fa078ac49d67d7 SHA256 9416376952812e5b479745d67a2bf874fbcad10137517314ce7de37abb756df8
-EBUILD libmpeg2-0.4.0b.ebuild 1590 RMD160 a1b0ced49d223c4667b685c73e438324e933994b SHA1 e9ce2e8b7b6a9a84f4a02f3297d434a957bf6de7 SHA256 02a3123885d8b17894a74c6794ec71680d7b597264ce317015e496331a850bf2
-MD5 09b9566a79074172b6de8e28cadc9762 libmpeg2-0.4.0b.ebuild 1590
-RMD160 a1b0ced49d223c4667b685c73e438324e933994b libmpeg2-0.4.0b.ebuild 1590
-SHA256 02a3123885d8b17894a74c6794ec71680d7b597264ce317015e496331a850bf2 libmpeg2-0.4.0b.ebuild 1590
-MISC ChangeLog 5853 RMD160 94cb08f4d4c5e0e515c21fa4027206b419bbfb40 SHA1 6848feaffd185268484d0b35d3f62036700602cc SHA256 01e47aa34a0b06d6059da80e21d09a6a8a0c1047c0a98ac6fdbf9a9518a91ba7
-MD5 60665f86a3cfb2ad155b24617d73b9f9 ChangeLog 5853
-RMD160 94cb08f4d4c5e0e515c21fa4027206b419bbfb40 ChangeLog 5853
-SHA256 01e47aa34a0b06d6059da80e21d09a6a8a0c1047c0a98ac6fdbf9a9518a91ba7 ChangeLog 5853
+EBUILD libmpeg2-0.4.0b.ebuild 1752 RMD160 a8e3ba0db64628aef8b0ecfd8d39c41834c2c0f9 SHA1 b0d62a9ceafcf2775039fb2bb063257675676aae SHA256 3d0d672c7a1101b3887af44de6dbaaa9cf206021ca47f62a204cf65bbf0327d4
+MD5 ffebf22bb5691ad9a28d0a759de66af1 libmpeg2-0.4.0b.ebuild 1752
+RMD160 a8e3ba0db64628aef8b0ecfd8d39c41834c2c0f9 libmpeg2-0.4.0b.ebuild 1752
+SHA256 3d0d672c7a1101b3887af44de6dbaaa9cf206021ca47f62a204cf65bbf0327d4 libmpeg2-0.4.0b.ebuild 1752
+MISC ChangeLog 6052 RMD160 e402fd0fb399e2900277f6c06657642908d71952 SHA1 9f2c907523f42a127f2d1c23a20657c4f1627604 SHA256 ac01930edc5b4d75877ef666fbf8f9b0a0c30de27aa5ea337d5d2b65b3b231c0
+MD5 977c423af7c364f2c7624bfedb970c5d ChangeLog 6052
+RMD160 e402fd0fb399e2900277f6c06657642908d71952 ChangeLog 6052
+SHA256 ac01930edc5b4d75877ef666fbf8f9b0a0c30de27aa5ea337d5d2b65b3b231c0 ChangeLog 6052
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
 MD5 0338bfb24d7bfb6450aac4dd025c0096 metadata.xml 223
 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 metadata.xml 223
@@ -28,7 +32,7 @@ SHA256 d53d7a61530e917fa1bcdbafb0b694fd90b8650080995bdc5a7c1f035e2f3ce1 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE+8pbamhnQswr0vIRAnzVAJ0b+uhSXiR8PsRNkj52z+zvlEzI/gCdEmiH
-A8/7NPYAo+t6bZuP5NDffhM=
-=iBgT
+iD8DBQFFCC8ht2vP6XvVdOcRAjJ3AJ4m6oLLpq8cDAZgYW7ohxq7pG6KhACffPR9
+byTylDxPpQJ95Dnca+CPXSg=
+=IeXr
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libmpeg2/files/libmpeg2-0.4.0b-use-readelf-for-test.patch b/media-libs/libmpeg2/files/libmpeg2-0.4.0b-use-readelf-for-test.patch
new file mode 100644
index 000000000000..7d091cfbb04e
--- /dev/null
+++ b/media-libs/libmpeg2/files/libmpeg2-0.4.0b-use-readelf-for-test.patch
@@ -0,0 +1,26 @@
+--- test/globals.orig	2006-04-29 19:19:59.000000000 +0200
++++ test/globals	2006-04-29 19:24:35.000000000 +0200
+@@ -14,8 +14,9 @@
+ 
+ error=0
+ 
+-bad_globals=`nm -g --defined-only $builddir/../libmpeg2/*.o |\
+-    awk '{if ($3) print $3}' | grep -v '^_\?mpeg2_'`
++bad_globals=`readelf -s $builddir/../libmpeg2/*.o |\
++	awk '$5=="GLOBAL" && $6!="HIDDEN" && $7!="UND" {print $8}' |\
++	grep -v '^_\?mpeg2_'`
+ 
+ if test x"$bad_globals" != x""; then
+     echo BAD GLOBAL SYMBOLS:
+@@ -23,8 +24,9 @@
+     error=1
+ fi
+ 
+-bad_globals=`nm -g --defined-only $builddir/../libmpeg2/convert/*.o |\
+-    awk '{if ($3) print $3}' | grep -v '^_\?mpeg2convert_'`
++bad_globals=`readelf -s $builddir/../libmpeg2/convert/*.o |\
++	awk '$5=="GLOBAL" && $6!="HIDDEN" && $7!="UND" {print $8}' |\
++	grep -v '^_\?mpeg2convert_'`
+ 
+ if test x"$bad_globals" != x""; then
+     echo BAD GLOBAL SYMBOLS:
diff --git a/media-libs/libmpeg2/libmpeg2-0.4.0b.ebuild b/media-libs/libmpeg2/libmpeg2-0.4.0b.ebuild
index 5afe1a0c7486..fc2f31d17045 100644
--- a/media-libs/libmpeg2/libmpeg2-0.4.0b.ebuild
+++ b/media-libs/libmpeg2/libmpeg2-0.4.0b.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg2/libmpeg2-0.4.0b.ebuild,v 1.30 2006/09/04 06:39:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg2/libmpeg2-0.4.0b.ebuild,v 1.31 2006/09/13 16:17:27 zzam Exp $
 
 inherit eutils flag-o-matic autotools libtool
 
@@ -43,6 +43,10 @@ src_unpack() {
 		configure.in \
 		|| die "sed configure failed"
 
+	# Fix problem that the test for external symbols
+	# uses nm which also displays hidden symbols. Bug #130831
+	epatch "${FILESDIR}/${P}-use-readelf-for-test.patch"
+
 	eautoreconf
 	elibtoolize
 }