From owner-freebsd-gnome@FreeBSD.ORG Sat Jul 26 22:55: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 E9EEA106566B for ; Sat, 26 Jul 2008 22:55:19 +0000 (UTC) (envelope-from mwisnicki@gmail.com) Received: from ug-out-1314.google.com (ug-out-1314.google.com [66.249.92.171]) by mx1.freebsd.org (Postfix) with ESMTP id 684928FC1F for ; Sat, 26 Jul 2008 22:55:19 +0000 (UTC) (envelope-from mwisnicki@gmail.com) Received: by ug-out-1314.google.com with SMTP id q2so92668uge.37 for ; Sat, 26 Jul 2008 15:55:18 -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=YlHXhY1MsIk6GFmqUbOqHzzYDREdN+QfF34k/9K9znM=; b=X+UEygRjsEDOUY+N9+gUl+c5jHt8lxckg0tLqrT3/eKumn1NVJlOBLSogsUd5sWb9P 9E/QscKvfHhleM2K5LydN+zrpfTn0/38SH/4XM40SC0eNf6dfubxbUbSLCO4upoH7rWw fBWLXVfPuYGLrIMryFOjNFAlY12KEArxJIopU= 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=AHbstOXHFRdfZ2ELHYXXi+pMwGzMOqqZ61/NAiv2Q+02noVCXoHLOoWjDgwPp73Y2D swFQUdZ/IGP1I1NfcD0Hm1E6ih8Rf6jCTJh8ECd/S8wfoRxXWbtXbNugpmAyHx8WyNsy 5om7gCC93GcKvxceVujBOQ1Jhs0vhBT5fk0jI= Received: by 10.66.224.19 with SMTP id w19mr1033665ugg.72.1217112918214; Sat, 26 Jul 2008 15:55:18 -0700 (PDT) Received: from ghost.pnet.one.pl ( [84.40.242.20]) by mx.google.com with ESMTPS id k27sm961753ugd.35.2008.07.26.15.55.15 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 26 Jul 2008 15:55:16 -0700 (PDT) Received: by ghost.pnet.one.pl (sSMTP sendmail emulation); Sun, 27 Jul 2008 00:55:13 +0200 Date: Sun, 27 Jul 2008 00:55: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: <488bab54.1b89420a.7bca.218f@mx.google.com> Cc: gnome@FreeBSD.org Subject: [PATCH] x11/gnome-screensaver: 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 22:55:20 -0000 >Submitter-Id: current-users >Originator: Marcin Wisnicki >Organization: >Confidential: no >Synopsis: [PATCH] x11/gnome-screensaver: 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 and install pam configuration This patch assumes that ports/125967 is commited. Added file(s): - files/gnome-screensaver.pam.in Port maintainer (gnome@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- gnome-screensaver-2.22.2_5.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-19 15:52:47.000000000 +0200 +++ /usr/ports/x11/gnome-screensaver/Makefile 2008-07-27 00:53:54.000000000 +0200 @@ -8,7 +8,7 @@ PORTNAME= gnome-screensaver PORTVERSION= 2.22.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -34,20 +34,40 @@ MAN1= gnome-screensaver-command.1 gnome-screensaver-preferences.1 \ gnome-screensaver.1 - PLIST= ${WRKDIR}/pkg-plist +SUB_FILES+= gnome-screensaver.pam XSCREENSAVER_DIR= ${LOCALBASE}/share/xscreensaver/config SCREENSAVER_DIR= share/applications/screensavers XSCREENSAVER_EXCLUDE= "(popsquares.xml)" -OPTIONS= PAM "Pluggable Authentication Module support" off +OPTIONS= PAM "Pluggable Authentication Module support" on \ + KEYRING "Enable GnomeKeyring/PAM integration" on .include -.if !defined(WITH_PAM) +.if defined(WITH_PAM) +CONFIGURE_ARGS+= --enable-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+= --disable-pam +PLIST_SUB+= PAM="@comment " +.if defined(WITH_KEYRING) +.warning Option KEYRING needs PAM, but PAM is disabled. +.endif +.endif + +post-patch: +.if defined(WITH_PAM) + @${REINPLACE_CMD} -e 's|/etc/pam.d|${PREFIX}/etc/pam.d|g' \ + ${WRKSRC}/src/gs-auth-pam.c .endif pre-install: @@ -66,5 +86,8 @@ ${FIND} -s ${XSCREENSAVER_DIR} -maxdepth 1 -type f -name "*.xml" | \ ${GREP} -Ev ${XSCREENSAVER_EXCLUDE} | \ ${XARGS} ${WRKSRC}/data/migrate-xscreensaver-config.sh +.if defined(WITH_PAM) + ${INSTALL_DATA} ${WRKDIR}/gnome-screensaver.pam ${PREFIX}/etc/pam.d/gnome-screensaver +.endif .include diff -ruN --exclude=CVS /usr/ports/x11/gnome-screensaver.orig/files/gnome-screensaver.pam.in /usr/ports/x11/gnome-screensaver/files/gnome-screensaver.pam.in --- /usr/ports/x11/gnome-screensaver.orig/files/gnome-screensaver.pam.in 1970-01-01 01:00:00.000000000 +0100 +++ /usr/ports/x11/gnome-screensaver/files/gnome-screensaver.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 diff -ruN --exclude=CVS /usr/ports/x11/gnome-screensaver.orig/pkg-plist /usr/ports/x11/gnome-screensaver/pkg-plist --- /usr/ports/x11/gnome-screensaver.orig/pkg-plist 2008-04-03 00:03:15.000000000 +0200 +++ /usr/ports/x11/gnome-screensaver/pkg-plist 2008-07-27 00:34:42.000000000 +0200 @@ -1,6 +1,7 @@ bin/gnome-screensaver bin/gnome-screensaver-command bin/gnome-screensaver-preferences +%%PAM%%etc/pam.d/gnome-screensaver etc/xdg/menus/gnome-screensavers.menu libdata/pkgconfig/gnome-screensaver.pc libexec/gnome-screensaver-dialog --- gnome-screensaver-2.22.2_5.patch ends here ---