Pullup ticket 756 - requested by Takahiro Kambe

bugfix update for squid

Revisions pulled up:
- pkgsrc/www/squid/Makefile		1.158
- pkgsrc/www/squid/distinfo		1.102
- pkgsrc/www/squid/options.mk		1.4
- pkgsrc/www/squid/patches/patch-ag	1.21
- pkgsrc/www/squid/patches/patch-an	1.9
- pkgsrc/www/squid/patches/patch-ap	1.2
- pkgsrc/www/squid/patches/patch-bb	1.8
- pkgsrc/www/squid/patches/patch-cd	removed

   Module Name:		pkgsrc
   Committed By:	taca
   Date:		Thu Sep 15 15:40:47 UTC 2005

   Modified Files:
   	pkgsrc/www/squid: Makefile distinfo options.mk
   	pkgsrc/www/squid/patches: patch-ag patch-an patch-ap patch-bb
   Removed Files:
   	pkgsrc/www/squid/patches: patch-cd

   Log Message:
   Update squid package to 2.5.10nb3.

   - pkgsrc update:

   o s/SQUID_BACKEND/SQUID_BACKENDS/ as suggested by pkglint.
   o Fix leaving ${PREFIX}/etc/squid/msntauth.conf.default out of PLIST.
   o IP Filter related patches are incorporated to squid.

   - Add/update official patches:

   o 2005-09-15 11:15 (Major) FATAL: Incorrect scheme in auth header
   o 2005-09-15 09:56 (Medium) Odd results on pipelined CONNECT requests
   o 2005-09-13 23:59 (Minor) Transparent proxy problem with IP Filter
   o 2005-09-11 01:53 (Medium) Clients bypassing delay pools by faking
                               a cache hit
   o 2005-09-11 01:42 (Cosmetic) Allow leaving core dumps on Linux
   o 2005-09-11 01:21 (Cosmetic) enums can not be assumed to be signed ints
   o 2005-09-11 01:21 (Cosmetic) Incorrect store dir selection debug message
                                 on objects >2G
   o 2005-09-11 00:57 (Minor) LDAP helpers does not work with TLS (-Z option)

8 files changed, 67 insertions, 146 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index 66e547c2fa4..8f0c0d058bc 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.153.2.1 2005/09/10 11:16:41 salo Exp $
+# $NetBSD: Makefile,v 1.153.2.2 2005/09/15 16:35:32 salo Exp $
 
 DISTNAME=	squid-2.5.STABLE10
 PKGNAME=	squid-2.5.10
-PKGREVISION=	2
+PKGREVISION=	3
 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/ \
@@ -36,8 +36,16 @@ PATCHFILES=	squid-2.5.STABLE10-content_length.patch \
 		squid-2.5.STABLE10-STORE_PENDING.patch \
 		squid-2.5.STABLE10-ldap_auth-U.patch \
 		squid-2.5.STABLE10-cacheClientTable.patch \
-		squid-2.5.STABLE10-Solaris_IPFilter.patch \
-		squid-2.5.STABLE10-mail_from.patch
+		squid-2.5.STABLE10-Solaris_IPFilter-2.patch \
+		squid-2.5.STABLE10-mail_from.patch \
+		squid-2.5.STABLE10-LDAP_TLS.patch \
+		squid-2.5.STABLE10-storedir_objsize_debug.patch \
+		squid-2.5.STABLE10-header_id_enum.patch \
+		squid-2.5.STABLE10-allow_coredump.patch \
+		squid-2.5.STABLE10-delay_pools.patch \
+		squid-2.5.STABLE10-NetBSD_IPFilter-4.patch \
+		squid-2.5.STABLE10-pipeline-CONNECT.patch \
+		squid-2.5.STABLE10-NTLM-scheme_assert.patch
 PATCH_DIST_STRIP=       -p1
 
 MAINTAINER=	taca@NetBSD.org
@@ -95,7 +103,7 @@ CONFIGURE_ARGS+=	--enable-auth=basic,digest,ntlm \
 			--enable-removal-policies=lru,heap \
 			--enable-poll \
 			--enable-underscores \
-			--enable-storeio=${SQUID_BACKEND:Q}
+			--enable-storeio=${SQUID_BACKENDS:Q}
 
 #
 # generic helpers
diff --git a/www/squid/distinfo b/www/squid/distinfo
index 2f3581ac0b6..0968d84af28 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.99.2.1 2005/09/10 11:16:41 salo Exp $
+$NetBSD: distinfo,v 1.99.2.2 2005/09/15 16:35:32 salo Exp $
 
 SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10.tar.bz2) = a0092570938032f66e7f636d1a6a02dd2383a643
 RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10.tar.bz2) = e1409a2fcd52e1c928d74740c98396886b5ef927
@@ -81,23 +81,46 @@ Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-ldap_auth-U.patch) = 1380 bytes
 SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-cacheClientTable.patch) = 1b09b265c23955c008456276a09b291c567cae0c
 RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-cacheClientTable.patch) = 4773824bd1d5e47af3137f3ec4f851766e8738ee
 Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-cacheClientTable.patch) = 632 bytes
-SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-Solaris_IPFilter.patch) = 898720e6b412859232346317ff1d2df2c2486ec2
-RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-Solaris_IPFilter.patch) = 55003aba24e74f7a1e93dc56a2801f6e2b5e235f
-Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-Solaris_IPFilter.patch) = 1607 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-Solaris_IPFilter-2.patch) = a2e5e60c4e8af4bac428e995633265989c6ba271
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-Solaris_IPFilter-2.patch) = d327a2126574ed3c4a1ce534211301705e901e6b
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-Solaris_IPFilter-2.patch) = 2993 bytes
 SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-mail_from.patch) = 92cbdc4ae9edf22f8eedd66603fed81ed4e300e6
 RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-mail_from.patch) = 2aa39b1f4ccf940250514cef58609209878c39ff
 Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-mail_from.patch) = 1863 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-LDAP_TLS.patch) = 62491b8283994c1a7f11a0d88269ea418a2271ae
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-LDAP_TLS.patch) = acaa61ff1e361d7c540349e93908fb20f04d9903
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-LDAP_TLS.patch) = 2466 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-storedir_objsize_debug.patch) = 35469702eb69339d3849f6510a98f5f834495a0a
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-storedir_objsize_debug.patch) = 56a27ba425ac262362143450984ce90a02caebe9
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-storedir_objsize_debug.patch) = 1289 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-header_id_enum.patch) = 70a6d54d8340fd038637262f8d10a8b0cf9f3514
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-header_id_enum.patch) = 9cf6e2011c80d1155ba7ed444320612404a38f84
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-header_id_enum.patch) = 628 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-allow_coredump.patch) = 72d122e439b806f51d4c19b44db39d7422f2b099
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-allow_coredump.patch) = 411dccc635c68cd5ed7e6008744bcccabf9d441a
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-allow_coredump.patch) = 3496 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-delay_pools.patch) = dd288e718ac2bfb1218c67395ffd2cb555eca94e
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-delay_pools.patch) = acd6eb90b85707867b052f8bb059f8479fef005d
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-delay_pools.patch) = 7782 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-NetBSD_IPFilter-4.patch) = 5a9756f243df5966e7abec3d71b9f982f9781718
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-NetBSD_IPFilter-4.patch) = dc0cda0aa82bd2bf0a81263e9bde447065f599c8
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-NetBSD_IPFilter-4.patch) = 4532 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-pipeline-CONNECT.patch) = f72a46995e4673d69d6d10c9c719ffbf63da0659
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-pipeline-CONNECT.patch) = 97b88ba80c8aa26ed9f0bc719a24d35993b81488
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-pipeline-CONNECT.patch) = 6316 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-NTLM-scheme_assert.patch) = 636aa38c881d2ccc3903111ee11459135e912482
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-NTLM-scheme_assert.patch) = def3c62346d2ef1b4d94229bb27300e799e9920e
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-NTLM-scheme_assert.patch) = 1203 bytes
 SHA1 (patch-aa) = 25d47b8ab8618af2b1d2a40f1dc3630cdc14038c
 SHA1 (patch-ab) = 1224ba4cee98a26d2c9d670eb6d57c6187ff2d56
 SHA1 (patch-ac) = 1b283f0a573c02c82ce26f75e67d19b1ec5ff9f0
 SHA1 (patch-ad) = 88b46bc9051ea32ebd74f06ebd362ce16f8c5c4c
 SHA1 (patch-ae) = 860c8ad41ea09282bdb0d626260084354458f653
-SHA1 (patch-ag) = 815ea5faa2425aa66f5648f702148427bbfd53ad
+SHA1 (patch-ag) = db36d9125fa812aa9d420f76a669337dd11e4916
 SHA1 (patch-aj) = aa2271e53602fe168604aeced6ed66d28fe47707
 SHA1 (patch-ak) = 108b313149271457bee702ecf9489c61715ec9e7
 SHA1 (patch-al) = 51d7c84b007ab9600ae911e1e9206cf91b937120
-SHA1 (patch-an) = c5bfcd3d8955e5f58cf18bcdc412e05c89082e89
-SHA1 (patch-ap) = f57cd1137c3e5419f3788c391292421ca8a91a57
-SHA1 (patch-bb) = 6bed55283acf8828de75b1fc05b20d6ef7ef965e
+SHA1 (patch-an) = a44c492c39e249d7894d8424263deca7f5e0ea95
+SHA1 (patch-ap) = 0bc9d7dceaf132a60e4089796057e2e3a65c37b8
+SHA1 (patch-bb) = aa85a484f01f980c968f0436b7a2b46e4ee86d4c
 SHA1 (patch-bc) = 536299e59c396829f23484a14bb9a6f5c0a4de35
-SHA1 (patch-cd) = f97ae58a084b75a3dda558f6e8c7c306cbb6b625
diff --git a/www/squid/options.mk b/www/squid/options.mk
index 944c8adf94d..450991331c4 100644
--- a/www/squid/options.mk
+++ b/www/squid/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2005/06/07 14:19:10 taca Exp $
+# $NetBSD: options.mk,v 1.3.2.1 2005/09/15 16:35:33 salo Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.squid
 PKG_SUPPORTED_OPTIONS=	icmp pam-helper snmp ssl aufs
@@ -42,7 +42,7 @@ PKG_SUPPORTED_OPTIONS+=	arp-acl
 
 .include "../../mk/bsd.options.mk"
 
-SQUID_BACKEND?=			ufs null
+SQUID_BACKENDS?=		ufs null
 SQUID_BASIC_AUTH_HELPERS?=	getpwnam MSNT NCSA YP winbind
 SQUID_DIGEST_AUTH_HELPERS?=	password
 SQUID_NTLM_AUTH_HELPERS?=	fakeauth SMB
@@ -85,7 +85,7 @@ CONFIGURE_ARGS+=	--enable-ssl --with-openssl=${SSLBASE}
 .endif
 
 .if !empty(PKG_OPTIONS:Mdiskd)
-SQUID_BACKEND+=		diskd
+SQUID_BACKENDS+=	diskd
 .endif
 
 .if !empty(SQUID_BASIC_AUTH_HELPERS)
diff --git a/www/squid/patches/patch-ag b/www/squid/patches/patch-ag
index bc39d039516..4bc34321bd4 100644
--- a/www/squid/patches/patch-ag
+++ b/www/squid/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.19.2.1 2005/09/10 11:16:41 salo Exp $
+$NetBSD: patch-ag,v 1.19.2.2 2005/09/15 16:35:33 salo Exp $
 
---- configure.orig	2005-09-02 10:23:02.000000000 +0900
+--- configure.orig	2005-09-13 12:26:12.000000000 +0900
 +++ configure
 @@ -2241,7 +2241,7 @@ if test "${enable_snmp+set}" = set; then
  #define SQUID_SNMP 1
@@ -11,27 +11,15 @@ $NetBSD: patch-ag,v 1.19.2.1 2005/09/10 11:16:41 salo Exp $
      
  
  if true; then
-@@ -4046,9 +4046,11 @@ for ac_hdr in \
- 	ip_fil_compat.h \
- 	ip_fil.h \
- 	ip_nat.h \
-+	ipl.h \
+@@ -4062,6 +4062,7 @@ for ac_hdr in \
  	libc.h \
  	limits.h \
  	linux/netfilter_ipv4.h \
-+	machine/byte_swap.h \
++ 	machine/byte_swap.h \
  	malloc.h \
  	math.h \
  	memory.h \
-@@ -4063,6 +4065,7 @@ for ac_hdr in \
- 	netinet/ip_fil_compat.h \
- 	netinet/ip_fil.h \
- 	netinet/ip_nat.h \
-+	netinet/ipl.h \
- 	openssl/err.h \
- 	openssl/md5.h \
- 	openssl/ssl.h \
-@@ -6294,43 +6297,38 @@ fi
+@@ -6309,43 +6310,38 @@ fi
  echo "$ac_t""$ac_cv_type_mode_t" 1>&6
  if test $ac_cv_type_mode_t = no; then
    cat >> confdefs.h <<\EOF
@@ -89,7 +77,7 @@ $NetBSD: patch-ag,v 1.19.2.1 2005/09/10 11:16:41 salo Exp $
  
  
  echo $ac_n "checking size of off_t""... $ac_c" 1>&6
-@@ -7646,8 +7644,8 @@ if test "$GCC" = "yes"; then
+@@ -7661,8 +7657,8 @@ if test "$GCC" = "yes"; then
  	GCCVER=`$CC -v 2>&1 | awk '$2 ==  "version" {print $3}'`
  	case "$GCCVER" in
  	2.95.[123])
diff --git a/www/squid/patches/patch-an b/www/squid/patches/patch-an
index 13bc38ee2db..3cd3ae0b3f9 100644
--- a/www/squid/patches/patch-an
+++ b/www/squid/patches/patch-an
@@ -1,6 +1,6 @@
-$NetBSD: patch-an,v 1.7.2.1 2005/09/10 11:16:41 salo Exp $
+$NetBSD: patch-an,v 1.7.2.2 2005/09/15 16:35:33 salo Exp $
 
---- configure.in.orig	2005-09-02 10:23:02.000000000 +0900
+--- configure.in.orig	2005-09-13 10:48:42.000000000 +0900
 +++ configure.in
 @@ -493,7 +493,7 @@ AC_ARG_ENABLE(snmp,
  [ if test "$enableval" = "yes" ; then
@@ -11,27 +11,15 @@ $NetBSD: patch-an,v 1.7.2.1 2005/09/10 11:16:41 salo Exp $
      AM_CONDITIONAL(USE_SNMP, true)
      SNMP_MAKEFILE=./snmplib/Makefile
      makesnmplib=snmplib
-@@ -1282,9 +1282,11 @@ AC_CHECK_HEADERS( \
- 	ip_fil_compat.h \
- 	ip_fil.h \
- 	ip_nat.h \
-+	ipl.h \
+@@ -1302,6 +1302,7 @@ AC_CHECK_HEADERS( \
  	libc.h \
  	limits.h \
  	linux/netfilter_ipv4.h \
-+	machine/byte_swap.h \
++ 	machine/byte_swap.h \
  	malloc.h \
  	math.h \
  	memory.h \
-@@ -1299,6 +1301,7 @@ AC_CHECK_HEADERS( \
- 	netinet/ip_fil_compat.h \
- 	netinet/ip_fil.h \
- 	netinet/ip_nat.h \
-+	netinet/ipl.h \
- 	openssl/err.h \
- 	openssl/md5.h \
- 	openssl/ssl.h \
-@@ -1510,8 +1513,17 @@ AC_CHECK_TYPE(pid_t, int)
+@@ -1529,8 +1530,17 @@ AC_CHECK_TYPE(pid_t, int)
  AC_CHECK_TYPE(size_t, unsigned int)
  AC_CHECK_TYPE(ssize_t, int)
  AC_CHECK_TYPE(off_t, int)
@@ -51,7 +39,7 @@ $NetBSD: patch-an,v 1.7.2.1 2005/09/10 11:16:41 salo Exp $
  
  AC_CHECK_SIZEOF_SYSTYPE(off_t, 4)
  AC_CHECK_SIZEOF_SYSTYPE(size_t, 4)
-@@ -1719,8 +1731,8 @@ if test "$GCC" = "yes"; then
+@@ -1738,8 +1748,8 @@ if test "$GCC" = "yes"; then
  	GCCVER=`$CC -v 2>&1 | awk '$2 ==  "version" {print $3}'`
  	case "$GCCVER" in
  	[2.95.[123]])
diff --git a/www/squid/patches/patch-ap b/www/squid/patches/patch-ap
index 9f57f8b3218..5c5b3e402c3 100644
--- a/www/squid/patches/patch-ap
+++ b/www/squid/patches/patch-ap
@@ -1,13 +1,16 @@
-$NetBSD: patch-ap,v 1.1.2.2 2005/09/10 11:16:41 salo Exp $
+$NetBSD: patch-ap,v 1.1.2.3 2005/09/15 16:35:33 salo Exp $
 
 --- helpers/basic_auth/MSNT/Makefile.in.orig	2005-03-19 09:55:41.000000000 +0900
 +++ helpers/basic_auth/MSNT/Makefile.in
-@@ -383,7 +383,7 @@ info: info-am
+@@ -383,9 +383,9 @@ info: info-am
  
  info-am:
  
 -install-data-am: install-data-local
 +install-data-am:
  
- install-exec-am: install-libexecPROGRAMS install-sysconfDATA
+-install-exec-am: install-libexecPROGRAMS install-sysconfDATA
++install-exec-am: install-libexecPROGRAMS
+ 
+ install-info: install-info-am
  
diff --git a/www/squid/patches/patch-bb b/www/squid/patches/patch-bb
index e1c3590f47e..74fd58523a1 100644
--- a/www/squid/patches/patch-bb
+++ b/www/squid/patches/patch-bb
@@ -1,17 +1,7 @@
-$NetBSD: patch-bb,v 1.6.2.1 2005/09/10 11:16:41 salo Exp $
+$NetBSD: patch-bb,v 1.6.2.2 2005/09/15 16:35:33 salo Exp $
 
 --- include/autoconf.h.in.orig	2005-04-23 10:32:27.000000000 +0900
 +++ include/autoconf.h.in
-@@ -656,6 +656,9 @@
- /* Define if you have the <ip_nat.h> header file.  */
- #undef HAVE_IP_NAT_H
- 
-+/* Define if you have the <ipl.h> header file.  */
-+#undef HAVE_IPL_H
-+
- /* Define if you have the <libc.h> header file.  */
- #undef HAVE_LIBC_H
- 
 @@ -665,6 +668,9 @@
  /* Define if you have the <linux/netfilter_ipv4.h> header file.  */
  #undef HAVE_LINUX_NETFILTER_IPV4_H
@@ -22,13 +12,3 @@ $NetBSD: patch-bb,v 1.6.2.1 2005/09/10 11:16:41 salo Exp $
  /* Define if you have the <malloc.h> header file.  */
  #undef HAVE_MALLOC_H
  
-@@ -707,6 +713,9 @@
- /* Define if you have the <netinet/ip_nat.h> header file.  */
- #undef HAVE_NETINET_IP_NAT_H
- 
-+/* Define if you have the <netinet/ipl.h> header file.  */
-+#undef HAVE_NETINET_IPL_H
-+
- /* Define if you have the <netinet/tcp.h> header file.  */
- #undef HAVE_NETINET_TCP_H
- 
diff --git a/www/squid/patches/patch-cd b/www/squid/patches/patch-cd
deleted file mode 100644
index 5846cf55b03..00000000000
--- a/www/squid/patches/patch-cd
+++ /dev/null
@@ -1,69 +0,0 @@
-$NetBSD: patch-cd,v 1.9.2.1 2005/09/10 11:16:41 salo Exp $
-
---- src/client_side.c.orig	2005-09-02 10:23:02.000000000 +0900
-+++ src/client_side.c
-@@ -55,6 +55,11 @@
- #ifdef _SQUID_SOLARIS_
- #undef free
- #endif
-+#ifdef HAVE_IPL_H
-+#include <ipl.h>
-+#elif HAVE_NETINET_IPL_H
-+#include <netinet/ipl.h>
-+#endif
- #if HAVE_IP_FIL_COMPAT_H
- #include <ip_fil_compat.h>
- #elif HAVE_NETINET_IP_FIL_COMPAT_H
-@@ -2606,6 +2611,9 @@ parseHttpRequest(ConnStateData * conn, m
-     static int natfd = -1;
-     static int siocgnatl_cmd = SIOCGNATL & 0xff;
-     int x;
-+#if defined(IPFILTER_VERSION) && (IPFILTER_VERSION >= 4000027)
-+    struct ipfobj obj;
-+#endif
- #endif
- #if PF_TRANSPARENT
-     struct pfioc_natlook nl;
-@@ -2748,6 +2756,13 @@ parseHttpRequest(ConnStateData * conn, m
- 	if (vhost_mode) {
- #if IPF_TRANSPARENT
- 	    static time_t last_reported = 0;
-+#if defined(IPFILTER_VERSION) && (IPFILTER_VERSION >= 4000027)
-+	    obj.ipfo_rev = IPFILTER_VERSION;
-+	    obj.ipfo_size = sizeof(natLookup);
-+	    obj.ipfo_ptr = &natLookup;
-+	    obj.ipfo_type = IPFOBJ_NATLOOKUP;
-+	    obj.ipfo_offset = 0;
-+#endif
- 	    natLookup.nl_inport = http->conn->me.sin_port;
- 	    natLookup.nl_outport = http->conn->peer.sin_port;
- 	    natLookup.nl_inip = http->conn->me.sin_addr;
-@@ -2756,8 +2771,8 @@ parseHttpRequest(ConnStateData * conn, m
- 	    if (natfd < 0) {
- 		int save_errno;
- 		enter_suid();
--#ifdef IPL_NAME
--		natfd = open(IPL_NAME, O_RDONLY, 0);
-+#ifdef IPNAT_NAME
-+		natfd = open(IPNAT_NAME, O_RDONLY, 0);
- #else
- 		natfd = open(IPL_NAT, O_RDONLY, 0);
- #endif
-@@ -2771,6 +2786,9 @@ parseHttpRequest(ConnStateData * conn, m
- 		    last_reported = squid_curtime;
- 		}
- 	    } else {
-+#if defined(IPFILTER_VERSION) && (IPFILTER_VERSION >= 4000027)
-+		x = ioctl(natfd, SIOCGNATL, &obj);
-+#else
- 		/*
- 		 * IP-Filter changed the type for SIOCGNATL between
- 		 * 3.3 and 3.4.  It also changed the cmd value for
-@@ -2784,6 +2802,7 @@ parseHttpRequest(ConnStateData * conn, m
- 		} else {
- 		    x = ioctl(natfd, SIOCGNATL, &natLookup);
- 		}
-+#endif
- 		if (x < 0) {
- 		    if (errno != ESRCH) {
- 			if (squid_curtime - last_reported > 60) {