From 82be18b245d034005a32da28f2b4ee006ecc368d Mon Sep 17 00:00:00 2001 From: todd Date: Sun, 20 May 2007 00:52:32 +0000 Subject: [PATCH] update to 2.6 stable13, from brad@ (maint) ok kili@ tested by me --- www/squid/Makefile | 4 ++-- www/squid/distinfo | 10 +++++----- www/squid/patches/patch-configure_in | 8 ++++---- www/squid/patches/patch-src_Makefile_in | 18 +++++++++--------- www/squid/patches/patch-src_cf_data_pre | 6 +++--- www/squid/patches/patch-src_client_side_c | 6 +++--- www/squid/patches/patch-tools_Makefile_in | 8 ++++---- 7 files changed, 30 insertions(+), 30 deletions(-) diff --git a/www/squid/Makefile b/www/squid/Makefile index f631ba4f8c1..291f9ed325f 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.86 2007/04/12 15:10:02 robert Exp $ +# $OpenBSD: Makefile,v 1.87 2007/05/20 00:52:32 todd Exp $ COMMENT= "WWW and FTP proxy cache and accelerator" -DISTNAME= squid-2.6.STABLE12 +DISTNAME= squid-2.6.STABLE13 CATEGORIES= www MASTER_SITES= ${HOMEPAGE}Versions/v2/2.6/ DIST_SUBDIR= squid diff --git a/www/squid/distinfo b/www/squid/distinfo index 3c963445341..b0f981f615d 100644 --- a/www/squid/distinfo +++ b/www/squid/distinfo @@ -1,5 +1,5 @@ -MD5 (squid/squid-2.6.STABLE12.tar.gz) = RCz/5ER7dtcyrysTU+KD1Q== -RMD160 (squid/squid-2.6.STABLE12.tar.gz) = jpRjlpBkMStfL76DsDm+CWRu++0= -SHA1 (squid/squid-2.6.STABLE12.tar.gz) = BqczzAS6iUz092ISeKEUW45YB/k= -SHA256 (squid/squid-2.6.STABLE12.tar.gz) = tKHdR2NxMnNpiU/3P3KeWiTsdrB/QKgjzwTKXBIQ/EI= -SIZE (squid/squid-2.6.STABLE12.tar.gz) = 1626994 +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 diff --git a/www/squid/patches/patch-configure_in b/www/squid/patches/patch-configure_in index f5faa8aa547..5b2feef78f9 100644 --- a/www/squid/patches/patch-configure_in +++ b/www/squid/patches/patch-configure_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure_in,v 1.23 2007/02/01 07:46:24 todd Exp $ ---- configure.in.orig Tue Jan 23 21:07:43 2007 -+++ configure.in Wed Jan 24 02:12:02 2007 -@@ -2230,18 +2230,6 @@ dnl during compile. +$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. ;; esac diff --git a/www/squid/patches/patch-src_Makefile_in b/www/squid/patches/patch-src_Makefile_in index aa423148dc0..916fa3c1a48 100644 --- a/www/squid/patches/patch-src_Makefile_in +++ b/www/squid/patches/patch-src_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_Makefile_in,v 1.12 2006/11/13 02:11:39 brad Exp $ ---- src/Makefile.in.orig Sun Oct 29 21:21:34 2006 -+++ src/Makefile.in Sat Nov 4 15:50:31 2006 -@@ -224,7 +224,7 @@ CPP = @CPP@ +$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@ CPPFLAGS = @CPPFLAGS@ CRYPTLIB = @CRYPTLIB@ CYGPATH_W = @CYGPATH_W@ @@ -10,7 +10,7 @@ $OpenBSD: patch-src_Makefile_in,v 1.12 2006/11/13 02:11:39 brad Exp $ DEPDIR = @DEPDIR@ DIGEST_AUTH_HELPERS = @DIGEST_AUTH_HELPERS@ ECHO_C = @ECHO_C@ -@@ -374,7 +374,7 @@ prefix = @prefix@ +@@ -373,7 +373,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -19,7 +19,7 @@ $OpenBSD: patch-src_Makefile_in,v 1.12 2006/11/13 02:11:39 brad Exp $ target_alias = @target_alias@ @USE_DNSSERVER_FALSE@DNSSOURCE = dns_internal.c @USE_DNSSERVER_TRUE@DNSSOURCE = dns.c -@@ -605,8 +605,8 @@ EXTRA_DIST = \ +@@ -610,8 +610,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.12 2006/11/13 02:11:39 brad Exp $ DEFAULT_DNSSERVER = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'` DEFAULT_LOG_PREFIX = $(localstatedir)/logs DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log -@@ -866,37 +866,37 @@ distclean-compile: +@@ -871,37 +871,37 @@ distclean-compile: uninstall-info-am: install-dataDATA: $(data_DATA) @$(NORMAL_INSTALL) @@ -78,7 +78,7 @@ $OpenBSD: patch-src_Makefile_in,v 1.12 2006/11/13 02:11:39 brad Exp $ done # This directory's subdirectories are mostly independent; you can cd -@@ -1079,7 +1079,7 @@ check: $(BUILT_SOURCES) +@@ -1084,7 +1084,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.12 2006/11/13 02:11:39 brad Exp $ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: $(BUILT_SOURCES) -@@ -1217,7 +1217,7 @@ cf.data: cf.data.pre Makefile +@@ -1222,7 +1222,7 @@ cf.data: cf.data.pre Makefile sed "\ s%@DEFAULT_HTTP_PORT@%$(DEFAULT_HTTP_PORT)%g;\ s%@DEFAULT_ICP_PORT@%$(DEFAULT_ICP_PORT)%g;\ diff --git a/www/squid/patches/patch-src_cf_data_pre b/www/squid/patches/patch-src_cf_data_pre index cb27b0e693b..f5c3974fc41 100644 --- a/www/squid/patches/patch-src_cf_data_pre +++ b/www/squid/patches/patch-src_cf_data_pre @@ -1,6 +1,6 @@ -$OpenBSD: patch-src_cf_data_pre,v 1.23 2007/04/12 15:10:02 robert Exp $ ---- src/cf.data.pre.orig Sat Feb 3 22:59:24 2007 -+++ src/cf.data.pre Thu Apr 12 11:26:11 2007 +$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 NAME: cache_effective_user diff --git a/www/squid/patches/patch-src_client_side_c b/www/squid/patches/patch-src_client_side_c index 5c4ba58b2f5..f58ab2ea477 100644 --- a/www/squid/patches/patch-src_client_side_c +++ b/www/squid/patches/patch-src_client_side_c @@ -1,6 +1,6 @@ -$OpenBSD: patch-src_client_side_c,v 1.12 2007/04/12 15:10:02 robert Exp $ ---- src/client_side.c.orig Tue Mar 20 22:26:34 2007 -+++ src/client_side.c Thu Apr 12 11:26:12 2007 +$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) static int pffd = -1; static time_t last_reported = 0; diff --git a/www/squid/patches/patch-tools_Makefile_in b/www/squid/patches/patch-tools_Makefile_in index 2871d86fcf0..8733ed3f20f 100644 --- a/www/squid/patches/patch-tools_Makefile_in +++ b/www/squid/patches/patch-tools_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-tools_Makefile_in,v 1.1 2006/10/03 05:00:49 brad Exp $ ---- tools/Makefile.in.orig Fri Sep 22 05:09:50 2006 -+++ tools/Makefile.in Tue Sep 26 19:32:49 2006 -@@ -65,6 +65,7 @@ PROGRAMS = $(bin_PROGRAMS) $(libexec_PRO +$OpenBSD: patch-tools_Makefile_in,v 1.2 2007/05/20 00:52:32 todd Exp $ +--- tools/Makefile.in.orig Sat Nov 4 18:20:05 2006 ++++ tools/Makefile.in Sat May 12 23:44:44 2007 +@@ -65,6 +65,7 @@ PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS) am_cachemgr__CGIEXT__OBJECTS = cachemgr__CGIEXT_-cachemgr.$(OBJEXT) cachemgr__CGIEXT__OBJECTS = $(am_cachemgr__CGIEXT__OBJECTS) cachemgr__CGIEXT__LDADD = $(LDADD)