diff options
| author | taca <taca@pkgsrc.org> | 2005-05-01 23:17:49 +0000 |
|---|---|---|
| committer | taca <taca@pkgsrc.org> | 2005-05-01 23:17:49 +0000 |
| commit | ff555936901a313652de5c3ec3b08a62935e74b0 (patch) | |
| tree | e95814e3fc15593e916db01243b35fc336352cc6 /www/squid | |
| parent | d05cc39960a7da76e85895d9d9965d814950ba42 (diff) | |
| download | pkgsrc-ff555936901a313652de5c3ec3b08a62935e74b0.tar.gz | |
Disable squid-2.5.STABLE9-transparent_port.patch since it is broken with
IP Filter 4.1 and later. (It has no problem on IP Filter 3.x, but it is
difficult apply it conditionally with IP Filter's version.)
This apparently fix PR pkg/30085. But note, Squid's transparent proxy
with IP Filter dosen't work. It is worked without IP Filter's NAT process.
So, web acceess through squid may fail for HTTP 1.0 client which dosen't
send Host header.
Bump PKGREVISION (squid-2.5.9nb10).
Diffstat (limited to 'www/squid')
| -rw-r--r-- | www/squid/Makefile | 6 | ||||
| -rw-r--r-- | www/squid/distinfo | 6 | ||||
| -rw-r--r-- | www/squid/patches/patch-cd | 13 |
3 files changed, 18 insertions, 7 deletions
diff --git a/www/squid/Makefile b/www/squid/Makefile index 425e40b72d8..42bdc54d9c0 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.148 2005/04/26 16:19:43 taca Exp $ +# $NetBSD: Makefile,v 1.149 2005/05/01 23:17:49 taca Exp $ DISTNAME= squid-2.5.STABLE9 PKGNAME= squid-2.5.9 -PKGREVISION= 9 +PKGREVISION= 10 CATEGORIES= www MASTER_SITES= http://www.squid-cache.org/Versions/v2/2.5/ \ ftp://ftp.leo.org/pub/comp/general/infosys/www/daemons/squid/squid-2/STABLE/ \ @@ -37,13 +37,13 @@ PATCHFILES= squid-2.5.STABLE9-setcookie.patch \ squid-2.5.STABLE9-syslog.patch \ squid-2.5.STABLE9-errpage_user.patch \ squid-2.5.STABLE9-debug_newlines.patch \ - squid-2.5.STABLE9-transparent_port.patch \ squid-2.5.STABLE9-squid_k_nohostname.patch \ squid-2.5.STABLE9-config_CRLF.patch \ squid-2.5.STABLE9-forwardcc.patch \ squid-2.5.STABLE9-authinfo.patch \ squid-2.5.STABLE9-chroot_pidfile.patch \ squid-2.5.STABLE9-cachemgr_conf.patch +# squid-2.5.STABLE9-transparent_port.patch PATCH_DIST_STRIP= -p1 MAINTAINER= taca@NetBSD.org diff --git a/www/squid/distinfo b/www/squid/distinfo index 8b47b0e3bb7..e65fbc97821 100644 --- a/www/squid/distinfo +++ b/www/squid/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.95 2005/04/26 16:19:43 taca Exp $ +$NetBSD: distinfo,v 1.96 2005/05/01 23:17:49 taca Exp $ SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9.tar.bz2) = 9605e274f548bfc8dcb60a299b680df2846ee74b RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9.tar.bz2) = 98e49ff58ffc4664a46350f3d6c34be99b713716 @@ -84,9 +84,6 @@ Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-errpage_user.patch) = 822 bytes SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9-debug_newlines.patch) = 804f09685b4d86c507f7eb669da20caeb02e6f7b RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9-debug_newlines.patch) = efc38284ceed04743abf637ce3b1f59628d5df57 Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-debug_newlines.patch) = 5049 bytes -SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9-transparent_port.patch) = 2580792f9353f23a221d4dc6303dbc0919aaf10c -RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9-transparent_port.patch) = 9d9db96ef48fdcd376a1507996e24ab81db92024 -Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-transparent_port.patch) = 8886 bytes SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9-squid_k_nohostname.patch) = 326dc2668e02f1034627f944163f92f12c7dc978 RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9-squid_k_nohostname.patch) = a9088582f60430c5a5e1f47e2566ef42d473a4ce Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-squid_k_nohostname.patch) = 1590 bytes @@ -121,3 +118,4 @@ SHA1 (patch-bc) = 536299e59c396829f23484a14bb9a6f5c0a4de35 SHA1 (patch-ca) = 132e45eea22cccf6678b5d920d913965f73f0db7 SHA1 (patch-cb) = 603471bf702c3ff4480585dc59dc326f23a5f2e8 SHA1 (patch-cc) = 53d72f0df09f1e2c4cc9b65a635d320e4d315cf5 +SHA1 (patch-cd) = 3d3e2d18f3f2b46109177109c7dbf9695eb1ed22 diff --git a/www/squid/patches/patch-cd b/www/squid/patches/patch-cd new file mode 100644 index 00000000000..c3ab8b7d7ee --- /dev/null +++ b/www/squid/patches/patch-cd @@ -0,0 +1,13 @@ +$NetBSD: patch-cd,v 1.7 2005/05/01 23:17:49 taca Exp $ + +--- src/client_side.c.orig 2005-05-02 01:31:18.000000000 +0900 ++++ src/client_side.c +@@ -2782,7 +2782,7 @@ parseHttpRequest(ConnStateData * conn, m + if (natfd < 0) { + int save_errno; + enter_suid(); +- natfd = open(IPL_NAT, O_RDONLY, 0); ++ natfd = open(IPNAT_NAME, O_RDONLY, 0); + save_errno = errno; + leave_suid(); + errno = save_errno; |