From nobody Tue Jan 06 14:32:57 2026 X-Original-To: dev-commits-ports-all@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 4dlttd5PCJz6NhqP for ; Tue, 06 Jan 2026 14:32:57 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dlttd44c0z3fxv for ; Tue, 06 Jan 2026 14:32:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767709977; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=15WpO3PZw+P5zUqCBrBGVHSu2URc1pwa7eE2Z2bEzWk=; b=GsPdrkyuXUuQ6gKO9xsqNWwRXmGVUS1W22hB40705fLbZWWn9IojlWG+wXBhroYa4gbCvh 0vhesKvYuzEaBB0O9UCKHl4U8+KiyJ0jGyRT4alfstgEwxRQUEH26+KUiEw3F3vGUHOwIw 0+G6r+jQ4WZMagj3WPVL5/M6yTBWSTbBrJL8ekcvl3T6FvmrwC6n7DY+upVqOqHa6O3iS3 G91eIGJOclAmsBORJEJdMytd5gPkLqVul1V6dAX9/1FPmUHZoh7J0qr9Wwjk22F3AOE87D ZihFX0tL6bxgL1+DWxvyyON7vDsGDWNJA9fn9ACvAEgdtYxoV1qE0r7n5BR/TQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767709977; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=15WpO3PZw+P5zUqCBrBGVHSu2URc1pwa7eE2Z2bEzWk=; b=vTcNT0SyUARcj/2FG1aRXvTjWEmzSHJVwoTizhJk8ZyOYjBLS057ZJzuBvvPVB+AI1B0VK auQBveJ7BBZwLQ0yWL8Pm4G1LxnhQt7atN0pAHWR91lkPPUxIp9LNw+MXvRz+wG9uwOQgb 1Aps0rLawdLLDnVYrLIwVLUZIIpW4J6bViSQ+xAS+sHxafqWMoUyEKxXrVAvMHSe58Meev QtvUoCOVSNKRi9ZyP+F6UwDc2ZucblGpN4lRjAZh/7ExeXdW+3jJfPlXGPfUvkabAQDpw5 7yAQ7c0cJT978GxtXMuUHs1PhfRuNiV7SjiD7Gb083xktKgThN3dpaEgM8ymEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767709977; a=rsa-sha256; cv=none; b=cG27QAAANhHXFC6eYz2dZPlQEzyaVqEExacioC06rGcUEHezlkff4HUtFKFYHhnY6OFwqM ntT4bUm90KUDK6dIdcJosC9bshJ0R4D6WlMU+ONe6SGf6bSxV6UiWBmZLKuZCgXHasrY7j eZHngk7e9maD3HkjrmdHpfNfo8Dc9V/nvgD7bD9Fm81098Co6f6+rlkEOxiFNxMMRFhfh+ GueSZlfbbowcgNw1f4MaNLygL0oTO9ykUBLOPDA6N75EVxhZ/CYoBV8RvtI5gKZKdSHTJs v1GDodr+jaYlEJP2Arw7wStdoTODmUrAk3egHFuJ/RDPJ/BW5NjAn+cGaeLT0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dlttd3QH9z19RR for ; Tue, 06 Jan 2026 14:32:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id d687 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 06 Jan 2026 14:32:57 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Cc: Pavel Timofeev From: Vladimir Druzenko Subject: git: 780e9bf2bdba - main - www/squid: Fix ARP_ACL option build List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 780e9bf2bdba72007b89526a15dc44ae271b8bed Auto-Submitted: auto-generated Date: Tue, 06 Jan 2026 14:32:57 +0000 Message-Id: <695d1d19.d687.62ad654c@gitrepo.freebsd.org> The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=780e9bf2bdba72007b89526a15dc44ae271b8bed commit 780e9bf2bdba72007b89526a15dc44ae271b8bed Author: Pavel Timofeev AuthorDate: 2026-01-06 14:28:56 +0000 Commit: Vladimir Druzenko CommitDate: 2026-01-06 14:32:43 +0000 www/squid: Fix ARP_ACL option build PR: 292200 --- www/squid/Makefile | 2 +- www/squid/files/patch-configure | 42 ++++++++++++++++++++++++++++------------- 2 files changed, 30 insertions(+), 14 deletions(-) diff --git a/www/squid/Makefile b/www/squid/Makefile index 52ab01d14cf4..253b7c629874 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -1,6 +1,6 @@ PORTNAME= squid DISTVERSION= 7.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= https://github.com/${PORTNAME}-cache/${PORTNAME}/releases/download/${PORTNAME:tu}_${DISTVERSION:S|.|_|g}/ diff --git a/www/squid/files/patch-configure b/www/squid/files/patch-configure index f87538d28673..029b914fd6be 100644 --- a/www/squid/files/patch-configure +++ b/www/squid/files/patch-configure @@ -1,6 +1,22 @@ --- configure.orig 2025-10-28 20:25:31 UTC +++ configure -@@ -32420,15 +32420,15 @@ then : +@@ -29214,7 +29214,14 @@ fi + + fi + +- ac_fn_cxx_check_member "$LINENO" "struct arpreq" "arp_pa" "ac_cv_member_struct_arpreq_arp_pa" " ++if test "x$ac_cv_header_sys_socket_h" = xyes ++then : ++ printf "%s\n" "#define HAVE_SYS_SOCKET_H 1" >>confdefs.h ++ ++fi ++ ++ ++ ac_fn_cxx_check_member "$LINENO" "struct arpreq" "arp_pa.sa_family" "ac_cv_member_struct_arpreq_arp_pa" " + #if HAVE_SYS_TYPES_H + #include + #endif +@@ -32420,15 +32427,15 @@ then : with_mit_krb5=yes if test -d "$withval/lib64" then : @@ -19,7 +35,7 @@ fi ;; esac -@@ -33791,9 +33791,6 @@ else $as_nop +@@ -33791,9 +33798,6 @@ else $as_nop #elif HAVE_GSSAPI_H #include #endif @@ -29,7 +45,7 @@ #if HAVE_GSSAPI_GSSAPI_GENERIC_H #include #endif -@@ -33871,9 +33868,6 @@ else $as_nop +@@ -33871,9 +33875,6 @@ else $as_nop #elif HAVE_GSSAPI_H #include #endif @@ -39,7 +55,7 @@ #if HAVE_GSSAPI_GSSAPI_GENERIC_H #include #endif -@@ -35197,9 +35191,6 @@ else $as_nop +@@ -35197,9 +35198,6 @@ else $as_nop #elif HAVE_GSSAPI_H #include #endif @@ -49,7 +65,7 @@ #if HAVE_GSSAPI_GSSAPI_GENERIC_H #include #endif -@@ -35277,9 +35268,6 @@ else $as_nop +@@ -35277,9 +35275,6 @@ else $as_nop #elif HAVE_GSSAPI_H #include #endif @@ -59,7 +75,7 @@ #if HAVE_GSSAPI_GSSAPI_GENERIC_H #include #endif -@@ -35530,15 +35518,15 @@ then : +@@ -35530,15 +35525,15 @@ then : with_heimdal_krb5=yes if test -d "$withval/lib64" then : @@ -78,7 +94,7 @@ fi ;; esac -@@ -36777,9 +36765,6 @@ else $as_nop +@@ -36777,9 +36772,6 @@ else $as_nop #elif HAVE_GSSAPI_H #include #endif @@ -88,7 +104,7 @@ #if HAVE_GSSAPI_GSSAPI_GENERIC_H #include #endif -@@ -36857,9 +36842,6 @@ else $as_nop +@@ -36857,9 +36849,6 @@ else $as_nop #elif HAVE_GSSAPI_H #include #endif @@ -98,7 +114,7 @@ #if HAVE_GSSAPI_GSSAPI_GENERIC_H #include #endif -@@ -37250,9 +37232,6 @@ else $as_nop +@@ -37250,9 +37239,6 @@ else $as_nop #elif HAVE_GSSAPI_H #include #endif @@ -108,7 +124,7 @@ #if HAVE_GSSAPI_GSSAPI_GENERIC_H #include #endif -@@ -37329,9 +37308,6 @@ else $as_nop +@@ -37329,9 +37315,6 @@ else $as_nop #elif HAVE_GSSAPI_H #include #endif @@ -118,7 +134,7 @@ #if HAVE_GSSAPI_GSSAPI_GENERIC_H #include #endif -@@ -40801,7 +40777,7 @@ BUILD_HELPER="NIS" +@@ -40801,7 +40784,7 @@ BUILD_HELPER="NIS" ## BUILD_HELPER="NIS" @@ -127,7 +143,7 @@ do : as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" " -@@ -47289,6 +47265,7 @@ ac_fn_cxx_check_type "$LINENO" "cpu_set_t" "ac_cv_type +@@ -47289,6 +47272,7 @@ ac_fn_cxx_check_type "$LINENO" "cpu_set_t" "ac_cv_type ac_fn_cxx_check_type "$LINENO" "cpu_set_t" "ac_cv_type_cpu_set_t" " #if HAVE_SCHED_H @@ -135,7 +151,7 @@ #include #endif -@@ -49806,6 +49783,7 @@ else $as_nop +@@ -49806,6 +49790,7 @@ else $as_nop # include # include #undef minor_t