Pullup ticket 949 - requested by Lubomir Sedlacik

security update for curl

Revisions pulled up:
- pkgsrc/www/curl/Makefile		1.60
- pkgsrc/www/curl/PLIST			1.18
- pkgsrc/www/curl/distinfo		1.42
- pkgsrc/www/curl/patches/patch-ab	removed

   Module Name:    pkgsrc
   Committed By:   salo
   Date:           Sat Dec 10 17:57:29 UTC 2005

   Modified Files:
           pkgsrc/www/curl: Makefile PLIST distinfo
   Removed Files:
           pkgsrc/www/curl/patches: patch-ab

   Log Message:
   Update to version 7.15.1

   Changes:

   - the libcurl.pc pkgconfig file now gets installed on make install
   - URL globbing now offers "range steps": [1-100:10]
   - LDAPv3 is now the preferred LDAP protocol version
   - --max-redirs and CURLOPT_MAXREDIRS set to 0 limits redirects
   - improved MSVC makefile

   Bugfixes:

   - URL buffer overflow problem (CVE-2005-4077)
   - using file:// on non-existing files are properly handled
   - builds fine on DJGPP
   - CURLOPT_ERRORBUFFER is now always filled in on errors
   - curl outputs error on bad --limit-rate units
   - fixed libcurl's use of poll() on cygwin
   - the GnuTLS code didn't support client certificates
   - TFTP over IPv6 works
   - no reverse lookups on IP addresses when ipv6-enabled
   - SSPI compatibility fix: using the proper DLLs
   - binary LDAP properties are now shown base64 encoded
   - Windows uploads from stdin using curl can now contain ctrl-Z bytes
   - -r [num] would produce an invalid HTTP Range: header
   - multi interface with multi IP hosts could leak socket descriptors
   - the GnuTLS code didn't handle rehandshakes
   - re-use of a dead FTP connection
   - name resolve error codes fixed for Windows builds
   - double WWW-Authenticate Digest headers are now handled
   - curl-config --vernum fixed

4 files changed, 8 insertions, 23 deletions

diff --git a/www/curl/Makefile b/www/curl/Makefile
index c1034aa8207..b1f5136ce53 100644
--- a/www/curl/Makefile
+++ b/www/curl/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.56.2.1 2005/10/30 13:33:19 salo Exp $
+# $NetBSD: Makefile,v 1.56.2.2 2005/12/10 22:35:41 snj Exp $
 
-DISTNAME=	curl-7.15.0
-PKGREVISION=	1
+DISTNAME=	curl-7.15.1
 CATEGORIES=	www
 MASTER_SITES=	http://curl.haxx.se/download/ \
 		ftp://ftp.sunet.se/pub/www/utilities/curl/ \
diff --git a/www/curl/PLIST b/www/curl/PLIST
index 8ed6fe59b5e..655e8616801 100644
--- a/www/curl/PLIST
+++ b/www/curl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2005/09/02 08:13:29 adam Exp $
+@comment $NetBSD: PLIST,v 1.17.2.1 2005/12/10 22:35:41 snj Exp $
 bin/curl
 bin/curl-config
 include/curl/curl.h
@@ -9,6 +9,7 @@ include/curl/multi.h
 include/curl/stdcheaders.h
 include/curl/types.h
 lib/libcurl.la
+lib/pkgconfig/libcurl.pc
 man/man1/curl-config.1
 man/man1/curl.1
 man/man3/curl_easy_cleanup.3
diff --git a/www/curl/distinfo b/www/curl/distinfo
index fbf1187c565..5d55196d856 100644
--- a/www/curl/distinfo
+++ b/www/curl/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.38.2.1 2005/10/30 13:33:19 salo Exp $
+$NetBSD: distinfo,v 1.38.2.2 2005/12/10 22:35:42 snj Exp $
 
-SHA1 (curl-7.15.0.tar.bz2) = 5c4d5b57e180d419a311f5fbbc104aac4d3f3a83
-RMD160 (curl-7.15.0.tar.bz2) = 181cc8bbe7422fbf3c249902baae1d9c65633683
-Size (curl-7.15.0.tar.bz2) = 1426714 bytes
+SHA1 (curl-7.15.1.tar.bz2) = 2b94192557954bba396bfbb980feed17aadc6295
+RMD160 (curl-7.15.1.tar.bz2) = c733937754b579d45de8c26cf4dfa6c5cec82fae
+Size (curl-7.15.1.tar.bz2) = 1437950 bytes
 SHA1 (patch-aa) = 83b1b2ec0d9531ef85c42d5ba1b5319415168d3e
-SHA1 (patch-ab) = bc4a3b9d02dd07ec89af8745a44ee9957ad502cc
diff --git a/www/curl/patches/patch-ab b/www/curl/patches/patch-ab
deleted file mode 100644
index 24e69a0c2bb..00000000000
--- a/www/curl/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.9.12.1 2005/10/30 13:33:19 salo Exp $
-
---- include/curl/curlver.h.orig	2005-10-13 01:20:05.000000000 -0700
-+++ include/curl/curlver.h
-@@ -51,8 +51,6 @@
-    and it is always a greater number in a more recent release. It makes
-    comparisons with greater than and less than work.
- */
--#define LIBCURL_VERSION_NUM ((LIBCURL_VERSION_MAJOR << 16) | \
--                             (LIBCURL_VERSION_MINOR << 8) | \
--                             LIBCURL_VERSION_PATCH)
-+#define LIBCURL_VERSION_NUM 0x070f00
- 
- #endif /* __CURL_CURLVER_H */