[arch-commits] Commit in gdm/repos (14 files)
Jan Steffens
heftig at archlinux.org
Mon Oct 3 13:26:42 UTC 2016
Date: Monday, October 3, 2016 @ 13:26:41
Author: heftig
Revision: 277574
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
gdm/repos/testing-i686/0002-Xsession-Don-t-start-ssh-agent-by-default.patch
(from rev 277573, gdm/trunk/0002-Xsession-Don-t-start-ssh-agent-by-default.patch)
gdm/repos/testing-i686/PKGBUILD
(from rev 277573, gdm/trunk/PKGBUILD)
gdm/repos/testing-i686/gdm.install
(from rev 277573, gdm/trunk/gdm.install)
gdm/repos/testing-x86_64/0002-Xsession-Don-t-start-ssh-agent-by-default.patch
(from rev 277573, gdm/trunk/0002-Xsession-Don-t-start-ssh-agent-by-default.patch)
gdm/repos/testing-x86_64/PKGBUILD
(from rev 277573, gdm/trunk/PKGBUILD)
gdm/repos/testing-x86_64/gdm.install
(from rev 277573, gdm/trunk/gdm.install)
Deleted:
gdm/repos/testing-i686/0001-Add-Arch-Linux-PAM-config-files.patch
gdm/repos/testing-i686/0002-Xsession-Don-t-start-ssh-agent-by-default.patch
gdm/repos/testing-i686/PKGBUILD
gdm/repos/testing-i686/gdm.install
gdm/repos/testing-x86_64/0001-Add-Arch-Linux-PAM-config-files.patch
gdm/repos/testing-x86_64/0002-Xsession-Don-t-start-ssh-agent-by-default.patch
gdm/repos/testing-x86_64/PKGBUILD
gdm/repos/testing-x86_64/gdm.install
---------------------------------------------------------------------+
/0002-Xsession-Don-t-start-ssh-agent-by-default.patch | 62 +++
/PKGBUILD | 184 +++++++++
/gdm.install | 14
testing-i686/0001-Add-Arch-Linux-PAM-config-files.patch | 199 ----------
testing-i686/0002-Xsession-Don-t-start-ssh-agent-by-default.patch | 31 -
testing-i686/PKGBUILD | 92 ----
testing-i686/gdm.install | 7
testing-x86_64/0001-Add-Arch-Linux-PAM-config-files.patch | 199 ----------
testing-x86_64/0002-Xsession-Don-t-start-ssh-agent-by-default.patch | 31 -
testing-x86_64/PKGBUILD | 92 ----
testing-x86_64/gdm.install | 7
11 files changed, 260 insertions(+), 658 deletions(-)
Deleted: testing-i686/0001-Add-Arch-Linux-PAM-config-files.patch
===================================================================
--- testing-i686/0001-Add-Arch-Linux-PAM-config-files.patch 2016-10-03 13:25:57 UTC (rev 277573)
+++ testing-i686/0001-Add-Arch-Linux-PAM-config-files.patch 2016-10-03 13:26:41 UTC (rev 277574)
@@ -1,199 +0,0 @@
-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
-
Deleted: testing-i686/0002-Xsession-Don-t-start-ssh-agent-by-default.patch
===================================================================
--- testing-i686/0002-Xsession-Don-t-start-ssh-agent-by-default.patch 2016-10-03 13:25:57 UTC (rev 277573)
+++ testing-i686/0002-Xsession-Don-t-start-ssh-agent-by-default.patch 2016-10-03 13:26:41 UTC (rev 277574)
@@ -1,31 +0,0 @@
-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/testing-i686/0002-Xsession-Don-t-start-ssh-agent-by-default.patch (from rev 277573, gdm/trunk/0002-Xsession-Don-t-start-ssh-agent-by-default.patch)
===================================================================
--- testing-i686/0002-Xsession-Don-t-start-ssh-agent-by-default.patch (rev 0)
+++ testing-i686/0002-Xsession-Don-t-start-ssh-agent-by-default.patch 2016-10-03 13:26:41 UTC (rev 277574)
@@ -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
+
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2016-10-03 13:25:57 UTC (rev 277573)
+++ testing-i686/PKGBUILD 2016-10-03 13:26:41 UTC (rev 277574)
@@ -1,92 +0,0 @@
-# $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.22.0
-pkgrel=1
-pkgdesc="Display manager and login screen"
-arch=(i686 x86_64)
-license=(GPL)
-url="https://wiki.gnome.org/Projects/GDM"
-depends=(gnome-shell gnome-session upower xorg-xrdb xorg-server xorg-server-xwayland xorg-xhost)
-makedepends=(yelp-tools intltool gobject-introspection git)
-checkdepends=('check')
-_commit=2bfe227e1f0eb14f42d9137ddeb4337e278121d4
-source=("git://git.gnome.org/gdm#commit=$_commit"
- 0002-Xsession-Don-t-start-ssh-agent-by-default.patch)
-sha256sums=('SKIP'
- '9449da0b6ee58aa3fde65e6d8d1f30513e4176a7dc6d176f17f320ce82cb1d82')
-
-pkgver() {
- cd $pkgbase
- git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
- cd $pkgbase
- patch -Np1 -i ../0002-Xsession-Don-t-start-ssh-agent-by-default.patch
- NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
- cd $pkgbase
- ./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-default-pam-config=arch \
- --with-default-path=/usr/local/bin:/usr/local/sbin:/usr/bin \
- --with-gnome-settings-daemon-directory=/usr/lib/gnome-settings-daemon \
- --without-plymouth \
- --without-tcp-wrappers
-
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
- make
-}
-
-check() {
- cd $pkgbase
- 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
- make DESTDIR="$pkgdir" install
-
- chown -R 120:120 "$pkgdir/var/lib/gdm"
-
- # Unused or created at start
- rm -r "$pkgdir"/var/{cache,log,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)
-
- cd $pkgbase
- 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/testing-i686/PKGBUILD (from rev 277573, gdm/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2016-10-03 13:26:41 UTC (rev 277574)
@@ -0,0 +1,92 @@
+# $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.22.0+1+g3d2aa55
+pkgrel=1
+pkgdesc="Display manager and login screen"
+arch=(i686 x86_64)
+license=(GPL)
+url="https://wiki.gnome.org/Projects/GDM"
+depends=(gnome-shell gnome-session upower xorg-xrdb xorg-server xorg-server-xwayland xorg-xhost)
+makedepends=(yelp-tools intltool gobject-introspection git)
+checkdepends=('check')
+_commit=3d2aa559a4a7decc8b6568de6b41cf9f94170613 # master
+source=("git://git.gnome.org/gdm#commit=$_commit"
+ 0002-Xsession-Don-t-start-ssh-agent-by-default.patch)
+sha256sums=('SKIP'
+ '9449da0b6ee58aa3fde65e6d8d1f30513e4176a7dc6d176f17f320ce82cb1d82')
+
+pkgver() {
+ cd $pkgbase
+ git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+ cd $pkgbase
+ patch -Np1 -i ../0002-Xsession-Don-t-start-ssh-agent-by-default.patch
+ NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+ cd $pkgbase
+ ./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-default-pam-config=arch \
+ --with-default-path=/usr/local/bin:/usr/local/sbin:/usr/bin \
+ --with-gnome-settings-daemon-directory=/usr/lib/gnome-settings-daemon \
+ --without-plymouth \
+ --without-tcp-wrappers
+
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+ make
+}
+
+check() {
+ cd $pkgbase
+ 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
+ make DESTDIR="$pkgdir" install
+
+ chown -R 120:120 "$pkgdir/var/lib/gdm"
+
+ # Unused or created at start
+ rm -r "$pkgdir"/var/{cache,log,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)
+
+ cd $pkgbase
+ 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: testing-i686/gdm.install
===================================================================
--- testing-i686/gdm.install 2016-10-03 13:25:57 UTC (rev 277573)
+++ testing-i686/gdm.install 2016-10-03 13:26:41 UTC (rev 277574)
@@ -1,7 +0,0 @@
-post_install() {
- if ! getent passwd gdm >/dev/null; then
- groupadd -g 120 gdm
- useradd -c 'Gnome Display Manager' -u 120 -g gdm -d /var/lib/gdm -s /sbin/nologin gdm
- passwd -ql gdm
- fi
-}
Copied: gdm/repos/testing-i686/gdm.install (from rev 277573, gdm/trunk/gdm.install)
===================================================================
--- testing-i686/gdm.install (rev 0)
+++ testing-i686/gdm.install 2016-10-03 13:26:41 UTC (rev 277574)
@@ -0,0 +1,7 @@
+post_install() {
+ if ! getent passwd gdm >/dev/null; then
+ groupadd -g 120 gdm
+ useradd -c 'Gnome Display Manager' -u 120 -g gdm -d /var/lib/gdm -s /sbin/nologin gdm
+ passwd -ql gdm
+ fi
+}
Deleted: testing-x86_64/0001-Add-Arch-Linux-PAM-config-files.patch
===================================================================
--- testing-x86_64/0001-Add-Arch-Linux-PAM-config-files.patch 2016-10-03 13:25:57 UTC (rev 277573)
+++ testing-x86_64/0001-Add-Arch-Linux-PAM-config-files.patch 2016-10-03 13:26:41 UTC (rev 277574)
@@ -1,199 +0,0 @@
-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
-
Deleted: testing-x86_64/0002-Xsession-Don-t-start-ssh-agent-by-default.patch
===================================================================
--- testing-x86_64/0002-Xsession-Don-t-start-ssh-agent-by-default.patch 2016-10-03 13:25:57 UTC (rev 277573)
+++ testing-x86_64/0002-Xsession-Don-t-start-ssh-agent-by-default.patch 2016-10-03 13:26:41 UTC (rev 277574)
@@ -1,31 +0,0 @@
-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/testing-x86_64/0002-Xsession-Don-t-start-ssh-agent-by-default.patch (from rev 277573, gdm/trunk/0002-Xsession-Don-t-start-ssh-agent-by-default.patch)
===================================================================
--- testing-x86_64/0002-Xsession-Don-t-start-ssh-agent-by-default.patch (rev 0)
+++ testing-x86_64/0002-Xsession-Don-t-start-ssh-agent-by-default.patch 2016-10-03 13:26:41 UTC (rev 277574)
@@ -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
+
Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2016-10-03 13:25:57 UTC (rev 277573)
+++ testing-x86_64/PKGBUILD 2016-10-03 13:26:41 UTC (rev 277574)
@@ -1,92 +0,0 @@
-# $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.22.0
-pkgrel=1
-pkgdesc="Display manager and login screen"
-arch=(i686 x86_64)
-license=(GPL)
-url="https://wiki.gnome.org/Projects/GDM"
-depends=(gnome-shell gnome-session upower xorg-xrdb xorg-server xorg-server-xwayland xorg-xhost)
-makedepends=(yelp-tools intltool gobject-introspection git)
-checkdepends=('check')
-_commit=2bfe227e1f0eb14f42d9137ddeb4337e278121d4
-source=("git://git.gnome.org/gdm#commit=$_commit"
- 0002-Xsession-Don-t-start-ssh-agent-by-default.patch)
-sha256sums=('SKIP'
- '9449da0b6ee58aa3fde65e6d8d1f30513e4176a7dc6d176f17f320ce82cb1d82')
-
-pkgver() {
- cd $pkgbase
- git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
- cd $pkgbase
- patch -Np1 -i ../0002-Xsession-Don-t-start-ssh-agent-by-default.patch
- NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
- cd $pkgbase
- ./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-default-pam-config=arch \
- --with-default-path=/usr/local/bin:/usr/local/sbin:/usr/bin \
- --with-gnome-settings-daemon-directory=/usr/lib/gnome-settings-daemon \
- --without-plymouth \
- --without-tcp-wrappers
-
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
- make
-}
-
-check() {
- cd $pkgbase
- 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
- make DESTDIR="$pkgdir" install
-
- chown -R 120:120 "$pkgdir/var/lib/gdm"
-
- # Unused or created at start
- rm -r "$pkgdir"/var/{cache,log,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)
-
- cd $pkgbase
- 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/testing-x86_64/PKGBUILD (from rev 277573, gdm/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2016-10-03 13:26:41 UTC (rev 277574)
@@ -0,0 +1,92 @@
+# $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.22.0+1+g3d2aa55
+pkgrel=1
+pkgdesc="Display manager and login screen"
+arch=(i686 x86_64)
+license=(GPL)
+url="https://wiki.gnome.org/Projects/GDM"
+depends=(gnome-shell gnome-session upower xorg-xrdb xorg-server xorg-server-xwayland xorg-xhost)
+makedepends=(yelp-tools intltool gobject-introspection git)
+checkdepends=('check')
+_commit=3d2aa559a4a7decc8b6568de6b41cf9f94170613 # master
+source=("git://git.gnome.org/gdm#commit=$_commit"
+ 0002-Xsession-Don-t-start-ssh-agent-by-default.patch)
+sha256sums=('SKIP'
+ '9449da0b6ee58aa3fde65e6d8d1f30513e4176a7dc6d176f17f320ce82cb1d82')
+
+pkgver() {
+ cd $pkgbase
+ git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+ cd $pkgbase
+ patch -Np1 -i ../0002-Xsession-Don-t-start-ssh-agent-by-default.patch
+ NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+ cd $pkgbase
+ ./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-default-pam-config=arch \
+ --with-default-path=/usr/local/bin:/usr/local/sbin:/usr/bin \
+ --with-gnome-settings-daemon-directory=/usr/lib/gnome-settings-daemon \
+ --without-plymouth \
+ --without-tcp-wrappers
+
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+ make
+}
+
+check() {
+ cd $pkgbase
+ 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
+ make DESTDIR="$pkgdir" install
+
+ chown -R 120:120 "$pkgdir/var/lib/gdm"
+
+ # Unused or created at start
+ rm -r "$pkgdir"/var/{cache,log,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)
+
+ cd $pkgbase
+ 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: testing-x86_64/gdm.install
===================================================================
--- testing-x86_64/gdm.install 2016-10-03 13:25:57 UTC (rev 277573)
+++ testing-x86_64/gdm.install 2016-10-03 13:26:41 UTC (rev 277574)
@@ -1,7 +0,0 @@
-post_install() {
- if ! getent passwd gdm >/dev/null; then
- groupadd -g 120 gdm
- useradd -c 'Gnome Display Manager' -u 120 -g gdm -d /var/lib/gdm -s /sbin/nologin gdm
- passwd -ql gdm
- fi
-}
Copied: gdm/repos/testing-x86_64/gdm.install (from rev 277573, gdm/trunk/gdm.install)
===================================================================
--- testing-x86_64/gdm.install (rev 0)
+++ testing-x86_64/gdm.install 2016-10-03 13:26:41 UTC (rev 277574)
@@ -0,0 +1,7 @@
+post_install() {
+ if ! getent passwd gdm >/dev/null; then
+ groupadd -g 120 gdm
+ useradd -c 'Gnome Display Manager' -u 120 -g gdm -d /var/lib/gdm -s /sbin/nologin gdm
+ passwd -ql gdm
+ fi
+}
More information about the arch-commits
mailing list