Fixing HOME problem (bug 34867)

5 files changed, 93 insertions, 4 deletions

diff --git a/x11-misc/sux/ChangeLog b/x11-misc/sux/ChangeLog
index 851425197c8e..3d4dcbb4a2e5 100644
--- a/x11-misc/sux/ChangeLog
+++ b/x11-misc/sux/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/sux
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/sux/ChangeLog,v 1.3 2003/06/24 07:39:25 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/sux/ChangeLog,v 1.4 2003/12/02 09:12:10 phosphan Exp $
+
+*sux-1.0-r1 (02 Dec 2003)
+
+  02 Dec 2003; Patrick Kursawe <phosphan@gentoo.org> sux-1.0-r1.ebuild:
+  Should have a correct $HOME now.
 
   24 Jun 2003; Patrick Kursawe <phosphan@gentoo.org> sux-1.0.ebuild:
   Declared stable
diff --git a/x11-misc/sux/Manifest b/x11-misc/sux/Manifest
index d7c6ca9d74b0..6b68892d2ba8 100644
--- a/x11-misc/sux/Manifest
+++ b/x11-misc/sux/Manifest
@@ -1,7 +1,7 @@
-MD5 411737f2ab1f8d27c25cf2633f4d3150 sux-1.0-r1.ebuild 664
+MD5 2ff678c9b3320a7b5a7b59aac3368854 sux-1.0-r1.ebuild 667
 MD5 78a500abb1b40281f998cb2b3c0bf361 sux-1.0.ebuild 645
-MD5 935e4f0cafdbaf531877fd3522e09142 ChangeLog 579
-MD5 b742040acaeddc3798a21739bd59e8aa metadata.xml 224
+MD5 2f77334e27fec94ecef4965e852733f8 ChangeLog 714
+MD5 73306e20ac1b1ef3b82127d6585e9431 metadata.xml 229
 MD5 647cd948286e00f7e1c74e3643471e41 files/sux-1.0-r1.patch 1779
 MD5 7f1bcc869672e2722ab392e07bcd9983 files/sux-1.0.patch 1064
 MD5 0f1c62f11288b0303d9c1a9179ec9029 files/digest-sux-1.0 46
diff --git a/x11-misc/sux/files/digest-sux-1.0-r1 b/x11-misc/sux/files/digest-sux-1.0-r1
new file mode 100644
index 000000000000..df5460f73672
--- /dev/null
+++ b/x11-misc/sux/files/digest-sux-1.0-r1
@@ -0,0 +1 @@
+MD5 f36740d7898914a86f4f32ec6ea1c53c sux 9403
diff --git a/x11-misc/sux/files/sux-1.0-r1.patch b/x11-misc/sux/files/sux-1.0-r1.patch
new file mode 100644
index 000000000000..28c09f2663ed
--- /dev/null
+++ b/x11-misc/sux/files/sux-1.0-r1.patch
@@ -0,0 +1,52 @@
+--- sux 2001-08-22 18:09:06.000000000 +0200
++++ /usr/X11R6/bin/sux  2003-04-28 16:25:09.000000000 +0200
+@@ -29,7 +29,6 @@
+ # are on NFS. In such a case, change the default to copy-cookies.
+ sux_root_cookie_transfer="c"
+ 
+-
+ usage()
+ {
+   echo "usage: `basename $0` [-m|-p|--preserve-environment]" >&2
+@@ -230,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="xauth -q remove $DISPLAY 2>/dev/null;"
++  export TERM="/usr/X11R6/bin/xauth -q remove $DISPLAY 2>/dev/null;"
+   if [ -n "$sux_unix_display" ]
+   then
+-    TERM="$TERM xauth -q remove $sux_unix_display;"
++    TERM="$TERM /usr/X11R6/bin/xauth -q remove $sux_unix_display;"
+   fi
+ 
+   # Note that there may be more than one cookie to transfer, hence 
+@@ -250,7 +249,7 @@
+     sux_i=`expr $sux_i + 1`
+     if [ $sux_i -eq 9 ]
+     then
+-      TERM="$TERM | xauth nmerge - ;"
++      TERM="$TERM | /usr/X11R6/bin/xauth nmerge - ;"
+       sux_i=0
+     fi
+   done
+@@ -316,12 +316,12 @@
+ # wouldn't have the proper access rights anyway...
+ unset XAUTHORITY
+ 
++sux_home=`egrep "^$sux_username:" /etc/passwd | cut -d: -f6`
+ 
+ ##
+ # --preserve-environment special case
+ if [ -n "$sux_preserve" -a -n "$sux_xauth_cmd" ]
+ then
+-  sux_home=`egrep "^$sux_username:" /etc/passwd | cut -d: -f6`
+   if [ -z "$sux_home" ]
+   then
+     echo "WARNING: --preserve-environment has been set, but no good value was found for XAUTHORITY, expect trouble" >&2
+@@ -334,4 +334,4 @@
+ ##
+ # Execute su
+ exec su $sux_su_opts -c "$sux_xauth_cmd \
+-     exec env $sux_xauthority $sux_term DISPLAY='$DISPLAY' $sux_cmd;"
++     exec env $sux_xauthority $sux_term HOME='$sux_home' DISPLAY='$DISPLAY' $sux_cmd;"
diff --git a/x11-misc/sux/sux-1.0-r1.ebuild b/x11-misc/sux/sux-1.0-r1.ebuild
new file mode 100644
index 000000000000..daa6379db213
--- /dev/null
+++ b/x11-misc/sux/sux-1.0-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/sux/sux-1.0-r1.ebuild,v 1.1 2003/12/02 09:12:10 phosphan 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="~x86"
+S=${WORKDIR}
+
+DEPEND="virtual/x11
+		sys-apps/debianutils"
+
+src_unpack() {
+	cp ${DISTDIR}/${A} .
+	epatch ${FILESDIR}/${P}-r1.patch
+}
+
+src_compile() {
+	echo "nothing to be done"
+}
+
+src_install() {
+	exeinto /usr/X11R6/bin
+	doexe sux
+}