diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2012-10-09 05:48:11 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2012-10-09 05:48:11 +0800 |
| commit | 7ab2b156b9ff90797e323939dfd4d03f54158af9 (patch) | |
| tree | 664e9959dff0dca20b9c0210f551276e84b38b37 /x11/gdm3 | |
| parent | ca0901871495faaf97136f0e16297af0226246f3 (diff) | |
| download | marcuscom-ports-7ab2b156b9ff90797e323939dfd4d03f54158af9.tar marcuscom-ports-7ab2b156b9ff90797e323939dfd4d03f54158af9.tar.gz marcuscom-ports-7ab2b156b9ff90797e323939dfd4d03f54158af9.tar.bz2 marcuscom-ports-7ab2b156b9ff90797e323939dfd4d03f54158af9.tar.lz marcuscom-ports-7ab2b156b9ff90797e323939dfd4d03f54158af9.tar.xz marcuscom-ports-7ab2b156b9ff90797e323939dfd4d03f54158af9.tar.zst marcuscom-ports-7ab2b156b9ff90797e323939dfd4d03f54158af9.zip | |
Tweak gdm pam file to load gnome-keyring for keyring unlock.
Submitted by: Berislav Purgar <bpurgar@gmail.com>
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@17110 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11/gdm3')
| -rw-r--r-- | x11/gdm3/Makefile | 6 | ||||
| -rw-r--r-- | x11/gdm3/files/patch-gui_simple-greeter_extensions_password_gdm-password.pam | 13 |
2 files changed, 11 insertions, 8 deletions
diff --git a/x11/gdm3/Makefile b/x11/gdm3/Makefile index 4d047a2f5..c5f8b2856 100644 --- a/x11/gdm3/Makefile +++ b/x11/gdm3/Makefile @@ -3,11 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gdm3/Makefile,v 1.19 2012/06/01 20:55:17 mezz Exp $ +# $MCom: ports/x11/gdm3/Makefile,v 1.20 2012/06/02 13:10:28 kwm Exp $ # PORTNAME= gdm PORTVERSION= 3.4.1 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -99,7 +100,8 @@ post-patch: ${WRKSRC}/data/Makefile.in @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ - ${WRKSRC}/daemon/gdm-session-worker.c + ${WRKSRC}/daemon/gdm-session-worker.c \ + ${WRKSRC}/gui/simple-greeter/extensions/password/gdm-password.pam @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \ -e 's|/usr/bin/X|${LOCALBASE}/bin/X|g' \ -e 's|/usr/bin/Xorg|${LOCALBASE}/bin/Xorg|g' \ diff --git a/x11/gdm3/files/patch-gui_simple-greeter_extensions_password_gdm-password.pam b/x11/gdm3/files/patch-gui_simple-greeter_extensions_password_gdm-password.pam index 08686fb88..258ec55aa 100644 --- a/x11/gdm3/files/patch-gui_simple-greeter_extensions_password_gdm-password.pam +++ b/x11/gdm3/files/patch-gui_simple-greeter_extensions_password_gdm-password.pam @@ -1,13 +1,14 @@ ---- gui/simple-greeter/extensions/password/gdm-password.pam.orig 2011-10-19 17:41:52.000000000 +0200 -+++ gui/simple-greeter/extensions/password/gdm-password.pam 2012-01-26 14:09:55.000000000 +0100 -@@ -1,19 +1,13 @@ +--- gui/simple-greeter/extensions/password/gdm-password.pam.orig 2011-10-21 04:13:08.000000000 +0000 ++++ gui/simple-greeter/extensions/password/gdm-password.pam 2012-10-08 21:32:54.000000000 +0000 +@@ -1,19 +1,12 @@ # Sample PAM file for doing password authentication. # Distros should replace this with what makes sense for them. -auth required pam_env.so - auth sufficient pam_unix.so nullok try_first_pass +-auth sufficient pam_unix.so nullok try_first_pass -auth requisite pam_succeed_if.so uid >= 500 quiet -auth required pam_deny.so +auth required pam_unix.so ++auth optional %%LOCALBASE%%/lib/pam_gnome_keyring.so account required pam_unix.so -account sufficient pam_localuser.so @@ -15,12 +16,12 @@ -account required pam_permit.so -password requisite pam_cracklib.so try_first_pass retry=3 type= - password sufficient pam_unix.so nullok try_first_pass use_authtok +-password sufficient pam_unix.so nullok try_first_pass use_authtok -password required pam_deny.so +password required pam_unix.so + -+#session required pam_unix.so +session include system ++session optional %%LOCALBASE%%/lib/pam_gnome_keyring.so auto_start -session optional pam_keyinit.so revoke -session required pam_limits.so |