Subject: Re: Problems with squid
To: None <martti.kuparinen@iki.fi>
From: Takahiro Kambe <taca@back-street.net>
List: tech-pkg
Date: 04/30/2005 18:52:17
In message <42733D7D.7090601@iki.fi>
on Sat, 30 Apr 2005 11:10:37 +0300,
Martti Kuparinen <martti.kuparinen@iki.fi> wrote:
> Takahiro Kambe wrote:
> > Is it improve anythihng if disable transparent_port.patch?
>
> It doesn't compile without that patch.
Oops, I've forgot one patch needed.
--
Takahiro Kambe <taca@back-street.net>
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/squid/Makefile,v
retrieving revision 1.148
diff -d -u -p -r1.148 Makefile
--- Makefile 26 Apr 2005 16:19:43 -0000 1.148
+++ Makefile 30 Apr 2005 09:51:50 -0000
@@ -37,13 +37,13 @@ PATCHFILES= squid-2.5.STABLE9-setcookie.
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
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/www/squid/distinfo,v
retrieving revision 1.95
diff -d -u -p -r1.95 distinfo
--- distinfo 26 Apr 2005 16:19:43 -0000 1.95
+++ distinfo 30 Apr 2005 09:51:50 -0000
@@ -84,9 +84,6 @@ Size (squid-2.5.9-2005042600/squid-2.5.S
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) = 536299e59c396829f23484
SHA1 (patch-ca) = 132e45eea22cccf6678b5d920d913965f73f0db7
SHA1 (patch-cb) = 603471bf702c3ff4480585dc59dc326f23a5f2e8
SHA1 (patch-cc) = 53d72f0df09f1e2c4cc9b65a635d320e4d315cf5
+SHA1 (patch-cd) = e4270ce5ee8c58dba78093e5624891e2abbbb7a5
Index: patches/patch-cd
===================================================================
RCS file: patches/patch-cd
diff -N patches/patch-cd
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-cd 30 Apr 2005 09:51:50 -0000
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/client_side.c.orig 2005-04-30 15:09:58.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;