From 7c6072e3effa66b1bafeabc25ce1d271bee0b197 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Jul 19 2012 16:39:06 +0000 Subject: Update to 3.5.4.1 - Fixes autologin - Fixes logind integration - Fixes dconf incompatibility --- diff --git a/.gitignore b/.gitignore index 1b976c3..7e46adc 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,5 @@ gdm-2.30.2.tar.bz2 /gdm-3.4.1.tar.xz /gdm-3.5.2.tar.xz /gdm-3.5.4.tar.xz +/gdm-3.5.4.1.tar.xz +/org.gnome.login-screen.gschema.override diff --git a/gdm-autologin-pam b/gdm-autologin-pam deleted file mode 100644 index 0616e66..0000000 --- a/gdm-autologin-pam +++ /dev/null @@ -1,16 +0,0 @@ - #%PAM-1.0 -auth required pam_env.so -auth required pam_permit.so -auth include postlogin -account required pam_nologin.so -account include system-auth -password include system-auth -session required pam_selinux.so close -session required pam_loginuid.so -session optional pam_console.so --session optional pam_ck_connector.so -session required pam_selinux.so open -session optional pam_keyinit.so force revoke -session required pam_namespace.so -session include system-auth -session include postlogin diff --git a/gdm-fingerprint-16.png b/gdm-fingerprint-16.png deleted file mode 100644 index 4438cee..0000000 Binary files a/gdm-fingerprint-16.png and /dev/null differ diff --git a/gdm-fingerprint-48.png b/gdm-fingerprint-48.png deleted file mode 100644 index fd6f546..0000000 Binary files a/gdm-fingerprint-48.png and /dev/null differ diff --git a/gdm-fingerprint.pam b/gdm-fingerprint.pam deleted file mode 100644 index 684ac95..0000000 --- a/gdm-fingerprint.pam +++ /dev/null @@ -1,18 +0,0 @@ -auth substack fingerprint-auth -auth required pam_succeed_if.so user != root quiet -auth include postlogin - -account required pam_nologin.so -account include fingerprint-auth - -password include fingerprint-auth - -session required pam_selinux.so close -session required pam_loginuid.so -session optional pam_console.so --session optional pam_ck_connector.so -session required pam_selinux.so open -session optional pam_keyinit.so force revoke -session required pam_namespace.so -session include fingerprint-auth -session include postlogin diff --git a/gdm-password.pam b/gdm-password.pam deleted file mode 100644 index 650534c..0000000 --- a/gdm-password.pam +++ /dev/null @@ -1,21 +0,0 @@ -auth [success=done ignore=ignore default=bad] pam_selinux_permit.so -auth substack password-auth -auth required pam_succeed_if.so user != root quiet -auth optional pam_gnome_keyring.so -auth include postlogin - -account required pam_nologin.so -account include password-auth - -password include password-auth - -session required pam_selinux.so close -session required pam_loginuid.so -session optional pam_console.so --session optional pam_ck_connector.so -session required pam_selinux.so open -session optional pam_keyinit.so force revoke -session required pam_namespace.so -session include password-auth -session optional pam_gnome_keyring.so auto_start -session include postlogin diff --git a/gdm-smartcard-16.png b/gdm-smartcard-16.png deleted file mode 100644 index 0112af1..0000000 Binary files a/gdm-smartcard-16.png and /dev/null differ diff --git a/gdm-smartcard-48.png b/gdm-smartcard-48.png deleted file mode 100644 index 35d5578..0000000 Binary files a/gdm-smartcard-48.png and /dev/null differ diff --git a/gdm-smartcard.pam b/gdm-smartcard.pam deleted file mode 100644 index 1c8c7b1..0000000 --- a/gdm-smartcard.pam +++ /dev/null @@ -1,18 +0,0 @@ -auth substack smartcard-auth -auth required pam_succeed_if.so user != root quiet -auth include postlogin - -account required pam_nologin.so -account include smartcard-auth - -password include smartcard-auth - -session required pam_selinux.so close -session required pam_loginuid.so -session optional pam_console.so --session optional pam_ck_connector.so -session required pam_selinux.so open -session optional pam_keyinit.so force revoke -session required pam_namespace.so -session include smartcard-auth -session include postlogin diff --git a/gdm-welcome-pam b/gdm-welcome-pam deleted file mode 100644 index 17f323e..0000000 --- a/gdm-welcome-pam +++ /dev/null @@ -1,11 +0,0 @@ -#%PAM-1.0 -auth required pam_env.so -auth required pam_permit.so -auth include postlogin -account required pam_nologin.so -account include system-auth -password include system-auth -session required pam_loginuid.so -session optional pam_keyinit.so force revoke -session include system-auth -session include postlogin diff --git a/gdm.spec b/gdm.spec index 541c857..18d8a6c 100644 --- a/gdm.spec +++ b/gdm.spec @@ -13,24 +13,15 @@ Summary: The GNOME Display Manager Name: gdm -Version: 3.5.4 -Release: 3%{?dist} +Version: 3.5.4.1 +Release: 1%{?dist} Epoch: 1 License: GPLv2+ Group: User Interface/X URL: http://download.gnome.org/sources/gdm #VCS: git:git://git.gnome.org/gdm Source: http://download.gnome.org/sources/gdm/3.4/gdm-%{version}.tar.xz -Source2: gdm-autologin-pam -Source11: gdm-welcome-pam -Source3: gdm-password.pam -Source4: gdm-smartcard.pam -Source5: gdm-fingerprint.pam -Source6: gdm-smartcard-16.png -Source7: gdm-smartcard-48.png -Source8: gdm-fingerprint-16.png -Source9: gdm-fingerprint-48.png -Source10: org.gnome.login-screen.gschema.override +Source1: org.gnome.login-screen.gschema.override # upstream fix Patch0: dconf-profile.patch @@ -136,15 +127,6 @@ Development files and headers for writing GDM greeters. autoreconf -i -f %build -cp -f %{SOURCE2} data/gdm-autologin -cp -f %{SOURCE3} gui/simple-greeter/extensions/password/gdm-password.pam -cp -f %{SOURCE4} data/gdm-smartcard.pam -cp -f %{SOURCE5} data/gdm-fingerprint.pam -cp -f %{SOURCE11} data/gdm-welcome -cp -f %{SOURCE6} gui/simple-greeter/extensions/smartcard/icons/16x16/gdm-smartcard.png -cp -f %{SOURCE7} gui/simple-greeter/extensions/smartcard/icons/48x48/gdm-smartcard.png -cp -f %{SOURCE8} gui/simple-greeter/extensions/fingerprint/icons/16x16/gdm-fingerprint.png -cp -f %{SOURCE9} gui/simple-greeter/extensions/fingerprint/icons/48x48/gdm-fingerprint.png %configure --with-pam-prefix=%{_sysconfdir} \ --enable-split-authentication \ @@ -366,6 +348,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || : %{_libdir}/girepository-1.0/Gdm-1.0.typelib %changelog +* Thu Jul 19 2012 Ray Strode 3.5.4.1-1 +- Update to 3.5.4.1 +- Fixes autologin +- Fixes logind integration +- Fixes dconf incompatibility + * Thu Jul 19 2012 Matthias Clasen - 1:3.5.4-3 - Fix dconf profile syntax diff --git a/gdmsetup-pam b/gdmsetup-pam deleted file mode 100644 index 1952d97..0000000 --- a/gdmsetup-pam +++ /dev/null @@ -1,4 +0,0 @@ -#%PAM-1.0 -auth include config-util -account include config-util -session include config-util diff --git a/polkit-gnome-authentication-agent-1.desktop b/polkit-gnome-authentication-agent-1.desktop deleted file mode 100644 index a8c9662..0000000 --- a/polkit-gnome-authentication-agent-1.desktop +++ /dev/null @@ -1,5 +0,0 @@ -[Desktop Entry] -Type=Application -Name=PolicyKit Authentication Agent -Exec=/usr/libexec/polkit-gnome-authentication-agent-1 -OnlyShowIn=GNOME; diff --git a/sources b/sources index 740b364..44cd499 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -b622bb2b8a0461125824bcede844a9a7 gdm-3.5.4.tar.xz +e7a016c384f85aff5f974612a6236560 gdm-3.5.4.1.tar.xz +f8fbef8f99229e0e0dfa7621d4786786 org.gnome.login-screen.gschema.override