Fix for modular X. See bug #115964.

Package-Manager: portage-2.1_pre2

5 files changed, 73 insertions, 4 deletions

diff --git a/x11-misc/sux/ChangeLog b/x11-misc/sux/ChangeLog
index 99d6e2642295..1f13bd064b58 100644
--- a/x11-misc/sux/ChangeLog
+++ b/x11-misc/sux/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/sux
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/sux/ChangeLog,v 1.14 2005/09/17 02:03:25 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/sux/ChangeLog,v 1.15 2005/12/28 18:19:52 nelchael Exp $
+
+*sux-1.0-r3 (28 Dec 2005)
+
+  28 Dec 2005; Krzysiek Pawlik <nelchael@gentoo.org> +files/sux-X11R6.patch,
+  +sux-1.0-r3.ebuild:
+  Fix for modular X. See bug #115964.
 
   17 Sep 2005; Aron Griffis <agriffis@gentoo.org> sux-1.0-r2.ebuild:
   Mark 1.0-r2 stable on alpha
diff --git a/x11-misc/sux/Manifest b/x11-misc/sux/Manifest
index cc117aa64eec..0cebbabbe916 100644
--- a/x11-misc/sux/Manifest
+++ b/x11-misc/sux/Manifest
@@ -1,5 +1,8 @@
-MD5 73306e20ac1b1ef3b82127d6585e9431 metadata.xml 229
-MD5 4c5b95ce46a12915c034434c293fc6f1 ChangeLog 1497
-MD5 b8684da7703eae4ac4194fe4f1e4b821 sux-1.0-r2.ebuild 676
+MD5 c09869fc1aeb45a59785a048bba3363c ChangeLog 1662
 MD5 0f1c62f11288b0303d9c1a9179ec9029 files/digest-sux-1.0-r2 46
+MD5 0f1c62f11288b0303d9c1a9179ec9029 files/digest-sux-1.0-r3 46
 MD5 647cd948286e00f7e1c74e3643471e41 files/sux-1.0-r1.patch 1779
+MD5 21f7d11e49b77d776f4d57dc1fc06cce files/sux-X11R6.patch 887
+MD5 73306e20ac1b1ef3b82127d6585e9431 metadata.xml 229
+MD5 b8684da7703eae4ac4194fe4f1e4b821 sux-1.0-r2.ebuild 676
+MD5 9a331c69f9273271c299abcc141f7708 sux-1.0-r3.ebuild 761
diff --git a/x11-misc/sux/files/digest-sux-1.0-r3 b/x11-misc/sux/files/digest-sux-1.0-r3
new file mode 100644
index 000000000000..df5460f73672
--- /dev/null
+++ b/x11-misc/sux/files/digest-sux-1.0-r3
@@ -0,0 +1 @@
+MD5 f36740d7898914a86f4f32ec6ea1c53c sux 9403
diff --git a/x11-misc/sux/files/sux-X11R6.patch b/x11-misc/sux/files/sux-X11R6.patch
new file mode 100644
index 000000000000..ae45f2280b9c
--- /dev/null
+++ b/x11-misc/sux/files/sux-X11R6.patch
@@ -0,0 +1,24 @@
+--- /usr/bin/sux	2005-12-18 16:45:21.000000000 +0000
++++ sux	2005-12-18 18:54:32.000000000 +0000
+@@ -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 
+   # around.
+-  export TERM="/usr/X11R6/bin/xauth -q remove $DISPLAY 2>/dev/null;"
++  export TERM="/usr/bin/xauth -q remove $DISPLAY 2>/dev/null;"
+   if [ -n "$sux_unix_display" ]
+   then
+-    TERM="$TERM /usr/X11R6/bin/xauth -q remove $sux_unix_display;"
++    TERM="$TERM /usr/bin/xauth -q remove $sux_unix_display;"
+   fi
+ 
+   # Note that there may be more than one cookie to transfer, hence 
+@@ -249,7 +249,7 @@
+     sux_i=`expr $sux_i + 1`
+     if [ $sux_i -eq 9 ]
+     then
+-      TERM="$TERM | /usr/X11R6/bin/xauth nmerge - ;"
++      TERM="$TERM | /usr/bin/xauth nmerge - ;"
+       sux_i=0
+     fi
+   done
diff --git a/x11-misc/sux/sux-1.0-r3.ebuild b/x11-misc/sux/sux-1.0-r3.ebuild
new file mode 100644
index 000000000000..c5ccabc2ea9a
--- /dev/null
+++ b/x11-misc/sux/sux-1.0-r3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/sux/sux-1.0-r3.ebuild,v 1.1 2005/12/28 18:19:52 nelchael Exp $
+
+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="X11"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE=""
+S=${WORKDIR}
+
+DEPEND="sys-apps/debianutils"
+RDEPEND="|| ( x11-apps/xauth
+			  virtual/x11
+			)"
+
+src_unpack() {
+	cp "${DISTDIR}/${A}" .
+	epatch "${FILESDIR}/${P}-r1.patch"
+	epatch "${FILESDIR}/${PN}-X11R6.patch"
+}
+
+src_compile() {
+	echo "nothing to be done"
+}
+
+src_install() {
+	exeinto /usr/bin
+	doexe sux
+}