head	1.1;
access;
symbols
	pkgsrc-2013Q2:1.1.0.12
	pkgsrc-2013Q2-base:1.1
	pkgsrc-2012Q4:1.1.0.10
	pkgsrc-2012Q4-base:1.1
	pkgsrc-2011Q4:1.1.0.8
	pkgsrc-2011Q4-base:1.1
	pkgsrc-2011Q2:1.1.0.6
	pkgsrc-2011Q2-base:1.1
	pkgsrc-2009Q4:1.1.0.4
	pkgsrc-2009Q4-base:1.1
	pkgsrc-2008Q4:1.1.0.2;
locks; strict;
comment	@# @;


1.1
date	2009.03.15.15.07.23;	author tron;	state dead;
branches
	1.1.2.1;
next	;

1.1.2.1
date	2009.03.15.15.07.23;	author tron;	state Exp;
branches;
next	;


desc
@@


1.1
log
@file patch-ae was initially added on branch pkgsrc-2008Q4.
@
text
@@


1.1.2.1
log
@Pullup ticket 2722 - requested by bouyer
curl: build fix

Revisions pulled up:
- www/curl/Makefile				patch
- www/curl/distinfo				patch
- www/curl/patches/patch-ab			patch
- www/curl/patches/patch-ac			patch
- www/curl/patches/patch-ad			patch
- www/curl/patches/patch-ae			patch
- www/curl/patches/patch-af			patch
---
The security patch for CVE-2009-0037 has changed on the master site which
changed the checksum and size of "curl-7.18.1-CVE-2009-0037.patch".
Update to the latest version and integrate it directly to avoid further
build breaks.
@
text
@a0 55
$NetBSD$

Taken from http://curl.haxx.se/CVE-2009-0037/curl-7.18.1-CVE-2009-0037.patch

--- lib/urldata.h.orig
+++ lib/urldata.h
@@@@ -863,19 +863,26 @@@@ struct connectdata {
   long connectindex; /* what index in the connection cache connects index this
                         particular struct has */
   long protocol; /* PROT_* flags concerning the protocol set */
-#define PROT_MISSING (1<<0)
-#define PROT_HTTP    (1<<2)
-#define PROT_HTTPS   (1<<3)
-#define PROT_FTP     (1<<4)
-#define PROT_TELNET  (1<<5)
-#define PROT_DICT    (1<<6)
-#define PROT_LDAP    (1<<7)
-#define PROT_FILE    (1<<8)
-#define PROT_FTPS    (1<<9)
-#define PROT_SSL     (1<<10) /* protocol requires SSL */
-#define PROT_TFTP    (1<<11)
-#define PROT_SCP     (1<<12)
-#define PROT_SFTP    (1<<13)
+#define PROT_HTTP    CURLPROTO_HTTP
+#define PROT_HTTPS   CURLPROTO_HTTPS
+#define PROT_FTP     CURLPROTO_FTP
+#define PROT_TELNET  CURLPROTO_TELNET
+#define PROT_DICT    CURLPROTO_DICT
+#define PROT_LDAP    CURLPROTO_LDAP
+#define PROT_FILE    CURLPROTO_FILE
+#define PROT_FTPS    CURLPROTO_FTPS
+#define PROT_TFTP    CURLPROTO_TFTP
+#define PROT_SCP     CURLPROTO_SCP
+#define PROT_SFTP    CURLPROTO_SFTP
+
+/* CURLPROTO_TFTP (1<<11) is currently the highest used bit in the public
+   bitmask. We make sure we use "private bits" above the first 16 to make
+   things easier. */
+
+#define PROT_EXTMASK 0xffff
+
+#define PROT_SSL     (1<<22) /* protocol requires SSL */
+#define PROT_MISSING (1<<23)
 
 #define PROT_CLOSEACTION PROT_FTP /* these ones need action before socket
                                      close */
@@@@ -1467,6 +1474,8 @@@@ struct UserDefined {
   bool proxy_transfer_mode; /* set transfer mode (;type=<a|i>) when doing FTP
                                via an HTTP proxy */
   char *str[STRING_LAST]; /* array of strings, pointing to allocated memory */
+  long allowed_protocols;
+  long redir_protocols;
 };
 
 struct Names {
@