Restore DISPLAY/XAUTHORITY env passing hack for now #69925.

5 files changed, 221 insertions, 5 deletions

diff --git a/sys-apps/shadow/ChangeLog b/sys-apps/shadow/ChangeLog
index db648d9906a0..66043d3da460 100644
--- a/sys-apps/shadow/ChangeLog
+++ b/sys-apps/shadow/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/shadow
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.83 2004/11/03 17:58:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.84 2004/11/03 23:48:02 vapier Exp $
+
+*shadow-4.0.5-r2 (03 Nov 2004)
+
+  03 Nov 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/shadow-4.0.5-hack-X-envvars.patch, +shadow-4.0.5-r2.ebuild:
+  Restore DISPLAY/XAUTHORITY env passing hack for now #69925.
 
 *shadow-4.0.5-r1 (03 Nov 2004)
 
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index e76e1cfcc7cc..da3af2aaa61b 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -1,11 +1,12 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 29fe43bd59a344aefa4c8fca5dcaf34b ChangeLog 15560
+MD5 a049afea7ebeef097e2135dff49e5183 ChangeLog 15774
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 f967b8c89896d0101831a6548ce94a52 shadow-4.0.5.ebuild 5099
 MD5 23ef7363bf5ffa1d0f3343ff2a618e5d shadow-4.0.4.1-r4.ebuild 5943
 MD5 226400fa60e88f85f3185e36b4aab178 shadow-4.0.5-r1.ebuild 5235
+MD5 27d4d171439107657a372bedb843c23e shadow-4.0.5-r2.ebuild 5476
 MD5 cef6788bc7c8c5468c1b1f68df77ed9e files/digest-shadow-4.0.4.1-r4 67
 MD5 2d2faa6b9a837f9319de52a780485743 files/securetty 243
 MD5 058f760e522ab65e270293003805fe61 files/shadow-4.0.4.1-userdel-missing-brackets.patch 380
@@ -22,6 +23,8 @@ MD5 7becc41b4f7264483ee3ff0ca8277084 files/shadow-4.0.4.1-passwd-typo.patch 438
 MD5 b8efca60a25e256eebe54c3d0db0760f files/shadow-4.0.4.1-gcc34-xmalloc.patch 361
 MD5 391991f50203bd8b7738474051befdee files/shadow-4.0.5-remove-else.patch 531
 MD5 020e030c2d09b206e88cf9051ced6244 files/shadow-4.0.4.1-nonis.patch 1504
+MD5 20fd2dc35b8671b91e120b90281b4cf3 files/shadow-4.0.5-hack-X-envvars.patch 521
+MD5 d8b8542a7bc013011a293732ca504a50 files/digest-shadow-4.0.5-r2 66
 MD5 6e0bc0211949c624da0ea08d994a7038 files/default/useradd 96
 MD5 51b0337bd261f6ed5e53af5dc196431a files/pam.d/system-auth 499
 MD5 a5311bbc9c1fc378a6b0bfb3ca1b2394 files/pam.d/login 431
@@ -33,7 +36,7 @@ MD5 1baa646400c4a596290e9d4b9e1c09b2 files/pam.d/system-auth-1.1 491
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBiSDIHTu7gpaalycRAg/9AKDLP3Bx9NQCloIfMQOKOUIacokHMQCfenyE
-BSR/prLQwI8qSq/RCtqQiho=
-=fDXR
+iD8DBQFBiW5fHTu7gpaalycRApPCAKC8bLaK0qHA4H445q2ZRuMCwiKqWACfSj8e
+ZLAlougUqS38mvchWjultqg=
+=RfXk
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/shadow/files/digest-shadow-4.0.5-r2 b/sys-apps/shadow/files/digest-shadow-4.0.5-r2
new file mode 100644
index 000000000000..00b3a379adf1
--- /dev/null
+++ b/sys-apps/shadow/files/digest-shadow-4.0.5-r2
@@ -0,0 +1 @@
+MD5 cca17a4843a3b5b324a5398faf81c3b4 shadow-4.0.5.tar.bz2 1012361
diff --git a/sys-apps/shadow/files/shadow-4.0.5-hack-X-envvars.patch b/sys-apps/shadow/files/shadow-4.0.5-hack-X-envvars.patch
new file mode 100644
index 000000000000..e8672886b07b
--- /dev/null
+++ b/sys-apps/shadow/files/shadow-4.0.5-hack-X-envvars.patch
@@ -0,0 +1,18 @@
+--- shadow-4.0.5/src/su.c.orig	2004-11-03 18:25:17.663531472 -0500
++++ shadow-4.0.5/src/su.c	2004-11-03 18:25:24.256529184 -0500
+@@ -359,7 +359,6 @@
+ 		 */
+ 		if ((cp = getenv ("TERM")))
+ 			addenv ("TERM", cp);
+-#ifndef USE_PAM
+ 		/*
+ 		 * Also leave DISPLAY and XAUTHORITY if present, else
+ 		 * pam_xauth will not work.
+@@ -368,7 +367,6 @@
+ 			addenv ("DISPLAY", cp);
+ 		if ((cp = getenv ("XAUTHORITY")))
+ 			addenv ("XAUTHORITY", cp);
+-#endif				/* !USE_PAM */
+ 	} else {
+ 		while (*envp)
+ 			addenv (*envp++, NULL);
diff --git a/sys-apps/shadow/shadow-4.0.5-r2.ebuild b/sys-apps/shadow/shadow-4.0.5-r2.ebuild
new file mode 100644
index 000000000000..2e269a1da275
--- /dev/null
+++ b/sys-apps/shadow/shadow-4.0.5-r2.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.5-r2.ebuild,v 1.1 2004/11/03 23:48:02 vapier Exp $
+
+inherit eutils libtool gnuconfig flag-o-matic
+
+FORCE_SYSTEMAUTH_UPDATE="no"
+SELINUX_PATCH="shadow-4.0.4.1-selinux.diff"
+
+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"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86"
+IUSE="pam selinux nls skey"
+
+RDEPEND=">=sys-libs/cracklib-2.7-r3
+	pam? ( >=sys-libs/pam-0.75-r4 )
+	!pam? ( !virtual/login )
+	skey? ( app-admin/skey )
+	selinux? ( sys-libs/libselinux )"
+DEPEND="${DEPEND}
+	>=sys-apps/portage-2.0.51-r2
+	nls? ( sys-devel/gettext )"
+#this requires a newer portage (>2.0.51-r2)
+#PROVIDE="!pam? ( virtual/login )"
+
+pkg_preinst() {
+	rm -f ${ROOT}/etc/pam.d/system-auth.new
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# uclibc support, corrects NIS usage
+	epatch ${FILESDIR}/shadow-4.0.4.1-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}/shadow-${PV}-nls-manpages.patch
+
+	# tweak the default login.defs
+	epatch ${FILESDIR}/shadow-${PV}-login.defs.patch
+
+	# fix small graphical typo in passwd.1 #68150
+	epatch ${FILESDIR}/shadow-4.0.4.1-passwd-typo.patch
+
+	# skeychallenge call needs updating #69741
+	epatch ${FILESDIR}/shadow-${PV}-skey.patch
+
+	# remove an extra else #69212
+	epatch ${FILESDIR}/shadow-${PV}-remove-else.patch
+
+	# restore DISPLAY/XAUTHORITY propogation even with USE=pam
+	# so that users have a chance to migrate to new system #69925
+	epatch ${FILESDIR}/shadow-${PV}-hack-X-envvars.patch
+	[ "${PVR}" != "4.0.5-r2" ] && die "remove the X envvar hack!"
+
+	# Allows shadow configure detect newer systems properly
+	gnuconfig_update
+	elibtoolize
+}
+
+src_compile() {
+	append-ldflags -Wl,-z,now
+	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() {
+	make DESTDIR=${D} install || die "install problem"
+	dosym useradd /usr/sbin/adduser
+
+	# lock down setuid perms #47208
+	fperms go-r /bin/su /usr/bin/ch{fn,sh,age} \
+		/usr/bin/{expiry,newgrp,passwd,gpasswd} || die "fperms"
+
+	# 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}/lib/lib{misc,shadow}.{a,la}
+
+	# Do not install this login, but rather the one from
+	# pam-login, as this one have a serious root exploit
+	# with pam support enabled.
+	use pam && rm ${D}/bin/login
+
+	insinto /etc
+	# Using a securetty with devfs device names added
+	# (compat names kept for non-devfs compatibility)
+	insopts -m0600 ; doins ${FILESDIR}/securetty
+	insopts -m0600 ; doins etc/login.access
+	insopts -m0644 ; doins etc/limits
+
+	# 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
+		insinto /etc/pam.d ; insopts -m0644
+		for x in ${FILESDIR}/pam.d/*; do
+			[ -f ${x} ] && doins ${x}
+		done
+		cd ${FILESDIR}/pam.d
+		# Make sure /etc/pam.d/system-auth is the new version ..
+		mv ${D}/etc/pam.d/system-auth-1.1 ${D}/etc/pam.d/system-auth
+		newins system-auth-1.1 system-auth.new || die
+		for x in chage chsh chfn chpasswd newusers \
+		         user{add,del,mod} group{add,del,mod} ; do
+			newins shadow ${x}
+		done
+
+		# remove manpages that pam will install for us
+		# and/or don't apply when using pam
+
+		find ${D}/usr/share/man \
+			'(' -name 'login.1' -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
+
+	# ttyB0 is the PDC software console
+	if [ "${ARCH}" = "hppa" ]
+	then
+		echo "ttyB0" >> ${D}/etc/securetty
+	fi
+}
+
+pkg_postinst() {
+	use pam || return 0;
+	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}" -a "${FORCE_SYSTEMAUTH_UPDATE}" = "yes" ]
+	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
+}