From c99e270696c93c481c98fc2d148419b5fef98c8d Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 25 Mar 2007 16:29:47 +0000 Subject: [PATCH] Fix linking with selinux libs #160879. Package-Manager: portage-2.1.2.2 --- sys-apps/busybox/ChangeLog | 7 +++- sys-apps/busybox/Manifest | 34 +++++++++++-------- sys-apps/busybox/busybox-1.4.1-r2.ebuild | 3 +- sys-apps/busybox/busybox-1.4.2.ebuild | 3 +- .../busybox/files/1.4.0/selinux-link.patch | 11 ++++++ 5 files changed, 40 insertions(+), 18 deletions(-) create mode 100644 sys-apps/busybox/files/1.4.0/selinux-link.patch diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog index db86a7066e1a..edde54bb9058 100644 --- a/sys-apps/busybox/ChangeLog +++ b/sys-apps/busybox/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-apps/busybox # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.134 2007/03/25 15:00:17 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.135 2007/03/25 16:29:47 vapier Exp $ + + 25 Mar 2007; Mike Frysinger + +files/1.4.0/selinux-link.patch, busybox-1.4.1-r2.ebuild, + busybox-1.4.2.ebuild: + Fix linking with selinux libs #160879. *busybox-1.5.0 (25 Mar 2007) diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest index f2ea976d163b..cef2957620c1 100644 --- a/sys-apps/busybox/Manifest +++ b/sys-apps/busybox/Manifest @@ -29,6 +29,10 @@ AUX 1.4.0/data_extract_all.patch 545 RMD160 88773f3504cbf3e66e83e4c7d017591f79c9 MD5 856258c2e8806dab258cd192160e2b24 files/1.4.0/data_extract_all.patch 545 RMD160 88773f3504cbf3e66e83e4c7d017591f79c97c9f files/1.4.0/data_extract_all.patch 545 SHA256 cb2b59cb27114771b0c8dc04b480434a85a912eae5e6b96639cfcf5917f7b87e files/1.4.0/data_extract_all.patch 545 +AUX 1.4.0/selinux-link.patch 228 RMD160 21393fb5549b6867d6f6a310067114ec3ff7858d SHA1 d092e9899dd96416bc380fa8bc2d3eb5c876ff8c SHA256 28636595203193474e995552466c83292c542c1463037b2338c62518fb6a9fe5 +MD5 25174c2b997cb4301b2cf5b6db50a18b files/1.4.0/selinux-link.patch 228 +RMD160 21393fb5549b6867d6f6a310067114ec3ff7858d files/1.4.0/selinux-link.patch 228 +SHA256 28636595203193474e995552466c83292c542c1463037b2338c62518fb6a9fe5 files/1.4.0/selinux-link.patch 228 AUX 1.5.0/bb.patch 840 RMD160 b581f42a5bae2c12e0c2650c60ed20e95edc21a8 SHA1 128e75a932e65ccaed8c23fad5cc124f8bfc4e03 SHA256 6562015b4b9b1bdee2be221ade6805fdbbf778d5ae830683a29f34387af38e70 MD5 480266122cbcbc64ec90a80da7b7525c files/1.5.0/bb.patch 840 RMD160 b581f42a5bae2c12e0c2650c60ed20e95edc21a8 files/1.5.0/bb.patch 840 @@ -55,22 +59,22 @@ EBUILD busybox-1.4.1-r1.ebuild 8242 RMD160 26991c92f984f14a0bb9648148f59b00a1f7e MD5 f81ea3f600826d2b1808c82ce3ca23d0 busybox-1.4.1-r1.ebuild 8242 RMD160 26991c92f984f14a0bb9648148f59b00a1f7eadc busybox-1.4.1-r1.ebuild 8242 SHA256 62b73f790869faa0e5e7904341cda3f68a476ebadf49bac564adf7b29627127b busybox-1.4.1-r1.ebuild 8242 -EBUILD busybox-1.4.1-r2.ebuild 8283 RMD160 497b7fb833312314508dbe396da2e160c8c745ba SHA1 c47e5477f352ece36255063d6731c6967e9f91a4 SHA256 6bc52bfd1802760150f05ecef423ec3ba7ac7363542fc4a5df6c512a08a0083f -MD5 3b9d97c942f77c81609a90462f32383a busybox-1.4.1-r2.ebuild 8283 -RMD160 497b7fb833312314508dbe396da2e160c8c745ba busybox-1.4.1-r2.ebuild 8283 -SHA256 6bc52bfd1802760150f05ecef423ec3ba7ac7363542fc4a5df6c512a08a0083f busybox-1.4.1-r2.ebuild 8283 -EBUILD busybox-1.4.2.ebuild 8197 RMD160 924a50f3a7fcb4068230a04436af2ef2fb930bcc SHA1 fa10247cf6f162eccf5e249ff21d5cee72e86579 SHA256 eb95a4599d8459de6aa88979da468d2121fed478f60bcb9d81f40ca1f6368a1d -MD5 0011bd21b5bd31aaedd38aa7ab890991 busybox-1.4.2.ebuild 8197 -RMD160 924a50f3a7fcb4068230a04436af2ef2fb930bcc busybox-1.4.2.ebuild 8197 -SHA256 eb95a4599d8459de6aa88979da468d2121fed478f60bcb9d81f40ca1f6368a1d busybox-1.4.2.ebuild 8197 +EBUILD busybox-1.4.1-r2.ebuild 8330 RMD160 0a887b2115a709da1c636d35fac4624c0714a010 SHA1 5d15e868bc3f76dd00380fa3c967125b21172b1f SHA256 0df50b384da412efba178d9f3b03c014afe7d30fc05380bbaa0f2615ccd48ace +MD5 da971d9b6dbda31043087397a98d283e busybox-1.4.1-r2.ebuild 8330 +RMD160 0a887b2115a709da1c636d35fac4624c0714a010 busybox-1.4.1-r2.ebuild 8330 +SHA256 0df50b384da412efba178d9f3b03c014afe7d30fc05380bbaa0f2615ccd48ace busybox-1.4.1-r2.ebuild 8330 +EBUILD busybox-1.4.2.ebuild 8244 RMD160 2c4e5c1924209f76ff2d8f5dd861b05305207c38 SHA1 b514c85df11fc0f784ee54b86bc33605c66cfa82 SHA256 e597d21d5146fbe17fefec1d94eca8d6d457e6b24fac118f4eaf4939887e7f2b +MD5 4879210b629d01da8038ae6937bbeb92 busybox-1.4.2.ebuild 8244 +RMD160 2c4e5c1924209f76ff2d8f5dd861b05305207c38 busybox-1.4.2.ebuild 8244 +SHA256 e597d21d5146fbe17fefec1d94eca8d6d457e6b24fac118f4eaf4939887e7f2b busybox-1.4.2.ebuild 8244 EBUILD busybox-1.5.0.ebuild 8198 RMD160 c8ab9bade0c1b8dc61c7e3a01cfea7012d5333d9 SHA1 c2d2ec70a086a7c1c3f6a03276c018d055fc3576 SHA256 777a01eb0aa0da37adcc9771c22feff4cd333d8c6b321d53df96a29db6527217 MD5 30e1cf1a19402e97c7f388d664424798 busybox-1.5.0.ebuild 8198 RMD160 c8ab9bade0c1b8dc61c7e3a01cfea7012d5333d9 busybox-1.5.0.ebuild 8198 SHA256 777a01eb0aa0da37adcc9771c22feff4cd333d8c6b321d53df96a29db6527217 busybox-1.5.0.ebuild 8198 -MISC ChangeLog 21221 RMD160 5c7ca6338283f467522bca4c3b7f24cd494a114f SHA1 1bce495daef83a5b867d996f1320fa5abb547e2b SHA256 1a3580abef8e3705539bc9d7fc373b876d6cc84aa572873a785fca7cf6f950a0 -MD5 6db7d4100dd13308b1e11867e71cf62a ChangeLog 21221 -RMD160 5c7ca6338283f467522bca4c3b7f24cd494a114f ChangeLog 21221 -SHA256 1a3580abef8e3705539bc9d7fc373b876d6cc84aa572873a785fca7cf6f950a0 ChangeLog 21221 +MISC ChangeLog 21397 RMD160 0560b0307c0e3ac75438bb82e393a995b411fbf3 SHA1 e61c1590f81658241ad77a4475df726cba93d360 SHA256 e838b9740468f777e7507b15c1e1821e8b4006483340f546e949a045a130443d +MD5 c4d64e385f6a7a61688b83053d7c0bad ChangeLog 21397 +RMD160 0560b0307c0e3ac75438bb82e393a995b411fbf3 ChangeLog 21397 +SHA256 e838b9740468f777e7507b15c1e1821e8b4006483340f546e949a045a130443d ChangeLog 21397 MISC metadata.xml 161 RMD160 77385273ea1d12ed4093a4167307486b74d1cf82 SHA1 aa4b2873e32de89c0b0aeb26b5782f77cb00948e SHA256 a11fdd02015a232398fdf22a20d26a95fc34d44c54513e6b26b6128d0b76122e MD5 8ef75eba39772bdd1a8facc7815dbebb metadata.xml 161 RMD160 77385273ea1d12ed4093a4167307486b74d1cf82 metadata.xml 161 @@ -96,7 +100,7 @@ SHA256 07a1d99470a24ffb961a0d1bdd253fc04e90a28f3e76e10b18c0c844ce54f8cd files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFGBo6m8bi6rjpTunYRAhcKAJ0UnjCx9vlesUe/acYuLsKx+M/XSQCfQ1qy -bFNzuEvyWLrksJ+R69HE/dA= -=dSX+ +iD8DBQFGBqOg8bi6rjpTunYRAtIgAKChMAWt/jXyqAe3J9myFeRMgduBxwCgsGEG +XFIyi/J75pwa+rM+DRLhrXA= +=Rl6P -----END PGP SIGNATURE----- diff --git a/sys-apps/busybox/busybox-1.4.1-r2.ebuild b/sys-apps/busybox/busybox-1.4.1-r2.ebuild index cae36eae3780..4760438af9d4 100644 --- a/sys-apps/busybox/busybox-1.4.1-r2.ebuild +++ b/sys-apps/busybox/busybox-1.4.1-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.4.1-r2.ebuild,v 1.7 2007/03/25 14:42:31 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.4.1-r2.ebuild,v 1.8 2007/03/25 16:29:47 vapier Exp $ inherit eutils flag-o-matic @@ -104,6 +104,7 @@ src_unpack() { # patches go here! epatch "${FILESDIR}"/1.4.0/bb.patch + epatch "${FILESDIR}"/1.4.0/selinux-link.patch epatch "${FILESDIR}"/1.4.0/bin2hex.patch epatch "${FILESDIR}"/1.4.0/data_extract_all.patch diff --git a/sys-apps/busybox/busybox-1.4.2.ebuild b/sys-apps/busybox/busybox-1.4.2.ebuild index 9802968f7d35..6d59ad6c9d2f 100644 --- a/sys-apps/busybox/busybox-1.4.2.ebuild +++ b/sys-apps/busybox/busybox-1.4.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.4.2.ebuild,v 1.1 2007/03/25 14:51:10 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.4.2.ebuild,v 1.2 2007/03/25 16:29:47 vapier Exp $ inherit eutils flag-o-matic @@ -104,6 +104,7 @@ src_unpack() { # patches go here! epatch "${FILESDIR}"/1.4.0/bb.patch + epatch "${FILESDIR}"/1.4.0/selinux-link.patch # work around broken ass powerpc compilers use ppc64 && append-flags -mminimal-toc diff --git a/sys-apps/busybox/files/1.4.0/selinux-link.patch b/sys-apps/busybox/files/1.4.0/selinux-link.patch new file mode 100644 index 000000000000..b2e69e4ac025 --- /dev/null +++ b/sys-apps/busybox/files/1.4.0/selinux-link.patch @@ -0,0 +1,11 @@ +--- busybox-1.4.2/Makefile.flags ++++ busybox-1.4.2/Makefile.flags +@@ -28,4 +28,8 @@ + ifeq ($(CONFIG_STATIC),y) + LDFLAGS += -static + endif ++ ++ifeq ($(CONFIG_SELINUX),y) ++LDFLAGS += -lselinux -lsepol ++endif + #LDFLAGS += -nostdlib -- 2.26.2