Date: Sat, 26 Jul 2008 17:12:13 +0200 From: Marcin Wisnicki <mwisnicki+freebsd@gmail.com> To: FreeBSD-gnats-submit@freebsd.org Cc: gnome@FreeBSD.org Subject: [PATCH] x11/xscreensaver-gnome: GnomeKeyring integration Message-ID: <488b3ecf.1358560a.073c.6228@mx.google.com>
next in thread | raw e-mail | index | archive | help
>Submitter-Id: current-users >Originator: Marcin Wisnicki >Organization: >Confidential: no >Synopsis: [PATCH] x11/xscreensaver-gnome: GnomeKeyring integration >Severity: non-critical >Priority: low >Category: ports >Class: change-request >Release: FreeBSD 7.0-STABLE i386 >Environment: System: FreeBSD ghost.pnet.one.pl 7.0-STABLE FreeBSD 7.0-STABLE #15: Fri Jul 25 18:16:53 CEST 2008 >Description: - Optional (enabled by default) GnomeKeyring integration via PAM. - Enable PAM by default This patch assumes that ports/125967 is commited. I will also submit similar patch for x11/gdm. Added file(s): - files/xscreensaver.pam.in Removed file(s): - files/xscreensaver.pam Port maintainer (gnome@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- xscreensaver-gnome-5.06_1.patch begins here --- diff -ruN --exclude=CVS /usr/ports/x11/xscreensaver-gnome.orig/Makefile /usr/ports/x11/xscreensaver-gnome/Makefile --- /usr/ports/x11/xscreensaver-gnome.orig/Makefile 2008-07-19 15:52:49.000000000 +0200 +++ /usr/ports/x11/xscreensaver-gnome/Makefile 2008-07-26 01:36:46.000000000 +0200 @@ -8,7 +8,7 @@ PORTNAME?= xscreensaver-gnome PORTVERSION= 5.06 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= x11 gnome MASTER_SITES= http://www.jwz.org/xscreensaver/ DISTNAME= xscreensaver-${PORTVERSION} @@ -36,10 +36,13 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -OPTIONS?= PAM "Pluggable Authentication Module support" off \ +OPTIONS?= PAM "Pluggable Authentication Module support" on \ + KEYRING "Enable GnomeKeyring/PAM integration" on \ ALL_FORTUNES "Enable support for all fortunes" off \ SETUID_HACKS "Install sonar hack suid so it can ping" off +SUB_FILES+= xscreensaver.pam + MAN1?= xscreensaver-command.1 xscreensaver-demo.1 \ xscreensaver-getimage-file.1 xscreensaver-getimage-video.1 \ xscreensaver-getimage.1 xscreensaver-text.1 xscreensaver.1 @@ -90,9 +93,18 @@ .if defined(WITH_PAM) CONFIGURE_ARGS+= --with-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+= --without-pam PLIST_SUB+= PAM="@comment " +.if defined(WITH_KEYRING) +.warning Option KEYRING needs PAM, but PAM is disabled. +.endif .endif .if defined(WITH_SETUID_HACKS) @@ -114,12 +126,16 @@ @${REINPLACE_CMD} -e 's|/etc/pam.d|${PREFIX}/etc/pam.d|g' \ ${WRKSRC}/${f} .endfor - @${CP} ${FILESDIR}/xscreensaver.pam ${WRKSRC}/driver/xscreensaver.pam .else @${REINPLACE_CMD} -e 's|install-xml install-pam|install-xml|' \ ${WRKSRC}/driver/Makefile.in .endif +pre-install: +.if defined(WITH_PAM) + @${CP} ${WRKDIR}/xscreensaver.pam ${WRKSRC}/driver/xscreensaver.pam +.endif + .if !target(post-install-slave) post-install-slave: @${DO_NADA} diff -ruN --exclude=CVS /usr/ports/x11/xscreensaver-gnome.orig/files/xscreensaver.pam /usr/ports/x11/xscreensaver-gnome/files/xscreensaver.pam --- /usr/ports/x11/xscreensaver-gnome.orig/files/xscreensaver.pam 2008-07-06 23:04:51.000000000 +0200 +++ /usr/ports/x11/xscreensaver-gnome/files/xscreensaver.pam 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -auth include system -account include system diff -ruN --exclude=CVS /usr/ports/x11/xscreensaver-gnome.orig/files/xscreensaver.pam.in /usr/ports/x11/xscreensaver-gnome/files/xscreensaver.pam.in --- /usr/ports/x11/xscreensaver-gnome.orig/files/xscreensaver.pam.in 1970-01-01 01:00:00.000000000 +0100 +++ /usr/ports/x11/xscreensaver-gnome/files/xscreensaver.pam.in 2008-07-26 01:25:24.000000000 +0200 @@ -0,0 +1,3 @@ +auth include system +%%PAM_KEYRING%%auth optional %%LOCALBASE%%/lib/pam_gnome_keyring.so +account include system --- xscreensaver-gnome-5.06_1.patch ends here ---
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?488b3ecf.1358560a.073c.6228>