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 | f45bf698bd3789f0cd349e85c9e4525aa4c9ac7b (patch) | |
| tree | a7d727d8bad31ed7384b76f044b7629b9f6a38da /sys-apps/policycoreutils | |
| parent | Stable on x86, bug #152334. (diff) | |
| download | gentoo-2-f45bf698bd3789f0cd349e85c9e4525aa4c9ac7b.tar.gz gentoo-2-f45bf698bd3789f0cd349e85c9e4525aa4c9ac7b.tar.bz2 gentoo-2-f45bf698bd3789f0cd349e85c9e4525aa4c9ac7b.zip | |
Fix glibc handling.
(Portage version: 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/policycoreutils-1.30.30.ebuild | 8 |
2 files changed, 11 insertions, 3 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/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// \ |