[pkgsrc/trunk]: pkgsrc/www/squid Update www/squid pacakge to 2.6.3 (squid 2.6...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/www/squid Update www/squid pacakge to 2.6.3 (squid 2.6...
From: taca <taca%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 03:58:10 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/3309ba62f1c3
branches:  trunk
changeset: 518562:3309ba62f1c3
user:      taca <taca%pkgsrc.org@localhost>
date:      Wed Sep 13 14:41:58 2006 +0000

description:
Update www/squid pacakge to 2.6.3 (squid 2.6.STABLE3).

Too may changes to mention here.
Please refer ${PREFIX}/share/doc/squid/RELEASENOTES.html.

diffstat:

 www/squid/Makefile         |   35 +++++-----
 www/squid/PLIST            |    5 +-
 www/squid/distinfo         |   42 +++++-------
 www/squid/options.mk       |    4 +-
 www/squid/patches/patch-aa |   59 ++++++++---------
 www/squid/patches/patch-ab |   18 ++--
 www/squid/patches/patch-ad |   16 ++--
 www/squid/patches/patch-ae |    8 +-
 www/squid/patches/patch-af |   12 +-
 www/squid/patches/patch-ag |  151 ++++++++++++++++++++++++++++----------------
 www/squid/patches/patch-aj |   10 +-
 www/squid/patches/patch-ak |   21 +++++-
 www/squid/patches/patch-al |    6 +-
 www/squid/patches/patch-an |   26 +++----
 www/squid/patches/patch-ap |    6 +-
 www/squid/patches/patch-aq |   19 -----
 www/squid/patches/patch-ar |   13 +++
 www/squid/patches/patch-bb |   14 ++--
 www/squid/patches/patch-bc |    8 +-
 19 files changed, 257 insertions(+), 216 deletions(-)

diffs (truncated from 820 to 300 lines):

diff -r 027d0f7353bc -r 3309ba62f1c3 www/squid/Makefile
--- a/www/squid/Makefile        Wed Sep 13 13:21:45 2006 +0000
+++ b/www/squid/Makefile        Wed Sep 13 14:41:58 2006 +0000
@@ -1,18 +1,17 @@
-# $NetBSD: Makefile,v 1.181 2006/07/09 12:23:22 taca Exp $
+# $NetBSD: Makefile,v 1.182 2006/09/13 14:41:58 taca Exp $
 
-DISTNAME=      squid-2.5.STABLE14
-PKGNAME=       squid-2.5.14
-PKGREVISION=   3
+DISTNAME=      squid-2.6.STABLE3
+PKGNAME=       squid-2.6.3
+#PKGREVISION=  1
 CATEGORIES=    www
-MASTER_SITES=  http://www.squid-cache.org/Versions/v2/2.5/ \
+MASTER_SITES=  http://www.squid-cache.org/Versions/v2/2.6/ \
                ftp://ftp.leo.org/pub/comp/general/infosys/www/daemons/squid/squid-2/STABLE/ \
                ftp://ftp1.au.squid-cache.org/pub/squid/squid-2/STABLE/
 EXTRACT_SUFX=  .tar.bz2
-
-PATCH_SITES=   http://www.squid-cache.org/Versions/v2/2.5/bugs/
-PATCHFILES=    squid-2.5.STABLE14-httpReplyDestroy.patch \
-               squid-2.5.STABLE14-hierarchy_tag.patch
-PATCH_DIST_STRIP= -p1
+#
+#PATCH_SITES=  http://www.squid-cache.org/Versions/v2/2.6/bugs/
+#PATCHFILES=
+#PATCH_DIST_STRIP= -p1
 
 MAINTAINER=    taca%NetBSD.org@localhost
 HOMEPAGE=      http://www.squid-cache.org/
@@ -42,6 +41,7 @@
 
 PKG_GECOS.${SQUID_USER}=       Squid Web-Cache pseudo-user
 
+CONF_FILES+=   ${EXAMPLESDIR}/cachemgr.conf ${PKG_SYSCONFDIR}/cachemgr.conf
 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
@@ -49,7 +49,8 @@
 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
+               helpers/basic_auth/MSNT/msntauth.conf.default \
+               tools/cachemgr.conf
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -57,7 +58,7 @@
 
 SQUID_USER?=   squid
 SQUID_GROUP?=  squid
-BUILD_DEFS+=   SQUID_USER SQUID_GROUP
+BUILD_DEFS+=   SQUID_USER SQUID_GROUP VARBASE
 
 CONFIGURE_ARGS+=       --enable-auth=basic,digest,ntlm \
                        --enable-cachemgr-hostname=localhost \
@@ -70,13 +71,14 @@
 #
 # generic helpers
 #
-OPTIONAL_FILES+= libexec/diskd libexec/dnsserver libexec/pinger libexec/unlinkd
+OPTIONAL_FILES+= libexec/diskd-daemon libexec/dnsserver
+OPTIONAL_FILES+= libexec/pinger libexec/unlinkd
 #
 # basic auth helpers (except LDAP, multi-domain-NTLM and SASL)
 #
 OPTIONAL_FILES+= libexec/getpwname_auth libexec/msnt_auth libexec/ncsa_auth
-OPTIONAL_FILES+= libexec/pam_auth man/man8/pam_auth.8 libexec/smb_auth
-OPTIONAL_FILES+= libexec/yp_auth libexec/wb_auth
+OPTIONAL_FILES+= libexec/pam_auth man/man8/ncsa_auth.8 man/man8/pam_auth.8
+OPTIONAL_FILES+= libexec/smb_auth libexec/yp_auth libexec/wb_auth
 #
 # digest auth helpers
 #
@@ -105,8 +107,7 @@
 post-install:
        ${INSTALL_DATA_DIR} ${EXAMPLESDIR}
 .for f in ${EXAMPLES_FILES}
-       cd ${WRKSRC} && \
-       ${INSTALL_DATA} ${f} ${EXAMPLESDIR}/`basename ${f} .default`
+       ${INSTALL_DATA} ${WRKSRC}/${f} ${EXAMPLESDIR}/`basename ${f} .default`
 .endfor
        ${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
        ${INSTALL_DATA_DIR} ${DOCDIR}
diff -r 027d0f7353bc -r 3309ba62f1c3 www/squid/PLIST
--- a/www/squid/PLIST   Wed Sep 13 13:21:45 2006 +0000
+++ b/www/squid/PLIST   Wed Sep 13 14:41:58 2006 +0000
@@ -1,15 +1,16 @@
-@comment $NetBSD: PLIST,v 1.19 2005/08/09 15:48:29 taca Exp $
+@comment $NetBSD: PLIST,v 1.20 2006/09/13 14:41:58 taca Exp $
+bin/cossdump
 bin/squidclient
 libexec/cachemgr.cgi
 man/man8/cachemgr.cgi.8
 man/man8/squid.8
-sbin/RunAccel
 sbin/RunCache
 sbin/squid
 share/doc/squid/ChangeLog
 share/doc/squid/RELEASENOTES.html
 share/doc/squid/debug-sections.txt
 share/examples/rc.d/squid
+share/examples/squid/cachemgr.conf
 share/examples/squid/mime.conf
 share/examples/squid/msntauth.conf
 share/examples/squid/squid.conf
diff -r 027d0f7353bc -r 3309ba62f1c3 www/squid/distinfo
--- a/www/squid/distinfo        Wed Sep 13 13:21:45 2006 +0000
+++ b/www/squid/distinfo        Wed Sep 13 14:41:58 2006 +0000
@@ -1,26 +1,20 @@
-$NetBSD: distinfo,v 1.119 2006/07/09 12:23:22 taca Exp $
+$NetBSD: distinfo,v 1.120 2006/09/13 14:41:58 taca Exp $
 
-SHA1 (squid-2.5.14/squid-2.5.STABLE14.tar.bz2) = ca7837c222800e25def1b6aad7d26245cb365960
-RMD160 (squid-2.5.14/squid-2.5.STABLE14.tar.bz2) = 4af6b7c034e8b5aa19d8f95ec5a19f5780569224
-Size (squid-2.5.14/squid-2.5.STABLE14.tar.bz2) = 1073745 bytes
-SHA1 (squid-2.5.14/squid-2.5.STABLE14-httpReplyDestroy.patch) = dd67bf8cc229134012f2df3eb85e2cd1e0469def
-RMD160 (squid-2.5.14/squid-2.5.STABLE14-httpReplyDestroy.patch) = cbba4d9bc67ee30be19e2c774aa1dc038b72245f
-Size (squid-2.5.14/squid-2.5.STABLE14-httpReplyDestroy.patch) = 1277 bytes
-SHA1 (squid-2.5.14/squid-2.5.STABLE14-hierarchy_tag.patch) = a3bfca773c9b0a9437064c709c8fb9974dd09ec8
-RMD160 (squid-2.5.14/squid-2.5.STABLE14-hierarchy_tag.patch) = 06f989912b5897de7e451ddf53eb0ebbcb5f1ee9
-Size (squid-2.5.14/squid-2.5.STABLE14-hierarchy_tag.patch) = 1319 bytes
-SHA1 (patch-aa) = 49032ad1c2ece5c88805276ddd76d0f9ac09cd02
-SHA1 (patch-ab) = 1224ba4cee98a26d2c9d670eb6d57c6187ff2d56
+SHA1 (squid-2.6.3/squid-2.6.STABLE3.tar.bz2) = d28ee77de9f118ab5d09d5f8e5b1f23974ab9b37
+RMD160 (squid-2.6.3/squid-2.6.STABLE3.tar.bz2) = 0f3fdc54e8b0bc740f5124e2a54245afceea24ac
+Size (squid-2.6.3/squid-2.6.STABLE3.tar.bz2) = 1231527 bytes
+SHA1 (patch-aa) = bcbe4e0bf3cd632497dc8045c1b8d86842edf90c
+SHA1 (patch-ab) = e4b9213dcbae32b65d0fe69b9cf9cff49aae504e
 SHA1 (patch-ac) = 1b283f0a573c02c82ce26f75e67d19b1ec5ff9f0
-SHA1 (patch-ad) = 3c1bce9266818b676b7cce4c2ef1f18e1edf9dd6
-SHA1 (patch-ae) = 2f9857bde5606d412276cb88ba28a38b9a67bd8e
-SHA1 (patch-af) = 9a93e1b98ade2b52089773bd8533586b0cd76925
-SHA1 (patch-ag) = 560f3a2a571cb988a1080e8d45f29a9eafef959e
-SHA1 (patch-aj) = aa2271e53602fe168604aeced6ed66d28fe47707
-SHA1 (patch-ak) = 590fc6e981c3b95e1a77a2d801747f328ca31a2e
-SHA1 (patch-al) = 931108431486868cdb714dd9fb1f11b27d092b20
-SHA1 (patch-an) = e96eaf094579208da58e3777dfad7e58b5933101
-SHA1 (patch-ap) = e0b7a203f6e299c6e103aaf50aed611a0670bb14
-SHA1 (patch-aq) = c3cd4f6b8da435912e1054cd47161cab8260344d
-SHA1 (patch-bb) = dd9de273a1c1d49ec64ad79c49fad9ac862650d7
-SHA1 (patch-bc) = 536299e59c396829f23484a14bb9a6f5c0a4de35
+SHA1 (patch-ad) = 8dc230430b9030951232c6881100234caffdd0d9
+SHA1 (patch-ae) = 5af05ae0ec09b7a6f3af61201f60357909b9e6c8
+SHA1 (patch-af) = a78e762c1ad928eef66b12395d48bc69542e32d9
+SHA1 (patch-ag) = 086b9f27b8a8eb892880be84c0485d72020b9ff0
+SHA1 (patch-aj) = e19317d35da85ad7481fdcd154c42706b605dc75
+SHA1 (patch-ak) = cec28eee3366b43ac574df6591a73a2d33be1a67
+SHA1 (patch-al) = 8f9ede6e80ba6950bf351fc75bbca8dbfbf110b6
+SHA1 (patch-an) = eb91d86926d5d25b92ec93e09c2b2da1d6f6389f
+SHA1 (patch-ap) = bf2223ea0ab660b2fdb6043845cedac5907bd1f0
+SHA1 (patch-ar) = a80477b24d02688f1f55ba1d4967bf340b5c04cb
+SHA1 (patch-bb) = 6711186c3e3e7992f9874eb47df7c0d3690649c2
+SHA1 (patch-bc) = 87d67c6d00c0734eebc1d7c6a9bcd1e3331400d9
diff -r 027d0f7353bc -r 3309ba62f1c3 www/squid/options.mk
--- a/www/squid/options.mk      Wed Sep 13 13:21:45 2006 +0000
+++ b/www/squid/options.mk      Wed Sep 13 14:41:58 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2005/12/23 15:37:41 taca Exp $
+# $NetBSD: options.mk,v 1.8 2006/09/13 14:41:58 taca Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.squid
 PKG_SUPPORTED_OPTIONS= aufs carp icmp pam-helper snmp ssl unlinkd
@@ -43,7 +43,7 @@
 .include "../../mk/bsd.options.mk"
 
 SQUID_BACKENDS?=               ufs null
-SQUID_BASIC_AUTH_HELPERS?=     getpwnam MSNT NCSA YP winbind
+SQUID_BASIC_AUTH_HELPERS?=     getpwnam MSNT NCSA YP
 SQUID_DIGEST_AUTH_HELPERS?=    password
 SQUID_NTLM_AUTH_HELPERS?=      fakeauth SMB
 SQUID_EXTERNAL_ACL_HELPERS?=   ip_user unix_group
diff -r 027d0f7353bc -r 3309ba62f1c3 www/squid/patches/patch-aa
--- a/www/squid/patches/patch-aa        Wed Sep 13 13:21:45 2006 +0000
+++ b/www/squid/patches/patch-aa        Wed Sep 13 14:41:58 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.18 2006/03/12 12:12:19 taca Exp $
+$NetBSD: patch-aa,v 1.19 2006/09/13 14:41:58 taca Exp $
 
---- src/Makefile.in.orig       2005-09-29 05:57:21.000000000 +0900
+--- src/Makefile.in.orig       2006-07-30 17:56:18.000000000 +0900
 +++ src/Makefile.in
-@@ -388,14 +388,14 @@ DEFAULT_LOG_PREFIX = $(localstatedir)/lo
+@@ -590,14 +590,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
@@ -11,61 +11,62 @@
  DEFAULT_SWAP_DIR = $(localstatedir)/cache
  DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
  DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`
- DEFAULT_DISKD = $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'`
+ DEFAULT_DISKD = $(libexecdir)/`echo diskd-daemon | sed '$(transform);s/$$/$(EXEEXT)/'`
 -DEFAULT_ICON_DIR = $(datadir)/icons
 -DEFAULT_ERROR_DIR = $(datadir)/errors/@ERR_DEFAULT_LANGUAGE@
 -DEFAULT_MIB_PATH = $(datadir)/mib.txt
 +DEFAULT_ICON_DIR = $(datadir)/squid/icons
 +DEFAULT_ERROR_DIR = $(datadir)/squid/errors/@ERR_DEFAULT_LANGUAGE@
 +DEFAULT_MIB_PATH = $(datadir)/squid/mib.txt
+ DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@
  
- DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\"
- 
-@@ -860,20 +860,20 @@ CCDEPMODE = @CCDEPMODE@
+ # Don't automatically uninstall config files
+@@ -842,20 +842,20 @@ distclean-compile:
  uninstall-info-am:
  install-dataDATA: $(data_DATA)
        @$(NORMAL_INSTALL)
--      $(mkinstalldirs) $(DESTDIR)$(datadir)
-+      $(mkinstalldirs) $(DESTDIR)$(datadir)/squid
+-      test -z "$(datadir)" || $(mkdir_p) "$(DESTDIR)$(datadir)"
++      test -z "$(datadir)" || $(mkdir_p) "$(DESTDIR)$(datadir)/squid"
        @list='$(data_DATA)'; for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         f="`echo $$p | sed -e 's|^.*/||'`"; \
--        echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(datadir)/$$f"; \
--        $(INSTALL_DATA) $$d$$p $(DESTDIR)$(datadir)/$$f; \
-+        echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(datadir)/squid/$$f"; \
-+        $(INSTALL_DATA) $$d$$p $(DESTDIR)$(datadir)/squid/$$f; \
+         f=$(am__strip_dir) \
+-        echo " $(dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(datadir)/$$f'"; \
+-        $(dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(datadir)/$$f"; \
++        echo " $(dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(datadir)/squid/$$f'"; \
++        $(dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(datadir)/squid/$$f"; \
        done
  
  uninstall-dataDATA:
        @$(NORMAL_UNINSTALL)
        @list='$(data_DATA)'; for p in $$list; do \
-         f="`echo $$p | sed -e 's|^.*/||'`"; \
--        echo " rm -f $(DESTDIR)$(datadir)/$$f"; \
--        rm -f $(DESTDIR)$(datadir)/$$f; \
-+        echo " rm -f $(DESTDIR)$(datadir)/squid/$$f"; \
-+        rm -f $(DESTDIR)$(datadir)/squid/$$f; \
+         f=$(am__strip_dir) \
+-        echo " rm -f '$(DESTDIR)$(datadir)/$$f'"; \
+-        rm -f "$(DESTDIR)$(datadir)/$$f"; \
++        echo " rm -f '$(DESTDIR)$(datadir)/squid/$$f'"; \
++        rm -f "$(DESTDIR)$(datadir)/squid/$$f"; \
        done
  install-sysconfDATA: $(sysconf_DATA)
        @$(NORMAL_INSTALL)
-@@ -1072,7 +1072,7 @@ info-am:
+@@ -1108,8 +1108,7 @@ info-am:
+ 
  install-data-am: install-data-local install-dataDATA
  
- install-exec-am: install-binPROGRAMS install-libexecPROGRAMS \
--      install-sbinPROGRAMS install-sysconfDATA
-+      install-sbinPROGRAMS
+-install-exec-am: install-libexecPROGRAMS install-sbinPROGRAMS \
+-      install-sysconfDATA
++install-exec-am: install-libexecPROGRAMS install-sbinPROGRAMS
  
  install-info: install-info-recursive
  
-@@ -1090,7 +1090,7 @@ mostlyclean-am: mostlyclean-compile most
+@@ -1136,7 +1135,7 @@ ps-am:
  
- uninstall-am: uninstall-binPROGRAMS uninstall-dataDATA uninstall-info-am \
+ uninstall-am: uninstall-dataDATA uninstall-info-am \
        uninstall-libexecPROGRAMS uninstall-local \
 -      uninstall-sbinPROGRAMS uninstall-sysconfDATA
 +      uninstall-sbinPROGRAMS
  
  uninstall-info: uninstall-info-recursive
  
-@@ -1175,26 +1175,7 @@ repl_modules.c: repl_modules.sh Makefile
+@@ -1220,20 +1219,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
  
@@ -82,12 +83,6 @@
 -              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
  
diff -r 027d0f7353bc -r 3309ba62f1c3 www/squid/patches/patch-ab
--- a/www/squid/patches/patch-ab        Wed Sep 13 13:21:45 2006 +0000
+++ b/www/squid/patches/patch-ab        Wed Sep 13 14:41:58 2006 +0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.6 2002/10/13 16:43:21 taca Exp $
+$NetBSD: patch-ab,v 1.7 2006/09/13 14:41:58 taca Exp $
 
---- scripts/Makefile.in.orig   Fri Jul 12 17:38:25 2002
+--- scripts/Makefile.in.orig   2006-06-12 15:10:08.000000000 +0900
 +++ scripts/Makefile.in
-@@ -26,7 +26,7 @@ VPATH = @srcdir@
- prefix = @prefix@
Prev by Date: [pkgsrc/trunk]: pkgsrc/security/EasyPG move EasyPG from epg to EasyPG, and ch...
Next by Date: [pkgsrc/trunk]: pkgsrc/multimedia/ruby-ming Update ruby-ming to 0.1.7.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/security/EasyPG move EasyPG from epg to EasyPG, and ch...
Next by Thread: [pkgsrc/trunk]: pkgsrc/multimedia/ruby-ming Update ruby-ming to 0.1.7.
Indexes:
Home | Main Index | Thread Index | Old Index