Pullup ticket 862 - requested by Min Sik Kim

security update for curl

Revisions pulled up:
- pkgsrc/www/curl/Makefile		1.57, 1.58
- pkgsrc/www/curl/buildlink3.mk		1.9, 1.10
- pkgsrc/www/curl/distinfo		1.39, 1.40
- pkgsrc/www/curl/patches/patch-ab	1.40

   Module Name:		pkgsrc
   Committed By:	reed
   Date:		Sat Oct 15 15:37:16 UTC 2005

   Modified Files:
   	pkgsrc/www/curl: Makefile buildlink3.mk distinfo

   Log Message:
   Update to version 7.15.0.

   This is a security issue.

   http://curl.haxx.se/mail/lib-2005-10/0061.html

   Also update BUILDLINK_RECOMMENDED.curl.
---
   Module Name:		pkgsrc
   Committed By:	reed
   Date:		Sat Oct 15 15:39:51 UTC 2005

   Modified Files:
   	pkgsrc/www/curl: buildlink3.mk

   Log Message:
   Change BUILDLINK_RECOMMENDED.curl from 7.15
   to real 7.15.0.
---
   Module Name:		pkgsrc
   Committed By:	minskim
   Date:		Thu Oct 20 16:25:15 UTC 2005

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

   Log Message:
   Make "curl-config --vernum" work again.  It was broken in 7.15.0.
   Bump PKGREVISION.

4 files changed, 24 insertions, 8 deletions

diff --git a/www/curl/Makefile b/www/curl/Makefile
index 58abae9d113..c1034aa8207 100644
--- a/www/curl/Makefile
+++ b/www/curl/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.56 2005/09/02 08:13:29 adam Exp $
+# $NetBSD: Makefile,v 1.56.2.1 2005/10/30 13:33:19 salo Exp $
 
-DISTNAME=	curl-7.14.1
+DISTNAME=	curl-7.15.0
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://curl.haxx.se/download/ \
 		ftp://ftp.sunet.se/pub/www/utilities/curl/ \
diff --git a/www/curl/buildlink3.mk b/www/curl/buildlink3.mk
index 8d2683317b6..317a164fe81 100644
--- a/www/curl/buildlink3.mk
+++ b/www/curl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2005/02/25 01:05:51 salo Exp $
+# $NetBSD: buildlink3.mk,v 1.8.6.1 2005/10/30 13:33:19 salo Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 CURL_BUILDLINK3_MK:=	${CURL_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	curl
 
 .if !empty(CURL_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.curl+=	curl>=7.12.3
-BUILDLINK_RECOMMENDED.curl+=	curl>=7.13.0nb1
+BUILDLINK_RECOMMENDED.curl+=	curl>=7.15.0
 BUILDLINK_PKGSRCDIR.curl?=	../../www/curl
 .endif	# CURL_BUILDLINK3_MK
 
diff --git a/www/curl/distinfo b/www/curl/distinfo
index f125add0afa..fbf1187c565 100644
--- a/www/curl/distinfo
+++ b/www/curl/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.38 2005/09/02 08:13:29 adam Exp $
+$NetBSD: distinfo,v 1.38.2.1 2005/10/30 13:33:19 salo Exp $
 
-SHA1 (curl-7.14.1.tar.bz2) = 617a5a0134cbc0c3ef4649b8a4020e91bab25fa3
-RMD160 (curl-7.14.1.tar.bz2) = 53e6f4f9b04336da8d83001ab5bd45fbea5d86e0
-Size (curl-7.14.1.tar.bz2) = 1399247 bytes
+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 (patch-aa) = 83b1b2ec0d9531ef85c42d5ba1b5319415168d3e
+SHA1 (patch-ab) = bc4a3b9d02dd07ec89af8745a44ee9957ad502cc
diff --git a/www/curl/patches/patch-ab b/www/curl/patches/patch-ab
new file mode 100644
index 00000000000..24e69a0c2bb
--- /dev/null
+++ b/www/curl/patches/patch-ab
@@ -0,0 +1,14 @@
+$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 */