Attachment #216115 for bug #247397

Lines 1-8 Link Here

(-)squid/Makefile (-2 / +1 lines)
1	# $FreeBSD: head/www/squid/Makefile 535391 2020-05-16 10:51:32Z sunpoet $	1	# $FreeBSD: head/www/squid/Makefile 535391 2020-05-16 10:51:32Z sunpoet $
2		2
3	PORTNAME= squid	3	PORTNAME= squid
4	PORTVERSION= 4.11	4	PORTVERSION= 4.12
5	PORTREVISION= 2
6	CATEGORIES= www	5	CATEGORIES= www
7	MASTER_SITES= http://www.squid-cache.org/Versions/v4/ \	6	MASTER_SITES= http://www.squid-cache.org/Versions/v4/ \
8	http://www2.us.squid-cache.org/Versions/v4/ \	7	http://www2.us.squid-cache.org/Versions/v4/ \

Lines 1-3 Link Here

(-)squid/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1588493552	1	TIMESTAMP = 1592288810
2	SHA256 (squid-4.11.tar.xz) = 4ed947612410263f57ad0e39bfd087e60fb714f028d7d3b0e469943efd34287d	2	SHA256 (squid-4.12.tar.xz) = f42a03c8b3dc020722c88bf1a87da8cb0c087b2f66b41d8256c77ee1b527e317
3	SIZE (squid-4.11.tar.xz) = 2447700	3	SIZE (squid-4.12.tar.xz) = 2450564




--- configure.orig	2020-06-09 06:58:26 UTC
+++ configure
@@ -35068,7 +35068,7 @@ done
 ##
 
 BUILD_HELPER="NIS"

 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" "
@@ -35083,8 +35083,10 @@ if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 

 fi
 
 done
@@ -35557,7 +35559,7 @@ done
 
   # unconditionally requires crypt(3), for now
   if test "x$ac_cv_func_crypt" != "x"; then

 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"
@@ -38321,7 +38323,7 @@ for ac_header in \
   arpa/nameser.h \
   assert.h \
   bstring.h \

   ctype.h \
   direct.h \
   errno.h \
@@ -38529,6 +38531,7 @@ ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" 
 #include <netinet/ip.h>
 #endif
 #if HAVE_NETINET_IP_COMPAT_H

 #include <netinet/ip_compat.h>
 #endif
 #if HAVE_NETINET_IP_FIL_H
@@ -42576,6 +42579,7 @@ if test "x$enable_ipf_transparent" != "xno" ; then
 #     include <sys/ioccom.h>
 #     include <netinet/in.h>
 

 #     include <netinet/ip_compat.h>
 #     include <netinet/ip_fil.h>
 #     include <netinet/ip_nat.h>
@@ -42606,6 +42610,7 @@ else
 #       include <sys/ioccom.h>
 #       include <netinet/in.h>
 #undef minor_t

 #       include <netinet/ip_compat.h>
 #       include <netinet/ip_fil.h>
 #       include <netinet/ip_nat.h>
@@ -42650,6 +42655,7 @@ _ACEOF
 	ip_fil_compat.h \
 	ip_fil.h \
 	ip_nat.h \

 	netinet/ip_compat.h \
 	netinet/ip_fil_compat.h \
 	netinet/ip_fil.h \
@@ -42679,6 +42685,7 @@ ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" 
 #if HAVE_IP_COMPAT_H
 #include <ip_compat.h>
 #elif HAVE_NETINET_IP_COMPAT_H

 #include <netinet/ip_compat.h>
 #endif
 #if HAVE_IP_FIL_H
@@ -42749,7 +42756,7 @@ _ACEOF
 
 
 fi
-ac_fn_cxx_check_member "$LINENO" "struct natlookup" "nl_realipaddr.in6" "ac_cv_member_struct_natlookup_nl_realipaddr_in6" "
+ac_fn_cxx_check_member "$LINENO" "struct natlookup" "nl_realipaddr.in6" "ac_cv_member_struct_natlookup_nl_realipaddr_in6__" "
+ac_fn_cxx_check_member "$LINENO" "struct natlookup" "nl_realipaddr.in6" "ac_cv_member_struct_natlookup_nl_realipaddr_in6___" "
 #if USE_SOLARIS_IPFILTER_MINOR_T_HACK
 #define minor_t fubar
 #endif




--- src/acl/external/eDirectory_userip/ext_edirectory_userip_acl.cc.orig	2020-04-19 12:38:51 UTC
+++ src/acl/external/eDirectory_userip/ext_edirectory_userip_acl.cc
@@ -69,6 +69,12 @@
 #ifdef HAVE_NETDB_H
 #include <netdb.h>
 #endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
 
 #ifdef HELPER_INPUT_BUFFER
 #define EDUI_MAXLEN     HELPER_INPUT_BUFFER




--- src/acl/external/kerberos_ldap_group/support_krb5.cc.orig	2020-04-19 12:38:51 UTC
+++ src/acl/external/kerberos_ldap_group/support_krb5.cc
@@ -467,10 +467,15 @@ krb5_create_cache(char *domain, char *service_principa
                 }
 
                 // overwrite limitation of enctypes
+#if USE_HEIMDAL_KRB5
+                creds->session.keytype = 0;
+                if (creds->session.keyvalue.length>0)
+                    krb5_free_keyblock_contents(kparam.context, &creds->session);
+#else
                 creds->keyblock.enctype = 0;
                 if (creds->keyblock.contents)
                     krb5_free_keyblock_contents(kparam.context, &creds->keyblock);
-
+#endif
                 code = krb5_get_credentials(kparam.context, 0, kparam.cc[ccindex], creds, &tgt_creds);
                 if (code) {
                     k5_error("Error while getting tgt", code);

Lines 29-34 Link Here

(-)squid/files/squid.in (+24 lines)
29	# you want to run Squid in reverse proxy setups or if you want	29	# you want to run Squid in reverse proxy setups or if you want
30	# Squid to listen on a "privileged" port < 1024.	30	# Squid to listen on a "privileged" port < 1024.
31	#	31	#
		32	# squid_group: The group id that should be used to run the Squid master
		33	# process. Default: squid
		34	# Note that it affects squid pid dir also, where SHM files
		35	# may be stored on some OS (see r391555)
		36	#
		37	# squid_maxwait: Seconds to wait for squid PID file
		38	# Default: 10
		39	#
32	# squid_pidfile:	40	# squid_pidfile:
33	# The name (including the full path) of the Squid	41	# The name (including the full path) of the Squid
34	# master process' PID file.	42	# master process' PID file.
Lines 74-80 Link Here
74	: ${squid_enable:=NO}	82	: ${squid_enable:=NO}
75	: ${squid_program:=%%PREFIX%%/sbin/squid}	83	: ${squid_program:=%%PREFIX%%/sbin/squid}
76	: ${squid_pidfile:=/var/run/squid/squid.pid}	84	: ${squid_pidfile:=/var/run/squid/squid.pid}
		85	: ${squid_maxwait:=10}
77	: ${squid_user:=squid}	86	: ${squid_user:=squid}
		87	: ${squid_group:=squid}
78		88
79	required_args="-f ${squid_conf}"	89	required_args="-f ${squid_conf}"
80	required_dirs=$chdir	90	required_dirs=$chdir
Lines 87-92 Link Here
87		97
88	squid_prestart()	98	squid_prestart()
89	{	99	{
		100	# create piddir if it's missing (for example if /var/run is tmpfs)
		101	squid_piddir=${pidfile%/*}
		102	if [ ! -d "${squid_piddir}" ]; then
		103	echo "Creating PID directory ${squid_piddir}"
		104	mkdir ${squid_piddir} && chown ${squid_user}:${squid_group} ${squid_piddir} && chmod 750 ${squid_piddir}\|\| return $?
		105	fi
		106
90	# setup KRB5_KTNAME:	107	# setup KRB5_KTNAME:
91	squid_krb5_ktname=${squid_krb5_ktname:-"NONE"}	108	squid_krb5_ktname=${squid_krb5_ktname:-"NONE"}
92	if [ "${squid_krb5_ktname}" != "NONE" ]; then	109	if [ "${squid_krb5_ktname}" != "NONE" ]; then
Lines 137-144 Link Here
137	# retrieve the PID of the Squid master process explicitly here	154	# retrieve the PID of the Squid master process explicitly here
138	# in case rc.subr was unable to determine it:	155	# in case rc.subr was unable to determine it:
139	if [ -z "$rc_pid" ]; then	156	if [ -z "$rc_pid" ]; then
		157	squid_secs=0
140	while ! [ -f ${pidfile} ]; do	158	while ! [ -f ${pidfile} ]; do
		159	if [ ${squid_maxwait} -le ${squid_secs} ]; then
		160	echo "give up waiting for pidfile"
		161	break
		162	fi
141	sleep 1	163	sleep 1
		164	echo -n "."
		165	: $(( squid_secs+=1 ))
142	done	166	done
143	read _pid _junk <${pidfile}	167	read _pid _junk <${pidfile}
144	[ -z "${_pid}" ] \|\| pid=${_pid}	168	[ -z "${_pid}" ] \|\| pid=${_pid}

Return to bug 247397

Lines 1-6 Link Here

(-)squid/files/patch-configure (-14 / +13 lines)
1	--- configure.orig 2020-04-19 12:39:06 UTC	1	--- configure.orig 2020-06-09 06:58:26 UTC
2	+++ configure	2	+++ configure
3	@@ -35077,7 +35077,7 @@ done	3	@@ -35068,7 +35068,7 @@ done
4	##	4	##
5		5
6	BUILD_HELPER="NIS"	6	BUILD_HELPER="NIS"
Lines 9-15 Link Here
9	do :	9	do :
10	as_ac_Header=`$as_echo "ac_cv_header_$ac_header" \| $as_tr_sh`	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" "	11	ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "
12	@@ -35092,8 +35092,10 @@ if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :	12	@@ -35083,8 +35083,10 @@ if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
13	#define `$as_echo "HAVE_$ac_header" \| $as_tr_cpp` 1	13	#define `$as_echo "HAVE_$ac_header" \| $as_tr_cpp` 1
14	_ACEOF	14	_ACEOF
15		15
Lines 22-28 Link Here
22	fi	22	fi
23		23
24	done	24	done
25	@@ -35566,7 +35568,7 @@ done	25	@@ -35557,7 +35559,7 @@ done
26		26
27	# unconditionally requires crypt(3), for now	27	# unconditionally requires crypt(3), for now
28	if test "x$ac_cv_func_crypt" != "x"; then	28	if test "x$ac_cv_func_crypt" != "x"; then
Lines 31-37 Link Here
31	do :	31	do :
32	as_ac_Header=`$as_echo "ac_cv_header_$ac_header" \| $as_tr_sh`	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"	33	ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
34	@@ -37958,7 +37960,7 @@ for ac_header in \	34	@@ -38321,7 +38323,7 @@ for ac_header in \
35	arpa/nameser.h \	35	arpa/nameser.h \
36	assert.h \	36	assert.h \
37	bstring.h \	37	bstring.h \
Lines 40-46 Link Here
40	ctype.h \	40	ctype.h \
41	direct.h \	41	direct.h \
42	errno.h \	42	errno.h \
43	@@ -38166,6 +38168,7 @@ ac_fn_cxx_check_header_compile "$LINENO" "$ac_header"	43	@@ -38529,6 +38531,7 @@ ac_fn_cxx_check_header_compile "$LINENO" "$ac_header"
44	#include <netinet/ip.h>	44	#include <netinet/ip.h>
45	#endif	45	#endif
46	#if HAVE_NETINET_IP_COMPAT_H	46	#if HAVE_NETINET_IP_COMPAT_H
Lines 48-54 Link Here
48	#include <netinet/ip_compat.h>	48	#include <netinet/ip_compat.h>
49	#endif	49	#endif
50	#if HAVE_NETINET_IP_FIL_H	50	#if HAVE_NETINET_IP_FIL_H
51	@@ -42213,6 +42216,7 @@ if test "x$enable_ipf_transparent" != "xno" ; then	51	@@ -42576,6 +42579,7 @@ if test "x$enable_ipf_transparent" != "xno" ; then
52	# include <sys/ioccom.h>	52	# include <sys/ioccom.h>
53	# include <netinet/in.h>	53	# include <netinet/in.h>
54		54
Lines 56-62 Link Here
56	# include <netinet/ip_compat.h>	56	# include <netinet/ip_compat.h>
57	# include <netinet/ip_fil.h>	57	# include <netinet/ip_fil.h>
58	# include <netinet/ip_nat.h>	58	# include <netinet/ip_nat.h>
59	@@ -42243,6 +42247,7 @@ else	59	@@ -42606,6 +42610,7 @@ else
60	# include <sys/ioccom.h>	60	# include <sys/ioccom.h>
61	# include <netinet/in.h>	61	# include <netinet/in.h>
62	#undef minor_t	62	#undef minor_t
Lines 64-70 Link Here
64	# include <netinet/ip_compat.h>	64	# include <netinet/ip_compat.h>
65	# include <netinet/ip_fil.h>	65	# include <netinet/ip_fil.h>
66	# include <netinet/ip_nat.h>	66	# include <netinet/ip_nat.h>
67	@@ -42287,6 +42292,7 @@ _ACEOF	67	@@ -42650,6 +42655,7 @@ _ACEOF
68	ip_fil_compat.h \	68	ip_fil_compat.h \
69	ip_fil.h \	69	ip_fil.h \
70	ip_nat.h \	70	ip_nat.h \
Lines 72-78 Link Here
72	netinet/ip_compat.h \	72	netinet/ip_compat.h \
73	netinet/ip_fil_compat.h \	73	netinet/ip_fil_compat.h \
74	netinet/ip_fil.h \	74	netinet/ip_fil.h \
75	@@ -42316,6 +42322,7 @@ ac_fn_cxx_check_header_compile "$LINENO" "$ac_header"	75	@@ -42679,6 +42685,7 @@ ac_fn_cxx_check_header_compile "$LINENO" "$ac_header"
76	#if HAVE_IP_COMPAT_H	76	#if HAVE_IP_COMPAT_H
77	#include <ip_compat.h>	77	#include <ip_compat.h>
78	#elif HAVE_NETINET_IP_COMPAT_H	78	#elif HAVE_NETINET_IP_COMPAT_H
Lines 80-92 Link Here
80	#include <netinet/ip_compat.h>	80	#include <netinet/ip_compat.h>
81	#endif	81	#endif
82	#if HAVE_IP_FIL_H	82	#if HAVE_IP_FIL_H
83	@@ -42379,8 +42386,7 @@ _ACEOF	83	@@ -42749,7 +42756,7 @@ _ACEOF
84		84
85		85
86	fi	86	fi
87	-ac_fn_cxx_check_member "$LINENO" "struct natlookup" "nl_realipaddr.in6"	87	-ac_fn_cxx_check_member "$LINENO" "struct natlookup" "nl_realipaddr.in6" "ac_cv_member_struct_natlookup_nl_realipaddr_in6" "
88	- "ac_cv_member_struct_natlookup_nl_realipaddr_in6___" "	88	+ac_fn_cxx_check_member "$LINENO" "struct natlookup" "nl_realipaddr.in6" "ac_cv_member_struct_natlookup_nl_realipaddr_in6__" "
89	+ac_fn_cxx_check_member "$LINENO" "struct natlookup" "nl_realipaddr.in6" "ac_cv_member_struct_natlookup_nl_realipaddr_in6___" "
90	#if USE_SOLARIS_IPFILTER_MINOR_T_HACK	89	#if USE_SOLARIS_IPFILTER_MINOR_T_HACK
91	#define minor_t fubar	90	#define minor_t fubar
92	#endif	91	#endif

Lines 1-15 Link Here

(-)squid/files/patch-src_acl_external_eDirectory__userip_ext__edirectory__userip__acl.cc (-15 lines)
1	--- src/acl/external/eDirectory_userip/ext_edirectory_userip_acl.cc.orig 2020-04-19 12:38:51 UTC
2	+++ src/acl/external/eDirectory_userip/ext_edirectory_userip_acl.cc
3	@@ -69,6 +69,12 @@
4	#ifdef HAVE_NETDB_H
5	#include <netdb.h>
6	#endif
7	+#ifdef HAVE_SYS_SOCKET_H
8	+#include <sys/socket.h>
9	+#endif
10	+#ifdef HAVE_NETINET_IN_H
11	+#include <netinet/in.h>
12	+#endif
13
14	#ifdef HELPER_INPUT_BUFFER
15	#define EDUI_MAXLEN HELPER_INPUT_BUFFER

Lines 1-19 Link Here

(-)squid/files/patch-src_acl_external_kerberos__ldap__group_support__krb5.cc (-19 lines)
1	--- src/acl/external/kerberos_ldap_group/support_krb5.cc.orig 2020-04-19 12:38:51 UTC
2	+++ src/acl/external/kerberos_ldap_group/support_krb5.cc
3	@@ -467,10 +467,15 @@ krb5_create_cache(char domain, char service_principa
4	}
5
6	// overwrite limitation of enctypes
7	+#if USE_HEIMDAL_KRB5
8	+ creds->session.keytype = 0;
9	+ if (creds->session.keyvalue.length>0)
10	+ krb5_free_keyblock_contents(kparam.context, &creds->session);
11	+#else
12	creds->keyblock.enctype = 0;
13	if (creds->keyblock.contents)
14	krb5_free_keyblock_contents(kparam.context, &creds->keyblock);
15	-
16	+#endif
17	code = krb5_get_credentials(kparam.context, 0, kparam.cc[ccindex], creds, &tgt_creds);
18	if (code) {
19	k5_error("Error while getting tgt", code);