[csw-devel] SF.net SVN: gar:[15942] csw/mgar/pkg/libcurl4/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Thu Oct 20 22:16:34 CEST 2011
Revision: 15942
http://gar.svn.sourceforge.net/gar/?rev=15942&view=rev
Author: dmichelsen
Date: 2011-10-20 20:16:34 +0000 (Thu, 20 Oct 2011)
Log Message:
-----------
libcurl4/trunk: Update to 7.21.7, add librtmp support, adjust package names
Modified Paths:
--------------
csw/mgar/pkg/libcurl4/trunk/Makefile
csw/mgar/pkg/libcurl4/trunk/checksums
Removed Paths:
-------------
csw/mgar/pkg/libcurl4/trunk/files/0001-Use-stdint.h-only-when-it-is-available-fall-back-to-.patch
Modified: csw/mgar/pkg/libcurl4/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libcurl4/trunk/Makefile 2011-10-20 09:43:15 UTC (rev 15941)
+++ csw/mgar/pkg/libcurl4/trunk/Makefile 2011-10-20 20:16:34 UTC (rev 15942)
@@ -1,5 +1,9 @@
+# TBD:
+# - Link against new libfbopenssl0
+# - Link against new librtmp0
+
NAME = curl
-VERSION = 7.21.6
+VERSION = 7.21.7
CATEGORIES = net
DESCRIPTION = Command line tool and library for client-side URL transfers
@@ -16,10 +20,6 @@
MASTER_SITES = http://curl.haxx.se/download/
DISTFILES = $(NAME)-$(VERSION).tar.bz2
-# Use patch until this is fixed:
-# https://sourceforge.net/tracker/?func=detail&aid=3294509&group_id=976&atid=100976
-PATCHFILES += 0001-Use-stdint.h-only-when-it-is-available-fall-back-to-.patch
-
FOREIGN_PACKAGES += CSWlibcurl2
OBSOLETED_BY_CSWlibcurl2 += CSWcurlrt
CATALOGNAME_CSWcurlrt = curl_rt_stub
@@ -33,20 +33,21 @@
PKGFILES_CSWlibcurl4 = $(call pkgfiles_lib,libcurl.so.4)
OBSOLETED_BY_CSWlibcurl4 = CSWcurlrt
RUNTIME_DEP_PKGS_CSWlibcurl4 += CSWosslrt
-RUNTIME_DEP_PKGS_CSWlibcurl4 += CSWzlib
+RUNTIME_DEP_PKGS_CSWlibcurl4 += CSWlibz1
RUNTIME_DEP_PKGS_CSWlibcurl4 += CSWlibidn11
PACKAGES += CSWlibcurl4-feature
CATALOGNAME_CSWlibcurl4-feature = libcurl4_feature
SPKG_DESC_CSWlibcurl4-feature = Full-features library for client-side URL transfers superseding libcurl.so.4
PKGFILES_CSWlibcurl4-feature = $(call pkgfiles_lib,libcurl-feature.so.4)
-RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWzlib
-RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibfbopenssl
+RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibz1
+RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibfbopenssl0
RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibidn11
RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWosslrt
RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWoldaprt
RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibssh2
RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibcares2
+RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibrtmp0
# These are artifacts of the feature lib being a regular one.
# As it is never linked against the soname doesn't matter here and the package name
@@ -66,7 +67,7 @@
CATALOGNAME_CSWcurl = curl
SPKG_DESC_CSWcurl = A command line tool and library for client-side URL transfers
# PKGFILES is catchall
-RUNTIME_DEP_PKGS_CSWcurl += CSWzlib
+RUNTIME_DEP_PKGS_CSWcurl += CSWlibz1
RUNTIME_DEP_PKGS_CSWcurl += CSWlibidn11
RUNTIME_DEP_PKGS_CSWcurl += CSWlibcurl4
RUNTIME_DEP_PKGS_CSWcurl += CSWosslrt
@@ -79,8 +80,10 @@
BUILD_DEP_PKGS += CSWoldapdevel
BUILD_DEP_PKGS += CSWossldevel
-BUILD_DEP_PKGS += CSWlibcaresdevel
+BUILD_DEP_PKGS += CSWlibcares-dev
BUILD_DEP_PKGS += CSWlibssh2devel
+BUILD_DEP_PKGS += CSWlibfbopenssl-dev
+BUILD_DEP_PKGS += CSWlibrtmp-dev
VENDOR_URL = http://curl.haxx.se
@@ -90,6 +93,7 @@
EXTRA_CONFIGURE_ARGS_features-minimal += --disable-ldap
EXTRA_CONFIGURE_ARGS_features-minimal += --without-libssh2
EXTRA_CONFIGURE_ARGS_features-minimal += --disable-ares
+EXTRA_CONFIGURE_ARGS_features-minimal += --without-librtmp
EXTRA_CONFIGURE_ARGS_features-full += --enable-ares
EXTRA_CONFIGURE_ARGS_features-full += --with-spnego=$(libdir)
Modified: csw/mgar/pkg/libcurl4/trunk/checksums
===================================================================
--- csw/mgar/pkg/libcurl4/trunk/checksums 2011-10-20 09:43:15 UTC (rev 15941)
+++ csw/mgar/pkg/libcurl4/trunk/checksums 2011-10-20 20:16:34 UTC (rev 15942)
@@ -1 +1 @@
-6611989a81ebd7b03a35adc3001ddee0 curl-7.21.6.tar.bz2
+5f6d50c4d4ee38c57fe37e3cff75adbd curl-7.21.7.tar.bz2
Deleted: csw/mgar/pkg/libcurl4/trunk/files/0001-Use-stdint.h-only-when-it-is-available-fall-back-to-.patch
===================================================================
--- csw/mgar/pkg/libcurl4/trunk/files/0001-Use-stdint.h-only-when-it-is-available-fall-back-to-.patch 2011-10-20 09:43:15 UTC (rev 15941)
+++ csw/mgar/pkg/libcurl4/trunk/files/0001-Use-stdint.h-only-when-it-is-available-fall-back-to-.patch 2011-10-20 20:16:34 UTC (rev 15942)
@@ -1,30 +0,0 @@
-From d3924ea3a11fe747edf84bd4e907ce17f61beaad Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Thu, 28 Apr 2011 19:34:10 +0200
-Subject: [PATCH] Use stdint.h only when it is available, fall back to inttypes.h
-
----
- docs/examples/anyauthput.c | 7 ++++++-
- 1 files changed, 6 insertions(+), 1 deletions(-)
-
-diff --git a/docs/examples/anyauthput.c b/docs/examples/anyauthput.c
-index 6b3d74a..679b0f3 100644
---- a/docs/examples/anyauthput.c
-+++ b/docs/examples/anyauthput.c
-@@ -27,7 +27,12 @@
- # ifdef __VMS
- typedef int intptr_t;
- # else
--# include <stdint.h>
-+# ifdef CURL_PULL_STDINT_H
-+# include <stdint.h>
-+# endif
-+# ifdef CURL_PULL_INTTYPES_H
-+# include <inttypes.h>
-+# endif
- # endif
- # include <unistd.h>
- #endif
---
-1.7.3.2
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list