gentoo resync : 16.09.2020

5 files changed, 36 insertions, 34 deletions

diff --git a/x11-misc/sux/Manifest b/x11-misc/sux/Manifest
index ea69a8a9b273..23494e2c6cf3 100644
--- a/x11-misc/sux/Manifest
+++ b/x11-misc/sux/Manifest
@@ -1,6 +1,7 @@
 AUX sux-1.0-dash.patch 279 BLAKE2B c878e89af286f239beefd8f7a2deb9c7783b410c291bacffeb855d781c7ca8efaed639c44bbad273fe310a7cdeb43a34d91200840b2a4bd4c2ecefaded5914bc SHA512 e8a0f44b1fa04fddedc6ea617c03da2c5c2ac5ea98b5fc60a8fbbed47c669b2cd8fc31e19d969f22f374c08ee80f5f108882eba0ca0ef64d69fe2339cdde8133
-AUX sux-1.0-r1.patch 1695 BLAKE2B 0ad2d5b021aed37904871904e135ef416a5c102557621ee158dbac946890b1e24263b5bb238e02816b96cf0d061d80aa03c78f9862804dc0b5c1bd1fdce251a4 SHA512 10e6b34aa1eb26bb51e33534a9c6c32ffb72c8b4eab86aec13087d915f49eda0bd6d6b6ec393ec8a1ec2f170f7fe00557019a235a10ae08f3d15f5a3c105f26f
-AUX sux-X11R6.patch 810 BLAKE2B f9844e65997e4c75dc9d5b41f9733b72bb072db13169d62f6986b28c89a027c8a91766cf4a03785f80b1d28cbeb22943ccb4ea3f9b5d2fa29c6cb171df8a6316 SHA512 5f34860c054c0eca0e7d2626cac3ff449c52310993628b756cebb96d589c9acb7b6fc726cb303d97f17233362bf7ed8c68fb836be529ef05aa1a7d9de71256a5
+AUX sux-1.0-xauth-and-home.patch 1677 BLAKE2B 873b36cfb2688ec0f5c78b78eecea08891011291f92df0c12f35d3a3b8b2fdb8dc50e4899237e384bd9929a245b4ca7c72013fc1e76417eb76601f261ec5e105 SHA512 8d04b827027a262caa00bc24c3d93f23f6ebde645564136ca9aafeda862b782a96427a1b1d616245392aaf314c64e537d4b4772efef19d3de414021343e230c8
 DIST sux 9403 BLAKE2B 26df0f3759b4f4f70479d1532459e3e04da05098045bed7b1066a89f6c636a1200f28866c7ba251d54c24d621b658686889f2306ed797719dfb95a55fb7b3430 SHA512 cf1afb736299e349a14837f89f0feb6a5beb1af35be8e6baef74d03e7278a9d9c331d2759ec21e5cf8b43197734f96464b82ff5904968428bc43a45d2ad0c598
-EBUILD sux-1.0-r4.ebuild 607 BLAKE2B 17fc68fd609ec84200526c36a3760960dec3ba69f90fbf5a7b30f5197b3f3c0f91afc1da96cf03d3ddb78049c327cf8fa69af10b7ba3055f13a32ec23d02a075 SHA512 d6c1c433067e71e4d823745c21a0392fce3dedabb6257f16bb0d8b5ca1d74809a0c4945b10e679cbaf5da1c9b73a5168b50cb316c782bb4dd1aa9b81a7e75209
+DIST sux-1.0.1.tar.gz 10614 BLAKE2B f22005a76194ff483ec24ad6ca1d92190fa9f2dbeabb96ad0343b06658b2bc2498e502e167e67df9ed335c74120b443e3daa31530aa18c615416d8464d758a5c SHA512 f121f70daa9e341ae636361675b1c73e3bb5c3f2301b93b32155c79175b3639d307b8fb0b63fbd51d98b6f3ae6c4530c0991343e86f95192a523a9a08a6048f3
+EBUILD sux-1.0-r4.ebuild 588 BLAKE2B cf275e279487c1340f0a291e44085a65229b21207a049bc05308e7bb5d60e604d9f6397cae1f0445ff3220593c1d6d6fc9cc15b4c45e931a1e1f036fcd590228 SHA512 d15931eaf95ffe014ea87d5b348dc7d0c4fd03b16a9bed22a7365b5a967c559ee8e7ad370f3513e529d4f8eca4e8485816e8a98b7d90e161e496e1264df506a5
+EBUILD sux-1.0.1.ebuild 587 BLAKE2B 7e604e215641c1c8609bfb33297bd6a844f3a3c5c72e7e246c60cc251cdce155815107b5967e54ae20ec669943a2d6cf2b76e69caec3ca19199b6822fadbe292 SHA512 ba8e51ce68903dab21e73a6dff13cd1678f99aa536748e7e12875632d80744ebc258a33e5f0be8dd6c0e680f328e70de97d1dc8e79abe2114bc420500d501da4
 MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4
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
diff --git a/x11-misc/sux/sux-1.0-r4.ebuild b/x11-misc/sux/sux-1.0-r4.ebuild
index a9b3f0087aa0..1acd867a81cd 100644
--- a/x11-misc/sux/sux-1.0-r4.ebuild
+++ b/x11-misc/sux/sux-1.0-r4.ebuild
@@ -23,8 +23,7 @@ src_unpack() {
 
 src_prepare() {
 	epatch \
-		"${FILESDIR}"/${P}-r1.patch \
-		"${FILESDIR}"/${PN}-X11R6.patch \
+		"${FILESDIR}"/${PN}-1.0-xauth-and-home.patch \
 		"${FILESDIR}"/${P}-dash.patch
 }
 
diff --git a/x11-misc/sux/sux-1.0.1.ebuild b/x11-misc/sux/sux-1.0.1.ebuild
new file mode 100644
index 000000000000..8619606a8840
--- /dev/null
+++ b/x11-misc/sux/sux-1.0.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="\"su\" wrapper which transfers X credentials"
+HOMEPAGE="http://fgouget.free.fr/sux/sux-readme.shtml"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
+
+RDEPEND="x11-apps/xauth"
+DEPEND="${RDEPEND}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0-xauth-and-home.patch
+)
+
+
+src_install() {
+	dobin ${PN}{,term}
+	dodoc TODO
+	newdoc debian/changelog Debian.changelog
+	doman debian/${PN}{,term}.1
+}