From b0290b4d03ab244436ce02d79534878c73d59abf Mon Sep 17 00:00:00 2001 From: piernov Date: Fri, 23 Sep 2011 21:11:38 +0200 Subject: gdm 3.1.92-2 màj pam MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gdm/.md5sum.i686 | 8 ++++++-- gdm/.md5sum.x86_64 | 8 ++++++-- gdm/Pkgfile | 18 ++++++++++++------ gdm/gdm-autologin.pam | 8 -------- gdm/gdm.pam | 10 ---------- gdm/pam/gdm-autologin.pam | 18 ++++++++++++++++++ gdm/pam/gdm-fingerprint.pam | 18 ++++++++++++++++++ gdm/pam/gdm-password.pam | 20 ++++++++++++++++++++ gdm/pam/gdm-smartcard.pam | 18 ++++++++++++++++++ gdm/pam/gdm-welcome.pam | 12 ++++++++++++ gdm/pam/gdm.pam | 10 ++++++++++ gdm/patch/switch_user.patch | 18 +++++++++--------- 12 files changed, 129 insertions(+), 37 deletions(-) delete mode 100644 gdm/gdm-autologin.pam delete mode 100644 gdm/gdm.pam create mode 100644 gdm/pam/gdm-autologin.pam create mode 100644 gdm/pam/gdm-fingerprint.pam create mode 100644 gdm/pam/gdm-password.pam create mode 100644 gdm/pam/gdm-smartcard.pam create mode 100644 gdm/pam/gdm-welcome.pam create mode 100644 gdm/pam/gdm.pam (limited to 'gdm') diff --git a/gdm/.md5sum.i686 b/gdm/.md5sum.i686 index 015606b..60f097d 100644 --- a/gdm/.md5sum.i686 +++ b/gdm/.md5sum.i686 @@ -1,8 +1,12 @@ 5cd541c3f55aa49a8ce0dc974c7f1b95 default_session.patch 9d9e6bf9fd53140d29bcf2f7b137c25d fix_external_program_paths.patch 01c04e88dbb3138e3c469dffadba61b5 gdm-3.1.92.tar.xz -157f32e089a7aab50732dc122e592b35 gdm-autologin.pam +0f5460ca7e98d743679b90258c650949 gdm-autologin.pam +b0828986744bb1ef7afac02e8e65ff8b gdm-fingerprint.pam +0f1811f5f71418e5b298faca864286ae gdm-password.pam +6ea0e7268ab7044156a72ab7f04a27a4 gdm-smartcard.pam +d445a269dedf020bb88bf229279aeb8f gdm-welcome.pam 2e52f326dccc833e9c135f8df8297b12 gdm.pam -437f70d90eae8008da0814ad977ec971 switch_user.patch +f3651a027cd8dd6888085412eddd5d1f switch_user.patch 7738f68b6d3c9530133217b2c7969867 time_display_on_greeter.patch e5e2643269db8ee342690cc515fd620b vt-allocation-hack.patch diff --git a/gdm/.md5sum.x86_64 b/gdm/.md5sum.x86_64 index 015606b..60f097d 100644 --- a/gdm/.md5sum.x86_64 +++ b/gdm/.md5sum.x86_64 @@ -1,8 +1,12 @@ 5cd541c3f55aa49a8ce0dc974c7f1b95 default_session.patch 9d9e6bf9fd53140d29bcf2f7b137c25d fix_external_program_paths.patch 01c04e88dbb3138e3c469dffadba61b5 gdm-3.1.92.tar.xz -157f32e089a7aab50732dc122e592b35 gdm-autologin.pam +0f5460ca7e98d743679b90258c650949 gdm-autologin.pam +b0828986744bb1ef7afac02e8e65ff8b gdm-fingerprint.pam +0f1811f5f71418e5b298faca864286ae gdm-password.pam +6ea0e7268ab7044156a72ab7f04a27a4 gdm-smartcard.pam +d445a269dedf020bb88bf229279aeb8f gdm-welcome.pam 2e52f326dccc833e9c135f8df8297b12 gdm.pam -437f70d90eae8008da0814ad977ec971 switch_user.patch +f3651a027cd8dd6888085412eddd5d1f switch_user.patch 7738f68b6d3c9530133217b2c7969867 time_display_on_greeter.patch e5e2643269db8ee342690cc515fd620b vt-allocation-hack.patch diff --git a/gdm/Pkgfile b/gdm/Pkgfile index 251d143..dd31c68 100755 --- a/gdm/Pkgfile +++ b/gdm/Pkgfile @@ -7,15 +7,21 @@ name=gdm version=3.1.92 -release=1 +release=2 source=(http://download.gnome.org/sources/$name/${version%.*}/$name-$version.tar.xz \ + patch/fix_external_program_paths.patch patch/vt-allocation-hack.patch patch/default_session.patch patch/switch_user.patch patch/time_display_on_greeter.patch - gdm.pam - gdm-autologin.pam) + + pam/gdm.pam + pam/gdm-autologin.pam + pam/gdm-fingerprint.pam + pam/gdm-password.pam + pam/gdm-smartcard.pam + pam/gdm-welcome.pam) build() { cd $name-$version @@ -46,9 +52,9 @@ build() { gconf-merge-schema $PKG/usr/share/gconf/schemas/$name.schemas --domain gdm $PKG/etc/gconf/schemas/*.schemas rm -r $PKG/etc/gconf/ - install -m644 ../gdm-autologin.pam $PKG/etc/pam.d/gdm-autologin - install -m644 ../gdm.pam $PKG/etc/pam.d/gdm - sed -e 's/include\s*system-auth/required\tpam_unix.so/' -i $PKG/etc/pam.d/gdm-welcome + for i in gdm.pam gdm-autologin.pam gdm-fingerprint.pam gdm-password.pam gdm-smartcard.pam gdm-welcome.pam; do + install -m644 $SRC/$i $PKG/etc/pam.d/${i%.pam} + done rm -rf $PKG/var/gdm chmod 1770 $PKG/var/log/gdm diff --git a/gdm/gdm-autologin.pam b/gdm/gdm-autologin.pam deleted file mode 100644 index 7c2f9a9..0000000 --- a/gdm/gdm-autologin.pam +++ /dev/null @@ -1,8 +0,0 @@ -#%PAM-1.0 -auth requisite pam_nologin.so -auth required pam_env.so -auth required pam_permit.so -account required pam_unix.so -password required pam_unix.so -session required pam_limits.so -session required pam_unix.so diff --git a/gdm/gdm.pam b/gdm/gdm.pam deleted file mode 100644 index 655299c..0000000 --- a/gdm/gdm.pam +++ /dev/null @@ -1,10 +0,0 @@ -#%PAM-1.0 -auth requisite pam_nologin.so -auth required pam_env.so -auth required pam_unix.so -auth optional pam_gnome_keyring.so -account required pam_unix.so -session required pam_limits.so -session required pam_unix.so -session optional pam_gnome_keyring.so auto_start -password required pam_unix.so diff --git a/gdm/pam/gdm-autologin.pam b/gdm/pam/gdm-autologin.pam new file mode 100644 index 0000000..c77c789 --- /dev/null +++ b/gdm/pam/gdm-autologin.pam @@ -0,0 +1,18 @@ +#%PAM-1.0 +auth requisite pam_nologin.so +auth required pam_env.so + +auth requisite pam_permit.so + +auth sufficient pam_succeed_if.so uid >= 1000 quiet +auth required pam_deny.so + +account required pam_unix.so + +password required pam_deny.so + +session required pam_loginuid.so +-session optional pam_systemd.so +session optional pam_keyinit.so revoke +session required pam_limits.so +session required pam_unix.so diff --git a/gdm/pam/gdm-fingerprint.pam b/gdm/pam/gdm-fingerprint.pam new file mode 100644 index 0000000..5b74bf6 --- /dev/null +++ b/gdm/pam/gdm-fingerprint.pam @@ -0,0 +1,18 @@ +#%PAM-1.0 +auth requisite pam_nologin.so +auth required pam_env.so + +auth requisite pam_fprintd.so + +auth sufficient pam_succeed_if.so uid >= 1000 quiet +auth required pam_deny.so + +account required pam_unix.so + +password required pam_deny.so + +session required pam_loginuid.so +-session optional pam_systemd.so +session optional pam_keyinit.so revoke +session required pam_limits.so +session required pam_unix.so diff --git a/gdm/pam/gdm-password.pam b/gdm/pam/gdm-password.pam new file mode 100644 index 0000000..7beda83 --- /dev/null +++ b/gdm/pam/gdm-password.pam @@ -0,0 +1,20 @@ +#%PAM-1.0 +auth requisite pam_nologin.so +auth required pam_env.so + +auth requisite pam_unix.so nullok +auth optional pam_gnome_keyring.so + +auth sufficient pam_succeed_if.so uid >= 1000 quiet +auth required pam_deny.so + +account required pam_unix.so + +password required pam_unix.so + +session required pam_loginuid.so +-session optional pam_systemd.so +session optional pam_keyinit.so revoke +session required pam_limits.so +session required pam_unix.so +session optional pam_gnome_keyring.so auto_start diff --git a/gdm/pam/gdm-smartcard.pam b/gdm/pam/gdm-smartcard.pam new file mode 100644 index 0000000..baacb8b --- /dev/null +++ b/gdm/pam/gdm-smartcard.pam @@ -0,0 +1,18 @@ +#%PAM-1.0 +auth requisite pam_nologin.so +auth required pam_env.so + +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_unix.so + +password required pam_pkcs11.so + +session required pam_loginuid.so +-session optional pam_systemd.so +session optional pam_keyinit.so revoke +session required pam_limits.so +session required pam_unix.so diff --git a/gdm/pam/gdm-welcome.pam b/gdm/pam/gdm-welcome.pam new file mode 100644 index 0000000..cc3811c --- /dev/null +++ b/gdm/pam/gdm-welcome.pam @@ -0,0 +1,12 @@ +#%PAM-1.0 +auth required pam_env.so +auth required pam_permit.so + +account required pam_nologin.so +account required pam_unix.so + +password required pam_deny.so + +session required pam_loginuid.so +-session optional pam_systemd.so +session optional pam_keyinit.so force revoke diff --git a/gdm/pam/gdm.pam b/gdm/pam/gdm.pam new file mode 100644 index 0000000..655299c --- /dev/null +++ b/gdm/pam/gdm.pam @@ -0,0 +1,10 @@ +#%PAM-1.0 +auth requisite pam_nologin.so +auth required pam_env.so +auth required pam_unix.so +auth optional pam_gnome_keyring.so +account required pam_unix.so +session required pam_limits.so +session required pam_unix.so +session optional pam_gnome_keyring.so auto_start +password required pam_unix.so diff --git a/gdm/patch/switch_user.patch b/gdm/patch/switch_user.patch index e9485dd..754e42c 100644 --- a/gdm/patch/switch_user.patch +++ b/gdm/patch/switch_user.patch @@ -91,7 +91,7 @@ diff -r -u gdm-3.1.90.old//daemon/gdm-display.c gdm-3.1.90/daemon/gdm-display.c diff -r -u gdm-3.1.90.old//daemon/gdm-greeter-server.c gdm-3.1.90/daemon/gdm-greeter-server.c --- gdm-3.1.90.old//daemon/gdm-greeter-server.c 2011-09-02 17:35:54.665697535 +0200 +++ gdm-3.1.90/daemon/gdm-greeter-server.c 2011-09-02 17:44:04.614674842 +0200 -@@ -344,6 +344,14 @@ +@@ -384,6 +384,14 @@ } void @@ -106,7 +106,7 @@ diff -r -u gdm-3.1.90.old//daemon/gdm-greeter-server.c gdm-3.1.90/daemon/gdm-gre gdm_greeter_server_request_timed_login (GdmGreeterServer *greeter_server, const char *username, int delay) -@@ -848,6 +856,9 @@ +@@ -901,6 +909,9 @@ " \n" " \n" " \n" @@ -116,7 +116,7 @@ diff -r -u gdm-3.1.90.old//daemon/gdm-greeter-server.c gdm-3.1.90/daemon/gdm-gre " \n" " \n" " \n" -@@ -1200,7 +1211,7 @@ +@@ -1253,7 +1264,7 @@ "display id", NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); @@ -314,7 +314,7 @@ diff -r -u gdm-3.1.90.old//daemon/gdm-simple-slave.c gdm-3.1.90/daemon/gdm-simpl }; static void gdm_simple_slave_class_init (GdmSimpleSlaveClass *klass); -@@ -622,6 +624,16 @@ +@@ -636,6 +638,16 @@ } static void @@ -331,7 +331,7 @@ diff -r -u gdm-3.1.90.old//daemon/gdm-simple-slave.c gdm-3.1.90/daemon/gdm-simpl on_session_conversation_started (GdmSession *session, const char *service_name, GdmSimpleSlave *slave) -@@ -640,6 +652,19 @@ +@@ -654,6 +666,19 @@ } } @@ -351,7 +351,7 @@ diff -r -u gdm-3.1.90.old//daemon/gdm-simple-slave.c gdm-3.1.90/daemon/gdm-simpl enabled = FALSE; gdm_slave_get_timed_login_details (GDM_SLAVE (slave), &enabled, &username, &delay); if (! enabled) { -@@ -1523,7 +1548,14 @@ +@@ -1552,7 +1577,14 @@ const GValue *value, GParamSpec *pspec) { @@ -366,7 +366,7 @@ diff -r -u gdm-3.1.90.old//daemon/gdm-simple-slave.c gdm-3.1.90/daemon/gdm-simpl default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; -@@ -1536,7 +1568,15 @@ +@@ -1565,7 +1597,15 @@ GValue *value, GParamSpec *pspec) { @@ -382,7 +382,7 @@ diff -r -u gdm-3.1.90.old//daemon/gdm-simple-slave.c gdm-3.1.90/daemon/gdm-simpl default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; -@@ -1573,6 +1613,14 @@ +@@ -1602,6 +1642,14 @@ g_type_class_add_private (klass, sizeof (GdmSimpleSlavePrivate)); @@ -397,7 +397,7 @@ diff -r -u gdm-3.1.90.old//daemon/gdm-simple-slave.c gdm-3.1.90/daemon/gdm-simpl dbus_g_object_type_install_info (GDM_TYPE_SIMPLE_SLAVE, &dbus_glib_gdm_simple_slave_object_info); } -@@ -1608,12 +1656,13 @@ +@@ -1637,12 +1685,13 @@ } GdmSlave * -- cgit v1.2.3-54-g00ecf