summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2008-02-24 11:02:09 +0000
committerMike Frysinger <vapier@gentoo.org>2008-02-24 11:02:09 +0000
commit6f2d9336157491ecc35ec2beec52f62a88e41264 (patch)
treec839a9b816f9926e7d614cf0748506bb063c68d7 /sys-apps/shadow
parentbump to 0.8.3, fix bug #168870 (diff)
downloadhistorical-6f2d9336157491ecc35ec2beec52f62a88e41264.tar.gz
historical-6f2d9336157491ecc35ec2beec52f62a88e41264.tar.bz2
historical-6f2d9336157491ecc35ec2beec52f62a88e41264.zip
Make sure we respect libdir for path to cracklib dicts.
Package-Manager: portage-2.2_pre2
Diffstat (limited to 'sys-apps/shadow')
-rw-r--r--sys-apps/shadow/ChangeLog7
-rw-r--r--sys-apps/shadow/Manifest16
-rw-r--r--sys-apps/shadow/files/shadow-4.0.17-login.defs.patch2
-rw-r--r--sys-apps/shadow/shadow-4.0.18.1-r1.ebuild7
-rw-r--r--sys-apps/shadow/shadow-4.0.18.2-r2.ebuild5
-rw-r--r--sys-apps/shadow/shadow-4.0.18.2.ebuild7
6 files changed, 26 insertions, 18 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/Manifest b/sys-apps/shadow/Manifest
index 1dc2088629f5..37988d4176a8 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -24,20 +24,20 @@ AUX shadow-4.0.13-long-groupnames.patch 398 RMD160 a1fdef5d2c87579838332558624f8
AUX shadow-4.0.13-nonis.patch 1795 RMD160 ed7ece3f676283f24daa4d7506a0ed73a5bb4e77 SHA1 c2f1472da3865370201d1c43e26db86da7fdd6c5 SHA256 4a4bbed01da45aa7217e12a070e0a86c70a4c9049bddaa881d404a362e5df145
AUX shadow-4.0.15-uclibc-missing-l64a.patch 1354 RMD160 6d35c4ddad876edacdd41be056fa8abd567ae802 SHA1 27012d25d41a19dcafab1fb45921bbf7aa12885d SHA256 37ac2cdea64f849e0cf9e92ccefeab05b0466541268fb4844f18a94c377c8514
AUX shadow-4.0.16-fix-useradd-usergroups.patch 3319 RMD160 22c4f916fe1f9da00b0d587b9976491426142f98 SHA1 b08cb5129717c040479f287e0c7851da27b77483 SHA256 b9428435b51341f23be148fa6921408b595dd965a02d1ba731d1ff5b9caba786
-AUX shadow-4.0.17-login.defs.patch 367 RMD160 e538f7942dc58b9f5b2f40ba47730aa22b91be20 SHA1 cda5c26df5df855f6fabdad6bb1a3526cb44929e SHA256 cefe0ab1203f436b0c23ce4cde3133fdcc8146d3616542af4bbc69415acf18b0
+AUX shadow-4.0.17-login.defs.patch 372 RMD160 055add143d873be6a57dbd1f8620b7e45268b5b3 SHA1 2db43522c24931ef6eacc00fca1c982ee9148bb9 SHA256 c23c744f959f3ea8f8aab23652f439803a5167b3a50fa3ef3ca5d4c1f12a9101
AUX shadow-4.0.18.1-useradd-usermod.patch 1081 RMD160 65bb85eba9f2e08f4febeea97d522d515f7d9fb7 SHA1 c13cf8b5c566e129d4fc62ad3ac08b6c856c992e SHA256 ca34bc36424585c9f1d64c6b4201ce62c964773c7c6c16faecdd2610ad655cfb
AUX shadow-4.0.18.2-useradd.patch 489 RMD160 8b4b6f9e83a1da6152ae588355709d0df3deb0b6 SHA1 8a829fa144597a0806a136bc275e484c6029dd61 SHA256 9069a1a025e1dd96d3a3b4e5e759f55b297a34a2943f27e160864c090390a8c4
DIST shadow-4.0.18.1.tar.bz2 1516296 RMD160 05a1f609370371de3112479cb6a98d966c45fa6c SHA1 1a30458e9db05560bfc82529048bd5d60b45cf9b SHA256 3da368d87a94270c3db4bae6ff634b8db5dcbc8822d554dbfea955a676c1ab12
DIST shadow_4.0.18.2.orig.tar.gz 2501791 RMD160 f13d5c06bc88eea8d851a8c396110b2e96d1bb39 SHA1 c3426cddc8605ddb7ff55fdc231dc191ecc46989 SHA256 0b3cbfb32200cacd8544734d227d0a576642baf573f972f046bbbae457145cae
-EBUILD shadow-4.0.18.1-r1.ebuild 5914 RMD160 c5323f6fd8b05ffc826d444e12dd62f9780c987c SHA1 edf2c72b3ecd2f004cfa6f95ff430a930ce3561f SHA256 780da8cb7536fe971f803c2371d40ecff6eb7ec3d7541f084b1ace8570f9ed9c
-EBUILD shadow-4.0.18.2-r2.ebuild 5151 RMD160 f730df1f1bb5b0764e80028dfed666785e6ba178 SHA1 4cf2a9d39eb1e9028f809a1da218abb6c65f8807 SHA256 e797bc10e88364e3330493a6ff8fca194aad4dde3ffddede30405d2adde8a1c9
-EBUILD shadow-4.0.18.2.ebuild 5124 RMD160 955b0e83690bc5fab79e5d0376c16bc99e501120 SHA1 2ddd5b0ba21078685fee9f19e532f262ea264bf3 SHA256 ce6134223c39bf097470722e4031553ad121dae089cf9291c61022f4e1a11a84
-MISC ChangeLog 32738 RMD160 5086a286b251d4678268821c3cc389cd3567b38f SHA1 de332d591633557e54cb3e08f7dae69cd2bc3fd4 SHA256 505a12517283e5427ea2d9f6cf8afd41fe0e29288f8196d679a3279d4bcde1a7
+EBUILD shadow-4.0.18.1-r1.ebuild 5981 RMD160 3d55c06ab5a08051d9fcc14d79caf13f23bef699 SHA1 617a0087d5a949bee90135dc4aba0702bfd938b6 SHA256 efb797e3aa03063f0fc1d020daae30e401d5a3ad42c317235d153e52eb40ebb4
+EBUILD shadow-4.0.18.2-r2.ebuild 5215 RMD160 a8b1a78dfaa6182e76ab94576fdf907f1ac91e44 SHA1 68f26a57d13bcff59efc1cddce4fa06b0a14ee9f SHA256 850d092f5641d7b9c58359d8fada64c96335c6f180fcc90d7f8c2dc830bdcba4
+EBUILD shadow-4.0.18.2.ebuild 5191 RMD160 6716d64cee6e46c8cfd9bf84be0d7c2e1eee1684 SHA1 8023121f304efd1d0ab872d858cdf5e1c2bd837c SHA256 2681f509f51a1d5f01658c60616c43f5e80d75c5621bfe288051cedffbd850be
+MISC ChangeLog 32964 RMD160 9ef78de6a94d08b4fb4448c3a27c8b2ce2876440 SHA1 00012cff5880af387e274bfc827377eb645d1388 SHA256 b4b099104cda997c9cc60772a5e313033bf647cfce165f28604ee2542532c145
MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.7 (GNU/Linux)
-iD8DBQFHu25+AiZjviIA2XgRAsKgAJ9fjQlJp7yjNlnMxoBVzNq/yIFENACfXP8h
-0poV7qdPuwsdjq9eeW1VrhE=
-=YjQa
+iD8DBQFHwU63j9hvisErhMIRAhNFAJ9ecNbhHicjoRrxlwALKL0CjSucXQCfb38G
+4tpCsNBNFO06qhRJ60C1MH4=
+=BAwG
-----END PGP SIGNATURE-----
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