ports/160535: [PATCH] security/gnupg 2.0.18 will not use libcurl

[John Marshall]

>Number:         160535
>Category:       ports
>Synopsis:       [PATCH] security/gnupg 2.0.18 will not use libcurl
>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:   Wed Sep 07 06:30:11 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     John Marshall
>Release:        FreeBSD 8.2-STABLE i386
>Organization:
Riverwillow Pty Ltd
>Environment:
System: FreeBSD rwpc13 8.2-STABLE FreeBSD 8.2-STABLE #0: Sat Aug 13 07:41:35 AEST 2011 root at rwpc13:/build/obj/build/src/sys/RWPC13 i386


	
>Description:

There is an error in the gnupg 2.0.18 configure test for libcurl which
results in configure always failing to find a usable libcurl.  This
doesn't break the build because it falls back to using the GnuPG
'curl-shim'.

>How-To-Repeat:

 - Ensure WITH_CURL=true (default)
 - make configure
 - Review work/gnupg-2.0.18/config.log

   configure:9374: checking whether libcurl is usable
   ---< snip >--
   configure:9421: result: no

>Fix:

The attached patch alters the port to patch the distribution's configure
script to correct the error in the libcurl test program.  The problem
has been reported to the GnuPG folks.

 - Bump PORTREVISION
 - Add File: files/patch-configure

--- gnupg_2.0.18.diff begins here ---
diff -urN security/gnupg.orig/Makefile security/gnupg/Makefile
--- security/gnupg.orig/Makefile	2011-08-05 10:35:25.000000000 +1000
+++ security/gnupg/Makefile	2011-09-07 11:13:59.000000000 +1000
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnupg
 PORTVERSION=	2.0.18
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	gnupg
diff -urN security/gnupg.orig/files/patch-configure security/gnupg/files/patch-configure
--- security/gnupg.orig/files/patch-configure	1970-01-01 10:00:00.000000000 +1000
+++ security/gnupg/files/patch-configure	2011-09-07 09:31:10.000000000 +1000
@@ -0,0 +1,11 @@
+--- configure.orig	2011-09-07 09:26:46.000000000 +1000
++++ configure	2011-09-07 09:29:32.000000000 +1000
+@@ -9384,7 +9384,7 @@
+ 
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-include <curl/curl.h>
++#include <curl/curl.h>
+ int
+ main ()
+ {
--- gnupg_2.0.18.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: