Date: 4 Dec 2009 15:34:37 -0000 From: Thomas-Martin Seck <tmseck@web.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/141169: [Maintainer] www/squid31: update to 3.1.0.15 Message-ID: <20091204153437.12978.qmail@wcfields.tmseck.homedns.org> Resent-Message-ID: <200912041540.nB4Fe3Xj058266@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 141169
>Category: ports
>Synopsis: [Maintainer] www/squid31: update to 3.1.0.15
>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: Fri Dec 04 15:40:03 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Thomas-Martin Seck
>Release: FreeBSD 7.2-RELEASE i386
>Organization:
a private site in Germany
>Environment:
FreeBSD ports collection as of December 4, 2009.
>Description:
- update to 3.1.0.15
- merge SQUID_KERB_AUTH and SQUID_NIS_AUTH options from www/squid30
- merge setfib(1) support from www/squid
- add a new rc variable "squid_conf"
- document the user settable rc variables
- make squid_confdir world-readable on new installations; this unbreaks
the straightforward use of cachemgr.cgi because it looks for its
configuration file in the Squid configuration directory
>How-To-Repeat:
>Fix:
Apply this patch:
Index: Makefile
===================================================================
--- Makefile (.../www/squid31) (Revision 1695)
+++ Makefile (.../local/squid31) (Revision 1695)
@@ -91,7 +91,7 @@
LATEST_LINK= squid31
-SQUID_BETA_VER= 14
+SQUID_BETA_VER= 15
CONFLICTS= squid-2.[0-9].* squid-3.[^1].* cacheboy-[0-9]*
GNU_CONFIGURE= yes
@@ -110,7 +110,9 @@
SUB_FILES+= pkg-deinstall pkg-install pkg-message
SUB_LIST+= SQUID_UID=${SQUID_UID} SQUID_GID=${SQUID_GID}
-OPTIONS= SQUID_LDAP_AUTH "Install LDAP authentication helpers" off \
+OPTIONS= SQUID_KERB_AUTH "Install Kerberos authentication helpers" on \
+ SQUID_LDAP_AUTH "Install LDAP authentication helpers" off \
+ SQUID_NIS_AUTH "Install NIS/YP authentication helpers" on \
SQUID_SASL_AUTH "Install SASL authentication helpers" off \
SQUID_IPV6 "Enable IPv6 support" on \
SQUID_DELAY_POOLS "Enable delay pools" off \
@@ -261,7 +263,8 @@
basic_auth+= SASL
libexec+= sasl_auth
.endif
-.if !defined(NO_NIS) && !defined(WITHOUT_NIS)
+# POLA: allow the old global make.conf(5) (pre src.conf(5)) defines, too:
+.if defined(WITH_SQUID_NIS_AUTH) && !defined(NO_NIS) && !defined(WITHOUT_NIS)
basic_auth+= YP
libexec+= yp_auth
.endif
@@ -270,7 +273,8 @@
--enable-digest-auth-helpers="${digest_auth}" \
--enable-external-acl-helpers="${external_acl}" \
--enable-ntlm-auth-helpers="smb_lm"
-.if !defined(NO_KERBEROS) && !defined(WITHOUT_KERBEROS)
+# POLA: allow the old global make.conf(5) (pre src.conf(5)) defines, too:
+.if defined(WITH_SQUID_KERB_AUTH) && !defined(NO_KERBEROS) && !defined(WITHOUT_KERBEROS)
CONFIGURE_ARGS+= --enable-negotiate-auth-helpers="squid_kerb_auth"
libexec+= negotiate_kerb_auth negotiate_kerb_auth_test \
squid_kerb_auth squid_kerb_auth_test
@@ -376,6 +380,7 @@
CONFIGURE_ARGS+= --enable-follow-x-forwarded-for
.endif
.if defined(WITH_SQUID_ECAP)
+BROKEN= eCAP support does not build, see Squid bug 2825
CONFIGURE_ARGS+= --enable-ecap
LIB_DEPENDS+= ecap:${PORTSDIR}/www/libecap
CFLAGS+= -I${LOCALBASE}/include
Index: distinfo
===================================================================
--- distinfo (.../www/squid31) (Revision 1695)
+++ distinfo (.../local/squid31) (Revision 1695)
@@ -1,3 +1,3 @@
-MD5 (squid3.1/squid-3.1.0.14.tar.bz2) = 0e76bc406495b010ac898937e19528c3
-SHA256 (squid3.1/squid-3.1.0.14.tar.bz2) = fb41d1762a48e52f4041b416665f1f9416bf6d1946f3ba3c4e31a74185fcad57
-SIZE (squid3.1/squid-3.1.0.14.tar.bz2) = 2398582
+MD5 (squid3.1/squid-3.1.0.15.tar.bz2) = 295f5c6067244cf8537600be0b9841d7
+SHA256 (squid3.1/squid-3.1.0.15.tar.bz2) = 9fd3d7f5e2bee836126ab0f9cc07fb61207027bed29a3213db73aed46a888bdd
+SIZE (squid3.1/squid-3.1.0.15.tar.bz2) = 2416255
Index: files/pkg-install.in
===================================================================
--- files/pkg-install.in (.../www/squid31) (Revision 1695)
+++ files/pkg-install.in (.../local/squid31) (Revision 1695)
@@ -72,7 +72,7 @@
if [ ! -d ${squid_confdir} ]; then
echo "Creating ${squid_confdir}..."
install -d -o root -g ${squid_group} \
- -m 0750 ${squid_confdir}
+ -m 0755 ${squid_confdir}
fi
;;
POST-INSTALL)
Index: files/squid.in
===================================================================
--- files/squid.in (.../www/squid31) (Revision 1695)
+++ files/squid.in (.../local/squid31) (Revision 1695)
@@ -8,16 +8,51 @@
#
# Note:
# Set "squid_enable=yes" in either /etc/rc.conf, /etc/rc.conf.local or
-# /etc/rc.conf.d/squid to make this script actually do something. There
-# you can also set squid_chdir, squid_pidfile, squid_user, and squid_flags.
+# /etc/rc.conf.d/squid to activate Squid.
#
-# Please see squid(8), rc.conf(5) and rc(8) for further details.
+# Additional variables you can define in one of these files:
#
+# squid_chdir: the directory into which the rc system moves into before
+# starting Squid. Default: %%PREFIX%%/squid
+#
+# squid_conf: The configuration file that Squid should use.
+# Default: %%PREFIX%%/etc/squid/squid.conf
+#
+# squid_fib: The alternative routing table id that Squid should use.
+# Default: none
+# See setfib(1) for further details. Note that the setfib(2)
+# system call is not available in FreeBSD versions prior to 7.1.
+#
+# squid_user: The user id that should be used to run the Squid master
+# process. Default: %%SQUID_UID%%.
+# Note that you probably need to define "squid_user=root" if
+# you want to run Squid in reverse proxy setups or if you want
+# Squid to listen on a "privileged" port < 1024.
+#
+# squid_pidfile:
+# The name (including the full path) of the Squid
+# master process' PID file.
+# Default: %%PREFIX%%/squid/squid.pid.
+# You only need to change this if you changed the
+# corresponding entry in your Squid configuration.
+#
+# squid_flags: Additional commandline arguments for Squid you might want to
+# use. See squid(8) for further details.
+#
squid_checkrunning() {
${command} ${squid_flags} -k check 2>/dev/null
}
+squid_setfib() {
+ sysctl net.fibs >/dev/null 2>&1 || return 0
+ if [ "x${squid_fib}" != "xNONE" ]; then
+ command="setfib -F ${squid_fib} ${command}"
+ else
+ return 0
+ fi
+}
+
squid_stop() {
echo "Stopping ${name}."
${command} ${squid_flags} -k shutdown
@@ -32,28 +67,26 @@
command=%%PREFIX%%/sbin/squid
extra_commands=reload
reload_cmd="${command} ${squid_flags} -k reconfigure"
+start_precmd="squid_setfib"
stop_precmd="squid_checkrunning"
stop_cmd="squid_stop"
load_rc_config ${name}
squid_chdir=${squid_chdir:-"%%PREFIX%%/squid"}
+squid_conf=${squid_conf:-"%%PREFIX%%/etc/squid/squid.conf"}
squid_enable=${squid_enable:-"NO"}
+squid_fib=${squid_fib:-"NONE"}
squid_pidfile=${squid_pidfile:-"%%PREFIX%%/squid/squid.pid"}
squid_user=${squid_user:-%%SQUID_UID%%}
-default_config=%%PREFIX%%/etc/squid/squid.conf
pidfile=${squid_pidfile}
required_dirs=${squid_chdir}
-# squid(8) will not start if ${default_config} is not present so try
+# squid(8) will not start if ${squid_conf} is not present so try
# to catch that beforehand via ${required_files} rather than make
# squid(8) crash.
-# If you remove the default configuration file make sure to add
-# '-f /path/to/your/squid.conf' to squid_flags
-if [ -z "${squid_flags}" ]; then
- required_files=${default_config}
-fi
+required_files=${squid_conf}
run_rc_command "$1"
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20091204153437.12978.qmail>