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

Andreas Radke andyrtr at archlinux.org
Mon Mar 4 19:22:28 UTC 2019


    Date: Monday, March 4, 2019 @ 19:22:27
  Author: andyrtr
Revision: 347056

archrelease: copy trunk to testing-x86_64

Added:
  xorg-xdm/repos/testing-x86_64/
  xorg-xdm/repos/testing-x86_64/PKGBUILD
    (from rev 347055, xorg-xdm/trunk/PKGBUILD)
  xorg-xdm/repos/testing-x86_64/Xsession-loginshell.patch
    (from rev 347055, xorg-xdm/trunk/Xsession-loginshell.patch)
  xorg-xdm/repos/testing-x86_64/Xsession-xsm.patch
    (from rev 347055, xorg-xdm/trunk/Xsession-xsm.patch)
  xorg-xdm/repos/testing-x86_64/libsystemd.patch
    (from rev 347055, xorg-xdm/trunk/libsystemd.patch)
  xorg-xdm/repos/testing-x86_64/nolisten.patch
    (from rev 347055, xorg-xdm/trunk/nolisten.patch)
  xorg-xdm/repos/testing-x86_64/xdm-1.0.5-sessreg-utmp-fix-bug177890.patch
    (from rev 347055, xorg-xdm/trunk/xdm-1.0.5-sessreg-utmp-fix-bug177890.patch)
  xorg-xdm/repos/testing-x86_64/xdm.pam
    (from rev 347055, xorg-xdm/trunk/xdm.pam)

--------------------------------------------+
 PKGBUILD                                   |   71 +++++++++++++++++++++++++++
 Xsession-loginshell.patch                  |   15 +++++
 Xsession-xsm.patch                         |   21 +++++++
 libsystemd.patch                           |   17 ++++++
 nolisten.patch                             |    8 +++
 xdm-1.0.5-sessreg-utmp-fix-bug177890.patch |    8 +++
 xdm.pam                                    |    7 ++
 7 files changed, 147 insertions(+)

Copied: xorg-xdm/repos/testing-x86_64/PKGBUILD (from rev 347055, xorg-xdm/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2019-03-04 19:22:27 UTC (rev 347056)
@@ -0,0 +1,71 @@
+# Maintainer: Alexander Baldeck <alexander at archlinux.org>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xorg-xdm
+pkgver=1.1.12
+pkgrel=1
+pkgdesc="X Display Manager"
+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')
+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)
+source=(${url}/releases/individual/app/xdm-${pkgver}.tar.bz2
+        Xsession-loginshell.patch
+        Xsession-xsm.patch
+        xdm-1.0.5-sessreg-utmp-fix-bug177890.patch
+        xdm.pam
+        libsystemd.patch
+        nolisten.patch)
+sha512sums=('1a4be0a070ced5db8fda6fc74794c9f9ed0cb37fa440fda6a3a7652aff62dfc3d7ba68b9facf054671ebf0f4db2a0eec29d0aa3716e3407ccd5529bac3553bdb'
+            'cf79d5ced77568f346e0955d955438ce27dae99cca21fdd80df779c97cfc03b3b15b561d483f8a8206e1db0785434b816b3474d6cc20c5adb8072c0985254c69'
+            '9ba9b515d18c595cec402c7d4f2a8c4b9b10d99ee1bb0a86f2c72c813962a325c3c6e85ea5387f11819f8c046761494d6e54df0cb33bb4ab1e87ef354dc61c5b'
+            '698d401899660708dc17eaa84bd2323426afa4c3c094ff8d4a8d9c54e26e073f40dafed67636855bb230f351523a88f1f1ed1ec443d77d92ef65646b5a6976d5'
+            'cb912013a294f0801b357a43f3e5313ffa9ac5fcc493b2318843983388eb0b839c84060a97c355e12ca03f3b056644aa4a2bb8a74ed73a0f2405816b8d6efdc0'
+            'f30243aa8343d245e32a80953dc990d95d0b9048574a1ae777cb81cde14a0e167e544df1d40d7316ec8465571bd6b68cda984bb40c1fe99fc7ce348247cdca71'
+            '36136bdec96dbe034d93b68f14dbd34663e3423520eb8674a5760c7e6379006b32e42c43691cf6d91f9d683bee07e117c7ffc326c50b9e24f7515495e12cd89b')
+
+prepare() {
+  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
+  autoreconf -vfi
+}
+
+build() {
+  cd xdm-${pkgver}
+  ./configure --prefix=/usr \
+      --disable-xdm-auth \
+      --disable-static \
+      --with-xdmconfigdir=/etc/X11/xdm \
+      --with-xdmscriptdir=/etc/X11/xdm \
+      --with-pixmapdir=/usr/share/xdm/pixmaps
+
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+  make
+}
+
+check() {
+  cd xdm-${pkgver}
+  make check
+}
+
+package() {
+  cd xdm-${pkgver}
+  make DESTDIR="${pkgdir}" install
+  install -m755 -d "${pkgdir}/var/lib/xdm"
+  install -m755 -d "${pkgdir}/etc/pam.d"
+  install -m644 "${srcdir}/xdm.pam" "${pkgdir}/etc/pam.d/xdm"
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+
+  sed -i -e 's/\/X11R6//g' "${pkgdir}"/etc/X11/xdm/*
+
+  sed -i 's|^Alias=.*|Alias=display-manager.service|' \
+    "$pkgdir/usr/lib/systemd/system/xdm.service"
+}

Copied: xorg-xdm/repos/testing-x86_64/Xsession-loginshell.patch (from rev 347055, xorg-xdm/trunk/Xsession-loginshell.patch)
===================================================================
--- testing-x86_64/Xsession-loginshell.patch	                        (rev 0)
+++ testing-x86_64/Xsession-loginshell.patch	2019-03-04 19:22:27 UTC (rev 347056)
@@ -0,0 +1,15 @@
+--- 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
+ 
+ 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"

Copied: xorg-xdm/repos/testing-x86_64/Xsession-xsm.patch (from rev 347055, xorg-xdm/trunk/Xsession-xsm.patch)
===================================================================
--- testing-x86_64/Xsession-xsm.patch	                        (rev 0)
+++ testing-x86_64/Xsession-xsm.patch	2019-03-04 19:22:27 UTC (rev 347056)
@@ -0,0 +1,21 @@
+--- 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
+ resources=$HOME/.Xresources
++xinitrc=$HOME/.xinitrc
+ 
+ if [ -s "$startup" ]; then
+ 	exec /bin/sh -ls -c "$startup"
+@@ -58,5 +59,9 @@
+ 	if [ -r "$resources" ]; then
+ 		BINDIR/xrdb -load "$resources"
+ 	fi
+-	exec BINDIR/xsm
++	if [ -r "$xinitrc" ]; then
++		exec /bin/sh -ls -c "$xinitrc"
++	else
++		exec /bin/sh -l /etc/X11/xinit/xinitrc
++        fi
+ fi

Copied: xorg-xdm/repos/testing-x86_64/libsystemd.patch (from rev 347055, xorg-xdm/trunk/libsystemd.patch)
===================================================================
--- testing-x86_64/libsystemd.patch	                        (rev 0)
+++ testing-x86_64/libsystemd.patch	2019-03-04 19:22:27 UTC (rev 347056)
@@ -0,0 +1,17 @@
+diff --git a/configure.ac b/configure.ac
+index d20ae28..2da0f50 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -173,10 +173,10 @@ AC_ARG_WITH([systemd-daemon], AS_HELP_STRING([--with-systemd-daemon],
+ 	[Add support for systemd startup notification (default is autodetected)]),
+ 	[USE_SYSTEMD_DAEMON=$withval], [USE_SYSTEMD_DAEMON=auto])
+ AS_IF([test "x$USE_SYSTEMD_DAEMON" != "xno"], [
+-    PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd-daemon],
++    PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd],
+ 	[AC_DEFINE(USE_SYSTEMD_DAEMON,1,[Use systemd startup notification])],
+ 	[AS_IF([test "x$USE_SYSTEMD_DAEMON" = "xyes"],
+-	    [AC_MSG_ERROR([systemd startup notification support requested, but libsystemd-daemon not found.])]
++	    [AC_MSG_ERROR([systemd startup notification support requested, but libsystemd not found.])]
+ 	)]
+     )
+ ])

Copied: xorg-xdm/repos/testing-x86_64/nolisten.patch (from rev 347055, xorg-xdm/trunk/nolisten.patch)
===================================================================
--- testing-x86_64/nolisten.patch	                        (rev 0)
+++ testing-x86_64/nolisten.patch	2019-03-04 19:22:27 UTC (rev 347056)
@@ -0,0 +1,8 @@
+--- 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
+ XCOMM
+-:0 local BINDIR/X :0 DEFAULTVT
++:0 local BINDIR/X :0 DEFAULTVT -nolisten tcp

Copied: xorg-xdm/repos/testing-x86_64/xdm-1.0.5-sessreg-utmp-fix-bug177890.patch (from rev 347055, xorg-xdm/trunk/xdm-1.0.5-sessreg-utmp-fix-bug177890.patch)
===================================================================
--- testing-x86_64/xdm-1.0.5-sessreg-utmp-fix-bug177890.patch	                        (rev 0)
+++ testing-x86_64/xdm-1.0.5-sessreg-utmp-fix-bug177890.patch	2019-03-04 19:22:27 UTC (rev 347056)
@@ -0,0 +1,8 @@
+--- config/GiveConsole.sessreg-utmp-fix-bug177890	2006-07-24 04:20:10.000000000 -0400
++++ config/GiveConsole	2006-07-24 04:21:16.000000000 -0400
+@@ -8,3 +8,5 @@
+ # causing serious grief.
+ #
+ chown $USER /dev/console
++exec /usr/bin/sessreg  -a -w "/var/log/wtmp" -u "/run/utmp" \
++        -x "/etc/X11/xdm/Xservers" -l $DISPLAY -h "" $USER

Copied: xorg-xdm/repos/testing-x86_64/xdm.pam (from rev 347055, xorg-xdm/trunk/xdm.pam)
===================================================================
--- testing-x86_64/xdm.pam	                        (rev 0)
+++ testing-x86_64/xdm.pam	2019-03-04 19:22:27 UTC (rev 347056)
@@ -0,0 +1,7 @@
+#%PAM-1.0
+auth        include     system-login
+-auth       optional    pam_gnome_keyring.so
+account     include     system-login
+password    include     system-login
+session     include     system-login
+-session    optional    pam_gnome_keyring.so auto_start


More information about the arch-commits mailing list