Date: Sat, 30 Dec 2006 12:53:09 +0100 (CET) From: Ulrich Spoerlein <uspoerlein@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: kuriyama@FreeBSD.org Subject: ports/107349: [PATCH] security/gnupg: Unbreak BATCH building Message-ID: <200612301153.kBUBr9FX021318@roadrunner.q.local> Resent-Message-ID: <200612301200.kBUC0b12061014@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 107349
>Category: ports
>Synopsis: [PATCH] security/gnupg: Unbreak BATCH building
>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: Sat Dec 30 12:00:37 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Ulrich Spoerlein
>Release: FreeBSD 6.2-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD roadrunner.q.local 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #3: Fri Dec 29 20:43:07 CET 2006
>Description:
The OPTIONS framework is flawed wrt. to BATCH mode. There are around 600
instances where wrong checks are performed. For a general fix see ports/105147
For this port, I'm just submitting a bandaid fix.
Port maintainer (kuriyama@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
% cd /usr/port/security/gnupg
% __MAKE_CONF=/dev/null make -DBATCH -DWITH_LDAP
===> gnupg-2.0.1 is marked as broken: Conflict options: WITHOUT_LDAP/WITH_LDAP.
*** Error code 1
Why? OPTIONS will always define the default value (in this case
WITHOUT_LDAP). Now if the user specifies WITH_LDAP too, the error will occur.
>Fix:
--- gnupg-2.0.1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/security/gnupg/Makefile,v
retrieving revision 1.96
diff -u -p -u -r1.96 Makefile
--- Makefile 25 Dec 2006 02:59:59 -0000 1.96
+++ Makefile 30 Dec 2006 11:36:29 -0000
@@ -51,9 +51,6 @@ PLIST_SUB= NLS=""
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 "
@@ -63,9 +60,6 @@ PLIST_SUB+= LDAP="@comment "
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 +67,6 @@ PLIST_SUB+= SCDAEMON="@comment "
.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}
--- gnupg-2.0.1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200612301153.kBUBr9FX021318>