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-af 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 20
$NetBSD$

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

--- lib/easy.c.orig
+++ lib/easy.c
@@@@ -756,6 +756,13 @@@@ void curl_easy_reset(CURL *curl)
                                                       type */
   data->set.new_file_perms = 0644;    /* Default permissions */
   data->set.new_directory_perms = 0755; /* Default permissions */
+
+  /* for the *protocols fields we don't use the CURLPROTO_ALL convenience
+     define since we internally only use the lower 16 bits for the passed
+     in bitmask to not conflict with the private bits */
+  data->set.allowed_protocols = PROT_EXTMASK;
+  data->set.redir_protocols =
+    PROT_EXTMASK & ~(CURLPROTO_FILE|CURLPROTO_SCP); /* not FILE or SCP */
 }
 
 /*
@