Here is an update to Squid 2.6.STABLE14.

Please test this out.


Index: Makefile
===================================================================
RCS file: /cvs/ports/www/squid/Makefile,v
retrieving revision 1.87
diff -u -p -r1.87 Makefile
--- Makefile    20 May 2007 00:52:32 -0000      1.87
+++ Makefile    1 Aug 2007 04:38:16 -0000
@@ -1,8 +1,8 @@
 # $OpenBSD: Makefile,v 1.87 2007/05/20 00:52:32 todd Exp $
 
-COMMENT=       "WWW and FTP proxy cache and accelerator"
+COMMENT=       WWW and FTP proxy cache and accelerator
 
-DISTNAME=      squid-2.6.STABLE13
+DISTNAME=      squid-2.6.STABLE14
 CATEGORIES=    www
 MASTER_SITES=  ${HOMEPAGE}Versions/v2/2.6/
 DIST_SUBDIR=   squid
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/squid/distinfo,v
retrieving revision 1.44
diff -u -p -r1.44 distinfo
--- distinfo    20 May 2007 00:52:32 -0000      1.44
+++ distinfo    18 Jul 2007 02:54:03 -0000
@@ -1,5 +1,5 @@
-MD5 (squid/squid-2.6.STABLE13.tar.gz) = 8VIiTD7bwKy7hVZcGUIzKw==
-RMD160 (squid/squid-2.6.STABLE13.tar.gz) = agGhBILtHOlxWuiZBWKUchA705Q=
-SHA1 (squid/squid-2.6.STABLE13.tar.gz) = bleDySgyWzZSpaf/tbFnMY1ZN/E=
-SHA256 (squid/squid-2.6.STABLE13.tar.gz) = 
HDImXsFa98+ijewS81bJq8scOOz5feJjZ0u2FzLUB2s=
-SIZE (squid/squid-2.6.STABLE13.tar.gz) = 1627479
+MD5 (squid/squid-2.6.STABLE14.tar.gz) = On4CsI6XlEGU0folG5YsRQ==
+RMD160 (squid/squid-2.6.STABLE14.tar.gz) = U+/rTbjxGP4zaXBZnql/ljI09iA=
+SHA1 (squid/squid-2.6.STABLE14.tar.gz) = hg/GytoKkfk7heclNnIZ84FcuG4=
+SHA256 (squid/squid-2.6.STABLE14.tar.gz) = 
wulGXKPPd++w1iWpsrwf/tUrm2dMHYTVDd82uaJIdLA=
+SIZE (squid/squid-2.6.STABLE14.tar.gz) = 1694713
Index: patches/patch-configure_in
===================================================================
RCS file: /cvs/ports/www/squid/patches/patch-configure_in,v
retrieving revision 1.24
diff -u -p -r1.24 patch-configure_in
--- patches/patch-configure_in  20 May 2007 00:52:32 -0000      1.24
+++ patches/patch-configure_in  18 Jul 2007 02:54:24 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-configure_in,v 1.24 2007/05/20 00:52:32 todd Exp $
---- configure.in.orig  Thu May 10 19:59:36 2007
-+++ configure.in       Sat May 12 23:44:43 2007
-@@ -2231,18 +2231,6 @@ dnl during compile.
+--- configure.in.orig  Sun Jul 15 10:21:59 2007
++++ configure.in       Tue Jul 17 22:54:15 2007
+@@ -2247,18 +2247,6 @@ dnl during compile.
                ;;
  esac
  
Index: patches/patch-errors_Makefile_in
===================================================================
RCS file: /cvs/ports/www/squid/patches/patch-errors_Makefile_in,v
retrieving revision 1.9
diff -u -p -r1.9 patch-errors_Makefile_in
--- patches/patch-errors_Makefile_in    13 Nov 2006 02:11:39 -0000      1.9
+++ patches/patch-errors_Makefile_in    18 Jul 2007 02:54:24 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-errors_Makefile_in,v 1.9 2006/11/13 02:11:39 brad Exp $
---- errors/Makefile.in.orig    Sun Oct 29 21:21:13 2006
-+++ errors/Makefile.in Sat Nov  4 15:50:31 2006
-@@ -229,7 +229,7 @@ sbindir = @sbindir@
+--- errors/Makefile.in.orig    Fri Jun 22 20:14:40 2007
++++ errors/Makefile.in Tue Jul 17 22:54:15 2007
+@@ -231,7 +231,7 @@ sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
Index: patches/patch-helpers_basic_auth_MSNT_Makefile_in
===================================================================
RCS file: 
/cvs/ports/www/squid/patches/patch-helpers_basic_auth_MSNT_Makefile_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-helpers_basic_auth_MSNT_Makefile_in
--- patches/patch-helpers_basic_auth_MSNT_Makefile_in   13 Nov 2006 02:11:39 
-0000      1.3
+++ patches/patch-helpers_basic_auth_MSNT_Makefile_in   18 Jul 2007 02:54:24 
-0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-helpers_basic_auth_MSNT_Makefile_in,v 1.3 2006/11/13 02:11:39 
brad Exp $
---- helpers/basic_auth/MSNT/Makefile.in.orig   Sun Oct 29 21:21:17 2006
-+++ helpers/basic_auth/MSNT/Makefile.in        Sat Nov  4 15:50:31 2006
-@@ -263,7 +263,7 @@ prefix = @prefix@
+--- helpers/basic_auth/MSNT/Makefile.in.orig   Fri Jun 22 20:14:44 2007
++++ helpers/basic_auth/MSNT/Makefile.in        Tue Jul 17 22:54:15 2007
+@@ -265,7 +265,7 @@ prefix = @prefix@
  program_transform_name = @program_transform_name@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
Index: patches/patch-icons_Makefile_in
===================================================================
RCS file: /cvs/ports/www/squid/patches/patch-icons_Makefile_in,v
retrieving revision 1.9
diff -u -p -r1.9 patch-icons_Makefile_in
--- patches/patch-icons_Makefile_in     13 Nov 2006 02:11:39 -0000      1.9
+++ patches/patch-icons_Makefile_in     18 Jul 2007 02:54:24 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-icons_Makefile_in,v 1.9 2006/11/13 02:11:39 brad Exp $
---- icons/Makefile.in.orig     Sun Oct 29 21:21:32 2006
-+++ icons/Makefile.in  Sat Nov  4 15:50:31 2006
-@@ -266,7 +266,7 @@ ICON2 = anthony-bomb.gif \
+--- icons/Makefile.in.orig     Fri Jun 22 20:14:55 2007
++++ icons/Makefile.in  Tue Jul 17 22:54:15 2007
+@@ -268,7 +268,7 @@ ICON2 = anthony-bomb.gif \
                anthony-xbm.gif \
                anthony-xpm.gif
  
Index: patches/patch-src_Makefile_in
===================================================================
RCS file: /cvs/ports/www/squid/patches/patch-src_Makefile_in,v
retrieving revision 1.13
diff -u -p -r1.13 patch-src_Makefile_in
--- patches/patch-src_Makefile_in       20 May 2007 00:52:32 -0000      1.13
+++ patches/patch-src_Makefile_in       18 Jul 2007 02:54:27 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-src_Makefile_in,v 1.13 2007/05/20 00:52:32 todd Exp $
---- src/Makefile.in.orig       Sat May  5 18:06:55 2007
-+++ src/Makefile.in    Sat May 12 23:44:43 2007
-@@ -223,7 +223,7 @@ CPP = @CPP@
+--- src/Makefile.in.orig       Fri Jun 22 20:14:56 2007
++++ src/Makefile.in    Tue Jul 17 22:54:15 2007
+@@ -224,7 +224,7 @@ CPP = @CPP@
  CPPFLAGS = @CPPFLAGS@
  CRYPTLIB = @CRYPTLIB@
  CYGPATH_W = @CYGPATH_W@
@@ -10,7 +10,7 @@ $OpenBSD: patch-src_Makefile_in,v 1.13 2
  DEPDIR = @DEPDIR@
  DIGEST_AUTH_HELPERS = @DIGEST_AUTH_HELPERS@
  ECHO_C = @ECHO_C@
-@@ -373,7 +373,7 @@ prefix = @prefix@
+@@ -376,7 +376,7 @@ prefix = @prefix@
  program_transform_name = @program_transform_name@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
@@ -19,7 +19,7 @@ $OpenBSD: patch-src_Makefile_in,v 1.13 2
  target_alias = @target_alias@
  @[EMAIL PROTECTED] = dns_internal.c
  @[EMAIL PROTECTED] = dns.c
-@@ -610,8 +610,8 @@ EXTRA_DIST = \
+@@ -615,8 +615,8 @@ EXTRA_DIST = \
  DEFAULT_HTTP_PORT = @CACHE_HTTP_PORT@
  DEFAULT_ICP_PORT = @CACHE_ICP_PORT@
  DEFAULT_PREFIX = $(prefix)
@@ -30,7 +30,7 @@ $OpenBSD: patch-src_Makefile_in,v 1.13 2
  DEFAULT_DNSSERVER = $(libexecdir)/`echo dnsserver | sed 
'$(transform);s/$$/$(EXEEXT)/'`
  DEFAULT_LOG_PREFIX = $(localstatedir)/logs
  DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log
-@@ -871,37 +871,37 @@ distclean-compile:
+@@ -877,37 +877,37 @@ distclean-compile:
  uninstall-info-am:
  install-dataDATA: $(data_DATA)
        @$(NORMAL_INSTALL)
@@ -78,7 +78,7 @@ $OpenBSD: patch-src_Makefile_in,v 1.13 2
        done
  
  # This directory's subdirectories are mostly independent; you can cd
-@@ -1084,7 +1084,7 @@ check: $(BUILT_SOURCES)
+@@ -1090,7 +1090,7 @@ check: $(BUILT_SOURCES)
  all-am: Makefile $(PROGRAMS) $(DATA)
  installdirs: installdirs-recursive
  installdirs-am:
@@ -87,7 +87,7 @@ $OpenBSD: patch-src_Makefile_in,v 1.13 2
          test -z "$$dir" || $(mkdir_p) "$$dir"; \
        done
  install: $(BUILT_SOURCES)
-@@ -1222,7 +1222,7 @@ cf.data: cf.data.pre Makefile
+@@ -1228,7 +1228,7 @@ cf.data: cf.data.pre Makefile
        sed "\
        [EMAIL PROTECTED]@%$(DEFAULT_HTTP_PORT)%g;\
        [EMAIL PROTECTED]@%$(DEFAULT_ICP_PORT)%g;\
Index: patches/patch-src_cf_data_pre
===================================================================
RCS file: /cvs/ports/www/squid/patches/patch-src_cf_data_pre,v
retrieving revision 1.24
diff -u -p -r1.24 patch-src_cf_data_pre
--- patches/patch-src_cf_data_pre       20 May 2007 00:52:32 -0000      1.24
+++ patches/patch-src_cf_data_pre       18 Jul 2007 02:54:24 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-src_cf_data_pre,v 1.24 2007/05/20 00:52:32 todd Exp $
---- src/cf.data.pre.orig       Tue Apr 24 17:30:03 2007
-+++ src/cf.data.pre    Sat May 12 23:44:31 2007
-@@ -3311,7 +3311,7 @@ DOC_END
+--- src/cf.data.pre.orig       Mon Jun 25 19:34:57 2007
++++ src/cf.data.pre    Tue Jul 17 22:54:09 2007
+@@ -3275,7 +3275,7 @@ DOC_END
  
  NAME: cache_effective_user
  TYPE: string
@@ -10,7 +10,7 @@ $OpenBSD: patch-src_cf_data_pre,v 1.24 2
  LOC: Config.effectiveUser
  DOC_START
        If you start Squid as root, it will change its effective/real
-@@ -3326,7 +3326,7 @@ DOC_END
+@@ -3289,7 +3289,7 @@ DOC_END
  
  NAME: cache_effective_group
  TYPE: string
Index: patches/patch-src_client_side_c
===================================================================
RCS file: /cvs/ports/www/squid/patches/patch-src_client_side_c,v
retrieving revision 1.13
diff -u -p -r1.13 patch-src_client_side_c
--- patches/patch-src_client_side_c     20 May 2007 00:52:32 -0000      1.13
+++ patches/patch-src_client_side_c     18 Jul 2007 02:54:24 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-src_client_side_c,v 1.13 2007/05/20 00:52:32 todd Exp $
---- src/client_side.c.orig     Tue Mar 20 17:26:34 2007
-+++ src/client_side.c  Sat May 12 23:44:31 2007
-@@ -4435,7 +4435,7 @@ clientNatLookup(ConnStateData * conn)
+--- src/client_side.c.orig     Sun Jul 15 05:52:17 2007
++++ src/client_side.c  Tue Jul 17 22:54:09 2007
+@@ -4440,7 +4440,7 @@ clientNatLookup(ConnStateData * conn)
      static int pffd = -1;
      static time_t last_reported = 0;
      if (pffd < 0) {

Reply via email to