Add a patch to fix sudo segfault (bug #273785).

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 90 insertions, 5 deletions

diff --git a/sys-auth/pam_mount/ChangeLog b/sys-auth/pam_mount/ChangeLog
index 4dc9e43035e6..887677137aa0 100644
--- a/sys-auth/pam_mount/ChangeLog
+++ b/sys-auth/pam_mount/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-auth/pam_mount
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_mount/ChangeLog,v 1.32 2009/05/24 18:58:01 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_mount/ChangeLog,v 1.33 2009/06/15 13:31:56 flameeyes Exp $
+
+*pam_mount-1.25-r1 (15 Jun 2009)
+
+  15 Jun 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  +pam_mount-1.25-r1.ebuild, +files/pam_mount-1.25-nullsetenv.patch:
+  Add a patch to fix sudo segfault (bug #273785).
 
 *pam_mount-1.25 (24 May 2009)
 
diff --git a/sys-auth/pam_mount/Manifest b/sys-auth/pam_mount/Manifest
index bc7244c2c99d..7f02bfac7ff0 100644
--- a/sys-auth/pam_mount/Manifest
+++ b/sys-auth/pam_mount/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX pam_mount-1.25-nullsetenv.patch 1090 RMD160 4a1af10e0cfcd51db8553b9ff59d0b2657841c44 SHA1 5a2827472d7f5b12b9567fe7fd20d344bed69042 SHA256 1031986c4fd3eaf6cec957209d7b433ab21bab1ba2dcc7db0e0ac001541bbcdb
 DIST pam_mount-1.20.tar.bz2 325392 RMD160 20f01bf58f12f8c87f209f10c467b58d101714a3 SHA1 fe476566b45ddd06b3e2b654ea93228a93ea09c5 SHA256 6ec02ad0c939175a8432efb614b062ee090c3d43c73d9e9eded3433691990761
 DIST pam_mount-1.21.tar.bz2 325614 RMD160 1195ce2ee263a7cc53973b1d25339847cf476eb5 SHA1 1778c430d1a2a096165031614b39b73e41997d9e SHA256 f5254500b715cf07c5f08ca2127905999c6d3a0f8d1740b73bb6d9a0d3bea0b0
 DIST pam_mount-1.22.tar.bz2 326034 RMD160 b7b27234e0c2685476c7cda2e6360fd91af9006d SHA1 46dab50820beb75dacd045d66593c7bee6556b51 SHA256 e626b6faab394822a469178acb1e59bbbb63c4a56edf9c50172684a84ccbce02
@@ -10,13 +11,14 @@ EBUILD pam_mount-1.20.ebuild 941 RMD160 15a4073f733ceeb30978ccb78ba418a81c657c8c
 EBUILD pam_mount-1.21.ebuild 941 RMD160 f8443305f08466dd232eadd1d188026845df6f80 SHA1 9aab0a325f99d8cf07661e8bc828e299066c4936 SHA256 af5b695f1796059e0769ea3c666faed9294a54eec2d0dae237772caa84da8eb3
 EBUILD pam_mount-1.22.ebuild 941 RMD160 dc27ecc56fa37e25d3b81fc0a8723718297714e7 SHA1 483845ea8a910ef54a9cc5b8d5fe4f078815775d SHA256 e8c71daf61abb9ea986d77d31596c4ff41ec916d3622a26198172148b1cd3334
 EBUILD pam_mount-1.24.ebuild 941 RMD160 b3850794ccc54be04cf3bbd590a76e5c5888715d SHA1 11ab96f79352e261f20df54ca1494c5b5c6e17a6 SHA256 727487e3ef877718c70ba5b6bfb9cda20d2d9afbb7146d73107535e8bc8a4b8a
+EBUILD pam_mount-1.25-r1.ebuild 1042 RMD160 17678e8ad97b2a188a5221ed60f8a3a721918ecd SHA1 cd43d5b12a5b385091c7a043df77017db2b7ecf6 SHA256 777c7ec9f8696fee1c749c71fbda9f810866f072e901c878f0d5d953b4861151
 EBUILD pam_mount-1.25.ebuild 941 RMD160 69f7118a37aa8e45f2ca655c32b8fc7ac816291e SHA1 7cfafc875deb961898218c68d6021e21f52ee2c4 SHA256 a010766a3cd30dce02f1c5b3e206c8fc3dc65745db8f596ef33d60a68e251fe6
-MISC ChangeLog 4409 RMD160 afc74175fdbea1ae3920b357cc26d3af5d3339dd SHA1 f7902ab052314dbbb968c042b7abf8189626e9fd SHA256 3b9321fee9744fb40e319ffbd9b59d6ab6d8ab163a3e44c11f01e5dda9ce2512
+MISC ChangeLog 4623 RMD160 0fade504a416bec85c487a35662d2ea112b7442a SHA1 a83983a1f9036b43586ef8bf6e3214661c95a2ad SHA256 93c7b8fc37703ac07fee2ecf03158d991b54206b3d6b5a90cca9f9ed5bc3ef08
 MISC metadata.xml 217 RMD160 3b01d5dab901ee93217f72b711954d3cccbb1717 SHA1 e304788b60dd2cf214d360a21d267e8635474d98 SHA256 2f5dfc1eb79d2d9ee02663da6e1449f499c3a37b7f4cc2391e18d7789a314669
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkoZmL0ACgkQr2QksT29OyDluACgjS9LsbEOLif/mhvWeGPHtcge
-AnEAniLYyCPQ3qMFmmy2wqyJEnTqel4j
-=KhN3
+iEYEARECAAYFAko2TWIACgkQAiZjviIA2XjxcgCgqyEEJqeVW+mSnNmi5UIqc9Ec
+ZOIAmgKc4kBqTb9sWy2x3ZRE/SWIyWiQ
+=ZuCz
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/pam_mount/files/pam_mount-1.25-nullsetenv.patch b/sys-auth/pam_mount/files/pam_mount-1.25-nullsetenv.patch
new file mode 100644
index 000000000000..fe41263e87a6
--- /dev/null
+++ b/sys-auth/pam_mount/files/pam_mount-1.25-nullsetenv.patch
@@ -0,0 +1,34 @@
+Index: pam_mount-1.25/src/pam_mount.c
+===================================================================
+--- pam_mount-1.25.orig/src/pam_mount.c
++++ pam_mount-1.25/src/pam_mount.c
+@@ -445,7 +445,7 @@ PAM_EXTERN EXPORT_SYMBOL int pam_sm_open
+ {
+ 	struct vol *vol;
+ 	int ret;
+-	unsigned int krb5_set;
++	char *krb5;
+ 	char *system_authtok = NULL;
+ 	const void *tmp;
+ 	int getval;
+@@ -461,8 +461,9 @@ PAM_EXTERN EXPORT_SYMBOL int pam_sm_open
+ 	 * Get the Kerberos CCNAME so we can make it available to the
+ 	 * mount command later on.
+ 	 */
+-	krb5_set = getenv("KRB5CCNAME") != NULL;
+-	if (setenv("KRB5CCNAME", pam_getenv(pamh, "KRB5CCNAME"), 1) < 0)
++	krb5 = pam_getenv(pamh, "KRB5CCNAME");
++	if (krb5 != NULL &&
++	    setenv("KRB5CCNAME", krb5, 1) < 0)
+ 		l0g("KRB5CCNAME setenv failed\n");
+ 
+ 	/* Store initialized config as PAM data */
+@@ -539,7 +540,7 @@ PAM_EXTERN EXPORT_SYMBOL int pam_sm_open
+ 		}
+ 	}
+ 	memset(system_authtok, 0, strlen(system_authtok));
+-	if (krb5_set)
++	if (krb5 != NULL)
+ 		unsetenv("KRB5CCNAME");
+ 	modify_pm_count(&Config, Config.user, "1");
+ 	envpath_restore();
diff --git a/sys-auth/pam_mount/pam_mount-1.25-r1.ebuild b/sys-auth/pam_mount/pam_mount-1.25-r1.ebuild
new file mode 100644
index 000000000000..ade68faca21d
--- /dev/null
+++ b/sys-auth/pam_mount/pam_mount-1.25-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_mount/pam_mount-1.25-r1.ebuild,v 1.1 2009/06/15 13:31:56 flameeyes Exp $
+
+inherit multilib eutils
+
+DESCRIPTION="A PAM module that can mount volumes for a user session"
+HOMEPAGE="http://pam-mount.sourceforge.net"
+SRC_URI="mirror://sourceforge/pam-mount/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="crypt"
+DEPEND=">=sys-libs/pam-0.99
+	dev-libs/openssl
+	>=sys-libs/libhx-2.7
+	dev-libs/libxml2
+	dev-util/pkgconfig"
+RDEPEND=">=sys-libs/pam-0.99
+	dev-libs/openssl
+	>=sys-libs/libhx-2.7
+	dev-libs/libxml2
+	>=sys-fs/cryptsetup-1.0.5
+	sys-process/lsof"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-nullsetenv.patch
+}
+
+src_compile() {
+	econf --with-slibdir="/$(get_libdir)" || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc doc/*.txt || die "dodoc failed"
+}