Remove -l option to exec(1p) for POSIX conformance (e.g. dash, bug #473200). Clean up metadata.xml.

Package-Manager: portage-2.2.0/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

7 files changed, 70 insertions, 17 deletions

diff --git a/x11-misc/sux/ChangeLog b/x11-misc/sux/ChangeLog
index cd12e150f65e..19de9acfa76a 100644
--- a/x11-misc/sux/ChangeLog
+++ b/x11-misc/sux/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-misc/sux
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/sux/ChangeLog,v 1.26 2013/06/26 20:03:59 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/sux/ChangeLog,v 1.27 2013/08/14 12:35:14 jer Exp $
+
+*sux-1.0-r4 (14 Aug 2013)
+
+  14 Aug 2013; Jeroen Roovers <jer@gentoo.org> +sux-1.0-r4.ebuild,
+  +files/sux-1.0-dash.patch, files/sux-1.0-r1.patch, files/sux-X11R6.patch,
+  metadata.xml:
+  Remove -l option to exec(1p) for POSIX conformance (e.g. dash, bug #473200).
+  Clean up metadata.xml.
 
   26 Jun 2013; Patrick Kursawe <phosphan@gentoo.org> metadata.xml:
   Dropping maintainership, see bug #473480
diff --git a/x11-misc/sux/Manifest b/x11-misc/sux/Manifest
index 09bf8cd2241e..bb6cb7dd82e7 100644
--- a/x11-misc/sux/Manifest
+++ b/x11-misc/sux/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX sux-1.0-r1.patch 1768 SHA256 cd76fec60519188a8073d8399242ef91312fb193b8bc5341f902e1c3b0bd048d SHA512 a407bc803105da9493668d2f6f3d9244de518dcea8847a5e4f9b2bf83ecc9c39df4a9e97b09637bccaf8fc8c4f4c36d47d22ff4fb797b611a5528d801384475c WHIRLPOOL 3a51e0b65d9d10ba75449a2d20f6e89ad551993204e4bcc44508c541a7b5ee89c2578df8d802570fc38bf8578f70818dadf7e01a0bec528ef7c6fe07c25c5e9d
-AUX sux-X11R6.patch 882 SHA256 87b67fb878700897052bd95f6a2038ec373b3df46d3b104005533104644a8146 SHA512 d9c0800875acbebb2fce65bfb8de946602fca085636c6ab73267f38b21db8b89c2b5de4b0304f4028d5b0df86bcef432a40e38e068af776f3d4291d631505fd3 WHIRLPOOL f7afdb75bc1051bd0e97fee6f1dd5c00e6e3199b59ebfd00b4dd363d896cb4f9a62291af1167ec905734f4f2f6e906bd049021c2c933592efafbce75400f3d7f
-DIST sux 9403 SHA256 98a2e66d105e06f95d67312f40f928fb2885084ff46fad248c6d6cd25904efd1
+AUX sux-1.0-dash.patch 279 SHA256 cb08ae70ffd49afacbc3443f7028a5547e9b36acb9bd154438e1215bf5bc8c27 SHA512 e8a0f44b1fa04fddedc6ea617c03da2c5c2ac5ea98b5fc60a8fbbed47c669b2cd8fc31e19d969f22f374c08ee80f5f108882eba0ca0ef64d69fe2339cdde8133 WHIRLPOOL 570b46111d9a77a6e218aa4d5325dd034dca2bb0c1e1e4faa3afec5fef5831a4b44b3b5c2492ef0859e868d584aeebcc2f847d431a8537abc627dfd24f5aa9b5
+AUX sux-1.0-r1.patch 1695 SHA256 b8edc5e943064c0d8552a0bcb280d4744be5b60f65f9bb17530bee6c9860ff9a SHA512 10e6b34aa1eb26bb51e33534a9c6c32ffb72c8b4eab86aec13087d915f49eda0bd6d6b6ec393ec8a1ec2f170f7fe00557019a235a10ae08f3d15f5a3c105f26f WHIRLPOOL 955ac0f52f376c5f5dca0dfe53f2e701ccf5501d2fb1aac0fb24f08cc2ca28eddb39fcfa518977d415cb9bf68110065caa607a43aa66c74b52f89da128401df2
+AUX sux-X11R6.patch 810 SHA256 30bb882e4703349ef99aaee1c28aeff1448b3e3d1b6c748f499388ff5c6010eb SHA512 5f34860c054c0eca0e7d2626cac3ff449c52310993628b756cebb96d589c9acb7b6fc726cb303d97f17233362bf7ed8c68fb836be529ef05aa1a7d9de71256a5 WHIRLPOOL 3cec14d16d0104733b195436b0e84d22392de8793f9e03f19b43f4f4490a8498d385f4a7d2ae380334fcb584e10935cca5da5c3d09b40b4bffa53ced8c3d8a2a
+DIST sux 9403 SHA256 98a2e66d105e06f95d67312f40f928fb2885084ff46fad248c6d6cd25904efd1 SHA512 cf1afb736299e349a14837f89f0feb6a5beb1af35be8e6baef74d03e7278a9d9c331d2759ec21e5cf8b43197734f96464b82ff5904968428bc43a45d2ad0c598 WHIRLPOOL b0ef6fb0eb2752c99c53e7059d9e2830a336b84d98b67ef56d2fe758fd328fcd271a245bfbad8fd7cf1410c57757a8831c4edbe8b71c32f6dbfbac44d5020cc8
 EBUILD sux-1.0-r3.ebuild 740 SHA256 d41f8d731dd79dcc87a75262e94b85fbbb477169c29100b33815eb7a60427c90 SHA512 f2b32509011b886f401458daa27825430bc25545fbe3b7abe9e3d8b45561aac07f00b064705df7af8265f534b9107c37c0a2627ff4b16e921ae44afe23cbdab1 WHIRLPOOL 74935ce7ac80040c364a16e0f7c174f42bf0c7800a83b887f39fb540df45e109f8398ec628d9417c3ac9dcc9b841aef567ab340d12eb510531e4b44e0c687c31
-MISC ChangeLog 2786 SHA256 775274e5c277d730573f851d0c03d93d7390927be850452c2d2339775e9fec89 SHA512 78d624fe91b5a97089829099c73f094740db23beca22e38872fa7a4afd5e1bf3f7739bc8fe324c6f1d8607621280f3f5d6e96d64eafd90fb5068bfde681a8543 WHIRLPOOL c5ef19757ba7c30ac6d2f6778d8561d12e192afcc32bda196043fe11d9938b0c7567d46694f849e904210b6c725760f431d87968787913d47b8e5e76245847f9
-MISC metadata.xml 238 SHA256 252be3f47a480567d991e666bff45f3661ba711ca95e3c18d08d417868f09631 SHA512 4d402a6e70d25113bdfaf0ea558c75ea8395cba27027471d3d12a5bb0ab50a5a06f2d0b3e1d9b71a64fb52c3a5387257159c9fdb89912ee0f8373e4c09c1d2a4 WHIRLPOOL 4b3aec973451a9f6582b455584c1c88c3c4999c3391b6ef3867d971c18a51e24f4682b732f9468c56ed37d248968e1c9dbb4eaae8cbb5566b67e06b4d8dc6599
+EBUILD sux-1.0-r4.ebuild 710 SHA256 e5b0975c9526e1f2fac2852c4b00cce06e27409df996b1f00b05cb9b698a6b10 SHA512 c3ec3a1810be29371b67e75fa730d9bf4ae66404ae46900839d2c54874063b41b8ddebe412519cf796d1c78a6eb2ecbef144ff24b29d7fff3a7cfe4761ccaa3f WHIRLPOOL 141367e3b6b20a9f47aceda88478ea785b186218f43002b2d3ea7ea93b6a95f3a9094db972e30c6510029fd1e9b79cc8071eddfce1f7056987ed13438fa99e21
+MISC ChangeLog 3072 SHA256 31fee68368697eb6c61060fba318acb99a1c68fa3dc5b36f3afa2e90ce20ed73 SHA512 ec8d0597c45a0ecfe80d34be736f79b058b537520f68161f0c7e7c10a4969272344be23ea22ca6114295edd71ba3ee14a7d07d7d70b689b53f77c505649acabb WHIRLPOOL c8be4a3a19d6bfb5349854cc48f07a56d13485ef5f57d4d52f07e61267f6015485892dab4982e2bc36096cac761838fdd0f5d5cb6e86462e9eab86fb0cae9230
+MISC metadata.xml 165 SHA256 d7da9ed29b7afb87ac00580d48a49d248f89c92269e9a7791782dc72f4490aec SHA512 243d1391ff105563c9bf0f75b1eab39434cfb69e084e81cebf6e4eb3aa391cd7e36210b2c3808895bf876dd761eb72330144af2a81e467453c60b37ccdf0e63c WHIRLPOOL f63c52b91f14d86972c7de46b5a50b2d47822a1347d627e05845027ff75299dc79a135988141e1dec933925c4e0213287ef6933ed76ed2fd3fcdff3757c1766b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlHLSUUACgkQZQ9z0E7r6GMKKwD/YCu5UUfW5l0Z02Rp95wbEN3G
-n7tP/Hl2oM0ShTQi6qoA/0+ebrPO5BDP65CEcD3KbhdoIYW9+GZOT7rzmZlbgtIA
-=tl0J
+iEYEAREIAAYFAlILeYMACgkQVWmRsqeSphOqZACeJOJhoJubSgeCwNqCZDhgTvcc
+x9wAnicjIEPmFNKsft35GYxlaMOdxJSh
+=L9yj
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/sux/files/sux-1.0-dash.patch b/x11-misc/sux/files/sux-1.0-dash.patch
new file mode 100644
index 000000000000..a2ba00e0be05
--- /dev/null
+++ b/x11-misc/sux/files/sux-1.0-dash.patch
@@ -0,0 +1,12 @@
+--- a/sux
++++ b/sux
+@@ -302,7 +302,8 @@
+   then
+     if [ "$sux_got_minus" = "1" ]
+     then
+-      sux_cmd="sh -c \"exec -l \$SHELL\""
++      # exec -l does not work in dash (Gentoo bug #473200)
++      sux_cmd="sh -c \"exec \$SHELL\""
+     else
+       sux_cmd="\$SHELL"
+     fi
diff --git a/x11-misc/sux/files/sux-1.0-r1.patch b/x11-misc/sux/files/sux-1.0-r1.patch
index 8adfc8aa413e..5be78fd7b7d2 100644
--- a/x11-misc/sux/files/sux-1.0-r1.patch
+++ b/x11-misc/sux/files/sux-1.0-r1.patch
@@ -1,5 +1,5 @@
---- a/sux 2001-08-22 18:09:06.000000000 +0200
-+++ b/sux  2003-04-28 16:25:09.000000000 +0200
+--- a/sux
++++ b/sux
 @@ -29,7 +29,6 @@
  # are on NFS. In such a case, change the default to copy-cookies.
  sux_root_cookie_transfer="c"
diff --git a/x11-misc/sux/files/sux-X11R6.patch b/x11-misc/sux/files/sux-X11R6.patch
index ecfead7fdd5c..6b345a646965 100644
--- a/x11-misc/sux/files/sux-X11R6.patch
+++ b/x11-misc/sux/files/sux-X11R6.patch
@@ -1,5 +1,5 @@
---- a/sux	2005-12-18 16:45:21.000000000 +0000
-+++ b/sux	2005-12-18 18:54:32.000000000 +0000
+--- a/sux
++++ b/sux
 @@ -229,10 +229,10 @@
    # Remove the old cookies. They may cause trouble if we transfer only one 
    # cookie, e.g. an MIT cookie, and there's still a stale XDM cookie hanging 
diff --git a/x11-misc/sux/metadata.xml b/x11-misc/sux/metadata.xml
index 497c310b0dcd..40838bc36783 100644
--- a/x11-misc/sux/metadata.xml
+++ b/x11-misc/sux/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>desktop-misc</herd>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/sux/sux-1.0-r4.ebuild b/x11-misc/sux/sux-1.0-r4.ebuild
new file mode 100644
index 000000000000..46be4e92b9fa
--- /dev/null
+++ b/x11-misc/sux/sux-1.0-r4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/sux/sux-1.0-r4.ebuild,v 1.1 2013/08/14 12:35:14 jer Exp $
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="\"su\" wrapper which transfers X credentials"
+HOMEPAGE="http://fgouget.free.fr/sux/sux-readme.shtml"
+SRC_URI="http://fgouget.free.fr/sux/sux"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~sparc ~x86"
+IUSE=""
+
+S="${WORKDIR}"
+
+RDEPEND="x11-apps/xauth"
+
+src_unpack() {
+	cp "${DISTDIR}"/${A} .
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-r1.patch \
+		"${FILESDIR}"/${PN}-X11R6.patch \
+		"${FILESDIR}"/${P}-dash.patch
+}
+
+src_install() {
+	dobin sux
+}