Attachment #168622 for bug #208290

Lines 2-8 Link Here

(-)squid/Makefile (-13 / +37 lines)
2		2
3	PORTNAME= squid	3	PORTNAME= squid
4	PORTVERSION= 3.5.15	4	PORTVERSION= 3.5.15
5	PORTREVISION= 1	5	PORTREVISION= 2
6	CATEGORIES= www ipv6	6	CATEGORIES= www ipv6
7	MASTER_SITES= http://www.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \	7	MASTER_SITES= http://www.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \
8	http://www2.us.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \	8	http://www2.us.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \
Lines 45-52 Link Here
45	SUB_FILES+= pkg-install pkg-message	45	SUB_FILES+= pkg-install pkg-message
46		46
47	OPTIONS_SUB= yes	47	OPTIONS_SUB= yes
48	OPTIONS_DEFINE= ARP_ACL AUTH_LDAP AUTH_NIS AUTH_SASL AUTH_SMB \	48	OPTIONS_MULTI= AUTH
49	AUTH_SQL CACHE_DIGESTS DEBUG DELAY_POOLS ECAP ESI \	49	OPTIONS_RADIO= SMB
		50	OPTIONS_MULTI_AUTH=AUTH_LDAP AUTH_NIS AUTH_SASL AUTH_MYSQL AUTH_PGSQL AUTH_SQLITE
		51	OPTIONS_RADIO_SMB=AUTH_SMB3 AUTH_SMB4
		52	OPTIONS_DEFINE= ARP_ACL CACHE_DIGESTS DEBUG DELAY_POOLS ECAP ESI \
50	FOLLOW_XFF FS_AUFS FS_DISKD FS_ROCK HTCP ICAP ICMP IDENT IPV6 \	53	FOLLOW_XFF FS_AUFS FS_DISKD FS_ROCK HTCP ICAP ICMP IDENT IPV6 \
51	KQUEUE LARGEFILE NETTLE SNMP SSL SSL_CRTD STACKTRACES LAX_HTTP \	54	KQUEUE LARGEFILE NETTLE SNMP SSL SSL_CRTD STACKTRACES LAX_HTTP \
52	TP_IPF TP_IPFW TP_PF VIA_DB WCCP WCCPV2 DOCS EXAMPLES	55	TP_IPF TP_IPFW TP_PF VIA_DB WCCP WCCPV2 DOCS EXAMPLES
Lines 54-61 Link Here
54	OPTIONS_SINGLE= GSSAPI	57	OPTIONS_SINGLE= GSSAPI
55	OPTIONS_SINGLE_GSSAPI= GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT	58	OPTIONS_SINGLE_GSSAPI= GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
56		59
57	OPTIONS_DEFAULT=GSSAPI_BASE AUTH_NIS FS_AUFS FS_DISKD HTCP IDENT KQUEUE SNMP \	60	OPTIONS_DEFAULT=ARP_ACL AUTH_NIS CACHE_DIGESTS DELAY_POOLS DOCS EXAMPLES FOLLOW_XFF \
58	WCCP WCCPV2	61	FS_AUFS FS_DISKD FS_ROCK HTCP ICAP ICMP IDENT IPV6 KQUEUE LARGEFILE \
		62	LAX_HTTP SNMP SSL SSL_CRTD TP_IPF TP_IPFW TP_PF VIA_DB WCCP WCCPV2 \
		63	GSSAPI_BASE
59		64
60	ARP_ACL_CONFIGURE_ENABLE= eui	65	ARP_ACL_CONFIGURE_ENABLE= eui
61	AUTH_LDAP_CFLAGS= -I${LOCALBASE}/include	66	AUTH_LDAP_CFLAGS= -I${LOCALBASE}/include
Lines 65-74 Link Here
65	AUTH_SASL_CPPFLAGS= -I${LOCALBASE}/include	70	AUTH_SASL_CPPFLAGS= -I${LOCALBASE}/include
66	AUTH_SASL_LDFLAGS= -L${LOCALBASE}/lib	71	AUTH_SASL_LDFLAGS= -L${LOCALBASE}/lib
67	AUTH_SASL_LIB_DEPENDS= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2	72	AUTH_SASL_LIB_DEPENDS= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
68	AUTH_SMB_BUILD_DEPENDS= smbclient:${PORTSDIR}/net/samba36	73	AUTH_SMB3_RUN_DEPENDS= smbclient:${PORTSDIR}/net/samba36
69	AUTH_SMB_RUN_DEPENDS= smbclient:${PORTSDIR}/net/samba36	74	AUTH_SMB4_RUN_DEPENDS= smbclient:${PORTSDIR}/net/samba42
70	AUTH_SQL_RUN_DEPENDS= p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql	75	AUTH_MYSQL_RUN_DEPENDS= p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
71	AUTH_SQL_USE= MYSQL=yes	76	AUTH_MYSQL_USE= MYSQL=yes
		77	AUTH_PGSQL_RUN_DEPENDS= p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
		78	AUTH_PGSQL_USES= pgsql
		79	AUTH_SQLITE_RUN_DEPENDS= p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite
		80	AUTH_SQLITE_USES= sqlite
72	CACHE_DIGESTS_CONFIGURE_ENABLE= cache-digests	81	CACHE_DIGESTS_CONFIGURE_ENABLE= cache-digests
73	DELAY_POOLS_CONFIGURE_ENABLE= delay-pools	82	DELAY_POOLS_CONFIGURE_ENABLE= delay-pools
74	ECAP_CFLAGS= -I${LOCALBASE}/include	83	ECAP_CFLAGS= -I${LOCALBASE}/include
Lines 123-128 Link Here
123	# add an option for external_acl/session (requires some kind of external	132	# add an option for external_acl/session (requires some kind of external
124	# Berkeley DB support, unsure which one)	133	# Berkeley DB support, unsure which one)
125	ARP_ACL_DESC= ARP/MAC/EUI based authentification	134	ARP_ACL_DESC= ARP/MAC/EUI based authentification
		135	AUTH_DESC= Authentication helpers
126	GSSAPI_DESC= Install Kerberos authentication helpers	136	GSSAPI_DESC= Install Kerberos authentication helpers
127	GSSAPI_NONE_DESC= Build without Kerberos support	137	GSSAPI_NONE_DESC= Build without Kerberos support
128	GSSAPI_BASE_DESC= Build with Kerberos support from base	138	GSSAPI_BASE_DESC= Build with Kerberos support from base
Lines 131-138 Link Here
131	AUTH_LDAP_DESC= Install LDAP authentication helpers	141	AUTH_LDAP_DESC= Install LDAP authentication helpers
132	AUTH_NIS_DESC= Install NIS/YP authentication helpers	142	AUTH_NIS_DESC= Install NIS/YP authentication helpers
133	AUTH_SASL_DESC= Install SASL authentication helpers	143	AUTH_SASL_DESC= Install SASL authentication helpers
134	AUTH_SMB_DESC= Install SMB auth. helpers (req. Samba)	144	AUTH_SMB3_DESC= Install SMB3 auth. helpers (req. net/samba36)
135	AUTH_SQL_DESC= Install SQL based auth (uses MySQL)	145	AUTH_SMB4_DESC= Install SMB4 auth. helpers (req. net/samba42)
		146	AUTH_MYSQL_DESC= Install SQL based auth (uses MySQL)
		147	AUTH_PGSQL_DESC= Install SQL based auth (uses PgSQL)
		148	AUTH_SQLITE_DESC= Install SQL based auth (uses SQLite)
136	CACHE_DIGESTS_DESC= Use cache digests	149	CACHE_DIGESTS_DESC= Use cache digests
137	DEBUG_DESC= Build with extended debugging support	150	DEBUG_DESC= Build with extended debugging support
138	DELAY_POOLS_DESC= Delay pools (bandwidth limiting)	151	DELAY_POOLS_DESC= Delay pools (bandwidth limiting)
Lines 149-154 Link Here
149	KQUEUE_DESC= Kqueue(2) support	162	KQUEUE_DESC= Kqueue(2) support
150	LARGEFILE_DESC= Support large (>2GB) cache and log files	163	LARGEFILE_DESC= Support large (>2GB) cache and log files
151	NETTLE_DESC= Nettle MD5 algorithm support	164	NETTLE_DESC= Nettle MD5 algorithm support
		165	SMB_DESC= Samba authentication helpers
152	SNMP_DESC= SNMP support	166	SNMP_DESC= SNMP support
153	SSL_CRTD_DESC= Use ssl_crtd to handle SSL cert requests	167	SSL_CRTD_DESC= Use ssl_crtd to handle SSL cert requests
154	SSL_DESC= SSL gatewaying support	168	SSL_DESC= SSL gatewaying support
Lines 221-233 Link Here
221	basic_auth+= SASL	235	basic_auth+= SASL
222	.endif	236	.endif
223		237
224	.if ${PORT_OPTIONS:MAUTH_SMB}	238	.if ${PORT_OPTIONS:MAUTH_SMB3} \|\| ${PORT_OPTIONS:MAUTH_SMB4}
		239	PLIST_SUB+= AUTH_SMB=""
225	basic_auth+= SMB	240	basic_auth+= SMB
226	external_acl+= wbinfo_group	241	external_acl+= wbinfo_group
		242	.else
		243	PLIST_SUB+= AUTH_SMB="@comment "
227	.endif	244	.endif
228		245
229	.if ${PORT_OPTIONS:MAUTH_SQL}	246	.if ${PORT_OPTIONS:MAUTH_MYSQL} \|\| ${PORT_OPTIONS:MAUTH_PGSQL} \|\| ${PORT_OPTIONS:MAUTH_SQLITE}
		247	PLIST_SUB+= AUTH_SQL=""
230	external_acl+= SQL_session	248	external_acl+= SQL_session
		249	.else
		250	PLIST_SUB+= AUTH_SQL="@comment "
231	.endif	251	.endif
232		252
233	# POLA: allow the old global make.conf(5) (pre src.conf(5)) defines, too:	253	# POLA: allow the old global make.conf(5) (pre src.conf(5)) defines, too:
Lines 312-317 Link Here
312	LDFLAGS+= -L${OPENSSLLIB}	332	LDFLAGS+= -L${OPENSSLLIB}
313	.endif	333	.endif
314		334
		335	.if ${PORT_OPTIONS:MSSL_CRTD} && !${PORT_OPTIONS:MSSL}
		336	IGNORE=SSL_CRTD option can be used only if SSL option is enabled
		337	.endif
		338
315	.if ${PORT_OPTIONS:MSTACKTRACES}	339	.if ${PORT_OPTIONS:MSTACKTRACES}
316	CFLAGS+= -g	340	CFLAGS+= -g
317	LDFLAGS+= -lunwind -L${LOCALBASE}/lib	341	LDFLAGS+= -lunwind -L${LOCALBASE}/lib





squid_reload()
{

	$command $required_args $squid_flags -k reconfigure
}

squid_configtest()
{

	echo "Performing sanity check on ${name} configuration."
	if $command $required_args $squid_flags -k check; then
		echo "Configuration for ${name} passes."

squid_prestop()
{
	command_args="$command_args -k shutdown"
	squid_configtest
}

load_rc_config $name

Return to bug 208290

Lines 108-120 Link Here

(-)squid/files/squid.in (-3 / +1 lines)
108		108
109	squid_reload()	109	squid_reload()
110	{	110	{
111
112	$command $required_args $squid_flags -k reconfigure	111	$command $required_args $squid_flags -k reconfigure
113	}	112	}
114		113
115	squid_configtest()	114	squid_configtest()
116	{	115	{
117
118	echo "Performing sanity check on ${name} configuration."	116	echo "Performing sanity check on ${name} configuration."
119	if $command $required_args $squid_flags -k check; then	117	if $command $required_args $squid_flags -k check; then
120	echo "Configuration for ${name} passes."	118	echo "Configuration for ${name} passes."
Lines 142-148 Link Here
142	squid_prestop()	140	squid_prestop()
143	{	141	{
144	command_args="$command_args -k shutdown"	142	command_args="$command_args -k shutdown"
145	$command $required_args $squid_flags -k check 2>/dev/null	143	squid_configtest
146	}	144	}
147		145
148	load_rc_config $name	146	load_rc_config $name