Attachment 194428 Details for Bug 229181 – port patch

[patch] port patch

squid-devel-4.0.25.patch (text/plain), 8.32 KB, created by Pavel Timofeev on 2018-06-20 14:16:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel Timofeev

Created: 2018-06-20 14:16:42 UTC

Size: 8.32 KB

patch

obsolete

>diff -ruN /root/squid-devel.orig/distinfo squid-devel/distinfo
>--- /root/squid-devel.orig/distinfo	2018-06-20 12:31:22.928777000 +0300
>+++ squid-devel/distinfo	2018-06-20 12:34:12.398599000 +0300
>@@ -1,3 +1,3 @@
> TIMESTAMP = 1522445865
>-SHA256 (squid4.0/squid-4.0.24.tar.xz) = 091da0d763307dcc0f5c784ab07ea0c5a093f6dfac60f17ff26e2a6d50f76a07
>-SIZE (squid4.0/squid-4.0.24.tar.xz) = 2420076
>+SHA256 (squid4.0/squid-4.0.25.tar.xz) = f70dc75148895c3cc0d232596fee0eb346d92f5457c7180d493f133410c2d626
>+SIZE (squid4.0/squid-4.0.25.tar.xz) = 2424644
>diff -ruN /root/squid-devel.orig/files/extra-patch-build-8-9 squid-devel/files/extra-patch-build-8-9
>--- /root/squid-devel.orig/files/extra-patch-build-8-9	2018-06-20 12:31:22.930276000 +0300
>+++ squid-devel/files/extra-patch-build-8-9	1970-01-01 03:00:00.000000000 +0300
>@@ -1,11 +0,0 @@
>---- src/auth/negotiate/kerberos/negotiate_kerberos.h.orig	2015-08-01 06:08:17 UTC
>-+++ src/auth/negotiate/kerberos/negotiate_kerberos.h
>-@@ -140,7 +140,7 @@ int check_gss_err(OM_uint32 major_status
>- 
>- char *gethost_name(void);
>- 
>--#if (HAVE_GSSKRB5_EXTRACT_AUTHZ_DATA_FROM_SEC_CONTEXT || HAVE_GSS_MAP_NAME_TO_ANY) && HAVE_KRB5_PAC
>-+#if (HAVE_GSSKRB5_EXTRACT_AUTHZ_DATA_FROM_SEC_CONTEXT || HAVE_GSS_MAP_NAME_TO_ANY) && HAVE_KRB5_PAC && __FreeBSD__ >= 10
>- #define HAVE_PAC_SUPPORT 1
>- #define MAX_PAC_GROUP_SIZE 200*60
>- typedef struct {
>diff -ruN /root/squid-devel.orig/files/patch-configure squid-devel/files/patch-configure
>--- /root/squid-devel.orig/files/patch-configure	2018-06-20 12:31:22.929436000 +0300
>+++ squid-devel/files/patch-configure	2018-06-20 14:02:58.996752000 +0300
>@@ -1,6 +1,6 @@
>---- configure.orig	2016-12-16 10:19:31 UTC
>+--- configure.orig	2018-06-11 16:48:04 UTC
> +++ configure
>-@@ -33043,7 +33043,7 @@ done
>+@@ -34345,7 +34345,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" "
>-@@ -33058,8 +33058,10 @@ if eval test \"x\$"$as_ac_Header"\" = x"
>+@@ -34360,8 +34360,10 @@ if eval test \"x\$"$as_ac_Header"\" = x"
>  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
>  _ACEOF
>  
>@@ -22,7 +22,7 @@
>  fi
>  
>  done
>-@@ -33532,7 +33534,7 @@ done
>+@@ -34834,7 +34836,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"
>-@@ -35882,7 +35884,7 @@ for ac_header in \
>+@@ -37226,7 +37228,7 @@ for ac_header in \
>    arpa/nameser.h \
>    assert.h \
>    bstring.h \
>@@ -40,7 +40,7 @@
>    ctype.h \
>    direct.h \
>    errno.h \
>-@@ -36092,6 +36094,7 @@ ac_fn_cxx_check_header_compile "$LINENO"
>+@@ -37434,6 +37436,7 @@ ac_fn_cxx_check_header_compile "$LINENO"
>  #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
>-@@ -40315,6 +40318,7 @@ if test "x$enable_ipf_transparent" != "x
>+@@ -41450,6 +41453,7 @@ if test "x$enable_ipf_transparent" != "x
>  #     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>
>-@@ -40345,6 +40349,7 @@ else
>+@@ -41480,6 +41484,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>
>-@@ -40389,6 +40394,7 @@ _ACEOF
>+@@ -41524,6 +41529,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 \
>-@@ -40418,6 +40424,7 @@ ac_fn_cxx_check_header_compile "$LINENO"
>+@@ -41553,6 +41559,7 @@ ac_fn_cxx_check_header_compile "$LINENO"
>  #if HAVE_IP_COMPAT_H
>  #include <ip_compat.h>
>  #elif HAVE_NETINET_IP_COMPAT_H
>diff -ruN /root/squid-devel.orig/files/patch-src__ip__Intercept.cc squid-devel/files/patch-src__ip__Intercept.cc
>--- /root/squid-devel.orig/files/patch-src__ip__Intercept.cc	2018-06-20 12:31:22.930746000 +0300
>+++ squid-devel/files/patch-src__ip__Intercept.cc	1970-01-01 03:00:00.000000000 +0300
>@@ -1,15 +0,0 @@
>---- src/ip/Intercept.cc.orig	2016-12-16 10:06:20 UTC
>-+++ src/ip/Intercept.cc
>-@@ -206,10 +206,10 @@ Ip::Intercept::IpfInterception(const Com
>-     // for NAT lookup set local and remote IP:port's
>-     if (newConn->remote.isIPv6()) {
>- #if IPFILTER_VERSION < 5000003
>--        // warn once every 10 at critical level, then push down a level each repeated event
>-+        // warn once every million at critical level, then push down a level each repeated event
>-         static int warningLevel = DBG_CRITICAL;
>-         debugs(89, warningLevel, "IPF (IPFilter v4) NAT does not support IPv6. Please upgrade to IPFilter v5.1");
>--        warningLevel = (warningLevel + 1) % 10;
>-+        warningLevel = (warningLevel + 1) % 1048576;
>-         return false;
>-     }
>-     newConn->local.getInAddr(natLookup.nl_inip);
>diff -ruN /root/squid-devel.orig/files/patch-src_ip_Intercept.cc squid-devel/files/patch-src_ip_Intercept.cc
>--- /root/squid-devel.orig/files/patch-src_ip_Intercept.cc	1970-01-01 03:00:00.000000000 +0300
>+++ squid-devel/files/patch-src_ip_Intercept.cc	2018-06-20 14:02:59.011709000 +0300
>@@ -0,0 +1,15 @@
>+--- src/ip/Intercept.cc.orig	2018-06-20 11:02:30 UTC
>++++ src/ip/Intercept.cc
>+@@ -215,10 +215,10 @@ Ip::Intercept::IpfInterception(const Com
>+         newConn->remote.getInAddr(natLookup.nl_outipaddr.in4);
>+     }
>+ #else
>+-        // warn once every 10 at critical level, then push down a level each repeated event
>++        // warn once every million at critical level, then push down a level each repeated event
>+         static int warningLevel = DBG_CRITICAL;
>+         debugs(89, warningLevel, "Your IPF (IPFilter) NAT does not support IPv6. Please upgrade it.");
>+-        warningLevel = (warningLevel + 1) % 10;
>++        warningLevel = (warningLevel + 1) % 1048576;
>+         return false;
>+     }
>+     newConn->local.getInAddr(natLookup.nl_inip);
>diff -ruN /root/squid-devel.orig/files/patch-src_tools.cc squid-devel/files/patch-src_tools.cc
>--- /root/squid-devel.orig/files/patch-src_tools.cc	2018-06-20 12:31:22.930033000 +0300
>+++ squid-devel/files/patch-src_tools.cc	2018-06-20 14:02:59.019169000 +0300
>@@ -1,8 +1,8 @@
>---- src/tools.cc.orig	2016-12-16 10:06:20 UTC
>+--- src/tools.cc.orig	2018-06-11 16:30:57 UTC
> +++ src/tools.cc
>-@@ -603,7 +603,7 @@ no_suid(void)
>+@@ -605,7 +605,7 @@ no_suid(void)
>      uid = geteuid();
>-     debugs(21, 3, "no_suid: PID " << getpid() << " giving up root priveleges forever");
>+     debugs(21, 3, "no_suid: PID " << getpid() << " giving up root privileges forever");
>  
> -    if (setuid(0) < 0) {
> +    if (setuid(0) < 0 && TheProcessKind != pkHelper) {
>diff -ruN /root/squid-devel.orig/files/patch-src-cf.data.pre squid-devel/files/patch-src-cf.data.pre
>--- /root/squid-devel.orig/files/patch-src-cf.data.pre	2018-06-20 12:31:22.930515000 +0300
>+++ squid-devel/files/patch-src-cf.data.pre	2018-06-20 14:02:59.008540000 +0300
>@@ -1,6 +1,6 @@
>---- src/cf.data.pre.orig	2016-12-16 10:06:20 UTC
>+--- src/cf.data.pre.orig	2018-06-11 16:30:57 UTC
> +++ src/cf.data.pre
>-@@ -4754,6 +4754,10 @@ DEFAULT: @DEFAULT_PID_FILE@
>+@@ -4947,6 +4947,10 @@ DEFAULT: @DEFAULT_PID_FILE@
>  LOC: Config.pidFilename
>  DOC_START
>  	A filename to write the process-id to.  To disable, enter "none".
>diff -ruN /root/squid-devel.orig/Makefile squid-devel/Makefile
>--- /root/squid-devel.orig/Makefile	2018-06-20 12:31:22.928924000 +0300
>+++ squid-devel/Makefile	2018-06-20 14:55:20.442382000 +0300
>@@ -1,7 +1,7 @@
> # $FreeBSD: head/www/squid-devel/Makefile 467220 2018-04-13 09:21:51Z pizzamig $
> 
> PORTNAME=	squid
>-PORTVERSION=	4.0.24
>+PORTVERSION=	4.0.25
> CATEGORIES=	www ipv6
> MASTER_SITES=	http://www.squid-cache.org/Versions/v4/ \
> 		http://www2.us.squid-cache.org/Versions/v4/ \
>@@ -140,8 +140,6 @@
> GSSAPI_BASE_USES=		gssapi
> GSSAPI_BASE_CONFIGURE_ON=	--with-heimdal-krb5=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
> GSSAPI_BASE_PLIST_SUB=		AUTH_KERB=""
>-# Make it build on FreeBSD < 10
>-GSSAPI_BASE_EXTRA_PATCHES=	${FILESDIR}/extra-patch-build-8-9
> 
> GSSAPI_HEIMDAL_USES=		gssapi:heimdal
> GSSAPI_HEIMDAL_CONFIGURE_ON=	--with-heimdal-krb5=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}

Actions: View | Diff

Attachments on bug 229181: 194428