diff options
| author | adam <adam@pkgsrc.org> | 2012-01-08 10:06:59 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2012-01-08 10:06:59 +0000 |
| commit | da404b33a435bdd85ea5bc84bf92a6cf78b4a31c (patch) | |
| tree | 6365cc3cddbb0d5a34b46213a4066a91e081af8c /www | |
| parent | 551fc3f3a2212c56d67c5540881bc4a7561b5c11 (diff) | |
| download | pkgsrc-da404b33a435bdd85ea5bc84bf92a6cf78b4a31c.tar.gz | |
Changes 3.1.18:
* Bug 3085: Crash when parsing esi:include
* Bug 3442: assertion failed: external_acl.cc:908: ch->auth_user_request != NULL
* Polish: debug messages on swap.state rename failure
* Portability: SSL library dependency fixes
* Bug 3440: compile error in Adaptation
Diffstat (limited to 'www')
| -rw-r--r-- | www/squid31/Makefile | 5 | ||||
| -rw-r--r-- | www/squid31/distinfo | 11 | ||||
| -rw-r--r-- | www/squid31/patches/patch-aj | 15 |
3 files changed, 20 insertions, 11 deletions
diff --git a/www/squid31/Makefile b/www/squid31/Makefile index f8fe243673b..edc49a87de3 100644 --- a/www/squid31/Makefile +++ b/www/squid31/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.35 2011/11/28 15:26:25 drochner Exp $ +# $NetBSD: Makefile,v 1.36 2012/01/08 10:06:59 adam Exp $ -DISTNAME= squid-3.1.16 +DISTNAME= squid-3.1.18 PKGNAME= ${DISTNAME} # Necessary for "pkgsrc/www/squid/options.mk" -PKGREVISION= 1 CATEGORIES= www MASTER_SITES= http://www.squid-cache.org/Versions/v3/3.1/ \ ${SQUID_MASTER_SITES} diff --git a/www/squid31/distinfo b/www/squid31/distinfo index 25a94252360..bd66ac536f3 100644 --- a/www/squid31/distinfo +++ b/www/squid31/distinfo @@ -1,12 +1,13 @@ -$NetBSD: distinfo,v 1.32 2011/11/28 15:26:25 drochner Exp $ +$NetBSD: distinfo,v 1.33 2012/01/08 10:06:59 adam Exp $ -SHA1 (squid-3.1.16.tar.bz2) = 4d272921155165331205b039cebee2643158b5eb -RMD160 (squid-3.1.16.tar.bz2) = df730d0c60b0d16a11c7157c55f1c89b0c6f1f65 -Size (squid-3.1.16.tar.bz2) = 2510911 bytes +SHA1 (squid-3.1.18.tar.bz2) = 45926da99e3ea8320cb891275738c63b0367eac6 +RMD160 (squid-3.1.18.tar.bz2) = badf72c534ffd05bb6c2884bdcb9d54b15d9dc02 +Size (squid-3.1.18.tar.bz2) = 2510258 bytes SHA1 (patch-ad) = 2e8c05f220374240e5681efdd46379851c6bb50e SHA1 (patch-ae) = 944c24b28cf11f7a876150f8f0e131af5f3e354d -SHA1 (patch-aj) = 9f250b7f645b2ee77243a617c1a7faa5c7956339 +SHA1 (patch-aj) = b49b2549b125ec465e414445404ac759f3e54490 SHA1 (patch-al) = 6fec093f8969aed96cb8ffb115d96f9d21ac1f63 SHA1 (patch-am) = d6d52948f883d983b114c68cffb392cb8295f847 SHA1 (patch-src_base_TidyPointer.h) = d616bc21f7ab640622b7c34cf9da8222d2ddb5cf SHA1 (patch-src_ssl_gadgets.cc) = c631940ffd3fc7f44bc1586169eb4fe13a79ab35 +SHA1 (patch-src_store.cc) = 0f439a4440bb501459464916e7ab39472b95f0d4 diff --git a/www/squid31/patches/patch-aj b/www/squid31/patches/patch-aj index b2249c175b4..95b3623a517 100644 --- a/www/squid31/patches/patch-aj +++ b/www/squid31/patches/patch-aj @@ -1,8 +1,8 @@ -$NetBSD: patch-aj,v 1.5 2011/01/15 10:32:08 adam Exp $ +$NetBSD: patch-aj,v 1.6 2012/01/08 10:06:59 adam Exp $ ---- src/Makefile.in.orig 2010-12-22 05:47:54.000000000 +0000 +--- src/Makefile.in.orig 2011-12-03 06:20:35.000000000 +0000 +++ src/Makefile.in -@@ -4616,14 +4616,14 @@ info: info-recursive +@@ -4712,14 +4712,14 @@ info: info-recursive info-am: @@ -19,3 +19,12 @@ $NetBSD: patch-aj,v 1.5 2011/01/15 10:32:08 adam Exp $ install-html: install-html-recursive +@@ -4814,7 +4814,7 @@ cache_cf.o: cf_parser.cci + + # cf_gen builds the configuration files. + cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES) +- $(HOSTCXX) -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src ++ $(HOSTCXX) $(CXXFLAGS) -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src + + # squid.conf.default is built by cf_gen when making cf_parser.cci + squid.conf.default squid.conf.documented: cf_parser.cci |