Date: Sunday, March 30, 2014 @ 13:40:31 Author: heftig Revision: 209229
3.12.0 Added: gdm/trunk/0001-Add-Arch-Linux-PAM-config-files.patch Modified: gdm/trunk/PKGBUILD gdm/trunk/gdm.install Deleted: gdm/trunk/arch-pam.patch gdm/trunk/fix_external_program_directories.patch --------------------------------------------+ 0001-Add-Arch-Linux-PAM-config-files.patch | 209 +++++++++++++++++++++++++++ PKGBUILD | 24 +-- arch-pam.patch | 179 ----------------------- fix_external_program_directories.patch | 12 - gdm.install | 5 5 files changed, 223 insertions(+), 206 deletions(-) Added: 0001-Add-Arch-Linux-PAM-config-files.patch =================================================================== --- 0001-Add-Arch-Linux-PAM-config-files.patch (rev 0) +++ 0001-Add-Arch-Linux-PAM-config-files.patch 2014-03-30 11:40:31 UTC (rev 209229) @@ -0,0 +1,209 @@ +From cd3370b869bd2d5418270e0c9e8197c296d314f5 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <[email protected]> +Date: Tue, 30 Jul 2013 22:42:27 +0600 +Subject: [PATCH] Add Arch Linux PAM config files + +--- + configure.ac | 6 ++++-- + data/Makefile.am | 12 ++++++++++++ + data/pam-arch/gdm-autologin.pam | 14 ++++++++++++++ + data/pam-arch/gdm-fingerprint.pam | 16 ++++++++++++++++ + data/pam-arch/gdm-launch-environment.pam | 13 +++++++++++++ + data/pam-arch/gdm-password.pam | 11 +++++++++++ + data/pam-arch/gdm-pin.pam | 12 ++++++++++++ + data/pam-arch/gdm-smartcard.pam | 16 ++++++++++++++++ + 8 files changed, 98 insertions(+), 2 deletions(-) + create mode 100644 data/pam-arch/gdm-autologin.pam + create mode 100644 data/pam-arch/gdm-fingerprint.pam + create mode 100644 data/pam-arch/gdm-launch-environment.pam + create mode 100644 data/pam-arch/gdm-password.pam + create mode 100644 data/pam-arch/gdm-pin.pam + create mode 100644 data/pam-arch/gdm-smartcard.pam + +diff --git a/configure.ac b/configure.ac +index f66fdd9..aabe305 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -189,12 +189,13 @@ if test x$enable_split_authentication = xyes; then + 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") + AC_CHECK_FILE(/etc/fedora-release,with_default_pam_config="redhat") + AC_CHECK_FILE(/etc/exherbo-release,with_default_pam_config="exherbo") ++ AC_CHECK_FILE(/etc/arch-release,with_default_pam_config="arch") + AC_CHECK_FILE(/etc/lfs-release,with_default_pam_config="lfs") + dnl If not autodetected, default to none + if test x$with_default_pam_config = x; then +@@ -202,7 +203,7 @@ if test x$with_default_pam_config = x; then + 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 +@@ -212,6 +213,7 @@ AM_CONDITIONAL(ENABLE_REDHAT_PAM_CONFIG, test x$with_default_pam_config = xredha + 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 --git a/data/Makefile.am b/data/Makefile.am +index 1b79bc3..341b779 100644 +--- a/data/Makefile.am ++++ b/data/Makefile.am +@@ -140,6 +140,15 @@ pam_lfs_files = pam-lfs/gdm.pam \ + $(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 +@@ -152,6 +161,9 @@ endif + 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 --git a/data/pam-arch/gdm-autologin.pam b/data/pam-arch/gdm-autologin.pam +new file mode 100644 +index 0000000..e7998ef +--- /dev/null ++++ b/data/pam-arch/gdm-autologin.pam +@@ -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 optional pam_permit.so ++auth optional pam_gnome_keyring.so ++ ++account include system-local-login ++ ++password include system-local-login ++ ++session optional pam_keyinit.so force revoke ++session include system-local-login ++session optional pam_gnome_keyring.so auto_start +diff --git a/data/pam-arch/gdm-fingerprint.pam b/data/pam-arch/gdm-fingerprint.pam +new file mode 100644 +index 0000000..97afb44 +--- /dev/null ++++ b/data/pam-arch/gdm-fingerprint.pam +@@ -0,0 +1,16 @@ ++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 ++auth optional pam_gnome_keyring.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 ++session optional pam_gnome_keyring.so auto_start +diff --git a/data/pam-arch/gdm-launch-environment.pam b/data/pam-arch/gdm-launch-environment.pam +new file mode 100644 +index 0000000..2981326 +--- /dev/null ++++ b/data/pam-arch/gdm-launch-environment.pam +@@ -0,0 +1,13 @@ ++auth required pam_succeed_if.so audit quiet_success user = gdm ++auth required pam_env.so ++auth optional pam_permit.so ++ ++account required pam_succeed_if.so audit quiet_success user = gdm ++account include system-local-login ++ ++password required pam_deny.so ++ ++session optional pam_keyinit.so force revoke ++session required pam_succeed_if.so audit quiet_success user = gdm ++session required pam_systemd.so ++session optional pam_permit.so +diff --git a/data/pam-arch/gdm-password.pam b/data/pam-arch/gdm-password.pam +new file mode 100644 +index 0000000..8d34794 +--- /dev/null ++++ b/data/pam-arch/gdm-password.pam +@@ -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 --git a/data/pam-arch/gdm-pin.pam b/data/pam-arch/gdm-pin.pam +new file mode 100644 +index 0000000..44ec42f +--- /dev/null ++++ b/data/pam-arch/gdm-pin.pam +@@ -0,0 +1,12 @@ ++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 ++ ++session optional pam_keyinit.so force revoke ++session include system-local-login ++session optional pam_gnome_keyring.so auto_start +diff --git a/data/pam-arch/gdm-smartcard.pam b/data/pam-arch/gdm-smartcard.pam +new file mode 100644 +index 0000000..c6f01fe +--- /dev/null ++++ b/data/pam-arch/gdm-smartcard.pam +@@ -0,0 +1,16 @@ ++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 ++auth optional pam_gnome_keyring.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 ++session optional pam_gnome_keyring.so auto_start +-- +1.9.1 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-03-30 11:28:11 UTC (rev 209228) +++ PKGBUILD 2014-03-30 11:40:31 UTC (rev 209229) @@ -4,8 +4,8 @@ pkgbase=gdm pkgname=(gdm libgdm) -pkgver=3.10.0.1 -pkgrel=2 +pkgver=3.12.0 +pkgrel=1 pkgdesc="Gnome Display Manager" arch=(i686 x86_64) license=(GPL) @@ -14,15 +14,13 @@ makedepends=(itstool intltool yelp-tools gobject-introspection) checkdepends=('check') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver:0:4}/$pkgbase-$pkgver.tar.xz - fix_external_program_directories.patch arch-pam.patch) -sha256sums=('549a42009af9c79a4e07632e405dcb71ba2e876e766cff02471511ad641b6ae7' - 'a878680734e35c1d66252cbcfe678c3961b5ff0fa16302f8796a5e7e65ffe4a2' - 'b5c225784c3107564cb9685e41dfecdb20b8ea2415905c4119c96748c4e68003') + 0001-Add-Arch-Linux-PAM-config-files.patch) +sha256sums=('74889819a0c55577fd04236b5308de5f1fcf1992b221c71d02d91a1e564a5d87' + 'e158ea240e90113cf1d7790a623c3d0b64e459f76b0e9135f9f536cdb22c0c0e') prepare() { cd $pkgbase-$pkgver - patch -Np1 -i ../fix_external_program_directories.patch - patch -Np1 -i ../arch-pam.patch + patch -Np1 -i ../0001-Add-Arch-Linux-PAM-config-files.patch AUTOPOINT='intltoolize --automake -c' autoreconf -fi } @@ -39,6 +37,7 @@ --with-at-spi-registryd-directory=/usr/lib/at-spi2-core \ --with-check-accelerated-directory=/usr/lib/gnome-session \ --with-authentication-agent-directory=/usr/lib/polkit-gnome \ + --with-gnome-settings-daemon-directory=/usr/lib/gnome-settings-daemon \ --without-tcp-wrappers \ --without-console-kit \ --with-systemd \ @@ -46,7 +45,7 @@ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool - make -j1 + make } check() { @@ -59,8 +58,7 @@ 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) + etc/gdm/Xsession etc/gdm/PostSession/Default etc/gdm/PreSession/Default) groups=(gnome) install=gdm.install @@ -71,7 +69,7 @@ rm -r "$pkgdir/var/run" ### Split libgdm - make -C gui/libgdm DESTDIR="$pkgdir" uninstall + make -C libgdm DESTDIR="$pkgdir" uninstall mv "$pkgdir/usr/share/glib-2.0/schemas/org.gnome.login-screen.gschema.xml" "$srcdir" } @@ -81,7 +79,7 @@ install=libgdm.install cd $pkgbase-$pkgver - make -C gui/libgdm DESTDIR="$pkgdir" install + 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" } Deleted: arch-pam.patch =================================================================== --- arch-pam.patch 2014-03-30 11:28:11 UTC (rev 209228) +++ arch-pam.patch 2014-03-30 11:40:31 UTC (rev 209229) @@ -1,179 +0,0 @@ -diff --git c/configure.ac i/configure.ac -index bda20c6..e118101 100644 ---- c/configure.ac -+++ i/configure.ac -@@ -185,12 +185,13 @@ if test x$enable_split_authentication = xyes; then - 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") - AC_CHECK_FILE(/etc/fedora-release,with_default_pam_config="redhat") - AC_CHECK_FILE(/etc/exherbo-release,with_default_pam_config="exherbo") -+ AC_CHECK_FILE(/etc/arch-release,with_default_pam_config="arch") - AC_CHECK_FILE(/etc/lfs-release,with_default_pam_config="lfs") - dnl If not autodetected, default to none - if test x$with_default_pam_config = x; then -@@ -198,7 +199,7 @@ if test x$with_default_pam_config = x; then - 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 -@@ -208,6 +209,7 @@ AM_CONDITIONAL(ENABLE_REDHAT_PAM_CONFIG, test x$with_default_pam_config = xredha - 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 --git c/data/Makefile.am i/data/Makefile.am -index 81eb8ef..6a67433 100644 ---- c/data/Makefile.am -+++ i/data/Makefile.am -@@ -129,6 +129,15 @@ pam_lfs_files = pam-lfs/gdm.pam \ - $(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 -@@ -141,6 +150,9 @@ endif - if ENABLE_LFS_PAM_CONFIG - pam_files = $(pam_lfs_files) - endif -+if ENABLE_ARCH_PAM_CONFIG -+pam_files = $(pam_arch_files) -+endif - - EXTRA_DIST += \ - $(schemas_in_files) \ -diff --git c/data/pam-arch/gdm-autologin.pam i/data/pam-arch/gdm-autologin.pam -new file mode 100644 -index 0000000..de615ef ---- /dev/null -+++ i/data/pam-arch/gdm-autologin.pam -@@ -0,0 +1,13 @@ -+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 optional pam_permit.so -+auth optional pam_gnome_keyring.so -+ -+account include system-local-login -+ -+password include system-local-login -+ -+session include system-local-login -+session optional pam_gnome_keyring.so auto_start -diff --git c/data/pam-arch/gdm-fingerprint.pam i/data/pam-arch/gdm-fingerprint.pam -new file mode 100644 -index 0000000..f296ae0 ---- /dev/null -+++ i/data/pam-arch/gdm-fingerprint.pam -@@ -0,0 +1,15 @@ -+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 -+auth optional pam_gnome_keyring.so -+ -+account include system-local-login -+ -+password required pam_fprintd.so -+password optional pam_permit.so -+ -+session include system-local-login -+session optional pam_gnome_keyring.so auto_start -diff --git c/data/pam-arch/gdm-launch-environment.pam i/data/pam-arch/gdm-launch-environment.pam -new file mode 100644 -index 0000000..6dfbc51 ---- /dev/null -+++ i/data/pam-arch/gdm-launch-environment.pam -@@ -0,0 +1,13 @@ -+auth required pam_succeed_if.so audit quiet_success user = gdm -+auth required pam_env.so -+auth optional pam_permit.so -+ -+account required pam_succeed_if.so audit quiet_success user = gdm -+account include system-local-login -+ -+password required pam_deny.so -+ -+session required pam_succeed_if.so audit quiet_success user = gdm -+session required pam_systemd.so -+session optional pam_keyinit.so force revoke -+session optional pam_permit.so -diff --git c/data/pam-arch/gdm-password.pam i/data/pam-arch/gdm-password.pam -new file mode 100644 -index 0000000..7411285 ---- /dev/null -+++ i/data/pam-arch/gdm-password.pam -@@ -0,0 +1,9 @@ -+auth include system-local-login -+auth optional pam_gnome_keyring.so -+ -+account include system-local-login -+ -+password include system-local-login -+ -+session include system-local-login -+session optional pam_gnome_keyring.so auto_start -diff --git c/data/pam-arch/gdm-pin.pam i/data/pam-arch/gdm-pin.pam -new file mode 100644 -index 0000000..e024244 ---- /dev/null -+++ i/data/pam-arch/gdm-pin.pam -@@ -0,0 +1,11 @@ -+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 -+ -+session include system-local-login -+session optional pam_gnome_keyring.so auto_start -diff --git c/data/pam-arch/gdm-smartcard.pam i/data/pam-arch/gdm-smartcard.pam -new file mode 100644 -index 0000000..7c3d736 ---- /dev/null -+++ i/data/pam-arch/gdm-smartcard.pam -@@ -0,0 +1,15 @@ -+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 -+auth optional pam_gnome_keyring.so -+ -+account include system-local-login -+ -+password required pam_pkcs11.so -+password optional pam_permit.so -+ -+session include system-local-login -+session optional pam_gnome_keyring.so auto_start - Deleted: fix_external_program_directories.patch =================================================================== --- fix_external_program_directories.patch 2014-03-30 11:28:11 UTC (rev 209228) +++ fix_external_program_directories.patch 2014-03-30 11:40:31 UTC (rev 209229) @@ -1,12 +0,0 @@ -diff -Nur gdm-3.3.92.orig/gui/simple-chooser/gdm-chooser-session.c gdm-3.3.92/gui/simple-chooser/gdm-chooser-session.c ---- gdm-3.3.92.orig/gui/simple-chooser/gdm-chooser-session.c 2012-03-19 22:30:05.304823391 +0000 -+++ gdm-3.3.92/gui/simple-chooser/gdm-chooser-session.c 2012-03-19 22:30:17.004732251 +0000 -@@ -131,7 +131,7 @@ - ret = FALSE; - - error = NULL; -- g_spawn_command_line_async (LIBEXECDIR "/gnome-settings-daemon", &error); -+ g_spawn_command_line_async ("/usr/lib/gnome-settings-daemon/gnome-settings-daemon", &error); - if (error != NULL) { - g_warning ("Error starting settings daemon: %s", error->message); - g_error_free (error); Modified: gdm.install =================================================================== --- gdm.install 2014-03-30 11:28:11 UTC (rev 209228) +++ gdm.install 2014-03-30 11:40:31 UTC (rev 209229) @@ -6,15 +6,16 @@ chown root:gdm /var/log/gdm > /dev/null gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor - dconf update } post_upgrade() { post_install + if (( $(vercmp $2 3.12.0) < 0 )); then + rm /etc/dconf/db/gdm + fi } post_remove() { - dconf update gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor getent passwd gdm >/dev/null 2>&1 && userdel gdm
