latest offcial patch has updated:

  Bug #753: va_copy required
  Bug #995: segfault on long URLs (bug in previous patch to Bug #753)

And reduce offset from pkgsrc's patches.

Bump package revision.

7 files changed, 47 insertions, 47 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index 50420de0736..e7d9eb8fa77 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.108 2004/06/04 15:33:05 taca Exp $
+# $NetBSD: Makefile,v 1.109 2004/06/06 16:01:01 taca Exp $
 
 DISTNAME=	squid-2.5.STABLE5
 PKGNAME=	squid-2.5.5
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	http://www.squid-cache.org/Versions/v2/2.5/ \
 		ftp://ftp.leo.org/pub/comp/general/infosys/www/daemons/squid/squid-2/STABLE/ \
diff --git a/www/squid/distinfo b/www/squid/distinfo
index 69fa2173d1d..81da6bbe84b 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.54 2004/06/05 11:28:11 tron Exp $
+$NetBSD: distinfo,v 1.55 2004/06/06 16:01:01 taca Exp $
 
 SHA1 (squid-2.5.5/squid-2.5.STABLE5.tar.bz2) = fd632ebaad656566db11cf875868b19a9b4a71db
 Size (squid-2.5.5/squid-2.5.STABLE5.tar.bz2) = 1044932 bytes
@@ -56,20 +56,20 @@ SHA1 (squid-2.5.5/squid-2.5.STABLE5-dns_localhost.patch) = 73be7a23e0aec3304c159
 Size (squid-2.5.5/squid-2.5.STABLE5-dns_localhost.patch) = 1408 bytes
 SHA1 (squid-2.5.5/squid-2.5.STABLE5-msnt_auth_doc.patch) = 9177b064a207fa0582fe18b6a965746bf7b3fa33
 Size (squid-2.5.5/squid-2.5.STABLE5-msnt_auth_doc.patch) = 16644 bytes
-SHA1 (squid-2.5.5/squid-2.5.STABLE5-va_copy.patch) = 8cb8130b3475fed63aac7dd88cb1c318c66f985c
-Size (squid-2.5.5/squid-2.5.STABLE5-va_copy.patch) = 8582 bytes
+SHA1 (squid-2.5.5/squid-2.5.STABLE5-va_copy.patch) = eb95ada3950c3272e4f80b47d3c78498917c9eb5
+Size (squid-2.5.5/squid-2.5.STABLE5-va_copy.patch) = 8337 bytes
 SHA1 (patch-aa) = 2e0d96f6ccb9d0c42db2da49e76846edad09624f
 SHA1 (patch-ab) = 1224ba4cee98a26d2c9d670eb6d57c6187ff2d56
 SHA1 (patch-ac) = 1b283f0a573c02c82ce26f75e67d19b1ec5ff9f0
-SHA1 (patch-ad) = 23a906011ffef78d070cc49c94c4f4837eb319ec
+SHA1 (patch-ad) = af55d1ec9cd26653a83bcc3b736115f8528c9afd
 SHA1 (patch-ae) = 5031183c7512573c8c8602d0b0541999f43343f2
-SHA1 (patch-ag) = fc215888a815d2b39f408b980f8bce3bf5ca998c
+SHA1 (patch-ag) = 999f9f86cb85e28cbbf9073838f7f1ef8a7335d7
 SHA1 (patch-aj) = aa2271e53602fe168604aeced6ed66d28fe47707
-SHA1 (patch-ak) = 19861281d8a9ece352ce9e881e1e60f6787933e3
+SHA1 (patch-ak) = f4402cb429fd317650bd886a236eeb8476c5e33b
 SHA1 (patch-al) = 534f273ec63f6de0818f1f86a2b655eac4564213
-SHA1 (patch-an) = 8748cfb50e0acb6588228b87b424f87b0c48cc59
+SHA1 (patch-an) = 932d0bd96ae80c92d4f0320b3ccf082a8373ceca
 SHA1 (patch-ba) = c91bc26e4b6df2cb4b7042591efb4afd7c989462
-SHA1 (patch-bb) = 70e92462230ac3b9920946b089290d9ec814fade
+SHA1 (patch-bb) = 75840a5d893bd9aebe68380fdb4dfc594e5aac5e
 SHA1 (patch-bc) = 536299e59c396829f23484a14bb9a6f5c0a4de35
 SHA1 (patch-ca) = 652e35b253a6b75a3ac452773d681e70c5fc310d
 SHA1 (patch-cb) = 7fb49ee4f9e21dea9ca6e54da9a581866b225853
diff --git a/www/squid/patches/patch-ad b/www/squid/patches/patch-ad
index e7d278a627f..dbe532dfd07 100644
--- a/www/squid/patches/patch-ad
+++ b/www/squid/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.4 2002/10/13 16:43:21 taca Exp $
+$NetBSD: patch-ad,v 1.5 2004/06/06 16:01:03 taca Exp $
 
---- errors/Makefile.in.orig	Fri Jul 12 17:38:03 2002
-+++ errors/Makefile.in
-@@ -119,7 +119,7 @@ am__quote = @am__quote@
- install_sh = @install_sh@
- makesnmplib = @makesnmplib@
+--- icons/Makefile.in.orig	2003-05-22 09:15:40.000000000 +0900
++++ icons/Makefile.in
+@@ -144,7 +144,7 @@ ICON2 = anthony-bomb.gif \
+ 		anthony-xpm.gif
  
--errordir = $(datadir)/errors
-+errordir = $(datadir)/squid/errors
- 
- DEFAULT_ERROR_DIR = $(errordir)
  
+-icondir = $(datadir)/icons
++icondir = $(datadir)/squid/icons
+ icon_DATA = $(ICON1) $(ICON2)
+ EXTRA_DIST = $(ICON1) $(ICON2) icons.shar
+ DISTCLEANFILES = 
diff --git a/www/squid/patches/patch-ag b/www/squid/patches/patch-ag
index bdaba61226f..02352977ded 100644
--- a/www/squid/patches/patch-ag
+++ b/www/squid/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.14 2003/05/25 14:58:16 taca Exp $
+$NetBSD: patch-ag,v 1.15 2004/06/06 16:01:03 taca Exp $
 
---- configure.orig	2003-05-25 22:04:25.000000000 +0900
+--- configure.orig	2004-06-07 00:53:25.000000000 +0900
 +++ configure
-@@ -2180,7 +2180,7 @@ if test "${enable_snmp+set}" = set; then
+@@ -2219,7 +2219,7 @@ if test "${enable_snmp+set}" = set; then
  #define SQUID_SNMP 1
  EOF
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ag,v 1.14 2003/05/25 14:58:16 taca Exp $
      
  
  if true; then
-@@ -3776,6 +3776,7 @@ for ac_hdr in \
+@@ -3814,6 +3814,7 @@ for ac_hdr in \
  	libc.h \
  	limits.h \
  	linux/netfilter_ipv4.h \
@@ -19,7 +19,7 @@ $NetBSD: patch-ag,v 1.14 2003/05/25 14:58:16 taca Exp $
  	malloc.h \
  	math.h \
  	memory.h \
-@@ -3826,6 +3827,7 @@ for ac_hdr in \
+@@ -3864,6 +3865,7 @@ for ac_hdr in \
  	syslog.h \
  	time.h \
  	unistd.h \
@@ -27,7 +27,7 @@ $NetBSD: patch-ag,v 1.14 2003/05/25 14:58:16 taca Exp $
  	utime.h \
  	varargs.h \
  	byteswap.h \
-@@ -6021,44 +6023,39 @@ fi
+@@ -6059,44 +6061,39 @@ fi
  echo "$ac_t""$ac_cv_type_mode_t" 1>&6
  if test $ac_cv_type_mode_t = no; then
    cat >> confdefs.h <<\EOF
@@ -86,7 +86,7 @@ $NetBSD: patch-ag,v 1.14 2003/05/25 14:58:16 taca Exp $
  
  echo $ac_n "checking size of off_t""... $ac_c" 1>&6
  echo "configure:6065: checking size of off_t" >&5
-@@ -7333,8 +7330,8 @@ if test "$GCC" = "yes"; then
+@@ -7373,8 +7370,8 @@ if test "$GCC" = "yes"; then
  	GCCVER=`$CC -v 2>&1 | awk '$2 ==  "version" {print $3}'`
  	case "$GCCVER" in
  	2.95.[123])
@@ -97,7 +97,7 @@ $NetBSD: patch-ag,v 1.14 2003/05/25 14:58:16 taca Exp $
  		;;
  	esac
  fi
-@@ -7426,6 +7423,7 @@ for ac_func in \
+@@ -7467,6 +7464,7 @@ for ac_func in \
  	setrlimit \
  	getrlimit \
  	setsid \
diff --git a/www/squid/patches/patch-ak b/www/squid/patches/patch-ak
index 9034321cb52..06122f20c0a 100644
--- a/www/squid/patches/patch-ak
+++ b/www/squid/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.6 2002/10/13 16:43:21 taca Exp $
+$NetBSD: patch-ak,v 1.7 2004/06/06 16:01:03 taca Exp $
 
---- src/cf.data.pre.orig	Sat Oct 12 23:14:04 2002
+--- src/cf.data.pre.orig	2004-06-07 00:54:38.000000000 +0900
 +++ src/cf.data.pre
-@@ -923,6 +923,23 @@ DOC_START
+@@ -946,6 +946,23 @@ DOC_START
  DOC_END
  
  
diff --git a/www/squid/patches/patch-an b/www/squid/patches/patch-an
index dc0e03b7555..613f710bfa0 100644
--- a/www/squid/patches/patch-an
+++ b/www/squid/patches/patch-an
@@ -1,8 +1,8 @@
-$NetBSD: patch-an,v 1.3 2002/10/13 16:43:22 taca Exp $
+$NetBSD: patch-an,v 1.4 2004/06/06 16:01:03 taca Exp $
 
---- configure.in.orig	Wed Sep 25 05:00:03 2002
+--- configure.in.orig	2004-06-07 00:53:25.000000000 +0900
 +++ configure.in
-@@ -497,7 +497,7 @@ AC_ARG_ENABLE(snmp,
+@@ -489,7 +489,7 @@ AC_ARG_ENABLE(snmp,
  [ if test "$enableval" = "yes" ; then
      echo "SNMP monitoring enabled"
      AC_DEFINE(SQUID_SNMP)
@@ -11,7 +11,7 @@ $NetBSD: patch-an,v 1.3 2002/10/13 16:43:22 taca Exp $
      AM_CONDITIONAL(USE_SNMP, true)
      SNMP_MAKEFILE=./snmplib/Makefile
      makesnmplib=snmplib
-@@ -1153,6 +1153,7 @@ AC_CHECK_HEADERS( \
+@@ -1184,6 +1184,7 @@ AC_CHECK_HEADERS( \
  	libc.h \
  	limits.h \
  	linux/netfilter_ipv4.h \
@@ -19,7 +19,7 @@ $NetBSD: patch-an,v 1.3 2002/10/13 16:43:22 taca Exp $
  	malloc.h \
  	math.h \
  	memory.h \
-@@ -1203,6 +1204,7 @@ AC_CHECK_HEADERS( \
+@@ -1234,6 +1235,7 @@ AC_CHECK_HEADERS( \
  	syslog.h \
  	time.h \
  	unistd.h \
@@ -27,7 +27,7 @@ $NetBSD: patch-an,v 1.3 2002/10/13 16:43:22 taca Exp $
  	utime.h \
  	varargs.h \
  	byteswap.h \
-@@ -1378,8 +1380,17 @@ AC_CHECK_TYPE(pid_t, int)
+@@ -1409,8 +1411,17 @@ AC_CHECK_TYPE(pid_t, int)
  AC_CHECK_TYPE(size_t, unsigned int)
  AC_CHECK_TYPE(ssize_t, int)
  AC_CHECK_TYPE(off_t, int)
@@ -47,7 +47,7 @@ $NetBSD: patch-an,v 1.3 2002/10/13 16:43:22 taca Exp $
  
  AC_CHECK_SIZEOF_SYSTYPE(off_t, 4)
  AC_CHECK_SIZEOF_SYSTYPE(size_t, 4)
-@@ -1560,8 +1571,8 @@ if test "$GCC" = "yes"; then
+@@ -1614,8 +1625,8 @@ if test "$GCC" = "yes"; then
  	GCCVER=`$CC -v 2>&1 | awk '$2 ==  "version" {print $3}'`
  	case "$GCCVER" in
  	[2.95.[123]])
@@ -58,7 +58,7 @@ $NetBSD: patch-an,v 1.3 2002/10/13 16:43:22 taca Exp $
  		;;
  	esac
  fi
-@@ -1654,6 +1665,7 @@ AC_CHECK_FUNCS(\
+@@ -1710,6 +1721,7 @@ AC_CHECK_FUNCS(\
  	setrlimit \
  	getrlimit \
  	setsid \
diff --git a/www/squid/patches/patch-bb b/www/squid/patches/patch-bb
index b25a673cc93..789263ce04b 100644
--- a/www/squid/patches/patch-bb
+++ b/www/squid/patches/patch-bb
@@ -1,8 +1,8 @@
-$NetBSD: patch-bb,v 1.2 2002/10/13 16:43:22 taca Exp $
+$NetBSD: patch-bb,v 1.3 2004/06/06 16:01:03 taca Exp $
 
---- include/autoconf.h.in.orig	Tue Jul 16 06:29:47 2002
+--- include/autoconf.h.in.orig	2004-06-07 00:54:39.000000000 +0900
 +++ include/autoconf.h.in
-@@ -537,6 +537,9 @@
+@@ -548,6 +548,9 @@
  /* Define if you have the setpgrp function.  */
  #undef HAVE_SETPGRP
  
@@ -12,7 +12,7 @@ $NetBSD: patch-bb,v 1.2 2002/10/13 16:43:22 taca Exp $
  /* Define if you have the setrlimit function.  */
  #undef HAVE_SETRLIMIT
  
-@@ -645,6 +648,9 @@
+@@ -656,6 +659,9 @@
  /* Define if you have the <linux/netfilter_ipv4.h> header file.  */
  #undef HAVE_LINUX_NETFILTER_IPV4_H
  
@@ -22,13 +22,13 @@ $NetBSD: patch-bb,v 1.2 2002/10/13 16:43:22 taca Exp $
  /* Define if you have the <malloc.h> header file.  */
  #undef HAVE_MALLOC_H
  
-@@ -812,6 +818,9 @@
- 
+@@ -824,6 +830,9 @@
  /* Define if you have the <unistd.h> header file.  */
  #undef HAVE_UNISTD_H
-+
+ 
 +/* Define if you have the <util.h> header file.  */
 +#undef HAVE_UTIL_H
- 
++
  /* Define if you have the <utime.h> header file.  */
  #undef HAVE_UTIME_H
+