[arch-commits] Commit in gdm/repos (12 files)
Jan Steffens
heftig at archlinux.org
Fri Sep 25 15:39:21 UTC 2015
Date: Friday, September 25, 2015 @ 17:39:21
Author: heftig
Revision: 247434
archrelease: copy trunk to gnome-unstable-i686, gnome-unstable-x86_64
Added:
gdm/repos/gnome-unstable-i686/
gdm/repos/gnome-unstable-i686/0001-Add-Arch-Linux-PAM-config-files.patch
(from rev 247433, gdm/trunk/0001-Add-Arch-Linux-PAM-config-files.patch)
gdm/repos/gnome-unstable-i686/0002-Xsession-Don-t-start-ssh-agent-by-default.patch
(from rev 247433, gdm/trunk/0002-Xsession-Don-t-start-ssh-agent-by-default.patch)
gdm/repos/gnome-unstable-i686/PKGBUILD
(from rev 247433, gdm/trunk/PKGBUILD)
gdm/repos/gnome-unstable-i686/gdm.install
(from rev 247433, gdm/trunk/gdm.install)
gdm/repos/gnome-unstable-i686/libgdm.install
(from rev 247433, gdm/trunk/libgdm.install)
gdm/repos/gnome-unstable-x86_64/
gdm/repos/gnome-unstable-x86_64/0001-Add-Arch-Linux-PAM-config-files.patch
(from rev 247433, gdm/trunk/0001-Add-Arch-Linux-PAM-config-files.patch)
gdm/repos/gnome-unstable-x86_64/0002-Xsession-Don-t-start-ssh-agent-by-default.patch
(from rev 247433, gdm/trunk/0002-Xsession-Don-t-start-ssh-agent-by-default.patch)
gdm/repos/gnome-unstable-x86_64/PKGBUILD
(from rev 247433, gdm/trunk/PKGBUILD)
gdm/repos/gnome-unstable-x86_64/gdm.install
(from rev 247433, gdm/trunk/gdm.install)
gdm/repos/gnome-unstable-x86_64/libgdm.install
(from rev 247433, gdm/trunk/libgdm.install)
----------------------------------------------------------------------------+
gnome-unstable-i686/0001-Add-Arch-Linux-PAM-config-files.patch | 199 ++++++++++
gnome-unstable-i686/0002-Xsession-Don-t-start-ssh-agent-by-default.patch | 31 +
gnome-unstable-i686/PKGBUILD | 93 ++++
gnome-unstable-i686/gdm.install | 20 +
gnome-unstable-i686/libgdm.install | 11
gnome-unstable-x86_64/0001-Add-Arch-Linux-PAM-config-files.patch | 199 ++++++++++
gnome-unstable-x86_64/0002-Xsession-Don-t-start-ssh-agent-by-default.patch | 31 +
gnome-unstable-x86_64/PKGBUILD | 93 ++++
gnome-unstable-x86_64/gdm.install | 20 +
gnome-unstable-x86_64/libgdm.install | 11
10 files changed, 708 insertions(+)
Copied: gdm/repos/gnome-unstable-i686/0001-Add-Arch-Linux-PAM-config-files.patch (from rev 247433, gdm/trunk/0001-Add-Arch-Linux-PAM-config-files.patch)
===================================================================
--- gnome-unstable-i686/0001-Add-Arch-Linux-PAM-config-files.patch (rev 0)
+++ gnome-unstable-i686/0001-Add-Arch-Linux-PAM-config-files.patch 2015-09-25 15:39:21 UTC (rev 247434)
@@ -0,0 +1,199 @@
+From 54c780b7d4124e990726cb7afb3aa387979b7094 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Thu, 9 Oct 2014 00:55:31 +0200
+Subject: [PATCH 1/2] Add Arch Linux PAM config files
+
+---
+ configure.ac | 6 ++++--
+ data/Makefile.am | 12 ++++++++++++
+ data/pam-arch/gdm-autologin.pam | 10 ++++++++++
+ data/pam-arch/gdm-fingerprint.pam | 14 ++++++++++++++
+ data/pam-arch/gdm-launch-environment.pam | 10 ++++++++++
+ data/pam-arch/gdm-password.pam | 11 +++++++++++
+ data/pam-arch/gdm-pin.pam | 13 +++++++++++++
+ data/pam-arch/gdm-smartcard.pam | 14 ++++++++++++++
+ 8 files changed, 88 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 b7e86f8..f3f6a45 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 7d521bb..7c0abea 100644
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -130,6 +130,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
+@@ -142,6 +151,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..9f45c65
+--- /dev/null
++++ b/data/pam-arch/gdm-autologin.pam
+@@ -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 --git a/data/pam-arch/gdm-fingerprint.pam b/data/pam-arch/gdm-fingerprint.pam
+new file mode 100644
+index 0000000..a480861
+--- /dev/null
++++ b/data/pam-arch/gdm-fingerprint.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 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 --git a/data/pam-arch/gdm-launch-environment.pam b/data/pam-arch/gdm-launch-environment.pam
+new file mode 100644
+index 0000000..618a7d3
+--- /dev/null
++++ b/data/pam-arch/gdm-launch-environment.pam
+@@ -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 --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..135e205
+--- /dev/null
++++ b/data/pam-arch/gdm-pin.pam
+@@ -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_start
+diff --git a/data/pam-arch/gdm-smartcard.pam b/data/pam-arch/gdm-smartcard.pam
+new file mode 100644
+index 0000000..ec6f75d
+--- /dev/null
++++ b/data/pam-arch/gdm-smartcard.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 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
+--
+2.4.5
+
Copied: gdm/repos/gnome-unstable-i686/0002-Xsession-Don-t-start-ssh-agent-by-default.patch (from rev 247433, gdm/trunk/0002-Xsession-Don-t-start-ssh-agent-by-default.patch)
===================================================================
--- gnome-unstable-i686/0002-Xsession-Don-t-start-ssh-agent-by-default.patch (rev 0)
+++ gnome-unstable-i686/0002-Xsession-Don-t-start-ssh-agent-by-default.patch 2015-09-25 15:39:21 UTC (rev 247434)
@@ -0,0 +1,31 @@
+From 8bf4d553ba9e7a5978ed8920ca0b06e624de2eda Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Sat, 20 Jun 2015 17:22:38 +0200
+Subject: [PATCH 2/2] 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
+--- a/data/Xsession.in
++++ b/data/Xsession.in
+@@ -184,14 +184,6 @@ if [ "x$command" = "xdefault" ] ; then
+ fi
+ fi
+
+-# add ssh-agent if found
+-sshagent="`gdmwhich ssh-agent`"
+-if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then
+- command="$sshagent -- $command"
+-elif [ -z "$sshagent" ] ; then
+- echo "$0: ssh-agent not found!"
+-fi
+-
+ echo "$0: Setup done, will execute: $command"
+
+ eval exec $command
+--
+2.4.5
+
Copied: gdm/repos/gnome-unstable-i686/PKGBUILD (from rev 247433, gdm/trunk/PKGBUILD)
===================================================================
--- gnome-unstable-i686/PKGBUILD (rev 0)
+++ gnome-unstable-i686/PKGBUILD 2015-09-25 15:39:21 UTC (rev 247434)
@@ -0,0 +1,93 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgbase=gdm
+pkgname=(gdm libgdm)
+pkgver=3.18.0
+pkgrel=1
+pkgdesc="Gnome Display Manager"
+arch=(i686 x86_64)
+license=(GPL)
+url="http://www.gnome.org"
+depends=(gnome-shell gnome-session upower xorg-xrdb xorg-server xorg-server-xwayland xorg-xhost)
+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
+ 0001-Add-Arch-Linux-PAM-config-files.patch
+ 0002-Xsession-Don-t-start-ssh-agent-by-default.patch)
+sha256sums=('c9fbe7a921a73e2cced219eab35c350f86dfcfd5b7ed7502f9aeb3c262b46a47'
+ 'b8a766de258520e9f9079ce50db5a80c9a22fd4e2813359e9f34f7c29e723912'
+ '9449da0b6ee58aa3fde65e6d8d1f30513e4176a7dc6d176f17f320ce82cb1d82')
+
+prepare() {
+ cd $pkgbase-$pkgver
+
+ patch -Np1 -i ../0001-Add-Arch-Linux-PAM-config-files.patch
+ patch -Np1 -i ../0002-Xsession-Don-t-start-ssh-agent-by-default.patch
+
+ AUTOPOINT='intltoolize --automake -c' autoreconf -fi
+}
+
+build() {
+ cd $pkgbase-$pkgver
+ ./configure \
+ --prefix=/usr \
+ --sbindir=/usr/bin \
+ --sysconfdir=/etc \
+ --libexecdir=/usr/lib/gdm \
+ --localstatedir=/var \
+ --disable-static \
+ --disable-schemas-compile \
+ --enable-gdm-xsession \
+ --enable-ipv6 \
+ --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 \
+ --without-plymouth \
+ --with-systemd \
+ --with-default-pam-config=arch
+
+ 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
+}
+
+check() {
+ cd $pkgbase-$pkgver
+ make check
+}
+
+package_gdm() {
+ depends+=(libgdm)
+ 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.install
+
+ cd $pkgbase-$pkgver
+ make DESTDIR="$pkgdir" install
+
+ chmod 711 "$pkgdir/var/log/gdm"
+ rm -r "$pkgdir/var/run"
+
+### Split libgdm
+ make -C libgdm DESTDIR="$pkgdir" uninstall
+ mv "$pkgdir/usr/share/glib-2.0/schemas/org.gnome.login-screen.gschema.xml" "$srcdir"
+}
+
+package_libgdm() {
+ pkgdesc="GDM support library"
+ depends=(systemd glib2)
+ install=libgdm.install
+
+ 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"
+}
Copied: gdm/repos/gnome-unstable-i686/gdm.install (from rev 247433, gdm/trunk/gdm.install)
===================================================================
--- gnome-unstable-i686/gdm.install (rev 0)
+++ gnome-unstable-i686/gdm.install 2015-09-25 15:39:21 UTC (rev 247434)
@@ -0,0 +1,20 @@
+post_install() {
+ getent group gdm >/dev/null 2>&1 || groupadd -g 120 gdm
+ getent passwd gdm > /dev/null 2>&1 || useradd -c 'Gnome Display Manager' -u 120 -g gdm -d /var/lib/gdm -s /sbin/nologin gdm
+ passwd -l gdm > /dev/null
+ chown -R gdm:gdm /var/lib/gdm > /dev/null
+ chown root:gdm /var/log/gdm > /dev/null
+
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+ if (( $(vercmp $2 3.12.0) < 0 )); then
+ rm /etc/dconf/db/gdm
+ fi
+}
+
+post_remove() {
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
Copied: gdm/repos/gnome-unstable-i686/libgdm.install (from rev 247433, gdm/trunk/libgdm.install)
===================================================================
--- gnome-unstable-i686/libgdm.install (rev 0)
+++ gnome-unstable-i686/libgdm.install 2015-09-25 15:39:21 UTC (rev 247434)
@@ -0,0 +1,11 @@
+post_install() {
+ glib-compile-schemas /usr/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: gdm/repos/gnome-unstable-x86_64/0001-Add-Arch-Linux-PAM-config-files.patch (from rev 247433, gdm/trunk/0001-Add-Arch-Linux-PAM-config-files.patch)
===================================================================
--- gnome-unstable-x86_64/0001-Add-Arch-Linux-PAM-config-files.patch (rev 0)
+++ gnome-unstable-x86_64/0001-Add-Arch-Linux-PAM-config-files.patch 2015-09-25 15:39:21 UTC (rev 247434)
@@ -0,0 +1,199 @@
+From 54c780b7d4124e990726cb7afb3aa387979b7094 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Thu, 9 Oct 2014 00:55:31 +0200
+Subject: [PATCH 1/2] Add Arch Linux PAM config files
+
+---
+ configure.ac | 6 ++++--
+ data/Makefile.am | 12 ++++++++++++
+ data/pam-arch/gdm-autologin.pam | 10 ++++++++++
+ data/pam-arch/gdm-fingerprint.pam | 14 ++++++++++++++
+ data/pam-arch/gdm-launch-environment.pam | 10 ++++++++++
+ data/pam-arch/gdm-password.pam | 11 +++++++++++
+ data/pam-arch/gdm-pin.pam | 13 +++++++++++++
+ data/pam-arch/gdm-smartcard.pam | 14 ++++++++++++++
+ 8 files changed, 88 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 b7e86f8..f3f6a45 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 7d521bb..7c0abea 100644
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -130,6 +130,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
+@@ -142,6 +151,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..9f45c65
+--- /dev/null
++++ b/data/pam-arch/gdm-autologin.pam
+@@ -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 --git a/data/pam-arch/gdm-fingerprint.pam b/data/pam-arch/gdm-fingerprint.pam
+new file mode 100644
+index 0000000..a480861
+--- /dev/null
++++ b/data/pam-arch/gdm-fingerprint.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 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 --git a/data/pam-arch/gdm-launch-environment.pam b/data/pam-arch/gdm-launch-environment.pam
+new file mode 100644
+index 0000000..618a7d3
+--- /dev/null
++++ b/data/pam-arch/gdm-launch-environment.pam
+@@ -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 --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..135e205
+--- /dev/null
++++ b/data/pam-arch/gdm-pin.pam
+@@ -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_start
+diff --git a/data/pam-arch/gdm-smartcard.pam b/data/pam-arch/gdm-smartcard.pam
+new file mode 100644
+index 0000000..ec6f75d
+--- /dev/null
++++ b/data/pam-arch/gdm-smartcard.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 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
+--
+2.4.5
+
Copied: gdm/repos/gnome-unstable-x86_64/0002-Xsession-Don-t-start-ssh-agent-by-default.patch (from rev 247433, gdm/trunk/0002-Xsession-Don-t-start-ssh-agent-by-default.patch)
===================================================================
--- gnome-unstable-x86_64/0002-Xsession-Don-t-start-ssh-agent-by-default.patch (rev 0)
+++ gnome-unstable-x86_64/0002-Xsession-Don-t-start-ssh-agent-by-default.patch 2015-09-25 15:39:21 UTC (rev 247434)
@@ -0,0 +1,31 @@
+From 8bf4d553ba9e7a5978ed8920ca0b06e624de2eda Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Sat, 20 Jun 2015 17:22:38 +0200
+Subject: [PATCH 2/2] 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
+--- a/data/Xsession.in
++++ b/data/Xsession.in
+@@ -184,14 +184,6 @@ if [ "x$command" = "xdefault" ] ; then
+ fi
+ fi
+
+-# add ssh-agent if found
+-sshagent="`gdmwhich ssh-agent`"
+-if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then
+- command="$sshagent -- $command"
+-elif [ -z "$sshagent" ] ; then
+- echo "$0: ssh-agent not found!"
+-fi
+-
+ echo "$0: Setup done, will execute: $command"
+
+ eval exec $command
+--
+2.4.5
+
Copied: gdm/repos/gnome-unstable-x86_64/PKGBUILD (from rev 247433, gdm/trunk/PKGBUILD)
===================================================================
--- gnome-unstable-x86_64/PKGBUILD (rev 0)
+++ gnome-unstable-x86_64/PKGBUILD 2015-09-25 15:39:21 UTC (rev 247434)
@@ -0,0 +1,93 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgbase=gdm
+pkgname=(gdm libgdm)
+pkgver=3.18.0
+pkgrel=1
+pkgdesc="Gnome Display Manager"
+arch=(i686 x86_64)
+license=(GPL)
+url="http://www.gnome.org"
+depends=(gnome-shell gnome-session upower xorg-xrdb xorg-server xorg-server-xwayland xorg-xhost)
+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
+ 0001-Add-Arch-Linux-PAM-config-files.patch
+ 0002-Xsession-Don-t-start-ssh-agent-by-default.patch)
+sha256sums=('c9fbe7a921a73e2cced219eab35c350f86dfcfd5b7ed7502f9aeb3c262b46a47'
+ 'b8a766de258520e9f9079ce50db5a80c9a22fd4e2813359e9f34f7c29e723912'
+ '9449da0b6ee58aa3fde65e6d8d1f30513e4176a7dc6d176f17f320ce82cb1d82')
+
+prepare() {
+ cd $pkgbase-$pkgver
+
+ patch -Np1 -i ../0001-Add-Arch-Linux-PAM-config-files.patch
+ patch -Np1 -i ../0002-Xsession-Don-t-start-ssh-agent-by-default.patch
+
+ AUTOPOINT='intltoolize --automake -c' autoreconf -fi
+}
+
+build() {
+ cd $pkgbase-$pkgver
+ ./configure \
+ --prefix=/usr \
+ --sbindir=/usr/bin \
+ --sysconfdir=/etc \
+ --libexecdir=/usr/lib/gdm \
+ --localstatedir=/var \
+ --disable-static \
+ --disable-schemas-compile \
+ --enable-gdm-xsession \
+ --enable-ipv6 \
+ --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 \
+ --without-plymouth \
+ --with-systemd \
+ --with-default-pam-config=arch
+
+ 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
+}
+
+check() {
+ cd $pkgbase-$pkgver
+ make check
+}
+
+package_gdm() {
+ depends+=(libgdm)
+ 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.install
+
+ cd $pkgbase-$pkgver
+ make DESTDIR="$pkgdir" install
+
+ chmod 711 "$pkgdir/var/log/gdm"
+ rm -r "$pkgdir/var/run"
+
+### Split libgdm
+ make -C libgdm DESTDIR="$pkgdir" uninstall
+ mv "$pkgdir/usr/share/glib-2.0/schemas/org.gnome.login-screen.gschema.xml" "$srcdir"
+}
+
+package_libgdm() {
+ pkgdesc="GDM support library"
+ depends=(systemd glib2)
+ install=libgdm.install
+
+ 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"
+}
Copied: gdm/repos/gnome-unstable-x86_64/gdm.install (from rev 247433, gdm/trunk/gdm.install)
===================================================================
--- gnome-unstable-x86_64/gdm.install (rev 0)
+++ gnome-unstable-x86_64/gdm.install 2015-09-25 15:39:21 UTC (rev 247434)
@@ -0,0 +1,20 @@
+post_install() {
+ getent group gdm >/dev/null 2>&1 || groupadd -g 120 gdm
+ getent passwd gdm > /dev/null 2>&1 || useradd -c 'Gnome Display Manager' -u 120 -g gdm -d /var/lib/gdm -s /sbin/nologin gdm
+ passwd -l gdm > /dev/null
+ chown -R gdm:gdm /var/lib/gdm > /dev/null
+ chown root:gdm /var/log/gdm > /dev/null
+
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+ if (( $(vercmp $2 3.12.0) < 0 )); then
+ rm /etc/dconf/db/gdm
+ fi
+}
+
+post_remove() {
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
Copied: gdm/repos/gnome-unstable-x86_64/libgdm.install (from rev 247433, gdm/trunk/libgdm.install)
===================================================================
--- gnome-unstable-x86_64/libgdm.install (rev 0)
+++ gnome-unstable-x86_64/libgdm.install 2015-09-25 15:39:21 UTC (rev 247434)
@@ -0,0 +1,11 @@
+post_install() {
+ glib-compile-schemas /usr/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
More information about the arch-commits
mailing list