[PATCH] x11/gnome-screensaver: Prevent foot-shooting and unbreak with portupgrade

Marcin Wisnicki mwisnicki+freebsd at gmail.com
Thu Jul 31 02:43:12 UTC 2008

>Submitter-Id:	current-users
>Originator:	Marcin Wisnicki
>Confidential:	no 
>Synopsis:	[PATCH] x11/gnome-screensaver: Prevent foot-shooting and unbreak with portupgrade
>Severity:	non-critical
>Priority:	low
>Category:	ports 
>Class:		change-request
>Release:	FreeBSD 7.0-STABLE i386
System: FreeBSD ghost.pnet.one.pl 7.0-STABLE FreeBSD 7.0-STABLE #15: Fri Jul 25 18:16:53 CEST 2008
- automatically disable keyring if pam is disabled
- remove .warning that confuses portupgrade
- provide more helpful descriptions of options
- break the build if PAM is enabled, define GNOME_SCREENSAVER_WITH_BROKEN_PAM
  if you really want PAM.

Port maintainer (gnome at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.77

--- gnome-screensaver-2.22.2_4.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/x11/gnome-screensaver.orig/Makefile /usr/ports/x11/gnome-screensaver/Makefile
--- /usr/ports/x11/gnome-screensaver.orig/Makefile	2008-07-27 22:23:26.000000000 +0200
+++ /usr/ports/x11/gnome-screensaver/Makefile	2008-07-31 04:37:57.000000000 +0200
@@ -42,26 +42,35 @@
 XSCREENSAVER_EXCLUDE=	"(popsquares.xml)"
-OPTIONS=	PAM "Pluggable Authentication Module support" off \
-		KEYRING "Enable GnomeKeyring/PAM integration" off
+OPTIONS=	PAM "Pluggable Authentication Module support (broken!)" off \
+		KEYRING "Enable GnomeKeyring integration (needs PAM)" off
 .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
+IGNORE=		PAM support is partially broken. Please read Makefile
 CONFIGURE_ARGS+=	--enable-pam
-.if defined(WITH_KEYRING)
+CONFIGURE_ARGS+=	--disable-pam
+PLIST_SUB+=		PAM="@comment "
+.if defined(WITH_KEYRING) && defined(WITH_PAM)
 RUN_DEPENDS+=		${LOCALBASE}/lib/pam_gnome_keyring.so:${PORTSDIR}/security/gnome-keyring
-CONFIGURE_ARGS+=	--disable-pam
-PLIST_SUB+=		PAM="@comment "
-.if defined(WITH_KEYRING)
-.warning Option KEYRING needs PAM, but PAM is disabled.
+.if defined(WITHOUT_PAM) && defined(WITH_KEYRING)
+	@${ECHO_MSG} "Keyring integration is disabled because it needs PAM."
--- gnome-screensaver-2.22.2_4.patch ends here ---

More information about the freebsd-gnome mailing list