- Add missing optional installed files.

- Slightly simplify installation of example configurations.
- Add official patches.

* 2005-07-11 00:46 (Cosmetic) The new --with-build-environment=...
				option doesn't work
* 2005-07-09 08:58 (Cosmetic) Allow wb_ntlm_auth to run more silent
* 2005-07-03 08:24 (Cosmetic) "make all" gives many warnings
* 2005-06-29 20:36 (Minor) wbinfo_group.pl only looks into the first
				group specified
* 2005-06-21 22:28 (Minor) FTP listings uses "BASE HREF" much more than
				it needs to,
* 2005-06-22 10:46 (Cosmetic) Title in FTP listings somewhat messed up
* 2005-06-19 21:03 (Minor) SNMP GETNEXT fails if the given OID is
				outside the Squid MIB
* 2005-06-19 09:39 (Minor) squid -k reconfigure internal corruption
				if the type of a cache_dir is changed
* 2005-06-13 22:55 (Minor) httpd_accel_signle_host incompatible
				with redireection
* 2005-06-30 08:49 (Minor) Core dump with --enable-ipf-transparent
				if access to NAT device not granted
* 2005-06-27 21:24 (Minor) squid -k fails in combination with chroot
				after patch for bug 1157
* 2005-06-09 08:01 (Minor) Squid internal icons served up with slightly
				incorrect HTTP headers
* 2005-06-06 21:38 (Cosmetic) Updated Spanish error messages

Bump PKGREVISION.

6 files changed, 101 insertions, 31 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index a62c61204f5..eab0d79df79 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.154 2005/07/15 20:14:03 jlam Exp $
+# $NetBSD: Makefile,v 1.155 2005/08/09 15:48:29 taca Exp $
 
 DISTNAME=	squid-2.5.STABLE10
 PKGNAME=	squid-2.5.10
+PKGREVISION=	1
 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/ \
@@ -9,7 +10,20 @@ MASTER_SITES=	http://www.squid-cache.org/Versions/v2/2.5/ \
 EXTRACT_SUFX=	.tar.bz2
 
 PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.5/bugs/
-PATCHFILES=	squid-2.5.STABLE10-content_length.patch
+PATCHFILES=	squid-2.5.STABLE10-content_length.patch \
+		squid-2.5.STABLE10-spanish.patch \
+		squid-2.5.STABLE10-internal_date.patch \
+		squid-2.5.STABLE10-chroot-2.patch \
+		squid-2.5.STABLE10-transparent-2.patch \
+		squid-2.5.STABLE10-redirect_flags.patch \
+		squid-2.5.STABLE10-cache_dir_change.patch \
+		squid-2.5.STABLE10-snmp_getnext.patch \
+		squid-2.5.STABLE10-ftp_title-2.patch \
+		squid-2.5.STABLE10-ftp_basehref.patch \
+		squid-2.5.STABLE10-wbinfo_groups.patch \
+		squid-2.5.STABLE10-64bit_cleanup.patch \
+		squid-2.5.STABLE10-wb_ntlm_auth_silent.patch \
+		squid-2.5.STABLE10-buildenv.patch
 PATCH_DIST_STRIP=       -p1
 
 MAINTAINER=	taca@NetBSD.org
@@ -47,9 +61,12 @@ PKG_GROUPS=	${SQUID_GROUP}
 PKG_USERS=	${SQUID_USER}:${SQUID_GROUP}::Squid\\ Web-Cache\\ pseudo-user
 CONF_FILES+=	${EXAMPLESDIR}/mime.conf ${PKG_SYSCONFDIR}/mime.conf
 CONF_FILES+=	${EXAMPLESDIR}/squid.conf ${PKG_SYSCONFDIR}/squid.conf
+CONF_FILES+=	${EXAMPLESDIR}/msntauth.conf ${PKG_SYSCONFDIR}/msntauth.conf
 OWN_DIRS=	${DATADIR}
 OWN_DIRS_PERMS+= ${DATADIR}/cache ${SQUID_USER} ${SQUID_GROUP} 0750 \
 		 ${DATADIR}/logs ${SQUID_USER} ${SQUID_GROUP} 0750
+EXAMPLES_FILES=	src/mime.conf.default src/squid.conf.default \
+		helpers/basic_auth/MSNT/msntauth.conf.default
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -82,6 +99,7 @@ OPTIONAL_FILES+= libexec/digest_pw_auth
 #
 # ntlm auth helpers (except no_check and winbind)
 #
+OPTIONAL_FILES+= libexec/fakeauth_auth libexec/ntlm_auth
 OPTIONAL_FILES+= libexec/wb_ntlmauth man/man8/squid_unix_group.8
 #
 # external acl helpers (except ldap_group, wbinfo_group and winbind_group)
@@ -89,12 +107,16 @@ OPTIONAL_FILES+= libexec/wb_ntlmauth man/man8/squid_unix_group.8
 OPTIONAL_FILES+= libexec/ip_user_check libexec/squid_unix_group
 
 pre-install:
-	@${INSTALL_DATA_DIR} ${EXAMPLESDIR}
 	@${INSTALL_DATA_DIR} ${PREFIX}/share/squid
 	@${INSTALL_DATA_DIR} ${PREFIX}/share/squid/errors
 	@${INSTALL_DATA_DIR} ${PREFIX}/share/squid/icons
 
 post-install:
+	@${INSTALL_DATA_DIR} ${EXAMPLESDIR}
+.for f in ${EXAMPLES_FILES}
+	cd ${WRKSRC} && \
+	${INSTALL_DATA}	${f} ${EXAMPLESDIR}/`basename ${f} .default`
+.endfor
 	@${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
 	${INSTALL_DATA_DIR} ${DOCDIR}
 	@cd ${WRKSRC};						\
diff --git a/www/squid/PLIST b/www/squid/PLIST
index a2569b71363..636a20e1daf 100644
--- a/www/squid/PLIST
+++ b/www/squid/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2005/06/05 14:20:26 taca Exp $
+@comment $NetBSD: PLIST,v 1.19 2005/08/09 15:48:29 taca Exp $
 bin/squidclient
 libexec/cachemgr.cgi
 man/man8/cachemgr.cgi.8
@@ -11,6 +11,7 @@ share/doc/squid/RELEASENOTES.html
 share/doc/squid/debug-sections.txt
 share/examples/rc.d/squid
 share/examples/squid/mime.conf
+share/examples/squid/msntauth.conf
 share/examples/squid/squid.conf
 @dirrm share/doc/squid
 @dirrm share/examples/squid
diff --git a/www/squid/distinfo b/www/squid/distinfo
index 0aaa40fe3a9..228f95246bf 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.99 2005/06/07 14:19:10 taca Exp $
+$NetBSD: distinfo,v 1.100 2005/08/09 15:48:29 taca 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
@@ -6,7 +6,46 @@ Size (squid-2.5.10-2005060500/squid-2.5.STABLE10.tar.bz2) = 1069922 bytes
 SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-content_length.patch) = 197a8b7cbd288c491a2a766d846653930c4e9275
 RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-content_length.patch) = 68889eca3b7aa9094125f864be2ad66bc8031f50
 Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-content_length.patch) = 1879 bytes
-SHA1 (patch-aa) = 4d697ea43975e7c98bdf6ff5b18d82b944bdd6b2
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-spanish.patch) = 054b9bc37328071c4ccb9e1b3ec8b893f36aa3f2
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-spanish.patch) = 80ef1444ad53028e122a195a0e0328a35fa8dafe
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-spanish.patch) = 17111 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-internal_date.patch) = 5ce31f06f1c9d07d845679e83cdfd45610e10a89
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-internal_date.patch) = 1b12f4f120af55456a523a3a17c7cc939d65afe5
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-internal_date.patch) = 8150 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-chroot-2.patch) = e6eb56e9a93528b32bdd7d1964aae4673e9c340d
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-chroot-2.patch) = b71367a6bec8fe7558e2d39d604eacd545fef887
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-chroot-2.patch) = 3500 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-transparent-2.patch) = 4b7971b009d12f931a01f2ceff6742fb88be5d0a
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-transparent-2.patch) = 710494240e519cc6b89f02c8135f918c62144b57
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-transparent-2.patch) = 4008 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-redirect_flags.patch) = f6ebe02e82f54704c70600dead9ac6c4c96064d6
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-redirect_flags.patch) = 19c79b0c4e0c866599d4f88080981bf9ede49683
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-redirect_flags.patch) = 945 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-cache_dir_change.patch) = a181a0eece077b8e1c0a3ea976b39fb4318c721a
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-cache_dir_change.patch) = c191c101183662ac63f1dd1f32accdf3d6699a87
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-cache_dir_change.patch) = 2843 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-snmp_getnext.patch) = 1e31f5ed2515d5b386a0ead620f6c17724f8ef48
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-snmp_getnext.patch) = e25d7fa0815a60aaf3a1ad29dad010322b766ce0
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-snmp_getnext.patch) = 1012 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-ftp_title-2.patch) = 445816d0657e595efef192052dae13c97ddd347e
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-ftp_title-2.patch) = c0694b84c9ad9813c8def34507efb9b3815c944e
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-ftp_title-2.patch) = 4240 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-ftp_basehref.patch) = 0e9f378d8a49758544499307a99ba7bfc685512d
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-ftp_basehref.patch) = 2540214b456b9c4a7066b5e8143605a1f1180528
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-ftp_basehref.patch) = 8250 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-wbinfo_groups.patch) = c4025826802fa4373e586dfe37c8ed3de02234e5
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-wbinfo_groups.patch) = 0d9333410f5be6ab3e637a0a8f6d840e04d734da
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-wbinfo_groups.patch) = 1245 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-64bit_cleanup.patch) = 48e910184ea0802f8db67869e2d9d921efe67b4a
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-64bit_cleanup.patch) = c16dd8d0e0967eab9b22c47ca3ac519de47a0c19
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-64bit_cleanup.patch) = 21491 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-wb_ntlm_auth_silent.patch) = 2cc566b084e74337aac78ec95d5158c4d1d7908c
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-wb_ntlm_auth_silent.patch) = 914aecf88caaba3d252a2f2eee29df2c441f5987
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-wb_ntlm_auth_silent.patch) = 2035 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-buildenv.patch) = 433b03e172cde2e4893c8a1f943329a164f6bcc8
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-buildenv.patch) = 67688fb7ee4aee8923439684053b08f742522a82
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-buildenv.patch) = 4025 bytes
+SHA1 (patch-aa) = 25d47b8ab8618af2b1d2a40f1dc3630cdc14038c
 SHA1 (patch-ab) = 1224ba4cee98a26d2c9d670eb6d57c6187ff2d56
 SHA1 (patch-ac) = 1b283f0a573c02c82ce26f75e67d19b1ec5ff9f0
 SHA1 (patch-ad) = 88b46bc9051ea32ebd74f06ebd362ce16f8c5c4c
@@ -16,6 +55,7 @@ SHA1 (patch-aj) = aa2271e53602fe168604aeced6ed66d28fe47707
 SHA1 (patch-ak) = 108b313149271457bee702ecf9489c61715ec9e7
 SHA1 (patch-al) = 51d7c84b007ab9600ae911e1e9206cf91b937120
 SHA1 (patch-an) = 8c9fc0f542859341fe1790dd70be7e624d46fe99
+SHA1 (patch-ap) = f57cd1137c3e5419f3788c391292421ca8a91a57
 SHA1 (patch-bb) = 0fbd2ce31546289edad3b1e5ea5de408d359d3a1
 SHA1 (patch-bc) = 536299e59c396829f23484a14bb9a6f5c0a4de35
-SHA1 (patch-cd) = c58d741b140be632ce3857a86e304f21f7c06e96
+SHA1 (patch-cd) = ba012a5885de2906dfe7887863918721a81a79be
diff --git a/www/squid/patches/patch-aa b/www/squid/patches/patch-aa
index 3d86f8815c6..0c1b7e20c1c 100644
--- a/www/squid/patches/patch-aa
+++ b/www/squid/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.16 2005/04/25 15:39:14 taca Exp $
+$NetBSD: patch-aa,v 1.17 2005/08/09 15:48:30 taca Exp $
 
---- src/Makefile.in.orig	2005-04-25 23:25:05.000000000 +0900
+--- src/Makefile.in.orig	2005-04-24 09:12:08.000000000 +0900
 +++ src/Makefile.in
-@@ -383,14 +383,15 @@ DEFAULT_LOG_PREFIX = $(localstatedir)/lo
+@@ -384,14 +384,14 @@ DEFAULT_LOG_PREFIX = $(localstatedir)/lo
  DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log
  DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log
  DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log
@@ -18,11 +18,10 @@ $NetBSD: patch-aa,v 1.16 2005/04/25 15:39:14 taca Exp $
 +DEFAULT_ICON_DIR = $(datadir)/squid/icons
 +DEFAULT_ERROR_DIR = $(datadir)/squid/errors/@ERR_DEFAULT_LANGUAGE@
 +DEFAULT_MIB_PATH = $(datadir)/squid/mib.txt
-+EXAMPLES_DIR = $(datadir)/examples/squid
  
  DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\"
  
-@@ -855,20 +856,20 @@ CCDEPMODE = @CCDEPMODE@
+@@ -856,20 +856,20 @@ CCDEPMODE = @CCDEPMODE@
  uninstall-info-am:
  install-dataDATA: $(data_DATA)
  	@$(NORMAL_INSTALL)
@@ -48,7 +47,7 @@ $NetBSD: patch-aa,v 1.16 2005/04/25 15:39:14 taca Exp $
  	done
  install-sysconfDATA: $(sysconf_DATA)
  	@$(NORMAL_INSTALL)
-@@ -1067,7 +1068,7 @@ info-am:
+@@ -1068,7 +1068,7 @@ info-am:
  install-data-am: install-data-local install-dataDATA
  
  install-exec-am: install-binPROGRAMS install-libexecPROGRAMS \
@@ -57,7 +56,7 @@ $NetBSD: patch-aa,v 1.16 2005/04/25 15:39:14 taca Exp $
  
  install-info: install-info-recursive
  
-@@ -1085,7 +1086,7 @@ mostlyclean-am: mostlyclean-compile most
+@@ -1086,7 +1086,7 @@ mostlyclean-am: mostlyclean-compile most
  
  uninstall-am: uninstall-binPROGRAMS uninstall-dataDATA uninstall-info-am \
  	uninstall-libexecPROGRAMS uninstall-local \
@@ -66,7 +65,7 @@ $NetBSD: patch-aa,v 1.16 2005/04/25 15:39:14 taca Exp $
  
  uninstall-info: uninstall-info-recursive
  
-@@ -1168,26 +1169,12 @@ repl_modules.c: repl_modules.sh Makefile
+@@ -1169,26 +1169,7 @@ repl_modules.c: repl_modules.sh Makefile
  auth_modules.c: auth_modules.sh Makefile
  	@$(SHELL) $(srcdir)/auth_modules.sh $(AUTH_MODULES) >auth_modules.c
  
@@ -91,11 +90,6 @@ $NetBSD: patch-aa,v 1.16 2005/04/25 15:39:14 taca Exp $
 -	fi
 -	$(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX)
 +install-data-local: install-dataDATA
-+	@mkdir -p $(DESTDIR)$(EXAMPLES_DIR)
-+	@echo "$(INSTALL_DATA) $(srcdir)/mime.conf.default $(DESTDIR)$(EXAMPLES_DIR)/mime.conf" ;\
-+	        $(INSTALL_DATA) $(srcdir)/mime.conf.default $(DESTDIR)$(EXAMPLES_DIR)/mime.conf
-+	@echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(EXAMPLES_DIR)/suqid.conf"; \
-+	        $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(EXAMPLES_DIR)/squid.conf
  
  uninstall-local:
  	@if test -f $(DESTDIR)$(DEFAULT_MIME_TABLE) ; then \
diff --git a/www/squid/patches/patch-ap b/www/squid/patches/patch-ap
new file mode 100644
index 00000000000..d2afca5c963
--- /dev/null
+++ b/www/squid/patches/patch-ap
@@ -0,0 +1,13 @@
+$NetBSD: patch-ap,v 1.1 2005/08/09 15:48:30 taca 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
+ 
+ info-am:
+ 
+-install-data-am: install-data-local
++install-data-am:
+ 
+ install-exec-am: install-libexecPROGRAMS install-sysconfDATA
+ 
diff --git a/www/squid/patches/patch-cd b/www/squid/patches/patch-cd
index d42ebaf945a..fea4a9cee16 100644
--- a/www/squid/patches/patch-cd
+++ b/www/squid/patches/patch-cd
@@ -1,6 +1,6 @@
-$NetBSD: patch-cd,v 1.9 2005/06/07 14:19:10 taca Exp $
+$NetBSD: patch-cd,v 1.10 2005/08/09 15:48:30 taca Exp $
 
---- src/client_side.c.orig	2005-04-21 06:46:06.000000000 +0900
+--- src/client_side.c.orig	2005-07-13 01:16:03.000000000 +0900
 +++ src/client_side.c
 @@ -41,6 +41,9 @@
  #endif
@@ -12,7 +12,7 @@ $NetBSD: patch-cd,v 1.9 2005/06/07 14:19:10 taca Exp $
  #if HAVE_IP_FIL_COMPAT_H
  #include <ip_fil_compat.h>
  #elif HAVE_NETINET_IP_FIL_COMPAT_H
-@@ -2589,6 +2592,9 @@ parseHttpRequest(ConnStateData * conn, m
+@@ -2592,6 +2595,9 @@ parseHttpRequest(ConnStateData * conn, m
      static int natfd = -1;
      static int siocgnatl_cmd = SIOCGNATL & 0xff;
      int x;
@@ -22,10 +22,10 @@ $NetBSD: patch-cd,v 1.9 2005/06/07 14:19:10 taca Exp $
  #endif
  #if PF_TRANSPARENT
      struct pfioc_natlook nl;
-@@ -2731,6 +2737,13 @@ parseHttpRequest(ConnStateData * conn, m
- 	int vport;
+@@ -2734,6 +2740,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);
@@ -36,7 +36,7 @@ $NetBSD: patch-cd,v 1.9 2005/06/07 14:19:10 taca Exp $
  	    natLookup.nl_inport = http->conn->me.sin_port;
  	    natLookup.nl_outport = http->conn->peer.sin_port;
  	    natLookup.nl_inip = http->conn->me.sin_addr;
-@@ -2739,8 +2752,8 @@ parseHttpRequest(ConnStateData * conn, m
+@@ -2742,8 +2755,8 @@ parseHttpRequest(ConnStateData * conn, m
  	    if (natfd < 0) {
  		int save_errno;
  		enter_suid();
@@ -47,9 +47,9 @@ $NetBSD: patch-cd,v 1.9 2005/06/07 14:19:10 taca Exp $
  #else
  		natfd = open(IPL_NAT, O_RDONLY, 0);
  #endif
-@@ -2756,6 +2769,9 @@ parseHttpRequest(ConnStateData * conn, m
- 		cbdataFree(http);
- 		xfree(inbuf);
+@@ -2757,6 +2770,9 @@ parseHttpRequest(ConnStateData * conn, m
+ 		    last_reported = squid_curtime;
+ 		}
  	    } else {
 +#if defined(IPFILTER_VERSION) && (IPFILTER_VERSION >= 4000027)
 +		x = ioctl(natfd, SIOCGNATL, &obj);
@@ -57,11 +57,11 @@ $NetBSD: patch-cd,v 1.9 2005/06/07 14:19:10 taca Exp $
  		/*
  		 * IP-Filter changed the type for SIOCGNATL between
  		 * 3.3 and 3.4.  It also changed the cmd value for
-@@ -2769,6 +2785,7 @@ parseHttpRequest(ConnStateData * conn, m
+@@ -2770,6 +2786,7 @@ parseHttpRequest(ConnStateData * conn, m
  		} else {
  		    x = ioctl(natfd, SIOCGNATL, &natLookup);
  		}
 +#endif
  		if (x < 0) {
  		    if (errno != ESRCH) {
- 			debug(50, 1) ("parseHttpRequest: NAT lookup failed: ioctl(SIOCGNATL)\n");
+ 			if (squid_curtime - last_reported > 60) {