Fix static linking against selinux #484560 by thaehaid.

Package-Manager: portage-2.2.0/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

4 files changed, 76 insertions, 19 deletions

diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog
index 1ce4ce643ec3..077c2af3f630 100644
--- a/sys-apps/busybox/ChangeLog
+++ b/sys-apps/busybox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/busybox
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.361 2013/09/14 10:38:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.362 2013/09/29 00:55:52 vapier Exp $
+
+  29 Sep 2013; Mike Frysinger <vapier@gentoo.org>
+  +files/busybox-1.21.1-trylink-only-prefix-libs-with-l.patch,
+  busybox-1.21.1.ebuild:
+  Fix static linking against selinux #484560 by thaehaid.
 
   14 Sep 2013; Agostino Sarubbo <ago@gentoo.org> busybox-1.21.0.ebuild:
   Stable for sh, wrt bug #461372
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 58df2cbf7bf6..87f6eabdbbf7 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX busybox-1.19.0-bb.patch 908 SHA256 98f92c2edbcf61d1bacef783ea8b08cce07051b0a4489ed3f4579296846f89f1 SHA512 d4024e531ce7113cf554646608b1ef356e51691e3e21d165621b3690c82b56a319867b90d9daba548b635d9dbd41be5efea63181b7123d4505e529d863a8214c WHIRLPOOL b0d6d9b08ad0930e5243c7addc8a6db61505e95ed8e72c64fbfd734cb6ff9e303b3eb8ea6ec4790b2be567783664230cf278eb3e673fa0844c3881cf993f7cb8
 AUX busybox-1.20.0-udhcpc6-ipv6.patch 998 SHA256 58ac58c6d4e5d9d1d838d2e30f631b4b63a6187fd685d454294bee3646721d54 SHA512 4e506b1b8151aa5511a68c45fe95b7d8617738aed148ee60905fa4239c57d95b1b58cfa1d079be35411e5580936c5397eda34dba3a03290c788891b8cfdc6872 WHIRLPOOL 4cbd680815120425df0e2d955f8f79cf2d9ec516f7d360309feb7044a634408d79db4d967858a56669e9794e87cc8b7eea86597b89ed7507fbff1f21d79aaa61
@@ -8,6 +8,7 @@ AUX busybox-1.20.2-selinux-pkg-config.patch 2009 SHA256 09d34cafa860cfabfb6911b0
 AUX busybox-1.21.0-mdev.patch 1173 SHA256 911371ceff8c6a899323cda8d63a20b5f98d503681e5617b2448b555c4fecc61 SHA512 490a9a85d6df17e0111ad86f420207fed1b699b3b4e9ebe8d6700d4ce33ab3de0e0137dba1326efb5011dbcd53c769448ddab855995c896135ed6adbe61d2e44 WHIRLPOOL 2a302d310a6e82f3aa1c878a14fc4d2b1644d4e724aae1e25c1390cbd3852d252a38c76fd38fc79ee4b08d8f83aa2a442963955fe49486a28c060d1d4b6edc47
 AUX busybox-1.21.0-platform.patch 1227 SHA256 ee7b96577330a68598d4ec48ce94f6eca3079c32a86cca32f3bb6cc28d467654 SHA512 595e1081dcc9f2dca714066c1f59659d7c7e3f702df937c138ff60cf9af42272b71ac354521c3abd26ac406eb07a710c14c4f94e62a293edcd6473ba1fd53675 WHIRLPOOL d18661bccd8f43bc4fcb492013a647480ff4e0e88a1ac8ea9a1a3f176193363bfbd7777589b2796ccdf92315cd80a5d6999a321dafc441f4939546d6272002eb
 AUX busybox-1.21.0-xz.patch 2647 SHA256 c807f73718e836a81ee74987306c72297ddba209038240f81fab96b4a28b73b4 SHA512 696dd31a73bbd919435a3ee1b8cd05769e6c3a45e853e3e052a22b7290bf332cd3b7e17e394911864b3c7ed7f9eea604dfbd7a5c43f0eb1e65b257d679fcccd3 WHIRLPOOL a3be95e60602374daff1629c38556f93b2342d81939afda86613f5fb0af0f7b600656118712ac33237cba230369f622a18502347e1dad0aa3570dc1d0a1725f1
+AUX busybox-1.21.1-trylink-only-prefix-libs-with-l.patch 2110 SHA256 235b2fa702c998a66999074d00653e49fcdeca5967d7039644f84c8fa66cecbf SHA512 2ae6f95dc1e9045dec6504f1c52e79ff32aaecfcca04bea31e7033b013ef1ede44bac94251326e9ef227a55e35cd2268ce798d8e8fb44c578856cee4d2cc258e WHIRLPOOL 137d835a71d3119814010c9ea404b427f59c41a6b69491f12df60d2baefe5c5866cf34e49e575123a7764b5d9dfaa2a653280038f2436bfcfb70f2b8291ac2dc
 AUX ginit.c 3097 SHA256 fd6a4715d3dd10f6db479020433da3997d397658301335c847fb779129238b8c SHA512 8bf70f13db0fbeecedf9a9f862c5391c0d8b7aa3ddd2ec85cda9b360c3117a01e32b01017b8c30197f587e521ba360ff70d1caf8d0f69d5c3a27f37ecc252e7c WHIRLPOOL a1ec3ccc296033d88a9504b693c7d249d0bd11b1d75e3f59a62137c5e4b4c914fe2b8971c86dbca2cc8ccc0d86f3f8c2c45bb44cec85a3628c44f091476baa92
 AUX klogd.confd 218 SHA256 737b78745964e110da2fd3357c6d5fb80ccacf979039b8d40c03cf1cb969e5f3 SHA512 3348d5376b368b28d1431692a93868cd4550be12ad729340c5f78da35a5bd295e7613d70ce8ccde5029ad6d87a41c2f24155180f3570de8a9174dd63dece143f WHIRLPOOL ea28c1d926e36fba0ab69de8ddfd2503889b7cfa3a4ada347a9d22d9894fe30be068c0ed55f899b952e62b8de3cb69e1a4209f7864787988ded28ede10c7445a
 AUX klogd.initd 359 SHA256 ef607b72d270797e4be1fba425c23ba26078633c47c698063bd4b17e7b4ff8c3 SHA512 e9d6215e4b0dcc4fbb507ce2bb84c818ad18951282c47c98b0c98b3fa58e6b28218f608689a7786cb0447673ae1f5c3ba5767f9b29cffd73325d93bf2a928ac9 WHIRLPOOL d7e82a0d2a6a60b2444a3b212022250297ca163001045bf508442972fc6330c4eea55cb965920778e090c92a69441e864e6721f02ecc6d10279b6196b14f7e71
@@ -29,24 +30,24 @@ DIST busybox-1.21.0.tar.bz2 2200841 SHA256 eb9d268627783297f5f459cb9bd61a94e395d
 DIST busybox-1.21.1.tar.bz2 2201917 SHA256 cd5be0912ec856110ae12c76c3ec9cd5cba1df45b5a9da2b095b8284d1481303 SHA512 b1dd626e1c111214ebd9b933ce2465c943fd8a0a515b6962a31f3a76276ff7992c21b7f96eeb9baeb861a5e734689054e6df5dd6414c753c37084e2d705810e1 WHIRLPOOL 8ec0d9c23d8e2eb28e7f8e88f076908cf6a3f7b64aabd0a7a1af2200064a5337c82fdac9450726236e0632faa202ea08396ca5c35e5334c2128a307adbdd736c
 EBUILD busybox-1.20.2.ebuild 8689 SHA256 7b8d73cfd1fef71b4dff1d1401a06409efcc13f8ee7738b93f627f0c28d051b7 SHA512 40588e7619e5895f1516bf7265c353d3176a18b2211a0573e86f2b1b6734eff82ab9c337b6f28846dddbbddf970fbedab917ff9d05ea5d3cf801f0a65cc0ae3b WHIRLPOOL 046fdffc6253a8d621d276ea4070d313d3e508f9b7778ad5c8e76132848be0b301d4284ae989ba3da3ca584daa35e76cef807e5c268fd50d8db61aaed8d620b1
 EBUILD busybox-1.21.0.ebuild 8493 SHA256 c0753eba50809fd0a4520a645f62f632e2c88f90d7b1d8e6afd315ae6952d444 SHA512 10ed172f9ee2fddc8a87a4b2db1b09f5767b1afe148a3d3c67e5c5487f7d7c3eb999f21190672d688d16707fcba2ba0007dda9dfd1871e961545e730cff315d4 WHIRLPOOL 5f2ec0cf5f9cfc5dec73260bce07d564d675c88a34e47c01aed73983dcde522707963c7ec09b9549e82313d724438a9fd26d176d068861e1a1612f6e7fc646b0
-EBUILD busybox-1.21.1.ebuild 8507 SHA256 bf3dc3ae06ce42473aaf7bab6f1e7236976de0dcf7a5945335fe2f1880609d60 SHA512 2740a6235a71e9eb3e36d7966189eed29c0624778231925fd1a4c26fef895ce146c90c2f13d8b3a074640a4b083e18e79be9475ff3b578d73873036f50d75b74 WHIRLPOOL c63dad3474a454ad2dd97b08c5e0ddda859706a2d9b4bad68ee42f8481b48d16e92b77a1a9dc53124efbf266784f96273d3fe32f1fb4c1754a24dfeed65295b3
+EBUILD busybox-1.21.1.ebuild 8506 SHA256 45e6ad003eaa29c594772f24aa1903f36125bb3857d8fb86c6af2290e6755204 SHA512 7b663ee5e3580ab0f5b31c725ce5d7481cc38edcacacda035a20ea953be2a6edbe0b4c8834bb923bbac7a17001f213efdc8a259a92b85cdf7bdcfdd533be4ff3 WHIRLPOOL c66565d1749fccaa0d5e66e975d4497596ac74b114beeade6a68110535616c937d88fbfa5ffe2f3a01b032b164afaefb51da559918a35bcefbe2394bf6754490
 EBUILD busybox-9999.ebuild 8506 SHA256 08368826e7140b6d925b7eb348f1ccb99a851b825f9d6f4d80adee57d4f6dec0 SHA512 44f90f8eeb41cd2db2306df90debe289b7cd5ccf72bbd8185f64747067fc41717692a7609976738d6efefc9367a91d68c2ee9ae21ac74e3707dd896b5e6b4b69 WHIRLPOOL 11708cfbf79cb597a9f3ca75d0bffd77b0d1a247dbb25fecefeda5fe35aa5b5141c2b161c1e370c6c088597c0d9f4cd3db207e2071a456b3a66ec7203c11f2b7
-MISC ChangeLog 55333 SHA256 a1316726cce4e4c225a15cc3223a332f0d3d79356b59f7bf4c9a05d1ad52b84e SHA512 e28c58e8cbb491d563b3132b05ae4ba2c01edda3200abdf284b351dca3b1edaf7a75a2a87f878247399d87ace1f32fa0583c70257938febe6fe67beb74ef5ffe WHIRLPOOL e318cb52bb08bcc274078cba12e783731ad585b61fa38720a2eea89d0da28b71169bb658429736f2926386a8ba473ad7b7b4c2179ab655dd5e04e103d406aa77
+MISC ChangeLog 55533 SHA256 af13a3556e0f653e8346099e291c78791bbd78a7fcff52d3b86661463d80c185 SHA512 8920f74a310528819b66a7c18bfd2f396950600bc6f60d41038ac9f536049914557290b89da34293ff0748b9ac9dafeddb1f18b1812f018582006c2ed042d487 WHIRLPOOL a270b3422a461502b02856de772ab45be46e37dfdcfda0899845a48d5380eeb65de095c69445115d97d7fa8dcda5463b9402bda493807751dfab813db6593b0c
 MISC metadata.xml 708 SHA256 e17f2240f57d74f8847e7bbf4e3cf44fdcd3ab3f610e0a66eb186d2a598178be SHA512 0d26c0593b156cc5764ad03c64e9b2a724b3877e348787d57818aec6b32f995951a9c0976a92d6ba824a2a5983d0c88116b9d335e51ba0e3c7b8f89e579482ba WHIRLPOOL 2ab4758748cf6d83d1a3a1d2f5f9472825a01affe5c7fdf8cd78fb9c75a1abaf18d8895fce12c7c502453caf68dd40799f47cce502804c9ec60705af2bb4f388
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSNDyvAAoJELp701BxlEWfQF4QAMePHmUl0sRuAeoAOmrsIFBw
-L7Y8nJMw66z5kpWLu5Jv3tB1S6p8ScY6xregCAFmWGLDJz12ZQQ18G1A8tMQ/POg
-DWFx4hJWFmOVqEFusXlxJMs60B+Bx7S1Sj14HzEBUawyUKXVFgJCgPIzFx9CvGbV
-FcOMxLfSW+waNS9u+QMjbD9nuTtHFTb0RRdQrZTU18F0dp+Gj9QsDbE4w7zlwPue
-Ev3NzIeCQkiRehT37aUgC5eNVhOsT+2xhpLsVt1VhMM4kirTSKyC5tj42SLH6GEc
-4+n7bM+TpjmkVwY2W+041f+1c6/yriH2KiCw/cuN3DjabL9UK5U7BuraOxovIYAx
-kMF78p6QU0f/4lx60y+ma/eJOM4BY/GLfN9M+jVb6YDqwSEzro4TuRZ6P2Ctqyjw
-nS7Jhbd2lm01YTBNkBYA8x000is+z4Q57kHOEm4STu4OM7xamFlqlYoVoLyvN38C
-bH9+CfvaVGOFEEZnoFOwgTMKyCRemCooQfUS2OjXV7dskSvmZK1wxlryWHDluvpa
-193dZwRasSCvcp27QPbQ+5mKOPzBdLYUmCRqEvowab99cd3Vr1zYO/Y05gv5bUrQ
-dqbykt2c9hJJa/8ey2w13CaYoS7hStJxeqTuoNjIdCl/OLLMlrpmDW4uwuUlCakF
-9kx7K1NxjOdvJRD20mi4
-=Omtk
+iQIcBAEBCAAGBQJSR3qeAAoJELEHsLL7fEFWF/4QAIFQUdPN3VxmMn5qa5UCxD58
+Dvzmfr9iY/k4W4AAHiDlSsAHoKimzBFjVV/hFDdyLT7soHvvpQ0w4xtOZvWdQNOo
+LinR63E2ATWnhAAeEdnX9VJlAP4SgUC10D7Dg2l3lcQw1t4TVQj7vTI7H+Sygl9F
+QOatAJ0LH9/2Sel/u/T03RATGKH5KO2iE2YoKMe1T9J5s5AsjrihNHUMzBmb2mdC
+Iy0zmUXfQJIoKqyYrfci046vxRvDHttfjnSDPOz3vdYIjAV2XEIy2ClUXvlzDf/L
+PX8HEcpWKfVKBsCpWdZo+NApjWE1T7ZK3tOgKwL/xcM6TWaJfO56BuQQoRBAPEFr
+pPnM9ZDim1j3Eid18bS3vGq4r0Js5+YnYTsB28+i9jqsBwXLdMBu+3za6iMT0Ovk
+Z9oj2N6P2TgeHlcLyaWmxP1KVu/7f2C63ZhIxz5LsXow8tGsFUnKmwNOjcg4vcta
+qCc7RDguhgtxRxlhHFt1zyjc4fO8PM3v8GqM1zZkZMY0PLq/O659kJdJLPns9Aif
+xXqd09AI2Wy63bvfKtJP8xlb9THnVCcEUOr799glCief8kJHIrZPiSobW1/+Cl2H
+f4cBNSAFj97VIwWghSt0l3YMFlKB5mkL90myXS2B46NnXxJ2bit31Q+JOzgEsq/0
+yeOxfxR94bv0r4RQpext
+=Imhj
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/busybox/busybox-1.21.1.ebuild b/sys-apps/busybox/busybox-1.21.1.ebuild
index 8dc9e05eb334..74b793173e20 100644
--- a/sys-apps/busybox/busybox-1.21.1.ebuild
+++ b/sys-apps/busybox/busybox-1.21.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.21.1.ebuild,v 1.1 2013/08/17 17:55:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.21.1.ebuild,v 1.2 2013/09/29 00:55:52 vapier Exp $
 
 # See `man savedconfig.eclass` for info on how to use USE=savedconfig.
 
@@ -66,7 +66,7 @@ src_prepare() {
 
 	# patches go here!
 	epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch
-	#epatch "${FILESDIR}"/${P}-*.patch
+	epatch "${FILESDIR}"/${P}-*.patch
 	cp "${FILESDIR}"/ginit.c init/ || die
 
 	# flag cleanup
diff --git a/sys-apps/busybox/files/busybox-1.21.1-trylink-only-prefix-libs-with-l.patch b/sys-apps/busybox/files/busybox-1.21.1-trylink-only-prefix-libs-with-l.patch
new file mode 100644
index 000000000000..bbd9e554c241
--- /dev/null
+++ b/sys-apps/busybox/files/busybox-1.21.1-trylink-only-prefix-libs-with-l.patch
@@ -0,0 +1,51 @@
+https://bugs.gentoo.org/484560
+
+From 3eab2b7675fc7e2889cd69285a2a31980a4bf504 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Thu, 12 Sep 2013 00:29:40 -0400
+Subject: [PATCH] trylink: only prefix libs with -l
+
+If our pkg-config queries pass back a flag like -pthread, the trylink
+script will expand that to -l-pthread.  So change trylink to only add
+the -l prefix to a value that doesn't have a - prefix already.
+
+Reported-by: thaehaid@incognitomail.org
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ scripts/trylink | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/scripts/trylink b/scripts/trylink
+index a8b0b2e..e471699 100755
+--- a/scripts/trylink
++++ b/scripts/trylink
+@@ -117,7 +117,7 @@ LDLIBS=`echo "$LDLIBS" | xargs -n1 | sort | uniq | xargs`
+ # First link with all libs. If it fails, bail out
+ echo "Trying libraries: $LDLIBS"
+ # "lib1 lib2 lib3" -> "-llib1 -llib2 -llib3"
+-l_list=`echo "$LDLIBS" | sed -e 's/ / -l/g' -e 's/^/-l/' -e 's/^-l$//'`
++l_list=`echo " $LDLIBS " | sed -e 's: \([^- ][^ ]*\): -l\1:g'`
+ test "x$l_list" != "x" && l_list="$START_GROUP $l_list $END_GROUP"
+ try $CC $CFLAGS $LDFLAGS \
+ 	-o $EXE \
+@@ -141,7 +141,7 @@ while test "$LDLIBS"; do
+     for one in $LDLIBS; do
+ 	without_one=`echo " $LDLIBS " | sed "s/ $one / /g" | xargs`
+ 	# "lib1 lib2 lib3" -> "-llib1 -llib2 -llib3"
+-	l_list=`echo "$without_one" | sed -e 's/ / -l/g' -e 's/^/-l/' -e 's/^-l$//'`
++	l_list=`echo " $without_one " | sed -e 's: \([^- ][^ ]*\): -l\1:g'`
+ 	test x"$l_list" != x"" && l_list="$START_GROUP $l_list $END_GROUP"
+ 	$debug && echo "Trying -l options: '$l_list'"
+ 	try $CC $CFLAGS $LDFLAGS \
+@@ -172,7 +172,7 @@ done
+ 
+ # Make the binary with final, minimal list of libs
+ echo "Final link with: ${LDLIBS:-<none>}"
+-l_list=`echo "$LDLIBS" | sed -e 's/ / -l/g' -e 's/^/-l/' -e 's/^-l$//'`
++l_list=`echo " $LDLIBS " | sed -e 's: \([^- ][^ ]*\): -l\1:g'`
+ test "x$l_list" != "x" && l_list="$START_GROUP $l_list $END_GROUP"
+ # --verbose gives us gobs of info to stdout (e.g. linker script used)
+ if ! test -f busybox_ldscript; then
+-- 
+1.8.3.2
+