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

(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key A792A613)

6 files changed, 59 insertions, 8 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/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
+}