Attachment #102195 for bug #141930

View | Details | Raw Unified | Return to bug 141930
Collapse All | Expand All

Lines 76-82 Link Here

(-)Makefile (-5 / +9 lines)
76		76
77	PORTNAME= squid	77	PORTNAME= squid
78	PORTVERSION= 2.7.${SQUID_STABLE_VER}	78	PORTVERSION= 2.7.${SQUID_STABLE_VER}
79	PORTREVISION= 1	79	PORTREVISION= 2
80	CATEGORIES= www	80	CATEGORIES= www
81	MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \	81	MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
82	ftp://mirrors.24-7-solutions.net/pub/squid/%SUBDIR%/ \	82	ftp://mirrors.24-7-solutions.net/pub/squid/%SUBDIR%/ \
Lines 115-121 Link Here
115		115
116	SQUID_STABLE_VER= 7	116	SQUID_STABLE_VER= 7
117		117
118	CONFLICTS= squid-2.[^7]* squid-3.* cacheboy-[0-9]*	118	CONFLICTS= squid-2.[^7]* squid-3.* cacheboy-[0-9]* lusca-head-[0-9]*
119	GNU_CONFIGURE= yes	119	GNU_CONFIGURE= yes
120	USE_BZIP2= yes	120	USE_BZIP2= yes
121	USE_PERL5= yes	121	USE_PERL5= yes
Lines 131-137 Link Here
131	SUB_FILES+= pkg-deinstall pkg-install pkg-message	131	SUB_FILES+= pkg-deinstall pkg-install pkg-message
132	SUB_LIST+= SQUID_UID=${SQUID_UID} SQUID_GID=${SQUID_GID}	132	SUB_LIST+= SQUID_UID=${SQUID_UID} SQUID_GID=${SQUID_GID}
133		133
134	OPTIONS= SQUID_LDAP_AUTH "Install LDAP authentication helpers" off \	134	OPTIONS= SQUID_KERB_AUTH "Install Kerberos authentication helpers" on \
		135	SQUID_LDAP_AUTH "Install LDAP authentication helpers" off \
		136	SQUID_NIS_AUTH "Install NIS/YP authentication helpers" on \
135	SQUID_SASL_AUTH "Install SASL authentication helpers" off \	137	SQUID_SASL_AUTH "Install SASL authentication helpers" off \
136	SQUID_DELAY_POOLS "Enable delay pools" off \	138	SQUID_DELAY_POOLS "Enable delay pools" off \
137	SQUID_SNMP "Enable SNMP support" off \	139	SQUID_SNMP "Enable SNMP support" off \
Lines 233-239 Link Here
233	basic_auth+= SASL	235	basic_auth+= SASL
234	libexec+= sasl_auth	236	libexec+= sasl_auth
235	.endif	237	.endif
236	.if !defined(NO_NIS) && !defined(WITHOUT_NIS)	238	# POLA: allow the old global make.conf(5) (pre src.conf(5)) defines, too:
		239	.if defined(WITH_SQUID_NIS_AUTH) && !defined(NO_NIS) && !defined(WITHOUT_NIS)
237	basic_auth+= YP	240	basic_auth+= YP
238	libexec+= yp_auth	241	libexec+= yp_auth
239	.endif	242	.endif
Lines 242-248 Link Here
242	--enable-digest-auth-helpers="${digest_auth}" \	245	--enable-digest-auth-helpers="${digest_auth}" \
243	--enable-external-acl-helpers="${external_acl}" \	246	--enable-external-acl-helpers="${external_acl}" \
244	--enable-ntlm-auth-helpers="SMB"	247	--enable-ntlm-auth-helpers="SMB"
245	.if !defined(NO_KERBEROS) && !defined(WITHOUT_KERBEROS)	248	# POLA: allow the old global make.conf(5) (pre src.conf(5)) defines, too:
		249	.if defined(WITH_SQUID_KERB_AUTH) && !defined(NO_KERBEROS) && !defined(WITHOUT_KERBEROS)
246	# XXX This currently only works with heimdal from the base system,	250	# XXX This currently only works with heimdal from the base system,
247	# see files/patch-helpers_negotiate_auth-squid_kerb_auth_*	251	# see files/patch-helpers_negotiate_auth-squid_kerb_auth_*
248	CONFIGURE_ARGS+= --enable-negotiate-auth-helpers="squid_kerb_auth"	252	CONFIGURE_ARGS+= --enable-negotiate-auth-helpers="squid_kerb_auth"

Lines 60-66 Link Here

(-)files/pkg-install.in (-1 / +1 lines)
60	if [ ! -d ${squid_confdir} ]; then	60	if [ ! -d ${squid_confdir} ]; then
61	echo "Creating ${squid_confdir}..."	61	echo "Creating ${squid_confdir}..."
62	install -d -o root -g ${squid_group} \	62	install -d -o root -g ${squid_group} \
63	-m 0750 ${squid_confdir}	63	-m 0755 ${squid_confdir}
64	fi	64	fi
65	;;	65	;;
66	POST-INSTALL)	66	POST-INSTALL)




#
# Note:
# Set "squid_enable=yes" in either /etc/rc.conf, /etc/rc.conf.local or
# /etc/rc.conf.d/squid to activate Squid.
# you can also set squid_chdir, squid_pidfile, squid_user, and squid_flags.
#
# Additional variables you can define in one of these files:
# table for squid. See setfib(1) for details.
#
# 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

load_rc_config ${name}

squid_chdir=${squid_chdir:-"%%PREFIX%%/squid/logs"}
squid_conf=${squid_conf:-"%%PREFIX%%/etc/squid/squid.conf"}
squid_enable=${squid_enable:-"NO"}
squid_fib=${squid_fib:-"NONE"}
squid_flags=${squid_flags-"-D"}
squid_pidfile=${squid_pidfile:-"%%PREFIX%%/squid/logs/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 ${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

required_files=${squid_conf}
	required_files=${default_config}
fi

run_rc_command "$1"

Return to bug 141930

Lines 8-21 Link Here

(-)files/squid.in (-12 / +31 lines)
8	#	8	#
9	# Note:	9	# Note:
10	# Set "squid_enable=yes" in either /etc/rc.conf, /etc/rc.conf.local or	10	# Set "squid_enable=yes" in either /etc/rc.conf, /etc/rc.conf.local or
11	# /etc/rc.conf.d/squid to make this script actually do something. There	11	# /etc/rc.conf.d/squid to activate Squid.
12	# you can also set squid_chdir, squid_pidfile, squid_user, and squid_flags.
13	#	12	#
14	# On FreeBSD 7.1 and beyond you can use squid_fib to set a different routing	13	# Additional variables you can define in one of these files:
15	# table for squid. See setfib(1) for details.
16	#	14	#
17	# Please see squid(8), rc.conf(5) and rc(8) for further details.	15	# squid_chdir: the directory into which the rc system moves into before
		16	# starting Squid. Default: %%PREFIX%%/squid
18	#	17	#
		18	# squid_conf: The configuration file that Squid should use.
		19	# Default: %%PREFIX%%/etc/squid/squid.conf
		20	#
		21	# squid_fib: The alternative routing table id that Squid should use.
		22	# Default: none
		23	# See setfib(1) for further details. Note that the setfib(2)
		24	# system call is not available in FreeBSD versions prior to 7.1.
		25	#
		26	# squid_user: The user id that should be used to run the Squid master
		27	# process. Default: %%SQUID_UID%%.
		28	# Note that you probably need to define "squid_user=root" if
		29	# you want to run Squid in reverse proxy setups or if you want
		30	# Squid to listen on a "privileged" port < 1024.
		31	#
		32	# squid_pidfile:
		33	# The name (including the full path) of the Squid
		34	# master process' PID file.
		35	# Default: %%PREFIX%%/squid/squid.pid.
		36	# You only need to change this if you changed the
		37	# corresponding entry in your Squid configuration.
		38	#
		39	# squid_flags: Additional commandline arguments for Squid you might want to
		40	# use. See squid(8) for further details.
		41	#
19		42
20	squid_checkrunning() {	43	squid_checkrunning() {
21	${command} ${squid_flags} -k check 2>/dev/null	44	${command} ${squid_flags} -k check 2>/dev/null
Lines 51-74 Link Here
51	load_rc_config ${name}	74	load_rc_config ${name}
52		75
53	squid_chdir=${squid_chdir:-"%%PREFIX%%/squid/logs"}	76	squid_chdir=${squid_chdir:-"%%PREFIX%%/squid/logs"}
		77	squid_conf=${squid_conf:-"%%PREFIX%%/etc/squid/squid.conf"}
54	squid_enable=${squid_enable:-"NO"}	78	squid_enable=${squid_enable:-"NO"}
55	squid_fib=${squid_fib:-"NONE"}	79	squid_fib=${squid_fib:-"NONE"}
56	squid_flags=${squid_flags-"-D"}	80	squid_flags=${squid_flags-"-D"}
57	squid_pidfile=${squid_pidfile:-"%%PREFIX%%/squid/logs/squid.pid"}	81	squid_pidfile=${squid_pidfile:-"%%PREFIX%%/squid/logs/squid.pid"}
58	squid_user=${squid_user:-%%SQUID_UID%%}	82	squid_user=${squid_user:-%%SQUID_UID%%}
59	default_config=%%PREFIX%%/etc/squid/squid.conf
60		83
61	pidfile=${squid_pidfile}	84	pidfile=${squid_pidfile}
62	required_dirs=${squid_chdir}	85	required_dirs=${squid_chdir}
63		86
64	# squid(8) will not start if ${default_config} is not present so try	87	# squid(8) will not start if ${squid_conf} is not present so try
65	# to catch that beforehand via ${required_files} rather than make	88	# to catch that beforehand via ${required_files} rather than make
66	# squid(8) crash.	89	# squid(8) crash.
67	# If you remove the default configuration file make sure to add
68	# '-f /path/to/your/squid.conf' to squid_flags
69		90
70	if [ -z "${squid_flags}" ]; then	91	required_files=${squid_conf}
71	required_files=${default_config}
72	fi
73		92
74	run_rc_command "$1"	93	run_rc_command "$1"