From b63c6b4c369d7a8f54b2ca0f67f12322e8f6da29 Mon Sep 17 00:00:00 2001 From: sthen Date: Fri, 30 Oct 2009 00:56:57 +0000 Subject: [PATCH] update to the latest bug fix release in the 2.7 branch. From Brad (maintainer). --- www/squid/Makefile | 5 +-- www/squid/distinfo | 10 ++--- www/squid/patches/patch-errors_Makefile_in | 14 +++---- .../patch-helpers_basic_auth_MSNT_Makefile_in | 14 +++---- ...negotiate_auth_squid_kerb_auth_Makefile_in | 8 ++-- www/squid/patches/patch-icons_Makefile_in | 8 ++-- www/squid/patches/patch-src_HttpHeaderTools_c | 39 ------------------- www/squid/patches/patch-src_Makefile_in | 38 +++++++++--------- www/squid/patches/patch-tools_Makefile_in | 10 ++--- 9 files changed, 53 insertions(+), 93 deletions(-) delete mode 100644 www/squid/patches/patch-src_HttpHeaderTools_c diff --git a/www/squid/Makefile b/www/squid/Makefile index 2284cdbdec1..88fee97364b 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -1,9 +1,8 @@ -# $OpenBSD: Makefile,v 1.99 2009/08/30 21:52:44 jasper Exp $ +# $OpenBSD: Makefile,v 1.100 2009/10/30 00:56:57 sthen Exp $ COMMENT= WWW and FTP proxy cache and accelerator -DISTNAME= squid-2.7.STABLE6 -PKGNAME= ${DISTNAME}p0 +DISTNAME= squid-2.7.STABLE7 CATEGORIES= www MASTER_SITES= ${HOMEPAGE}/Versions/v2/2.7/ DIST_SUBDIR= squid diff --git a/www/squid/distinfo b/www/squid/distinfo index 77456163aa4..254c7c92272 100644 --- a/www/squid/distinfo +++ b/www/squid/distinfo @@ -1,5 +1,5 @@ -MD5 (squid/squid-2.7.STABLE6.tar.gz) = trys2cWObp4Y0P9E0gxQ2Q== -RMD160 (squid/squid-2.7.STABLE6.tar.gz) = yllYPp2TjDGEowaYTwNFU/do6UI= -SHA1 (squid/squid-2.7.STABLE6.tar.gz) = D2avyoVET31PSaUnRw7xR0GQTbA= -SHA256 (squid/squid-2.7.STABLE6.tar.gz) = CusN1gGCJxHPjhMdgt6Lxk6RitvP6n6DTEUpiVdZMxo= -SIZE (squid/squid-2.7.STABLE6.tar.gz) = 1786189 +MD5 (squid/squid-2.7.STABLE7.tar.gz) = xQYgf5IabaGHi0CF4gLhkA== +RMD160 (squid/squid-2.7.STABLE7.tar.gz) = wq2hqrOIJEqqIEdqWITpSzEH+/w= +SHA1 (squid/squid-2.7.STABLE7.tar.gz) = lKOFpJT1DPM5TiJs50OuOjrVFEA= +SHA256 (squid/squid-2.7.STABLE7.tar.gz) = K5Jq7OfUvqwDcNm3KJnTvn9Iwp6XOhMoZmk4ouTE/6Y= +SIZE (squid/squid-2.7.STABLE7.tar.gz) = 1784325 diff --git a/www/squid/patches/patch-errors_Makefile_in b/www/squid/patches/patch-errors_Makefile_in index 0bbff069c86..c2070a52ce6 100644 --- a/www/squid/patches/patch-errors_Makefile_in +++ b/www/squid/patches/patch-errors_Makefile_in @@ -1,10 +1,10 @@ -$OpenBSD: patch-errors_Makefile_in,v 1.11 2008/07/16 21:18:27 brad Exp $ ---- errors/Makefile.in.orig Sat Feb 23 20:17:16 2008 -+++ errors/Makefile.in Sun Jun 29 03:10:24 2008 -@@ -235,7 +235,7 @@ sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ +$OpenBSD: patch-errors_Makefile_in,v 1.12 2009/10/30 00:56:57 sthen Exp $ +--- errors/Makefile.in.orig Thu Apr 30 21:24:03 2009 ++++ errors/Makefile.in Thu Oct 29 18:29:29 2009 +@@ -192,7 +192,7 @@ target_alias = @target_alias@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ -errordir = $(datadir)/errors +errordir = $(prefix)/share/examples/squid/errors DEFAULT_ERROR_DIR = $(errordir) diff --git a/www/squid/patches/patch-helpers_basic_auth_MSNT_Makefile_in b/www/squid/patches/patch-helpers_basic_auth_MSNT_Makefile_in index 8598b3687e0..5a470409366 100644 --- a/www/squid/patches/patch-helpers_basic_auth_MSNT_Makefile_in +++ b/www/squid/patches/patch-helpers_basic_auth_MSNT_Makefile_in @@ -1,12 +1,12 @@ -$OpenBSD: patch-helpers_basic_auth_MSNT_Makefile_in,v 1.5 2008/07/16 21:18:27 brad Exp $ ---- helpers/basic_auth/MSNT/Makefile.in.orig Sun Nov 11 20:13:58 2007 -+++ helpers/basic_auth/MSNT/Makefile.in Sun Jun 29 03:10:24 2008 -@@ -269,7 +269,7 @@ program_transform_name = @program_transform_name@ - psdir = @psdir@ +$OpenBSD: patch-helpers_basic_auth_MSNT_Makefile_in,v 1.6 2009/10/30 00:56:57 sthen Exp $ +--- helpers/basic_auth/MSNT/Makefile.in.orig Thu Apr 30 21:24:06 2009 ++++ helpers/basic_auth/MSNT/Makefile.in Wed Oct 28 19:59:13 2009 +@@ -223,7 +223,7 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ + srcdir = @srcdir@ -sysconfdir = @sysconfdir@ +sysconfdir = @sysconfdir@/squid target_alias = @target_alias@ - msnt_auth_SOURCES = md4.c rfcnb-io.c rfcnb-util.c session.c msntauth.c \ - msntauth.h smbdes.c smbencrypt.c smblib-util.c smblib.c \ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ diff --git a/www/squid/patches/patch-helpers_negotiate_auth_squid_kerb_auth_Makefile_in b/www/squid/patches/patch-helpers_negotiate_auth_squid_kerb_auth_Makefile_in index 4b74012c6a8..55d02e7f010 100644 --- a/www/squid/patches/patch-helpers_negotiate_auth_squid_kerb_auth_Makefile_in +++ b/www/squid/patches/patch-helpers_negotiate_auth_squid_kerb_auth_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-helpers_negotiate_auth_squid_kerb_auth_Makefile_in,v 1.2 2008/07/16 21:18:28 brad Exp $ ---- helpers/negotiate_auth/squid_kerb_auth/Makefile.in.orig Sun Nov 11 20:14:15 2007 -+++ helpers/negotiate_auth/squid_kerb_auth/Makefile.in Sun Jun 29 03:10:24 2008 -@@ -268,12 +268,12 @@ LDADD = $(KERBLIBS) +$OpenBSD: patch-helpers_negotiate_auth_squid_kerb_auth_Makefile_in,v 1.3 2009/10/30 00:56:57 sthen Exp $ +--- helpers/negotiate_auth/squid_kerb_auth/Makefile.in.orig Wed Sep 16 18:36:24 2009 ++++ helpers/negotiate_auth/squid_kerb_auth/Makefile.in Wed Oct 28 19:16:46 2009 +@@ -225,12 +225,12 @@ LDADD = $(KERBLIBS) #-L$(top_builddir)/lib -lmiscutil $(XTRA_LIBS) # HEIMDAL diff --git a/www/squid/patches/patch-icons_Makefile_in b/www/squid/patches/patch-icons_Makefile_in index f57e2536876..9c3d71cb7c0 100644 --- a/www/squid/patches/patch-icons_Makefile_in +++ b/www/squid/patches/patch-icons_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-icons_Makefile_in,v 1.11 2008/07/16 21:18:28 brad Exp $ ---- icons/Makefile.in.orig Sun Nov 11 20:14:19 2007 -+++ icons/Makefile.in Sun Jun 29 03:10:24 2008 -@@ -272,7 +272,7 @@ ICON2 = anthony-bomb.gif \ +$OpenBSD: patch-icons_Makefile_in,v 1.12 2009/10/30 00:56:57 sthen Exp $ +--- icons/Makefile.in.orig Thu Apr 30 21:24:39 2009 ++++ icons/Makefile.in Wed Oct 28 19:16:47 2009 +@@ -229,7 +229,7 @@ ICON2 = anthony-bomb.gif \ anthony-xbm.gif \ anthony-xpm.gif diff --git a/www/squid/patches/patch-src_HttpHeaderTools_c b/www/squid/patches/patch-src_HttpHeaderTools_c deleted file mode 100644 index ffcb309434b..00000000000 --- a/www/squid/patches/patch-src_HttpHeaderTools_c +++ /dev/null @@ -1,39 +0,0 @@ -$OpenBSD: patch-src_HttpHeaderTools_c,v 1.1 2009/08/30 21:52:44 jasper Exp $ - -Security fix for CVE-2009-2855. -Patch from upstream repository: -http://www.squid-cache.org/Versions/v2/HEAD/changesets/12541.patch - ---- src/HttpHeaderTools.c.orig Sun Aug 30 20:43:57 2009 -+++ src/HttpHeaderTools.c Sun Aug 30 20:44:54 2009 -@@ -239,6 +239,10 @@ int - strListGetItem(const String * str, char del, const char **item, int *ilen, const char **pos) - { - size_t len; -+ /* ',' is always enabled as field delimiter as this is required for -+ * processing merged header values properly, even if Cookie normally -+ * uses ';' as delimiter. -+ */ - static char delim[3][8] = - { - "\"?,", -@@ -261,16 +265,15 @@ strListGetItem(const String * str, char del, const cha - /* find next delimiter */ - do { - *pos += strcspn(*pos, delim[quoted]); -- if (**pos == del) -- break; - if (**pos == '"') { - quoted = !quoted; - *pos += 1; -- } -- if (quoted && **pos == '\\') { -+ } else if (quoted && **pos == '\\') { - *pos += 1; - if (**pos) - *pos += 1; -+ } else { -+ break; /* Delimiter found, marking the end of this value */ - } - } while (**pos); - len = *pos - *item; /* *pos points to del or '\0' */ diff --git a/www/squid/patches/patch-src_Makefile_in b/www/squid/patches/patch-src_Makefile_in index bb2e97fea2c..ea054985c3c 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.15 2008/07/16 21:18:28 brad Exp $ ---- src/Makefile.in.orig Wed Jan 2 20:16:40 2008 -+++ src/Makefile.in Sun Jun 29 03:10:24 2008 -@@ -241,7 +241,7 @@ CPP = @CPP@ +$OpenBSD: patch-src_Makefile_in,v 1.16 2009/10/30 00:56:57 sthen Exp $ +--- src/Makefile.in.orig Thu Apr 30 21:24:42 2009 ++++ src/Makefile.in Thu Oct 29 18:44:21 2009 +@@ -238,7 +238,7 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CRYPTLIB = @CRYPTLIB@ CYGPATH_W = @CYGPATH_W@ @@ -10,16 +10,16 @@ $OpenBSD: patch-src_Makefile_in,v 1.15 2008/07/16 21:18:28 brad Exp $ DEPDIR = @DEPDIR@ DIGEST_AUTH_HELPERS = @DIGEST_AUTH_HELPERS@ ECHO_C = @ECHO_C@ -@@ -397,7 +397,7 @@ program_transform_name = @program_transform_name@ - psdir = @psdir@ +@@ -354,7 +354,7 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ + srcdir = @srcdir@ -sysconfdir = @sysconfdir@ +sysconfdir = @sysconfdir@/squid target_alias = @target_alias@ - @USE_DNSSERVER_FALSE@DNSSOURCE = dns_internal.c - @USE_DNSSERVER_TRUE@DNSSOURCE = dns.c -@@ -650,8 +650,8 @@ EXTRA_DIST = \ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ +@@ -610,8 +610,8 @@ EXTRA_DIST = \ DEFAULT_HTTP_PORT = @CACHE_HTTP_PORT@ DEFAULT_ICP_PORT = @CACHE_ICP_PORT@ DEFAULT_PREFIX = $(prefix) @@ -30,12 +30,12 @@ $OpenBSD: patch-src_Makefile_in,v 1.15 2008/07/16 21:18:28 brad Exp $ DEFAULT_DNSSERVER = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'` DEFAULT_LOG_PREFIX = $(localstatedir)/logs DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log -@@ -926,37 +926,37 @@ distclean-compile: - uninstall-info-am: +@@ -885,37 +885,37 @@ distclean-compile: + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` install-dataDATA: $(data_DATA) @$(NORMAL_INSTALL) -- test -z "$(datadir)" || $(mkdir_p) "$(DESTDIR)$(datadir)" -+ test -z "$(datadir)" || $(mkdir_p) "$(DESTDIR)$(prefix)/share/examples/squid" +- test -z "$(datadir)" || $(MKDIR_P) "$(DESTDIR)$(datadir)" ++ test -z "$(datadir)" || $(MKDIR_P) "$(DESTDIR)$(prefix)/share/examples/squid" @list='$(data_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -56,8 +56,8 @@ $OpenBSD: patch-src_Makefile_in,v 1.15 2008/07/16 21:18:28 brad Exp $ done install-sysconfDATA: $(sysconf_DATA) @$(NORMAL_INSTALL) -- test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)" -+ test -z "$(DESTDIR)$(prefix)/share/examples/squid" || $(mkdir_p) "$(DESTDIR)$(prefix)/share/examples/squid" +- test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" ++ test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(prefix)/share/examples/squid" @list='$(sysconf_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -78,16 +78,16 @@ $OpenBSD: patch-src_Makefile_in,v 1.15 2008/07/16 21:18:28 brad Exp $ done # This directory's subdirectories are mostly independent; you can cd -@@ -1139,7 +1139,7 @@ check: $(BUILT_SOURCES) +@@ -1097,7 +1097,7 @@ check: $(BUILT_SOURCES) all-am: Makefile $(PROGRAMS) $(DATA) installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(datadir)" "$(DESTDIR)$(sysconfdir)"; do \ -+ for dir in "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(DESTDIR)$(prefix)/share/examples/squid"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ for dir in "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(prefix)/share/examples/squid"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) -@@ -1278,7 +1278,7 @@ cf.data: cf.data.pre Makefile +@@ -1244,7 +1244,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-tools_Makefile_in b/www/squid/patches/patch-tools_Makefile_in index 8733ed3f20f..14a652be57f 100644 --- a/www/squid/patches/patch-tools_Makefile_in +++ b/www/squid/patches/patch-tools_Makefile_in @@ -1,11 +1,11 @@ -$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) +$OpenBSD: patch-tools_Makefile_in,v 1.3 2009/10/30 00:56:57 sthen Exp $ +--- tools/Makefile.in.orig Thu Apr 30 21:24:45 2009 ++++ tools/Makefile.in Wed Oct 28 19:16:47 2009 +@@ -62,6 +62,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) +cachemgr__CGIEXT__LDFLAGS = -static am__DEPENDENCIES_1 = cachemgr__CGIEXT__DEPENDENCIES = $(am__DEPENDENCIES_1) - am_cossdump_OBJECTS = cossdump.$(OBJEXT) + cachemgr__CGIEXT__LINK = $(CCLD) $(cachemgr__CGIEXT__CFLAGS) $(CFLAGS) \