Attachment 249133 Details for Bug 277672 – port patch

[patch] port patch

0001-www-squid-update-to-6.8.patch (text/plain), 6.08 KB, created by Pavel Timofeev on 2024-03-13 15:30:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel Timofeev

Created: 2024-03-13 15:30:14 UTC

Size: 6.08 KB

patch

obsolete

>From 0c3d31cace756e5276e81c159d133dfe5142e876 Mon Sep 17 00:00:00 2001
>From: Pavel Timofeev <timp87@gmail.com>
>Date: Mon, 4 Mar 2024 21:33:03 -0700
>Subject: [PATCH] www/squid: update to 6.8
>
>---
> www/squid/Makefile                                   |  2 +-
> www/squid/distinfo                                   |  6 +++---
> www/squid/files/patch-configure                      |  8 ++++----
> www/squid/files/patch-include_squid.h                |  6 +++---
> www/squid/files/patch-src-cf.data.pre                |  4 ++--
> .../files/patch-src_auth_basic_NIS_nis__support.h    | 12 ++++++++++++
> www/squid/files/patch-src_base_RandomUuid.cc         | 10 ----------
> www/squid/files/patch-src_enums.h                    |  6 +++---
> www/squid/files/patch-src_ip_Intercept.cc            |  4 ++--
> 9 files changed, 30 insertions(+), 28 deletions(-)
> create mode 100644 www/squid/files/patch-src_auth_basic_NIS_nis__support.h
> delete mode 100644 www/squid/files/patch-src_base_RandomUuid.cc
>
>diff --git a/www/squid/Makefile b/www/squid/Makefile
>index ec4dd826c6ee..1075ddc89314 100644
>--- a/www/squid/Makefile
>+++ b/www/squid/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	squid
>-DISTVERSION=	6.7
>+DISTVERSION=	6.8
> CATEGORIES=	www
> MASTER_SITES=	http://www2.pl.squid-cache.org/Versions/v6/ \
> 		http://www1.il.squid-cache.org/Versions/v6/ \
>diff --git a/www/squid/distinfo b/www/squid/distinfo
>index 5898547cb4f5..de0933b2967c 100644
>--- a/www/squid/distinfo
>+++ b/www/squid/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1708443648
>-SHA256 (squid-6.7.tar.xz) = e14daa4eae41925d1ae3f08e64439a6aaa3011bdced686628b8de697d5ab8428
>-SIZE (squid-6.7.tar.xz) = 2427468
>+TIMESTAMP = 1710267260
>+SHA256 (squid-6.8.tar.xz) = 11cc5650b51809d99483ccfae24744a2e51cd16199f5ff0c917e84fce695870f
>+SIZE (squid-6.8.tar.xz) = 2547796
>diff --git a/www/squid/files/patch-configure b/www/squid/files/patch-configure
>index a5f7ac84549b..24648548bddc 100644
>--- a/www/squid/files/patch-configure
>+++ b/www/squid/files/patch-configure
>@@ -1,6 +1,6 @@
>---- configure.orig	2023-02-28 09:24:52 UTC
>+--- configure.orig	2024-03-04 05:50:28 UTC
> +++ configure
>-@@ -44124,7 +44124,10 @@ _ACEOF
>+@@ -43985,7 +43985,10 @@ _ACEOF
>  
>  else $as_nop
>  
>@@ -12,7 +12,7 @@
>  
>  fi
>  
>-@@ -50983,6 +50986,7 @@ fi
>+@@ -50834,6 +50837,7 @@ fi
>  
>  ac_fn_cxx_check_type "$LINENO" "cpu_set_t" "ac_cv_type_cpu_set_t" "
>  #if HAVE_SCHED_H
>@@ -20,7 +20,7 @@
>  #include <sched.h>
>  #endif
>  
>-@@ -54169,6 +54173,7 @@ else $as_nop
>+@@ -54020,6 +54024,7 @@ else $as_nop
>  #       include <sys/ioccom.h>
>  #       include <netinet/in.h>
>  #undef minor_t
>diff --git a/www/squid/files/patch-include_squid.h b/www/squid/files/patch-include_squid.h
>index a12c1a52aad6..c781bf0a9d3b 100644
>--- a/www/squid/files/patch-include_squid.h
>+++ b/www/squid/files/patch-include_squid.h
>@@ -1,8 +1,8 @@
>---- include/squid.h.orig	2023-02-28 09:10:25 UTC
>+--- include/squid.h.orig	2024-03-04 05:45:51 UTC
> +++ include/squid.h
> @@ -9,6 +9,7 @@
>- #ifndef SQUID_CONFIG_H
>- #define SQUID_CONFIG_H
>+ #ifndef SQUID_INCLUDE_SQUID_H
>+ #define SQUID_INCLUDE_SQUID_H
>  
> +#define _WITH_CPU_SET_T
>  #include "autoconf.h"       /* For GNU autoconf variables */
>diff --git a/www/squid/files/patch-src-cf.data.pre b/www/squid/files/patch-src-cf.data.pre
>index f6acb5d213c7..bfcdb4b2bc8a 100644
>--- a/www/squid/files/patch-src-cf.data.pre
>+++ b/www/squid/files/patch-src-cf.data.pre
>@@ -1,6 +1,6 @@
>---- src/cf.data.pre.orig	2023-02-28 09:10:25 UTC
>+--- src/cf.data.pre.orig	2024-03-04 05:45:51 UTC
> +++ src/cf.data.pre
>-@@ -5507,6 +5507,10 @@ DEFAULT: @DEFAULT_PID_FILE@
>+@@ -5526,6 +5526,10 @@ DEFAULT: @DEFAULT_PID_FILE@
>  LOC: Config.pidFilename
>  DOC_START
>  	A filename to write the process-id to.  To disable, enter "none".
>diff --git a/www/squid/files/patch-src_auth_basic_NIS_nis__support.h b/www/squid/files/patch-src_auth_basic_NIS_nis__support.h
>new file mode 100644
>index 000000000000..a25672c7bbd7
>--- /dev/null
>+++ b/www/squid/files/patch-src_auth_basic_NIS_nis__support.h
>@@ -0,0 +1,12 @@
>+--- src/auth/basic/NIS/nis_support.h.orig	2024-03-04 05:45:51 UTC
>++++ src/auth/basic/NIS/nis_support.h
>+@@ -8,9 +8,6 @@
>+ #ifndef SQUID_SRC_AUTH_BASIC_NIS_NIS_SUPPORT_H
>+ #define SQUID_SRC_AUTH_BASIC_NIS_NIS_SUPPORT_H
>+ 
>+-#ifndef SQUID_SRC_AUTH_BASIC_NIS_NIS_SUPPORT_H
>+-#define SQUID_SRC_AUTH_BASIC_NIS_NIS_SUPPORT_H
>+-
>+ extern char * get_nis_password(char *user, char *nisdomain, char *nismap);
>+ 
>+ #endif /* SQUID_SRC_AUTH_BASIC_NIS_NIS_SUPPORT_H */
>diff --git a/www/squid/files/patch-src_base_RandomUuid.cc b/www/squid/files/patch-src_base_RandomUuid.cc
>deleted file mode 100644
>index eba0bfa8ad42..000000000000
>--- a/www/squid/files/patch-src_base_RandomUuid.cc
>+++ /dev/null
>@@ -1,10 +0,0 @@
>---- src/base/RandomUuid.cc.orig	2023-02-28 09:10:25 UTC
>-+++ src/base/RandomUuid.cc
>-@@ -13,6 +13,7 @@
>- #include "base/TextException.h"
>- #include "defines.h"
>- 
>-+#include <netinet/in.h>
>- #include <iostream>
>- 
>- static_assert(sizeof(RandomUuid) == 128/8, "RandomUuid has RFC 4122-prescribed 128-bit size");
>diff --git a/www/squid/files/patch-src_enums.h b/www/squid/files/patch-src_enums.h
>index 2f26fea7e1be..caf634b523a0 100644
>--- a/www/squid/files/patch-src_enums.h
>+++ b/www/squid/files/patch-src_enums.h
>@@ -1,8 +1,8 @@
>---- src/enums.h.orig	2020-04-19 10:50:48 UTC
>+--- src/enums.h.orig	2024-03-04 05:45:51 UTC
> +++ src/enums.h
> @@ -9,6 +9,9 @@
>- #ifndef SQUID_ENUMS_H
>- #define SQUID_ENUMS_H
>+ #ifndef SQUID_SRC_ENUMS_H
>+ #define SQUID_SRC_ENUMS_H
>  
> +/* Namespace pollution from fcntl.h as of FreeBSD r345982 */
> +#undef FD_NONE
>diff --git a/www/squid/files/patch-src_ip_Intercept.cc b/www/squid/files/patch-src_ip_Intercept.cc
>index 3ca029e6b8ea..d68f11b2655f 100644
>--- a/www/squid/files/patch-src_ip_Intercept.cc
>+++ b/www/squid/files/patch-src_ip_Intercept.cc
>@@ -1,6 +1,6 @@
>---- src/ip/Intercept.cc.orig	2023-02-28 09:10:25 UTC
>+--- src/ip/Intercept.cc.orig	2024-03-04 05:45:51 UTC
> +++ src/ip/Intercept.cc
>-@@ -217,10 +217,10 @@ Ip::Intercept::IpfInterception(const Comm::ConnectionP
>+@@ -218,10 +218,10 @@ Ip::Intercept::IpfInterception(const Comm::ConnectionP
>          newConn->remote.getInAddr(natLookup.nl_outipaddr.in4);
>      }
>  #else /* HAVE_STRUCT_NATLOOKUP_NL_INIPADDR_IN6 */
>-- 
>2.44.0
>

Flags:

timp87: maintainer-approval+

Actions: View | Diff

Attachments on bug 277672: 249133