Pullup ticket 738 - requested by Takahiro Kambe

security fix for squid

Revisions pulled up:
- pkgsrc/www/squid/Makefile		1.155, 1.157
- pkgsrc/www/squid/PLIST		1.19
- pkgsrc/www/squid/distinfo		1.100, 1.101
- pkgsrc/www/squid/patches/patch-aa	1.17
- pkgsrc/www/squid/patches/patch-ag	1.20
- pkgsrc/www/squid/patches/patch-an	1.8
- pkgsrc/www/squid/patches/patch-ap	1.1
- pkgsrc/www/squid/patches/patch-bb	1.7
- pkgsrc/www/squid/patches/patch-cd	1.10, 1.11

   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Tue Aug  9 15:48:30 UTC 2005

   Modified Files:
   	pkgsrc/www/squid: Makefile PLIST distinfo
   	pkgsrc/www/squid/patches: patch-aa patch-cd
   Added Files:
   	pkgsrc/www/squid/patches: patch-ap

   Log Message:
   - Add missing optional installed files.
   - Slightly simplify installation of example configurations.
   - Add official patches.

   * 2005-07-11 00:46 (Cosmetic) The new --with-build-environment=...
   				option doesn't work
   * 2005-07-09 08:58 (Cosmetic) Allow wb_ntlm_auth to run more silent
   * 2005-07-03 08:24 (Cosmetic) "make all" gives many warnings
   * 2005-06-29 20:36 (Minor) wbinfo_group.pl only looks into the first
   				group specified
   * 2005-06-21 22:28 (Minor) FTP listings uses "BASE HREF" much more than
   				it needs to,
   * 2005-06-22 10:46 (Cosmetic) Title in FTP listings somewhat messed up
   * 2005-06-19 21:03 (Minor) SNMP GETNEXT fails if the given OID is
   				outside the Squid MIB
   * 2005-06-19 09:39 (Minor) squid -k reconfigure internal corruption
   				if the type of a cache_dir is changed
   * 2005-06-13 22:55 (Minor) httpd_accel_signle_host incompatible
   				with redireection
   * 2005-06-30 08:49 (Minor) Core dump with --enable-ipf-transparent
   				if access to NAT device not granted
   * 2005-06-27 21:24 (Minor) squid -k fails in combination with chroot
   				after patch for bug 1157
   * 2005-06-09 08:01 (Minor) Squid internal icons served up with slightly
   				CVSincorrect HTTP headers
   * 2005-06-06 21:38 (Cosmetic) Updated Spanish error messages

   Bump PKGREVISION.
---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Sun Sep  4 05:07:05 UTC 2005

   Modified Files:
   	pkgsrc/www/squid: Makefile distinfo
   	pkgsrc/www/squid/patches: patch-ag patch-an patch-bb patch-cd

   Log Message:
   Update squid package to 2.5.10nb2.

   - pkgsrc changes: check IP filter's header file <ipl.h> as well as
   		  <netinet/ipl.h>.

   - Apply recent official patches including a security fix for DoS noted by
     http://secunia.com/advisories/16674/

   * 2005-09-03 09:41 (Minor) E-mail sent when cache dies is blocked from
   			   many antispam rules
   * 2005-09-03 09:41 (Minor) Solaris 10 SPARC transparent proxy build problem
   			   with ipfilter
   * 2005-09-01 22:57 (Minor) snmo cacheClientTable fails on "long" IP
   			   addresses
   * 2005-09-01 22:49 (Minor) squid_ldap_auth -U does not work
   * 2005-09-01 22:44 (Major) assertion failed:
   			   store.c:523: "e->store_status == STORE_PENDING"
   * 2005-09-01 22:39 (Cosmetic) Greek translation of error messages
   * 2005-09-01 22:31 (Minor) Some odd FTP servers respond with 250
   			   where 226 is expected
   * 2005-09-01 22:26 (Cosmetic) Fails to compile with glibc -D_FORTIFY_SOURCE=2
   * 2005-09-01 22:18 (Cosmetic) Odd URLs when failing to forward request via
   			      parent and several error messages inconsistent
   			      in reported request details
   * 2005-09-01 22:09 (Minor) More chroot_dir and squid -k reconfigure issues
   * 2005-09-01 21:56 (Medium) assertion failed:
   	StatHist.c:93: ((int) floor (0.99L + statHistVal(H, 0) - min)) == 0
   * 2005-09-01 20:27 (Major) Segmentation fault in sslConnectTimeout
   * 2005-08-19 09:31 (Minor) sync redeclarations when support for ARP acls
   * 2005-08-14 17:05 (Cosmetic) New 'mail_program' configuration option in
   			      squid.conf

1 files changed, 13 insertions, 3 deletions

diff --git a/www/squid/patches/patch-bb b/www/squid/patches/patch-bb
index 89665bde000..e1c3590f47e 100644
--- a/www/squid/patches/patch-bb
+++ b/www/squid/patches/patch-bb
@@ -1,8 +1,18 @@
-$NetBSD: patch-bb,v 1.6 2005/06/07 14:19:10 taca Exp $
+$NetBSD: patch-bb,v 1.6.2.1 2005/09/10 11:16:41 salo Exp $
 
 --- include/autoconf.h.in.orig	2005-04-23 10:32:27.000000000 +0900
 +++ include/autoconf.h.in
-@@ -665,6 +665,9 @@
+@@ -656,6 +656,9 @@
+ /* Define if you have the <ip_nat.h> header file.  */
+ #undef HAVE_IP_NAT_H
+ 
++/* Define if you have the <ipl.h> header file.  */
++#undef HAVE_IPL_H
++
+ /* Define if you have the <libc.h> header file.  */
+ #undef HAVE_LIBC_H
+ 
+@@ -665,6 +668,9 @@
  /* Define if you have the <linux/netfilter_ipv4.h> header file.  */
  #undef HAVE_LINUX_NETFILTER_IPV4_H
  
@@ -12,7 +22,7 @@ $NetBSD: patch-bb,v 1.6 2005/06/07 14:19:10 taca Exp $
  /* Define if you have the <malloc.h> header file.  */
  #undef HAVE_MALLOC_H
  
-@@ -707,6 +710,9 @@
+@@ -707,6 +713,9 @@
  /* Define if you have the <netinet/ip_nat.h> header file.  */
  #undef HAVE_NETINET_IP_NAT_H