[arch-commits] Commit in xorg-xinit/trunk (3 files)

[Andreas Radke]

    Date: Sunday, March 11, 2018 @ 16:57:32
  Author: andyrtr
Revision: 318544

upgpkg: xorg-xinit 1.4.0-1

upstream update 1.4.0

Modified:
  xorg-xinit/trunk/PKGBUILD
  xorg-xinit/trunk/fs25361.patch
Deleted:
  xorg-xinit/trunk/06_move_serverauthfile_into_tmp.diff

--------------------------------------+
 06_move_serverauthfile_into_tmp.diff |   20 --------------------
 PKGBUILD                             |   16 +++++++---------
 fs25361.patch                        |   12 +++++-------
 3 files changed, 12 insertions(+), 36 deletions(-)

Deleted: 06_move_serverauthfile_into_tmp.diff
===================================================================
--- 06_move_serverauthfile_into_tmp.diff	2018-03-11 14:07:10 UTC (rev 318543)
+++ 06_move_serverauthfile_into_tmp.diff	2018-03-11 16:57:32 UTC (rev 318544)
@@ -1,20 +0,0 @@
-Move startx auth files in /tmp so they are removed on reboot.
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=357736
-The trap patch didn't seem to work on reboot.
----
- startx.cpp |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: xinit/startx.cpp
-===================================================================
---- xinit.orig/startx.cpp
-+++ xinit/startx.cpp
-@@ -273,7 +273,7 @@
-     dummy=0
- 
-     XCOMM create a file with auth information for the server. ':0' is a dummy.
--    xserverauthfile=$HOME/.serverauth.$$
-+    xserverauthfile=`mktemp -p /tmp serverauth.XXXXXXXXXX`
-     trap "rm -f '$xserverauthfile'" HUP INT QUIT ILL TRAP KILL BUS TERM
-     xauth -q -f "$xserverauthfile" << EOF
- add :$dummy . $mcookie

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-03-11 14:07:10 UTC (rev 318543)
+++ PKGBUILD	2018-03-11 16:57:32 UTC (rev 318544)
@@ -3,8 +3,8 @@
 # Contributor: Alexander Baldeck <alexander at archlinux.org>
 
 pkgname=xorg-xinit
-pkgver=1.3.4
-pkgrel=4
+pkgver=1.4.0
+pkgrel=1
 pkgdesc="X.Org initialisation program "
 arch=('x86_64')
 license=('custom')
@@ -15,22 +15,20 @@
 backup=('etc/X11/xinit/xserverrc'
         'etc/X11/xinit/xinitrc')
 source=(${url}/releases/individual/app/xinit-${pkgver}.tar.bz2{,.sig}
-        06_move_serverauthfile_into_tmp.diff
         fs25361.patch
         fs46369.patch
         xserverrc)
 options=(!emptydirs)
-sha256sums=('75d88d7397a07e01db253163b7c7a00b249b3d30e99489f2734cac9a0c7902b3'
+sha512sums=('53a29081130c1e195eb441ee77ccaa044b18b4cca3d2d5da3a6d67aa421dfd9718fa18b6be6232a41e40cf260c8190064c4d8d9ab771177bd5cd12e77a8fa79e'
             'SKIP'
-            'a5c6ced5822bbb3145e0f30a4b12995782ca6d80ff2d927851ec91b5e41212cb'
-            '431335ceb84f75aaa96fba285a596f61a63629f94756f8063e4f621ae143629b'
-            '6e2c44b997e604db167f00168e8b6c68257be50447d7a80856b4aa910f52351e'
-            '86835010b5350c41035495b7b845db0eecf1e4b7eeaf152b12a881fa502e5387')
+            'cd52aa831154a8ed4f88c695b17fc692dc6ded30818b0e2bc28cb0174f4148bb1fb945c54e0ef2613e1dd459e36da69f03863b33b6ec16dc1d8466ff5e480a6a'
+            '8a36bff3c472763a9a46b9a36b8b4a15f03e6fb0387b12efba27f15dc500faa2a3f92c0f7e217a0b00da7c78682c7af6357cc6b88b550ece9bc89c477412b7e0'
+            'f86d96d76bcb340021e7904925f0029f8662e4dfc32489198b3a8695dca069da496539e2287249c763fe9c4d8d5d591fd18fe49a0bee822cbbd0eb712efbb89b')
 validpgpkeys=('7C2608F8E5F9E78D7A3F26FF177544B49AF313FB') #  "Hans de Goede <jwrdegoede at fedoraproject.org>"
+validpgpkeys+=('4A193C06D35E7C670FA4EF0BA2FB9E081F2D130E') # "Alan Coopersmith <alan.coopersmith at oracle.com>"
 
 prepare() {
   cd xinit-${pkgver}
-  patch -Np1 -i ../06_move_serverauthfile_into_tmp.diff
   patch -Np1 -i ../fs25361.patch
   patch -Np1 -i ../fs46369.patch
   sed -i -e 's/XSLASHGLOB.sh/XSLASHGLOB/' xinitrc.cpp

Modified: fs25361.patch
===================================================================
--- fs25361.patch	2018-03-11 14:07:10 UTC (rev 318543)
+++ fs25361.patch	2018-03-11 16:57:32 UTC (rev 318544)
@@ -1,16 +1,14 @@
-Common subdirectories: xinit.orig/privileged_startx and xinit/privileged_startx
-diff -u xinit.orig/startx.cpp xinit/startx.cpp
---- xinit.orig/startx.cpp	2011-08-02 18:26:57.161711018 +0400
-+++ xinit/startx.cpp	2011-08-02 19:06:39.348816866 +0400
-@@ -290,9 +290,9 @@
+--- xinit-1.4.0/startx.cpp	2018-03-11 17:49:26.995313610 +0100
++++ xinit-1.4.0/startx.cpp.new	2018-03-11 17:49:11.334908458 +0100
+@@ -296,9 +296,9 @@
      XCOMM now add the same credentials to the client authority file
      XCOMM if '$displayname' already exists do not overwrite it as another
-     XCOMM server man need it. Add them to the '$xserverauthfile' instead.
+     XCOMM server may need it. Add them to the '$xserverauthfile' instead.
 -    for displayname in $authdisplay $hostname$authdisplay; do
 +    for displayname in $authdisplay $hostname/unix$authdisplay; do
          authcookie=`XAUTH list "$displayname" @@
 -        | sed -n "s/.*$displayname[[:space:]*].*[[:space:]*]//p"` 2>/dev/null;
-+        | sed -n "s/.*$hostname\/unix$authdisplay[[:space:]*].*[[:space:]*]//p"` 2>/dev/null;
++        | sed -n "s/.*$displayname\/unix$authdisplay[[:space:]*].*[[:space:]*]//p"` 2>/dev/null;
          if [ "z${authcookie}" = "z" ] ; then
              XAUTH -q << EOF 
  add $displayname . $mcookie