From nobody Wed Mar 20 13:23:42 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V08Rz3MtBz5FXrb; Wed, 20 Mar 2024 13:23:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V08Rz16KLz4tVP; Wed, 20 Mar 2024 13:23:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710941023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=41MjYz6QwnZxzmPnR/h5e/sEqiq6naH5DibQPKcwjPU=; b=hMWKBBWLXIf8JC+tBEWwEH3sFHkAE/XLp4SYF3Q07bvrLjugxhjFRSRjTeOfXey9IEE+51 9TZy62jzNAS5aFl2oU6b7wF5gYiJ9qTDutw1OBfUQ8dFRPQZzvXzBMH7muPbssA6w1qria Jz/r4jdsuIMFbndrhjX4Q7qNPUn9CbXyhxFw+HhEZ4X4LUxVOLLbSVyAkeE4TWGUw5ay3O Sqcsj15HP35/nArcfOeeMkUnfZMupKOrxvuFC1kBBkeB24NRsAR9tZDnC/wmtUd1mFYb+h Ze6gRfgJR/E+W6QP2V1fmO8IhJtvM8YmTRX6EBhkJ69R4RmHVyvw37QmEC+ylQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710941023; a=rsa-sha256; cv=none; b=jUdxBPSgVDfMTg3a86ee9VWhvV58jE1W9NgVSwp+drw9xiQoQE8wYoFCcRtZiMSvNcj23y Us7WP16/UmVhk2G3WDXAHY0xhFIcMW7J0eoKvqVKqP3/TVHW3AboWy1qIWL5OsU9iuEXzr K8ms2GEPcv4q69Ee+MeQaw4odLlSZvnSnPoTEg/Kx+E3NnLfmoYboM3wvCKTWyodZD7rfN ni9eG6cQPlRqE11YwC8g2uIxi43fk0n0Ek3OKnxQ2uVBqih+seRg4Xn8qCTJ/Wo2LK1uGG ZDiE+eYfu+DYA7C+ZZ0u0a207mk1QcvlAiPe8bPxh1uqquiJzH4OA+T/5BZxiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710941023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=41MjYz6QwnZxzmPnR/h5e/sEqiq6naH5DibQPKcwjPU=; b=nMVs4y7+t4zWmtBJud+7JsqjDIItCmC6dOjjSS8oUimK2vZ3v4TgsX/ot7BjH8U4JzCIBE h5iaf2yDBKg6qSvkX4QWRqShhcCVn/VD+fDZllBXnsGUI2RqJeGJmKyrk/TU4mfuXwIdJk 478VNm99/FHQ9fchr81R6xpMao29rX15BAtv6mNX5PcCgtwSPRd70427KjGxfytlG6SefU S3AjdT0f17AKJyb/6PQvjWY3UhStNDv1zTrjacspUUw9Qn6zjbWwe/JyM6VCT3RYe0DvLS 5XvjICrvydQ/6aM14VFfIWddH4ILgFriL6icbnm2AGd2DaoXaB9sbDSyF+5ToA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V08Rz0jm5zsp7; Wed, 20 Mar 2024 13:23:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42KDNhtP016900; Wed, 20 Mar 2024 13:23:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42KDNgns016897; Wed, 20 Mar 2024 13:23:42 GMT (envelope-from git) Date: Wed, 20 Mar 2024 13:23:42 GMT Message-Id: <202403201323.42KDNgns016897@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Philippe Audeoud Subject: git: df243586379e - main - www/squid: update to 6.8 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jadawin X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: df243586379efcb537994e59e44ba80845304613 Auto-Submitted: auto-generated The branch main has been updated by jadawin: URL: https://cgit.FreeBSD.org/ports/commit/?id=df243586379efcb537994e59e44ba80845304613 commit df243586379efcb537994e59e44ba80845304613 Author: Philippe Audeoud AuthorDate: 2024-03-19 14:03:34 +0000 Commit: Philippe Audeoud CommitDate: 2024-03-20 13:23:24 +0000 www/squid: update to 6.8 remove patch no longer needed add patch to remove ifdef duplicate PR: 277672 Approved by: maintainer, bapt (mentor) Differential Revision: https://reviews.freebsd.org/D44431 --- 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 ++-- www/squid/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(-) 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 #endif -@@ -54169,6 +54173,7 @@ else $as_nop +@@ -54020,6 +54024,7 @@ else $as_nop # include # include #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 - #include - - 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 */