[arch-commits] Commit in xorg-xdm/trunk (4 files)

[Andreas Radke]

    Date: Monday, March 4, 2019 @ 19:21:23
  Author: andyrtr
Revision: 347055

upgpkg: xorg-xdm 1.1.12-1

upstream update 1.1.12

Modified:
  xorg-xdm/trunk/PKGBUILD
  xorg-xdm/trunk/Xsession-loginshell.patch
  xorg-xdm/trunk/Xsession-xsm.patch
  xorg-xdm/trunk/nolisten.patch

---------------------------+
 PKGBUILD                  |   43 ++++++++++++++++++-------------------------
 Xsession-loginshell.patch |    4 ++--
 Xsession-xsm.patch        |    4 ++--
 nolisten.patch            |    4 ++--
 4 files changed, 24 insertions(+), 31 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-03-04 19:13:22 UTC (rev 347054)
+++ PKGBUILD	2019-03-04 19:21:23 UTC (rev 347055)
@@ -1,17 +1,17 @@
 # Maintainer: Alexander Baldeck <alexander at archlinux.org>
 # Contributor: Jan de Groot <jgc at archlinux.org>
+
 pkgname=xorg-xdm
-pkgver=1.1.11+50+gb685338
+pkgver=1.1.12
 pkgrel=1
 pkgdesc="X Display Manager"
-arch=(x86_64)
+arch=('x86_64')
 url="https://xorg.freedesktop.org/"
 license=('custom')
 depends=('pam' 'libxaw' 'libxinerama' 'xorg-xrdb' 'xorg-sessreg' 'libxft' 'systemd')
-makedepends=('pkgconfig' 'xorg-util-macros' 'xtrans' git autoconf-archive)
+makedepends=('pkgconfig' 'xorg-util-macros' 'xtrans')
 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)
-_commit=b6853380678b793bad81ac09b2f872f8225ccec6  # master
-source=("git+https://anongit.freedesktop.org/git/xorg/app/xdm#commit=$_commit"
+source=(${url}/releases/individual/app/xdm-${pkgver}.tar.bz2
         Xsession-loginshell.patch
         Xsession-xsm.patch
         xdm-1.0.5-sessreg-utmp-fix-bug177890.patch
@@ -18,38 +18,26 @@
         xdm.pam
         libsystemd.patch
         nolisten.patch)
-sha512sums=('SKIP'
-            '4777e227c99bd39409a134fc2b0cb6ffd8f80ad0e0106ee9ab172637fdafe85027fe05ad7fc978005473ef683ab92f52d3cf06a257991af6b1aeaefe9860953e'
-            'eba7a9edfbbd9a9c7a0566b9b8a436e1eb9271d4e26f6200c53b70ab392d358191fd37c831aad8f94a9a6710f9ec66ee1f34adadb7ba121e55aee6a84b2ea32f'
+sha512sums=('1a4be0a070ced5db8fda6fc74794c9f9ed0cb37fa440fda6a3a7652aff62dfc3d7ba68b9facf054671ebf0f4db2a0eec29d0aa3716e3407ccd5529bac3553bdb'
+            'cf79d5ced77568f346e0955d955438ce27dae99cca21fdd80df779c97cfc03b3b15b561d483f8a8206e1db0785434b816b3474d6cc20c5adb8072c0985254c69'
+            '9ba9b515d18c595cec402c7d4f2a8c4b9b10d99ee1bb0a86f2c72c813962a325c3c6e85ea5387f11819f8c046761494d6e54df0cb33bb4ab1e87ef354dc61c5b'
             '698d401899660708dc17eaa84bd2323426afa4c3c094ff8d4a8d9c54e26e073f40dafed67636855bb230f351523a88f1f1ed1ec443d77d92ef65646b5a6976d5'
             'cb912013a294f0801b357a43f3e5313ffa9ac5fcc493b2318843983388eb0b839c84060a97c355e12ca03f3b056644aa4a2bb8a74ed73a0f2405816b8d6efdc0'
             'f30243aa8343d245e32a80953dc990d95d0b9048574a1ae777cb81cde14a0e167e544df1d40d7316ec8465571bd6b68cda984bb40c1fe99fc7ce348247cdca71'
-            'e21a7a9d0f6fa89146ad86e0083f4fe5d6451fe6f69c4ebe1e4f72507ac4f4c4cb0c4055679cb5d32d197c9f658a02ef2748c1357e6264c40fa122adb8ecd766')
+            '36136bdec96dbe034d93b68f14dbd34663e3423520eb8674a5760c7e6379006b32e42c43691cf6d91f9d683bee07e117c7ffc326c50b9e24f7515495e12cd89b')
 
-pkgver() {
-  cd xdm
-  git describe --tags | sed 's/^xdm-//;s/-/+/g'
-}
-
 prepare() {
-  cd xdm
+  cd xdm-${pkgver}
   patch -Np0 -i "${srcdir}/Xsession-loginshell.patch"
   patch -Np1 -i "${srcdir}/Xsession-xsm.patch"
   patch -Np0 -i "${srcdir}/xdm-1.0.5-sessreg-utmp-fix-bug177890.patch"
   patch -Np1 -i ../nolisten.patch
   patch -Np1 -i ../libsystemd.patch
-  NOCONFIGURE=1 ./autogen.sh
+  autoreconf -vfi
 }
 
-check() {
-  cd xdm
-  make check
-}
-
 build() {
-  cd "${srcdir}/xdm"
-
-  autoreconf -fi
+  cd xdm-${pkgver}
   ./configure --prefix=/usr \
       --disable-xdm-auth \
       --disable-static \
@@ -62,8 +50,13 @@
   make
 }
 
+check() {
+  cd xdm-${pkgver}
+  make check
+}
+
 package() {
-  cd "${srcdir}/xdm"
+  cd xdm-${pkgver}
   make DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/var/lib/xdm"
   install -m755 -d "${pkgdir}/etc/pam.d"

Modified: Xsession-loginshell.patch
===================================================================
--- Xsession-loginshell.patch	2019-03-04 19:13:22 UTC (rev 347054)
+++ Xsession-loginshell.patch	2019-03-04 19:21:23 UTC (rev 347055)
@@ -1,5 +1,5 @@
---- config/Xsession.cpp.orig	2008-06-21 13:57:36.000000000 +0000
-+++ config/Xsession.cpp	2008-06-21 14:01:25.000000000 +0000
+--- config/Xsession.in.orig	2008-06-21 13:57:36.000000000 +0000
++++ config/Xsession.in	2008-06-21 14:01:25.000000000 +0000
 @@ -56,11 +56,7 @@
  resources=$HOME/.Xresources
  

Modified: Xsession-xsm.patch
===================================================================
--- Xsession-xsm.patch	2019-03-04 19:13:22 UTC (rev 347054)
+++ Xsession-xsm.patch	2019-03-04 19:21:23 UTC (rev 347055)
@@ -1,5 +1,5 @@
---- xdm/config/Xsession.cpp.orig	2018-06-18 14:25:14.113681055 +0000
-+++ xdm/config/Xsession.cpp	2018-06-18 14:26:10.313832406 +0000
+--- xdm/config/Xsession.in.orig	2018-06-18 14:25:14.113681055 +0000
++++ xdm/config/Xsession.in	2018-06-18 14:26:10.313832406 +0000
 @@ -51,6 +51,7 @@
  
  startup=$HOME/.xsession

Modified: nolisten.patch
===================================================================
--- nolisten.patch	2019-03-04 19:13:22 UTC (rev 347054)
+++ nolisten.patch	2019-03-04 19:21:23 UTC (rev 347055)
@@ -1,5 +1,5 @@
---- xdm/config/Xservers.ws.cpp.orig	2018-06-18 14:31:07.227964637 +0000
-+++ xdm/config/Xservers.ws.cpp	2018-06-18 14:31:38.378048397 +0000
+--- xdm/config/Xservers.ws.in.orig	2018-06-18 14:31:07.227964637 +0000
++++ xdm/config/Xservers.ws.in	2018-06-18 14:31:38.378048397 +0000
 @@ -9,4 +9,4 @@
  XCOMM look like:
  XCOMM	XTerminalName:0 foreign