[arch-commits] Commit in gdm/trunk (PKGBUILD arch-pam.patch)
Jan Steffens
heftig at nymeria.archlinux.org
Wed Jul 24 12:21:15 UTC 2013
Date: Wednesday, July 24, 2013 @ 14:21:15
Author: heftig
Revision: 191369
systemd 206 compat
Added:
gdm/trunk/arch-pam.patch
Modified:
gdm/trunk/PKGBUILD
----------------+
PKGBUILD | 16 +++-
arch-pam.patch | 179 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 189 insertions(+), 6 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-07-24 12:17:57 UTC (rev 191368)
+++ PKGBUILD 2013-07-24 12:21:15 UTC (rev 191369)
@@ -5,24 +5,28 @@
pkgbase=gdm
pkgname=(gdm libgdm)
pkgver=3.8.3.1
-pkgrel=1
+pkgrel=2
pkgdesc="Gnome Display Manager"
arch=(i686 x86_64)
license=(GPL)
url="http://www.gnome.org"
options=('!libtool')
depends=(gnome-shell gnome-session upower xorg-xrdb xorg-server)
-makedepends=(itstool intltool gnome-doc-utils gobject-introspection)
+makedepends=(itstool intltool yelp-tools gobject-introspection)
checkdepends=('check')
source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver::3}/$pkgbase-$pkgver.tar.xz
- fix_external_program_directories.patch)
+ fix_external_program_directories.patch arch-pam.patch)
sha256sums=('a8c8a32803e32c5d087c75c6be8160cfe4d15843953f07b599d653bac471320e'
- 'a878680734e35c1d66252cbcfe678c3961b5ff0fa16302f8796a5e7e65ffe4a2')
+ 'a878680734e35c1d66252cbcfe678c3961b5ff0fa16302f8796a5e7e65ffe4a2'
+ 'b5c225784c3107564cb9685e41dfecdb20b8ea2415905c4119c96748c4e68003')
prepare() {
cd $pkgbase-$pkgver
- patch -Np1 -i "$srcdir/fix_external_program_directories.patch"
+ patch -Np1 -i ../fix_external_program_directories.patch
+ patch -Np1 -i ../arch-pam.patch
+ AUTOPOINT='intltoolize --automake -c' autoreconf -fi
}
+
build() {
cd $pkgbase-$pkgver
./configure \
@@ -39,7 +43,7 @@
--without-tcp-wrappers \
--without-console-kit \
--with-systemd \
- --with-default-pam-config=exherbo
+ --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
Added: arch-pam.patch
===================================================================
--- arch-pam.patch (rev 0)
+++ arch-pam.patch 2013-07-24 12:21:15 UTC (rev 191369)
@@ -0,0 +1,179 @@
+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
+
More information about the arch-commits
mailing list