ports/127627: [Maintainer] www/squid30: update to 3.0.STABLE9
Thomas-Martin Seck
tmseck at web.de
Thu Sep 25 09:00:08 UTC 2008
>Number: 127627
>Category: ports
>Synopsis: [Maintainer] www/squid30: update to 3.0.STABLE9
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Sep 25 09:00:07 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Thomas-Martin Seck
>Release: FreeBSD 7.0-STABLE i386
>Organization:
a private site in Germany
>Environment:
FreeBSD ports collection as of September 25, 2008.
>Description:
- Update to 3.0.STABLE9
- Make WITH_SQUID_COSS a no-op for now (see UPDATING)
- Use "templates" as the default language directory
Proposed UPDATING entry:
20080925:
AFFECTS: users of www/squid30
AUTHOR: tmseck at netcologne.de
The Squid developers decided to disable COSS support in 3.0, cf
the discussion starting with
<http://www.squid-cache.org/mail-archive/squid-dev/200809/0067.html>.
The correspoding port configuration option WITH_SQUID_COSS
is still available but is a no-op for now. If you currently use
COSS storage on Squid 3.0 you need to disable it in squid.conf.
>How-To-Repeat:
>Fix:
Apply this patch:
Index: Makefile
===================================================================
--- Makefile (.../www/squid30) (revision 1461)
+++ Makefile (.../local/squid30) (revision 1461)
@@ -16,7 +16,7 @@
#
# SQUID_LANGUAGES
# A list of languages for which error page files should be installed
-# (default: all)
+# (default: all available)
#
# E.g. use `make SQUID_LANGUAGES="English French"' if you want to
# install the files for these languages only.
@@ -25,7 +25,7 @@
#
# SQUID_DEFAULT_LANG
# If you define SQUID_LANGUAGES, select which language should be the default
-# one (this variable defaults to English). This setting can be overwritten
+# one (this variable defaults to "templates"). This setting can be overwritten
# with squid.conf's error_directory directive.
#
# SQUID_CONFIGURE_ARGS
@@ -102,7 +102,7 @@
LATEST_LINK= squid30
-SQUID_STABLE_VER= 8
+SQUID_STABLE_VER= 9
CONFLICTS= squid-2.[0-9].* cacheboy-[0-9]*
GNU_CONFIGURE= yes
@@ -147,7 +147,7 @@
SQUID_ICAP "Enable ICAP client functionality" off \
SQUID_ESI "Enable ESI support (experimental)" off \
SQUID_AUFS "Enable the aufs storage scheme" off \
- SQUID_COSS "Enable the COSS storage scheme" off \
+ SQUID_COSS "Enable COSS (currently not available)" off \
SQUID_KQUEUE "Use kqueue(2) (experimental)" on \
SQUID_LARGEFILE "Support log and cache files >2GB" off \
SQUID_STACKTRACES "Create backtraces on fatal errors" off \
@@ -253,7 +253,9 @@
CFLAGS+= ${PTHREAD_CFLAGS}
.endif
.if defined(WITH_SQUID_COSS)
-storage_schemes+= coss
+# Starting with 3.0.STABLE9, COSS is disabled in Squid-3 until fixes
+# from the 2.x series are backported to 3.x.
+# storage_schemes+= coss
.endif
CONFIGURE_ARGS+= --enable-storeio="${storage_schemes}"
@@ -382,7 +384,7 @@
Serbian Simplify_Chinese Slovak Spanish Swedish \
Traditional_Chinese Turkish Ukrainian-1251 \
Ukrainian-koi8-u Ukrainian-utf8
-SQUID_DEFAULT_LANG?= English
+SQUID_DEFAULT_LANG?= templates
CONFIGURE_ARGS+= --enable-err-languages="${SQUID_LANGUAGES}" \
--enable-default-err-language=${SQUID_DEFAULT_LANG}
@@ -397,7 +399,7 @@
PLIST_FILES= ${etc_files:S,^,etc/,} ${icon_files:S,^,etc/squid/icons/,} \
${libexec:S,^,libexec/squid/,} ${sbin:S,^,sbin/,}
-.for d in ${SQUID_LANGUAGES}
+.for d in ${SQUID_LANGUAGES} templates
PLIST_DIRS+= etc/squid/errors/${d}
PLIST_FILES+= ${error_files:S,^,etc/squid/errors/${d}/,}
.endfor
@@ -415,10 +417,10 @@
@${FIND} ${WRKSRC} -name '*.bak' -delete
@${FIND} ${WRKSRC} -name '*.orig' -delete
# XXX:
-# Remove error pages that were prematurely integrated into 3.0.STABLE2.
+# Remove error pages that were prematurely integrated into 3.0.STABLE.
# This is done to keep the package list manageable by installing the same
# set of error files for every language:
- @for d in Ukrainian-1251 Ukrainian-koi8-u Ukrainian-utf8; \
+ @for d in Ukrainian-1251 Ukrainian-koi8-u Ukrainian-utf8 templates; \
do ${RM} -f ${WRKSRC}/errors/$${d}/ERR_SECURE_CONNECT_FAIL; \
done
@@ -446,5 +448,10 @@
@${ECHO_CMD} ""
@${CAT} ${PKGMESSAGE}
@${ECHO_CMD} ""
+.if defined(WITH_SQUID_COSS)
+ @${ECHO_CMD} "Note: COSS support is currently disabled in Squid-3 by the Squid developers."
+ @${ECHO_CMD} "Please check your squid.conf and comment out any 'cache_dir coss' definitions."
+ @${ECHO_CMD} ""
+.endif
.include <bsd.port.post.mk>
Index: distinfo
===================================================================
--- distinfo (.../www/squid30) (revision 1461)
+++ distinfo (.../local/squid30) (revision 1461)
@@ -1,3 +1,3 @@
-MD5 (squid3.0/squid-3.0.STABLE8.tar.bz2) = 4b89ea6dd701258eed955b545b2d7e55
-SHA256 (squid3.0/squid-3.0.STABLE8.tar.bz2) = 8f9effc3bf17ff7bd5aa39a812af24ef782fd1556ad97f3e80566757e2323781
-SIZE (squid3.0/squid-3.0.STABLE8.tar.bz2) = 1786518
+MD5 (squid3.0/squid-3.0.STABLE9.tar.bz2) = 4009abfbf33d86f40db3ec4280716a0e
+SHA256 (squid3.0/squid-3.0.STABLE9.tar.bz2) = 4a3ca3ca3e84704d306be7f89a7badde119755e69c9cd4234f3dbaf09ab5bc2f
+SIZE (squid3.0/squid-3.0.STABLE9.tar.bz2) = 1795406
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list