diff options
author | Brian Bidulock | 2019-08-13 00:15:59 -0600 |
---|---|---|
committer | Brian Bidulock | 2019-08-13 00:15:59 -0600 |
commit | 649f2146b0bc4298ff684b49fa327353df6e0e6a (patch) | |
tree | 5f1359a53fcbe8d4b9c7991bb7428fab37359e4c | |
parent | 2930f84687071f21c6c5ff8f84b798c00bea6285 (diff) | |
download | aur-649f2146b0bc4298ff684b49fa327353df6e0e6a.tar.gz |
uppkg
-rw-r--r-- | .SRCINFO | 8 | ||||
-rw-r--r-- | PKGBUILD | 13 | ||||
-rw-r--r-- | Xsession-loginshell.patch | 4 | ||||
-rw-r--r-- | Xsession-xsm.patch | 17 | ||||
-rw-r--r-- | fixes.patch | 53 | ||||
-rw-r--r-- | xdm.pam | 15 |
6 files changed, 67 insertions, 43 deletions
@@ -1,6 +1,6 @@ pkgbase = xorg-xdm-git pkgdesc = X Display Manager - pkgver = 1.1.11.49.g50bd014 + pkgver = 1.1.12 pkgrel = 1 url = http://xorg.freedesktop.org/ arch = i686 @@ -33,9 +33,9 @@ pkgbase = xorg-xdm-git source = xorg-xdm-git::git://anongit.freedesktop.org/git/xorg/app/xdm source = fixes.patch source = xdm.pam - sha256sums = SKIP - sha256sums = 0aba5f8e58dead488544962376531e1067e7a55a441f62c601645cd31762caf9 - sha256sums = 7d6818a1c1a44e9bd38774c035e03b0b831f6646681bc2bf556761aec7baf418 + sha512sums = SKIP + sha512sums = 9fb1c63c37c7fe8d92f9883cc4c1f0f0685076f5edadbae1b56ed01c3f74c6fd31b57b3054441f939bcb617493dbaefe741f6826c9d1e7aa94170f7acb88cb83 + sha512sums = cb912013a294f0801b357a43f3e5313ffa9ac5fcc493b2318843983388eb0b839c84060a97c355e12ca03f3b056644aa4a2bb8a74ed73a0f2405816b8d6efdc0 pkgname = xorg-xdm-git @@ -2,7 +2,7 @@ # Contributor: Alexander Baldeck <alexander@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xdm-git -pkgver=1.1.11.49.g50bd014 +pkgver=1.1.12 pkgrel=1 pkgdesc="X Display Manager" arch=(i686 x86_64) @@ -17,9 +17,9 @@ options=('!libtool') source=("$pkgname::git://anongit.freedesktop.org/git/xorg/app/xdm" fixes.patch xdm.pam) -sha256sums=('SKIP' - '0aba5f8e58dead488544962376531e1067e7a55a441f62c601645cd31762caf9' - '7d6818a1c1a44e9bd38774c035e03b0b831f6646681bc2bf556761aec7baf418') +sha512sums=('SKIP' + '9fb1c63c37c7fe8d92f9883cc4c1f0f0685076f5edadbae1b56ed01c3f74c6fd31b57b3054441f939bcb617493dbaefe741f6826c9d1e7aa94170f7acb88cb83' + 'cb912013a294f0801b357a43f3e5313ffa9ac5fcc493b2318843983388eb0b839c84060a97c355e12ca03f3b056644aa4a2bb8a74ed73a0f2405816b8d6efdc0') pkgver() { cd $pkgname @@ -29,7 +29,7 @@ pkgver() { prepare() { cd $pkgname patch -Np2 -b -z .orig -i ../fixes.patch - autoreconf -fi + autoreconf -vfi } build() { @@ -40,6 +40,9 @@ build() { --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 } diff --git a/Xsession-loginshell.patch b/Xsession-loginshell.patch index 3710752efa62..d93523e11ce1 100644 --- a/Xsession-loginshell.patch +++ b/Xsession-loginshell.patch @@ -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 diff --git a/Xsession-xsm.patch b/Xsession-xsm.patch index a2d4d6cc6616..5524de26ccc9 100644 --- a/Xsession-xsm.patch +++ b/Xsession-xsm.patch @@ -1,18 +1,17 @@ -diff -Naur xdm-1.1.8-orig/config/Xsession.cpp xdm-1.1.8/config/Xsession.cpp ---- xdm-1.1.8-orig/config/Xsession.cpp 2008-05-21 14:08:45.000000000 -0400 -+++ xdm-1.1.8/config/Xsession.cpp 2009-04-28 02:56:11.000000000 -0400 -@@ -54,6 +54,7 @@ +--- 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 - if [ -x "$startup" ]; then -@@ -83,5 +84,9 @@ - exec `eval $XDESKTOP` - } - #endif + 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" diff --git a/fixes.patch b/fixes.patch index 8c1e6c930757..b207e108c332 100644 --- a/fixes.patch +++ b/fixes.patch @@ -1,15 +1,40 @@ diff -up src/xorg-xdm-git/config/GiveConsole.orig src/xorg-xdm-git/config/GiveConsole ---- src/xorg-xdm-git/config/GiveConsole.orig 2016-01-12 18:28:15.000000000 -0700 -+++ src/xorg-xdm-git/config/GiveConsole 2016-01-12 18:28:31.000000000 -0700 +--- src/xorg-xdm-git/config/GiveConsole.orig 2019-08-13 00:10:29.000000000 -0600 ++++ src/xorg-xdm-git/config/GiveConsole 2019-08-13 00:10:30.000000000 -0600 @@ -7,3 +7,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 -diff -up src/xorg-xdm-git/config/Xsession.cpp.orig src/xorg-xdm-git/config/Xsession.cpp ---- src/xorg-xdm-git/config/Xsession.cpp.orig 2016-01-12 18:24:23.000000000 -0700 -+++ src/xorg-xdm-git/config/Xsession.cpp 2016-01-12 18:27:35.000000000 -0700 +diff -up src/xorg-xdm-git/configure.ac.orig src/xorg-xdm-git/configure.ac +--- src/xorg-xdm-git/configure.ac.orig 2019-08-13 00:10:29.000000000 -0600 ++++ src/xorg-xdm-git/configure.ac 2019-08-13 00:10:30.000000000 -0600 +@@ -173,10 +173,10 @@ AC_ARG_WITH([systemd-daemon], AS_HELP_ST + [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.])] + )] + ) + ]) +diff -up src/xorg-xdm-git/config/Xservers.ws.in.orig src/xorg-xdm-git/config/Xservers.ws.in +--- src/xorg-xdm-git/config/Xservers.ws.in.orig 2019-08-13 00:10:29.000000000 -0600 ++++ src/xorg-xdm-git/config/Xservers.ws.in 2019-08-13 00:10:31.000000000 -0600 +@@ -9,4 +9,4 @@ XCOMM you can add them here as well. Ea + XCOMM look like: + XCOMM XTerminalName:0 foreign + XCOMM +-:0 local BINDIR/X :0 DEFAULTVT ++:0 local BINDIR/X :0 DEFAULTVT -nolisten tcp +diff -up src/xorg-xdm-git/config/Xsession.in.orig src/xorg-xdm-git/config/Xsession.in +--- src/xorg-xdm-git/config/Xsession.in.orig 2019-08-13 00:10:29.000000000 -0600 ++++ src/xorg-xdm-git/config/Xsession.in 2019-08-13 00:10:30.000000000 -0600 @@ -51,16 +51,17 @@ XCOMM The startup script is not intended startup=$HOME/.xsession @@ -35,9 +60,9 @@ diff -up src/xorg-xdm-git/config/Xsession.cpp.orig src/xorg-xdm-git/config/Xsess + fi fi diff -up src/xorg-xdm-git/xdm/choose.c.orig src/xorg-xdm-git/xdm/choose.c ---- src/xorg-xdm-git/xdm/choose.c.orig 2016-01-12 18:34:02.000000000 -0700 -+++ src/xorg-xdm-git/xdm/choose.c 2016-01-12 18:34:32.000000000 -0700 -@@ -51,6 +51,11 @@ in this Software without prior written a +--- src/xorg-xdm-git/xdm/choose.c.orig 2019-08-13 00:10:30.000000000 -0600 ++++ src/xorg-xdm-git/xdm/choose.c 2019-08-13 00:10:30.000000000 -0600 +@@ -59,6 +59,11 @@ in this Software without prior written a # include <time.h> # define Time_t time_t @@ -50,9 +75,9 @@ diff -up src/xorg-xdm-git/xdm/choose.c.orig src/xorg-xdm-git/xdm/choose.c FormatBytes ( unsigned char *data, diff -up src/xorg-xdm-git/xdm/genauth.c.orig src/xorg-xdm-git/xdm/genauth.c ---- src/xorg-xdm-git/xdm/genauth.c.orig 2016-01-12 18:35:06.000000000 -0700 -+++ src/xorg-xdm-git/xdm/genauth.c 2016-01-12 18:35:19.000000000 -0700 -@@ -43,6 +43,10 @@ from The Open Group. +--- src/xorg-xdm-git/xdm/genauth.c.orig 2019-08-13 00:10:30.000000000 -0600 ++++ src/xorg-xdm-git/xdm/genauth.c 2019-08-13 00:10:30.000000000 -0600 +@@ -51,6 +51,10 @@ from The Open Group. #include <time.h> #define Time_t time_t @@ -64,9 +89,9 @@ diff -up src/xorg-xdm-git/xdm/genauth.c.orig src/xorg-xdm-git/xdm/genauth.c static unsigned char key[8]; #endif diff -up src/xorg-xdm-git/xdm/session.c.orig src/xorg-xdm-git/xdm/session.c ---- src/xorg-xdm-git/xdm/session.c.orig 2016-01-12 18:36:15.000000000 -0700 -+++ src/xorg-xdm-git/xdm/session.c 2016-01-12 18:36:21.000000000 -0700 -@@ -78,6 +78,11 @@ extern int key_setnet(struct key_netstar +--- src/xorg-xdm-git/xdm/session.c.orig 2019-08-13 00:10:30.000000000 -0600 ++++ src/xorg-xdm-git/xdm/session.c 2019-08-13 00:10:30.000000000 -0600 +@@ -87,6 +87,11 @@ extern int key_setnet(struct key_netstar #include <systemd/sd-daemon.h> #endif @@ -1,10 +1,7 @@ #%PAM-1.0 -auth required pam_unix.so -auth required pam_nologin.so -auth required pam_env.so -account required pam_unix.so -password required pam_unix.so -session required pam_unix.so -session required pam_limits.so -session required pam_loginuid.so --session optional pam_systemd.so +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 |