diff options
| author | taca <taca> | 2003-03-25 17:44:22 +0000 |
|---|---|---|
| committer | taca <taca> | 2003-03-25 17:44:22 +0000 |
| commit | be296206312e23526fc039456ff5cef3671aa751 (patch) | |
| tree | 3a9e2a9ca8edb9a42fddea5748daa935eab67c03 /www/squid | |
| parent | b6afa0fa076965074696665f34aa4c604e2ece52 (diff) | |
| download | pkgsrc-be296206312e23526fc039456ff5cef3671aa751.tar.gz | |
Update squid package to 2.5.2.
pkgsrc change: install some supplemental documents.
Changes to squid-2.5.STABLE2 (Mars 17, 2003):
- Contrib files added back to the distribution
- Several compiler warnings fixed when using --disable-ident or
--disable-http-violations
- authentication can now be used in most access controls, but
must in most cases first be enforced in http_access to force
the user to authenticate.
- cleanups in the developer bootstrap.sh process when preparing
the sources.
- several squid.conf.default documentation updated to correctly
refer to the current names when refering to other directives
- authenticate_ip_ttl documentation updates
- several assertion faults and segmentation violations corrected
- the RunCache/RunAccel and squid.rc scripts updated to refer to
the squid binary in sbin rather than the old bin location.
- squid_ldap_auth command line processing fixes when specifying
the LDAP server last on the line instead of -h option
- aufs data corruption bugfix
- aufs performance improvement for low traffic systems
- aufs stability improvements
- external_acl corrected to properly deal with quoted strings
- WCCPv1 bugfix to make sure the router accepts the hash assignments
- "Total accounted memory" now correctly reported in cachemgr
- several small memory leaks (mostly reconfigure related)
- new squid.conf option to allow GET/HEAD requests with a request
entity
- "make uninstall" no longer removes squid.conf
- cachemgr.cgi now uses POST to avoid having the cachemgr password
logged in the web server logs
- authentication schemes which are known to not be proxyable are now
filtered out from forwarded server replies to avoid that the clients
tries to use such schemes when we know for a fact it won't work
- spelling corrections in various error messages
- now possible to define acl values with spaces in them
by using the "include file" feature
- squid_ldap_group updated to 2.10 to fix compilation issues with
recent (and older) OpenLDAP libraries and to make the helper deal
correctly with true LDAP groups by first looking up the user DN.
- Some internal code cleanups
- now verifies that programs etc exists iside the chroot directory
when using chroot_dir. No longer neccesary to set up a split view
environment where the same paths works both inside the chroot and
outside just to convince Squid that the files is actually there..
- improved memory usage reporting
- --disable-hostname-checks configure option
- no longer ignores double dots in host names. Any hostname with
double dots is now rejected as invalid.
- log_mime_hdrs no longer logs garbage if very long headers
are seen.
- 'select_fds_hist' object added to cachemgr 'histogram' output
- pid file now unlinked when squid has really shut down, not
immediately when the shutdown request is received. This allows
the pid file to be monitored to determine when Squid has shut down
properly
- correct authentication scheme setups on some platforms or compilers
- several squid.conf.default documentation updates to remove references
to renamed or replaced directives by changing them to their current
names.
- the SSL reverse proxy support updated to allow building with
OpenSSL 0.9.7 and and later.
- Corrected a minor performance problem while processing HEAD replies
from various broken web servers not sending a correct HTTP reply
- time acls can now specify multiple times in the same acl name, like
most other acl types.
- winbind helpers updated to match Samba-2.2.7a and should
work with Samba-2.2.6 or later (required). For compability with
older Samba versions A new configure option --with-samba-sources=...
has been added to allow you to specify which Samba version the
helpers should be built for if different than the above versions.
- Squid MIB definition syntax correction to work better with newer
(and older) SNMP tools.
- Fixed access.log format when logging "error:invalid-HTTP-ident" on
requests where parsing the HTTP identifier (HTTP/1.0) failed.
- "make distclean" no longer removes the icons, this avoids the
dependency on "uudecode" to rebuild Squid after "make distclean"
- User name returned by external acl lookups (external_acl_type)
is now available as "ident" in later acl checks in addition to
the logging in access.log.
- Incorrect behaviour of Digest authentication partly corrected - it
will not handle sessions, but will always enforce password
correctness.. (patch submitted by Sean Burford).
- Issue with persistent connections and PUT/POST request corrected
Diffstat (limited to 'www/squid')
| -rw-r--r-- | www/squid/Makefile | 98 | ||||
| -rw-r--r-- | www/squid/PLIST | 5 | ||||
| -rw-r--r-- | www/squid/distinfo | 150 | ||||
| -rw-r--r-- | www/squid/patches/patch-aa | 21 | ||||
| -rw-r--r-- | www/squid/patches/patch-ag | 32 |
5 files changed, 56 insertions, 250 deletions
diff --git a/www/squid/Makefile b/www/squid/Makefile index a0de649ecfc..a98c8ca4d70 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.78 2003/03/02 16:22:43 taca Exp $ +# $NetBSD: Makefile,v 1.79 2003/03/25 17:44:22 taca Exp $ -DISTNAME= squid-2.5.STABLE1 -PKGNAME= squid-2.5.1 -PKGREVISION= 4 +DISTNAME= squid-2.5.STABLE2 +PKGNAME= squid-2.5.2 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,74 +9,8 @@ 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.STABLE1-external_acl_user.patch \ - squid-2.5.STABLE1-auth_digest.patch \ - squid-2.5.STABLE1-external_acl_auth_segfault.patch \ - squid-2.5.STABLE1-distclean_icons.patch \ - squid-2.5.STABLE1-error-http-ident.patch \ - squid-2.5.STABLE1-disable-ident-lookups.patch \ - squid-2.5.STABLE1-disable-http-violations.patch \ - squid-2.5.STABLE1-proxy_auth.patch \ - squid-2.5.STABLE1-max_user_ip.patch \ - squid-2.5.STABLE1-cache_dir_docs.patch \ - squid-2.5.STABLE1-load_icons.patch \ - squid-2.5.STABLE1-referer_log.patch \ - squid-2.5.STABLE1-ldap_auth.patch \ - squid-2.5.STABLE1-addlang.patch \ - squid-2.5.STABLE1-pthreads.patch \ - squid-2.5.STABLE1-strwordtok.patch \ - squid-2.5.STABLE1-wccp.patch \ - squid-2.5.STABLE1-memstat.patch \ - squid-2.5.STABLE1-aufs.patch \ - squid-2.5.STABLE1-acl_leak.patch \ - squid-2.5.STABLE1-ext_acl_comma.patch \ - squid-2.5.STABLE1-request_entity.patch \ - squid-2.5.STABLE1-ext_acl_exit.patch \ - squid-2.5.STABLE1-uninstall.patch \ - squid-2.5.STABLE1-cachemgr.patch \ - squid-2.5.STABLE1-auth-proxy.patch \ - squid-2.5.STABLE1-dnsserver.patch \ - squid-2.5.STABLE1-spaces.patch \ - squid-2.5.STABLE1-flags_open.patch \ - squid-2.5.STABLE1-ldap_group-compile.patch \ - squid-2.5.STABLE1-aufs_performance.patch \ - squid-2.5.STABLE1-RunCache.patch \ - squid-2.5.STABLE1-rebuild_assert.patch \ - squid-2.5.STABLE1-offline_mode.patch \ - squid-2.5.STABLE1-S.patch \ - squid-2.5.STABLE1-chroot.patch \ - squid-2.5.STABLE1-aufs_reentrant.patch \ - squid-2.5.STABLE1-relnote11.patch \ - squid-2.5.STABLE1-ldap_group.patch \ - squid-2.5.STABLE1-offline_toggle.patch \ - squid-2.5.STABLE1-failure_ratio.patch \ - squid-2.5.STABLE1-hostnames.patch \ - squid-2.5.STABLE1-sbrk.patch \ - squid-2.5.STABLE1-log_mime_hdrs.patch \ - squid-2.5.STABLE1-peer_select_alg.patch \ - squid-2.5.STABLE1-mempoolstat.patch \ - squid-2.5.STABLE1-copy_offset.patch \ - squid-2.5.STABLE1-select_fds_hist.patch \ - squid-2.5.STABLE1-select_stat.patch \ - squid-2.5.STABLE1-pidfile.patch \ - squid-2.5.STABLE1-http_reply_max_size.patch \ - squid-2.5.STABLE1-cachemgr_non_get.patch \ - squid-2.5.STABLE1-authsheme_realloc.patch \ - squid-2.5.STABLE1-ftp_abort.patch \ - squid-2.5.STABLE1-helper_stats.patch \ - squid-2.5.STABLE1-delay_pools_docs.patch \ - squid-2.5.STABLE1-auth_connection.patch \ - squid-2.5.STABLE1-authenticate_program_docs.patch \ - squid-2.5.STABLE1-with_aufs_threads_trap.patch \ - squid-2.5.STABLE1-shutdown_assert.patch \ - squid-2.5.STABLE1-cachemgr_passwd.patch \ - squid-2.5.STABLE1-etc_hosts_fdleak.patch \ - squid-2.5.STABLE1-openssl097.patch \ - squid-2.5.STABLE1-HEAD_bad_headers.patch \ - squid-2.5.STABLE1-time_acl_list.patch \ - squid-2.5.STABLE1-CONNECT_pipeline.patch \ - squid-2.5.STABLE1-winbind.patch \ - squid-2.5.STABLE1-mib.patch +PATCHFILES= squid-2.5.STABLE2-concurrent_external_acl.patch \ + squid-2.5.STABLE2-external_acl_crash.patch PATCH_DIST_STRIP= -p1 MAINTAINER= taca@netbsd.org @@ -85,7 +18,11 @@ HOMEPAGE= http://www.squid-cache.org/ COMMENT= Post-Harvest_cached WWW proxy cache and accelerator USE_PERL5= build -DIST_SUBDIR= squid-2.5.1 +DIST_SUBDIR= squid-2.5.2 +DOCDIR= ${PREFIX}/share/doc/squid +EXAMPLESDIR= ${PREFIX}/share/examples/squid + +DOCFILES= ChangeLog RELEASENOTES.html doc/debug-sections.txt # Configuration directory location which can be overwritten by the user. PKG_SYSCONFSUBDIR?= squid @@ -107,10 +44,8 @@ PLIST_SRC= ${WRKDIR}/PLIST WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//} RCD_SCRIPTS= squid -CONF_FILES+= ${PREFIX}/share/examples/squid/mime.conf \ - ${PKG_SYSCONFDIR}/mime.conf -CONF_FILES+= ${PREFIX}/share/examples/squid/squid.conf \ - ${PKG_SYSCONFDIR}/squid.conf +CONF_FILES+= ${EXAMPLESDIR}/mime.conf ${PKG_SYSCONFDIR}/mime.conf +CONF_FILES+= ${EXAMPLESDIR}/squid.conf ${PKG_SYSCONFDIR}/squid.conf # Configuration options which can be overwritten by the user. SQUID_CONFIGURE_ARGS?= --disable-internal-dns \ @@ -138,19 +73,24 @@ OPTIONAL_FILES+= libexec/squid_unix_group libexec/wb_auth libexec/wb_group OPTIONAL_FILES+= libexec/wb_ntlmauth man/man8/squid_unix_group.8 pre-install: - @${INSTALL_DATA_DIR} ${PREFIX}/share/examples/squid + @${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: @${CP} ${PKGDIR}/PLIST ${PLIST_SRC} + ${INSTALL_DATA_DIR} ${DOCDIR} + @cd ${WRKSRC}; \ + for i in ${DOCFILES}; do \ + ${INSTALL_DATA} $$i ${DOCDIR}; \ + done @( \ for FILE in ${OPTIONAL_FILES}; do \ ${TEST} ! -e ${PREFIX}/$$FILE || ${ECHO} $$FILE; \ done; \ cd ${WRKSRC}/errors; \ - for i in *; do \ + for i in *; do \ ${TEST} -d $$i && \ (${LS} $$i/ERR_* | \ ${SED} -e 's@^@share/squid/errors/@'; \ diff --git a/www/squid/PLIST b/www/squid/PLIST index 15ef940d13a..c0c78df52be 100644 --- a/www/squid/PLIST +++ b/www/squid/PLIST @@ -1,8 +1,11 @@ -@comment $NetBSD: PLIST,v 1.11 2002/12/09 16:01:51 tron Exp $ +@comment $NetBSD: PLIST,v 1.12 2003/03/25 17:44:22 taca Exp $ bin/squidclient etc/rc.d/squid libexec/cachemgr.cgi man/man8/squid.8 +share/doc/squid/ChangeLog +share/doc/squid/RELEASENOTES.html +share/doc/squid/debug-sections.txt share/examples/squid/mime.conf share/examples/squid/squid.conf sbin/RunAccel diff --git a/www/squid/distinfo b/www/squid/distinfo index 11b6560ade2..07d385f3c82 100644 --- a/www/squid/distinfo +++ b/www/squid/distinfo @@ -1,149 +1,17 @@ -$NetBSD: distinfo,v 1.26 2003/03/02 16:22:43 taca Exp $ +$NetBSD: distinfo,v 1.27 2003/03/25 17:44:22 taca Exp $ -SHA1 (squid-2.5.1/squid-2.5.STABLE1.tar.bz2) = 6705006527f5fa0753e7c9f14347f36b1b787e62 -Size (squid-2.5.1/squid-2.5.STABLE1.tar.bz2) = 1006600 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-external_acl_user.patch) = 9048000ac8a2e728f91968f0143a6b460999ca02 -Size (squid-2.5.1/squid-2.5.STABLE1-external_acl_user.patch) = 909 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-auth_digest.patch) = 097fc3425b15d766772aa014d2ff0a0e9bd95e4c -Size (squid-2.5.1/squid-2.5.STABLE1-auth_digest.patch) = 7305 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-external_acl_auth_segfault.patch) = 02b161e4ba3e3cbe47ceab6f8e9de64aeaa33b8e -Size (squid-2.5.1/squid-2.5.STABLE1-external_acl_auth_segfault.patch) = 2490 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-distclean_icons.patch) = c0b767c4e7ef406f20788674ac32b39f56ba4b2b -Size (squid-2.5.1/squid-2.5.STABLE1-distclean_icons.patch) = 1505 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-error-http-ident.patch) = 22b3c847f6c21aee01287f13fe815d4fd6671501 -Size (squid-2.5.1/squid-2.5.STABLE1-error-http-ident.patch) = 983 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-disable-ident-lookups.patch) = 8b21d1c40c85a86c575e039021b10010e0ab55a8 -Size (squid-2.5.1/squid-2.5.STABLE1-disable-ident-lookups.patch) = 695 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-disable-http-violations.patch) = 18bc6685a7ee054e75f5260f6db15064671df361 -Size (squid-2.5.1/squid-2.5.STABLE1-disable-http-violations.patch) = 1903 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-proxy_auth.patch) = acbe54df4e2f6f00ac17d20e8b65a33c8fb27c32 -Size (squid-2.5.1/squid-2.5.STABLE1-proxy_auth.patch) = 6507 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-max_user_ip.patch) = fcab373dc21c2b79e397a594469e18a308c13f41 -Size (squid-2.5.1/squid-2.5.STABLE1-max_user_ip.patch) = 12639 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-cache_dir_docs.patch) = 3795590991c447b1f4b3bc78db78722f4c1709df -Size (squid-2.5.1/squid-2.5.STABLE1-cache_dir_docs.patch) = 960 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-load_icons.patch) = 960858c6d8ada1d70c20d740148de42ddb3c93a0 -Size (squid-2.5.1/squid-2.5.STABLE1-load_icons.patch) = 1254 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-referer_log.patch) = f5fceab5c485068d023b6093490f26f42278096e -Size (squid-2.5.1/squid-2.5.STABLE1-referer_log.patch) = 1347 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-ldap_auth.patch) = 0fe9f652d5cb72821b70151a819454ddb5f553ec -Size (squid-2.5.1/squid-2.5.STABLE1-ldap_auth.patch) = 1203 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-addlang.patch) = aafb5c5535a2e48a83831cd42265c6a5354942cc -Size (squid-2.5.1/squid-2.5.STABLE1-addlang.patch) = 1483 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-pthreads.patch) = ba0839b2595e005ffa5fe2d7f8de685097703adf -Size (squid-2.5.1/squid-2.5.STABLE1-pthreads.patch) = 4047 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-strwordtok.patch) = 916e63f5db23971466e1d15038f09d47112f0f81 -Size (squid-2.5.1/squid-2.5.STABLE1-strwordtok.patch) = 2005 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-wccp.patch) = 38ccbbab09a03228f3617f16db1a916e23439eeb -Size (squid-2.5.1/squid-2.5.STABLE1-wccp.patch) = 2143 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-memstat.patch) = 4c67ece7a7cc1e6ab46b2a6e586287adc3a5d426 -Size (squid-2.5.1/squid-2.5.STABLE1-memstat.patch) = 571 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-aufs.patch) = 82e216a036ae3660cf0085c20b15feab881e13cf -Size (squid-2.5.1/squid-2.5.STABLE1-aufs.patch) = 17855 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-acl_leak.patch) = a217d6a2c00637165a4b61f8ebc411bd69ea8539 -Size (squid-2.5.1/squid-2.5.STABLE1-acl_leak.patch) = 1722 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-ext_acl_comma.patch) = 3a6a739f52a67e4256df20756ce123108fcb1ca0 -Size (squid-2.5.1/squid-2.5.STABLE1-ext_acl_comma.patch) = 600 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-request_entity.patch) = 68f756428f8477b5779c424965d6bd66c154577a -Size (squid-2.5.1/squid-2.5.STABLE1-request_entity.patch) = 1999 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-ext_acl_exit.patch) = 3de37ee805f22d47e1296edb64a4c8c50d58fda4 -Size (squid-2.5.1/squid-2.5.STABLE1-ext_acl_exit.patch) = 1858 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-uninstall.patch) = b103cc343e77e3029c7a995a4fe8077efbd0f66f -Size (squid-2.5.1/squid-2.5.STABLE1-uninstall.patch) = 2395 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-cachemgr.patch) = 364542493e269db5c9101557d4e095caa3ca25aa -Size (squid-2.5.1/squid-2.5.STABLE1-cachemgr.patch) = 1182 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-auth-proxy.patch) = cbb1d1300027ccaef73356a3ee7d849b1e386d27 -Size (squid-2.5.1/squid-2.5.STABLE1-auth-proxy.patch) = 1225 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-dnsserver.patch) = 3f58bac1233b90e7504e65e1cb3e55fa8aba5273 -Size (squid-2.5.1/squid-2.5.STABLE1-dnsserver.patch) = 795 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-spaces.patch) = 1c40dfa614096685ed1d39af16878869f4ad3d3c -Size (squid-2.5.1/squid-2.5.STABLE1-spaces.patch) = 1014 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-flags_open.patch) = 771642e607e276f0429c4900b4211440744d2ef8 -Size (squid-2.5.1/squid-2.5.STABLE1-flags_open.patch) = 634 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-ldap_group-compile.patch) = 54012cc0e78765c3e8755b8f4083f5afba933df5 -Size (squid-2.5.1/squid-2.5.STABLE1-ldap_group-compile.patch) = 1570 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-aufs_performance.patch) = 5360cc0ff6fa5966a8f48daf64366c00e6d52a56 -Size (squid-2.5.1/squid-2.5.STABLE1-aufs_performance.patch) = 3383 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-RunCache.patch) = b1ce9d936bc19432ba36a3bd740e3e2ee978fea8 -Size (squid-2.5.1/squid-2.5.STABLE1-RunCache.patch) = 1068 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-rebuild_assert.patch) = a146de9315c3339e723c56d7cda645eda8781eb7 -Size (squid-2.5.1/squid-2.5.STABLE1-rebuild_assert.patch) = 3572 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-offline_mode.patch) = bd3b8bd9cc1a45c00eda14d9fdf448442c40b2a5 -Size (squid-2.5.1/squid-2.5.STABLE1-offline_mode.patch) = 917 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-S.patch) = fb4fa8b88503388695dbec73a56ee73b71d05848 -Size (squid-2.5.1/squid-2.5.STABLE1-S.patch) = 635 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-chroot.patch) = eae51317095148bc1b2b40c52e519d2d3013d901 -Size (squid-2.5.1/squid-2.5.STABLE1-chroot.patch) = 826 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-aufs_reentrant.patch) = 0db98c47e5ca3a06c6541e089477a557b36457b5 -Size (squid-2.5.1/squid-2.5.STABLE1-aufs_reentrant.patch) = 448 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-relnote11.patch) = a94d3a598c7ea6438c88697a2a500c51675afe31 -Size (squid-2.5.1/squid-2.5.STABLE1-relnote11.patch) = 762 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-ldap_group.patch) = ff8096fa1212975bf9a88b10f59ae88939685654 -Size (squid-2.5.1/squid-2.5.STABLE1-ldap_group.patch) = 25837 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-offline_toggle.patch) = 388629a5dfeba6993809520a14b47690abf07bd0 -Size (squid-2.5.1/squid-2.5.STABLE1-offline_toggle.patch) = 368 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-failure_ratio.patch) = 606c3639c75a0c37edaa7a9a035c8b9f2b06928f -Size (squid-2.5.1/squid-2.5.STABLE1-failure_ratio.patch) = 900 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-hostnames.patch) = 8edfe53a98d6c0c09c9509d2f990d2f90731843b -Size (squid-2.5.1/squid-2.5.STABLE1-hostnames.patch) = 5557 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-sbrk.patch) = fc3677369f8648cb0b2fa232083a80ad118a4215 -Size (squid-2.5.1/squid-2.5.STABLE1-sbrk.patch) = 3496 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-log_mime_hdrs.patch) = dd80ea4505777c0cbd236a43d2214e85429fe5cf -Size (squid-2.5.1/squid-2.5.STABLE1-log_mime_hdrs.patch) = 503 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-peer_select_alg.patch) = 5a0356d6ad358490d68769721e51de80a1ea36ab -Size (squid-2.5.1/squid-2.5.STABLE1-peer_select_alg.patch) = 2457 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-mempoolstat.patch) = 488d00decd37a79e0bfff5fed8df4afd4a0f789a -Size (squid-2.5.1/squid-2.5.STABLE1-mempoolstat.patch) = 1070 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-copy_offset.patch) = 05a34799ce176af6eac7dd26ed727456b5281ecd -Size (squid-2.5.1/squid-2.5.STABLE1-copy_offset.patch) = 476 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-select_fds_hist.patch) = cb0ae5f9d44813e5431249ebbe6dcaa848a80563 -Size (squid-2.5.1/squid-2.5.STABLE1-select_fds_hist.patch) = 555 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-select_stat.patch) = 74a5691ef30017cb44b820de9a608f1c3fd5b32b -Size (squid-2.5.1/squid-2.5.STABLE1-select_stat.patch) = 682 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-pidfile.patch) = d18de709dde42248515547f13a932af7c7fcf028 -Size (squid-2.5.1/squid-2.5.STABLE1-pidfile.patch) = 903 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-http_reply_max_size.patch) = f35f419b4468259e2bb50aa37d7963456813cff7 -Size (squid-2.5.1/squid-2.5.STABLE1-http_reply_max_size.patch) = 1114 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-cachemgr_non_get.patch) = a6c03334ec67846a0e5287c1b0109583db47e594 -Size (squid-2.5.1/squid-2.5.STABLE1-cachemgr_non_get.patch) = 608 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-authsheme_realloc.patch) = cd99d9aba788c2f4871c1f0bc7913e7400424b9b -Size (squid-2.5.1/squid-2.5.STABLE1-authsheme_realloc.patch) = 667 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-ftp_abort.patch) = 2c216c3e11474d3efe3b37cbbf12b90f249b5f5a -Size (squid-2.5.1/squid-2.5.STABLE1-ftp_abort.patch) = 1702 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-helper_stats.patch) = 684c47169cb6caa7c5d7570d5b0677ed309c631a -Size (squid-2.5.1/squid-2.5.STABLE1-helper_stats.patch) = 3325 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-delay_pools_docs.patch) = c04eb28f29c616c5192679070632207897631129 -Size (squid-2.5.1/squid-2.5.STABLE1-delay_pools_docs.patch) = 753 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-auth_connection.patch) = 40208be6825efafcb04389e0f3fe62f3af5aa6ac -Size (squid-2.5.1/squid-2.5.STABLE1-auth_connection.patch) = 8297 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-authenticate_program_docs.patch) = adf7bd0643859181eec2bc403052787ad91b77a4 -Size (squid-2.5.1/squid-2.5.STABLE1-authenticate_program_docs.patch) = 1672 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-with_aufs_threads_trap.patch) = 4f9e3026d56628a62c8c3a3e4e7e23898432c7e2 -Size (squid-2.5.1/squid-2.5.STABLE1-with_aufs_threads_trap.patch) = 1893 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-shutdown_assert.patch) = 347154d7f3815eb3a75926aa824778a4db1999cc -Size (squid-2.5.1/squid-2.5.STABLE1-shutdown_assert.patch) = 1107 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-cachemgr_passwd.patch) = 8bd9a7899babdb33b4391b8d686d12a18abc46ec -Size (squid-2.5.1/squid-2.5.STABLE1-cachemgr_passwd.patch) = 1271 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-etc_hosts_fdleak.patch) = a6c766cdaacb5f84a381864e2f8d1f94534d4494 -Size (squid-2.5.1/squid-2.5.STABLE1-etc_hosts_fdleak.patch) = 327 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-openssl097.patch) = 0842b16b3cc7dbbdf862068a6a7b513ffb4d878d -Size (squid-2.5.1/squid-2.5.STABLE1-openssl097.patch) = 4248 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-HEAD_bad_headers.patch) = d167a534244150f4d0750f394f93cbe37a5a5219 -Size (squid-2.5.1/squid-2.5.STABLE1-HEAD_bad_headers.patch) = 577 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-time_acl_list.patch) = 03da4d3195968f00305a55e5261ab6df1bdac7f0 -Size (squid-2.5.1/squid-2.5.STABLE1-time_acl_list.patch) = 855 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-CONNECT_pipeline.patch) = 8d1472cb82a12e44a22ab3baae72a901951dda37 -Size (squid-2.5.1/squid-2.5.STABLE1-CONNECT_pipeline.patch) = 1873 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-winbind.patch) = 949990209a4db546e3b0be698c68202a5e923a39 -Size (squid-2.5.1/squid-2.5.STABLE1-winbind.patch) = 70619 bytes -SHA1 (squid-2.5.1/squid-2.5.STABLE1-mib.patch) = c90f279228902b9286bdd2b289014d356be98308 -Size (squid-2.5.1/squid-2.5.STABLE1-mib.patch) = 611 bytes -SHA1 (patch-aa) = e29686a5c75635129b7e2eaf451140f10f29e081 +SHA1 (squid-2.5.2/squid-2.5.STABLE2.tar.bz2) = e319b3cfdf5d92df9ef39da048fc4235d9cc5154 +Size (squid-2.5.2/squid-2.5.STABLE2.tar.bz2) = 1020696 bytes +SHA1 (squid-2.5.2/squid-2.5.STABLE2-concurrent_external_acl.patch) = 8f6cacd9bfeda386006a417383d9f8f5049fd8da +Size (squid-2.5.2/squid-2.5.STABLE2-concurrent_external_acl.patch) = 730 bytes +SHA1 (squid-2.5.2/squid-2.5.STABLE2-external_acl_crash.patch) = 79d2cd10f832513a547b3d77bf09c2c359a6831c +Size (squid-2.5.2/squid-2.5.STABLE2-external_acl_crash.patch) = 1356 bytes +SHA1 (patch-aa) = 2e0d96f6ccb9d0c42db2da49e76846edad09624f SHA1 (patch-ab) = 1224ba4cee98a26d2c9d670eb6d57c6187ff2d56 SHA1 (patch-ac) = 1b283f0a573c02c82ce26f75e67d19b1ec5ff9f0 SHA1 (patch-ad) = 23a906011ffef78d070cc49c94c4f4837eb319ec SHA1 (patch-ae) = 5031183c7512573c8c8602d0b0541999f43343f2 -SHA1 (patch-ag) = 7a0aa328d18374a4a954f66ac1431779a303f395 +SHA1 (patch-ag) = b01a2b0309f3e0711c1c4e75580766e506915f10 SHA1 (patch-aj) = aa2271e53602fe168604aeced6ed66d28fe47707 SHA1 (patch-ak) = 19861281d8a9ece352ce9e881e1e60f6787933e3 SHA1 (patch-al) = 534f273ec63f6de0818f1f86a2b655eac4564213 diff --git a/www/squid/patches/patch-aa b/www/squid/patches/patch-aa index 0f0e995b047..eadf5251994 100644 --- a/www/squid/patches/patch-aa +++ b/www/squid/patches/patch-aa @@ -1,17 +1,17 @@ -$NetBSD: patch-aa,v 1.11 2002/10/25 02:13:37 taca Exp $ +$NetBSD: patch-aa,v 1.12 2003/03/25 17:44:23 taca Exp $ ---- src/Makefile.in.orig Sat Jul 13 00:10:04 2002 +--- src/Makefile.in.orig 2003-02-12 11:03:14.000000000 +0900 +++ src/Makefile.in -@@ -380,14 +380,15 @@ DEFAULT_LOG_PREFIX = $(localstatedir)/lo +@@ -378,14 +378,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_SWAP_DIR = $(localstatedir)/cache - DEFAULT_PINGER = $(libexecdir)/@OPT_PINGER_EXE@ - DEFAULT_UNLINKD = $(libexecdir)/$(UNLINKD_EXE) - DEFAULT_DISKD = $(libexecdir)/@OPT_DISKD_EXE@ + DEFAULT_PINGER = $(libexecdir)/pinger$(EXEEXT) + DEFAULT_UNLINKD = $(libexecdir)/unlinkd$(EXEEXT) + DEFAULT_DISKD = $(libexecdir)/diskd$(EXEEXT) -DEFAULT_ICON_DIR = $(datadir)/icons -DEFAULT_ERROR_DIR = $(datadir)/errors/@ERR_DEFAULT_LANGUAGE@ -DEFAULT_MIB_PATH = $(datadir)/mib.txt @@ -22,7 +22,7 @@ $NetBSD: patch-aa,v 1.11 2002/10/25 02:13:37 taca Exp $ DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\" -@@ -819,20 +820,20 @@ CCDEPMODE = @CCDEPMODE@ +@@ -836,20 +837,20 @@ CCDEPMODE = @CCDEPMODE@ uninstall-info-am: install-dataDATA: $(data_DATA) @$(NORMAL_INSTALL) @@ -48,7 +48,7 @@ $NetBSD: patch-aa,v 1.11 2002/10/25 02:13:37 taca Exp $ done install-sysconfDATA: $(sysconf_DATA) @$(NORMAL_INSTALL) -@@ -1031,7 +1032,7 @@ info-am: +@@ -1048,7 +1049,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.11 2002/10/25 02:13:37 taca Exp $ install-info: install-info-recursive -@@ -1049,7 +1050,7 @@ mostlyclean-am: mostlyclean-compile most +@@ -1066,7 +1067,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.11 2002/10/25 02:13:37 taca Exp $ uninstall-info: uninstall-info-recursive -@@ -1132,19 +1133,13 @@ repl_modules.c: repl_modules.sh Makefile +@@ -1149,19 +1150,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 @@ -89,7 +89,6 @@ $NetBSD: patch-aa,v 1.11 2002/10/25 02:13:37 taca Exp $ + $(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 -+ $(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX) uninstall-local: diff --git a/www/squid/patches/patch-ag b/www/squid/patches/patch-ag index d4546764217..34a08405815 100644 --- a/www/squid/patches/patch-ag +++ b/www/squid/patches/patch-ag @@ -1,8 +1,8 @@ -$NetBSD: patch-ag,v 1.12 2002/10/13 16:43:21 taca Exp $ +$NetBSD: patch-ag,v 1.13 2003/03/25 17:44:24 taca Exp $ ---- configure.orig Wed Sep 25 05:00:03 2002 +--- configure.orig 2003-03-18 04:00:14.000000000 +0900 +++ configure -@@ -2150,7 +2150,7 @@ if test "${enable_snmp+set}" = set; then +@@ -2180,7 +2180,7 @@ if test "${enable_snmp+set}" = set; then #define SQUID_SNMP 1 EOF @@ -11,7 +11,7 @@ $NetBSD: patch-ag,v 1.12 2002/10/13 16:43:21 taca Exp $ if true; then -@@ -3710,6 +3710,7 @@ for ac_hdr in \ +@@ -3771,6 +3771,7 @@ for ac_hdr in \ libc.h \ limits.h \ linux/netfilter_ipv4.h \ @@ -19,7 +19,7 @@ $NetBSD: patch-ag,v 1.12 2002/10/13 16:43:21 taca Exp $ malloc.h \ math.h \ memory.h \ -@@ -3760,6 +3761,7 @@ for ac_hdr in \ +@@ -3821,6 +3822,7 @@ for ac_hdr in \ syslog.h \ time.h \ unistd.h \ @@ -27,7 +27,7 @@ $NetBSD: patch-ag,v 1.12 2002/10/13 16:43:21 taca Exp $ utime.h \ varargs.h \ byteswap.h \ -@@ -5955,44 +5957,42 @@ fi +@@ -6016,44 +6018,39 @@ fi echo "$ac_t""$ac_cv_type_mode_t" 1>&6 if test $ac_cv_type_mode_t = no; then cat >> confdefs.h <<\EOF @@ -38,18 +38,15 @@ $NetBSD: patch-ag,v 1.12 2002/10/13 16:43:21 taca Exp $ fi -echo $ac_n "checking for fd_mask""... $ac_c" 1>&6 --echo "configure:5965: checking for fd_mask" >&5 +-echo "configure:6026: 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:5968: checking for fd_set" >&5 ++echo "configure:6026: checking for fd_set" >&5 +if eval "test \"`echo '$''{'ac_cv_have_fd_mask'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -+ cat > conftest.$ac_ext <<EOF --#line 5970 "configure" -+#line 5974 "configure" + #line 6031 "configure" #include "confdefs.h" #include <sys/types.h> -#if STDC_HEADERS @@ -67,13 +64,12 @@ $NetBSD: patch-ag,v 1.12 2002/10/13 16:43:21 taca Exp $ +if { (eval echo configure:5983: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - ac_cv_type_fd_mask=yes -+ ac_cv_have_fd_mask="yes" ++ ac_cv_have_fd_mask=yes else + echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 rm -rf conftest* - ac_cv_type_fd_mask=no -+ ac_cv_have_fd_mask="no" ++ ac_cv_have_fd_mask=no fi rm -f conftest* @@ -89,8 +85,8 @@ $NetBSD: patch-ag,v 1.12 2002/10/13 16:43:21 taca Exp $ +echo "$ac_t""$ac_cv_have_fd_mask" 1>&6 echo $ac_n "checking size of off_t""... $ac_c" 1>&6 - echo "configure:5999: checking size of off_t" >&5 -@@ -7246,8 +7246,8 @@ if test "$GCC" = "yes"; then + echo "configure:6060: checking size of off_t" >&5 +@@ -7324,8 +7321,8 @@ if test "$GCC" = "yes"; then GCCVER=`$CC -v 2>&1 | awk '$2 == "version" {print $3}'` case "$GCCVER" in 2.95.[123]) @@ -101,7 +97,7 @@ $NetBSD: patch-ag,v 1.12 2002/10/13 16:43:21 taca Exp $ ;; esac fi -@@ -7338,6 +7338,7 @@ for ac_func in \ +@@ -7417,6 +7414,7 @@ for ac_func in \ setrlimit \ getrlimit \ setsid \ |