Date: Mon, 25 Dec 2006 00:28:23 -0800 (PST) From: Doug Barton <dougb@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: kuriyama@FreeBSD.org Subject: ports/107185: [PATCH] security/gnupg updates Message-ID: <200612250828.kBP8SNUs077889@dougb.net> Resent-Message-ID: <200612250910.kBP9AJa6023014@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <bsd.port.pre.mk>
@@ -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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200612250828.kBP8SNUs077889>