SF.net SVN: gar:[24685] csw/mgar/pkg/curl/trunk

[dmichelsen at users.sourceforge.net]

Revision: 24685
          http://sourceforge.net/p/gar/code/24685
Author:   dmichelsen
Date:     2015-02-25 12:18:33 +0000 (Wed, 25 Feb 2015)
Log Message:
-----------
curl/trunk: Update to 7.41.0, fix kerberos for 64 bit

Modified Paths:
--------------
    csw/mgar/pkg/curl/trunk/Makefile
    csw/mgar/pkg/curl/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/curl/trunk/files/0001-Use-KRB5CONFIG.patch

Modified: csw/mgar/pkg/curl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/curl/trunk/Makefile	2015-02-25 09:09:57 UTC (rev 24684)
+++ csw/mgar/pkg/curl/trunk/Makefile	2015-02-25 12:18:33 UTC (rev 24685)
@@ -1,5 +1,5 @@
 NAME = curl
-VERSION = 7.39.0
+VERSION = 7.41.0
 GARTYPE = v2
 
 DESCRIPTION = Command line tool and library for client-side URL transfers
@@ -18,6 +18,8 @@
 
 VENDOR_URL = http://curl.haxx.se
 
+PATCHFILES += 0001-Use-KRB5CONFIG.patch
+
 # Because of OpenSSL 1.0 update
 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
 
@@ -68,6 +70,10 @@
 CHECKPKG_OVERRIDES_CSWlibcurl4-feature += shared-lib-pkgname-mismatch
 CHECKPKG_OVERRIDES_CSWlibcurl4-feature += soname-not-part-of-filename
 
+# Linker anomaly
+CHECKPKG_OVERRIDES_CSWcurl-feature-i386 += surplus-dependency|CSWlibintl8
+CHECKPKG_OVERRIDES_CSWcurl-feature += $(CHECKPKG_OVERRIDES_CSWcurl-feature-$(GARCH))
+
 PACKAGES += CSWlibcurl-dev
 CATALOGNAME_CSWlibcurl-dev = libcurl_dev
 SPKG_DESC_CSWlibcurl-dev = Development files for libcurl.so.4
@@ -88,6 +94,10 @@
 RUNTIME_DEP_PKGS_CSWcurl += CSWlibmetalink3
 RUNTIME_DEP_PKGS_CSWcurl += CSWlibintl8
 
+# Linker anomaly
+CHECKPKG_OVERRIDES_CSWcurl-i386 += surplus-dependency|CSWlibintl8
+CHECKPKG_OVERRIDES_CSWcurl += $(CHECKPKG_OVERRIDES_CSWcurl-$(GARCH))
+
 EXTRA_MODULATORS = FEATURES
 MODULATIONS_FEATURES = minimal full
 
@@ -101,9 +111,13 @@
 EXTRA_CONFIGURE_ARGS_features-full += --enable-ldap
 EXTRA_CONFIGURE_ARGS_features-full += --enable-ldaps
 EXTRA_CONFIGURE_ARGS_features-full += --with-libmetalink
-EXTRA_CONFIGURE_ARGS_features-full += --with-gssapi-includes=$(includedir)
-#EXTRA_CONFIGURE_ARGS_features-full += --with-gssapi-libs=$(libdir)
+# The problem is that krb5-config is taken from $GSSAPI_ROOT/bin/krb5-config which does not take
+# the isa-specific /opt/csw/bin/(sparcv9|amd64)/krb5-config into account. Use workaround until this is fixed:
+#   https://sourceforge.net/p/curl/bugs/1486/
 EXTRA_CONFIGURE_ARGS_features-full += --with-gssapi=$(prefix)
+EXTRA_CONFIGURE_EXPORTS_features-full += KRB5CONFIG
+EXTRA_CONFIGURE_EXPORTS += $(EXTRA_CONFIGURE_EXPORTS_features-$(FEATURES))
+CONFIGURE_ENV_KRB5CONFIG = $(bindir)/krb5-config
 
 # Make sure to link to the new libnet. See for details http://wiki.opencsw.org/project-libnet
 EXTRA_LDFLAGS = -L$(libdir)/libnet-new

Modified: csw/mgar/pkg/curl/trunk/checksums
===================================================================
--- csw/mgar/pkg/curl/trunk/checksums	2015-02-25 09:09:57 UTC (rev 24684)
+++ csw/mgar/pkg/curl/trunk/checksums	2015-02-25 12:18:33 UTC (rev 24685)
@@ -1 +1 @@
-e9aa6dec29920eba8ef706ea5823bad7  curl-7.39.0.tar.lzma
+3d75ba516673ddc441dac8d519d2634d  curl-7.41.0.tar.lzma

Added: csw/mgar/pkg/curl/trunk/files/0001-Use-KRB5CONFIG.patch
===================================================================
--- csw/mgar/pkg/curl/trunk/files/0001-Use-KRB5CONFIG.patch	                        (rev 0)
+++ csw/mgar/pkg/curl/trunk/files/0001-Use-KRB5CONFIG.patch	2015-02-25 12:18:33 UTC (rev 24685)
@@ -0,0 +1,46 @@
+From c2b3c5aedbb4f94554a69a6936aed67d10ae30b6 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 25 Feb 2015 10:57:44 +0100
+Subject: [PATCH] Use KRB5CONFIG
+
+---
+ configure | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/configure b/configure
+index 1616b1d..906ad4a 100755
+--- a/configure
++++ b/configure
+@@ -21116,6 +21118,7 @@ if test "${with_gssapi+set}" = set; then :
+ 
+ fi
+ 
++: ${KRB5CONFIG:="$GSSAPI_ROOT/bin/krb5-config"}
+ 
+ save_CPPFLAGS="$CPPFLAGS"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if GSS-API support is requested" >&5
+@@ -21127,8 +21130,8 @@ $as_echo "yes" >&6; }
+   if test -z "$GSSAPI_INCS"; then
+      if test -n "$host_alias" -a -f "$GSSAPI_ROOT/bin/$host_alias-krb5-config"; then
+         GSSAPI_INCS=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --cflags gssapi`
+-     elif test -f "$GSSAPI_ROOT/bin/krb5-config"; then
+-        GSSAPI_INCS=`$GSSAPI_ROOT/bin/krb5-config --cflags gssapi`
++     elif test -f "$KRB5CONFIG"; then
++        GSSAPI_INCS=`$KRB5CONFIG --cflags gssapi`
+      elif test "$GSSAPI_ROOT" != "yes"; then
+         GSSAPI_INCS="-I$GSSAPI_ROOT/include"
+      fi
+@@ -21272,8 +21275,8 @@ $as_echo "#define HAVE_GSSAPI 1" >>confdefs.h
+         if test -n "$host_alias" -a -f "$GSSAPI_ROOT/bin/$host_alias-krb5-config"; then
+                                  gss_libs=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --libs gssapi`
+            LIBS="$gss_libs $LIBS"
+-        elif test -f "$GSSAPI_ROOT/bin/krb5-config"; then
+-                                 gss_libs=`$GSSAPI_ROOT/bin/krb5-config --libs gssapi`
++        elif test -f "$KRB5CONFIG"; then
++                                 gss_libs=`$KRB5CONFIG --libs gssapi`
+            LIBS="$gss_libs $LIBS"
+         else
+            case $host in
+-- 
+2.2.1
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.