[arch-commits] Commit in gdm/repos (10 files)

Jan Steffens heftig at nymeria.archlinux.org
Wed Jul 24 12:37:22 UTC 2013


    Date: Wednesday, July 24, 2013 @ 14:37:22
  Author: heftig
Revision: 191371

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  gdm/repos/testing-i686/
  gdm/repos/testing-i686/PKGBUILD
    (from rev 191370, gdm/trunk/PKGBUILD)
  gdm/repos/testing-i686/arch-pam.patch
    (from rev 191370, gdm/trunk/arch-pam.patch)
  gdm/repos/testing-i686/fix_external_program_directories.patch
    (from rev 191370, gdm/trunk/fix_external_program_directories.patch)
  gdm/repos/testing-i686/gdm.install
    (from rev 191370, gdm/trunk/gdm.install)
  gdm/repos/testing-x86_64/
  gdm/repos/testing-x86_64/PKGBUILD
    (from rev 191370, gdm/trunk/PKGBUILD)
  gdm/repos/testing-x86_64/arch-pam.patch
    (from rev 191370, gdm/trunk/arch-pam.patch)
  gdm/repos/testing-x86_64/fix_external_program_directories.patch
    (from rev 191370, gdm/trunk/fix_external_program_directories.patch)
  gdm/repos/testing-x86_64/gdm.install
    (from rev 191370, gdm/trunk/gdm.install)

-------------------------------------------------------+
 testing-i686/PKGBUILD                                 |   85 +++++++
 testing-i686/arch-pam.patch                           |  179 ++++++++++++++++
 testing-i686/fix_external_program_directories.patch   |   12 +
 testing-i686/gdm.install                              |   30 ++
 testing-x86_64/PKGBUILD                               |   85 +++++++
 testing-x86_64/arch-pam.patch                         |  179 ++++++++++++++++
 testing-x86_64/fix_external_program_directories.patch |   12 +
 testing-x86_64/gdm.install                            |   30 ++
 8 files changed, 612 insertions(+)

Copied: gdm/repos/testing-i686/PKGBUILD (from rev 191370, gdm/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD	                        (rev 0)
+++ testing-i686/PKGBUILD	2013-07-24 12:37:22 UTC (rev 191371)
@@ -0,0 +1,85 @@
+# $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.8.3.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 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 arch-pam.patch)
+sha256sums=('a8c8a32803e32c5d087c75c6be8160cfe4d15843953f07b599d653bac471320e'
+            'a878680734e35c1d66252cbcfe678c3961b5ff0fa16302f8796a5e7e65ffe4a2'
+            'b5c225784c3107564cb9685e41dfecdb20b8ea2415905c4119c96748c4e68003')
+
+prepare() {
+  cd $pkgbase-$pkgver
+  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 \
+    --prefix=/usr \
+    --sbindir=/usr/bin \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib/gdm \
+    --localstatedir=/var \
+    --disable-static \
+    --disable-schemas-compile \
+    --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 \
+    --without-tcp-wrappers \
+    --without-console-kit \
+    --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 1770 "$pkgdir/var/log/gdm"
+  chmod 700 "$pkgdir/var/lib/gdm/.config/dconf"
+  rm -r "$pkgdir/var/run" "$pkgdir/var/gdm"
+
+### Split libgdm
+  make -C gui/libgdm DESTDIR="$pkgdir" uninstall
+}
+
+package_libgdm() {
+  pkgdesc="GDM support library"
+  depends=(systemd)
+
+  cd $pkgbase-$pkgver
+  make -C gui/libgdm DESTDIR="$pkgdir" install
+}

Copied: gdm/repos/testing-i686/arch-pam.patch (from rev 191370, gdm/trunk/arch-pam.patch)
===================================================================
--- testing-i686/arch-pam.patch	                        (rev 0)
+++ testing-i686/arch-pam.patch	2013-07-24 12:37:22 UTC (rev 191371)
@@ -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
+

Copied: gdm/repos/testing-i686/fix_external_program_directories.patch (from rev 191370, gdm/trunk/fix_external_program_directories.patch)
===================================================================
--- testing-i686/fix_external_program_directories.patch	                        (rev 0)
+++ testing-i686/fix_external_program_directories.patch	2013-07-24 12:37:22 UTC (rev 191371)
@@ -0,0 +1,12 @@
+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);

Copied: gdm/repos/testing-i686/gdm.install (from rev 191370, gdm/trunk/gdm.install)
===================================================================
--- testing-i686/gdm.install	                        (rev 0)
+++ testing-i686/gdm.install	2013-07-24 12:37:22 UTC (rev 191371)
@@ -0,0 +1,30 @@
+pkgname=gdm
+
+post_install() {
+  getent group gdm >/dev/null 2>&1 || groupadd -g 120 gdm
+  getent passwd gdm > /dev/null 2>&1 || usr/sbin/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
+
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+  dconf update
+}
+
+pre_upgrade() {
+  if [ -f /usr/share/gconf/schemas/${pkgname}.schemas ]; then
+    gconfpkg --uninstall ${pkgname}
+  fi
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+  dconf update
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+  getent passwd gdm >/dev/null 2>&1 && userdel gdm
+  getent group gdm >/dev/null 2>&1 && groupdel gdm
+}

Copied: gdm/repos/testing-x86_64/PKGBUILD (from rev 191370, gdm/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2013-07-24 12:37:22 UTC (rev 191371)
@@ -0,0 +1,85 @@
+# $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.8.3.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 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 arch-pam.patch)
+sha256sums=('a8c8a32803e32c5d087c75c6be8160cfe4d15843953f07b599d653bac471320e'
+            'a878680734e35c1d66252cbcfe678c3961b5ff0fa16302f8796a5e7e65ffe4a2'
+            'b5c225784c3107564cb9685e41dfecdb20b8ea2415905c4119c96748c4e68003')
+
+prepare() {
+  cd $pkgbase-$pkgver
+  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 \
+    --prefix=/usr \
+    --sbindir=/usr/bin \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib/gdm \
+    --localstatedir=/var \
+    --disable-static \
+    --disable-schemas-compile \
+    --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 \
+    --without-tcp-wrappers \
+    --without-console-kit \
+    --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 1770 "$pkgdir/var/log/gdm"
+  chmod 700 "$pkgdir/var/lib/gdm/.config/dconf"
+  rm -r "$pkgdir/var/run" "$pkgdir/var/gdm"
+
+### Split libgdm
+  make -C gui/libgdm DESTDIR="$pkgdir" uninstall
+}
+
+package_libgdm() {
+  pkgdesc="GDM support library"
+  depends=(systemd)
+
+  cd $pkgbase-$pkgver
+  make -C gui/libgdm DESTDIR="$pkgdir" install
+}

Copied: gdm/repos/testing-x86_64/arch-pam.patch (from rev 191370, gdm/trunk/arch-pam.patch)
===================================================================
--- testing-x86_64/arch-pam.patch	                        (rev 0)
+++ testing-x86_64/arch-pam.patch	2013-07-24 12:37:22 UTC (rev 191371)
@@ -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
+

Copied: gdm/repos/testing-x86_64/fix_external_program_directories.patch (from rev 191370, gdm/trunk/fix_external_program_directories.patch)
===================================================================
--- testing-x86_64/fix_external_program_directories.patch	                        (rev 0)
+++ testing-x86_64/fix_external_program_directories.patch	2013-07-24 12:37:22 UTC (rev 191371)
@@ -0,0 +1,12 @@
+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);

Copied: gdm/repos/testing-x86_64/gdm.install (from rev 191370, gdm/trunk/gdm.install)
===================================================================
--- testing-x86_64/gdm.install	                        (rev 0)
+++ testing-x86_64/gdm.install	2013-07-24 12:37:22 UTC (rev 191371)
@@ -0,0 +1,30 @@
+pkgname=gdm
+
+post_install() {
+  getent group gdm >/dev/null 2>&1 || groupadd -g 120 gdm
+  getent passwd gdm > /dev/null 2>&1 || usr/sbin/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
+
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+  dconf update
+}
+
+pre_upgrade() {
+  if [ -f /usr/share/gconf/schemas/${pkgname}.schemas ]; then
+    gconfpkg --uninstall ${pkgname}
+  fi
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+  dconf update
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+  getent passwd gdm >/dev/null 2>&1 && userdel gdm
+  getent group gdm >/dev/null 2>&1 && groupdel gdm
+}




More information about the arch-commits mailing list