From 98bf2ac3fdd6f7bcb6ce45c932fc13c07fecc03f Mon Sep 17 00:00:00 2001 From: root Date: Wed, 25 Apr 2012 00:01:35 +0000 Subject: Wed Apr 25 00:01:35 UTC 2012 --- extra/gdm/PKGBUILD | 49 ++++++++++++------------ extra/gdm/fix_external_program_directories.patch | 20 +++++----- extra/gdm/gdm-autologin.pam | 2 + extra/gdm/gdm-fingerprint.pam | 2 + extra/gdm/gdm-password.pam | 2 + extra/gdm/gdm-smartcard.pam | 2 + extra/gdm/gdm.install | 13 +++---- 7 files changed, 49 insertions(+), 41 deletions(-) (limited to 'extra/gdm') diff --git a/extra/gdm/PKGBUILD b/extra/gdm/PKGBUILD index 038f85375..db3d8994b 100644 --- a/extra/gdm/PKGBUILD +++ b/extra/gdm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 140873 2011-10-20 05:42:19Z ibiru $ +# $Id: PKGBUILD 156778 2012-04-23 09:05:26Z ibiru $ # Maintainer: Jan de Groot pkgname=gdm -pkgver=3.2.1.1 -pkgrel=1 +pkgver=3.4.1 +pkgrel=2 pkgdesc="Gnome Display Manager (a reimplementation of xdm)" arch=('i686' 'x86_64') license=('GPL') @@ -14,28 +14,29 @@ groups=('gnome-extra') options=('!libtool') depends=('libcanberra' 'libxklavier' 'gnome-session' 'gnome-settings-daemon' 'metacity' 'upower' 'accountsservice' 'consolekit' 'xorg-xrdb' 'nss') makedepends=('intltool' 'gnome-doc-utils' 'xorg-server' 'gobject-introspection') -optdepends=('gnome-shell: new login interface') +optdepends=('gnome-shell: new login interface' + 'fprintd: fingerprint authentication') install=gdm.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz fix_external_program_directories.patch gdm-vt-allocation-hack.patch gdm gdm-autologin.pam gdm-fingerprint.pam gdm.pam gdm-password.pam gdm-smartcard.pam gdm-welcome.pam) -sha256sums=('85a1383f93870fb5d47a938cc2e04b6f0d74cb611a2b5d94d9651b78a5ccffbd' - '2014ae3a6077546f7c07e80a6acc8a1c80c6765ad319ec389f52500c5a4fb363' +sha256sums=('6292968dff5fc89877b5e1aaa3c7d1484dd3ed2d4f388e935841d053439be665' + 'f68600ccf80f475deb417d58ab3306c4a1ba4622688e2901996c8549c85a9ee6' '3c8b588d4af08d94dc93bcd5e4c2a983c3f4fbbbe40833bceac2a1df4f1e8215' '272c08d8e8b50bf424d0705ac864d4c18c47ec4f6893b1af732c2efbc86c9550' - 'b30dfa217718b43ff3aa4e8af08985963175b79ff30698ec54e8396d2905922d' - '5bc3ff3ea7b31219dfcb7d9fc0eb2819eca1c5573a0f426d288a17560a69633e' + '6a8b286d1ffa04150b3cc401f64e6ddec778c7b65f5bfc831031b64345d7e6b2' + 'dd50f5bd28807a16c5ebe89fc868b7c47fa571138498e879f2b1c9da1ad6eb84' 'f1dfa4d88288d4b0a631a68a51b46c2da537bee8fe5a99f9f288c8ff75a50b19' - '92aded0804bad8a609fd150448ad4a2edb8166c17cb4e2b581559e80603bbb6c' - 'df74b0dcfb17ea43cc1e268a27cd256c552672457db1af40b285452d16b3e2fd' + '1a1e9b3f26de4eb9f45d1e9a0b5d0db902ca734461ba46b4bb620b0298bb98aa' + '844d5fae0df59241d34099a3d458289bd95707b2aae976627c663904294043d8' '39bf3824cc505043dc3136356da16dab9df9f369f1077435a324be2ac16cf834') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/fix_external_program_directories.patch" - patch -Np1 -i "${srcdir}/gdm-vt-allocation-hack.patch" + cd "$pkgname-$pkgver" + patch -Np1 -i "$srcdir/fix_external_program_directories.patch" + patch -Np1 -i "$srcdir/gdm-vt-allocation-hack.patch" ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/gdm \ @@ -43,24 +44,24 @@ build() { --with-at-spi-registryd-directory=/usr/lib/at-spi2-core \ --disable-scrollkeeper \ --disable-static \ - --without-tcp-wrappers + --without-tcp-wrappers \ + --disable-schemas-compile \ + --with-systemd=no 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 } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gdm ${pkgdir}/etc/gconf/schemas/*.schemas + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install for i in gdm-autologin.pam gdm-fingerprint.pam gdm.pam gdm-password.pam gdm-smartcard.pam gdm-welcome.pam;do - install -m644 "${srcdir}/${i}" "${pkgdir}/etc/pam.d/${i%.pam}" + install -m644 "$srcdir/$i" "$pkgdir/etc/pam.d/${i%.pam}" done - install -Dm755 "${srcdir}/gdm" "${pkgdir}/etc/rc.d/gdm" + install -Dm755 "$srcdir/gdm" "$pkgdir/etc/rc.d/gdm" - chmod 1770 "${pkgdir}/var/log/gdm" - chmod 700 "${pkgdir}/var/lib/gdm/.config/dconf" - rm -rf "${pkgdir}/var/run" "${pkgdir}/var/gdm" "${pkgdir}/etc/gconf" + chmod 1770 "$pkgdir/var/log/gdm" + chmod 700 "$pkgdir/var/lib/gdm/.config/dconf" + rm -rf "$pkgdir/var/run" "$pkgdir/var/gdm" } diff --git a/extra/gdm/fix_external_program_directories.patch b/extra/gdm/fix_external_program_directories.patch index 997ea5405..b3a0f0cf6 100644 --- a/extra/gdm/fix_external_program_directories.patch +++ b/extra/gdm/fix_external_program_directories.patch @@ -1,7 +1,7 @@ -diff -Nur gdm-3.2.0.orig/daemon/gdm-server.c gdm-3.2.0/daemon/gdm-server.c ---- gdm-3.2.0.orig/daemon/gdm-server.c 2011-10-02 01:13:37.772372528 +0000 -+++ gdm-3.2.0/daemon/gdm-server.c 2011-10-02 01:14:58.036444496 +0000 -@@ -131,7 +131,7 @@ +diff -Nur gdm-3.3.92.orig/daemon/gdm-server.c gdm-3.3.92/daemon/gdm-server.c +--- gdm-3.3.92.orig/daemon/gdm-server.c 2012-03-19 22:30:05.311490006 +0000 ++++ gdm-3.3.92/daemon/gdm-server.c 2012-03-19 22:30:17.004732251 +0000 +@@ -139,7 +139,7 @@ g_return_val_if_fail (GDM_IS_SERVER (server), NULL); error = NULL; @@ -10,9 +10,9 @@ diff -Nur gdm-3.2.0.orig/daemon/gdm-server.c gdm-3.2.0/daemon/gdm-server.c server->priv->display_name); g_debug ("GdmServer: Running helper %s", command); -diff -Nur gdm-3.2.0.orig/data/gdm-shell.session.in gdm-3.2.0/data/gdm-shell.session.in ---- gdm-3.2.0.orig/data/gdm-shell.session.in 2011-10-02 01:17:01.394246573 +0000 -+++ gdm-3.2.0/data/gdm-shell.session.in 2011-10-02 01:16:22.210552560 +0000 +diff -Nur gdm-3.3.92.orig/data/gdm-shell.session.in gdm-3.3.92/data/gdm-shell.session.in +--- gdm-3.3.92.orig/data/gdm-shell.session.in 2012-03-19 22:30:05.311490006 +0000 ++++ gdm-3.3.92/data/gdm-shell.session.in 2012-03-19 22:30:17.004732251 +0000 @@ -1,5 +1,5 @@ [GNOME Session] Name=Display Manager @@ -20,9 +20,9 @@ diff -Nur gdm-3.2.0.orig/data/gdm-shell.session.in gdm-3.2.0/data/gdm-shell.sess -IsRunnableHelper=bash -c 'gnome-shell --help | grep -q gdm-mode && @libexecdir@/gnome-session-check-accelerated' +IsRunnableHelper=bash -c 'gnome-shell --help | grep -q gdm-mode && /usr/lib/gnome-session/gnome-session-check-accelerated' FallbackSession=gdm-fallback -diff -Nur gdm-3.2.0.orig/gui/simple-chooser/gdm-chooser-session.c gdm-3.2.0/gui/simple-chooser/gdm-chooser-session.c ---- gdm-3.2.0.orig/gui/simple-chooser/gdm-chooser-session.c 2011-10-02 01:13:37.775705892 +0000 -+++ gdm-3.2.0/gui/simple-chooser/gdm-chooser-session.c 2011-10-02 01:14:58.036444496 +0000 +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; diff --git a/extra/gdm/gdm-autologin.pam b/extra/gdm/gdm-autologin.pam index c77c78917..bc0193df0 100644 --- a/extra/gdm/gdm-autologin.pam +++ b/extra/gdm/gdm-autologin.pam @@ -7,6 +7,8 @@ auth requisite pam_permit.so auth sufficient pam_succeed_if.so uid >= 1000 quiet auth required pam_deny.so +account required pam_access.so +account required pam_time.so account required pam_unix.so password required pam_deny.so diff --git a/extra/gdm/gdm-fingerprint.pam b/extra/gdm/gdm-fingerprint.pam index 5b74bf6d6..38fab5782 100644 --- a/extra/gdm/gdm-fingerprint.pam +++ b/extra/gdm/gdm-fingerprint.pam @@ -7,6 +7,8 @@ auth requisite pam_fprintd.so auth sufficient pam_succeed_if.so uid >= 1000 quiet auth required pam_deny.so +account required pam_access.so +account required pam_time.so account required pam_unix.so password required pam_deny.so diff --git a/extra/gdm/gdm-password.pam b/extra/gdm/gdm-password.pam index aa4d4dd47..eed5e1003 100644 --- a/extra/gdm/gdm-password.pam +++ b/extra/gdm/gdm-password.pam @@ -8,6 +8,8 @@ auth optional pam_gnome_keyring.so auth sufficient pam_succeed_if.so uid >= 1000 quiet auth required pam_deny.so +account required pam_access.so +account required pam_time.so account required pam_unix.so password required pam_unix.so diff --git a/extra/gdm/gdm-smartcard.pam b/extra/gdm/gdm-smartcard.pam index baacb8bed..c5c29e73f 100644 --- a/extra/gdm/gdm-smartcard.pam +++ b/extra/gdm/gdm-smartcard.pam @@ -7,6 +7,8 @@ auth requisite pam_pkcs11.so wait_for_card card_only auth sufficient pam_succeed_if.so uid >= 1000 quiet auth required pam_deny.so +account required pam_access.so +account required pam_time.so account required pam_unix.so password required pam_pkcs11.so diff --git a/extra/gdm/gdm.install b/extra/gdm/gdm.install index fda42d319..c48faf4ae 100644 --- a/extra/gdm/gdm.install +++ b/extra/gdm/gdm.install @@ -6,14 +6,13 @@ post_install() { passwd -l gdm > /dev/null chown -R gdm:gdm /var/lib/gdm > /dev/null - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - gconfpkg --install ${pkgname} - glib-compile-schemas usr/share/glib-2.0/schemas + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor dconf update } -pre_remove() { - if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then +pre_upgrade() { + if [ -f /usr/share/gconf/schemas/${pkgname}.schemas ]; then gconfpkg --uninstall ${pkgname} fi } @@ -23,9 +22,9 @@ post_upgrade() { } post_remove() { - glib-compile-schemas usr/share/glib-2.0/schemas + glib-compile-schemas /usr/share/glib-2.0/schemas dconf update - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + 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 } -- cgit v1.2.3-54-g00ecf