[csw-devel] SF.net SVN: gar:[21830] csw/mgar/pkg/libcurl4/trunk

[dmichelsen at users.sourceforge.net]

Revision: 21830
          http://gar.svn.sourceforge.net/gar/?rev=21830&view=rev
Author:   dmichelsen
Date:     2013-08-26 07:14:22 +0000 (Mon, 26 Aug 2013)
Log Message:
-----------
libcurl4/trunk: Update to 7.32.0 and fix #5104

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

Modified: csw/mgar/pkg/libcurl4/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libcurl4/trunk/Makefile	2013-08-23 10:32:51 UTC (rev 21829)
+++ csw/mgar/pkg/libcurl4/trunk/Makefile	2013-08-26 07:14:22 UTC (rev 21830)
@@ -1,5 +1,5 @@
 NAME = curl
-VERSION = 7.28.1
+VERSION = 7.32.0
 GARTYPE = v2
 
 DESCRIPTION = Command line tool and library for client-side URL transfers
@@ -37,6 +37,9 @@
 RUNTIME_DEP_PKGS_CSWlibcurl4 += CSWlibssl1-0-0
 RUNTIME_DEP_PKGS_CSWlibcurl4 += CSWlibz1
 RUNTIME_DEP_PKGS_CSWlibcurl4 += CSWlibidn11
+# We want the certs needed for ssl
+RUNTIME_DEP_PKGS_CSWlibcurl4 += CSWcacertificates
+CHECKPKG_OVERRIDES_CSWlibcurl4 += surplus-dependency|CSWcacertificates
 
 PACKAGES += CSWlibcurl4-feature
 CATALOGNAME_CSWlibcurl4-feature = libcurl4_feature
@@ -99,13 +102,15 @@
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --disable-static
 #CONFIGURE_ARGS += --with-ssl=/opt/csw/ssl
-CONFIGURE_ARGS += --with-ca-path=/opt/csw/ssl/certs
+
+# Update cert path as reported in #5104
+CONFIGURE_ARGS += --with-ca-path=/etc/opt/csw/ssl/certs
 CONFIGURE_ARGS += $(EXTRA_CONFIGURE_ARGS_features-$(FEATURES))
 
 BUILD64 = 1
 
 # There are some failing tests, ignore for now
-SKIPTEST ?= 1
+# SKIPTEST ?= 1
 
 # We do special 32/64 merging for this one, see post-merge
 EXTRA_MERGE_EXCLUDE_FILES += $(includedir)/curl/curlbuild.h

Modified: csw/mgar/pkg/libcurl4/trunk/checksums
===================================================================
--- csw/mgar/pkg/libcurl4/trunk/checksums	2013-08-23 10:32:51 UTC (rev 21829)
+++ csw/mgar/pkg/libcurl4/trunk/checksums	2013-08-26 07:14:22 UTC (rev 21830)
@@ -1 +1 @@
-b716ab1103fd4bef99b98f5ff2c7b638  curl-7.28.1.tar.lzma
+db5948f44e7ef3edbf9a7907af9556ac  curl-7.32.0.tar.lzma

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