From cf4dc39b614032a1733a67c6d65b5d0cd56bdf53 Mon Sep 17 00:00:00 2001 From: taca Date: Sun, 5 Jun 2005 14:20:25 +0000 Subject: Update squid package to 2.5.10 * squid 2.5.STABLE10 + official + one official patch. - 2005-05-25 23:01 (Cosmetic) Double content-length often harmless Other fixes are already done by official patches for squid 2.5.STABLE9. * Add missing cachemgr.cgi.8 to PLIST. * Introduce options.mk which may need to be brushed more. * Drop support for diskd on Darwin since diskd needs System V msg function which dosen't supported on Darwin. * Real fix for transparent proxy with IP Filter, fix PR pkg/30085. --- www/squid/Makefile | 115 ++++++++++++----------------------- www/squid/PLIST | 3 +- www/squid/distinfo | 148 +++------------------------------------------ www/squid/options.mk | 104 +++++++++++++++++++++++++++++++ www/squid/patches/patch-ag | 16 ++--- www/squid/patches/patch-ao | 28 --------- www/squid/patches/patch-ca | 18 ------ www/squid/patches/patch-cb | 18 ------ www/squid/patches/patch-cc | 18 ------ www/squid/patches/patch-cd | 66 +++++++++++++++++--- 10 files changed, 219 insertions(+), 315 deletions(-) create mode 100644 www/squid/options.mk delete mode 100644 www/squid/patches/patch-ao delete mode 100644 www/squid/patches/patch-ca delete mode 100644 www/squid/patches/patch-cb delete mode 100644 www/squid/patches/patch-cc (limited to 'www') diff --git a/www/squid/Makefile b/www/squid/Makefile index 17fbadc13ac..e094e4b9ca0 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.151 2005/05/22 05:35:33 jlam Exp $ +# $NetBSD: Makefile,v 1.152 2005/06/05 14:20:25 taca Exp $ -DISTNAME= squid-2.5.STABLE9 -PKGNAME= squid-2.5.9 -PKGREVISION= 11 +DISTNAME= squid-2.5.STABLE10 +PKGNAME= squid-2.5.10 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/ \ @@ -10,49 +9,7 @@ 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.STABLE9-setcookie.patch \ - squid-2.5.STABLE9-ftp_EPLF.patch \ - squid-2.5.STABLE9-ftp_base_href.patch \ - squid-2.5.STABLE9-acl_error.patch \ - squid-2.5.STABLE9-date.patch \ - squid-2.5.STABLE9-reload_into_ims.patch \ - squid-2.5.STABLE9-delay_access_doc.patch \ - squid-2.5.STABLE9-config_overflow.patch \ - squid-2.5.STABLE9-bzero.patch \ - squid-2.5.STABLE9-pid_t.patch \ - squid-2.5.STABLE9-ctype.patch \ - squid-2.5.STABLE9-defer_digest_fetch.patch \ - squid-2.5.STABLE9-dup_content_length.patch \ - squid-2.5.STABLE9-excess_data.patch \ - squid-2.5.STABLE9-aufs.patch \ - squid-2.5.STABLE9-long_basic_auth.patch \ - squid-2.5.STABLE9-CONNECT_truncated.patch \ - squid-2.5.STABLE9-LDAP_SUN_SDK.patch \ - squid-2.5.STABLE9-disable_hostname_checks.patch \ - squid-2.5.STABLE9-aufs_shutdown.patch \ - squid-2.5.STABLE9-2GB.patch \ - squid-2.5.STABLE9-rename_cleanup.patch \ - squid-2.5.STABLE9-cachemgr_objects.patch \ - squid-2.5.STABLE9-extaclauth.patch \ - squid-2.5.STABLE9-syslog.patch \ - squid-2.5.STABLE9-errpage_user.patch \ - squid-2.5.STABLE9-debug_newlines.patch \ - squid-2.5.STABLE9-squid_k_nohostname.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 \ - squid-2.5.STABLE9-aufs_improvement.patch \ - squid-2.5.STABLE9_2GB-hot_cache.patch \ - squid-2.5.STABLE9-diskd.patch \ - squid-2.5.STABLE9-snmp.patch \ - squid-2.5.STABLE9-arpacl.patch \ - squid-2.5.STABLE9-dstdomain_ip.patch \ - squid-2.5.STABLE9-dns_query-5.patch \ - squid-2.5.STABLE9-2GB_assert.patch \ - squid-2.5.STABLE9-always_direct_documentation.patch -# squid-2.5.STABLE9-transparent_port.patch +PATCHFILES= squid-2.5.STABLE10-content_length.patch PATCH_DIST_STRIP= -p1 MAINTAINER= taca@NetBSD.org @@ -68,32 +25,25 @@ DATADIR= ${VARBASE}/squid # Update this time stamp pattern if any of official distfiles has changed. # -DIST_STAMP= 2005042600 +DIST_STAMP= 2005060500 DOCFILES= ChangeLog RELEASENOTES.html doc/debug-sections.txt # Configuration directory location which can be overwritten by the user. PKG_SYSCONFSUBDIR?= squid -.include "../../mk/bsd.prefs.mk" - -USE_PERL5= build USE_PKGINSTALL= yes +USE_TOOLS+= perl +TOOLS_DEPMETHOD.perl?= DEPENDS GNU_CONFIGURE= yes CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} \ - --localstatedir=${DATADIR} \ - ${SQUID_CONFIGURE_ARGS} + --localstatedir=${DATADIR} -BUILD_DEFS+= SQUID_CONFIGURE_ARGS MAKE_ENV+= INSTALL_SCRIPT="${INSTALL_SCRIPT}" MAKE_ENV+= PKG_PREFIX="${PREFIX}" VARBASE="${VARBASE}" PLIST_SRC= ${WRKDIR}/PLIST RCD_SCRIPTS= squid -SQUID_USER?= squid -SQUID_GROUP?= squid -BUILD_DEFS+= SQUID_USER SQUID_GROUP - PKG_GROUPS= ${SQUID_GROUP} PKG_USERS= ${SQUID_USER}:${SQUID_GROUP}::Squid\\ Web-Cache\\ pseudo-user CONF_FILES+= ${EXAMPLESDIR}/mime.conf ${PKG_SYSCONFDIR}/mime.conf @@ -102,33 +52,43 @@ OWN_DIRS= ${DATADIR} OWN_DIRS_PERMS+= ${DATADIR}/cache ${SQUID_USER} ${SQUID_GROUP} 0750 \ ${DATADIR}/logs ${SQUID_USER} ${SQUID_GROUP} 0750 -.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux" || ${OPSYS} == "SunOS" -CONFIGURE_ARGS+= --enable-arp-acl -.endif +.include "../../mk/bsd.prefs.mk" + +SQUID_USER?= squid +SQUID_GROUP?= squid +BUILD_DEFS+= SQUID_USER SQUID_GROUP -# Configuration options which can be overwritten by the user. -SQUID_CONFIGURE_ARGS?= --enable-auth=basic,digest,ntlm \ +CONFIGURE_ARGS+= --enable-auth=basic,digest,ntlm \ --enable-cachemgr-hostname=localhost \ --enable-delay-pools \ --enable-removal-policies=lru,heap \ - --enable-icmp \ - --enable-ipf-transparent \ --enable-poll \ - --enable-snmp \ - --enable-ssl \ - --with-openssl=${SSLBASE} \ + --enable-async-io=5 \ --enable-underscores \ - --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 \ - --enable-ntlm-auth-helpers=winbind + --enable-storeio=${SQUID_BACKEND} +# +# generic helpers +# OPTIONAL_FILES+= libexec/diskd libexec/dnsserver libexec/pinger libexec/unlinkd -OPTIONAL_FILES+= libexec/digest_pw_auth libexec/getpwname_auth -OPTIONAL_FILES+= libexec/ip_user_check libexec/smb_auth libexec/smb_auth.sh -OPTIONAL_FILES+= libexec/squid_unix_group libexec/wb_auth libexec/wb_group +# +# 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 +# +# digest auth helpers +# +OPTIONAL_FILES+= libexec/digest_pw_auth +# +# ntlm auth helpers (except no_check and winbind) +# OPTIONAL_FILES+= libexec/wb_ntlmauth man/man8/squid_unix_group.8 +# +# external acl helpers (except ldap_group, wbinfo_group and winbind_group) +# +OPTIONAL_FILES+= libexec/ip_user_check libexec/squid_unix_group pre-install: @${INSTALL_DATA_DIR} ${EXAMPLESDIR} @@ -162,6 +122,5 @@ post-install: ${ECHO} "@dirrm share/squid" \ ) >>${PLIST_SRC} -.include "../../lang/perl5/buildlink3.mk" -.include "../../security/openssl/buildlink3.mk" +.include "options.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/squid/PLIST b/www/squid/PLIST index 8276ea970de..a2569b71363 100644 --- a/www/squid/PLIST +++ b/www/squid/PLIST @@ -1,6 +1,7 @@ -@comment $NetBSD: PLIST,v 1.17 2005/05/02 20:34:07 reed Exp $ +@comment $NetBSD: PLIST,v 1.18 2005/06/05 14:20:26 taca Exp $ bin/squidclient libexec/cachemgr.cgi +man/man8/cachemgr.cgi.8 man/man8/squid.8 sbin/RunAccel sbin/RunCache diff --git a/www/squid/distinfo b/www/squid/distinfo index cf9ecfd4c24..143075f5217 100644 --- a/www/squid/distinfo +++ b/www/squid/distinfo @@ -1,151 +1,21 @@ -$NetBSD: distinfo,v 1.97 2005/05/12 16:09:48 taca Exp $ +$NetBSD: distinfo,v 1.98 2005/06/05 14:20:26 taca Exp $ -SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9.tar.bz2) = 9605e274f548bfc8dcb60a299b680df2846ee74b -RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9.tar.bz2) = 98e49ff58ffc4664a46350f3d6c34be99b713716 -Size (squid-2.5.9-2005042600/squid-2.5.STABLE9.tar.bz2) = 1057776 bytes -SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9-setcookie.patch) = 1f1a6692a32a00e81873741f4152bdb21e90b263 -RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9-setcookie.patch) = 9e0faca4c185c0d689a3f78d156bc1d653854dfa -Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-setcookie.patch) = 5328 bytes -SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9-ftp_EPLF.patch) = cdb2236bf58fa896fd6b70d0ee0c9aa6ff9d9334 -RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9-ftp_EPLF.patch) = 3b438bad44b2bc2b9a7de737ae32399d75fbaddd -Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-ftp_EPLF.patch) = 4108 bytes -SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9-ftp_base_href.patch) = 1c72fd034aeee6900283b2f803ebd1eaa28c5397 -RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9-ftp_base_href.patch) = 06b2aa11b5a567d92c15086e2d7aedb508a0d8d1 -Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-ftp_base_href.patch) = 709 bytes -SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9-acl_error.patch) = fec6e7f2b82bd3a8f9f26e6044f516c8127b9120 -RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9-acl_error.patch) = 820a48ca76d5512dd0a0a28c4247d1a09d1ff528 -Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-acl_error.patch) = 8499 bytes -SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9-date.patch) = 3e98e96f3ce41c8b93f11f455e909fe3c31fa1ff -RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9-date.patch) = 4bfbfc7acd55747b58ce72316c6bb058fa7d4c0a -Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-date.patch) = 5647 bytes -SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9-reload_into_ims.patch) = 9313f40309fe075a05a76be26623acda67a1d0e4 -RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9-reload_into_ims.patch) = 1a312d5ab48416a33dc9af2c8adad4e66f7edc52 -Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-reload_into_ims.patch) = 852 bytes -SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9-delay_access_doc.patch) = 9b96b169dfd5f383350460c6c89b7baca5fede6f -RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9-delay_access_doc.patch) = c209d9178829ed3289111be8d489a603d031ae07 -Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-delay_access_doc.patch) = 1258 bytes -SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9-config_overflow.patch) = 03f7e72278e34c7bce6cac37bd5dfb4b91cc359b -RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9-config_overflow.patch) = 9b286b4b77162b5bbafc0a57f976101c6f9a091e -Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-config_overflow.patch) = 591 bytes -SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9-bzero.patch) = 2899bd43bc53c00d79a54eec89d90b3b33715e02 -RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9-bzero.patch) = b8888bdf567935fd0e00342b327441d338e2e191 -Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-bzero.patch) = 11326 bytes -SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9-pid_t.patch) = b03fa99462a522ebfbd759c6d2252e8d516ac230 -RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9-pid_t.patch) = e429d87b89dd3dd91f385c7b187b43b58ac92044 -Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-pid_t.patch) = 5576 bytes -SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9-ctype.patch) = d1956f64ab2312a146279971e06d0b3463956334 -RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9-ctype.patch) = 2e70bdb6899b97be611ce344dfbd516d1d2a8b5d -Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-ctype.patch) = 4698 bytes -SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9-defer_digest_fetch.patch) = a0ce5fa1787383ae000efab7cdbb7da7eda523b3 -RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9-defer_digest_fetch.patch) = 0592299cbd0780faac1aa1fc56af6306a7d5ed15 -Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-defer_digest_fetch.patch) = 1026 bytes -SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9-dup_content_length.patch) = f7d424975a35e253d981d3092b8e336cee037de2 -RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9-dup_content_length.patch) = fbd59d1acf271c5d36ecc99cb0ec64df11a52665 -Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-dup_content_length.patch) = 1685 bytes -SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9-excess_data.patch) = 7b272cadafb070c322d8ff488249c85e4640f5dd -RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9-excess_data.patch) = 4a87f35949b25171f5b24d195a4a770eb2b1c5c1 -Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-excess_data.patch) = 1553 bytes -SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9-aufs.patch) = 5e970b98c8ddfebf34d36587acc63a3ab9de9d78 -RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9-aufs.patch) = e23f773014c69ec6df6f0ef00de8f1d816ff007c -Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-aufs.patch) = 9317 bytes -SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9-long_basic_auth.patch) = 43b6ab0692290e38eddf8bdbd027bedadf6c36db -RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9-long_basic_auth.patch) = 331b2d19c436523b5b627b9c95f6c689f68e3f5d -Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-long_basic_auth.patch) = 1328 bytes -SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9-CONNECT_truncated.patch) = c5d90e4bb1021c58b74275d7d12900d671edc12c -RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9-CONNECT_truncated.patch) = 8cda87c642edc90b5713430dfd0a8d85bbf1e613 -Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-CONNECT_truncated.patch) = 4885 bytes -SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9-LDAP_SUN_SDK.patch) = 2dadb8dac2f2fca1dd30d8341aecedc6c3d1a845 -RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9-LDAP_SUN_SDK.patch) = 18faa8ebcb87d6a871d7482083d90e9fd4e36493 -Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-LDAP_SUN_SDK.patch) = 9238 bytes -SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9-disable_hostname_checks.patch) = 993f5111623ff0149352ec69e2f10380b3e3bc69 -RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9-disable_hostname_checks.patch) = 12ec3273716a9e6da31be5ec1a880662cb2957ec -Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-disable_hostname_checks.patch) = 2964 bytes -SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9-aufs_shutdown.patch) = 23ab9e4a8ef9042d03b5eaca366232c7609f6217 -RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9-aufs_shutdown.patch) = 68d2e27eceb4e2738cd4e495769ad7d58f288768 -Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-aufs_shutdown.patch) = 10649 bytes -SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9-2GB.patch) = 87618153f2eb97e8cf2c1133a4a06039e844ab93 -RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9-2GB.patch) = 9ee0616e6a15bd87faf94ef4fdcdba3e09b60c4e -Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-2GB.patch) = 248552 bytes -SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9-rename_cleanup.patch) = d61dbbee6a39fac03a323a62a81342cab9e15228 -RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9-rename_cleanup.patch) = 5f051fb2b6f9b655d2d938945789655d30f8e86b -Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-rename_cleanup.patch) = 6055 bytes -SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9-cachemgr_objects.patch) = f010f54998b726998bc02a922f52ae2887a6f3fc -RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9-cachemgr_objects.patch) = 3b4d9f6547f9bbb47b46299b8b9862aed728430e -Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-cachemgr_objects.patch) = 2625 bytes -SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9-extaclauth.patch) = aaa6abdd081e24be771fa0ab8fb82eac2b16b854 -RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9-extaclauth.patch) = 775220147c070a0313a68f0ad6fc8958c89c6f2b -Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-extaclauth.patch) = 1799 bytes -SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9-syslog.patch) = a2efd3cb5b63e086fcc4afb81cbb97239c833284 -RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9-syslog.patch) = 1faeb4a4a9ede12a716ac453e81fc9a40cb67ee3 -Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-syslog.patch) = 7439 bytes -SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9-errpage_user.patch) = 5ad27638aec2d09e731f6c991bfd28404c965c97 -RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9-errpage_user.patch) = 7f765a7dbfd846a608932a995e24d3b62b8a5ff5 -Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-errpage_user.patch) = 822 bytes -SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9-debug_newlines.patch) = 804f09685b4d86c507f7eb669da20caeb02e6f7b -RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9-debug_newlines.patch) = efc38284ceed04743abf637ce3b1f59628d5df57 -Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-debug_newlines.patch) = 5049 bytes -SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9-transparent_port.patch) = 2580792f9353f23a221d4dc6303dbc0919aaf10c -RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9-transparent_port.patch) = 9d9db96ef48fdcd376a1507996e24ab81db92024 -Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-transparent_port.patch) = 8886 bytes -SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9-squid_k_nohostname.patch) = 326dc2668e02f1034627f944163f92f12c7dc978 -RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9-squid_k_nohostname.patch) = a9088582f60430c5a5e1f47e2566ef42d473a4ce -Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-squid_k_nohostname.patch) = 1590 bytes -SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9-config_CRLF.patch) = f0fe96ef6b450dc4de026ed2b22e5587ea1b2ac8 -RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9-config_CRLF.patch) = 897ad90d93fde7d33191eb1c129d4ebdc5a35442 -Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-config_CRLF.patch) = 515 bytes -SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9-forwardcc.patch) = 4dfdddd75fff5b15daa11337938c04abea6b85e0 -RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9-forwardcc.patch) = dc12a6135861589605d3d56fcae382bfe1386af0 -Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-forwardcc.patch) = 2573 bytes -SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9-authinfo.patch) = 79dc67c81701952be60ec8212ff26d03b53e05ad -RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9-authinfo.patch) = 13b1446555251305731bf9488dc3da98b4eb67db -Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-authinfo.patch) = 11647 bytes -SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9-chroot_pidfile.patch) = d0e73cc02c369ca0d0e1c8f2deb85bcd239d3952 -RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9-chroot_pidfile.patch) = 6eb80ba6936252f86e9cbd6d98eb63324ba0040e -Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-chroot_pidfile.patch) = 948 bytes -SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9-cachemgr_conf.patch) = 064cea05c1741347ecaa6cf3ad4d29156154ff3b -RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9-cachemgr_conf.patch) = d2f84c263dfd3c8a39fc09e7ee3bdb0db704416a -Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-cachemgr_conf.patch) = 31572 bytes -SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9-aufs_improvement.patch) = 58e4ac976bd390248797f5508db29f6c0e86e8cc -RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9-aufs_improvement.patch) = 2245d12c997c6918ca86d692876723e549fe1748 -Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-aufs_improvement.patch) = 3188 bytes -SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9_2GB-hot_cache.patch) = 13da4ee06d1a2442eb9ebe6637d6f6c7aea39916 -RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9_2GB-hot_cache.patch) = a9f557182c01c61ebba190cbb4b33b19ce44f88a -Size (squid-2.5.9-2005042600/squid-2.5.STABLE9_2GB-hot_cache.patch) = 3016 bytes -SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9-diskd.patch) = e32fc4a8a1201b9768fad831fe6d044da86292ee -RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9-diskd.patch) = 0df0b068baca3bd3a0adbdbaab09db304751e2fd -Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-diskd.patch) = 2659 bytes -SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9-snmp.patch) = f810f55a6b0de96592f0f5dddd052e8dd90061ff -RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9-snmp.patch) = fe5c5a49194fdce270e0b22b02cf27c734f572fc -Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-snmp.patch) = 8013 bytes -SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9-arpacl.patch) = 005732a132e41d2e0c888246016f2ff1ac386640 -RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9-arpacl.patch) = afe73f9fb3371bb03c5998536cff36e37979d063 -Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-arpacl.patch) = 3110 bytes -SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9-dstdomain_ip.patch) = 8bdfbed49bf0caa9ba0b7380347d98634871bd4d -RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9-dstdomain_ip.patch) = 277061a114dc0cc00c120d51c31dab38031d6371 -Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-dstdomain_ip.patch) = 2638 bytes -SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9-dns_query-5.patch) = d17dfb25c8292b54bbb8403c32506c489464f9f8 -RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9-dns_query-5.patch) = 7cac123a800e56db320e4052cf4d1ecee10fe65c -Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-dns_query-5.patch) = 25779 bytes -SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9-2GB_assert.patch) = 4cf77b14c9b75eb4a7a55b17f5528ab486765118 -RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9-2GB_assert.patch) = 9d879037daaed4c67d5364b327e70e5efdd96a69 -Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-2GB_assert.patch) = 686 bytes -SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9-always_direct_documentation.patch) = 0d289314bb97129011c85966c1690f94826e1087 -RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9-always_direct_documentation.patch) = 3cd529ca4cc36eceb766f2f83faeadcbadac114c -Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-always_direct_documentation.patch) = 1610 bytes +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 +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 (patch-ab) = 1224ba4cee98a26d2c9d670eb6d57c6187ff2d56 SHA1 (patch-ac) = 1b283f0a573c02c82ce26f75e67d19b1ec5ff9f0 SHA1 (patch-ad) = 88b46bc9051ea32ebd74f06ebd362ce16f8c5c4c SHA1 (patch-ae) = 860c8ad41ea09282bdb0d626260084354458f653 -SHA1 (patch-ag) = 1ea73bcd19eb0c6e380c8fd173261b1171b9d787 +SHA1 (patch-ag) = 599a87a5f3ca0be1f89b7ec971c4a6aa36821d8a SHA1 (patch-aj) = aa2271e53602fe168604aeced6ed66d28fe47707 SHA1 (patch-ak) = 108b313149271457bee702ecf9489c61715ec9e7 SHA1 (patch-al) = 51d7c84b007ab9600ae911e1e9206cf91b937120 SHA1 (patch-an) = febe1a78dfbda5caebe5a9f16af6da1e1a9e79ca -SHA1 (patch-ao) = d324f7061d9532a165bdfe470e1a5f534d0c131b SHA1 (patch-bb) = cc0486eaf27f5796d83041e6b7a9562a134d8063 SHA1 (patch-bc) = 536299e59c396829f23484a14bb9a6f5c0a4de35 -SHA1 (patch-ca) = 132e45eea22cccf6678b5d920d913965f73f0db7 -SHA1 (patch-cb) = 603471bf702c3ff4480585dc59dc326f23a5f2e8 -SHA1 (patch-cc) = 53d72f0df09f1e2c4cc9b65a635d320e4d315cf5 -SHA1 (patch-cd) = 3d3e2d18f3f2b46109177109c7dbf9695eb1ed22 +SHA1 (patch-cd) = 657556f6d57f0a4ef01b2439714a4c1bceb04ef2 diff --git a/www/squid/options.mk b/www/squid/options.mk new file mode 100644 index 00000000000..6d7fda3d6bf --- /dev/null +++ b/www/squid/options.mk @@ -0,0 +1,104 @@ +# $NetBSD: options.mk,v 1.1 2005/06/05 14:20:27 taca Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.squid +PKG_SUPPORTED_OPTIONS= icmp pam-helper snmp ssl aufs +# +# most of options are enabled by default except aufs. aufs backend isn't +# tested well. +PKG_SUGGESTED_OPTIONS= icmp pam-helper snmp ssl + +.if !empty(OPSYS:MLinux) +PKG_SUPPORTED_OPTIONS+= linux-netfilter +.endif + +# some release of NetBSD lacks header of IP Filter 4.x +.if ${OPSYS} != "NetBSD" || ${OS_VERSION:M[01].*} || exists(/usr/include/netinet/ipl.h) +PKG_SUPPORTED_OPTIONS+= ipf-transparent +.endif + +.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" +PKG_SUPPORTED_OPTIONS+= pf-transparent +.endif + +.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD" +PKG_SUGGESTED_OPTIONS+= ipf-transparent +.endif + +.if ${OPSYS} == "OpenBSD" +PKG_SUGGESTED_OPTIONS+= pf-transparent +.endif + +# Darwin dosen't support System V IPC support. +.if empty(OPSYS:MDarwin) +PKG_SUPPORTED_OPTIONS+= diskd +PKG_SUGGESTED_OPTIONS+= diskd +.endif + +# limited platform support arp-acl +.if !empty(OPSYS:MFreeBSD) || !empty(OPSYS:MLinux) || !empty(OPSYS:MSunOS) +PKG_SUPPORTED_OPTIONS+= arp-acl +.endif + +.include "../../mk/bsd.options.mk" + +SQUID_BACKEND?= ufs,null +SQUID_BASIC_AUTH_HELPERS?= getpwnam MSNT NCSA YP winbind +SQUID_DIGEST_AUTH_HELPERS?= password +SQUID_NTLM_AUTH_HELPERS?= fakeauth SMB +SQUID_EXTERNAL_ACL_HELPERS?= ip_user unix_group + +# +# squid's code has preference as: +# ipf-transparent > pf-transparent > linux-netfilter +# So, options.mk introduce preference as: +# linux-netfilter > pf-transparnet > ipf-transparent +# +.if !empty(PKG_OPTIONS:Mlinux-netfilter) +CONFIGURE_ARGS+= --enable-linux-netfilter +.elif !empty(PKG_OPTIONS:Mpf-transparent) +CONFIGURE_ARGS+= --enable-pf-transparent +.elif !empty(PKG_OPTIONS:Mipf-transparent) +CONFIGURE_ARGS+= --enable-ipf-transparent +.endif + +.if !empty(PKG_OPTIONS:Marp-acl) +CONFIGURE_ARGS+= arp-acl +.endif + +.if !empty(PKG_OPTIONS:Micmp) +CONFIGURE_ARGS+= --enable-icmp +.endif + +.if !empty(PKG_OPTIONS:Mpam-helper) +. include "../../mk/pam.buildlink3.mk" +SQUID_BASIC_AUTH_HELPERS+= PAM +.endif + +.if !empty(PKG_OPTIONS:Msnmp) +CONFIGURE_ARGS+= --enable-snmp +.endif + +.if !empty(PKG_OPTIONS:Mssl) +CONFIGURE_ARGS+= --enable-ssl --with-openssl=${SSLBASE} +.include "../../security/openssl/buildlink3.mk" +.endif + +.if !empty(PKG_OPTIONS:Mdiskd) +SQUID_BACKEND+= diskd +.endif + +.if !empty(SQUID_BASIC_AUTH_HELPERS) +CONFIGURE_ARGS+= --enable-basic-auth-helpers=${SQUID_BASIC_AUTH_HELPERS:ts,} +.endif + +.if !empty(SQUID_DIGEST_AUTH_HELPERS) +CONFIGURE_ARGS+= --enable-digest-auth-helpers=${SQUID_DIGEST_AUTH_HELPERS:ts,} +.endif + +.if !empty(SQUID_NTLM_AUTH_HELPERS) +CONFIGURE_ARGS+= --enable-ntlm-auth-helpers=${SQUID_NTLM_AUTH_HELPERS:ts,} +.endif + +.if !empty(SQUID_EXTERNAL_ACL_HELPERS) +CONFIGURE_ARGS+= --enable-external-acl-helpers=${SQUID_EXTERNAL_ACL_HELPERS:ts,} +.endif diff --git a/www/squid/patches/patch-ag b/www/squid/patches/patch-ag index 4004b8e1436..75345474d14 100644 --- a/www/squid/patches/patch-ag +++ b/www/squid/patches/patch-ag @@ -1,8 +1,8 @@ -$NetBSD: patch-ag,v 1.17 2004/10/13 15:35:55 taca Exp $ +$NetBSD: patch-ag,v 1.18 2005/06/05 14:20:27 taca Exp $ ---- configure.orig 2004-10-12 05:27:03.000000000 +0900 +--- configure.orig 2005-05-17 07:41:14.000000000 +0900 +++ configure -@@ -2219,7 +2219,7 @@ if test "${enable_snmp+set}" = set; then +@@ -2241,7 +2241,7 @@ if test "${enable_snmp+set}" = set; then #define SQUID_SNMP 1 EOF @@ -11,7 +11,7 @@ $NetBSD: patch-ag,v 1.17 2004/10/13 15:35:55 taca Exp $ if true; then -@@ -3957,6 +3957,7 @@ for ac_hdr in \ +@@ -4046,6 +4046,7 @@ for ac_hdr in \ libc.h \ limits.h \ linux/netfilter_ipv4.h \ @@ -19,7 +19,7 @@ $NetBSD: patch-ag,v 1.17 2004/10/13 15:35:55 taca Exp $ malloc.h \ math.h \ memory.h \ -@@ -6202,43 +6203,38 @@ fi +@@ -6291,43 +6292,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 @@ -30,7 +30,7 @@ $NetBSD: patch-ag,v 1.17 2004/10/13 15:35:55 taca Exp $ fi -echo $ac_n "checking for fd_mask""... $ac_c" 1>&6 --echo "configure:6212: checking for fd_mask" >&5 +-echo "configure:6301: checking for fd_mask" >&5 -if eval "test \"`echo '$''{'ac_cv_type_fd_mask'+set}'`\" = set"; then +echo $ac_n "checking for fd_set""... $ac_c" 1>&6 +echo "configure:6031: checking for fd_set" >&5 @@ -38,7 +38,7 @@ $NetBSD: patch-ag,v 1.17 2004/10/13 15:35:55 taca Exp $ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < -#if STDC_HEADERS @@ -77,7 +77,7 @@ $NetBSD: patch-ag,v 1.17 2004/10/13 15:35:55 taca Exp $ echo $ac_n "checking size of off_t""... $ac_c" 1>&6 -@@ -7516,8 +7512,8 @@ if test "$GCC" = "yes"; then +@@ -7643,8 +7639,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-ao b/www/squid/patches/patch-ao deleted file mode 100644 index 13496ad6c15..00000000000 --- a/www/squid/patches/patch-ao +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-ao,v 1.1 2005/04/26 16:19:43 taca Exp $ - ---- doc/Makefile.in.orig 2005-04-27 00:32:57.000000000 +0900 -+++ doc/Makefile.in -@@ -161,7 +161,10 @@ MANS = $(man_MANS) - DIST_COMMON = Makefile.am Makefile.in - all: all-am - --.SUFFIXES: -+.SUFFIXES: .in -+.in: -+ $(SUBSTITUTE) < $< > $@ -+ - $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign doc/Makefile -@@ -314,10 +317,8 @@ uninstall-man: uninstall-man8 - - - squid.8: squid.8.in Makefile -- $(SUBSTITUTE) < $< > $@ -- - cachemgr.cgi.8: cachemgr.cgi.8.in Makefile -- $(SUBSTITUTE) < $< > $@ -+ - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: diff --git a/www/squid/patches/patch-ca b/www/squid/patches/patch-ca deleted file mode 100644 index 1f8028925d6..00000000000 --- a/www/squid/patches/patch-ca +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-ca,v 1.2 2004/08/22 15:11:09 taca Exp $ - ---- src/fs/diskd/diskd.c.orig 2001-02-08 03:56:54.000000000 +0900 -+++ src/fs/diskd/diskd.c -@@ -36,9 +36,12 @@ - #include "squid.h" - - #include --#include - #include - -+#ifdef HAVE_SYS_MSG_H -+#include -+#endif -+ - #include "store_diskd.h" - - #undef assert diff --git a/www/squid/patches/patch-cb b/www/squid/patches/patch-cb deleted file mode 100644 index 6f4ef69eaa3..00000000000 --- a/www/squid/patches/patch-cb +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-cb,v 1.2 2004/08/22 15:11:09 taca Exp $ - ---- src/fs/diskd/store_dir_diskd.c.orig 2003-07-24 06:00:34.000000000 +0900 -+++ src/fs/diskd/store_dir_diskd.c -@@ -36,9 +36,12 @@ - #include "squid.h" - - #include --#include - #include - -+#ifdef HAVE_SYS_MSG_H -+#include -+#endif -+ - #include "store_diskd.h" - - #define DefaultLevelOneDirs 16 diff --git a/www/squid/patches/patch-cc b/www/squid/patches/patch-cc deleted file mode 100644 index 6b3c3f312c4..00000000000 --- a/www/squid/patches/patch-cc +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-cc,v 1.3 2005/03/31 16:44:25 taca Exp $ - ---- src/fs/diskd/store_io_diskd.c.orig 2005-03-28 23:52:36.000000000 +0900 -+++ src/fs/diskd/store_io_diskd.c -@@ -37,9 +37,12 @@ - #include "squid.h" - - #include --#include - #include - -+#ifdef HAVE_SYS_MSG_H -+#include -+#endif -+ - #include "store_diskd.h" - - static int storeDiskdSend(int, SwapDir *, int, storeIOState *, int, off_t, int); diff --git a/www/squid/patches/patch-cd b/www/squid/patches/patch-cd index c3ab8b7d7ee..6e15deef08c 100644 --- a/www/squid/patches/patch-cd +++ b/www/squid/patches/patch-cd @@ -1,13 +1,65 @@ -$NetBSD: patch-cd,v 1.7 2005/05/01 23:17:49 taca Exp $ +$NetBSD: patch-cd,v 1.8 2005/06/05 14:20:27 taca Exp $ ---- src/client_side.c.orig 2005-05-02 01:31:18.000000000 +0900 +--- src/client_side.c.orig 2005-04-21 06:46:06.000000000 +0900 +++ src/client_side.c -@@ -2782,7 +2782,7 @@ parseHttpRequest(ConnStateData * conn, m +@@ -41,6 +41,7 @@ + #endif + #include + #include ++#include + #if HAVE_IP_FIL_COMPAT_H + #include + #elif HAVE_NETINET_IP_FIL_COMPAT_H +@@ -2589,6 +2590,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; +@@ -2731,6 +2735,13 @@ parseHttpRequest(ConnStateData * conn, m + int vport; + if (vhost_mode) { + #if IPF_TRANSPARENT ++#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; +@@ -2739,8 +2750,8 @@ parseHttpRequest(ConnStateData * conn, m if (natfd < 0) { int save_errno; enter_suid(); -- natfd = open(IPL_NAT, O_RDONLY, 0); +-#ifdef IPL_NAME +- natfd = open(IPL_NAME, O_RDONLY, 0); ++#ifdef IPNAT_NAME + natfd = open(IPNAT_NAME, O_RDONLY, 0); - save_errno = errno; - leave_suid(); - errno = save_errno; + #else + natfd = open(IPL_NAT, O_RDONLY, 0); + #endif +@@ -2756,6 +2767,9 @@ parseHttpRequest(ConnStateData * conn, m + cbdataFree(http); + xfree(inbuf); + } 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 +@@ -2769,6 +2783,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"); -- cgit v1.2.3