diff options
| -rw-r--r-- | .SRCINFO | 28 | ||||
| -rw-r--r-- | 0001-Add-Arch-Linux-PAM-config-files.patch | 155 | ||||
| -rw-r--r-- | 0001-Xsession-Don-t-start-ssh-agent-by-default.patch (renamed from 0002-Xsession-Don-t-start-ssh-agent-by-default.patch) | 12 | ||||
| -rw-r--r-- | 0003-autogoo-make-udev-rules-dir-configurable.patch | 63 | ||||
| -rw-r--r-- | PKGBUILD | 84 | ||||
| -rw-r--r-- | gdm-plymouth.install | 4 | ||||
| -rw-r--r-- | gdm.sysusers | 2 |
7 files changed, 63 insertions, 285 deletions
@@ -1,39 +1,35 @@ pkgbase = gdm-plymouth - pkgdesc = Gnome Display Manager with Plymouth support. - pkgver = 3.30.2 + pkgdesc = Display manager and login screen with plymouth support + pkgver = 3.32.0+2+g820f90f5 pkgrel = 1 - url = http://www.gnome.org + url = https://wiki.gnome.org/Projects/GDM arch = x86_64 license = GPL checkdepends = check - makedepends = intltool makedepends = yelp-tools makedepends = gobject-introspection + makedepends = git + makedepends = docbook-xsl depends = plymouth - depends = gnome-shell>=3.28.0 + depends = gnome-shell depends = gnome-session depends = upower depends = xorg-xrdb depends = xorg-server - depends = xorg-server-xwayland depends = xorg-xhost - source = https://gitlab.gnome.org/GNOME/gdm/-/archive/3.30.2/gdm-3.30.2.tar.gz - source = 0002-Xsession-Don-t-start-ssh-agent-by-default.patch - source = gdm.sysusers - sha256sums = 8ed69c69bc9cf273b3752e925fb267d7dcd00f16ce1da270f079803c47160ba1 - sha256sums = 63f99db7623f078e390bf755350e5793db8b2c4e06622caf42eddc63cd39ecca - sha256sums = 6d9c8e38c7de85b6ec75e488585b8c451f5d9b4fabd2a42921dc3bfcc4aa3e13 + source = git+https://gitlab.gnome.org/GNOME/gdm.git#commit=820f90f5a78b81b2e4610da14627266c2135c8b0 + source = 0001-Xsession-Don-t-start-ssh-agent-by-default.patch + sha256sums = SKIP + sha256sums = 3412f7da0205409f08a126a1d166b644fe0f1d0444f7cdebdce8e59cea2d672c pkgname = gdm-plymouth - install = gdm-plymouth.install groups = gnome depends = plymouth - depends = gnome-shell>=3.28.0 + depends = gnome-shell depends = gnome-session depends = upower depends = xorg-xrdb depends = xorg-server - depends = xorg-server-xwayland depends = xorg-xhost depends = libgdm-plymouth optdepends = fprintd: fingerprint authentication @@ -50,7 +46,7 @@ pkgname = gdm-plymouth backup = etc/gdm/PreSession/Default pkgname = libgdm-plymouth - pkgdesc = GDM support library including Plymouth support + pkgdesc = GDM support library with plymouth support depends = systemd depends = glib2 depends = dconf diff --git a/0001-Add-Arch-Linux-PAM-config-files.patch b/0001-Add-Arch-Linux-PAM-config-files.patch deleted file mode 100644 index f94ba6dfa05a..000000000000 --- a/0001-Add-Arch-Linux-PAM-config-files.patch +++ /dev/null @@ -1,155 +0,0 @@ -diff -urN gdm-3.17.4.orig/configure.ac gdm-3.17.4/configure.ac ---- gdm-3.17.4.orig/configure.ac 2015-07-25 16:52:56.977983878 +0200 -+++ gdm-3.17.4/configure.ac 2015-07-25 16:55:05.835278107 +0200 -@@ -195,7 +195,8 @@ - fi - - AC_ARG_WITH(default-pam-config, -- AS_HELP_STRING([--with-default-pam-config: One of redhat, openembedded, exherbo, lfs, none @<:@default=auto@:>@])) -+ AS_HELP_STRING([--with-default-pam-config: One of redhat, openembedded, exherbo, lfs, arch, none -+@<:@default=auto@:>@])) - dnl If not given, try autodetecting from release files (see NetworkManager source) - if test x$with_default_pam_config = x; then - AC_CHECK_FILE(/etc/redhat-release,with_default_pam_config="redhat") -@@ -208,7 +209,7 @@ - fi - fi - case x$with_default_pam_config in -- xredhat|xopenembedded|xexherbo|xlfs|xnone) ;; -+ xredhat|xopenembedded|xexherbo|xlfs|xarch|xnone) ;; - *) - AC_MSG_ERROR([Invalid --with-default-pam-config ${with_default_pam_config}]) - exit 1 -@@ -218,6 +219,7 @@ - AM_CONDITIONAL(ENABLE_OPENEMBEDDED_PAM_CONFIG, test x$with_default_pam_config = xopenembedded) - AM_CONDITIONAL(ENABLE_EXHERBO_PAM_CONFIG, test x$with_default_pam_config = xexherbo) - AM_CONDITIONAL(ENABLE_LFS_PAM_CONFIG, test x$with_default_pam_config = xlfs) -+AM_CONDITIONAL(ENABLE_ARCH_PAM_CONFIG, test x$with_default_pam_config = xarch) - - AC_ARG_ENABLE(console-helper, - AS_HELP_STRING([--enable-console-helper], -diff -urN gdm-3.17.4.orig/data/Makefile.am gdm-3.17.4/data/Makefile.am ---- gdm-3.17.4.orig/data/Makefile.am 2015-07-25 16:52:56.976983884 +0200 -+++ gdm-3.17.4/data/Makefile.am 2015-07-25 16:57:24.129520056 +0200 -@@ -125,6 +125,15 @@ - $(NULL) - EXTRA_DIST += $(pam_lfs_files) - -+pam_arch_files = pam-arch/gdm-autologin.pam \ -+ pam-arch/gdm-launch-environment.pam \ -+ pam-arch/gdm-fingerprint.pam \ -+ pam-arch/gdm-smartcard.pam \ -+ pam-arch/gdm-password.pam \ -+ pam-arch/gdm-pin.pam \ -+ $(NULL) -+EXTRA_DIST += $(pam_arch_files) -+ - if ENABLE_REDHAT_PAM_CONFIG - pam_files = $(pam_redhat_files) - endif -@@ -137,6 +146,9 @@ - if ENABLE_LFS_PAM_CONFIG - pam_files = $(pam_lfs_files) - endif -+if ENABLE_ARCH_PAM_CONFIG -+pam_files = $(pam_arch_files) -+endif - - EXTRA_DIST += \ - $(dconf_db_files) \ -diff -urN gdm-3.17.4.orig/data/pam-arch/gdm-autologin.pam gdm-3.17.4/data/pam-arch/gdm-autologin.pam ---- gdm-3.17.4.orig/data/pam-arch/gdm-autologin.pam 1970-01-01 01:00:00.000000000 +0100 -+++ gdm-3.17.4/data/pam-arch/gdm-autologin.pam 2015-07-25 16:58:54.784015841 +0200 -@@ -0,0 +1,10 @@ -+auth requisite pam_nologin.so -+auth required pam_env.so -+auth optional pam_permit.so -+ -+account include system-local-login -+ -+password include system-local-login -+ -+session optional pam_keyinit.so force revoke -+session include system-local-login -diff -urN gdm-3.17.4.orig/data/pam-arch/gdm-fingerprint.pam gdm-3.17.4/data/pam-arch/gdm-fingerprint.pam ---- gdm-3.17.4.orig/data/pam-arch/gdm-fingerprint.pam 1970-01-01 01:00:00.000000000 +0100 -+++ gdm-3.17.4/data/pam-arch/gdm-fingerprint.pam 2015-07-25 16:59:29.494812089 +0200 -@@ -0,0 +1,14 @@ -+auth required pam_tally.so onerr=succeed file=/var/log/faillog -+auth required pam_shells.so -+auth requisite pam_nologin.so -+auth required pam_env.so -+auth required pam_fprintd.so -+auth optional pam_permit.so -+ -+account include system-local-login -+ -+password required pam_fprintd.so -+password optional pam_permit.so -+ -+session optional pam_keyinit.so force revoke -+session include system-local-login -diff -urN gdm-3.17.4.orig/data/pam-arch/gdm-launch-environment.pam gdm-3.17.4/data/pam-arch/gdm-launch-environment.pam ---- gdm-3.17.4.orig/data/pam-arch/gdm-launch-environment.pam 1970-01-01 01:00:00.000000000 +0100 -+++ gdm-3.17.4/data/pam-arch/gdm-launch-environment.pam 2015-07-25 17:00:04.135609150 +0200 -@@ -0,0 +1,10 @@ -+auth required pam_env.so -+auth optional pam_permit.so -+ -+account include system-local-login -+ -+password required pam_deny.so -+ -+session optional pam_keyinit.so force revoke -+session required pam_systemd.so -+session optional pam_permit.so -diff -urN gdm-3.17.4.orig/data/pam-arch/gdm-password.pam gdm-3.17.4/data/pam-arch/gdm-password.pam ---- gdm-3.17.4.orig/data/pam-arch/gdm-password.pam 1970-01-01 01:00:00.000000000 +0100 -+++ gdm-3.17.4/data/pam-arch/gdm-password.pam 2015-07-25 17:00:28.295467846 +0200 -@@ -0,0 +1,11 @@ -+auth include system-local-login -+auth optional pam_gnome_keyring.so -+ -+account include system-local-login -+ -+password include system-local-login -+password optional pam_gnome_keyring.so use_authtok -+ -+session optional pam_keyinit.so force revoke -+session include system-local-login -+session optional pam_gnome_keyring.so auto_start -diff -urN gdm-3.17.4.orig/data/pam-arch/gdm-pin.pam gdm-3.17.4/data/pam-arch/gdm-pin.pam ---- gdm-3.17.4.orig/data/pam-arch/gdm-pin.pam 1970-01-01 01:00:00.000000000 +0100 -+++ gdm-3.17.4/data/pam-arch/gdm-pin.pam 2015-07-25 17:00:51.430332710 +0200 -@@ -0,0 +1,13 @@ -+auth requisite pam_pin.so -+auth include system-local-login -+auth optional pam_gnome_keyring.so -+ -+account include system-local-login -+ -+password include system-local-login -+password optional pam_pin.so -+password optional pam_gnome_keyring.so use_authtok -+ -+session optional pam_keyinit.so force revoke -+session include system-local-login -+session optional pam_gnome_keyring.so auto_star -diff -urN gdm-3.17.4.orig/data/pam-arch/gdm-smartcard.pam gdm-3.17.4/data/pam-arch/gdm-smartcard.pam ---- gdm-3.17.4.orig/data/pam-arch/gdm-smartcard.pam 1970-01-01 01:00:00.000000000 +0100 -+++ gdm-3.17.4/data/pam-arch/gdm-smartcard.pam 2015-07-25 17:01:16.614185794 +0200 -@@ -0,0 +1,14 @@ -+auth required pam_tally.so onerr=succeed file=/var/log/faillog -+auth required pam_shells.so -+auth requisite pam_nologin.so -+auth required pam_env.so -+auth required pam_pkcs11.so wait_for_card card_only -+auth optional pam_permit.so -+ -+account include system-local-login -+ -+password required pam_pkcs11.so -+password optional pam_permit.so -+ -+session optional pam_keyinit.so force revoke -+session include system-local-login diff --git a/0002-Xsession-Don-t-start-ssh-agent-by-default.patch b/0001-Xsession-Don-t-start-ssh-agent-by-default.patch index e5b6dd94b49b..997e9e39ce01 100644 --- a/0002-Xsession-Don-t-start-ssh-agent-by-default.patch +++ b/0001-Xsession-Don-t-start-ssh-agent-by-default.patch @@ -1,17 +1,18 @@ -From 8bf4d553ba9e7a5978ed8920ca0b06e624de2eda Mon Sep 17 00:00:00 2001 +From 328a315c21ec71e563d00699f0a79186b229270a Mon Sep 17 00:00:00 2001 +Message-Id: <328a315c21ec71e563d00699f0a79186b229270a.1541542184.git.jan.steffens@gmail.com> From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> Date: Sat, 20 Jun 2015 17:22:38 +0200 -Subject: [PATCH 2/2] Xsession: Don't start ssh-agent by default +Subject: [PATCH] Xsession: Don't start ssh-agent by default --- data/Xsession.in | 8 -------- 1 file changed, 8 deletions(-) diff --git a/data/Xsession.in b/data/Xsession.in -index f253375..c143b30 100755 +index 9d79558c..ff6d9de0 100755 --- a/data/Xsession.in +++ b/data/Xsession.in -@@ -184,14 +184,6 @@ if [ "x$command" = "xdefault" ] ; then +@@ -175,14 +175,6 @@ if [ "x$command" = "xdefault" ] ; then fi fi @@ -27,4 +28,5 @@ index f253375..c143b30 100755 eval exec $command -- -2.4.5 +2.19.1 + diff --git a/0003-autogoo-make-udev-rules-dir-configurable.patch b/0003-autogoo-make-udev-rules-dir-configurable.patch deleted file mode 100644 index 1032fc1126c9..000000000000 --- a/0003-autogoo-make-udev-rules-dir-configurable.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index 1b710098635d9d05f6821746571198d28ecea44b..7896f59daf351927e01ce8d895bb7eba629d640b 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -30,4 +30,4 @@ EXTRA_DIST = \ - DISTCLEANFILES = \ - $(NULL) - --AM_DISTCHECK_CONFIGURE_FLAGS = --enable-split-authentication --enable-introspection --without-systemdsystemunitdir -+AM_DISTCHECK_CONFIGURE_FLAGS = --enable-split-authentication --enable-introspection --without-systemdsystemunitdir --without-udevdir -diff --git a/configure.ac b/configure.ac -index 1a25c80871de0079d8d3133d648bda1e85182c88..bba96d2b6d3416cbbc582633085b32a4a1d9f193 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -254,7 +254,10 @@ AC_ARG_WITH(tcp-wrappers, - [Use TCP Wrappers @<:@default=auto@:>@]),, - with_tcp_wrappers=auto) - -- -+AC_ARG_WITH([udevdir], -+ AS_HELP_STRING([--with-udevdir=DIR], -+ [Directory for udev files]), -+ [with_udevdir=$withval], [with_udevdir=$($PKG_CONFIG --variable=udevdir udev)]) - AC_ARG_WITH([systemdsystemunitdir], - AS_HELP_STRING([--with-systemdsystemunitdir=DIR], - [Directory for systemd service files]), -@@ -867,6 +870,11 @@ AC_PATH_PROG(SYSTEMD_X_SERVER, systemd-multi-seat-x, [/lib/systemd/systemd-multi - AC_SUBST(SYSTEMD_X_SERVER) - AC_DEFINE_UNQUOTED(SYSTEMD_X_SERVER,"$SYSTEMD_X_SERVER",[Path to systemd X server wrapper]) - -+if test "x$with_udevdir" != xno; then -+ AC_SUBST(UDEV_DIR, [$with_udevdir]) -+fi -+AM_CONDITIONAL(INSTALL_UDEV_RULES, test x$with_udevdir != xno) -+ - if test "x$with_systemdsystemunitdir" != xno; then - AC_SUBST(SYSTEMD_SYSTEM_UNIT_DIR, [$with_systemdsystemunitdir]) - fi -@@ -1517,6 +1525,7 @@ echo \ - XDMCP support: ${XDMCP_SUPPORT} - SELinux support: ${use_selinux} - systemd unit dir: ${with_systemdsystemunitdir} -+ udev dir: ${with_udevdir} - plymouth support: ${use_plymouth} - wayland support: ${enable_wayland_support} - Build with RBAC: ${msg_rbac_shutdown} -diff --git a/data/Makefile.am b/data/Makefile.am -index 7c6a2eb38a85759218278b6ab9c7725f26eef990..162074f1c571b9d76164ac485643a28f0712292f 100644 ---- a/data/Makefile.am -+++ b/data/Makefile.am -@@ -154,8 +154,10 @@ if ENABLE_ARCH_PAM_CONFIG - pam_files = $(pam_arch_files) - endif - --udevrulesdir = /lib/udev/rules.d -+if INSTALL_UDEV_RULES -+udevrulesdir = $(UDEV_DIR)/rules.d - udevrules_DATA = 61-gdm.rules -+endif - - EXTRA_DIST += $(srcdir)/61-gdm.rules.in - 61-gdm.rules: $(srcdir)/61-gdm.rules.in - @@ -1,4 +1,5 @@ -# Maintainer: Sebastian Lau <lauseb644 _at_ gmail _dot_ com> +# Maintainer: Taijian <taijian@posteo.de> +# Contributor: Sebastian Lau <lauseb644 _at_ gmail _dot_ com> # Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Damian01w <damian01w@gmail.com> @@ -6,45 +7,50 @@ _pkgbase=gdm pkgbase=gdm-plymouth pkgname=(gdm-plymouth libgdm-plymouth) -pkgver=3.30.2 +pkgver=3.32.0+2+g820f90f5 pkgrel=1 -pkgdesc="Gnome Display Manager with Plymouth support." -arch=('x86_64') +pkgdesc="Display manager and login screen with plymouth support" +url="https://wiki.gnome.org/Projects/GDM" +arch=(x86_64) license=(GPL) -url="http://www.gnome.org" -depends=('plymouth' 'gnome-shell>=3.28.0' 'gnome-session' 'upower' 'xorg-xrdb' 'xorg-server' 'xorg-server-xwayland' 'xorg-xhost') -makedepends=('intltool' 'yelp-tools' 'gobject-introspection') -checkdepends=('check') -source=("https://gitlab.gnome.org/GNOME/gdm/-/archive/${pkgver}/${_pkgbase}-${pkgver}.tar.gz" - "0002-Xsession-Don-t-start-ssh-agent-by-default.patch" - "gdm.sysusers") -sha256sums=('8ed69c69bc9cf273b3752e925fb267d7dcd00f16ce1da270f079803c47160ba1' - '63f99db7623f078e390bf755350e5793db8b2c4e06622caf42eddc63cd39ecca' - '6d9c8e38c7de85b6ec75e488585b8c451f5d9b4fabd2a42921dc3bfcc4aa3e13') +depends=(plymouth gnome-shell gnome-session upower xorg-xrdb xorg-server xorg-xhost) +makedepends=(yelp-tools gobject-introspection git docbook-xsl) +checkdepends=(check) +_commit=820f90f5a78b81b2e4610da14627266c2135c8b0 # master +source=("git+https://gitlab.gnome.org/GNOME/gdm.git#commit=$_commit" + 0001-Xsession-Don-t-start-ssh-agent-by-default.patch) +sha256sums=('SKIP' + '3412f7da0205409f08a126a1d166b644fe0f1d0444f7cdebdce8e59cea2d672c') + +pkgver() { + cd gdm + git describe --tags | sed 's/-/+/g' +} prepare() { - cd $_pkgbase-${pkgver} - - patch -Np1 -i ../0002-Xsession-Don-t-start-ssh-agent-by-default.patch + mkdir build + cd gdm + patch -Np1 -i ../0001-Xsession-Don-t-start-ssh-agent-by-default.patch NOCONFIGURE=1 ./autogen.sh } build() { - cd $_pkgbase-${pkgver} - ./configure \ + cd build + ../gdm/configure \ --prefix=/usr \ - --sbindir=/usr/bin \ --sysconfdir=/etc \ - --libexecdir=/usr/lib \ --localstatedir=/var \ - --disable-static \ + --sbindir=/usr/bin \ + --libexecdir=/usr/lib \ + with_dbus_sys=/usr/share/dbus-1/system.d \ --disable-schemas-compile \ + --disable-static \ --enable-gdm-xsession \ --enable-ipv6 \ - --with-plymouth \ --with-default-pam-config=arch \ --with-default-path=/usr/local/bin:/usr/local/sbin:/usr/bin \ + --with-plymouth \ --without-tcp-wrappers sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool @@ -53,44 +59,42 @@ build() { } check() { - cd $_pkgbase-${pkgver} - make check + make -C build check } package_gdm-plymouth() { depends+=(libgdm-plymouth) + optdepends=('fprintd: fingerprint authentication') provides=("gdm") conflicts=("gdm") - optdepends=('fprintd: fingerprint authentication') backup=(etc/pam.d/gdm-autologin etc/pam.d/gdm-fingerprint etc/pam.d/gdm-launch-environment etc/pam.d/gdm-password etc/pam.d/gdm-smartcard etc/gdm/custom.conf etc/gdm/Xsession etc/gdm/PostSession/Default etc/gdm/PreSession/Default) groups=(gnome) - install=gdm-plymouth.install - cd $_pkgbase-${pkgver} - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" make -C build install - chown -R 120:120 "$pkgdir/var/lib/gdm" + chown -Rc 120:120 "$pkgdir/var/lib/gdm" # Unused or created at start rm -r "$pkgdir"/var/{cache,log,run} - install -Dm644 ../gdm.sysusers "$pkgdir/usr/lib/sysusers.d/gdm.conf" + install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/gdm.conf" <<END +g gdm 120 - +u gdm 120 "Gnome Display Manager" /var/lib/gdm +END - ### Split libgdm - make -C libgdm DESTDIR="$pkgdir" uninstall - mv "$pkgdir/usr/share/glib-2.0/schemas/org.gnome.login-screen.gschema.xml" "$srcdir" +### Split libgdm + mkdir -p libgdm/{lib,share} + mv -t libgdm "$pkgdir"/usr/include + mv -t libgdm/lib "$pkgdir"/usr/lib/{girepository-1.0,libgdm*,pkgconfig} + mv -t libgdm/share "$pkgdir"/usr/share/{gir-1.0,glib-2.0} } package_libgdm-plymouth() { - pkgdesc="GDM support library including Plymouth support" + pkgdesc="GDM support library with plymouth support" depends=(systemd glib2 dconf) provides=("libgdm") conflicts=("libgdm") - - cd $_pkgbase-${pkgver} - make -C libgdm DESTDIR="$pkgdir" install - install -Dm644 "$srcdir/org.gnome.login-screen.gschema.xml" \ - "$pkgdir/usr/share/glib-2.0/schemas/org.gnome.login-screen.gschema.xml" + mv libgdm "$pkgdir/usr" } diff --git a/gdm-plymouth.install b/gdm-plymouth.install deleted file mode 100644 index 0f25f1f32a18..000000000000 --- a/gdm-plymouth.install +++ /dev/null @@ -1,4 +0,0 @@ -post_install() { - systemd-sysusers gdm.conf -} - diff --git a/gdm.sysusers b/gdm.sysusers deleted file mode 100644 index 6f2a2790d590..000000000000 --- a/gdm.sysusers +++ /dev/null @@ -1,2 +0,0 @@ -g gdm 120 - -u gdm 120 "Gnome Display Manager" /var/lib/gdm |