From 5666584c24e69aaf7126f7ac49b6b573fa6e4eaa Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Mon, 17 Apr 2000 20:32:58 +0000
Subject: Update the squid23 port to fix a few loose ends: - the distributed
patches got regenerated to have the correct paths - disable optimization
because of gcc bugs (as recommended by squid folks) - list a few new
--enable/--disable options
---
www/squid25/Makefile | 27 ++++++++++++++++++++-------
www/squid25/distinfo | 12 ++++++++++--
2 files changed, 30 insertions(+), 9 deletions(-)
(limited to 'www/squid25')
diff --git a/www/squid25/Makefile b/www/squid25/Makefile
index 45abaa24d8b7..50852152a02a 100644
--- a/www/squid25/Makefile
+++ b/www/squid25/Makefile
@@ -18,7 +18,15 @@ EXTRACT_SUFX= -src.tar.gz
PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.3/bugs/
PATCHFILES= squid-2.3.stable2-EOF_in_cf.data.pre.patch \
- squid-2.3.stable2-USE_DNSSERVER.patch
+ squid-2.3.stable2-USE_DNSSERVER.patch \
+ squid-2.3.stable2-USE_DNSSERVER_part2.patch \
+ squid-2.3.stable2-hostname_whitespace.patch \
+ squid-2.3.stable2-netdb_exchange_loop.patch \
+ squid-2.3.stable2-getMyHostname.patch \
+ squid-2.3.stable2-redirected_username_logging.patch \
+ squid-2.3.stable2-snmp-problems.patch \
+ squid-2.3.stable2-getpwnam_return_value.patch \
+ squid-2.3.stable2-mimeGetIconURL_returns_NULL.patch
MAINTAINER= peter@freebsd.org
@@ -28,15 +36,10 @@ GNU_CONFIGURE= yes
# Follow the apache port's lead...
CONFIGURE_ARGS= --bindir=${PREFIX}/sbin --sysconfdir=${PREFIX}/etc/squid \
--localstatedir=${PREFIX}/squid
+CONFIGURE_ENV= CFLAGS=""
STRIP= # won't install scripts correctly othervise.
MAKEFILE= makefile
-.if defined(PATCH_DEBUG)
-PATCH_DIST_ARGS?= -d ${WRKSRC}/src -E ${PATCH_DIST_STRIP}
-.else
-PATCH_DIST_ARGS?= -d ${WRKSRC}/src --forward --quiet -E ${PATCH_DIST_STRIP}
-.endif
-
# Some other configure options..
# - Compile and use the malloc package from Doug Lea
#CONFIGURE_ARGS+= --enable-dlmalloc
@@ -60,6 +63,8 @@ PATCH_DIST_ARGS?= -d ${WRKSRC}/src --forward --quiet -E ${PATCH_DIST_STRIP
#CONFIGURE+ARGS+= --enable-mem-gen-trace
# - Enable logging of the User-Agent header
#CONFIGURE_ARGS+= --enable-useragent-log
+# - Disable Web Cache Coordination Protocol
+#CONFIGURE_ARGS+= --disable-wccp
# - Kill parent (eg: RunCache) on shutdown (use with great care!!)
#CONFIGURE_ARGS+= --enable-kill-parent-hack
# - Turn on SNMP server support
@@ -87,6 +92,14 @@ PATCH_DIST_ARGS?= -d ${WRKSRC}/src --forward --quiet -E ${PATCH_DIST_STRIP
# (--enable-leakfinfer is a developer support tool only)
# - Compile out code that does optional Ident (RFC931) lookups
#CONFIGURE_ARGS+= --disable-ident-lookups
+# - Disable squid's internal async DNS lookup code.
+#CONFIGURE_ARGS+= --disable-internal-dns
+# - Use truncate() rather than unlink()
+#CONFIGURE_ARGS+= --enable-truncate
+# - accept the illegal '_' character in hostnames.
+#CONFIGURE_ARGS+= --enable-underscores
+# - Enable control of different heap replacement algorithms at runtime.
+#CONFIGURE_ARGS+= --enable-heap-replacement
post-install:
cd ${WRKSRC}/src; make install-pinger
diff --git a/www/squid25/distinfo b/www/squid25/distinfo
index d4ef0c663423..65f11dafa38a 100644
--- a/www/squid25/distinfo
+++ b/www/squid25/distinfo
@@ -1,3 +1,11 @@
MD5 (squid2.3/squid-2.3.STABLE2-src.tar.gz) = ba90c12907e5dd8a29bf824bde2f7755
-MD5 (squid2.3/squid-2.3.stable2-EOF_in_cf.data.pre.patch) = aaa8ba879452b23c4fa5a4da6bdce5ed
-MD5 (squid2.3/squid-2.3.stable2-USE_DNSSERVER.patch) = ab04e0f9681dfdb62a813502cc936f98
+MD5 (squid2.3/squid-2.3.stable2-EOF_in_cf.data.pre.patch) = bade9d4d6dbed4520e0353669ee057b6
+MD5 (squid2.3/squid-2.3.stable2-USE_DNSSERVER.patch) = a586565ec1809f8afff72cd33f5e388d
+MD5 (squid2.3/squid-2.3.stable2-USE_DNSSERVER_part2.patch) = 65de93562970eaa5af25e88fc15c62f9
+MD5 (squid2.3/squid-2.3.stable2-hostname_whitespace.patch) = 9ce477e56b4eed66ed97bf377792029e
+MD5 (squid2.3/squid-2.3.stable2-netdb_exchange_loop.patch) = 2d7f25ca0c723907c9265ea840739982
+MD5 (squid2.3/squid-2.3.stable2-getMyHostname.patch) = 3649a611c44418366d07d579bfb4c64d
+MD5 (squid2.3/squid-2.3.stable2-redirected_username_logging.patch) = abafca200d09fc9badf81992af47e5ad
+MD5 (squid2.3/squid-2.3.stable2-snmp-problems.patch) = b88a2b0f8e2f26ea7c636a575324f1cc
+MD5 (squid2.3/squid-2.3.stable2-getpwnam_return_value.patch) = 18331a9395b2241e53d98c8639c8ef86
+MD5 (squid2.3/squid-2.3.stable2-mimeGetIconURL_returns_NULL.patch) = df93bcb745d3b0e057f236110426397e
--
cgit v1.2.3