diff options
author | veego <veego@pkgsrc.org> | 2000-10-15 20:17:44 +0000 |
---|---|---|
committer | veego <veego@pkgsrc.org> | 2000-10-15 20:17:44 +0000 |
commit | 313e13dc34be87c2cf6de08f1d1949acbc2c3059 (patch) | |
tree | 0c6d0de4c480b03dceb11cbc6a818817b11f5fd5 /www/squid | |
parent | 3df5117eac917300c1dda8b48c683fd50c5b52a2 (diff) | |
download | pkgsrc-313e13dc34be87c2cf6de08f1d1949acbc2c3059.tar.gz |
Update squid from 2.3stable3 to 2.3stable4:
Important Changes:
- offline_toggle
You can now toggle the 'offline_mode' option from the cache manager.
- minimum_object_size
Added the 'minimum_object_size' option. Files smaller than this size are
not cached.
- passive_ftp
If your firewall doesn't allow passive FTP transfers, you can tell Squid
to use PORT instead by turning the 'passive_ftp' option off.
- wccp_version
Some Cisco IOS versions expect to receive WCCP packets with version set
to three. The 'wccp_version' option allows you to change it, from the
default value of four.
Diffstat (limited to 'www/squid')
-rw-r--r-- | www/squid/Makefile | 22 | ||||
-rw-r--r-- | www/squid/files/md5 | 10 | ||||
-rw-r--r-- | www/squid/files/patch-sum | 4 | ||||
-rw-r--r-- | www/squid/patches/patch-ag | 16 |
4 files changed, 29 insertions, 23 deletions
diff --git a/www/squid/Makefile b/www/squid/Makefile index fbdf80b7fad..75837481d3d 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.33 2000/10/10 10:28:39 tron Exp $ +# $NetBSD: Makefile,v 1.34 2000/10/15 20:17:44 veego Exp $ -DISTNAME= squid-2.3.STABLE3-src -PKGNAME= squid-2.3s3 +DISTNAME= squid-2.3.STABLE4-src +PKGNAME= squid-2.3s4 CATEGORIES= www MASTER_SITES= \ http://www.squid-cache.org/Versions/v2/2.3/ \ @@ -12,8 +12,10 @@ MASTER_SITES= \ ftp://ftp.kpnqwest.de/pub/mirror.squid/squid-2/STABLE/ PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.3/bugs/ -PATCHFILES= squid-2.3.stable3-carp_compile.patch \ - squid-2.3.stable3-storeExpiredReferenceAge.patch +PATCHFILES= squid-2.3.stable4-invalid_ip_acl_entry.patch \ + squid-2.3.stable4-ipfw_configure.patch \ + squid-2.3.stable4-internal_dns_rcode_table_formatting.patch \ + squid-2.3.stable4-ftp_icon_not_found.patch MAINTAINER= tron@netbsd.org HOMEPAGE= http://www.squid-cache.org/ @@ -50,11 +52,11 @@ DEPENDS+= egcs-1.1.2:../../lang/egcs MAKE_ENV+= CPPFLAGS= CFLAGS= .endif -pre-patch: - @cd ${WRKSRC}/src && \ - ${MV} client_side.c client_side.c.prepatch && \ - ${SED} -e 's#1\.459\.2\.36#1\.459\.2\.37#' <client_side.c.prepatch \ - >client_side.c +post-configure: + @cd ${WRKSRC}/include && \ + ${MV} autoconf.h autoconf.h.prepatch && \ + ${SED} -e 's%#define fd_mask int%/* #undef fd_mask */%' <autoconf.h.prepatch \ + >autoconf.h post-build: ${SED} s#@PREFIX@#${PREFIX}#g <${FILESDIR}/squid.sh >${WRKDIR}/squid.sh diff --git a/www/squid/files/md5 b/www/squid/files/md5 index 71d53bf5870..2a63c848958 100644 --- a/www/squid/files/md5 +++ b/www/squid/files/md5 @@ -1,5 +1,7 @@ -$NetBSD: md5,v 1.12 2000/05/19 07:18:55 tron Exp $ +$NetBSD: md5,v 1.13 2000/10/15 20:17:45 veego Exp $ -MD5 (squid-2.3.STABLE3-src.tar.gz) = 8c2384ea5e17c68941fea4cdeef3b6f7 -MD5 (squid-2.3.stable3-carp_compile.patch) = 6bc79fd59484d7b4acc55d268a6e5081 -MD5 (squid-2.3.stable3-storeExpiredReferenceAge.patch) = e98c735db35ed1f38363e54d9bf6d788 +MD5 (squid-2.3.STABLE4-src.tar.gz) = c38c083f44c222a8d026fa129c30b98f +MD5 (squid-2.3.stable4-invalid_ip_acl_entry.patch) = 436eb77056bed5d45547c739d1123bd3 +MD5 (squid-2.3.stable4-ipfw_configure.patch) = 4453c53a712280a26fdca42c950bc94f +MD5 (squid-2.3.stable4-internal_dns_rcode_table_formatting.patch) = bec46f5a1fcbd9aa1deb9d518c5c11a5 +MD5 (squid-2.3.stable4-ftp_icon_not_found.patch) = f1383b24672f9a8317c2c16302a94eaa diff --git a/www/squid/files/patch-sum b/www/squid/files/patch-sum index d9afe6dad47..5150bfc8b47 100644 --- a/www/squid/files/patch-sum +++ b/www/squid/files/patch-sum @@ -1,4 +1,4 @@ -$NetBSD: patch-sum,v 1.6 2000/05/19 07:18:55 tron Exp $ +$NetBSD: patch-sum,v 1.7 2000/10/15 20:17:46 veego Exp $ MD5 (patch-aa) = 6befb071002fb7ced0fb9f388d039cd9 MD5 (patch-ab) = 05ef29847c539ee53d056061ab21ebcf @@ -6,6 +6,6 @@ MD5 (patch-ac) = 3bb7a6c638dbbe91042ea52149dbc18e MD5 (patch-ad) = e29e0dbd58b2838964d4135d730dfc5b MD5 (patch-ae) = fa1d2532d75b8e409f225063e6589f4a MD5 (patch-af) = ec14792120b479d910a2a9f2f183564c -MD5 (patch-ag) = faf26a08bbaf4998339e37ab9f9b305c +MD5 (patch-ag) = c29b4cd5e47bcd56c8b63c97ddd135b2 MD5 (patch-ah) = 971f5268e79bd6a7b266baa3e5b87ca0 MD5 (patch-ai) = f4e4dbed017331c46df688543c98fec8 diff --git a/www/squid/patches/patch-ag b/www/squid/patches/patch-ag index 1b618b9422f..5bebf7e523d 100644 --- a/www/squid/patches/patch-ag +++ b/www/squid/patches/patch-ag @@ -1,17 +1,19 @@ -$NetBSD: patch-ag,v 1.6 1999/11/12 22:07:11 tron Exp $ +$NetBSD: patch-ag,v 1.7 2000/10/15 20:17:46 veego Exp $ ---- configure.orig Thu Sep 23 02:06:48 1999 -+++ configure Fri Nov 12 22:15:48 1999 -@@ -644,11 +644,11 @@ +--- configure.orig Tue Sep 12 13:20:11 2000 ++++ configure Tue Sep 12 13:17:48 2000 +@@ -676,12 +676,12 @@ REGEXLIB='' # -lregex LIBREGEX='' # libregex.a --if test "$libexecdir" = '${exec_prefix}/libexec'; then +-if test "$libexecdir" = '${exec_prefix}/libexec' && +- test "$localstatedir" = '${prefix}/var'; then - libexecdir='${bindir}' - localstatedir='${prefix}' - -fi -+#if test "$libexecdir" = '${exec_prefix}/libexec'; then ++#if test "$libexecdir" = '${exec_prefix}/libexec' && ++# test "$localstatedir" = '${prefix}/var'; then +# libexecdir='${bindir}' +# localstatedir='${prefix}' +# @@ -19,7 +21,7 @@ $NetBSD: patch-ag,v 1.6 1999/11/12 22:07:11 tron Exp $ case "$host_os" in cygwin32|os2) -@@ -1204,7 +1204,7 @@ +@@ -1287,7 +1287,7 @@ #define SQUID_SNMP 1 EOF |