From owner-freebsd-gnome@FreeBSD.ORG Thu Jul 31 02:43:12 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 76736106564A for ; Thu, 31 Jul 2008 02:43:12 +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 067978FC25 for ; Thu, 31 Jul 2008 02:43:11 +0000 (UTC) (envelope-from mwisnicki@gmail.com) Received: by fg-out-1718.google.com with SMTP id l26so354846fgb.35 for ; Wed, 30 Jul 2008 19:43:10 -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=eE9bWgE5HpcpoBFxY8xiAV7PUccZ+L9kcDT0+S1aifs=; b=wxqxMGHmXj6jS1zO3VVSZtQHFVvBPtTiQgzOJHxi8dfGumC8w24FmCH+tTSHjMBF/M FO0k63JWeu7+NavwRNwIL29MWcpWZPQjrsGJ442s+WcvMc+dO+EeKP+0lLmpo+I+ROxG TWBX1pHsM0hHhJhUGCUp4av7ZmJUB2CRcjKgI= 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=nzrFXPmDcRgG2z55IEOvwfVQ2s9g3cvSMTf1Ix3eYily0VybGS+45LaV6Ek/wPMdKN F1SpO6Iqjh9C7jMUq/ePuDWc8LyoR5LLsymXEr9WqsHHHBCZHvNVRbcyUWaoQC/Bsxgk WXzCmzcxd82eWHq3OPmUZ487xV6bNGHi+uH9M= Received: by 10.86.90.13 with SMTP id n13mr5585404fgb.3.1217472190833; Wed, 30 Jul 2008 19:43:10 -0700 (PDT) Received: from ghost.pnet.one.pl ( [84.40.242.20]) by mx.google.com with ESMTPS id 12sm2130561fgg.0.2008.07.30.19.43.08 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 30 Jul 2008 19:43:09 -0700 (PDT) Received: by ghost.pnet.one.pl (sSMTP sendmail emulation); Thu, 31 Jul 2008 04:43:06 +0200 Date: Thu, 31 Jul 2008 04:43:06 +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: <489126bd.0c07560a.0eaf.ffff8229@mx.google.com> Cc: gnome@FreeBSD.org Subject: [PATCH] x11/gnome-screensaver: Prevent foot-shooting and unbreak with portupgrade 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: Thu, 31 Jul 2008 02:43:12 -0000 >Submitter-Id: current-users >Originator: Marcin Wisnicki >Organization: >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 >Environment: System: FreeBSD ghost.pnet.one.pl 7.0-STABLE FreeBSD 7.0-STABLE #15: Fri Jul 25 18:16:53 CEST 2008 >Description: - 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@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- 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 .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: --- gnome-screensaver-2.22.2_4.patch ends here ---