Sync with the FreeBSD ports tree.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@11192 df743ca5-7f9a-e211-a948-0013205c9059

10 files changed, 80 insertions, 19 deletions

diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index 804dd4e19..c7f04a367 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -3,11 +3,12 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/security/gnome-keyring/Makefile,v 1.59 2008/03/09 18:30:40 mezz Exp $
+#   $MCom: ports/security/gnome-keyring/Makefile,v 1.61 2008/07/23 01:22:29 marcus Exp $
 #
 
 PORTNAME=	gnome-keyring
 PORTVERSION=	2.23.5
+PORTREVISION=	1
 CATEGORIES=	security gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -25,6 +26,7 @@ USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_LDCONFIG=	yes
+CONFIGURE_ARGS=	--with-pam-dir="${PREFIX}/lib"
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 GCONF_SCHEMAS=	gnome-keyring.schemas
diff --git a/security/gnome-keyring/pkg-plist b/security/gnome-keyring/pkg-plist
index afc0ea0c4..043e025ca 100644
--- a/security/gnome-keyring/pkg-plist
+++ b/security/gnome-keyring/pkg-plist
@@ -15,9 +15,9 @@ lib/libgp11.a
 lib/libgp11.la
 lib/libgp11.so
 lib/libgp11.so.0
-lib/security/pam_gnome_keyring.a
-lib/security/pam_gnome_keyring.la
-lib/security/pam_gnome_keyring.so
+lib/pam_gnome_keyring.a
+lib/pam_gnome_keyring.la
+lib/pam_gnome_keyring.so
 libdata/pkgconfig/gnome-keyring-1.pc
 libdata/pkgconfig/gp11-0.pc
 libexec/gnome-keyring-ask
@@ -120,7 +120,6 @@ share/locale/zh_CN/LC_MESSAGES/gnome-keyring.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-keyring.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-keyring.mo
 @dirrm %%DOCSDIR%%
-@dirrmtry lib/security
 @dirrm lib/gnome-keyring
 @dirrm include/gp11
 @dirrm include/gnome-keyring-1
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 263c51284..b54bba059 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -3,12 +3,12 @@
 # Whom:                Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gdm/Makefile,v 1.124 2008/06/09 05:34:29 marcus Exp $
+#   $MCom: ports/x11/gdm/Makefile,v 1.125 2008/07/26 02:40:42 marcus Exp $
 #
 
 PORTNAME=	gdm
 PORTVERSION=	2.22.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -39,19 +39,23 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		GTKDOC="false"
 
+SUB_FILES+=	gdm.pam
+
 GDMDIR?=	${PREFIX}/etc/gdm
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 GNOME_LOCALSTATEDIR=	/var
 
-OPTIONS=	IPV6 "Enable IPv6 support" on
+OPTIONS=	IPV6 "Enable IPv6 support" on \
+		KEYRING "Enable GnomeKeyring/PAM integration" on
 
 .include <bsd.port.pre.mk>
 
-.if exists(/usr/include/security/pam_misc.h)
-PLIST_SUB+=	PAM_MISC=""
+.if defined(WITHOUT_KEYRING)
+SUB_LIST+=	PAM_KEYRING=\#
 .else
-PLIST_SUB+=	PAM_MISC="@comment "
+RUN_DEPENDS+=	${LOCALBASE}/lib/pam_gnome_keyring.so:${PORTSDIR}/security/gnome-keyring
+SUB_LIST+=	PAM_KEYRING=
 .endif
 
 .if !defined(WITHOUT_IPV6)
@@ -81,6 +85,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/data/gdm.conf-custom \
 		${PREFIX}/etc/gdm/custom.conf.default
 	${MKDIR} ${PREFIX}/share/xsessions
+	${INSTALL_DATA} ${WRKDIR}/gdm.pam ${PREFIX}/etc/pam.d/gdm
 	@${MKDIR} ${PREFIX}/etc/gdm/Sessions
 	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' < ${PKGDIR}/pkg-message \
 		| /usr/bin/fmt 75 79 > ${PKGMESSAGE}
diff --git a/x11/gdm/files/gdm.in b/x11/gdm/files/gdm.in
index f44669946..df726e5af 100644
--- a/x11/gdm/files/gdm.in
+++ b/x11/gdm/files/gdm.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $FreeBSD$
-#    $MCom: ports-experimental/x11/gdm/files/gdm.in,v 1.1 2008/02/29 22:20:47 mezz Exp $
+#    $MCom: ports/x11/gdm/files/gdm.in,v 1.30 2008/03/24 14:15:12 kwm Exp $
 
 # PROVIDE: gdm
 # REQUIRE: LOGIN cleanvar moused syscons dbus
@@ -14,6 +14,7 @@
 . %%GNOME_SUBR%%
 
 gdm_enable=${gdm_enable-${gnome_enable}}
+gdm_preserve_base_pam_conf=${gdm_preserve_base_pam_conf-NO}
 
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin:%%LOCALBASE%%/bin:%%LOCALBASE%%/sbin
 
@@ -31,6 +32,12 @@ gdm_start()
     fi
     echo "Starting ${name}."
 
+    # make sure there is no pam configuration for gdm service in base system
+    if ! checkyesno gdm_preserve_base_pam_conf && [ -f /etc/pam.d/gdm ]; then
+	cp -p /etc/pam.d/gdm /etc/pam.d/gdm_disabled
+    	rm -f /etc/pam.d/gdm
+    fi
+
     ( iter=0
     while ! ps -axoargs | grep "^/usr/libexec/getty " | grep -qv grep >/dev/null 2>&1; do
 	if [ ${iter} -eq 60 ]; then
diff --git a/x11/gdm/files/gdm.pam.in b/x11/gdm/files/gdm.pam.in
new file mode 100644
index 000000000..2355004d0
--- /dev/null
+++ b/x11/gdm/files/gdm.pam.in
@@ -0,0 +1,21 @@
+#
+# $FreeBSD: src/etc/pam.d/gdm,v 1.8 2007/06/10 18:57:20 yar Exp $
+#
+# PAM configuration for the "gdm" service
+#
+
+# auth
+#auth		sufficient	pam_krb5.so		no_warn try_first_pass
+#auth		sufficient	pam_ssh.so		no_warn try_first_pass
+auth		required	pam_unix.so		no_warn try_first_pass
+%%PAM_KEYRING%%auth		optional	%%LOCALBASE%%/lib/pam_gnome_keyring.so
+
+# account
+account		required	pam_nologin.so
+#account 	required	pam_krb5.so
+account		required	pam_unix.so
+
+# session
+#session 	optional	pam_ssh.so
+session		required	pam_permit.so
+%%PAM_KEYRING%%session		optional	%%LOCALBASE%%/lib/pam_gnome_keyring.so	auto_start
diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist
index c4f919b40..bb09fcdb6 100644
--- a/x11/gdm/pkg-plist
+++ b/x11/gdm/pkg-plist
@@ -10,6 +10,7 @@ etc/gdm/Xsession
 etc/gdm/custom.conf.default
 @exec [ -f %B/custom.conf ] || cp %B/%f %B/custom.conf
 etc/gdm/gdm.schemas
+etc/pam.d/gdm
 libdata/bonobo/servers/GNOME_FastUserSwitchApplet.server
 libexec/gdm-crash-logger
 libexec/gdm-factory-slave
@@ -21,7 +22,6 @@ libexec/gdm-simple-greeter
 libexec/gdm-simple-slave
 libexec/gdm-user-switch-applet
 libexec/gdm-xdmcp-chooser-slave
-%%PAM_MISC%%libexec/gdmaskpass
 sbin/gdm
 sbin/gdm-binary
 sbin/gdm-restart
diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index 50908c11f..2a8dfa912 100644
--- a/x11/gnome-screensaver/Makefile
+++ b/x11/gnome-screensaver/Makefile
@@ -3,7 +3,7 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-screensaver/Makefile,v 1.89 2008/07/19 22:40:26 marcus Exp $
+#   $MCom: ports/x11/gnome-screensaver/Makefile,v 1.90 2008/07/23 19:07:09 marcus Exp $
 #
 
 PORTNAME=	gnome-screensaver
@@ -34,20 +34,40 @@ GCONF_SCHEMAS=	gnome-screensaver.schemas
 MAN1=		gnome-screensaver-command.1 gnome-screensaver-preferences.1 \
 		gnome-screensaver.1
 
-
 PLIST=	${WRKDIR}/pkg-plist
+SUB_FILES+=	gnome-screensaver.pam
 
 XSCREENSAVER_DIR=	${LOCALBASE}/share/xscreensaver/config
 SCREENSAVER_DIR=	share/applications/screensavers
 
 XSCREENSAVER_EXCLUDE=	"(popsquares.xml)"
 
-OPTIONS=	PAM "Pluggable Authentication Module support" off
+OPTIONS=	PAM "Pluggable Authentication Module support" off \
+		KEYRING "Enable GnomeKeyring/PAM integration" off
 
 .include <bsd.port.pre.mk>
 
-.if !defined(WITH_PAM)
+.if defined(WITH_PAM)
+CONFIGURE_ARGS+=	--enable-pam
+PLIST_SUB+=		PAM=""
+.if defined(WITH_KEYRING)
+SUB_LIST+=		PAM_KEYRING=
+RUN_DEPENDS+=		${LOCALBASE}/lib/pam_gnome_keyring.so:${PORTSDIR}/security/gnome-keyring
+.else
+SUB_LIST+=		PAM_KEYRING=\#
+.endif
+.else
 CONFIGURE_ARGS+=	--disable-pam
+PLIST_SUB+=		PAM="@comment "
+.if defined(WITH_KEYRING)
+.warning Option KEYRING needs PAM, but PAM is disabled.
+.endif
+.endif
+
+post-patch:
+.if defined(WITH_PAM)
+	@${REINPLACE_CMD} -e 's|/etc/pam.d|${PREFIX}/etc/pam.d|g' \
+		${WRKSRC}/src/gs-auth-pam.c
 .endif
 
 pre-install:
@@ -66,5 +86,8 @@ post-install:
 		${FIND} -s ${XSCREENSAVER_DIR} -maxdepth 1 -type f -name "*.xml" | \
 			${GREP} -Ev ${XSCREENSAVER_EXCLUDE} | \
 			${XARGS} ${WRKSRC}/data/migrate-xscreensaver-config.sh
+.if defined(WITH_PAM)
+	${INSTALL_DATA} ${WRKDIR}/gnome-screensaver.pam ${PREFIX}/etc/pam.d/gnome-screensaver
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/x11/gnome-screensaver/files/gnome-screensaver.pam.in b/x11/gnome-screensaver/files/gnome-screensaver.pam.in
new file mode 100644
index 000000000..c2f8394ff
--- /dev/null
+++ b/x11/gnome-screensaver/files/gnome-screensaver.pam.in
@@ -0,0 +1,3 @@
+auth		include		system
+%%PAM_KEYRING%%auth		optional	%%LOCALBASE%%/lib/pam_gnome_keyring.so
+account		include		system
diff --git a/x11/gnome-screensaver/pkg-plist b/x11/gnome-screensaver/pkg-plist
index 0670d8c17..e919aba09 100644
--- a/x11/gnome-screensaver/pkg-plist
+++ b/x11/gnome-screensaver/pkg-plist
@@ -1,6 +1,7 @@
 bin/gnome-screensaver
 bin/gnome-screensaver-command
 bin/gnome-screensaver-preferences
+%%PAM%%etc/pam.d/gnome-screensaver
 etc/xdg/menus/gnome-screensavers.menu
 libdata/pkgconfig/gnome-screensaver.pc
 libexec/gnome-screensaver-dialog
diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile
index 97a2a19e8..269491140 100644
--- a/x11/gnome2/Makefile
+++ b/x11/gnome2/Makefile
@@ -3,7 +3,7 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome2/Makefile,v 1.246 2008/07/23 19:47:14 marcus Exp $
+#   $MCom: ports/x11/gnome2/Makefile,v 1.247 2008/07/24 01:28:56 marcus Exp $
 #
 
 PORTNAME=	gnome2
@@ -102,7 +102,7 @@ RUN_DEPENDS+=	ekiga:${PORTSDIR}/net/ekiga
 
 .if ${.CURDIR}==${MASTERDIR} || ${.CURDIR:T}=="gnome2-lite"
 .if defined(WITH_XSCREENSAVER)
-RUN_DEPENDS+=	${LOCALBASE}/share/applications/gnome-screensaver-properties.desktop:${PORTSDIR}/x11/xscreensaver-gnome
+RUN_DEPENDS+=	${LOCALBASE}/share/applications/xscreensaver-properties.desktop:${PORTSDIR}/x11/xscreensaver-gnome
 .else
 RUN_DEPENDS+=	gnome-screensaver:${PORTSDIR}/x11/gnome-screensaver
 .endif