From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jan 24 19:30:27 2005
Return-Path: The squid patches page notes: This patch makes Squid considerably stricter while parsing the
HTTP protocol. To enable these strict parsing rules, update to at least
squid-2.5.7_9 and specify
relaxed_header_parser off
in squid.conf.
++While trying to process the request: ++
++%R ++++
++The following error was encountered: ++
++The HTTP Response message received from the contacted server ++could not be understood or was otherwise malformed. Please contact ++the site operator. Your cache administrator may be able to provide ++you with more details about the exact nature of the problem if needed. ++ ++
Your cache administrator is %w. +diff -ruP errors.orig/Lithuanian/ERR_INVALID_RESP errors/Lithuanian/ERR_INVALID_RESP +--- errors.orig/Lithuanian/ERR_INVALID_RESP Thu Jan 1 01:00:00 1970 ++++ errors/Lithuanian/ERR_INVALID_RESP Mon Jan 24 19:19:43 2005 +@@ -0,0 +1,29 @@ ++ ++
++++While trying to process the request: ++
++%R ++++
++The following error was encountered: ++
++The HTTP Response message received from the contacted server ++could not be understood or was otherwise malformed. Please contact ++the site operator. Your cache administrator may be able to provide ++you with more details about the exact nature of the problem if needed. ++ ++
Your cache administrator is %w. +diff -ruP errors.orig/Polish/ERR_INVALID_RESP errors/Polish/ERR_INVALID_RESP +--- errors.orig/Polish/ERR_INVALID_RESP Thu Jan 1 01:00:00 1970 ++++ errors/Polish/ERR_INVALID_RESP Mon Jan 24 19:19:43 2005 +@@ -0,0 +1,29 @@ ++ ++
++++While trying to process the request: ++
++%R ++++
++The following error was encountered: ++
++The HTTP Response message received from the contacted server ++could not be understood or was otherwise malformed. Please contact ++the site operator. Your cache administrator may be able to provide ++you with more details about the exact nature of the problem if needed. ++ ++
Your cache administrator is %w. +diff -ruP errors.orig/Portuguese/ERR_INVALID_RESP errors/Portuguese/ERR_INVALID_RESP +--- errors.orig/Portuguese/ERR_INVALID_RESP Thu Jan 1 01:00:00 1970 ++++ errors/Portuguese/ERR_INVALID_RESP Mon Jan 24 19:19:43 2005 +@@ -0,0 +1,29 @@ ++ ++
++++While trying to process the request: ++
++%R ++++
++The following error was encountered: ++
++The HTTP Response message received from the contacted server ++could not be understood or was otherwise malformed. Please contact ++the site operator. Your cache administrator may be able to provide ++you with more details about the exact nature of the problem if needed. ++ ++
Your cache administrator is %w. +diff -ruP errors.orig/Romanian/ERR_INVALID_RESP errors/Romanian/ERR_INVALID_RESP +--- errors.orig/Romanian/ERR_INVALID_RESP Thu Jan 1 01:00:00 1970 ++++ errors/Romanian/ERR_INVALID_RESP Mon Jan 24 19:19:43 2005 +@@ -0,0 +1,29 @@ ++ ++
++++While trying to process the request: ++
++%R ++++
++The following error was encountered: ++
++The HTTP Response message received from the contacted server ++could not be understood or was otherwise malformed. Please contact ++the site operator. Your cache administrator may be able to provide ++you with more details about the exact nature of the problem if needed. ++ ++
Your cache administrator is %w. Index: Makefile =================================================================== --- Makefile (.../www/squid) (revision 360) +++ Makefile (.../local/squid) (revision 360) @@ -74,7 +74,7 @@ PORTNAME= squid PORTVERSION= 2.5.7 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= www MASTER_SITES= \ ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ @@ -93,6 +93,7 @@ squid-2.5.STABLE7-helper_shutdown.patch \ squid-2.5.STABLE7-blank_response.patch \ squid-2.5.STABLE7-dothost.patch \ + squid-2.5.STABLE7-PURGE_internal.patch \ squid-2.5.STABLE7-httpd_accel_vport.patch \ squid-2.5.STABLE7-cachemgr_vmobjects.patch \ squid-2.5.STABLE7-empty_acls.patch \ @@ -103,6 +104,8 @@ squid-2.5.STABLE7-dns_memleak.patch \ squid-2.5.STABLE7-fqdn_truncated.patch \ squid-2.5.STABLE7-ldap_spaces.patch \ + squid-2.5.STABLE7-header_parsing.patch \ + squid-2.5.STABLE7-httpd_accel_no_pmtu_disc.patch \ squid-2.5.STABLE7-ftp_datachannel.patch \ squid-2.5.STABLE7-short_icons_urls.patch \ squid-2.5.STABLE7-response_splitting.patch @@ -150,9 +153,8 @@ SQUID_STACKTRACES "Create backtraces on fatal errors" off \ SQUID_RCNG "Install an rcNG startup script" on -PLIST_FILES= etc/rc.d/squid.sh etc/squid/mib.txt etc/squid/mime.conf.default \ - etc/squid/msntauth.conf.default etc/squid/squid.conf.default \ - sbin/RunAccel sbin/RunCache sbin/squidclient sbin/squid +etc_files= rc.d/squid.sh squid/mib.txt squid/mime.conf.default \ + squid/msntauth.conf.default squid/squid.conf.default icon_files= anthony-binhex.gif anthony-bomb.gif anthony-box.gif \ anthony-box2.gif anthony-c.gif anthony-compressed.gif \ @@ -169,18 +171,23 @@ ERR_CONNECT_FAIL ERR_DNS_FAIL ERR_FORWARDING_DENIED \ ERR_FTP_DISABLED ERR_FTP_FAILURE ERR_FTP_FORBIDDEN \ ERR_FTP_NOT_FOUND ERR_FTP_PUT_CREATED \ - ERR_FTP_PUT_ERROR ERR_FTP_PUT_MODIFIED \ - ERR_FTP_UNAVAILABLE ERR_INVALID_REQ ERR_INVALID_URL \ + ERR_FTP_PUT_ERROR ERR_FTP_PUT_MODIFIED ERR_FTP_UNAVAILABLE \ + ERR_INVALID_REQ ERR_INVALID_RESP ERR_INVALID_URL \ ERR_LIFETIME_EXP ERR_NO_RELAY ERR_ONLY_IF_CACHED_MISS \ ERR_READ_ERROR ERR_READ_TIMEOUT ERR_SHUTTING_DOWN \ ERR_SOCKET_FAILURE ERR_TOO_BIG ERR_UNSUP_REQ \ ERR_URN_RESOLVE ERR_WRITE_ERROR ERR_ZERO_SIZE_OBJECT -libexec= cachemgr.cgi digest_pw_auth diskd dnsserver ip_user_check \ - squid_ldap_auth squid_ldap_group msnt_auth ncsa_auth ntlm_auth \ - pam_auth pinger smb_auth smb_auth.sh squid_unix_group \ - unlinkd wb_auth wb_group wb_ntlmauth wbinfo_group.pl +libexec= cachemgr.cgi digest_pw_auth diskd ip_user_check \ + msnt_auth ncsa_auth ntlm_auth \ + pam_auth smb_auth smb_auth.sh squid_unix_group \ + wb_auth wb_group wb_ntlmauth wbinfo_group.pl +.if !defined(SQUID_CONFIGURE_ARGS) || ${SQUID_CONFIGURE_ARGS:M*--disable-unlinkd*} == "" +libexec+= unlinkd +.endif +sbin= RunAccel RunCache squidclient squid + CONFIGURE_ARGS= --bindir=${PREFIX}/sbin --sysconfdir=${PREFIX}/etc/squid \ --datadir=${PREFIX}/etc/squid \ --libexecdir=${PREFIX}/libexec/squid \ @@ -201,6 +208,7 @@ MAN8+= squid_ldap_auth.8 squid_ldap_group.8 basic_auth+= LDAP external_acl+= ldap_group +libexec+= squid_ldap_auth squid_ldap_group .endif .if !defined(NO_NIS) basic_auth+= YP @@ -251,9 +259,11 @@ .endif .if defined(WITH_SQUID_PINGER) CONFIGURE_ARGS+= --enable-icmp +libexec+= pinger .endif .if defined(WITH_SQUID_DNS_HELPER) CONFIGURE_ARGS+= --disable-internal-dns +libexec+= dnsserver .endif .if defined(WITH_SQUID_HTCP) CONFIGURE_ARGS+= --enable-htcp @@ -332,6 +342,16 @@ CONFIGURE_ENV+= CFLAGS="${CFLAGS}" \ LDFLAGS="${LDFLAGS}" +PLIST_DIRS= etc/squid/icons libexec/squid +PLIST_FILES= ${etc_files:S,^,etc/,} ${icon_files:S,^,etc/squid/icons/,} \ + ${libexec:S,^,libexec/squid/,} ${sbin:S,^,sbin/,} + +.for d in ${SQUID_LANGUAGES} +PLIST_DIRS+= etc/squid/errors/${d} +PLIST_FILES+= ${error_files:S,^,etc/squid/errors/${d}/,} +.endfor +PLIST_DIRS+= etc/squid/errors etc/squid squid/logs squid/cache squid + pre-patch: # Check whether we need to create the extra patch that makes pf(4) # visible to squid's configure script: @@ -375,27 +395,6 @@ .endif @${SETENV} PKG_PREFIX=${PREFIX} \ ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -# Create package list: - @for f in ${libexec}; do \ - ${TEST} -f ${PREFIX}/libexec/squid/$${f} && \ - ${ECHO_CMD} "libexec/squid/$${f}" >>${TMPPLIST} || ${TRUE} ; \ - done - @${ECHO_CMD} "@unexec rmdir %D/libexec/squid 2>/dev/null || true" \ - >>${TMPPLIST} - @for f in ${icon_files}; do \ - ${ECHO_CMD} "etc/squid/icons/$${f}" >>${TMPPLIST}; \ - done - @${ECHO_CMD} "@unexec rmdir %D/etc/squid/icons 2>/dev/null || true" \ - >>${TMPPLIST} - @for d in ${SQUID_LANGUAGES}; do \ - for f in ${error_files}; do \ - ${ECHO_CMD} "etc/squid/errors/$${d}/$${f}" >>${TMPPLIST} ; \ - done; \ - ${ECHO_CMD} "@unexec rmdir %D/etc/squid/errors/$${d} 2>/dev/null || true" \ - >>${TMPPLIST}; \ - done - @${ECHO_CMD} "@unexec rmdir %D/etc/squid/errors 2>/dev/null || true" \ - >>${TMPPLIST} changeuser: # Recover from the problem that earlier versions of this port created the Index: pkg-deinstall =================================================================== --- pkg-deinstall (.../www/squid) (revision 360) +++ pkg-deinstall (.../local/squid) (revision 360) @@ -13,20 +13,20 @@ done ;; POST-DEINSTALL) - rmdir ${PKG_PREFIX}/etc/squid 2>/dev/null - rmdir ${PKG_PREFIX}/squid/cache 2>/dev/null - rmdir ${PKG_PREFIX}/squid/logs 2>/dev/null - rmdir ${PKG_PREFIX}/squid 2>/dev/null echo "===> post-deinstallation information for $1" echo "" - echo " Please note that $1 was not completely removed" - echo " from this system." + echo " Please note that squid was not completely removed" + echo " from this system:" echo "" - echo " The cache and log directories, squid's user account," - echo " and any modified configuration files have been preserved" - echo " in case you want to install an updated version of squid" - echo " on this system. You must remove them manually if you do" - echo " not want to use squid any longer." + echo " Any squid related user accounts were kept." + if [ -d ${PKG_PREFIX}/squid -o -d ${PKG_PREFIX}/etc/squid ] ; then + echo "" + echo " Additionally, cache and log directories as well as" + echo " configuration files modified by you were preserved" + echo " too, in case you want to install an updated version" + echo " of squid. You need to remove them manually if you do" + echo " not want to use it any longer." + fi echo "" ;; *) >Release-Note: >Audit-Trail: >Unformatted: