[arch-commits] Commit in xorg-xinit/repos (14 files)

andyrtr at archlinux.org andyrtr at archlinux.org
Fri Feb 3 12:12:07 EST 2012


    Date: Friday, February 3, 2012 @ 12:12:06
  Author: andyrtr
Revision: 148559

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  xorg-xinit/repos/testing-i686/
  xorg-xinit/repos/testing-i686/06_move_serverauthfile_into_tmp.diff
    (from rev 148558, xorg-xinit/trunk/06_move_serverauthfile_into_tmp.diff)
  xorg-xinit/repos/testing-i686/PKGBUILD
    (from rev 148558, xorg-xinit/trunk/PKGBUILD)
  xorg-xinit/repos/testing-i686/fs25361.patch
    (from rev 148558, xorg-xinit/trunk/fs25361.patch)
  xorg-xinit/repos/testing-i686/xinitrc
    (from rev 148558, xorg-xinit/trunk/xinitrc)
  xorg-xinit/repos/testing-i686/xserverrc
    (from rev 148558, xorg-xinit/trunk/xserverrc)
  xorg-xinit/repos/testing-i686/xsession
    (from rev 148558, xorg-xinit/trunk/xsession)
  xorg-xinit/repos/testing-x86_64/
  xorg-xinit/repos/testing-x86_64/06_move_serverauthfile_into_tmp.diff
    (from rev 148558, xorg-xinit/trunk/06_move_serverauthfile_into_tmp.diff)
  xorg-xinit/repos/testing-x86_64/PKGBUILD
    (from rev 148558, xorg-xinit/trunk/PKGBUILD)
  xorg-xinit/repos/testing-x86_64/fs25361.patch
    (from rev 148558, xorg-xinit/trunk/fs25361.patch)
  xorg-xinit/repos/testing-x86_64/xinitrc
    (from rev 148558, xorg-xinit/trunk/xinitrc)
  xorg-xinit/repos/testing-x86_64/xserverrc
    (from rev 148558, xorg-xinit/trunk/xserverrc)
  xorg-xinit/repos/testing-x86_64/xsession
    (from rev 148558, xorg-xinit/trunk/xsession)

-----------------------------------------------------+
 testing-i686/06_move_serverauthfile_into_tmp.diff   |   20 ++++++
 testing-i686/PKGBUILD                               |   52 ++++++++++++++++++
 testing-i686/fs25361.patch                          |   16 +++++
 testing-i686/xinitrc                                |   17 +++++
 testing-i686/xserverrc                              |    1 
 testing-i686/xsession                               |   10 +++
 testing-x86_64/06_move_serverauthfile_into_tmp.diff |   20 ++++++
 testing-x86_64/PKGBUILD                             |   52 ++++++++++++++++++
 testing-x86_64/fs25361.patch                        |   16 +++++
 testing-x86_64/xinitrc                              |   17 +++++
 testing-x86_64/xserverrc                            |    1 
 testing-x86_64/xsession                             |   10 +++
 12 files changed, 232 insertions(+)

Copied: xorg-xinit/repos/testing-i686/06_move_serverauthfile_into_tmp.diff (from rev 148558, xorg-xinit/trunk/06_move_serverauthfile_into_tmp.diff)
===================================================================
--- testing-i686/06_move_serverauthfile_into_tmp.diff	                        (rev 0)
+++ testing-i686/06_move_serverauthfile_into_tmp.diff	2012-02-03 17:12:06 UTC (rev 148559)
@@ -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

Copied: xorg-xinit/repos/testing-i686/PKGBUILD (from rev 148558, xorg-xinit/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD	                        (rev 0)
+++ testing-i686/PKGBUILD	2012-02-03 17:12:06 UTC (rev 148559)
@@ -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.2
+pkgrel=1
+pkgdesc="X.Org initialisation program "
+arch=('i686' 'x86_64')
+license=('custom')
+url="http://xorg.freedesktop.org/"
+depends=('libx11' 'xorg-xauth' 'inetutils')
+makedepends=('xorg-util-macros')
+optdepends=('xorg-twm' 'xterm')
+backup=('etc/skel/.xinitrc'
+        'etc/skel/.xsession'
+        '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
+        xinitrc
+        xsession
+        xserverrc)
+options=(!emptydirs)
+md5sums=('9c0943cbd83e489ad1b05221b97efd44'
+         'abd072ec435ce084cf4e89c58f83d45c'
+         '73a597d3fb7f5b9487318ac8cfd4bedf'
+         'c7b406c3c5c1e8011b3ac7d6b29c1a2c'
+         '7873d97db30d6c279ed37e3559e7c59d'
+         'c5baef10fdb7239594daee72a94ddab3')
+
+build() {
+  cd "${srcdir}/xinit-${pkgver}"
+  patch -Np1 -i "${srcdir}/06_move_serverauthfile_into_tmp.diff"
+  patch -Np1 -i "${srcdir}/fs25361.patch"
+  sed -i -e 's/XSLASHGLOB.sh/XSLASHGLOB/' xinitrc.cpp
+  ./configure --prefix=/usr --with-xinitdir=/etc/X11/xinit
+  make
+}
+
+package() {
+  cd "${srcdir}/xinit-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  install -m755 -d "${pkgdir}/etc/skel"
+  install -m644 "${srcdir}/xinitrc" "${pkgdir}/etc/skel/.xinitrc"
+  install -m644 "${srcdir}/xsession" "${pkgdir}/etc/skel/.xsession"
+  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/testing-i686/fs25361.patch (from rev 148558, xorg-xinit/trunk/fs25361.patch)
===================================================================
--- testing-i686/fs25361.patch	                        (rev 0)
+++ testing-i686/fs25361.patch	2012-02-03 17:12:06 UTC (rev 148559)
@@ -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

Copied: xorg-xinit/repos/testing-i686/xinitrc (from rev 148558, xorg-xinit/trunk/xinitrc)
===================================================================
--- testing-i686/xinitrc	                        (rev 0)
+++ testing-i686/xinitrc	2012-02-03 17:12:06 UTC (rev 148559)
@@ -0,0 +1,17 @@
+#!/bin/sh
+#
+# ~/.xinitrc
+#
+# Executed by startx (run your window manager from here)
+
+if [ -d /etc/X11/xinit/xinitrc.d ]; then
+  for f in /etc/X11/xinit/xinitrc.d/*; do
+    [ -x "$f" ] && . "$f"
+  done
+  unset f
+fi
+
+# exec gnome-session
+# exec startkde
+# exec startxfce4
+# ...or the Window Manager of your choice

Copied: xorg-xinit/repos/testing-i686/xserverrc (from rev 148558, xorg-xinit/trunk/xserverrc)
===================================================================
--- testing-i686/xserverrc	                        (rev 0)
+++ testing-i686/xserverrc	2012-02-03 17:12:06 UTC (rev 148559)
@@ -0,0 +1 @@
+exec /usr/bin/X -nolisten tcp "$@"

Copied: xorg-xinit/repos/testing-i686/xsession (from rev 148558, xorg-xinit/trunk/xsession)
===================================================================
--- testing-i686/xsession	                        (rev 0)
+++ testing-i686/xsession	2012-02-03 17:12:06 UTC (rev 148559)
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+#
+# ~/.xsession
+#
+# Executed by xdm/gdm/kdm at login
+#
+
+/bin/bash --login -i ~/.xinitrc
+

Copied: xorg-xinit/repos/testing-x86_64/06_move_serverauthfile_into_tmp.diff (from rev 148558, xorg-xinit/trunk/06_move_serverauthfile_into_tmp.diff)
===================================================================
--- testing-x86_64/06_move_serverauthfile_into_tmp.diff	                        (rev 0)
+++ testing-x86_64/06_move_serverauthfile_into_tmp.diff	2012-02-03 17:12:06 UTC (rev 148559)
@@ -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

Copied: xorg-xinit/repos/testing-x86_64/PKGBUILD (from rev 148558, xorg-xinit/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2012-02-03 17:12:06 UTC (rev 148559)
@@ -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.2
+pkgrel=1
+pkgdesc="X.Org initialisation program "
+arch=('i686' 'x86_64')
+license=('custom')
+url="http://xorg.freedesktop.org/"
+depends=('libx11' 'xorg-xauth' 'inetutils')
+makedepends=('xorg-util-macros')
+optdepends=('xorg-twm' 'xterm')
+backup=('etc/skel/.xinitrc'
+        'etc/skel/.xsession'
+        '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
+        xinitrc
+        xsession
+        xserverrc)
+options=(!emptydirs)
+md5sums=('9c0943cbd83e489ad1b05221b97efd44'
+         'abd072ec435ce084cf4e89c58f83d45c'
+         '73a597d3fb7f5b9487318ac8cfd4bedf'
+         'c7b406c3c5c1e8011b3ac7d6b29c1a2c'
+         '7873d97db30d6c279ed37e3559e7c59d'
+         'c5baef10fdb7239594daee72a94ddab3')
+
+build() {
+  cd "${srcdir}/xinit-${pkgver}"
+  patch -Np1 -i "${srcdir}/06_move_serverauthfile_into_tmp.diff"
+  patch -Np1 -i "${srcdir}/fs25361.patch"
+  sed -i -e 's/XSLASHGLOB.sh/XSLASHGLOB/' xinitrc.cpp
+  ./configure --prefix=/usr --with-xinitdir=/etc/X11/xinit
+  make
+}
+
+package() {
+  cd "${srcdir}/xinit-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  install -m755 -d "${pkgdir}/etc/skel"
+  install -m644 "${srcdir}/xinitrc" "${pkgdir}/etc/skel/.xinitrc"
+  install -m644 "${srcdir}/xsession" "${pkgdir}/etc/skel/.xsession"
+  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/testing-x86_64/fs25361.patch (from rev 148558, xorg-xinit/trunk/fs25361.patch)
===================================================================
--- testing-x86_64/fs25361.patch	                        (rev 0)
+++ testing-x86_64/fs25361.patch	2012-02-03 17:12:06 UTC (rev 148559)
@@ -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

Copied: xorg-xinit/repos/testing-x86_64/xinitrc (from rev 148558, xorg-xinit/trunk/xinitrc)
===================================================================
--- testing-x86_64/xinitrc	                        (rev 0)
+++ testing-x86_64/xinitrc	2012-02-03 17:12:06 UTC (rev 148559)
@@ -0,0 +1,17 @@
+#!/bin/sh
+#
+# ~/.xinitrc
+#
+# Executed by startx (run your window manager from here)
+
+if [ -d /etc/X11/xinit/xinitrc.d ]; then
+  for f in /etc/X11/xinit/xinitrc.d/*; do
+    [ -x "$f" ] && . "$f"
+  done
+  unset f
+fi
+
+# exec gnome-session
+# exec startkde
+# exec startxfce4
+# ...or the Window Manager of your choice

Copied: xorg-xinit/repos/testing-x86_64/xserverrc (from rev 148558, xorg-xinit/trunk/xserverrc)
===================================================================
--- testing-x86_64/xserverrc	                        (rev 0)
+++ testing-x86_64/xserverrc	2012-02-03 17:12:06 UTC (rev 148559)
@@ -0,0 +1 @@
+exec /usr/bin/X -nolisten tcp "$@"

Copied: xorg-xinit/repos/testing-x86_64/xsession (from rev 148558, xorg-xinit/trunk/xsession)
===================================================================
--- testing-x86_64/xsession	                        (rev 0)
+++ testing-x86_64/xsession	2012-02-03 17:12:06 UTC (rev 148559)
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+#
+# ~/.xsession
+#
+# Executed by xdm/gdm/kdm at login
+#
+
+/bin/bash --login -i ~/.xinitrc
+



More information about the arch-commits mailing list