From owner-freebsd-gnome@FreeBSD.ORG Sat Jul 26 15:12:19 2008 Return-Path: Delivered-To: gnome@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CF4FC106566B for ; Sat, 26 Jul 2008 15:12:19 +0000 (UTC) (envelope-from mwisnicki@gmail.com) Received: from fg-out-1718.google.com (fg-out-1718.google.com [72.14.220.154]) by mx1.freebsd.org (Postfix) with ESMTP id 4D90A8FC08 for ; Sat, 26 Jul 2008 15:12:19 +0000 (UTC) (envelope-from mwisnicki@gmail.com) Received: by fg-out-1718.google.com with SMTP id l26so3068675fgb.35 for ; Sat, 26 Jul 2008 08:12:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:received:date:to:subject:from :cc:x-send-pr-version:x-gnats-notify:sender:message-id; bh=i7EngjvR0U7UZLBJ6QAp7l8geqlPaocU4QbygHotmt8=; b=tRCiPRZ8EQYuqf7Em3yXDzwPc4eNaT8dCIF/o2CgkwKHwCjro878QEuU4AXlWen2FK U/hwwUP90XTziZVMGXBANV/G3dinYLRHhA64JusGaXB8QS9x0kTe5hGVa60+q8JY6PfQ 8jhworJdvlcpKVl+hN4/IJ0MZpG/O9YS01mHY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:to:subject:from:cc:x-send-pr-version:x-gnats-notify:sender :message-id; b=fh0WNcsX4ribMwT8IRSJAimX5Lrkex3EHwwCj4+Fu49ZvHoFCykOtQd1GUeMjDgu3u bFlm7zTOBWp/VFQNs6hWJUzDWYf3fKei4dwkefry6jbnYIjdZPhPuY7V7J5OVdGFrBU0 iA9/c5FVsQjd4vQ7bDlyhKdzkdJdsHnzYFS38= Received: by 10.86.96.18 with SMTP id t18mr929713fgb.78.1217085137010; Sat, 26 Jul 2008 08:12:17 -0700 (PDT) Received: from ghost.pnet.one.pl ( [84.40.242.20]) by mx.google.com with ESMTPS id l19sm10996902fgb.7.2008.07.26.08.12.14 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 26 Jul 2008 08:12:15 -0700 (PDT) Received: by ghost.pnet.one.pl (sSMTP sendmail emulation); Sat, 26 Jul 2008 17:12:13 +0200 Date: Sat, 26 Jul 2008 17:12:13 +0200 To: FreeBSD-gnats-submit@freebsd.org From: Marcin Wisnicki X-send-pr-version: 3.113 X-GNATS-Notify: Sender: =?UTF-8?B?TWFyY2luIFdpxZtuaWNraQ==?= Message-ID: <488b3ecf.1358560a.073c.6228@mx.google.com> Cc: gnome@FreeBSD.org Subject: [PATCH] x11/xscreensaver-gnome: GnomeKeyring integration X-BeenThere: freebsd-gnome@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: GNOME for FreeBSD -- porting and maintaining List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Jul 2008 15:12:19 -0000 >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 ---