enable PAM support again, as an option; require pam-pwauth_suid on NetBSD

in that case (setuid does not work here because gtk refuses it)

6 files changed, 41 insertions, 23 deletions

diff --git a/x11/gnome-screensaver/MESSAGE b/x11/gnome-screensaver/MESSAGE
index 92e5b2abb8c..8dd2507f27d 100644
--- a/x11/gnome-screensaver/MESSAGE
+++ b/x11/gnome-screensaver/MESSAGE
@@ -1,11 +1,15 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2006/05/02 15:54:16 drochner Exp $
+$NetBSD: MESSAGE,v 1.3 2007/01/08 21:48:40 drochner Exp $
 
-In order to get gnome-screensaver working properly, you need to add a
+If gnome-screensaver is built with the "pam" option:
+In order to make unlocking work, you need to add a
 gnome-screensaver file to your pam configuration directory (usually
 /etc/pam.d).  You can find sample files in:
-
-	${EGDIR}/pam.d/gnome-screensaver
+	${EGDIR}/pam.d/gnome-screensaver-*
+On  NetBSD, the "pam_pwauth_suid.so" module must be used to authenticate
+against a shadow password database. Note that use of this module might
+allow programs with your privileges to get a copy of your plaintext
+password as typed in for unlocking.
 
 The "floating feet" animation needs librsvg (from pkgsrc/graphics/librsvg2)
 to read its graphics file.
diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index 6cbb3d790ab..7f2c4c43481 100644
--- a/x11/gnome-screensaver/Makefile
+++ b/x11/gnome-screensaver/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2006/11/22 17:17:45 drochner Exp $
+# $NetBSD: Makefile,v 1.16 2007/01/08 21:48:40 drochner Exp $
 #
 
-DISTNAME=	gnome-screensaver-2.16.0
-PKGREVISION=	3
+DISTNAME=	gnome-screensaver-2.16.2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-screensaver/2.16/}
 
@@ -19,13 +18,24 @@ USE_X11=		yes
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "NetBSD"
-# gnome-screensaver-dialog drops SUID privs
+PKG_OPTIONS_VAR=	PKG_OPTIONS.gnome-screensaver
+PKG_SUPPORTED_OPTIONS=	pam
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mpam)
+. include "../../mk/pam.buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-pam
+. include "../../mk/bsd.prefs.mk"
+. if ${OPSYS} == "NetBSD"
+# needed to read shadow passwords
+DEPENDS+=	pam-pwauth_suid-*:../../security/pam-pwauth_suid
+. endif
+.else
 CONFIGURE_ARGS+=	--disable-pam
 .endif
 
-PKGCONFIG_OVERRIDE=	data/gnome-screensaver.pc
+PKGCONFIG_OVERRIDE=	data/gnome-screensaver.pc.in
 
 GCONF2_SCHEMAS=		gnome-screensaver.schemas
 
@@ -47,7 +57,9 @@ post-install:
 		${EGDIR}/pam.d/gnome-screensaver-NetBSD
 	${INSTALL_DATA} ${WRKSRC}/data/gnome-screensaver \
 		${EGDIR}/pam.d/gnome-screensaver-Linux
+.if empty(PKG_OPTIONS:Mpam)
 	${CHMOD} 04555 ${PREFIX}/libexec/gnome-screensaver-dialog
+.endif
 
 .include "../../devel/GConf2/schemas.mk"
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/x11/gnome-screensaver/PLIST b/x11/gnome-screensaver/PLIST
index 7a480b720e3..60e0cbbb198 100644
--- a/x11/gnome-screensaver/PLIST
+++ b/x11/gnome-screensaver/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2006/09/20 14:40:14 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2007/01/08 21:48:40 drochner Exp $
 bin/gnome-screensaver
 bin/gnome-screensaver-command
 bin/gnome-screensaver-preferences
@@ -20,6 +20,7 @@ share/examples/gnome-screensaver/xdg/menus/gnome-screensavers.menu
 share/gconf/schemas/gnome-screensaver.schemas
 share/gnome-screensaver/gnome-screensaver-preferences.glade
 share/gnome-screensaver/lock-dialog-default.glade
+share/locale/ar/LC_MESSAGES/gnome-screensaver.mo
 share/locale/bg/LC_MESSAGES/gnome-screensaver.mo
 share/locale/bn/LC_MESSAGES/gnome-screensaver.mo
 share/locale/bn_IN/LC_MESSAGES/gnome-screensaver.mo
diff --git a/x11/gnome-screensaver/distinfo b/x11/gnome-screensaver/distinfo
index 34c6cb5194c..36d66980448 100644
--- a/x11/gnome-screensaver/distinfo
+++ b/x11/gnome-screensaver/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2006/09/15 15:19:54 jmmv Exp $
+$NetBSD: distinfo,v 1.8 2007/01/08 21:48:40 drochner Exp $
 
-SHA1 (gnome-screensaver-2.16.0.tar.gz) = a4120fc320b9b7a8e7992ec3200bda950070a851
-RMD160 (gnome-screensaver-2.16.0.tar.gz) = e39f85239b5809a703f108b98a514265fd314f11
-Size (gnome-screensaver-2.16.0.tar.gz) = 2308702 bytes
+SHA1 (gnome-screensaver-2.16.2.tar.gz) = cbc59b9f0b3232de5587541efaeca8f4fda40263
+RMD160 (gnome-screensaver-2.16.2.tar.gz) = e3bf41db4fbbf8dbda440d4f505287feaa63423f
+Size (gnome-screensaver-2.16.2.tar.gz) = 2338710 bytes
 SHA1 (patch-aa) = 8cb55b6b916e4d49c6a2107012dd07fae528bf53
 SHA1 (patch-ab) = 5b5f9d69fd071bfd6f9b316626e23585841dad9d
-SHA1 (patch-ac) = cd295277d2be9b268f5251d098a2452e359cbdf2
+SHA1 (patch-ac) = bd1d74084b9a10319b55fd726b739fd1f5466cae
diff --git a/x11/gnome-screensaver/files/pam-gnome-screensaver-NetBSD b/x11/gnome-screensaver/files/pam-gnome-screensaver-NetBSD
index be86a439894..82f1a6a602e 100644
--- a/x11/gnome-screensaver/files/pam-gnome-screensaver-NetBSD
+++ b/x11/gnome-screensaver/files/pam-gnome-screensaver-NetBSD
@@ -1,9 +1,10 @@
-# $NetBSD: pam-gnome-screensaver-NetBSD,v 1.1.1.1 2006/04/01 21:43:59 jmmv Exp $
+# $NetBSD: pam-gnome-screensaver-NetBSD,v 1.2 2007/01/08 21:48:40 drochner Exp $
 #
 # PAM configuration for the "gnome-screensaver" service
 #
 
 # auth
+auth		sufficient	pam_pwauth_suid.so
 auth		include		system
 
 # account
diff --git a/x11/gnome-screensaver/patches/patch-ac b/x11/gnome-screensaver/patches/patch-ac
index b86cf1d81c1..acc9c0ba090 100644
--- a/x11/gnome-screensaver/patches/patch-ac
+++ b/x11/gnome-screensaver/patches/patch-ac
@@ -1,16 +1,16 @@
-$NetBSD: patch-ac,v 1.2 2006/09/15 15:19:55 jmmv Exp $
+$NetBSD: patch-ac,v 1.3 2007/01/08 21:48:40 drochner Exp $
 
---- src/gs-auth-pam.c.orig	2006-06-08 22:23:40.000000000 +0200
+--- src/gs-auth-pam.c.orig	2006-11-09 17:17:35.000000000 +0100
 +++ src/gs-auth-pam.c
-@@ -204,7 +204,11 @@ pam_conversation (int                   
+@@ -226,7 +226,11 @@ pam_conversation (int                   
                          if (res) {
                                  reply [replies].resp_retcode = PAM_SUCCESS;
                          } else {
 +#if defined(PAM_INCOMPLETE)
                                  reply [replies].resp_retcode = PAM_INCOMPLETE;
 +#else
-+                                reply [replies].resp_retcode = PAM_SERVICE_ERR;
++				reply [replies].resp_retcode = PAM_SERVICE_ERR;
 +#endif
                          }
                  }
-         }
+