Grab a fix from upstream cvs to fix `su -c boo` syntax #118342 by Wolfgang Frisch.

Package-Manager: portage-2.1_pre3-r1

5 files changed, 95 insertions, 8 deletions

diff --git a/sys-apps/shadow/ChangeLog b/sys-apps/shadow/ChangeLog
index cc3a167feab9..20e2b5827186 100644
--- a/sys-apps/shadow/ChangeLog
+++ b/sys-apps/shadow/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/shadow
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.124 2006/01/04 02:37:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.125 2006/01/10 00:00:26 vapier Exp $
+
+*shadow-4.0.14-r1 (10 Jan 2006)
+
+  10 Jan 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/shadow-4.0.14-su-cvs.patch, -shadow-4.0.14.ebuild,
+  +shadow-4.0.14-r1.ebuild:
+  Grab a fix from upstream cvs to fix `su -c boo` syntax #118342 by Wolfgang
+  Frisch.
 
 *shadow-4.0.14 (04 Jan 2006)
 
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index 321242eb7395..cc1d511f68ce 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -1,13 +1,13 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 4d9e0bb15e5b9822329578b623b4f944 ChangeLog 23312
+MD5 93af243585769ebe95c7d85964b0f602 ChangeLog 23571
 MD5 6e0bc0211949c624da0ea08d994a7038 files/default/useradd 96
 MD5 9375147f78a25196b654616c969af9a5 files/digest-shadow-4.0.11.1-r1 69
 MD5 9375147f78a25196b654616c969af9a5 files/digest-shadow-4.0.11.1-r2 69
 MD5 cec3e64e953a7f3f96a1e89d73b62899 files/digest-shadow-4.0.12 67
 MD5 2832ae3af9a1f70243c65802597ae825 files/digest-shadow-4.0.13 67
-MD5 2b6cc6ba67673510780c1c4474587e62 files/digest-shadow-4.0.14 67
+MD5 2b6cc6ba67673510780c1c4474587e62 files/digest-shadow-4.0.14-r1 67
 MD5 cef6788bc7c8c5468c1b1f68df77ed9e files/digest-shadow-4.0.4.1-r4 67
 MD5 d8b8542a7bc013011a293732ca504a50 files/digest-shadow-4.0.5-r2 66
 MD5 d8b8542a7bc013011a293732ca504a50 files/digest-shadow-4.0.5-r3 66
@@ -51,6 +51,7 @@ MD5 acdc5a5ac62bfd3495bde25438b49734 files/shadow-4.0.13-long-groupnames.patch 3
 MD5 dfa169094cacf64d4980b0c8d76374d8 files/shadow-4.0.13-nonis.patch 1795
 MD5 223a6d64e1635462fcca48217644cfd0 files/shadow-4.0.13-su-fix-environment.patch 1070
 MD5 ab488dd7dc2c40e1311479470b28d140 files/shadow-4.0.14-nls-manpages.patch 373
+MD5 d31e7b9100b625d9b07638b84062db49 files/shadow-4.0.14-su-cvs.patch 1986
 MD5 afc6edd720c3e704f48553ef9ca8631b files/shadow-4.0.14-su-fix-environment.patch 701
 MD5 b8efca60a25e256eebe54c3d0db0760f files/shadow-4.0.4.1-gcc34-xmalloc.patch 361
 MD5 a99f871c88548d503bad935d2aa6f412 files/shadow-4.0.4.1-nls-manpages.patch 355
@@ -81,7 +82,7 @@ MD5 30c0eb4f3ffb1e531659cf9b69cffa14 shadow-4.0.11.1-r1.ebuild 7084
 MD5 75f60cacddf580b22250ec244749116c shadow-4.0.11.1-r2.ebuild 7215
 MD5 0528fcbf64cb6383f23308d400e3d58a shadow-4.0.12.ebuild 7110
 MD5 4f8bc9907379d3293bae4bcd497b0b60 shadow-4.0.13.ebuild 7156
-MD5 22cd4f39fbd7d880a962d61ef7acab16 shadow-4.0.14.ebuild 7033
+MD5 f45ce9c805646393f218026b5e49126c shadow-4.0.14-r1.ebuild 7125
 MD5 dd33182f75e512eacdf6652e505359eb shadow-4.0.4.1-r4.ebuild 5963
 MD5 bbedc15fb467b91796456cd032199535 shadow-4.0.5-r2.ebuild 5443
 MD5 69b75fc8b3df89e5da434f35f6db5e31 shadow-4.0.5-r3.ebuild 5616
@@ -93,7 +94,7 @@ MD5 314bf4f7ce691287c74208fe9719f146 shadow-4.0.7.ebuild 5582
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDuzUb2+ySkm8kpY0RAiiwAKDERS8qk7Y7LQNsA5O8R+11DpT1LQCfeSl6
-Lrm+ooWNuEHXsPaG8TSZ6uc=
-=DNDQ
+iD8DBQFDwvlx2+ySkm8kpY0RAn8jAKDBpHSq94XbLE/M49DG6EKGtnyvGwCfYjn+
+jlYaUuzqDwJkO+5Wv0a6zNg=
+=eGob
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/shadow/files/digest-shadow-4.0.14 b/sys-apps/shadow/files/digest-shadow-4.0.14-r1
index c8fe2c833299..c8fe2c833299 100644
--- a/sys-apps/shadow/files/digest-shadow-4.0.14
+++ b/sys-apps/shadow/files/digest-shadow-4.0.14-r1
diff --git a/sys-apps/shadow/files/shadow-4.0.14-su-cvs.patch b/sys-apps/shadow/files/shadow-4.0.14-su-cvs.patch
new file mode 100644
index 000000000000..58c2a7d59a44
--- /dev/null
+++ b/sys-apps/shadow/files/shadow-4.0.14-su-cvs.patch
@@ -0,0 +1,75 @@
+grab upstream fix for
+http://bugs.gentoo.org/118342
+
+===================================================================
+RCS file: /cvsroot/shadow/src/su.c,v
+retrieving revision 1.61
+retrieving revision 1.62
+diff -u -r1.61 -r1.62
+--- shadow/src/su.c	2006/01/02 22:37:47	1.61
++++ shadow/src/su.c	2006/01/07 19:38:15	1.62
+@@ -256,6 +256,7 @@
+ 	fprintf (stderr, _("Usage: su [options] [login]\n"
+ 			   "\n"
+ 			   "Options:\n"
++			   "  -c, --command COMMAND		pass COMMAND to the invoked shell\n"
+ 			   "  -h, --help			display this help message and exit\n"
+ 			   "  -, -l, --login		make the shell a login shell\n"
+ 			   "  -m, -p,\n"
+@@ -286,7 +287,7 @@
+ 	uid_t my_uid;
+ 	struct passwd *pw = 0;
+ 	char **envp = environ;
+-	char *shellstr = 0;
++	char *shellstr = 0, *command = 0;
+ 
+ #ifdef USE_PAM
+ 	int ret;
+@@ -328,6 +329,7 @@
+ 		int option_index = 0;
+ 		int c;
+ 		static struct option long_options[] = {
++			{"command", required_argument, NULL, 'c'},
+ 			{"help", no_argument, NULL, 'h'},
+ 			{"login", no_argument, NULL, 'l'},
+ 			{"preserve-environment", no_argument, NULL, 'p'},
+@@ -336,7 +338,7 @@
+ 		};
+ 
+ 		while ((c =
+-			getopt_long (argc, argv, "-hlmps:", long_options,
++			getopt_long (argc, argv, "-c:hlmps:", long_options,
+ 				     &option_index)) != -1) {
+ 			switch (c) {
+ 			case 1:
+@@ -349,6 +351,9 @@
+ 				optind--;
+ 				goto end_su_options;
+ 				break;	/* NOT REACHED */
++			case 'c':
++				command = optarg;
++				break;
+ 			case 'h':
+ 				usage ();
+ 				break;
+@@ -423,6 +428,8 @@
+ 		(void) strcpy (name, "root");
+ 
+ 	doshell = argc == optind;	/* any arguments remaining? */
++	if (command)
++		doshell = 0;
+ 
+ 	/*
+ 	 * Get the user's real name. The current UID is used to determine
+@@ -832,6 +839,11 @@
+ 	if (!doshell) {
+ 		/* Position argv to the remaining arguments */
+ 		argv += optind;
++		if (command) {
++			argv -= 2;
++			argv[0] = "-c";
++			argv[1] = command;
++		}
+ 		/*
+ 		 * Use the shell and create an argv
+ 		 * with the rest of the command line included.
diff --git a/sys-apps/shadow/shadow-4.0.14.ebuild b/sys-apps/shadow/shadow-4.0.14-r1.ebuild
index 99c2c4aae2a6..cc6811a3a3df 100644
--- a/sys-apps/shadow/shadow-4.0.14.ebuild
+++ b/sys-apps/shadow/shadow-4.0.14-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.14.ebuild,v 1.1 2006/01/04 02:37:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.14-r1.ebuild,v 1.1 2006/01/10 00:00:26 vapier Exp $
 
 inherit eutils libtool toolchain-funcs flag-o-matic
 
@@ -58,6 +58,9 @@ src_unpack() {
 	# Patch from upstream enables the new environment too early for PAM
 	epatch "${FILESDIR}"/${PN}-4.0.14-su-fix-environment.patch
 
+	# Patch from upstream fixes `su -c ls` #118342
+	epatch "${FILESDIR}"/${P}-su-cvs.patch
+
 	# Some UCLIBC patches
 	epatch "${FILESDIR}"/${PN}-4.0.11.1-uclibc-missing-l64a.patch