Fix SELinux linking problems, bug #140615.

Package-Manager: portage-2.1.1_rc1-r2

5 files changed, 44 insertions, 18 deletions

diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog
index b3b4801daec1..ed26d2dc3739 100644
--- a/sys-apps/busybox/ChangeLog
+++ b/sys-apps/busybox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/busybox
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.104 2006/08/09 18:18:00 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.105 2006/09/04 20:26:16 pebenito Exp $
+
+  04 Sep 2006; Chris PeBenito <pebenito@gentoo.org>
+  +files/1.1.1/busybox-libsepol.patch, +files/1.2.0/busybox-libsepol.patch,
+  busybox-1.1.3.ebuild, busybox-1.2.1.ebuild:
+  Fix SELinux linking problems, bug #140615.
 
   09 Aug 2006; <solar@gentoo.org> busybox-1.2.1.ebuild:
   - move preinst data into postinst. Add a few savedconfig examples
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 08c6b64d8b29..582a6ba77dfd 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -25,24 +25,28 @@ AUX 1.2.0/bb.patch 484 RMD160 eec4ca0e5a8a3391f6530722dd50b3b0d6099be8 SHA1 e742
 MD5 7200d404c8e8cf27992611a44f0d76f3 files/1.2.0/bb.patch 484
 RMD160 eec4ca0e5a8a3391f6530722dd50b3b0d6099be8 files/1.2.0/bb.patch 484
 SHA256 e3b8d8122ece3a2fa81671dbd5a613ead2b414c044bde398d42eba53fe66f92c files/1.2.0/bb.patch 484
+AUX 1.2.0/busybox-libsepol.patch 312 RMD160 7277dc4af858f6cf2e2b0e74d1a15ca8cb1ede11 SHA1 adc17ce5d018a70aaf24d60b241045c6523acb32 SHA256 e98ddc5aaed7f270f334a8370ff489a655f9af558b7df8e7754574560f032084
+MD5 8abab3f6270f4e16eff37979e7e1df47 files/1.2.0/busybox-libsepol.patch 312
+RMD160 7277dc4af858f6cf2e2b0e74d1a15ca8cb1ede11 files/1.2.0/busybox-libsepol.patch 312
+SHA256 e98ddc5aaed7f270f334a8370ff489a655f9af558b7df8e7754574560f032084 files/1.2.0/busybox-libsepol.patch 312
 AUX config-netboot 9853 RMD160 3d62cf31765adbc88c7a39f0f21223d7e73ef627 SHA1 0dc911793cd298a1e6f61073c2e37ba1c107f5f9 SHA256 75cae861b7bae144ca86998cb90dae9bcb0f54e09ed0c36d1ed81ad79a401e3d
 MD5 d9841a0171170d16bb121c696591e7ef files/config-netboot 9853
 RMD160 3d62cf31765adbc88c7a39f0f21223d7e73ef627 files/config-netboot 9853
 SHA256 75cae861b7bae144ca86998cb90dae9bcb0f54e09ed0c36d1ed81ad79a401e3d files/config-netboot 9853
 DIST busybox-1.1.3.tar.bz2 1435820 RMD160 b1e3409bc3180532af60140cdc5cfa84591c9641 SHA1 9feb01c74e370e7e59b6ccecd9cee2760435b462 SHA256 5228a88866211810c69d7a5be925cf87df47519b1d9d403aaca63bbdd32c975e
 DIST busybox-1.2.1.tar.bz2 1404986 RMD160 c9eb1637856a98278a4666f1c27db861477c31ca SHA1 487ef51209e253d3aa981dc0b0645063a804f4c7 SHA256 c6f955c7feafdb7c40645b3dc4c4a3c945477a2429633eef7b2a34ef01827410
-EBUILD busybox-1.1.3.ebuild 6643 RMD160 0c80c52f8e5b7c07c9dd6181403b0c42972b5219 SHA1 4c4c08a2e87d0314447213afc2972992afc4d100 SHA256 ddee9aa8a5691d1845275e06ee82c74c9ff9ba9413d2c9763707e17bdffb2e8c
-MD5 cb794b270e4977c82f8009fd5e45f16a busybox-1.1.3.ebuild 6643
-RMD160 0c80c52f8e5b7c07c9dd6181403b0c42972b5219 busybox-1.1.3.ebuild 6643
-SHA256 ddee9aa8a5691d1845275e06ee82c74c9ff9ba9413d2c9763707e17bdffb2e8c busybox-1.1.3.ebuild 6643
-EBUILD busybox-1.2.1.ebuild 8152 RMD160 925a343dcf0a16e0dcb91e747889b29675d19497 SHA1 817f60ee863325d24211161837c2fbda3e6556b4 SHA256 270039700f77ac9c023024fe6db13bd9880df4f722de5148ffd68e6605614dfc
-MD5 f6fa4d4c32cb87f6178fbc2af167b9c9 busybox-1.2.1.ebuild 8152
-RMD160 925a343dcf0a16e0dcb91e747889b29675d19497 busybox-1.2.1.ebuild 8152
-SHA256 270039700f77ac9c023024fe6db13bd9880df4f722de5148ffd68e6605614dfc busybox-1.2.1.ebuild 8152
-MISC ChangeLog 17274 RMD160 88cb2367dcba4ee7d34cc92cf8e94dc9e6a70309 SHA1 c64dd2305de166d1e825a2dea1afd757c552ec0f SHA256 e0d6bc60627cc1140dd9093c5a798035e1cb804209b1d3c5c411b9688aef0d7d
-MD5 0ed3cb8604fb49a17c1b3a3100fd62a9 ChangeLog 17274
-RMD160 88cb2367dcba4ee7d34cc92cf8e94dc9e6a70309 ChangeLog 17274
-SHA256 e0d6bc60627cc1140dd9093c5a798035e1cb804209b1d3c5c411b9688aef0d7d ChangeLog 17274
+EBUILD busybox-1.1.3.ebuild 6720 RMD160 5e9fa9603a004eb851216e44c693979f0e1b7fce SHA1 a57eec9ed3706e2c8bd08a4d864cd71421daec58 SHA256 0d0926c47586bd8729638e41cccd25ce9d744f46eeb7ae9440c9c994967cafc5
+MD5 db765f7282bc4375326cb4c24079465e busybox-1.1.3.ebuild 6720
+RMD160 5e9fa9603a004eb851216e44c693979f0e1b7fce busybox-1.1.3.ebuild 6720
+SHA256 0d0926c47586bd8729638e41cccd25ce9d744f46eeb7ae9440c9c994967cafc5 busybox-1.1.3.ebuild 6720
+EBUILD busybox-1.2.1.ebuild 8229 RMD160 6686f7eee6f111cd76346e42b412784bf48dd94b SHA1 97a2bb6890ef6ca9bedf1ecb7ef0ee2a54df4ebb SHA256 2912e72d8277c59f84f38df2f136ed3433b092141f105bb9e52272690278b060
+MD5 ae9196baae24e6ba52fa1091a303dd77 busybox-1.2.1.ebuild 8229
+RMD160 6686f7eee6f111cd76346e42b412784bf48dd94b busybox-1.2.1.ebuild 8229
+SHA256 2912e72d8277c59f84f38df2f136ed3433b092141f105bb9e52272690278b060 busybox-1.2.1.ebuild 8229
+MISC ChangeLog 17497 RMD160 c4b7eb4890a9790ab51998c6e3332f346b8ea969 SHA1 e47177858febc846062c064744e4acdfbf72ed32 SHA256 a06ccba83593dfd84cd714ad2e5a3b38d6e2734de2a0ee80ee19643c2f94a9da
+MD5 11e0d38b16b68546fb3d28fc4c87d007 ChangeLog 17497
+RMD160 c4b7eb4890a9790ab51998c6e3332f346b8ea969 ChangeLog 17497
+SHA256 a06ccba83593dfd84cd714ad2e5a3b38d6e2734de2a0ee80ee19643c2f94a9da ChangeLog 17497
 MISC metadata.xml 161 RMD160 77385273ea1d12ed4093a4167307486b74d1cf82 SHA1 aa4b2873e32de89c0b0aeb26b5782f77cb00948e SHA256 a11fdd02015a232398fdf22a20d26a95fc34d44c54513e6b26b6128d0b76122e
 MD5 8ef75eba39772bdd1a8facc7815dbebb metadata.xml 161
 RMD160 77385273ea1d12ed4093a4167307486b74d1cf82 metadata.xml 161
@@ -56,7 +60,7 @@ SHA256 7cdd7cafb10a98988a5e4226f3b23246f785e3e624880789676f89fa362eb38b files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE+xZHamhnQswr0vIRAriUAJ4t5kVsDbrPonWBqfcMfh23yJ8D6ACfReDG
-gQWar0F8G9Idi1ei3pQW1pI=
-=w4/W
+iD4DBQFE/IvS3gmyzsILbxIRArOmAKDP7Z90GjDhA+1qykf7+8fnCZ8D3ACXQtNZ
+GyXVwp7AX3dL9r3qYieC/Q==
+=ZReJ
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/busybox/busybox-1.1.3.ebuild b/sys-apps/busybox/busybox-1.1.3.ebuild
index 6cec22b55215..bf2cf937b333 100644
--- a/sys-apps/busybox/busybox-1.1.3.ebuild
+++ b/sys-apps/busybox/busybox-1.1.3.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/sys-apps/busybox/busybox-1.1.3.ebuild,v 1.19 2006/09/03 17:51:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.1.3.ebuild,v 1.20 2006/09/04 20:26:16 pebenito Exp $
 
 inherit eutils flag-o-matic
 
@@ -58,6 +58,8 @@ src_unpack() {
 
 	# patches go here!
 	epatch "${FILESDIR}"/1.1.1/bb.patch
+	# fix SELinux linking:
+	epatch "${FILESDIR}"/1.2.0/busybox-libsepol.patch
 
 	# check for a busybox config before making one of our own.
 	# if one exist lets return and use it.
diff --git a/sys-apps/busybox/busybox-1.2.1.ebuild b/sys-apps/busybox/busybox-1.2.1.ebuild
index c8e54e401f27..fa0f5da39dd3 100644
--- a/sys-apps/busybox/busybox-1.2.1.ebuild
+++ b/sys-apps/busybox/busybox-1.2.1.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/sys-apps/busybox/busybox-1.2.1.ebuild,v 1.8 2006/09/03 09:01:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.2.1.ebuild,v 1.9 2006/09/04 20:26:16 pebenito Exp $
 
 inherit eutils flag-o-matic
 
@@ -101,6 +101,8 @@ src_unpack() {
 
 	# patches go here!
 	epatch "${FILESDIR}"/1.2.0/bb.patch
+	# fix SELinux linking:
+	epatch "${FILESDIR}"/1.2.0/busybox-libsepol.patch
 
 	# check for a busybox config before making one of our own.
 	# if one exist lets return and use it.
diff --git a/sys-apps/busybox/files/1.2.0/busybox-libsepol.patch b/sys-apps/busybox/files/1.2.0/busybox-libsepol.patch
new file mode 100644
index 000000000000..32412846f71c
--- /dev/null
+++ b/sys-apps/busybox/files/1.2.0/busybox-libsepol.patch
@@ -0,0 +1,13 @@
+Index: Rules.mak
+===================================================================
+--- Rules.mak	(revision 15800)
++++ Rules.mak	(working copy)
+@@ -298,7 +298,7 @@
+ endif
+ 
+ ifeq ($(strip $(CONFIG_SELINUX)),y)
+-    LIBRARIES += -lselinux
++    LIBRARIES += -lselinux -lsepol
+ endif
+ 
+ ifeq ($(strip $(PREFIX)),)