summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2008-08-09 07:55:22 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2008-08-09 07:55:22 +0000
commit9c21c2d7e89ce0f0ae38ef0e338bf3bc723b1382 (patch)
treed908961653954ba431640393579574e399bc8c19
parentAdd pam_helper, a small utility which allows non-PAM or non-setuid (diff)
Enable PAM support by default, and depend on pam_helper to provide the
authentication services.
-rw-r--r--x11/gnome-screensaver/Makefile16
1 files changed, 6 insertions, 10 deletions
diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index a8b29b5c58a7..eeae47840a69 100644
--- a/x11/gnome-screensaver/Makefile
+++ b/x11/gnome-screensaver/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnome-screensaver
PORTVERSION= 2.22.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -42,19 +42,15 @@ SCREENSAVER_DIR= share/applications/screensavers
XSCREENSAVER_EXCLUDE= "(popsquares.xml)"
-OPTIONS= PAM "Pluggable Authentication Module support (broken!)" off \
- KEYRING "Enable GnomeKeyring integration (needs PAM)" off
+OPTIONS= PAM "Pluggable Authentication Module support" on \
+ KEYRING "Enable GnomeKeyring integration (needs PAM)" on
.include <bsd.port.pre.mk>
.if defined(WITH_PAM)
-# Currently semi-broken: http://bugzilla.gnome.org/show_bug.cgi?id=370847
-# Our default pam_unix will not be able to authenticate
-# Define GNOME_SCREENSAVER_WITH_BROKEN_PAM only if you know what you are doing.
-.if !defined(GNOME_SCREENSAVER_WITH_BROKEN_PAM)
-IGNORE= PAM support is partially broken. Please read Makefile
-.endif
-CONFIGURE_ARGS+= --enable-pam
+RUN_DEPENDS+= pam_helper:${PORTSDIR}/security/pam_helper
+CONFIGURE_ARGS+= --enable-authentication-scheme=helper \
+ --with-passwd-helper=${LOCALBASE}/bin/pam_helper
PLIST_SUB+= PAM=""
.else
CONFIGURE_ARGS+= --disable-pam