[arch-commits] Commit in xorg-xdm/repos (3 files)

[Jan de Groot]

    Date: Saturday, June 21, 2008 @ 13:41:07
  Author: jgc
Revision: 3237

Merged revisions 2-3236 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/xorg-xdm/trunk

........
  r356 | aaron | 2008-04-18 22:56:27 +0000 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r3205 | jgc | 2008-06-21 14:07:06 +0000 (Sat, 21 Jun 2008) | 5 lines
  
  upgpkg: xorg-xdm 1.1.8-1
      Update to new version
  - Fix FS#7804: add extra file to backup array
  - Fix FS#9167: Make xdm use a login shell by default
  - Fix FS#7821: Update to latest version, upstream fixed this one already.
........
  r3235 | jgc | 2008-06-21 17:38:59 +0000 (Sat, 21 Jun 2008) | 2 lines
  
  Add missing patch
........

Added:
  xorg-xdm/repos/extra-i686/Xsession-loginshell.patch
    (from rev 3235, xorg-xdm/trunk/Xsession-loginshell.patch)
Modified:
  xorg-xdm/repos/extra-i686/	(properties)
  xorg-xdm/repos/extra-i686/PKGBUILD

---------------------------+
 PKGBUILD                  |   18 ++++++++++--------
 Xsession-loginshell.patch |   15 +++++++++++++++
 2 files changed, 25 insertions(+), 8 deletions(-)


Property changes on: xorg-xdm/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /xorg-xdm/trunk:1
   + /xorg-xdm/trunk:1-3236

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-06-21 17:39:17 UTC (rev 3236)
+++ extra-i686/PKGBUILD	2008-06-21 17:41:07 UTC (rev 3237)
@@ -2,35 +2,37 @@
 # Maintainer: Alexander Baldeck <alexander at archlinux.org>
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=xorg-xdm
-pkgver=1.1.6
+pkgver=1.1.8
 pkgrel=1
 pkgdesc="X Display Manager"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 depends=('pam' 'libxaw' 'libxinerama' 'xorg-server-utils' 'libxft')
 makedepends=('pkgconfig')
-backup=(etc/X11/xdm/Xaccess etc/X11/xdm/Xresources etc/X11/xdm/Xservers etc/X11/xdm/xdm-config etc/pam.d/xdm)
+backup=(etc/X11/xdm/Xaccess etc/X11/xdm/Xresources etc/X11/xdm/Xservers etc/X11/xdm/xdm-config etc/pam.d/xdm etc/X11/xdm/Xsetup_0 etc/X11/xdm/Xsession)
 options=('!libtool')
 source=(${url}/releases/individual/app/xdm-${pkgver}.tar.bz2
+	Xsession-loginshell.patch
 	xdm.pam)
+md5sums=('cc1816bc62a3722ad509373b0b7f30fe'
+	 '234ae568e7b22cbc09433bb396ff3d80'
+         '419d6289ba6f851135f5c70c0e3cbec4')
 
 build() {
   cd ${startdir}/src/xdm-${pkgver}
+  patch -Np0 -i ${srcdir}/Xsession-loginshell.patch || return 1
   ./configure --prefix=/usr \
               --disable-static \
 	      --disable-xprint \
 	      --with-xdmconfigdir=/etc/X11/xdm \
 	      --with-xdmscriptdir=/etc/X11/xdm \
-	      --with-pixmapdir=/usr/share/xdm/pixmaps
+	      --with-pixmapdir=/usr/share/xdm/pixmaps || return 1
   make || return 1
   make DESTDIR=${startdir}/pkg install || return 1
-  mkdir -p ${startdir}/pkg/etc/pam.d
-  install -m644 ${startdir}/src/xdm.pam ${startdir}/pkg/etc/pam.d/xdm
+  install -m755 -d ${startdir}/pkg/etc/pam.d
+  install -m644 ${startdir}/src/xdm.pam ${startdir}/pkg/etc/pam.d/xdm || return 1
 
   #Get rid of /usr/X11R6
   cd ${startdir}/pkg/etc/X11/xdm
   sed -i -e 's/\/X11R6//g' *
 }
-
-md5sums=('c89f8bc74fda4d19e5f374f59c88810f'
-         '419d6289ba6f851135f5c70c0e3cbec4')

Copied: xorg-xdm/repos/extra-i686/Xsession-loginshell.patch (from rev 3235, xorg-xdm/trunk/Xsession-loginshell.patch)
===================================================================
--- extra-i686/Xsession-loginshell.patch	                        (rev 0)
+++ extra-i686/Xsession-loginshell.patch	2008-06-21 17:41:07 UTC (rev 3237)
@@ -0,0 +1,15 @@
+--- config/Xsession.cpp.orig	2008-06-21 13:57:36.000000000 +0000
++++ config/Xsession.cpp	2008-06-21 14:01:25.000000000 +0000
+@@ -56,11 +56,7 @@
+ resources=$HOME/.Xresources
+ 
+ if [ -s "$startup" ]; then
+-	if [ -x "$startup" ]; then
+-		exec "$startup"
+-	else
+-		exec /bin/sh "$startup"
+-	fi
++	exec /bin/sh -ls -c "$startup"
+ else
+ 	if [ -r "$resources" ]; then
+ 		BINDIR/xrdb -load "$resources"