diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-09-16 09:32:48 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-09-16 09:32:48 +0100 |
| commit | 9ee6d97c2883d42f204a533a8bc1f4562df778fb (patch) | |
| tree | b690ddc0ca30f1472887edbb0b8313629bfcbbb2 /x11-misc/sux/files | |
| parent | b17a3ef12038de50228bade1f05502c74e135321 (diff) | |
gentoo resync : 16.09.2020
Diffstat (limited to 'x11-misc/sux/files')
| -rw-r--r-- | x11-misc/sux/files/sux-1.0-xauth-and-home.patch (renamed from x11-misc/sux/files/sux-1.0-r1.patch) | 10 | ||||
| -rw-r--r-- | x11-misc/sux/files/sux-X11R6.patch | 24 |
2 files changed, 5 insertions, 29 deletions
diff --git a/x11-misc/sux/files/sux-1.0-r1.patch b/x11-misc/sux/files/sux-1.0-xauth-and-home.patch index 5be78fd7b7d2..09bcf3826af3 100644 --- a/x11-misc/sux/files/sux-1.0-r1.patch +++ b/x11-misc/sux/files/sux-1.0-xauth-and-home.patch @@ -13,11 +13,11 @@ # 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;" ++ export TERM="/usr/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;" ++ TERM="$TERM /usr/bin/xauth -q remove $sux_unix_display;" fi # Note that there may be more than one cookie to transfer, hence @@ -26,11 +26,11 @@ if [ $sux_i -eq 9 ] then - TERM="$TERM | xauth nmerge - ;" -+ TERM="$TERM | /usr/X11R6/bin/xauth nmerge - ;" ++ TERM="$TERM | /usr/bin/xauth nmerge - ;" sux_i=0 fi done -@@ -316,12 +316,12 @@ +@@ -316,12 +315,12 @@ # wouldn't have the proper access rights anyway... unset XAUTHORITY @@ -44,7 +44,7 @@ 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 @@ +@@ -334,4 +333,4 @@ ## # Execute su exec su $sux_su_opts -c "$sux_xauth_cmd \ diff --git a/x11-misc/sux/files/sux-X11R6.patch b/x11-misc/sux/files/sux-X11R6.patch deleted file mode 100644 index 6b345a646965..000000000000 --- a/x11-misc/sux/files/sux-X11R6.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- 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 - # 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 |