diff options
-rw-r--r-- | www/squid/Makefile | 12 | ||||
-rw-r--r-- | www/squid/distinfo | 23 | ||||
-rw-r--r-- | www/squid/files/squid.sh | 4 | ||||
-rw-r--r-- | www/squid/patches/patch-aa | 22 | ||||
-rw-r--r-- | www/squid/patches/patch-cd | 14 |
5 files changed, 41 insertions, 34 deletions
diff --git a/www/squid/Makefile b/www/squid/Makefile index c2af78867e4..83b3508f61f 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.146 2005/04/21 15:49:53 taca Exp $ +# $NetBSD: Makefile,v 1.147 2005/04/25 15:39:13 taca Exp $ DISTNAME= squid-2.5.STABLE9 PKGNAME= squid-2.5.9 -PKGREVISION= 7 +PKGREVISION= 8 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/ \ @@ -39,7 +39,11 @@ PATCHFILES= squid-2.5.STABLE9-setcookie.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-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 PATCH_DIST_STRIP= -p1 MAINTAINER= taca@NetBSD.org @@ -106,7 +110,7 @@ SQUID_CONFIGURE_ARGS?= --enable-auth=basic,digest,ntlm \ --enable-ssl \ --with-openssl=${SSLBASE} \ --enable-underscores \ - --enable-storeio=aufs,ufs,diskd,null \ + --enable-storeio=ufs,diskd,null \ --enable-basic-auth-helpers=getpwnam,winbind,SMB \ --enable-digest-auth-helpers=password \ --enable-external-acl-helpers=unix_group,ip_user,winbind_group \ diff --git a/www/squid/distinfo b/www/squid/distinfo index 92a66f4e9e1..ecc0fb66bd2 100644 --- a/www/squid/distinfo +++ b/www/squid/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.93 2005/04/21 15:49:53 taca Exp $ +$NetBSD: distinfo,v 1.94 2005/04/25 15:39:13 taca Exp $ SHA1 (squid-2.5.9-2005042100/squid-2.5.STABLE9.tar.bz2) = 9605e274f548bfc8dcb60a299b680df2846ee74b RMD160 (squid-2.5.9-2005042100/squid-2.5.STABLE9.tar.bz2) = 98e49ff58ffc4664a46350f3d6c34be99b713716 @@ -81,19 +81,31 @@ Size (squid-2.5.9-2005042100/squid-2.5.STABLE9-syslog.patch) = 6859 bytes SHA1 (squid-2.5.9-2005042100/squid-2.5.STABLE9-errpage_user.patch) = 5ad27638aec2d09e731f6c991bfd28404c965c97 RMD160 (squid-2.5.9-2005042100/squid-2.5.STABLE9-errpage_user.patch) = 7f765a7dbfd846a608932a995e24d3b62b8a5ff5 Size (squid-2.5.9-2005042100/squid-2.5.STABLE9-errpage_user.patch) = 822 bytes +SHA1 (squid-2.5.9-2005042100/squid-2.5.STABLE9-debug_newlines.patch) = 804f09685b4d86c507f7eb669da20caeb02e6f7b +RMD160 (squid-2.5.9-2005042100/squid-2.5.STABLE9-debug_newlines.patch) = efc38284ceed04743abf637ce3b1f59628d5df57 +Size (squid-2.5.9-2005042100/squid-2.5.STABLE9-debug_newlines.patch) = 5049 bytes SHA1 (squid-2.5.9-2005042100/squid-2.5.STABLE9-transparent_port.patch) = 2580792f9353f23a221d4dc6303dbc0919aaf10c RMD160 (squid-2.5.9-2005042100/squid-2.5.STABLE9-transparent_port.patch) = 9d9db96ef48fdcd376a1507996e24ab81db92024 Size (squid-2.5.9-2005042100/squid-2.5.STABLE9-transparent_port.patch) = 8886 bytes SHA1 (squid-2.5.9-2005042100/squid-2.5.STABLE9-squid_k_nohostname.patch) = 326dc2668e02f1034627f944163f92f12c7dc978 RMD160 (squid-2.5.9-2005042100/squid-2.5.STABLE9-squid_k_nohostname.patch) = a9088582f60430c5a5e1f47e2566ef42d473a4ce Size (squid-2.5.9-2005042100/squid-2.5.STABLE9-squid_k_nohostname.patch) = 1590 bytes -SHA1 (squid-2.5.9-2005042100/squid-2.5.STABLE9-debug_newlines.patch) = 804f09685b4d86c507f7eb669da20caeb02e6f7b -RMD160 (squid-2.5.9-2005042100/squid-2.5.STABLE9-debug_newlines.patch) = efc38284ceed04743abf637ce3b1f59628d5df57 -Size (squid-2.5.9-2005042100/squid-2.5.STABLE9-debug_newlines.patch) = 5049 bytes SHA1 (squid-2.5.9-2005042100/squid-2.5.STABLE9-config_CRLF.patch) = f0fe96ef6b450dc4de026ed2b22e5587ea1b2ac8 RMD160 (squid-2.5.9-2005042100/squid-2.5.STABLE9-config_CRLF.patch) = 897ad90d93fde7d33191eb1c129d4ebdc5a35442 Size (squid-2.5.9-2005042100/squid-2.5.STABLE9-config_CRLF.patch) = 515 bytes -SHA1 (patch-aa) = 3e6fb677125eec276fdfa62336c134f26e1e1edd +SHA1 (squid-2.5.9-2005042100/squid-2.5.STABLE9-forwardcc.patch) = 4dfdddd75fff5b15daa11337938c04abea6b85e0 +RMD160 (squid-2.5.9-2005042100/squid-2.5.STABLE9-forwardcc.patch) = dc12a6135861589605d3d56fcae382bfe1386af0 +Size (squid-2.5.9-2005042100/squid-2.5.STABLE9-forwardcc.patch) = 2573 bytes +SHA1 (squid-2.5.9-2005042100/squid-2.5.STABLE9-authinfo.patch) = 79dc67c81701952be60ec8212ff26d03b53e05ad +RMD160 (squid-2.5.9-2005042100/squid-2.5.STABLE9-authinfo.patch) = 13b1446555251305731bf9488dc3da98b4eb67db +Size (squid-2.5.9-2005042100/squid-2.5.STABLE9-authinfo.patch) = 11647 bytes +SHA1 (squid-2.5.9-2005042100/squid-2.5.STABLE9-chroot_pidfile.patch) = d0e73cc02c369ca0d0e1c8f2deb85bcd239d3952 +RMD160 (squid-2.5.9-2005042100/squid-2.5.STABLE9-chroot_pidfile.patch) = 6eb80ba6936252f86e9cbd6d98eb63324ba0040e +Size (squid-2.5.9-2005042100/squid-2.5.STABLE9-chroot_pidfile.patch) = 948 bytes +SHA1 (squid-2.5.9-2005042100/squid-2.5.STABLE9-cachemgr_conf.patch) = ec5c8922ad657ac872bcf59556f280b8fffb7698 +RMD160 (squid-2.5.9-2005042100/squid-2.5.STABLE9-cachemgr_conf.patch) = e3f4056e5b032665a61db6dcf48e8ccea6d40e68 +Size (squid-2.5.9-2005042100/squid-2.5.STABLE9-cachemgr_conf.patch) = 19424 bytes +SHA1 (patch-aa) = 4d697ea43975e7c98bdf6ff5b18d82b944bdd6b2 SHA1 (patch-ab) = 1224ba4cee98a26d2c9d670eb6d57c6187ff2d56 SHA1 (patch-ac) = 1b283f0a573c02c82ce26f75e67d19b1ec5ff9f0 SHA1 (patch-ad) = 88b46bc9051ea32ebd74f06ebd362ce16f8c5c4c @@ -108,4 +120,3 @@ SHA1 (patch-bc) = 536299e59c396829f23484a14bb9a6f5c0a4de35 SHA1 (patch-ca) = 132e45eea22cccf6678b5d920d913965f73f0db7 SHA1 (patch-cb) = 603471bf702c3ff4480585dc59dc326f23a5f2e8 SHA1 (patch-cc) = 53d72f0df09f1e2c4cc9b65a635d320e4d315cf5 -SHA1 (patch-cd) = 2a22aa071cc0f50b5ed87e31c0e531a5fc9dc2b7 diff --git a/www/squid/files/squid.sh b/www/squid/files/squid.sh index 81e2cfec9ca..0f785ecc7cb 100644 --- a/www/squid/files/squid.sh +++ b/www/squid/files/squid.sh @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: squid.sh,v 1.17 2003/08/18 16:03:03 taca Exp $ +# $NetBSD: squid.sh,v 1.18 2005/04/25 15:39:14 taca Exp $ # # PROVIDE: squid @@ -12,7 +12,7 @@ conf_file="@PKG_SYSCONFDIR@/squid.conf" name="squid" rcvar=$name command="@PREFIX@/sbin/${name}" -pidfile="/var/run/${name}.pid" +pidfile="@VARBASE@/run/${name}.pid" required_files="${conf_file} @PKG_SYSCONFDIR@/mime.conf" command_args="-Y -f $conf_file" diff --git a/www/squid/patches/patch-aa b/www/squid/patches/patch-aa index 4eff10d651a..3d86f8815c6 100644 --- a/www/squid/patches/patch-aa +++ b/www/squid/patches/patch-aa @@ -1,13 +1,13 @@ -$NetBSD: patch-aa,v 1.15 2004/12/14 14:27:07 taca Exp $ +$NetBSD: patch-aa,v 1.16 2005/04/25 15:39:14 taca Exp $ ---- src/Makefile.in.orig 2004-09-26 06:37:59.000000000 +0900 +--- src/Makefile.in.orig 2005-04-25 23:25:05.000000000 +0900 +++ src/Makefile.in -@@ -380,14 +380,15 @@ DEFAULT_LOG_PREFIX = $(localstatedir)/lo +@@ -383,14 +383,15 @@ 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 -DEFAULT_PID_FILE = $(DEFAULT_LOG_PREFIX)/squid.pid -+DEFAULT_PID_FILE = /var/run/squid.pid ++DEFAULT_PID_FILE = $(VARBASE)/run/squid.pid DEFAULT_SWAP_DIR = $(localstatedir)/cache DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'` DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'` @@ -22,7 +22,7 @@ $NetBSD: patch-aa,v 1.15 2004/12/14 14:27:07 taca Exp $ DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\" -@@ -838,20 +839,20 @@ CCDEPMODE = @CCDEPMODE@ +@@ -855,20 +856,20 @@ CCDEPMODE = @CCDEPMODE@ uninstall-info-am: install-dataDATA: $(data_DATA) @$(NORMAL_INSTALL) @@ -48,7 +48,7 @@ $NetBSD: patch-aa,v 1.15 2004/12/14 14:27:07 taca Exp $ done install-sysconfDATA: $(sysconf_DATA) @$(NORMAL_INSTALL) -@@ -1050,7 +1051,7 @@ info-am: +@@ -1067,7 +1068,7 @@ info-am: install-data-am: install-data-local install-dataDATA install-exec-am: install-binPROGRAMS install-libexecPROGRAMS \ @@ -57,7 +57,7 @@ $NetBSD: patch-aa,v 1.15 2004/12/14 14:27:07 taca Exp $ install-info: install-info-recursive -@@ -1068,7 +1069,7 @@ mostlyclean-am: mostlyclean-compile most +@@ -1085,7 +1086,7 @@ mostlyclean-am: mostlyclean-compile most uninstall-am: uninstall-binPROGRAMS uninstall-dataDATA uninstall-info-am \ uninstall-libexecPROGRAMS uninstall-local \ @@ -66,7 +66,7 @@ $NetBSD: patch-aa,v 1.15 2004/12/14 14:27:07 taca Exp $ uninstall-info: uninstall-info-recursive -@@ -1151,20 +1152,12 @@ repl_modules.c: repl_modules.sh Makefile +@@ -1168,26 +1169,12 @@ repl_modules.c: repl_modules.sh Makefile auth_modules.c: auth_modules.sh Makefile @$(SHELL) $(srcdir)/auth_modules.sh $(AUTH_MODULES) >auth_modules.c @@ -83,6 +83,12 @@ $NetBSD: patch-aa,v 1.15 2004/12/14 14:27:07 taca Exp $ - echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \ - $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE); \ - fi +- @if test -f $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG) ; then \ +- echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG)" ; \ +- else \ +- echo "$(INSTALL_DATA) $(srcdir)/cachemgr.conf $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG)"; \ +- $(INSTALL_DATA) $(srcdir)/cachemgr.conf $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG); \ +- fi - $(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX) +install-data-local: install-dataDATA + @mkdir -p $(DESTDIR)$(EXAMPLES_DIR) diff --git a/www/squid/patches/patch-cd b/www/squid/patches/patch-cd deleted file mode 100644 index 8c14f179ca2..00000000000 --- a/www/squid/patches/patch-cd +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-cd,v 1.5 2005/02/11 14:47:18 taca Exp $ - ---- src/client_side.c.orig 2005-02-04 09:10:09.000000000 +0900 -+++ src/client_side.c -@@ -2773,6 +2773,9 @@ parseHttpRequest(ConnStateData * conn, m - natLookup.nl_inip = http->conn->me.sin_addr; - natLookup.nl_outip = http->conn->peer.sin_addr; - natLookup.nl_flags = IPN_TCP; -+#ifndef IPL_NAT -+#define IPL_NAT IPNAT_NAME -+#endif - if (natfd < 0) { - int save_errno; - enter_suid(); |