Attachment #230763 for bug #260927




PORTNAME=	squid
DISTVERSION=	5.3
CATEGORIES=	www
MASTER_SITES=	http://www2.pl.squid-cache.org/Versions/v5/ \
		http://www1.il.squid-cache.org/Versions/v5/ \
		http://www1.jp.squid-cache.org/Versions/v5/ \
		http://www2.gr.squid-cache.org/Versions/v5/ \
		http://ca2.squid-cache.org/Versions/v5/ \
		http://www.squid-cache.org/Versions/v5/
		http://www.squid-cache.org/Versions/v4/

PATCH_SITES=	http://www2.pl.squid-cache.org/%SUBDIR%/ \
		http://ca.squid-cache.org/%SUBDIR%/ \
		http://www1.il.squid-cache.org/%SUBDIR%/ \
		http://www1.jp.squid-cache.org/%SUBDIR%/ \
		http://www2.gr.squid-cache.org/%SUBDIR%/ \
		http://ca2.squid-cache.org/%SUBDIR%/ \
		http://www.squid-cache.org/%SUBDIR%/
PATCH_SITE_SUBDIR=	Versions/v5/changesets

MAINTAINER=	timp87@gmail.com
COMMENT=	HTTP Caching Proxy

LICENSE=	GPLv2
LICENSE_FILE=	${WRKSRC}/COPYING

USES=		compiler:c++11-lib cpe gmake localbase:ldflags perl5 shebangfix tar:xz

CONFLICTS=	squid-devel
CPE_VENDOR=	squid-cache
SHEBANG_FILES=	scripts/*.pl contrib/*.pl tools/*.pl
GNU_CONFIGURE=	yes

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 TDB 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 SNMP SSL SSL_CRTD \
		STACKTRACES VIA_DB WCCP WCCPV2

		WCCPV2

ARP_ACL_CONFIGURE_ENABLE=	eui
AUTH_LDAP_CFLAGS=		-I${LOCALBASE}/include
AUTH_LDAP_LDFLAGS=		-L${LOCALBASE}/lib
AUTH_LDAP_USE=			OPENLDAP=yes
AUTH_LDAP_VARS=			BASIC_AUTH+=LDAP DIGEST_AUTH+="eDirectory LDAP" EXTERNAL_ACL+="LDAP_group eDirectory_userip"
AUTH_SASL_CFLAGS=		-I${LOCALBASE}/include
AUTH_SASL_CPPFLAGS=		-I${LOCALBASE}/include
AUTH_SASL_LDFLAGS=		-L${LOCALBASE}/lib
AUTH_SASL_LIB_DEPENDS=		libsasl2.so:security/cyrus-sasl2
AUTH_SASL_VARS=			BASIC_AUTH+=SASL
AUTH_SMB_USES=			samba:run
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
TDB_CONFIGURE_ENABLE=		tdb
TDB_LIB_DEPENDS=		libtdb.so:databases/tdb
TDB_VARS=			EXTERNAL_ACL+="time_quota session"
CACHE_DIGESTS_CONFIGURE_ENABLE=	cache-digests
DELAY_POOLS_CONFIGURE_ENABLE=	delay-pools
ECAP_CFLAGS=			-I${LOCALBASE}/include
ECAP_CONFIGURE_ENABLE=		ecap
ECAP_LDFLAGS=			-L${LOCALBASE}/lib
ECAP_LIB_DEPENDS=		libecap.so:www/libecap
ECAP_USES=			pkgconfig:build
ESI_CFLAGS=			-I${LOCALBASE}/include -I${LOCALBASE}/include/libxml2
ESI_CONFIGURE_ENABLE=		esi
ESI_LDFLAGS=			-L${LOCALBASE}/lib
ESI_LIB_DEPENDS=		libexpat.so:textproc/expat2 \
				libxml2.so:textproc/libxml2
FOLLOW_XFF_CONFIGURE_ENABLE=	follow-x-forwarded-for

STACKTRACES_EXTRA_PATCHES=	${FILESDIR}/extra-patch-gen-stacktrace
STACKTRACES_LIB_DEPENDS=	libunwind.so:devel/libunwind
STACKTRACES_CFLAGS=		-g
STACKTRACES_LDFLAGS=		-lunwind
STACKTRACES_VARS=		STRIP=""
TP_IPFW_CONFIGURE_ENABLE=	ipfw-transparent
TP_IPF_CONFIGURE_ENABLE=	ipf-transparent

AUTH_SASL_DESC=		Install SASL authentication helpers
AUTH_SMB_DESC=		Install SMB auth. helpers (req. Samba)
AUTH_SQL_DESC=		Install SQL based auth
TDB_DESC=		TrivialDB 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)

PLIST_SUB+=	AUTH_KERB="@comment "
.else
# The kerberos_ldap_group external helper also depends on LDAP and SASL:
# The kerberos_sid_group external helper depends on kerberos_ldap_group meanwhile
. if ${PORT_OPTIONS:MAUTH_LDAP} && ${PORT_OPTIONS:MAUTH_SASL}
EXTERNAL_ACL+=	kerberos_ldap_group kerberos_sid_group
. endif
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

(-)b/www/squid/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1622579975	1	TIMESTAMP = 1640710772
2	SHA256 (squid-4.15.tar.xz) = b693a4e5ab2811a8a854f60de0a62afbbf3a952bb1d047952c9ae01321f84a25	2	SHA256 (squid-5.3.tar.xz) = 45178588df1311ded41ebadd632840c4d93a8d7f5f60e38e74acf2f1ae2f1715
3	SIZE (squid-4.15.tar.xz) = 2454176	3	SIZE (squid-5.3.tar.xz) = 2553980

Lines 1-5 Link Here

(-)b/www/squid/files/patch-compat_cpu.h (-2 / +2 lines)
1	--- compat/cpu.h.orig 2021-05-10 02:02:34.000000000 -0700	1	--- compat/cpu.h.orig 2021-12-07 14:15:52 UTC
2	+++ compat/cpu.h 2021-11-29 10:31:25.381434000 -0800	2	+++ compat/cpu.h
3	@@ -15,6 +15,8 @@	3	@@ -15,6 +15,8 @@
4	#if HAVE_SCHED_H	4	#if HAVE_SCHED_H
5	#include <sched.h>	5	#include <sched.h>




--- configure.orig	2021-12-07 14:11:12 UTC
+++ configure
@@ -36683,8 +36683,10 @@ then :
 #define `printf "%s\n" "HAVE_$ac_header" | $as_tr_cpp` 1
 
 BUILD_HELPER="NIS"
-for ac_header in sys/types.h rpc/rpc.h rpcsvc/ypclnt.h rpcsvc/yp_prot.h crypt.h
+for ac_header in sys/types.h rpc/rpc.h rpcsvc/ypclnt.h rpcsvc/yp_prot.h rpcsvc/crypt.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "
@@ -35102,8 +35102,10 @@
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
-else $as_nop
-  BUILD_HELPER=""
+# XXX: On FreeBSD we have to do this to make NIS work
+# until https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=188247

 fi
 
 done
@@ -42604,6 +42606,7 @@ fi
 
   # unconditionally requires crypt(3), for now
   if test "x$ac_cv_func_crypt" != "x"; then
-    for ac_header in unistd.h crypt.h shadow.h
+    for ac_header in unistd.h rpcsvc/crypt.h shadow.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -37982,7 +37984,7 @@
   arpa/nameser.h \
   assert.h \
   bstring.h \
-  crypt.h \
+  rpcsvc/crypt.h \
   ctype.h \
   direct.h \
   errno.h \
@@ -38190,6 +38192,7 @@
 #include <netinet/ip.h>
 #endif
 #if HAVE_NETINET_IP_COMPAT_H
+#include <net/if.h>	/* IFNAMSIZ */
 #include <netinet/ip_compat.h>
 #endif
 #if HAVE_NETINET_IP_FIL_H
@@ -39490,6 +39493,7 @@
 
 ac_fn_cxx_check_type "$LINENO" "cpu_set_t" "ac_cv_type_cpu_set_t" "
 #if HAVE_SCHED_H

 #include <sched.h>
 #endif
 
@@ -45611,6 +45614,7 @@ else $as_nop
 #     include <sys/ioccom.h>
 #     include <netinet/in.h>
 
+#     include <net/if.h>	/* IFNAMSIZ */
 #     include <netinet/ip_compat.h>
 #     include <netinet/ip_fil.h>
 #     include <netinet/ip_nat.h>
@@ -42267,6 +42272,7 @@
 #       include <sys/ioccom.h>
 #       include <netinet/in.h>
 #undef minor_t
+#       include <net/if.h>     /* IFNAMSIZ */
 #       include <netinet/ip_compat.h>
 #       include <netinet/ip_fil.h>
 #       include <netinet/ip_nat.h>
@@ -42311,6 +42317,7 @@
 	ip_fil_compat.h \
 	ip_fil.h \
 	ip_nat.h \
+	net/if.h \
 	netinet/ip_compat.h \
 	netinet/ip_fil_compat.h \
 	netinet/ip_fil.h \
@@ -42340,6 +42347,7 @@
 #if HAVE_IP_COMPAT_H
 #include <ip_compat.h>
 #elif HAVE_NETINET_IP_COMPAT_H
+#include <net/if.h>	/* IFNAMSIZ */
 #include <netinet/ip_compat.h>
 #endif
 #if HAVE_IP_FIL_H

Lines 1-5 Link Here

(-)b/www/squid/files/patch-include_squid.h (-2 / +2 lines)
1	--- include/squid.h.orig 2021-05-10 02:02:34.000000000 -0700	1	--- include/squid.h.orig 2021-12-07 14:15:52 UTC
2	+++ include/squid.h 2021-11-29 08:48:04.020714000 -0800	2	+++ include/squid.h
3	@@ -9,6 +9,7 @@	3	@@ -9,6 +9,7 @@
4	#ifndef SQUID_CONFIG_H	4	#ifndef SQUID_CONFIG_H
5	#define SQUID_CONFIG_H	5	#define SQUID_CONFIG_H

Lines 1-6 Link Here

(-)b/www/squid/files/patch-src-cf.data.pre (-2 / +2 lines)
1	--- src/cf.data.pre.orig 2020-04-19 12:38:51 UTC	1	--- src/cf.data.pre.orig 2021-12-07 14:15:52 UTC
2	+++ src/cf.data.pre	2	+++ src/cf.data.pre
3	@@ -5062,6 +5062,10 @@ DEFAULT: @DEFAULT_PID_FILE@	3	@@ -5354,6 +5354,10 @@ DEFAULT: @DEFAULT_PID_FILE@
4	LOC: Config.pidFilename	4	LOC: Config.pidFilename
5	DOC_START	5	DOC_START
6	A filename to write the process-id to. To disable, enter "none".	6	A filename to write the process-id to. To disable, enter "none".

Lines 1-4 Link Here

(-)b/www/squid/files/patch-src_enums.h (-1 / +1 lines)
1	--- src/enums.h.orig 2020-04-19 12:38:51 UTC	1	--- src/enums.h.orig 2020-04-19 10:50:48 UTC
2	+++ src/enums.h	2	+++ src/enums.h
3	@@ -9,6 +9,9 @@	3	@@ -9,6 +9,9 @@
4	#ifndef SQUID_ENUMS_H	4	#ifndef SQUID_ENUMS_H

Lines 1-6 Link Here

(-)b/www/squid/files/patch-src_ip_Intercept.cc (-2 / +2 lines)
1	--- src/ip/Intercept.cc.orig 2018-07-02 03:26:07 UTC	1	--- src/ip/Intercept.cc.orig 2021-12-07 14:15:52 UTC
2	+++ src/ip/Intercept.cc	2	+++ src/ip/Intercept.cc
3	@@ -215,10 +215,10 @@ Ip::Intercept::IpfInterception(const Comm::ConnectionP	3	@@ -211,10 +211,10 @@ Ip::Intercept::IpfInterception(const Comm::ConnectionP
4	newConn->remote.getInAddr(natLookup.nl_outipaddr.in4);	4	newConn->remote.getInAddr(natLookup.nl_outipaddr.in4);
5	}	5	}
6	#else	6	#else

Lines 1-6 Link Here

(-)b/www/squid/files/patch-src_tools.cc (-2 / +2 lines)
1	--- src/tools.cc.orig 2018-06-11 16:30:57 UTC	1	--- src/tools.cc.orig 2021-12-07 14:15:52 UTC
2	+++ src/tools.cc	2	+++ src/tools.cc
3	@@ -605,7 +605,7 @@ no_suid(void)	3	@@ -608,7 +608,7 @@ no_suid(void)
4	uid = geteuid();	4	uid = geteuid();
5	debugs(21, 3, "no_suid: PID " << getpid() << " giving up root privileges forever");	5	debugs(21, 3, "no_suid: PID " << getpid() << " giving up root privileges forever");
6		6

Lines 44-49 libexec/squid/basic_getpwnam_auth Link Here

(-)b/www/squid/pkg-plist (-5 / +52 lines)
44	libexec/squid/basic_fake_auth	44	libexec/squid/basic_fake_auth
45	libexec/squid/basic_db_auth	45	libexec/squid/basic_db_auth
46	%%UNLINKD%%libexec/squid/unlinkd	46	%%UNLINKD%%libexec/squid/unlinkd
		47	%%TDB%%man/man8/ext_time_quota_acl.8.gz
		48	%%TDB%%man/man8/ext_session_acl.8.gz
		49	%%TDB%%libexec/squid/ext_time_quota_acl
		50	%%TDB%%libexec/squid/ext_session_acl
47	%%SSL%%man/man8/security_file_certgen.8.gz	51	%%SSL%%man/man8/security_file_certgen.8.gz
48	%%SSL%%libexec/squid/security_file_certgen	52	%%SSL%%libexec/squid/security_file_certgen
49	%%ICMP%%@(,squid,4510) libexec/squid/pinger	53	%%ICMP%%@(,squid,4510) libexec/squid/pinger
Lines 600-605 libexec/squid/basic_db_auth Link Here
600	%%ETCDIR%%/errors/sr-cyrl-me	604	%%ETCDIR%%/errors/sr-cyrl-me
601	%%ETCDIR%%/errors/sr-cyrl-cs	605	%%ETCDIR%%/errors/sr-cyrl-cs
602	%%ETCDIR%%/errors/sr	606	%%ETCDIR%%/errors/sr
		607	%%ETCDIR%%/errors/spq
603	%%ETCDIR%%/errors/sl/error-details.txt	608	%%ETCDIR%%/errors/sl/error-details.txt
604	%%ETCDIR%%/errors/sl/ERR_ZERO_SIZE_OBJECT	609	%%ETCDIR%%/errors/sl/ERR_ZERO_SIZE_OBJECT
605	%%ETCDIR%%/errors/sl/ERR_WRITE_ERROR	610	%%ETCDIR%%/errors/sl/ERR_WRITE_ERROR
Lines 1719-1725 libexec/squid/basic_db_auth Link Here
1719	%%ETCDIR%%/errors/es-pe	1724	%%ETCDIR%%/errors/es-pe
1720	%%ETCDIR%%/errors/es-pa	1725	%%ETCDIR%%/errors/es-pa
1721	%%ETCDIR%%/errors/es-ni	1726	%%ETCDIR%%/errors/es-ni
1722	%%ETCDIR%%/errors/es-mx	1727	%%ETCDIR%%/errors/es-mx/ERR_ACCESS_DENIED
		1728	%%ETCDIR%%/errors/es-mx/ERR_ACL_TIME_QUOTA_EXCEEDED
		1729	%%ETCDIR%%/errors/es-mx/ERR_AGENT_CONFIGURE
		1730	%%ETCDIR%%/errors/es-mx/ERR_AGENT_WPAD
		1731	%%ETCDIR%%/errors/es-mx/ERR_CACHE_ACCESS_DENIED
		1732	%%ETCDIR%%/errors/es-mx/ERR_CACHE_MGR_ACCESS_DENIED
		1733	%%ETCDIR%%/errors/es-mx/ERR_CANNOT_FORWARD
		1734	%%ETCDIR%%/errors/es-mx/ERR_CONFLICT_HOST
		1735	%%ETCDIR%%/errors/es-mx/ERR_CONNECT_FAIL
		1736	%%ETCDIR%%/errors/es-mx/ERR_DIR_LISTING
		1737	%%ETCDIR%%/errors/es-mx/ERR_DNS_FAIL
		1738	%%ETCDIR%%/errors/es-mx/ERR_ESI
		1739	%%ETCDIR%%/errors/es-mx/ERR_FORWARDING_DENIED
		1740	%%ETCDIR%%/errors/es-mx/ERR_FTP_DISABLED
		1741	%%ETCDIR%%/errors/es-mx/ERR_FTP_FAILURE
		1742	%%ETCDIR%%/errors/es-mx/ERR_FTP_FORBIDDEN
		1743	%%ETCDIR%%/errors/es-mx/ERR_FTP_NOT_FOUND
		1744	%%ETCDIR%%/errors/es-mx/ERR_FTP_PUT_CREATED
		1745	%%ETCDIR%%/errors/es-mx/ERR_FTP_PUT_ERROR
		1746	%%ETCDIR%%/errors/es-mx/ERR_FTP_PUT_MODIFIED
		1747	%%ETCDIR%%/errors/es-mx/ERR_FTP_UNAVAILABLE
		1748	%%ETCDIR%%/errors/es-mx/ERR_GATEWAY_FAILURE
		1749	%%ETCDIR%%/errors/es-mx/ERR_ICAP_FAILURE
		1750	%%ETCDIR%%/errors/es-mx/ERR_INVALID_REQ
		1751	%%ETCDIR%%/errors/es-mx/ERR_INVALID_RESP
		1752	%%ETCDIR%%/errors/es-mx/ERR_INVALID_URL
		1753	%%ETCDIR%%/errors/es-mx/ERR_LIFETIME_EXP
		1754	%%ETCDIR%%/errors/es-mx/ERR_NO_RELAY
		1755	%%ETCDIR%%/errors/es-mx/ERR_ONLY_IF_CACHED_MISS
		1756	%%ETCDIR%%/errors/es-mx/ERR_PRECONDITION_FAILED
		1757	%%ETCDIR%%/errors/es-mx/ERR_PROTOCOL_UNKNOWN
		1758	%%ETCDIR%%/errors/es-mx/ERR_READ_ERROR
		1759	%%ETCDIR%%/errors/es-mx/ERR_READ_TIMEOUT
		1760	%%ETCDIR%%/errors/es-mx/ERR_SECURE_CONNECT_FAIL
		1761	%%ETCDIR%%/errors/es-mx/ERR_SHUTTING_DOWN
		1762	%%ETCDIR%%/errors/es-mx/ERR_SOCKET_FAILURE
		1763	%%ETCDIR%%/errors/es-mx/ERR_TOO_BIG
		1764	%%ETCDIR%%/errors/es-mx/ERR_UNSUP_HTTPVERSION
		1765	%%ETCDIR%%/errors/es-mx/ERR_UNSUP_REQ
		1766	%%ETCDIR%%/errors/es-mx/ERR_URN_RESOLVE
		1767	%%ETCDIR%%/errors/es-mx/ERR_WRITE_ERROR
		1768	%%ETCDIR%%/errors/es-mx/ERR_ZERO_SIZE_OBJECT
		1769	%%ETCDIR%%/errors/es-mx/error-details.txt
1723	%%ETCDIR%%/errors/es-hn	1770	%%ETCDIR%%/errors/es-hn
1724	%%ETCDIR%%/errors/es-gt	1771	%%ETCDIR%%/errors/es-gt
1725	%%ETCDIR%%/errors/es-es	1772	%%ETCDIR%%/errors/es-es
Lines 1728-1733 libexec/squid/basic_db_auth Link Here
1728	%%ETCDIR%%/errors/es-cr	1775	%%ETCDIR%%/errors/es-cr
1729	%%ETCDIR%%/errors/es-co	1776	%%ETCDIR%%/errors/es-co
1730	%%ETCDIR%%/errors/es-cl	1777	%%ETCDIR%%/errors/es-cl
		1778	%%ETCDIR%%/errors/es-cu
		1779	%%ETCDIR%%/errors/es-bz
1731	%%ETCDIR%%/errors/es-bo	1780	%%ETCDIR%%/errors/es-bo
1732	%%ETCDIR%%/errors/es-ar	1781	%%ETCDIR%%/errors/es-ar
1733	%%ETCDIR%%/errors/en/error-details.txt	1782	%%ETCDIR%%/errors/en/error-details.txt
Lines 2204-2213 libexec/squid/basic_db_auth Link Here
2204	%%ETCDIR%%/errors/af/ERR_AGENT_CONFIGURE	2253	%%ETCDIR%%/errors/af/ERR_AGENT_CONFIGURE
2205	%%ETCDIR%%/errors/af/ERR_ACL_TIME_QUOTA_EXCEEDED	2254	%%ETCDIR%%/errors/af/ERR_ACL_TIME_QUOTA_EXCEEDED
2206	%%ETCDIR%%/errors/af/ERR_ACCESS_DENIED	2255	%%ETCDIR%%/errors/af/ERR_ACCESS_DENIED
2207	%%BDB%%man/man8/ext_time_quota_acl.8.gz
2208	%%BDB%%man/man8/ext_session_acl.8.gz
2209	%%BDB%%libexec/squid/ext_time_quota_acl
2210	%%BDB%%libexec/squid/ext_session_acl
2211	%%AUTH_SQL%%man/man8/ext_sql_session_acl.8.gz	2256	%%AUTH_SQL%%man/man8/ext_sql_session_acl.8.gz
2212	%%AUTH_SQL%%libexec/squid/ext_sql_session_acl	2257	%%AUTH_SQL%%libexec/squid/ext_sql_session_acl
2213	%%AUTH_SMB%%man/man8/ext_wbinfo_group_acl.8.gz	2258	%%AUTH_SMB%%man/man8/ext_wbinfo_group_acl.8.gz
Lines 2229-2234 libexec/squid/basic_db_auth Link Here
2229	%%AUTH_KERB%%libexec/squid/negotiate_wrapper_auth	2274	%%AUTH_KERB%%libexec/squid/negotiate_wrapper_auth
2230	%%AUTH_KERB%%libexec/squid/negotiate_kerberos_auth_test	2275	%%AUTH_KERB%%libexec/squid/negotiate_kerberos_auth_test
2231	%%AUTH_KERB%%libexec/squid/negotiate_kerberos_auth	2276	%%AUTH_KERB%%libexec/squid/negotiate_kerberos_auth
		2277	%%AUTH_KERB%%%%AUTH_LDAP%%%%AUTH_SASL%%man/man8/ext_kerberos_sid_group_acl.8.gz
		2278	%%AUTH_KERB%%%%AUTH_LDAP%%%%AUTH_SASL%%libexec/squid/ext_kerberos_sid_group_acl
2232	%%AUTH_KERB%%%%AUTH_LDAP%%%%AUTH_SASL%%libexec/squid/ext_kerberos_ldap_group_acl	2279	%%AUTH_KERB%%%%AUTH_LDAP%%%%AUTH_SASL%%libexec/squid/ext_kerberos_ldap_group_acl
2233	%%AUTH_KERB%%%%AUTH_LDAP%%%%AUTH_SASL%%libexec/squid/cert_tool	2280	%%AUTH_KERB%%%%AUTH_LDAP%%%%AUTH_SASL%%libexec/squid/cert_tool
2234	@sample %%ETCDIR%%/squid.conf.sample	2281	@sample %%ETCDIR%%/squid.conf.sample

Return to bug 260927

Lines 1-22 Link Here

(-)b/www/squid/Makefile (-33 / +18 lines)
1	PORTNAME= squid	1	PORTNAME= squid
2	DISTVERSION= 4.15	2	DISTVERSION= 5.3
3	CATEGORIES= www	3	CATEGORIES= www
4	MASTER_SITES= http://www2.pl.squid-cache.org/Versions/v4/ \	4	MASTER_SITES= http://www2.pl.squid-cache.org/Versions/v5/ \
5	http://ca.squid-cache.org/Versions/v4/ \	5	http://www1.il.squid-cache.org/Versions/v5/ \
6	http://www1.il.squid-cache.org/Versions/v4/ \	6	http://www1.jp.squid-cache.org/Versions/v5/ \
7	http://www1.jp.squid-cache.org/Versions/v4/ \	7	http://www2.gr.squid-cache.org/Versions/v5/ \
8	http://www2.gr.squid-cache.org/Versions/v4/ \	8	http://ca2.squid-cache.org/Versions/v5/ \
9	http://ca2.squid-cache.org/Versions/v4/ \	9	http://www.squid-cache.org/Versions/v5/
10	http://www.squid-cache.org/Versions/v4/
11		10
12	PATCH_SITES= http://www2.pl.squid-cache.org/%SUBDIR%/ \	11	PATCH_SITES= http://www2.pl.squid-cache.org/%SUBDIR%/ \
13	http://ca.squid-cache.org/%SUBDIR%/ \
14	http://www1.il.squid-cache.org/%SUBDIR%/ \	12	http://www1.il.squid-cache.org/%SUBDIR%/ \
15	http://www1.jp.squid-cache.org/%SUBDIR%/ \	13	http://www1.jp.squid-cache.org/%SUBDIR%/ \
16	http://www2.gr.squid-cache.org/%SUBDIR%/ \	14	http://www2.gr.squid-cache.org/%SUBDIR%/ \
17	http://ca2.squid-cache.org/%SUBDIR%/ \	15	http://ca2.squid-cache.org/%SUBDIR%/ \
18	http://www.squid-cache.org/%SUBDIR%/	16	http://www.squid-cache.org/%SUBDIR%/
19	PATCH_SITE_SUBDIR= Versions/v4/changesets	17	PATCH_SITE_SUBDIR= Versions/v5/changesets
20		18
21	MAINTAINER= timp87@gmail.com	19	MAINTAINER= timp87@gmail.com
22	COMMENT= HTTP Caching Proxy	20	COMMENT= HTTP Caching Proxy
Lines 24-32 COMMENT= HTTP Caching Proxy Link Here
24	LICENSE= GPLv2	22	LICENSE= GPLv2
25	LICENSE_FILE= ${WRKSRC}/COPYING	23	LICENSE_FILE= ${WRKSRC}/COPYING
26		24
27	USES= compiler:c++11-lib cpe perl5 shebangfix tar:xz	25	USES= compiler:c++11-lib cpe gmake localbase:ldflags perl5 shebangfix tar:xz
28		26
29	CONFLICTS= squid3 squid-devel	27	CONFLICTS= squid-devel
30	CPE_VENDOR= squid-cache	28	CPE_VENDOR= squid-cache
31	SHEBANG_FILES= scripts/.pl contrib/.pl tools/*.pl	29	SHEBANG_FILES= scripts/.pl contrib/.pl tools/*.pl
32	GNU_CONFIGURE= yes	30	GNU_CONFIGURE= yes
Lines 45-51 OPTIONS_GROUP= AUTH Link Here
45	OPTIONS_RADIO= FW	43	OPTIONS_RADIO= FW
46	OPTIONS_GROUP_AUTH=AUTH_LDAP AUTH_NIS AUTH_SASL AUTH_SMB AUTH_SQL	44	OPTIONS_GROUP_AUTH=AUTH_LDAP AUTH_NIS AUTH_SASL AUTH_SMB AUTH_SQL
47	OPTIONS_RADIO_FW=TP_IPF TP_IPFW TP_PF	45	OPTIONS_RADIO_FW=TP_IPF TP_IPFW TP_PF
48	OPTIONS_DEFINE= ARP_ACL BDB CACHE_DIGESTS DEBUG DELAY_POOLS DOCS ECAP ESI EXAMPLES \	46	OPTIONS_DEFINE= ARP_ACL TDB CACHE_DIGESTS DEBUG DELAY_POOLS DOCS ECAP ESI EXAMPLES \
49	FOLLOW_XFF FS_AUFS FS_DISKD FS_ROCK HTCP ICAP ICMP IDENT IPV6 \	47	FOLLOW_XFF FS_AUFS FS_DISKD FS_ROCK HTCP ICAP ICMP IDENT IPV6 \
50	KQUEUE LARGEFILE LAX_HTTP NETTLE SNMP SSL SSL_CRTD \	48	KQUEUE LARGEFILE LAX_HTTP NETTLE SNMP SSL SSL_CRTD \
51	STACKTRACES VIA_DB WCCP WCCPV2	49	STACKTRACES VIA_DB WCCP WCCPV2
Lines 59-88 OPTIONS_DEFAULT=ARP_ACL AUTH_NIS CACHE_DIGESTS DELAY_POOLS FOLLOW_XFF FS_AUFS \ Link Here
59	WCCPV2	57	WCCPV2
60		58
61	ARP_ACL_CONFIGURE_ENABLE= eui	59	ARP_ACL_CONFIGURE_ENABLE= eui
62	AUTH_LDAP_CFLAGS= -I${LOCALBASE}/include
63	AUTH_LDAP_LDFLAGS= -L${LOCALBASE}/lib
64	AUTH_LDAP_USE= OPENLDAP=yes	60	AUTH_LDAP_USE= OPENLDAP=yes
65	AUTH_LDAP_VARS= BASIC_AUTH+=LDAP DIGEST_AUTH+="eDirectory LDAP" EXTERNAL_ACL+="LDAP_group eDirectory_userip"	61	AUTH_LDAP_VARS= BASIC_AUTH+=LDAP DIGEST_AUTH+="eDirectory LDAP" EXTERNAL_ACL+="LDAP_group eDirectory_userip"
66	AUTH_SASL_CFLAGS= -I${LOCALBASE}/include
67	AUTH_SASL_CPPFLAGS= -I${LOCALBASE}/include
68	AUTH_SASL_LDFLAGS= -L${LOCALBASE}/lib
69	AUTH_SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2	62	AUTH_SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2
70	AUTH_SASL_VARS= BASIC_AUTH+=SASL	63	AUTH_SASL_VARS= BASIC_AUTH+=SASL
71	AUTH_SMB_USES= samba:run	64	AUTH_SMB_USES= samba:run
72	AUTH_SMB_VARS= BASIC_AUTH+=SMB EXTERNAL_ACL+=wbinfo_group	65	AUTH_SMB_VARS= BASIC_AUTH+=SMB EXTERNAL_ACL+=wbinfo_group
73	AUTH_SQL_RUN_DEPENDS= p5-DBI>=1.08:databases/p5-DBI	66	AUTH_SQL_RUN_DEPENDS= p5-DBI>=1.08:databases/p5-DBI
74	AUTH_SQL_VARS= EXTERNAL_ACL+=SQL_session	67	AUTH_SQL_VARS= EXTERNAL_ACL+=SQL_session
75	BDB_USES= bdb	68	TDB_CONFIGURE_ENABLE= tdb
		69	TDB_LIB_DEPENDS= libtdb.so:databases/tdb
		70	TDB_VARS= EXTERNAL_ACL+="time_quota session"
76	CACHE_DIGESTS_CONFIGURE_ENABLE= cache-digests	71	CACHE_DIGESTS_CONFIGURE_ENABLE= cache-digests
77	DELAY_POOLS_CONFIGURE_ENABLE= delay-pools	72	DELAY_POOLS_CONFIGURE_ENABLE= delay-pools
78	ECAP_CFLAGS= -I${LOCALBASE}/include
79	ECAP_CONFIGURE_ENABLE= ecap	73	ECAP_CONFIGURE_ENABLE= ecap
80	ECAP_LDFLAGS= -L${LOCALBASE}/lib
81	ECAP_LIB_DEPENDS= libecap.so:www/libecap	74	ECAP_LIB_DEPENDS= libecap.so:www/libecap
82	ECAP_USES= pkgconfig:build	75	ECAP_USES= pkgconfig:build
83	ESI_CFLAGS= -I${LOCALBASE}/include -I${LOCALBASE}/include/libxml2
84	ESI_CONFIGURE_ENABLE= esi	76	ESI_CONFIGURE_ENABLE= esi
85	ESI_LDFLAGS= -L${LOCALBASE}/lib
86	ESI_LIB_DEPENDS= libexpat.so:textproc/expat2 \	77	ESI_LIB_DEPENDS= libexpat.so:textproc/expat2 \
87	libxml2.so:textproc/libxml2	78	libxml2.so:textproc/libxml2
88	FOLLOW_XFF_CONFIGURE_ENABLE= follow-x-forwarded-for	79	FOLLOW_XFF_CONFIGURE_ENABLE= follow-x-forwarded-for
Lines 116-122 STACKTRACES_CONFIGURE_ENABLE= stacktraces Link Here
116	STACKTRACES_EXTRA_PATCHES= ${FILESDIR}/extra-patch-gen-stacktrace	107	STACKTRACES_EXTRA_PATCHES= ${FILESDIR}/extra-patch-gen-stacktrace
117	STACKTRACES_LIB_DEPENDS= libunwind.so:devel/libunwind	108	STACKTRACES_LIB_DEPENDS= libunwind.so:devel/libunwind
118	STACKTRACES_CFLAGS= -g	109	STACKTRACES_CFLAGS= -g
119	STACKTRACES_LDFLAGS= -lunwind -L${LOCALBASE}/lib	110	STACKTRACES_LDFLAGS= -lunwind
120	STACKTRACES_VARS= STRIP=""	111	STACKTRACES_VARS= STRIP=""
121	TP_IPFW_CONFIGURE_ENABLE= ipfw-transparent	112	TP_IPFW_CONFIGURE_ENABLE= ipfw-transparent
122	TP_IPF_CONFIGURE_ENABLE= ipf-transparent	113	TP_IPF_CONFIGURE_ENABLE= ipf-transparent
Lines 155-161 AUTH_NIS_DESC= Install NIS/YP authentication helpers Link Here
155	AUTH_SASL_DESC= Install SASL authentication helpers	146	AUTH_SASL_DESC= Install SASL authentication helpers
156	AUTH_SMB_DESC= Install SMB auth. helpers (req. Samba)	147	AUTH_SMB_DESC= Install SMB auth. helpers (req. Samba)
157	AUTH_SQL_DESC= Install SQL based auth	148	AUTH_SQL_DESC= Install SQL based auth
158	BDB_DESC= Berkeley DB support required for session and time quota external helpers	149	TDB_DESC= TrivialDB support required for session and time quota external helpers
159	CACHE_DIGESTS_DESC= Use cache digests	150	CACHE_DIGESTS_DESC= Use cache digests
160	DEBUG_DESC= Build with extended debugging support	151	DEBUG_DESC= Build with extended debugging support
161	DELAY_POOLS_DESC= Delay pools (bandwidth limiting)	152	DELAY_POOLS_DESC= Delay pools (bandwidth limiting)
Lines 248-266 NEGOTIATE_AUTH= none Link Here
248	PLIST_SUB+= AUTH_KERB="@comment "	239	PLIST_SUB+= AUTH_KERB="@comment "
249	.else	240	.else
250	# The kerberos_ldap_group external helper also depends on LDAP and SASL:	241	# The kerberos_ldap_group external helper also depends on LDAP and SASL:
		242	# The kerberos_sid_group external helper depends on kerberos_ldap_group meanwhile
251	. if ${PORT_OPTIONS:MAUTH_LDAP} && ${PORT_OPTIONS:MAUTH_SASL}	243	. if ${PORT_OPTIONS:MAUTH_LDAP} && ${PORT_OPTIONS:MAUTH_SASL}
252	EXTERNAL_ACL+= kerberos_ldap_group	244	EXTERNAL_ACL+= kerberos_ldap_group kerberos_sid_group
253	. endif	245	. endif
254	NEGOTIATE_AUTH= kerberos wrapper	246	NEGOTIATE_AUTH= kerberos wrapper
255	.endif	247	.endif
256		248
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
264	# Storage schemes:	249	# Storage schemes:
265	STORAGE_SCHEMES+= ufs	250	STORAGE_SCHEMES+= ufs
266	DISKIO_MODULES+= AIO Blocking IpcIo Mmapped	251	DISKIO_MODULES+= AIO Blocking IpcIo Mmapped

Lines 1-19 Link Here

(-)b/www/squid/files/patch-configure (-67 / +8 lines)
1	--- configure.orig 2021-05-10 03:35:34.000000000 -0700	1	--- configure.orig 2021-12-07 14:11:12 UTC
2	+++ configure 2021-11-29 12:11:20.139764000 -0800	2	+++ configure
3	@@ -35087,7 +35087,7 @@	3	@@ -36683,8 +36683,10 @@ then :
4	##	4	#define `printf "%s\n" "HAVE_$ac_header" \| $as_tr_cpp` 1
5
6	BUILD_HELPER="NIS"
7	-for ac_header in sys/types.h rpc/rpc.h rpcsvc/ypclnt.h rpcsvc/yp_prot.h crypt.h
8	+for ac_header in sys/types.h rpc/rpc.h rpcsvc/ypclnt.h rpcsvc/yp_prot.h rpcsvc/crypt.h
9	do :
10	as_ac_Header=`$as_echo "ac_cv_header_$ac_header" \| $as_tr_sh`
11	ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "
12	@@ -35102,8 +35102,10 @@
13	#define `$as_echo "HAVE_$ac_header" \| $as_tr_cpp` 1
14	_ACEOF	5	_ACEOF
15		6
16	-else	7	-else $as_nop
17	- BUILD_HELPER=""	8	- BUILD_HELPER=""
18	+# XXX: On FreeBSD we have to do this to make NIS work	9	+# XXX: On FreeBSD we have to do this to make NIS work
19	+# until https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=188247	10	+# until https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=188247
Lines 22-54 Link Here
22	fi	13	fi
23		14
24	done	15	done
25	@@ -35576,7 +35578,7 @@	16	@@ -42604,6 +42606,7 @@ fi
26
27	# unconditionally requires crypt(3), for now
28	if test "x$ac_cv_func_crypt" != "x"; then
29	- for ac_header in unistd.h crypt.h shadow.h
30	+ for ac_header in unistd.h rpcsvc/crypt.h shadow.h
31	do :
32	as_ac_Header=`$as_echo "ac_cv_header_$ac_header" \| $as_tr_sh`
33	ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
34	@@ -37982,7 +37984,7 @@
35	arpa/nameser.h \
36	assert.h \
37	bstring.h \
38	- crypt.h \
39	+ rpcsvc/crypt.h \
40	ctype.h \
41	direct.h \
42	errno.h \
43	@@ -38190,6 +38192,7 @@
44	#include <netinet/ip.h>
45	#endif
46	#if HAVE_NETINET_IP_COMPAT_H
47	+#include <net/if.h> /* IFNAMSIZ */
48	#include <netinet/ip_compat.h>
49	#endif
50	#if HAVE_NETINET_IP_FIL_H
51	@@ -39490,6 +39493,7 @@
52		17
53	ac_fn_cxx_check_type "$LINENO" "cpu_set_t" "ac_cv_type_cpu_set_t" "	18	ac_fn_cxx_check_type "$LINENO" "cpu_set_t" "ac_cv_type_cpu_set_t" "
54	#if HAVE_SCHED_H	19	#if HAVE_SCHED_H
Lines 56-90 Link Here
56	#include <sched.h>	21	#include <sched.h>
57	#endif	22	#endif
58		23
59	@@ -42237,6 +42241,7 @@	24	@@ -45611,6 +45614,7 @@ else $as_nop
60	# include <sys/ioccom.h>
61	# include <netinet/in.h>
62
63	+# include <net/if.h> /* IFNAMSIZ */
64	# include <netinet/ip_compat.h>
65	# include <netinet/ip_fil.h>
66	# include <netinet/ip_nat.h>
67	@@ -42267,6 +42272,7 @@
68	# include <sys/ioccom.h>	25	# include <sys/ioccom.h>
69	# include <netinet/in.h>	26	# include <netinet/in.h>
70	#undef minor_t	27	#undef minor_t
71	+# include <net/if.h> /* IFNAMSIZ */	28	+# include <net/if.h> /* IFNAMSIZ */
72	# include <netinet/ip_compat.h>	29	# include <netinet/ip_compat.h>
73	# include <netinet/ip_fil.h>	30	# include <netinet/ip_fil.h>
74	# include <netinet/ip_nat.h>	31	# include <netinet/ip_nat.h>
75	@@ -42311,6 +42317,7 @@
76	ip_fil_compat.h \
77	ip_fil.h \
78	ip_nat.h \
79	+ net/if.h \
80	netinet/ip_compat.h \
81	netinet/ip_fil_compat.h \
82	netinet/ip_fil.h \
83	@@ -42340,6 +42347,7 @@
84	#if HAVE_IP_COMPAT_H
85	#include <ip_compat.h>
86	#elif HAVE_NETINET_IP_COMPAT_H
87	+#include <net/if.h> /* IFNAMSIZ */
88	#include <netinet/ip_compat.h>
89	#endif
90	#if HAVE_IP_FIL_H