summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schlemmer <azarah@gentoo.org>2002-12-03 20:33:01 +0000
committerMartin Schlemmer <azarah@gentoo.org>2002-12-03 20:33:01 +0000
commit3d9c664ec7cc992cb164f42db86e448a8f8ef7cd (patch)
treeb22016db4f01906c0d8bb3ffcd760a73699ac5b2 /sys-apps/shadow
parentRemoved the unstable multibyte char patch code. (diff)
downloadgentoo-2-3d9c664ec7cc992cb164f42db86e448a8f8ef7cd.tar.gz
gentoo-2-3d9c664ec7cc992cb164f42db86e448a8f8ef7cd.tar.bz2
gentoo-2-3d9c664ec7cc992cb164f42db86e448a8f8ef7cd.zip
fix system-auth.new being installed
Diffstat (limited to 'sys-apps/shadow')
-rw-r--r--sys-apps/shadow/ChangeLog4
-rw-r--r--sys-apps/shadow/shadow-4.0.3-r2.ebuild5
2 files changed, 5 insertions, 4 deletions
diff --git a/sys-apps/shadow/ChangeLog b/sys-apps/shadow/ChangeLog
index f990d2f7bbf6..efec6bc1eefa 100644
--- a/sys-apps/shadow/ChangeLog
+++ b/sys-apps/shadow/ChangeLog
@@ -1,12 +1,14 @@
# ChangeLog for sys-apps/shadow
# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.18 2002/12/03 07:35:59 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.19 2002/12/03 20:33:01 azarah Exp $
03 Dec 2002; Martin Schlemmer <azarah@gentoo.org> shadow-4.0.3-r2.ebuild :
Mark as stable. Update pam.d/su to use pam_filelist.so if uncommented.
This can be used as a type of /etc/suauth. Should close bug #4210.
+ Fix an issue where /etc/pam.d/system-auth.new was still being installed.
+
*shadow-4.0.3-r1 (20 Oct 2002)
20 Oct 2002; Martin Schlemmer <azarah@gentoo.org> shadow-4.0.3-r2.ebuild :
diff --git a/sys-apps/shadow/shadow-4.0.3-r2.ebuild b/sys-apps/shadow/shadow-4.0.3-r2.ebuild
index 70308f605ce4..b5ce47d55497 100644
--- a/sys-apps/shadow/shadow-4.0.3-r2.ebuild
+++ b/sys-apps/shadow/shadow-4.0.3-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2002 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.3-r2.ebuild,v 1.3 2002/12/03 07:35:59 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.3-r2.ebuild,v 1.4 2002/12/03 20:33:01 azarah Exp $
IUSE=""
@@ -141,7 +141,6 @@ src_install() {
}
pkg_postinst() {
- [ "${FORCE_SYSTEMAUTH_UPDATE}" != "yes" ] && return 0
ewarn "Due to a security issue, ${ROOT}etc/pam.d/system-auth "
ewarn "is being updated automatically. Your old "
@@ -152,7 +151,7 @@ pkg_postinst() {
local CHECK1="$(md5sum ${ROOT}/etc/pam.d/system-auth | cut -d ' ' -f 1)"
local CHECK2="$(md5sum ${ROOT}/etc/pam.d/system-auth.new | cut -d ' ' -f 1)"
- if [ "${CHECK1}" != "${CHECK2}" ];
+ if [ "${CHECK1}" != "${CHECK2}" -a "${FORCE_SYSTEMAUTH_UPDATE}" = "yes" ]
then
cp -a ${ROOT}/etc/pam.d/system-auth \
${ROOT}/etc/pam.d/system-auth.bak;