[arch-commits] Commit in xorg-xinit/repos/extra-i686 (10 files)

Andreas Radke andyrtr at archlinux.org
Sun Jan 15 11:56:45 UTC 2017


    Date: Sunday, January 15, 2017 @ 11:56:44
  Author: andyrtr
Revision: 286479

archrelease: copy trunk to extra-i686

Added:
  xorg-xinit/repos/extra-i686/06_move_serverauthfile_into_tmp.diff
    (from rev 286478, xorg-xinit/trunk/06_move_serverauthfile_into_tmp.diff)
  xorg-xinit/repos/extra-i686/PKGBUILD
    (from rev 286478, xorg-xinit/trunk/PKGBUILD)
  xorg-xinit/repos/extra-i686/fs25361.patch
    (from rev 286478, xorg-xinit/trunk/fs25361.patch)
  xorg-xinit/repos/extra-i686/fs46369.patch
    (from rev 286478, xorg-xinit/trunk/fs46369.patch)
  xorg-xinit/repos/extra-i686/xserverrc
    (from rev 286478, xorg-xinit/trunk/xserverrc)
Deleted:
  xorg-xinit/repos/extra-i686/06_move_serverauthfile_into_tmp.diff
  xorg-xinit/repos/extra-i686/PKGBUILD
  xorg-xinit/repos/extra-i686/fs25361.patch
  xorg-xinit/repos/extra-i686/fs46369.patch
  xorg-xinit/repos/extra-i686/xserverrc

--------------------------------------+
 06_move_serverauthfile_into_tmp.diff |   40 ++++++------
 PKGBUILD                             |  102 ++++++++++++++++-----------------
 fs25361.patch                        |   32 +++++-----
 fs46369.patch                        |   22 +++----
 xserverrc                            |    4 -
 5 files changed, 101 insertions(+), 99 deletions(-)

Deleted: 06_move_serverauthfile_into_tmp.diff
===================================================================
--- 06_move_serverauthfile_into_tmp.diff	2017-01-15 11:56:32 UTC (rev 286478)
+++ 06_move_serverauthfile_into_tmp.diff	2017-01-15 11:56:44 UTC (rev 286479)
@@ -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

Copied: xorg-xinit/repos/extra-i686/06_move_serverauthfile_into_tmp.diff (from rev 286478, xorg-xinit/trunk/06_move_serverauthfile_into_tmp.diff)
===================================================================
--- 06_move_serverauthfile_into_tmp.diff	                        (rev 0)
+++ 06_move_serverauthfile_into_tmp.diff	2017-01-15 11:56:44 UTC (rev 286479)
@@ -0,0 +1,20 @@
+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

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2017-01-15 11:56:32 UTC (rev 286478)
+++ PKGBUILD	2017-01-15 11:56:44 UTC (rev 286479)
@@ -1,50 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-# Contributor: Alexander Baldeck <alexander at archlinux.org>
-
-pkgname=xorg-xinit
-pkgver=1.3.4
-pkgrel=4
-pkgdesc="X.Org initialisation program "
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('libx11' 'xorg-xauth' 'xorg-xrdb' 'xorg-xmodmap' 'inetutils')
-makedepends=('xorg-util-macros')
-optdepends=('xorg-twm' 'xterm')
-backup=('etc/X11/xinit/xserverrc'
-        'etc/X11/xinit/xinitrc')
-source=(${url}/releases/individual/app/xinit-${pkgver}.tar.bz2
-        06_move_serverauthfile_into_tmp.diff
-        fs25361.patch
-        fs46369.patch
-        xserverrc)
-options=(!emptydirs)
-sha256sums=('75d88d7397a07e01db253163b7c7a00b249b3d30e99489f2734cac9a0c7902b3'
-            'a5c6ced5822bbb3145e0f30a4b12995782ca6d80ff2d927851ec91b5e41212cb'
-            '431335ceb84f75aaa96fba285a596f61a63629f94756f8063e4f621ae143629b'
-            '6e2c44b997e604db167f00168e8b6c68257be50447d7a80856b4aa910f52351e'
-            '86835010b5350c41035495b7b845db0eecf1e4b7eeaf152b12a881fa502e5387')
-
-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
-}
-
-build() {
-  cd xinit-${pkgver}
-  autoreconf -fi
-  ./configure --prefix=/usr --with-xinitdir=/etc/X11/xinit
-  make
-}
-
-package() {
-  cd xinit-${pkgver}
-  make DESTDIR="${pkgdir}" install
-  install -m644 "${srcdir}/xserverrc" "${pkgdir}/etc/X11/xinit/xserverrc"
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}

Copied: xorg-xinit/repos/extra-i686/PKGBUILD (from rev 286478, xorg-xinit/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2017-01-15 11:56:44 UTC (rev 286479)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: Alexander Baldeck <alexander at archlinux.org>
+
+pkgname=xorg-xinit
+pkgver=1.3.4
+pkgrel=4
+pkgdesc="X.Org initialisation program "
+arch=('i686' 'x86_64')
+license=('custom')
+url="https://xorg.freedesktop.org/"
+depends=('libx11' 'xorg-xauth' 'xorg-xrdb' 'xorg-xmodmap' 'inetutils')
+makedepends=('xorg-util-macros')
+optdepends=('xorg-twm' 'xterm')
+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'
+            'SKIP'
+            'a5c6ced5822bbb3145e0f30a4b12995782ca6d80ff2d927851ec91b5e41212cb'
+            '431335ceb84f75aaa96fba285a596f61a63629f94756f8063e4f621ae143629b'
+            '6e2c44b997e604db167f00168e8b6c68257be50447d7a80856b4aa910f52351e'
+            '86835010b5350c41035495b7b845db0eecf1e4b7eeaf152b12a881fa502e5387')
+validpgpkeys=('7C2608F8E5F9E78D7A3F26FF177544B49AF313FB') #  "Hans de Goede <jwrdegoede at fedoraproject.org>"
+
+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
+}
+
+build() {
+  cd xinit-${pkgver}
+  autoreconf -fi
+  ./configure --prefix=/usr --with-xinitdir=/etc/X11/xinit
+  make
+}
+
+package() {
+  cd xinit-${pkgver}
+  make DESTDIR="${pkgdir}" install
+  install -m644 "${srcdir}/xserverrc" "${pkgdir}/etc/X11/xinit/xserverrc"
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}

Deleted: fs25361.patch
===================================================================
--- fs25361.patch	2017-01-15 11:56:32 UTC (rev 286478)
+++ fs25361.patch	2017-01-15 11:56:44 UTC (rev 286479)
@@ -1,16 +0,0 @@
-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 @@
-     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.
--    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;
-         if [ "z${authcookie}" = "z" ] ; then
-             XAUTH -q << EOF 
- add $displayname . $mcookie

Copied: xorg-xinit/repos/extra-i686/fs25361.patch (from rev 286478, xorg-xinit/trunk/fs25361.patch)
===================================================================
--- fs25361.patch	                        (rev 0)
+++ fs25361.patch	2017-01-15 11:56:44 UTC (rev 286479)
@@ -0,0 +1,16 @@
+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 @@
+     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.
+-    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;
+         if [ "z${authcookie}" = "z" ] ; then
+             XAUTH -q << EOF 
+ add $displayname . $mcookie

Deleted: fs46369.patch
===================================================================
--- fs46369.patch	2017-01-15 11:56:32 UTC (rev 286478)
+++ fs46369.patch	2017-01-15 11:56:44 UTC (rev 286479)
@@ -1,11 +0,0 @@
-diff -u -r xinit-1.3.4/startx.cpp xinit-1.3.4-dbus/startx.cpp
---- xinit-1.3.4/startx.cpp	2015-09-21 17:07:29.732240308 +0200
-+++ xinit-1.3.4-dbus/startx.cpp	2015-09-21 17:07:59.255424644 +0200
-@@ -11,7 +11,6 @@
- XCOMM Site administrators are STRONGLY urged to write nicer versions.
- XCOMM
- 
--unset DBUS_SESSION_BUS_ADDRESS
- unset SESSION_MANAGER
- 
- #ifdef __APPLE__

Copied: xorg-xinit/repos/extra-i686/fs46369.patch (from rev 286478, xorg-xinit/trunk/fs46369.patch)
===================================================================
--- fs46369.patch	                        (rev 0)
+++ fs46369.patch	2017-01-15 11:56:44 UTC (rev 286479)
@@ -0,0 +1,11 @@
+diff -u -r xinit-1.3.4/startx.cpp xinit-1.3.4-dbus/startx.cpp
+--- xinit-1.3.4/startx.cpp	2015-09-21 17:07:29.732240308 +0200
++++ xinit-1.3.4-dbus/startx.cpp	2015-09-21 17:07:59.255424644 +0200
+@@ -11,7 +11,6 @@
+ XCOMM Site administrators are STRONGLY urged to write nicer versions.
+ XCOMM
+ 
+-unset DBUS_SESSION_BUS_ADDRESS
+ unset SESSION_MANAGER
+ 
+ #ifdef __APPLE__

Deleted: xserverrc
===================================================================
--- xserverrc	2017-01-15 11:56:32 UTC (rev 286478)
+++ xserverrc	2017-01-15 11:56:44 UTC (rev 286479)
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/X -nolisten tcp "$@"

Copied: xorg-xinit/repos/extra-i686/xserverrc (from rev 286478, xorg-xinit/trunk/xserverrc)
===================================================================
--- xserverrc	                        (rev 0)
+++ xserverrc	2017-01-15 11:56:44 UTC (rev 286479)
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /usr/bin/X -nolisten tcp "$@"



More information about the arch-commits mailing list