Attachment 215756 Details for Bug 247397 – www/squid: Update to 4.12

[patch] www/squid: Update to 4.12

www_squid.diff (text/plain), 5.77 KB, created by Juraj Lutter on 2020-06-18 23:33:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Juraj Lutter

Created: 2020-06-18 23:33:47 UTC

Size: 5.77 KB

patch

obsolete

>diff --git a/www/squid/Makefile b/www/squid/Makefile
>index 78fe2539a091..992ac6549162 100644
>--- a/www/squid/Makefile
>+++ b/www/squid/Makefile
>@@ -1,8 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	squid
>-PORTVERSION=	4.11
>-PORTREVISION=	2
>+PORTVERSION=	4.12
> CATEGORIES=	www
> MASTER_SITES=	http://www.squid-cache.org/Versions/v4/ \
> 		http://www2.us.squid-cache.org/Versions/v4/ \
>diff --git a/www/squid/distinfo b/www/squid/distinfo
>index 00caed0c73cf..2aaac422be87 100644
>--- a/www/squid/distinfo
>+++ b/www/squid/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1588493552
>-SHA256 (squid-4.11.tar.xz) = 4ed947612410263f57ad0e39bfd087e60fb714f028d7d3b0e469943efd34287d
>-SIZE (squid-4.11.tar.xz) = 2447700
>+TIMESTAMP = 1592516847
>+SHA256 (squid-4.12.tar.xz) = f42a03c8b3dc020722c88bf1a87da8cb0c087b2f66b41d8256c77ee1b527e317
>+SIZE (squid-4.12.tar.xz) = 2450564
>diff --git a/www/squid/files/patch-configure b/www/squid/files/patch-configure
>index 50b6ece70612..d71b23ce744e 100644
>--- a/www/squid/files/patch-configure
>+++ b/www/squid/files/patch-configure
>@@ -1,6 +1,6 @@
>---- configure.orig	2020-04-19 12:39:06 UTC
>+--- configure.orig	2020-06-18 21:56:43 UTC
> +++ configure
>-@@ -35077,7 +35077,7 @@ done
>+@@ -35092,7 +35092,7 @@ done
>  ##
>  
>  BUILD_HELPER="NIS"
>@@ -9,7 +9,7 @@
>  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" "
>-@@ -35092,8 +35092,10 @@ if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
>+@@ -35107,8 +35107,10 @@ if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
>  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
>  _ACEOF
>  
>@@ -22,7 +22,7 @@
>  fi
>  
>  done
>-@@ -35566,7 +35568,7 @@ done
>+@@ -35581,7 +35583,7 @@ done
>  
>    # unconditionally requires crypt(3), for now
>    if test "x$ac_cv_func_crypt" != "x"; then
>@@ -31,7 +31,7 @@
>  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"
>-@@ -37958,7 +37960,7 @@ for ac_header in \
>+@@ -37973,7 +37975,7 @@ for ac_header in \
>    arpa/nameser.h \
>    assert.h \
>    bstring.h \
>@@ -40,53 +40,3 @@
>    ctype.h \
>    direct.h \
>    errno.h \
>-@@ -38166,6 +38168,7 @@ ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" 
>- #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
>-@@ -42213,6 +42216,7 @@ if test "x$enable_ipf_transparent" != "xno" ; then
>- #     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>
>-@@ -42243,6 +42247,7 @@ else
>- #       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>
>-@@ -42287,6 +42292,7 @@ _ACEOF
>- 	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 \
>-@@ -42316,6 +42322,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 <net/if.h>	/* IFNAMSIZ */
>- #include <netinet/ip_compat.h>
>- #endif
>- #if HAVE_IP_FIL_H
>-@@ -42379,8 +42386,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___" "
>- #if USE_SOLARIS_IPFILTER_MINOR_T_HACK
>- #define minor_t fubar
>- #endif
>diff --git a/www/squid/files/patch-src_acl_external_eDirectory__userip_ext__edirectory__userip__acl.cc b/www/squid/files/patch-src_acl_external_eDirectory__userip_ext__edirectory__userip__acl.cc
>deleted file mode 100644
>index e5189a91bc1a..000000000000
>--- a/www/squid/files/patch-src_acl_external_eDirectory__userip_ext__edirectory__userip__acl.cc
>+++ /dev/null
>@@ -1,15 +0,0 @@
>---- 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
>diff --git a/www/squid/files/patch-src_acl_external_kerberos__ldap__group_support__krb5.cc b/www/squid/files/patch-src_acl_external_kerberos__ldap__group_support__krb5.cc
>deleted file mode 100644
>index 8aaf7af308d1..000000000000
>--- a/www/squid/files/patch-src_acl_external_kerberos__ldap__group_support__krb5.cc
>+++ /dev/null
>@@ -1,19 +0,0 @@
>---- 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);

Actions: View | Diff

Attachments on bug 247397: 215756 | 216115 | 216343 | 216412