Attachment 89225 Details for Bug 126115 – gnome-screensaver-2.22.2_4.patch

[patch] gnome-screensaver-2.22.2_4.patch

gnome-screensaver-2.22.2_4.patch (text/plain), 1.63 KB, created by mwisnicki+freebsd on 2008-07-31 03:50:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: mwisnicki+freebsd

Created: 2008-07-31 03:50:01 UTC

Size: 1.63 KB

patch

obsolete

>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
>+.if !defined(GNOME_SCREENSAVER_WITH_BROKEN_PAM)
>+IGNORE=		PAM support is partially broken. Please read Makefile
>+.endif
> CONFIGURE_ARGS+=	--enable-pam
> PLIST_SUB+=		PAM=""
>-.if defined(WITH_KEYRING)
>+.else
>+CONFIGURE_ARGS+=	--disable-pam
>+PLIST_SUB+=		PAM="@comment "
>+.endif
>+
>+.if defined(WITH_KEYRING) && defined(WITH_PAM)
> 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
>+
>+pre-fetch:
>+.if defined(WITHOUT_PAM) && defined(WITH_KEYRING)
>+	@${ECHO_MSG} "Keyring integration is disabled because it needs PAM."
> .endif
> 
> post-patch:

Actions: View | Diff

Attachments on bug 126115: 89225