[arch-commits] Commit in xorg-xdm/trunk (PKGBUILD libsystemd.patch)

[Andreas Radke]

    Date: Monday, April 4, 2022 @ 05:35:07
  Author: andyrtr
Revision: 441489

upgpkg: xorg-xdm 1.1.13-1: upstream update 1.1.13

Modified:
  xorg-xdm/trunk/PKGBUILD
Deleted:
  xorg-xdm/trunk/libsystemd.patch

------------------+
 PKGBUILD         |   16 +++++++---------
 libsystemd.patch |   17 -----------------
 2 files changed, 7 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-04 05:32:19 UTC (rev 441488)
+++ PKGBUILD	2022-04-04 05:35:07 UTC (rev 441489)
@@ -1,9 +1,8 @@
-# Maintainer: Alexander Baldeck <alexander at archlinux.org>
-# Contributor: Jan de Groot <jgc at archlinux.org>
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
 
 pkgname=xorg-xdm
-pkgver=1.1.12
-pkgrel=3
+pkgver=1.1.13
+pkgrel=1
 pkgdesc="X Display Manager"
 arch=('x86_64')
 url="https://xorg.freedesktop.org/"
@@ -11,20 +10,20 @@
 depends=('pam' 'libxaw' 'libxinerama' 'xorg-xrdb' 'xorg-sessreg' 'libxft' 'systemd' 'libxcrypt')
 makedepends=('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
+source=(${url}/releases/individual/app/xdm-${pkgver}.tar.xz{,.sig}
         Xsession-loginshell.patch
         Xsession-xsm.patch
         xdm-1.0.5-sessreg-utmp-fix-bug177890.patch
         xdm.pam
-        libsystemd.patch
         nolisten.patch)
-sha512sums=('1a4be0a070ced5db8fda6fc74794c9f9ed0cb37fa440fda6a3a7652aff62dfc3d7ba68b9facf054671ebf0f4db2a0eec29d0aa3716e3407ccd5529bac3553bdb'
+sha512sums=('1c7ba51dc8c6989ff6ede3a3abd06e002903609d4ebd31f06ec39fbfee3a80a690c6180f85c3ab135a0de4623261d92a191d1ca5f733cdb3bd2e7e78977b98e5'
+            'SKIP'
             'cf79d5ced77568f346e0955d955438ce27dae99cca21fdd80df779c97cfc03b3b15b561d483f8a8206e1db0785434b816b3474d6cc20c5adb8072c0985254c69'
             '9ba9b515d18c595cec402c7d4f2a8c4b9b10d99ee1bb0a86f2c72c813962a325c3c6e85ea5387f11819f8c046761494d6e54df0cb33bb4ab1e87ef354dc61c5b'
             '698d401899660708dc17eaa84bd2323426afa4c3c094ff8d4a8d9c54e26e073f40dafed67636855bb230f351523a88f1f1ed1ec443d77d92ef65646b5a6976d5'
             'cb912013a294f0801b357a43f3e5313ffa9ac5fcc493b2318843983388eb0b839c84060a97c355e12ca03f3b056644aa4a2bb8a74ed73a0f2405816b8d6efdc0'
-            'f30243aa8343d245e32a80953dc990d95d0b9048574a1ae777cb81cde14a0e167e544df1d40d7316ec8465571bd6b68cda984bb40c1fe99fc7ce348247cdca71'
             '36136bdec96dbe034d93b68f14dbd34663e3423520eb8674a5760c7e6379006b32e42c43691cf6d91f9d683bee07e117c7ffc326c50b9e24f7515495e12cd89b')
+validpgpkeys=('4A193C06D35E7C670FA4EF0BA2FB9E081F2D130E') # Alan Coopersmith <alan.coopersmith at oracle.com>
 
 prepare() {
   cd xdm-${pkgver}
@@ -32,7 +31,6 @@
   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
 }
 

Deleted: libsystemd.patch
===================================================================
--- libsystemd.patch	2022-04-04 05:32:19 UTC (rev 441488)
+++ libsystemd.patch	2022-04-04 05:35:07 UTC (rev 441489)
@@ -1,17 +0,0 @@
-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.])]
- 	)]
-     )
- ])