Patch from upstream enables the new environment too early for PAM, causing

segfaults in some cases.

(Portage version: 2.0.51.22-r2)

5 files changed, 288 insertions, 11 deletions

diff --git a/sys-apps/shadow/ChangeLog b/sys-apps/shadow/ChangeLog
index 3bb6d846b320..62b8444124bd 100644
--- a/sys-apps/shadow/ChangeLog
+++ b/sys-apps/shadow/ChangeLog
@@ -1,6 +1,14 @@
 # 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.117 2005/08/03 18:56:46 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.118 2005/08/04 10:48:39 azarah Exp $
+
+*shadow-4.0.11.1-r2 (04 Aug 2005)
+
+  04 Aug 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/shadow-4.0.11.1-su-fix-environment.patch,
+  +shadow-4.0.11.1-r2.ebuild:
+  Patch from upstream enables the new environment too early for PAM, causing
+  segfaults in some cases.
 
 *shadow-4.0.11.1-r1 (03 Aug 2005)
 
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index 1c2b204c2c99..cd498a5bb52a 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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
@@ -12,6 +9,7 @@ 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
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 3900a0a49f2e53bc8abde5294575fd6c shadow-4.0.11.1-r2.ebuild 7226
 MD5 20fd2dc35b8671b91e120b90281b4cf3 files/shadow-4.0.5-hack-X-envvars.patch 521
 MD5 d06833980d79d4f001b6064a3f52f938 files/shadow-4.0.7-iswheel.patch 416
 MD5 70b7c7f1725841e335e5f2361fc9ebab files/shadow-4.0.7-nscd-EPIPE-failure.patch 947
@@ -45,9 +43,11 @@ MD5 f9846ea2aeefba54443ef5d6796f0bbc files/shadow-4.0.10-nls-manpages.patch 367
 MD5 46c2be2ed8b26ec007e3ed1f476491d8 files/digest-shadow-4.0.7-r1 66
 MD5 058f760e522ab65e270293003805fe61 files/shadow-4.0.4.1-userdel-missing-brackets.patch 380
 MD5 b8efca60a25e256eebe54c3d0db0760f files/shadow-4.0.4.1-gcc34-xmalloc.patch 361
+MD5 9375147f78a25196b654616c969af9a5 files/digest-shadow-4.0.11.1-r2 69
 MD5 90e2ab53494f677dc23b5137d6e39110 files/shadow-4.0.6-fix-configure.patch 3047
 MD5 636f233fa173a998195016c3808173d4 files/shadow-4.0.5-skey.patch 395
 MD5 fdb23bff28b70bd53f200379c33dd27c files/shadow-4.0.10-nonis.patch 1434
+MD5 f4ae7cde924d5d91ce4010760439b836 files/shadow-4.0.11.1-su-fix-environment.patch 966
 MD5 13cddd2e24cbcaf5164e13f9105c222c files/shadow-4.0.7-perms.patch 1768
 MD5 cef6788bc7c8c5468c1b1f68df77ed9e files/digest-shadow-4.0.4.1-r4 67
 MD5 95f7b8980169e81352229bd548909ea7 files/shadow-4.0.10-fix-configure.patch 579
@@ -71,10 +71,3 @@ MD5 a1fc81dbd0d41face776fba4ca929d8f files/pam.d/su 1142
 MD5 a5721c39446539b751dceae4b054542b files/pam.d/shadow 171
 MD5 8a59937d720a19824db6e4a8cd173a4b files/pam.d/passwd 172
 MD5 5bff4f2134b72dabc4afa5bb296e874d files/pam.d/other 142
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC8RSS1ZcsMnZjRyIRAn+lAKCrytMa0B2s9VsAADoZcuAFmwCe1gCgvwcH
-sgjWn6VCJEuz0HzRJhlS218=
-=o5h9
------END PGP SIGNATURE-----
diff --git a/sys-apps/shadow/files/digest-shadow-4.0.11.1-r2 b/sys-apps/shadow/files/digest-shadow-4.0.11.1-r2
new file mode 100644
index 000000000000..797d6633880d
--- /dev/null
+++ b/sys-apps/shadow/files/digest-shadow-4.0.11.1-r2
@@ -0,0 +1 @@
+MD5 e60b7b16128b9e00576073389a0ff1e6 shadow-4.0.11.1.tar.bz2 1056103
diff --git a/sys-apps/shadow/files/shadow-4.0.11.1-su-fix-environment.patch b/sys-apps/shadow/files/shadow-4.0.11.1-su-fix-environment.patch
new file mode 100644
index 000000000000..cfb2aa692fec
--- /dev/null
+++ b/sys-apps/shadow/files/shadow-4.0.11.1-su-fix-environment.patch
@@ -0,0 +1,36 @@
+The patch from upstream (shadow-4.0.11.1-SUPATH.patch) sets environ too
+early when using PAM, so move it to !USE_PAM.  Also set USER and SHELL.
+
+--- shadow-4.0.11.1/src/su.c	2005-08-04 12:34:35.000000000 +0200
++++ shadow-4.0.11.1.az/src/su.c	2005-08-04 12:38:57.000000000 +0200
+@@ -594,8 +594,6 @@
+ 		addenv ("PATH", cp);
+ 	}
+ 
+-	environ = newenvp;	/* make new environment active */
+-
+ 	if (getenv ("IFS"))	/* don't export user IFS ... */
+ 		addenv ("IFS= \t\n", NULL);	/* ... instead, set a safe IFS */
+ 
+@@ -666,6 +664,8 @@
+ 		exit (1);
+ 	}
+ #else				/* !USE_PAM */
++	environ = newenvp;	/* make new environment active */
++	
+ 	if (!amroot)		/* no limits if su from root */
+ 		setup_limits (&pwent);
+ 
+@@ -676,8 +676,11 @@
+ 	if (fakelogin)
+ 		setup_env (&pwent);
+ #if 1				/* Suggested by Joey Hess. XXX - is this right?  */
+-	else
++	else {
+ 		addenv ("HOME", pwent.pw_dir);
++		addenv ("USER", pwent.pw_name);
++		addenv ("SHELL", pwent.pw_shell);
++	}
+ #endif
+ 
+ 	/*
diff --git a/sys-apps/shadow/shadow-4.0.11.1-r2.ebuild b/sys-apps/shadow/shadow-4.0.11.1-r2.ebuild
new file mode 100644
index 000000000000..77fa391d5163
--- /dev/null
+++ b/sys-apps/shadow/shadow-4.0.11.1-r2.ebuild
@@ -0,0 +1,239 @@
+# 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.11.1-r2.ebuild,v 1.1 2005/08/04 10:48:39 azarah Exp $
+
+inherit eutils libtool toolchain-funcs flag-o-matic
+
+# We should remove this login after pam-0.78 goes stable.
+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/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="nls pam selinux skey nousuid"
+
+RDEPEND=">=sys-libs/cracklib-2.7-r3
+	pam? ( virtual/pam )
+	!pam? ( !sys-apps/pam-login )
+	skey? ( app-admin/skey )
+	selinux? ( sys-libs/libselinux )"
+DEPEND="${RDEPEND}
+	>=sys-apps/portage-2.0.51-r2
+	nls? ( sys-devel/gettext )"
+# We moved /etc/pam.d/login to pam-login
+PDEPEND="pam? ( >=sys-apps/pam-login-4.0.11.1-r2 )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# uclibc support, corrects NIS usage
+	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.
+	# *** This one could be a security hole; disable for now ***
+	#epatch "${FILESDIR}"/${P}-nologin-run-sh.patch
+
+	# don't install manpages if USE=-nls
+	epatch "${FILESDIR}"/${PN}-4.0.10-nls-manpages.patch
+
+	# tweak the default login.defs
+	epatch "${FILESDIR}"/${PN}-4.0.5-login.defs.patch
+
+	# The new configure changes do not detect utmp/logdir properly
+	epatch "${FILESDIR}"/${PN}-4.0.10-fix-configure.patch
+
+	# skeychallenge call needs updating #69741
+	epatch "${FILESDIR}"/shadow-4.0.5-skey.patch
+
+	# Make user/group names more flexible #3485 / #22920
+	epatch "${FILESDIR}"/${PN}-4.0.10-dots-in-usernames.patch
+	epatch "${FILESDIR}"/${PN}-4.0.10-long-groupnames.patch
+
+	# Checked with upstream .. SUPATH and PATH valid again for PAM (bug #101047)
+	epatch "${FILESDIR}"/${PN}-4.0.11.1-SUPATH.patch
+	# Patch from upstream enables the new environment too early for PAM
+	epatch "${FILESDIR}"/${PN}-4.0.11.1-su-fix-environment.patch
+
+	# Some UCLIBC patches
+	epatch "${FILESDIR}"/${PN}-4.0.11.1-ngettext.patch
+	epatch "${FILESDIR}"/${PN}-4.0.11.1-uclibc-missing-l64a.patch
+
+	# lock down setuid perms #47208
+	epatch "${FILESDIR}"/${PN}-4.0.11.1-perms.patch
+
+	elibtoolize
+	epunt_cxx
+
+	# Needed by the UCLIBC patches
+	autoconf
+}
+
+src_compile() {
+	append-ldflags -Wl,-z,now
+	[[ ${CTARGET:-${CHOST}} != ${CHOST} ]] \
+		&& export ac_cv_func_setpgrp_void=yes
+	econf \
+		--disable-desrpc \
+		--with-libcrypt \
+		--with-libcrack \
+		--enable-shared=no \
+		--enable-static=yes \
+		$(use_with pam libpam) \
+		$(use_with skey libskey) \
+		$(use_with selinux) \
+		$(use_enable nls) \
+		|| die "bad configure"
+	emake || die "compile problem"
+}
+
+src_install() {
+	local perms=4711
+	use nousuid && perms=711
+	make DESTDIR=${D} suiduperms=${perms} install || die "install problem"
+	dosym useradd /usr/sbin/adduser
+
+	# Remove libshadow and libmisc; see bug 37725 and the following
+	# comment from shadow's README.linux:
+	#   Currently, libshadow.a is for internal use only, so if you see
+	#   -lshadow in a Makefile of some other package, it is safe to
+	#   remove it.
+	rm -f "${D}"/{,usr/}$(get_libdir)/lib{misc,shadow}.{a,la}
+
+	if use pam; then
+		# These is now shipped with pam-login, and login
+		# had/have a serious root exploit with pam support
+		# enabled.
+		for x in "${D}"/bin/login \
+		         "${D}"/usr/bin/faillog "${D}"/usr/bin/lastlog \
+		         "${D}"/usr/share/man/man1/login.1* \
+		         "${D}"/usr/share/man/man5/login.{access,defs}.5* \
+		         "${D}"/usr/share/man/man5/faillog.5* \
+		         "${D}"/usr/share/man/man8/lastlog.8* \
+		         "${D}"/usr/share/man/man8/faillog.8*; do
+				 [[ -f ${x} ]] && rm -f ${x}
+		done
+	fi
+
+	insinto /etc
+	# Using a securetty with devfs device names added
+	# (compat names kept for non-devfs compatibility)
+	insopts -m0600 ; doins "${FILESDIR}"/securetty
+	use pam || { insopts -m0600 ; doins etc/login.access ; }
+	use pam || { insopts -m0600 ; doins etc/limits ; }
+	# Output arch-specific cruft
+	case $(tc-arch) in
+		ppc64) echo "hvc0" >> "${D}"/etc/securetty
+		       echo "hvsi0" >> "${D}"/etc/securetty;;
+		hppa)  echo "ttyB0" >> "${D}"/etc/securetty;;
+		arm)   echo "ttyFB0" >> "${D}"/etc/securetty;;
+	esac
+
+	# needed for 'adduser -D'
+	insinto /etc/default
+	insopts -m0600
+	doins "${FILESDIR}"/default/useradd
+
+	# move passwd to / to help recover broke systems #64441
+	mv "${D}"/usr/bin/passwd "${D}"/bin/
+	dosym /bin/passwd /usr/bin/passwd
+
+	if use pam ; then
+		local INSTALL_SYSTEM_PAMD="yes"
+
+		# Do not install below pam.d files if we have pam-0.78 or later
+		portageq has_version / '>=sys-libs/pam-0.78' && \
+			INSTALL_SYSTEM_PAMD="no"
+
+		for x in "${FILESDIR}"/pam.d-include/*; do
+			case "${x##*/}" in
+				"login")
+					# We do no longer install this one, as its from
+					# pam-login now.
+					;;
+				"system-auth"|"system-auth-1.1"|"other")
+					# These we only install if we do not have pam-0.78
+					# or later.
+					[ "${INSTALL_SYSTEM_PAMD}" = "yes" ] && [ -f ${x} ] && \
+						dopamd ${x}
+					;;
+				"su")
+					# Disable support for pam_env and pam_wheel on openpam
+					has_version sys-libs/pam && dopamd ${x}
+					;;
+				"su-openpam")
+					has_version sys-libs/openpam && newpamd ${x} su
+					;;
+				*)
+					[ -f ${x} ] && dopamd ${x}
+					;;
+			esac
+		done
+		for x in chage chsh chfn chpasswd newusers \
+		         user{add,del,mod} group{add,del,mod} ; do
+			newpamd "${FILESDIR}"/pam.d-include/shadow ${x}
+		done
+
+		# Only add this one if needed.
+		if [ "${FORCE_SYSTEMAUTH_UPDATE}" = "yes" ]; then
+			newpamd "${FILESDIR}"/pam.d-include/system-auth-1.1 system-auth.new || \
+				die "Failed to install system-auth.new!"
+		fi
+
+		# remove manpages that pam will install for us
+		# and/or don't apply when using pam
+
+		find "${D}"/usr/share/man \
+			'(' -name 'limits.5*' -o -name 'suauth.5*' ')' \
+			-exec rm {} \;
+	else
+		insinto /etc
+		insopts -m0644
+		newins etc/login.defs.linux login.defs
+	fi
+
+	# Remove manpages that are handled by other packages
+	find "${D}"/usr/share/man \
+		'(' -name id.1 -o -name passwd.5 -o -name getspnam.3 ')' \
+		-exec rm {} \;
+
+	cd "${S}"/doc
+	dodoc INSTALL README WISHLIST
+	docinto txt
+	dodoc HOWTO LSM README.* *.txt
+}
+
+pkg_preinst() {
+	rm -f "${ROOT}"/etc/pam.d/system-auth.new
+}
+
+pkg_postinst() {
+	use pam || return 0;
+
+	if [ "${FORCE_SYSTEMAUTH_UPDATE}" = "yes" ]; then
+		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}" ]; then
+			ewarn "Due to a security issue, ${ROOT}etc/pam.d/system-auth "
+			ewarn "is being updated automatically. Your old "
+			ewarn "system-auth will be backed up as:"
+			ewarn
+			ewarn "  ${ROOT}etc/pam.d/system-auth.bak"
+			echo
+
+			cp -a ${ROOT}/etc/pam.d/system-auth \
+				${ROOT}/etc/pam.d/system-auth.bak;
+			mv -f ${ROOT}/etc/pam.d/system-auth.new \
+				${ROOT}/etc/pam.d/system-auth
+			rm -f ${ROOT}/etc/pam.d/._cfg????_system-auth
+		else
+			rm -f ${ROOT}/etc/pam.d/system-auth.new
+		fi
+	fi
+}