diff options
| author |   Chris PeBenito <pebenito@gentoo.org> | 2006-10-24 00:12:29 +0000 |
|---|---|---|
| committer | Chris PeBenito <pebenito@gentoo.org> | 2006-10-24 00:12:29 +0000 |
| commit | a601d9c6bf899cfeb11ca6683701b03f9ebd8f45 (patch) | |
| tree | 298ba1457e5fc306f8c629607d1038ee8821f93a /sys-apps/policycoreutils | |
| parent | Stable on x86, bug #152334. (diff) | |
| download | historical-a601d9c6bf899cfeb11ca6683701b03f9ebd8f45.tar.gz historical-a601d9c6bf899cfeb11ca6683701b03f9ebd8f45.tar.bz2 historical-a601d9c6bf899cfeb11ca6683701b03f9ebd8f45.zip | |
Fix glibc handling.
Package-Manager: portage-2.1.2_pre3-r4
Diffstat (limited to 'sys-apps/policycoreutils')
| -rw-r--r-- | sys-apps/policycoreutils/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/policycoreutils/Manifest | 22 | ||||
| -rw-r--r-- | sys-apps/policycoreutils/policycoreutils-1.30.30.ebuild | 8 |
3 files changed, 22 insertions, 14 deletions
diff --git a/sys-apps/policycoreutils/ChangeLog b/sys-apps/policycoreutils/ChangeLog index aa5fc43c3c21..d641b1ab608f 100644 --- a/sys-apps/policycoreutils/ChangeLog +++ b/sys-apps/policycoreutils/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/policycoreutils # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.60 2006/10/09 23:38:08 pebenito Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.61 2006/10/24 00:12:29 pebenito Exp $ + + 24 Oct 2006; Chris PeBenito <pebenito@gentoo.org> + policycoreutils-1.30.30.ebuild: + Fix glibc handling. 09 Oct 2006; Chris PeBenito <pebenito@gentoo.org> policycoreutils-1.30.30.ebuild: diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest index be8a13be2bd2..d96e3ba8a74c 100644 --- a/sys-apps/policycoreutils/Manifest +++ b/sys-apps/policycoreutils/Manifest @@ -27,14 +27,14 @@ EBUILD policycoreutils-1.30-r1.ebuild 3790 RMD160 a5d030579d974fdc436e54a6c4013b MD5 52161ed8912516a1000af85a24be9c2d policycoreutils-1.30-r1.ebuild 3790 RMD160 a5d030579d974fdc436e54a6c4013b532d550566 policycoreutils-1.30-r1.ebuild 3790 SHA256 a9dd240a0efe0ff6db43f23665a5a307ff78a56c15b2441667fb96b6ee05c977 policycoreutils-1.30-r1.ebuild 3790 -EBUILD policycoreutils-1.30.30.ebuild 3628 RMD160 8581cdf831ef3d13c337209c1bb1c0eb9dff6c4d SHA1 8ce8e4b8a1dbb86e25d05a9101b9b26bdf4a2e2f SHA256 437b92489bddb0adb57368a819d55b72f14cc84545b7fe2e436b528212ab28e6 -MD5 9015440f153df5e74b33a65bfb48f698 policycoreutils-1.30.30.ebuild 3628 -RMD160 8581cdf831ef3d13c337209c1bb1c0eb9dff6c4d policycoreutils-1.30.30.ebuild 3628 -SHA256 437b92489bddb0adb57368a819d55b72f14cc84545b7fe2e436b528212ab28e6 policycoreutils-1.30.30.ebuild 3628 -MISC ChangeLog 9563 RMD160 954af8b3bf7892dbd9a104fac5e69ef376396bb2 SHA1 8917f2fd91fd6bea34cb043792f8d00c9a2d92a1 SHA256 b843cf692041335edc2ce37c5d5f9912f405968e6acb23211ad28c93351b68e0 -MD5 d3a2b1bcf8c6ab9a2bb8bfd94062a34a ChangeLog 9563 -RMD160 954af8b3bf7892dbd9a104fac5e69ef376396bb2 ChangeLog 9563 -SHA256 b843cf692041335edc2ce37c5d5f9912f405968e6acb23211ad28c93351b68e0 ChangeLog 9563 +EBUILD policycoreutils-1.30.30.ebuild 3783 RMD160 e11d6c458ac88863903e8c132c641305cf20d2fc SHA1 1999133af5758d7f9e622c68ba1b81a517c2226d SHA256 48410fb0a69956dcdf60a6a37ace03245c5b59fd154dd613cdf9c9cc9ce120db +MD5 f226d39d917611b3b9e2e43889d1814a policycoreutils-1.30.30.ebuild 3783 +RMD160 e11d6c458ac88863903e8c132c641305cf20d2fc policycoreutils-1.30.30.ebuild 3783 +SHA256 48410fb0a69956dcdf60a6a37ace03245c5b59fd154dd613cdf9c9cc9ce120db policycoreutils-1.30.30.ebuild 3783 +MISC ChangeLog 9672 RMD160 dcb9315c4772fca01613316b2f82753c7b9a9672 SHA1 b440b93b272fc25b478b8cf51579a3b9e5120232 SHA256 f898b4aa338356c33929fa58cb0e32d7033dab7e066ea7936def31080f24d91f +MD5 f779d828d3712d37de8949c7549d77a6 ChangeLog 9672 +RMD160 dcb9315c4772fca01613316b2f82753c7b9a9672 ChangeLog 9672 +SHA256 f898b4aa338356c33929fa58cb0e32d7033dab7e066ea7936def31080f24d91f ChangeLog 9672 MISC metadata.xml 836 RMD160 421e492e89112f8436f8c5535aa2340cc8795929 SHA1 91c830f5358b9786f2b61e1967214f49212c4e3a SHA256 1d14250f52ecf63b67bed2289833d6f1ff2eba3cad9a80794b356e747917cdb7 MD5 2eeb1df30e87ba2861eddbdc34a48bb8 metadata.xml 836 RMD160 421e492e89112f8436f8c5535aa2340cc8795929 metadata.xml 836 @@ -51,7 +51,7 @@ SHA256 5c07727b9aad2847f471cfa3495f007e004569ff2108962c3449a62e02533ff2 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFFKt0E3gmyzsILbxIRAgRUAJ95+eWylTNjQckE6cc2GbHwBL8UAgCgtgpx -qX5NVlRuZaTGak9fq7aw3kw= -=8VJO +iD8DBQFFPVpL3gmyzsILbxIRAn17AJ97JfLiGST1yQ7gbJFDYuqwUFCpgQCgqZH2 +A2Vh5Vfo1yOTM+zYf+DcSds= +=XXJy -----END PGP SIGNATURE----- diff --git a/sys-apps/policycoreutils/policycoreutils-1.30.30.ebuild b/sys-apps/policycoreutils/policycoreutils-1.30.30.ebuild index 2fc15c5f0e76..9c870ea47336 100644 --- a/sys-apps/policycoreutils/policycoreutils-1.30.30.ebuild +++ b/sys-apps/policycoreutils/policycoreutils-1.30.30.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/policycoreutils/policycoreutils-1.30.30.ebuild,v 1.3 2006/10/09 23:38:08 pebenito Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-1.30.30.ebuild,v 1.4 2006/10/24 00:12:29 pebenito Exp $ IUSE="nls pam" @@ -22,7 +22,6 @@ SLOT="0" KEYWORDS="alpha amd64 mips ppc sparc x86" RDEPEND=">=sys-libs/libselinux-${SELNX_VER} - >=sys-libs/glibc-2.4 pam? ( sys-libs/pam ) =sys-libs/libsemanage-${SEMNG_VER}*" @@ -67,6 +66,11 @@ src_unpack() { sed -i -e '/fixfiles/d' ${S}/scripts/Makefile \ || die "fixfiles sed 2 failed" + if ! has_version '>=sys-libs/glibc-2.4'; then + ewarn "Glibc 2.4 or newer is not available. Disabling restorecond." + sed -i -e '/^SUBDIRS/s/restorecond//' ${S}/Makefile + fi + if ! useq pam; then # disable pam sed -i -e s/-lpam/-lcrypt/ -e s/-lpam_misc// -e s/-DUSE_PAM// \ |