Attachment #191994 for bug #227127




# $FreeBSD$

PORTNAME=	squid
PORTVERSION=	4.0.24
CATEGORIES=	www ipv6
MASTER_SITES=	http://www.squid-cache.org/Versions/v4/ \
		http://www2.us.squid-cache.org/Versions/v4/ \


CONFLICTS=	squid*-3.*

USES=		compiler:c++11-lib cpe perl5 shebangfix tar:xz
CPE_VENDOR=	squid-cache
SHEBANG_FILES=	scripts/*.pl contrib/*.pl tools/*.pl
GNU_CONFIGURE=	yes
USE_RC_SUBR=	squid
CPPFLAGS+=	-I${BDB_INCLUDE_DIR}
LDFLAGS+=	-L${BDB_LIB_DIR}

USERS=		squid
GROUPS=		squid

OPTIONS_RADIO=	FW
OPTIONS_GROUP_AUTH=AUTH_LDAP AUTH_NIS AUTH_SASL AUTH_SMB AUTH_SQL
OPTIONS_RADIO_FW=TP_IPF TP_IPFW TP_PF
OPTIONS_DEFINE=	ARP_ACL BDB CACHE_DIGESTS DEBUG DELAY_POOLS DOCS ECAP ESI EXAMPLES \
		FOLLOW_XFF FS_AUFS FS_DISKD FS_ROCK HTCP ICAP ICMP IDENT IPV6 \
		KQUEUE LARGEFILE LAX_HTTP NETTLE PCRE SNMP SSL SSL_CRTD \
		STACKTRACES VIA_DB WCCP WCCPV2

OPTIONS_SINGLE=	GSSAPI
OPTIONS_SINGLE_GSSAPI=	GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT

OPTIONS_DEFAULT=ARP_ACL AUTH_NIS BDB CACHE_DIGESTS DELAY_POOLS FOLLOW_XFF FS_AUFS \
		FS_DISKD FS_ROCK GSSAPI_BASE HTCP ICAP ICMP IDENT KQUEUE \
		LARGEFILE LAX_HTTP PCRE SNMP SSL SSL_CRTD TP_IPFW VIA_DB WCCP \
		WCCPV2

AUTH_SMB_VARS=			BASIC_AUTH+=SMB EXTERNAL_ACL+=wbinfo_group
AUTH_SQL_RUN_DEPENDS=		p5-DBI>=1.08:databases/p5-DBI
AUTH_SQL_VARS=			EXTERNAL_ACL+=SQL_session
BDB_USES=			bdb
CACHE_DIGESTS_CONFIGURE_ENABLE=	cache-digests
DELAY_POOLS_CONFIGURE_ENABLE=	delay-pools
ECAP_CFLAGS=			-I${LOCALBASE}/include

GSSAPI_MIT_CONFIGURE_ON=	--with-mit-krb5=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
GSSAPI_MIT_PLIST_SUB=		AUTH_KERB=""

# TODO:
# add an option for external_acl/session (requires some kind of external
# Berkeley DB support, unsure which one)
ARP_ACL_DESC=		ARP/MAC/EUI based authentification
AUTH_DESC=		Authentication helpers
AUTH_LDAP_DESC=		Install LDAP authentication helpers

AUTH_SASL_DESC=		Install SASL authentication helpers
AUTH_SMB_DESC=		Install SMB auth. helpers (req. Samba)
AUTH_SQL_DESC=		Install SQL based auth
BDB_DESC=		Berkeley DB support required for session and time quota external helpers
CACHE_DIGESTS_DESC=	Use cache digests
DEBUG_DESC=		Build with extended debugging support
DELAY_POOLS_DESC=	Delay pools (bandwidth limiting)

# Authentication methods and modules:

BASIC_AUTH+=	DB SMB_LM NCSA PAM POP3 RADIUS fake getpwnam
EXTERNAL_ACL+=	file_userip unix_group

# POLA: allow the old global make.conf(5) (pre src.conf(5)) defines, too:
.if ${PORT_OPTIONS:MAUTH_NIS} && !defined(NO_NIS) && !defined(WITHOUT_NIS)

NEGOTIATE_AUTH=	kerberos wrapper
.endif

# The session and time_quota external helpers require Berkeley DB support:
.if ${PORT_OPTIONS:MBDB}
CPPFLAGS+=	-I${BDB_INCLUDE_DIR}
LDFLAGS+=	-L${BDB_LIB_DIR}
EXTERNAL_ACL+=	time_quota session
.endif

# Storage schemes:
STORAGE_SCHEMES+=	ufs
DISKIO_MODULES+=	AIO Blocking IpcIo Mmapped

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1517146538	1	TIMESTAMP = 1522445865
2	SHA256 (squid4.0/squid-4.0.23.tar.xz) = 18b71a601f60f49ca0cfc7d1d212dc935112d61008ab8a689fceab3ef4070f29	2	SHA256 (squid4.0/squid-4.0.24.tar.xz) = 091da0d763307dcc0f5c784ab07ea0c5a093f6dfac60f17ff26e2a6d50f76a07
3	SIZE (squid4.0/squid-4.0.23.tar.xz) = 2415132	3	SIZE (squid4.0/squid-4.0.24.tar.xz) = 2420076




# https://bugs.squid-cache.org/show_bug.cgi?id=4822
# https://patch-diff.githubusercontent.com/raw/squid-cache/squid/pull/158.patch

--- src/ipc/Kid.cc.orig	2018-02-22 18:34:42 UTC
+++ src/ipc/Kid.cc
@@ -90,7 +90,9 @@ Kid::reportStopped() const
     if (hopeless() && Config.hopelessKidRevivalDelay) {
         syslog(LOG_NOTICE, "Squid Parent: %s process %d will not be restarted for %ld "
                "seconds due to repeated, frequent failures",
-               theName.termedBuf(), pid, Config.hopelessKidRevivalDelay);
+               theName.termedBuf(),
+               pid,
+               static_cast<long int>(Config.hopelessKidRevivalDelay));
     }
 }
 




libexec/squid/ext_file_userip_acl
%%AUTH_KERB%%%%AUTH_LDAP%%%%AUTH_SASL%%libexec/squid/ext_kerberos_ldap_group_acl
%%AUTH_LDAP%%libexec/squid/ext_ldap_group_acl
%%BDB%%libexec/squid/ext_session_acl
%%AUTH_SQL%%libexec/squid/ext_sql_session_acl
%%BDB%%libexec/squid/ext_time_quota_acl
libexec/squid/ext_unix_group_acl
%%AUTH_SMB%%libexec/squid/ext_wbinfo_group_acl
libexec/squid/helper-mux

man/man8/digest_file_auth.8.gz
man/man8/ext_file_userip_acl.8.gz
%%AUTH_LDAP%%man/man8/ext_ldap_group_acl.8.gz
%%BDB%%man/man8/ext_session_acl.8.gz
%%AUTH_SQL%%man/man8/ext_sql_session_acl.8.gz
%%BDB%%man/man8/ext_time_quota_acl.8.gz
man/man8/ext_unix_group_acl.8.gz
%%AUTH_SMB%%man/man8/ext_wbinfo_group_acl.8.gz
%%AUTH_KERB%%man/man8/negotiate_kerberos_auth.8.gz

Return to bug 227127

Lines 1-7 Link Here

(-)Makefile (-10 / +14 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= squid	3	PORTNAME= squid
4	PORTVERSION= 4.0.23	4	PORTVERSION= 4.0.24
5	CATEGORIES= www ipv6	5	CATEGORIES= www ipv6
6	MASTER_SITES= http://www.squid-cache.org/Versions/v4/ \	6	MASTER_SITES= http://www.squid-cache.org/Versions/v4/ \
7	http://www2.us.squid-cache.org/Versions/v4/ \	7	http://www2.us.squid-cache.org/Versions/v4/ \
Lines 29-41 Link Here
29		29
30	CONFLICTS= squid-3.	30	CONFLICTS= squid-3.
31		31
32	USES= compiler:c++11-lib cpe perl5 shebangfix tar:xz bdb	32	USES= compiler:c++11-lib cpe perl5 shebangfix tar:xz
33	CPE_VENDOR= squid-cache	33	CPE_VENDOR= squid-cache
34	SHEBANG_FILES= scripts/.pl contrib/.pl tools/*.pl	34	SHEBANG_FILES= scripts/.pl contrib/.pl tools/*.pl
35	GNU_CONFIGURE= yes	35	GNU_CONFIGURE= yes
36	USE_RC_SUBR= squid	36	USE_RC_SUBR= squid
37	CPPFLAGS+= -I${BDB_INCLUDE_DIR}
38	LDFLAGS+= -L${BDB_LIB_DIR}
39		37
40	USERS= squid	38	USERS= squid
41	GROUPS= squid	39	GROUPS= squid
Lines 50-56 Link Here
50	OPTIONS_RADIO= FW	48	OPTIONS_RADIO= FW
51	OPTIONS_GROUP_AUTH=AUTH_LDAP AUTH_NIS AUTH_SASL AUTH_SMB AUTH_SQL	49	OPTIONS_GROUP_AUTH=AUTH_LDAP AUTH_NIS AUTH_SASL AUTH_SMB AUTH_SQL
52	OPTIONS_RADIO_FW=TP_IPF TP_IPFW TP_PF	50	OPTIONS_RADIO_FW=TP_IPF TP_IPFW TP_PF
53	OPTIONS_DEFINE= ARP_ACL CACHE_DIGESTS DEBUG DELAY_POOLS DOCS ECAP ESI EXAMPLES \	51	OPTIONS_DEFINE= ARP_ACL BDB CACHE_DIGESTS DEBUG DELAY_POOLS DOCS ECAP ESI EXAMPLES \
54	FOLLOW_XFF FS_AUFS FS_DISKD FS_ROCK HTCP ICAP ICMP IDENT IPV6 \	52	FOLLOW_XFF FS_AUFS FS_DISKD FS_ROCK HTCP ICAP ICMP IDENT IPV6 \
55	KQUEUE LARGEFILE LAX_HTTP NETTLE PCRE SNMP SSL SSL_CRTD \	53	KQUEUE LARGEFILE LAX_HTTP NETTLE PCRE SNMP SSL SSL_CRTD \
56	STACKTRACES VIA_DB WCCP WCCPV2	54	STACKTRACES VIA_DB WCCP WCCPV2
Lines 58-64 Link Here
58	OPTIONS_SINGLE= GSSAPI	56	OPTIONS_SINGLE= GSSAPI
59	OPTIONS_SINGLE_GSSAPI= GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT	57	OPTIONS_SINGLE_GSSAPI= GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
60		58
61	OPTIONS_DEFAULT=ARP_ACL AUTH_NIS CACHE_DIGESTS DELAY_POOLS FOLLOW_XFF FS_AUFS \	59	OPTIONS_DEFAULT=ARP_ACL AUTH_NIS BDB CACHE_DIGESTS DELAY_POOLS FOLLOW_XFF FS_AUFS \
62	FS_DISKD FS_ROCK GSSAPI_BASE HTCP ICAP ICMP IDENT KQUEUE \	60	FS_DISKD FS_ROCK GSSAPI_BASE HTCP ICAP ICMP IDENT KQUEUE \
63	LARGEFILE LAX_HTTP PCRE SNMP SSL SSL_CRTD TP_IPFW VIA_DB WCCP \	61	LARGEFILE LAX_HTTP PCRE SNMP SSL SSL_CRTD TP_IPFW VIA_DB WCCP \
64	WCCPV2	62	WCCPV2
Lines 77-82 Link Here
77	AUTH_SMB_VARS= BASIC_AUTH+=SMB EXTERNAL_ACL+=wbinfo_group	75	AUTH_SMB_VARS= BASIC_AUTH+=SMB EXTERNAL_ACL+=wbinfo_group
78	AUTH_SQL_RUN_DEPENDS= p5-DBI>=1.08:databases/p5-DBI	76	AUTH_SQL_RUN_DEPENDS= p5-DBI>=1.08:databases/p5-DBI
79	AUTH_SQL_VARS= EXTERNAL_ACL+=SQL_session	77	AUTH_SQL_VARS= EXTERNAL_ACL+=SQL_session
		78	BDB_USES= bdb
80	CACHE_DIGESTS_CONFIGURE_ENABLE= cache-digests	79	CACHE_DIGESTS_CONFIGURE_ENABLE= cache-digests
81	DELAY_POOLS_CONFIGURE_ENABLE= delay-pools	80	DELAY_POOLS_CONFIGURE_ENABLE= delay-pools
82	ECAP_CFLAGS= -I${LOCALBASE}/include	81	ECAP_CFLAGS= -I${LOCALBASE}/include
Lines 152-160 Link Here
152	GSSAPI_MIT_CONFIGURE_ON= --with-mit-krb5=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}	151	GSSAPI_MIT_CONFIGURE_ON= --with-mit-krb5=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
153	GSSAPI_MIT_PLIST_SUB= AUTH_KERB=""	152	GSSAPI_MIT_PLIST_SUB= AUTH_KERB=""
154		153
155	# TODO:
156	# add an option for external_acl/session (requires some kind of external
157	# Berkeley DB support, unsure which one)
158	ARP_ACL_DESC= ARP/MAC/EUI based authentification	154	ARP_ACL_DESC= ARP/MAC/EUI based authentification
159	AUTH_DESC= Authentication helpers	155	AUTH_DESC= Authentication helpers
160	AUTH_LDAP_DESC= Install LDAP authentication helpers	156	AUTH_LDAP_DESC= Install LDAP authentication helpers
Lines 162-167 Link Here
162	AUTH_SASL_DESC= Install SASL authentication helpers	158	AUTH_SASL_DESC= Install SASL authentication helpers
163	AUTH_SMB_DESC= Install SMB auth. helpers (req. Samba)	159	AUTH_SMB_DESC= Install SMB auth. helpers (req. Samba)
164	AUTH_SQL_DESC= Install SQL based auth	160	AUTH_SQL_DESC= Install SQL based auth
		161	BDB_DESC= Berkeley DB support required for session and time quota external helpers
165	CACHE_DIGESTS_DESC= Use cache digests	162	CACHE_DIGESTS_DESC= Use cache digests
166	DEBUG_DESC= Build with extended debugging support	163	DEBUG_DESC= Build with extended debugging support
167	DELAY_POOLS_DESC= Delay pools (bandwidth limiting)	164	DELAY_POOLS_DESC= Delay pools (bandwidth limiting)
Lines 238-244 Link Here
238	# Authentication methods and modules:	235	# Authentication methods and modules:
239		236
240	BASIC_AUTH+= DB SMB_LM NCSA PAM POP3 RADIUS fake getpwnam	237	BASIC_AUTH+= DB SMB_LM NCSA PAM POP3 RADIUS fake getpwnam
241	EXTERNAL_ACL+= file_userip time_quota unix_group	238	EXTERNAL_ACL+= file_userip unix_group
242		239
243	# POLA: allow the old global make.conf(5) (pre src.conf(5)) defines, too:	240	# POLA: allow the old global make.conf(5) (pre src.conf(5)) defines, too:
244	.if ${PORT_OPTIONS:MAUTH_NIS} && !defined(NO_NIS) && !defined(WITHOUT_NIS)	241	.if ${PORT_OPTIONS:MAUTH_NIS} && !defined(NO_NIS) && !defined(WITHOUT_NIS)
Lines 257-262 Link Here
257	NEGOTIATE_AUTH= kerberos wrapper	254	NEGOTIATE_AUTH= kerberos wrapper
258	.endif	255	.endif
259		256
		257	# The session and time_quota external helpers require Berkeley DB support:
		258	.if ${PORT_OPTIONS:MBDB}
		259	CPPFLAGS+= -I${BDB_INCLUDE_DIR}
		260	LDFLAGS+= -L${BDB_LIB_DIR}
		261	EXTERNAL_ACL+= time_quota session
		262	.endif
		263
260	# Storage schemes:	264	# Storage schemes:
261	STORAGE_SCHEMES+= ufs	265	STORAGE_SCHEMES+= ufs
262	DISKIO_MODULES+= AIO Blocking IpcIo Mmapped	266	DISKIO_MODULES+= AIO Blocking IpcIo Mmapped

Lines 1-16 Link Here

(-)files/patch-src_ipc_Kid.cc (-16 lines)
1	# https://bugs.squid-cache.org/show_bug.cgi?id=4822
2	# https://patch-diff.githubusercontent.com/raw/squid-cache/squid/pull/158.patch
3
4	--- src/ipc/Kid.cc.orig 2018-02-22 18:34:42 UTC
5	+++ src/ipc/Kid.cc
6	@@ -90,7 +90,9 @@ Kid::reportStopped() const
7	if (hopeless() && Config.hopelessKidRevivalDelay) {
8	syslog(LOG_NOTICE, "Squid Parent: %s process %d will not be restarted for %ld "
9	"seconds due to repeated, frequent failures",
10	- theName.termedBuf(), pid, Config.hopelessKidRevivalDelay);
11	+ theName.termedBuf(),
12	+ pid,
13	+ static_cast<long int>(Config.hopelessKidRevivalDelay));
14	}
15	}
16

Lines 2174-2181 Link Here

(-)pkg-plist (-2 / +4 lines)
2174	libexec/squid/ext_file_userip_acl	2174	libexec/squid/ext_file_userip_acl
2175	%%AUTH_KERB%%%%AUTH_LDAP%%%%AUTH_SASL%%libexec/squid/ext_kerberos_ldap_group_acl	2175	%%AUTH_KERB%%%%AUTH_LDAP%%%%AUTH_SASL%%libexec/squid/ext_kerberos_ldap_group_acl
2176	%%AUTH_LDAP%%libexec/squid/ext_ldap_group_acl	2176	%%AUTH_LDAP%%libexec/squid/ext_ldap_group_acl
		2177	%%BDB%%libexec/squid/ext_session_acl
2177	%%AUTH_SQL%%libexec/squid/ext_sql_session_acl	2178	%%AUTH_SQL%%libexec/squid/ext_sql_session_acl
2178	libexec/squid/ext_time_quota_acl	2179	%%BDB%%libexec/squid/ext_time_quota_acl
2179	libexec/squid/ext_unix_group_acl	2180	libexec/squid/ext_unix_group_acl
2180	%%AUTH_SMB%%libexec/squid/ext_wbinfo_group_acl	2181	%%AUTH_SMB%%libexec/squid/ext_wbinfo_group_acl
2181	libexec/squid/helper-mux	2182	libexec/squid/helper-mux
Lines 2211-2218 Link Here
2211	man/man8/digest_file_auth.8.gz	2212	man/man8/digest_file_auth.8.gz
2212	man/man8/ext_file_userip_acl.8.gz	2213	man/man8/ext_file_userip_acl.8.gz
2213	%%AUTH_LDAP%%man/man8/ext_ldap_group_acl.8.gz	2214	%%AUTH_LDAP%%man/man8/ext_ldap_group_acl.8.gz
		2215	%%BDB%%man/man8/ext_session_acl.8.gz
2214	%%AUTH_SQL%%man/man8/ext_sql_session_acl.8.gz	2216	%%AUTH_SQL%%man/man8/ext_sql_session_acl.8.gz
2215	man/man8/ext_time_quota_acl.8.gz	2217	%%BDB%%man/man8/ext_time_quota_acl.8.gz
2216	man/man8/ext_unix_group_acl.8.gz	2218	man/man8/ext_unix_group_acl.8.gz
2217	%%AUTH_SMB%%man/man8/ext_wbinfo_group_acl.8.gz	2219	%%AUTH_SMB%%man/man8/ext_wbinfo_group_acl.8.gz
2218	%%AUTH_KERB%%man/man8/negotiate_kerberos_auth.8.gz	2220	%%AUTH_KERB%%man/man8/negotiate_kerberos_auth.8.gz