Attachment 215450 Details for Bug 247174 – port patch

[patch] port patch

squid-devel-5.0.3.patch (text/plain), 7.78 KB, created by Pavel Timofeev on 2020-06-11 15:10:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel Timofeev

Created: 2020-06-11 15:10:45 UTC

Size: 7.78 KB

patch

obsolete

>diff -ruN /root/squid-devel.orig/Makefile squid-devel/Makefile
>--- /root/squid-devel.orig/Makefile	2020-06-10 11:58:31.405600000 +0300
>+++ squid-devel/Makefile	2020-06-11 15:54:12.781161000 +0300
>@@ -1,8 +1,7 @@
> # $FreeBSD: head/www/squid-devel/Makefile 535729 2020-05-18 08:20:51Z pi $
> 
> PORTNAME=	squid
>-PORTVERSION=	5.0.2
>-PORTREVISION=	2
>+PORTVERSION=	5.0.3
> CATEGORIES=	www
> MASTER_SITES=	http://www.squid-cache.org/Versions/v5/ \
> 		http://www2.us.squid-cache.org/Versions/v5/ \
>@@ -27,7 +26,7 @@
> 
> USES=		compiler:c++11-lib cpe perl5 shebangfix tar:xz
> 
>-CONFLICTS=	squid3-* squid-*
>+CONFLICTS=	squid3-* squid-4.*
> CPE_VENDOR=	squid-cache
> SHEBANG_FILES=	scripts/*.pl contrib/*.pl tools/*.pl
> GNU_CONFIGURE=	yes
>diff -ruN /root/squid-devel.orig/distinfo squid-devel/distinfo
>--- /root/squid-devel.orig/distinfo	2020-06-10 11:58:31.423204000 +0300
>+++ squid-devel/distinfo	2020-06-10 11:59:03.483210000 +0300
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1588325736
>-SHA256 (squid-5.0.2.tar.xz) = c163e8d5432198b7e5b490b72d1bdb50c953394e3123f0629ff1eb89a6dc2b96
>-SIZE (squid-5.0.2.tar.xz) = 2509540
>+TIMESTAMP = 1591779543
>+SHA256 (squid-5.0.3.tar.xz) = c09dd43121ce7fe006b8afd8ddfe6ca064aadf0ab342303f4e6c6678463bb4d0
>+SIZE (squid-5.0.3.tar.xz) = 2518568
>diff -ruN /root/squid-devel.orig/files/patch-configure squid-devel/files/patch-configure
>--- /root/squid-devel.orig/files/patch-configure	2020-06-10 11:58:31.370726000 +0300
>+++ squid-devel/files/patch-configure	2020-06-11 18:07:11.731971000 +0300
>@@ -1,6 +1,6 @@
>---- configure.orig	2020-04-19 12:08:55 UTC
>+--- configure.orig	2020-06-09 06:58:26 UTC
> +++ configure
>-@@ -35054,7 +35054,7 @@ done
>+@@ -35068,7 +35068,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" "
>-@@ -35069,8 +35069,10 @@ if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
>+@@ -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
>  
>@@ -22,7 +22,7 @@
>  fi
>  
>  done
>-@@ -35543,7 +35545,7 @@ done
>+@@ -35557,7 +35559,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"
>-@@ -38307,7 +38309,7 @@ for ac_header in \
>+@@ -38321,7 +38323,7 @@ for ac_header in \
>    arpa/nameser.h \
>    assert.h \
>    bstring.h \
>@@ -40,7 +40,7 @@
>    ctype.h \
>    direct.h \
>    errno.h \
>-@@ -38515,6 +38517,7 @@ ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" 
>+@@ -38529,6 +38531,7 @@ ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" 
>  #include <netinet/ip.h>
>  #endif
>  #if HAVE_NETINET_IP_COMPAT_H
>@@ -48,7 +48,7 @@
>  #include <netinet/ip_compat.h>
>  #endif
>  #if HAVE_NETINET_IP_FIL_H
>-@@ -42562,6 +42565,7 @@ if test "x$enable_ipf_transparent" != "xno" ; then
>+@@ -42576,6 +42579,7 @@ if test "x$enable_ipf_transparent" != "xno" ; then
>  #     include <sys/ioccom.h>
>  #     include <netinet/in.h>
>  
>@@ -56,7 +56,7 @@
>  #     include <netinet/ip_compat.h>
>  #     include <netinet/ip_fil.h>
>  #     include <netinet/ip_nat.h>
>-@@ -42592,6 +42596,7 @@ else
>+@@ -42606,6 +42610,7 @@ else
>  #       include <sys/ioccom.h>
>  #       include <netinet/in.h>
>  #undef minor_t
>@@ -64,7 +64,7 @@
>  #       include <netinet/ip_compat.h>
>  #       include <netinet/ip_fil.h>
>  #       include <netinet/ip_nat.h>
>-@@ -42636,6 +42641,7 @@ _ACEOF
>+@@ -42650,6 +42655,7 @@ _ACEOF
>  	ip_fil_compat.h \
>  	ip_fil.h \
>  	ip_nat.h \
>@@ -72,7 +72,7 @@
>  	netinet/ip_compat.h \
>  	netinet/ip_fil_compat.h \
>  	netinet/ip_fil.h \
>-@@ -42665,6 +42671,7 @@ ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" 
>+@@ -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
>@@ -80,13 +80,12 @@
>  #include <netinet/ip_compat.h>
>  #endif
>  #if HAVE_IP_FIL_H
>-@@ -42728,8 +42735,7 @@ _ACEOF
>+@@ -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" "
>++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 -ruN /root/squid-devel.orig/files/patch-src_acl_external_eDirectory__userip_ext__edirectory__userip__acl.cc squid-devel/files/patch-src_acl_external_eDirectory__userip_ext__edirectory__userip__acl.cc
>--- /root/squid-devel.orig/files/patch-src_acl_external_eDirectory__userip_ext__edirectory__userip__acl.cc	2020-06-10 11:58:31.335023000 +0300
>+++ squid-devel/files/patch-src_acl_external_eDirectory__userip_ext__edirectory__userip__acl.cc	1970-01-01 03:00:00.000000000 +0300
>@@ -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 -ruN /root/squid-devel.orig/files/patch-src_acl_external_kerberos__ldap__group_support__krb5.cc squid-devel/files/patch-src_acl_external_kerberos__ldap__group_support__krb5.cc
>--- /root/squid-devel.orig/files/patch-src_acl_external_kerberos__ldap__group_support__krb5.cc	2020-06-10 11:58:31.348550000 +0300
>+++ squid-devel/files/patch-src_acl_external_kerberos__ldap__group_support__krb5.cc	1970-01-01 03:00:00.000000000 +0300
>@@ -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);
>diff -ruN /root/squid-devel.orig/files/patch-src_acl_external_session_ext__session__acl.cc squid-devel/files/patch-src_acl_external_session_ext__session__acl.cc
>--- /root/squid-devel.orig/files/patch-src_acl_external_session_ext__session__acl.cc	2020-06-10 11:58:31.349491000 +0300
>+++ squid-devel/files/patch-src_acl_external_session_ext__session__acl.cc	1970-01-01 03:00:00.000000000 +0300
>@@ -1,13 +0,0 @@
>---- src/acl/external/session/ext_session_acl.cc.orig	2020-05-10 08:32:32 UTC
>-+++ src/acl/external/session/ext_session_acl.cc
>-@@ -137,6 +137,10 @@ static void init_db(void)
>-         }
>-     }
>- #elif USE_TRIVIALDB
>-+#if _SQUID_FREEBSD_ && !defined(O_DSYNC)
>-+    // FreeBSD lacks O_DSYNC, O_SYNC is closest to correct behaviour
>-+#define O_DSYNC O_SYNC
>-+#endif
>-     db = tdb_open(db_path, 0, TDB_CLEAR_IF_FIRST, O_CREAT|O_DSYNC, 0666);
>- #endif
>-     if (!db) {

Flags:

timp87: maintainer-approval+

Actions: View | Diff

Attachments on bug 247174: 215450