diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2008-02-24 11:02:09 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2008-02-24 11:02:09 +0000 |
| commit | d76bed5467c20174ac1d02f45953d745e14ed3ec (patch) | |
| tree | ece531d52636269304828319be5e5e4946f5a4c2 | |
| parent | bump to 0.8.3, fix bug #168870 (diff) | |
| download | gentoo-2-d76bed5467c20174ac1d02f45953d745e14ed3ec.tar.gz gentoo-2-d76bed5467c20174ac1d02f45953d745e14ed3ec.tar.bz2 gentoo-2-d76bed5467c20174ac1d02f45953d745e14ed3ec.zip | |
Make sure we respect libdir for path to cracklib dicts.
(Portage version: 2.2_pre2)
| -rw-r--r-- | sys-apps/shadow/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-apps/shadow/files/shadow-4.0.17-login.defs.patch | 2 | ||||
| -rw-r--r-- | sys-apps/shadow/shadow-4.0.18.1-r1.ebuild | 7 | ||||
| -rw-r--r-- | sys-apps/shadow/shadow-4.0.18.2-r2.ebuild | 5 | ||||
| -rw-r--r-- | sys-apps/shadow/shadow-4.0.18.2.ebuild | 7 |
5 files changed, 18 insertions, 10 deletions
diff --git a/sys-apps/shadow/ChangeLog b/sys-apps/shadow/ChangeLog index e69c5f517967..9b81ecc39575 100644 --- a/sys-apps/shadow/ChangeLog +++ b/sys-apps/shadow/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-apps/shadow # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.182 2008/02/20 00:04:08 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.183 2008/02/24 11:02:08 vapier Exp $ + + 24 Feb 2008; Mike Frysinger <vapier@gentoo.org> + files/shadow-4.0.17-login.defs.patch, shadow-4.0.18.1-r1.ebuild, + shadow-4.0.18.2.ebuild, shadow-4.0.18.2-r2.ebuild: + Make sure we respect libdir for path to cracklib dicts. 20 Feb 2008; Diego Pettenò <flameeyes@gentoo.org> shadow-4.0.18.2-r2.ebuild: diff --git a/sys-apps/shadow/files/shadow-4.0.17-login.defs.patch b/sys-apps/shadow/files/shadow-4.0.17-login.defs.patch index 26beb12be417..03eb731fa968 100644 --- a/sys-apps/shadow/files/shadow-4.0.17-login.defs.patch +++ b/sys-apps/shadow/files/shadow-4.0.17-login.defs.patch @@ -8,7 +8,7 @@ +SU_WHEEL_ONLY yes @@ -210 +210 @@ -CRACKLIB_DICTPATH /var/cache/cracklib/cracklib_dict -+CRACKLIB_DICTPATH /usr/lib/cracklib_dict ++CRACKLIB_DICTPATH /usr/@LIBDIR@/cracklib_dict @@ -227 +227 @@ -LOGIN_RETRIES 5 +LOGIN_RETRIES 3 diff --git a/sys-apps/shadow/shadow-4.0.18.1-r1.ebuild b/sys-apps/shadow/shadow-4.0.18.1-r1.ebuild index 79741bba6ad0..5c54db52992d 100644 --- a/sys-apps/shadow/shadow-4.0.18.1-r1.ebuild +++ b/sys-apps/shadow/shadow-4.0.18.1-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.18.1-r1.ebuild,v 1.11 2007/09/27 14:02:05 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.18.1-r1.ebuild,v 1.12 2008/02/24 11:02:08 vapier Exp $ -inherit eutils libtool toolchain-funcs autotools pam +inherit eutils libtool toolchain-funcs autotools pam multilib DESCRIPTION="Utilities to deal with user accounts" HOMEPAGE="http://shadow.pld.org.pl/" @@ -37,6 +37,7 @@ src_unpack() { # tweak the default login.defs epatch "${FILESDIR}"/${PN}-4.0.17-login.defs.patch + sed -i "s:@LIBDIR@:$(get_libdir):" etc/login.defs || die # Make user/group names more flexible #3485 / #22920 epatch "${FILESDIR}"/${PN}-4.0.13-dots-in-usernames.patch diff --git a/sys-apps/shadow/shadow-4.0.18.2-r2.ebuild b/sys-apps/shadow/shadow-4.0.18.2-r2.ebuild index 5cd3db25569a..c272689a22a0 100644 --- a/sys-apps/shadow/shadow-4.0.18.2-r2.ebuild +++ b/sys-apps/shadow/shadow-4.0.18.2-r2.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.18.2-r2.ebuild,v 1.2 2008/02/20 00:04:08 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.18.2-r2.ebuild,v 1.3 2008/02/24 11:02:08 vapier Exp $ -inherit eutils libtool toolchain-funcs autotools pam +inherit eutils libtool toolchain-funcs autotools pam multilib DESCRIPTION="Utilities to deal with user accounts" HOMEPAGE="http://shadow.pld.org.pl/ http://packages.qa.debian.org/s/shadow.html" @@ -40,6 +40,7 @@ src_unpack() { # tweak the default login.defs epatch "${FILESDIR}"/${PN}-4.0.17-login.defs.patch + sed -i "s:@LIBDIR@:$(get_libdir):" etc/login.defs || die # Make user/group names more flexible #3485 / #22920 epatch "${FILESDIR}"/${PN}-4.0.13-dots-in-usernames.patch diff --git a/sys-apps/shadow/shadow-4.0.18.2.ebuild b/sys-apps/shadow/shadow-4.0.18.2.ebuild index 754bc2ef088b..90a262aff971 100644 --- a/sys-apps/shadow/shadow-4.0.18.2.ebuild +++ b/sys-apps/shadow/shadow-4.0.18.2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.18.2.ebuild,v 1.3 2007/11/04 19:07:08 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.18.2.ebuild,v 1.4 2008/02/24 11:02:08 vapier Exp $ -inherit eutils libtool toolchain-funcs autotools pam +inherit eutils libtool toolchain-funcs autotools pam multilib DESCRIPTION="Utilities to deal with user accounts" HOMEPAGE="http://shadow.pld.org.pl/ http://packages.qa.debian.org/s/shadow.html" @@ -37,6 +37,7 @@ src_unpack() { # tweak the default login.defs epatch "${FILESDIR}"/${PN}-4.0.17-login.defs.patch + sed -i "s:@LIBDIR@:$(get_libdir):" etc/login.defs || die # Make user/group names more flexible #3485 / #22920 epatch "${FILESDIR}"/${PN}-4.0.13-dots-in-usernames.patch |