From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Dec 25 09:10:19 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E6ECC16A4C2 for ; Mon, 25 Dec 2006 09:10:19 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id C763F13C473 for ; Mon, 25 Dec 2006 09:10:19 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id kBP9AJ3W023015 for ; Mon, 25 Dec 2006 09:10:19 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id kBP9AJa6023014; Mon, 25 Dec 2006 09:10:19 GMT (envelope-from gnats) Resent-Date: Mon, 25 Dec 2006 09:10:19 GMT Resent-Message-Id: <200612250910.kBP9AJa6023014@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Doug Barton Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8A42B16A584; Mon, 25 Dec 2006 09:03:32 +0000 (UTC) (envelope-from doug@dougb.net) Received: from dougb.net (pool-71-160-100-40.lsanca.dsl-w.verizon.net [71.160.100.40]) by mx1.freebsd.org (Postfix) with ESMTP id 1D22513C48D; Mon, 25 Dec 2006 09:03:31 +0000 (UTC) (envelope-from doug@dougb.net) Received: from dougb.net (50q5fxztozi9icoq@localhost [127.0.0.1]) by dougb.net (8.13.8/8.13.8) with ESMTP id kBP8SN8g077890; Mon, 25 Dec 2006 00:28:23 -0800 (PST) (envelope-from doug@dougb.net) Received: (from doug@localhost) by dougb.net (8.13.8/8.13.8/Submit) id kBP8SNUs077889; Mon, 25 Dec 2006 00:28:23 -0800 (PST) (envelope-from doug) Message-Id: <200612250828.kBP8SNUs077889@dougb.net> Date: Mon, 25 Dec 2006 00:28:23 -0800 (PST) From: Doug Barton To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: kuriyama@FreeBSD.org Subject: ports/107185: [PATCH] security/gnupg updates X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Doug Barton List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Dec 2006 09:10:20 -0000 >Number: 107185 >Category: ports >Synopsis: [PATCH] security/gnupg updates >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Dec 25 09:10:19 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Doug >Release: FreeBSD 4.11-STABLE-1206 i386 >Organization: AAAG >Environment: N/A >Description: 1. In CONFIGURE_ARGS, the -libpth stuff is not needed, the 2.0.1 release fixed that problem. 2. NLS should be an option, as it is for gnupg 1.x 3. The conflicting options detection creates a deadlock for users with conflicting options in existing /var/db/ports/gnupg/options files. >How-To-Repeat: N/A >Fix: Apply the following patch: Index: Makefile =================================================================== RCS file: /usr/local/ncvs/ports/security/gnupg/Makefile,v retrieving revision 1.96 diff -u -r1.96 Makefile --- Makefile 25 Dec 2006 02:59:59 -0000 1.96 +++ Makefile 25 Dec 2006 08:18:18 -0000 @@ -32,8 +32,7 @@ USE_LDCONFIG= YES USE_GETTEXT= YES CONFIGURE_TARGET=# empty -CONFIGURE_ARGS+= --infodir=${PREFIX}/info --mandir=${PREFIX}/man \ - --enable-nls --with-libpth-prefix=${LOCALBASE}/lib/pth +CONFIGURE_ARGS+= --infodir=${PREFIX}/info --mandir=${PREFIX}/man MAN1= gpg2.1 gpgsm.1 gpgv2.1 gpg-agent.1 scdaemon.1 watchgnupg.1 \ gpgconf.1 gpg-preset-passphrase.1 gpg-connect-agent.1 \ gpgparsemail.1 symcryptrun.1 gpgsm-gencert.sh.1 @@ -41,9 +40,9 @@ INFO= gnupg OPTIONS= LDAP "LDAP keyserver interface" off \ + NLS "National Language Support" off \ SCDAEMON "Enable Smartcard daemon (with libusb)" off \ CURL "Use the real curl library (worked around if no)" on -PLIST_SUB= NLS="" .include @@ -51,21 +50,23 @@ USE_OPENLDAP= YES CONFIGURE_ARGS+=--with-ldap=${LOCALBASE} PLIST_SUB+= LDAP="" -.if defined(WITHOUT_LDAP) -BROKEN= Conflict options: WITHOUT_LDAP/WITH_LDAP -.endif .else CONFIGURE_ARGS+=--disable-ldap PLIST_SUB+= LDAP="@comment " .endif +.if defined(WITH_NLS) +CONFIGURE_ARGS+=--enable-nls +PLIST_SUB+= NLS="" +.else +CONFIGURE_ARGS+=--disable-nls +PLIST_SUB+= NLS="@comment " +.endif + .if defined(WITH_SCDAEMON) CONFIGURE_ARGS+=--enable-scdaemon LIB_DEPENDS+= usb-0.1:${PORTSDIR}/devel/libusb PLIST_SUB+= SCDAEMON="" -.if defined(WITHOUT_SCDAEMON) -BROKEN= Conflict options: WITHOUT_SCDAEMON/WITH_SCDAEMON -.endif .else CONFIGURE_ARGS+=--disable-scdaemon PLIST_SUB+= SCDAEMON="@comment " @@ -73,9 +74,6 @@ .if defined(WITHOUT_CURL) CONFIGURE_ARGS+=--without-libcurl -.if defined(WITH_CURL) -BROKEN= Conflict options: WITHOUT_CURL/WITH_CURL -.endif .else LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl CONFIGURE_ARGS+=--with-libcurl=${LOCALBASE} >Release-Note: >Audit-Trail: >Unformatted: