summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys-apps/shadow/ChangeLog5
-rw-r--r--sys-apps/shadow/Manifest10
-rw-r--r--sys-apps/shadow/shadow-4.0.10.ebuild23
3 files changed, 21 insertions, 17 deletions
diff --git a/sys-apps/shadow/ChangeLog b/sys-apps/shadow/ChangeLog
index be46fc416a52..d9b40fe253e6 100644
--- a/sys-apps/shadow/ChangeLog
+++ b/sys-apps/shadow/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/shadow
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.108 2005/07/08 13:16:40 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.109 2005/07/08 13:40:12 azarah Exp $
+
+ 08 Jul 2005; Martin Schlemmer <azarah@gentoo.org> shadow-4.0.10.ebuild:
+ Add NSCD patches from 4.0.7-r3 as well.
*shadow-4.0.7-r3 (08 Jul 2005)
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index 3adb8c3c3c44..b4c0aaeacf19 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -5,8 +5,8 @@ MD5 2581b4daddefcf73a30d69ac42fdfd1a shadow-4.0.5-r3.ebuild 5614
MD5 db870979ea0f600d0bd8137520e2251a shadow-4.0.4.1-r4.ebuild 5961
MD5 a51d02eb155feb33913816239bb3cf57 shadow-4.0.7.ebuild 5602
MD5 80b1199a3fef2d1758404dbc1836c5ac shadow-4.0.7-r3.ebuild 7026
-MD5 fd457a31c8dee4d4e21c4d25472cdac6 ChangeLog 20424
-MD5 94f729277cd41cc1d45c29cb7e0d7391 shadow-4.0.10.ebuild 6709
+MD5 e1fcced0011ab6f7b5be53ef4f1e1464 ChangeLog 20541
+MD5 e0d109d5c6707ccdb7273480194634c4 shadow-4.0.10.ebuild 6752
MD5 ac3c5c29460f248d06d4ef83c96ca912 shadow-4.0.7-r1.ebuild 6602
MD5 fad39eceb7fd04f2805c6acc16c59d57 shadow-4.0.5-r2.ebuild 5440
MD5 06049e2959c62c88aee32422a37bf07f shadow-4.0.6-r1.ebuild 5641
@@ -67,7 +67,7 @@ MD5 5bff4f2134b72dabc4afa5bb296e874d files/pam.d/other 142
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
-iD8DBQFCzn3F1ZcsMnZjRyIRArXSAJ9ockWxlKXxaFS8u/GtuHijRU6sowCfcNt8
-CetSIKw/YUqlhK4oq3eEN+E=
-=FPlL
+iD8DBQFCzoK/1ZcsMnZjRyIRAtD1AJ4+Lyh38alDCB46d5MiFKqqy93p8wCgrmkI
+DyQ+HI3bKwK9BORXjwStbaA=
+=og30
-----END PGP SIGNATURE-----
diff --git a/sys-apps/shadow/shadow-4.0.10.ebuild b/sys-apps/shadow/shadow-4.0.10.ebuild
index 8645132c20f6..718655a84785 100644
--- a/sys-apps/shadow/shadow-4.0.10.ebuild
+++ b/sys-apps/shadow/shadow-4.0.10.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.10.ebuild,v 1.2 2005/07/02 15:49:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.10.ebuild,v 1.3 2005/07/08 13:40:12 azarah Exp $
inherit eutils libtool toolchain-funcs flag-o-matic
@@ -9,7 +9,7 @@ FORCE_SYSTEMAUTH_UPDATE="no"
DESCRIPTION="Utilities to deal with user accounts"
HOMEPAGE="http://shadow.pld.org.pl/"
-SRC_URI="ftp://ftp.pld.org.pl/software/shadow/${P}.tar.bz2"
+SRC_URI="ftp://ftp.pld.org.pl/software/${PN}/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
@@ -32,7 +32,7 @@ src_unpack() {
cd "${S}"
# uclibc support, corrects NIS usage
- epatch "${FILESDIR}"/shadow-4.0.10-nonis.patch
+ epatch "${FILESDIR}"/${PN}-4.0.10-nonis.patch
# If su should not simulate a login shell, use '/bin/sh' as shell to enable
# running of commands as user with /bin/false as shell, closing bug #15015.
@@ -40,22 +40,23 @@ src_unpack() {
#epatch "${FILESDIR}"/${P}-nologin-run-sh.patch
# don't install manpages if USE=-nls
- epatch "${FILESDIR}"/shadow-4.0.10-nls-manpages.patch
+ epatch "${FILESDIR}"/${PN}-4.0.10-nls-manpages.patch
# tweak the default login.defs
- epatch "${FILESDIR}"/shadow-4.0.5-login.defs.patch
+ epatch "${FILESDIR}"/${PN}-4.0.5-login.defs.patch
# The new configure changes do not detect utmp/logdir properly
- epatch "${FILESDIR}"/shadow-4.0.10-fix-configure.patch
+ epatch "${FILESDIR}"/${PN}-4.0.10-fix-configure.patch
# Make user/group names more flexible #3485 / #22920
- epatch "${FILESDIR}"/shadow-4.0.10-dots-in-usernames.patch
- epatch "${FILESDIR}"/shadow-4.0.10-long-groupnames.patch
+ epatch "${FILESDIR}"/${PN}-4.0.10-dots-in-usernames.patch
+ epatch "${FILESDIR}"/${PN}-4.0.10-long-groupnames.patch
# Newer glibc's have a different nscd socket location #74395
- sed -i \
- -e '/_PATH_NSCDSOCKET/s:/var/run/.nscd_socket:/var/run/nscd/socket:' \
- lib/nscd.c || die "sed nscd socket"
+ epatch "${FILESDIR}"/${PN}-4.0.7-nscd-socket-path.patch
+
+ # Fix EPIPE failure when writing to nscd, bug #80413
+ epatch "${FILESDIR}"/${PN}-4.0.7-nscd-EPIPE-failure.patch
elibtoolize
epunt_cxx