git: 780e9bf2bdba - main - www/squid: Fix ARP_ACL option build

The branch main has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=780e9bf2bdba72007b89526a15dc44ae271b8bed

commit 780e9bf2bdba72007b89526a15dc44ae271b8bed
Author:     Pavel Timofeev <timp87@gmail.com>
AuthorDate: 2026-01-06 14:28:56 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
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 <sys/types.h>
+ #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 <gssapi.h>
  #endif
@@ -29,7 +45,7 @@
  #if HAVE_GSSAPI_GSSAPI_GENERIC_H
  #include <gssapi/gssapi_generic.h>
  #endif
-@@ -33871,9 +33868,6 @@ else $as_nop
+@@ -33871,9 +33875,6 @@ else $as_nop
  #elif HAVE_GSSAPI_H
  #include <gssapi.h>
  #endif
@@ -39,7 +55,7 @@
  #if HAVE_GSSAPI_GSSAPI_GENERIC_H
  #include <gssapi/gssapi_generic.h>
  #endif
-@@ -35197,9 +35191,6 @@ else $as_nop
+@@ -35197,9 +35198,6 @@ else $as_nop
  #elif HAVE_GSSAPI_H
  #include <gssapi.h>
  #endif
@@ -49,7 +65,7 @@
  #if HAVE_GSSAPI_GSSAPI_GENERIC_H
  #include <gssapi/gssapi_generic.h>
  #endif
-@@ -35277,9 +35268,6 @@ else $as_nop
+@@ -35277,9 +35275,6 @@ else $as_nop
  #elif HAVE_GSSAPI_H
  #include <gssapi.h>
  #endif
@@ -59,7 +75,7 @@
  #if HAVE_GSSAPI_GSSAPI_GENERIC_H
  #include <gssapi/gssapi_generic.h>
  #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 <gssapi.h>
  #endif
@@ -88,7 +104,7 @@
  #if HAVE_GSSAPI_GSSAPI_GENERIC_H
  #include <gssapi/gssapi_generic.h>
  #endif
-@@ -36857,9 +36842,6 @@ else $as_nop
+@@ -36857,9 +36849,6 @@ else $as_nop
  #elif HAVE_GSSAPI_H
  #include <gssapi.h>
  #endif
@@ -98,7 +114,7 @@
  #if HAVE_GSSAPI_GSSAPI_GENERIC_H
  #include <gssapi/gssapi_generic.h>
  #endif
-@@ -37250,9 +37232,6 @@ else $as_nop
+@@ -37250,9 +37239,6 @@ else $as_nop
  #elif HAVE_GSSAPI_H
  #include <gssapi.h>
  #endif
@@ -108,7 +124,7 @@
  #if HAVE_GSSAPI_GSSAPI_GENERIC_H
  #include <gssapi/gssapi_generic.h>
  #endif
-@@ -37329,9 +37308,6 @@ else $as_nop
+@@ -37329,9 +37315,6 @@ else $as_nop
  #elif HAVE_GSSAPI_H
  #include <gssapi.h>
  #endif
@@ -118,7 +134,7 @@
  #if HAVE_GSSAPI_GSSAPI_GENERIC_H
  #include <gssapi/gssapi_generic.h>
  #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 <sched.h>
  #endif
  
-@@ -49806,6 +49783,7 @@ else $as_nop
+@@ -49806,6 +49790,7 @@ else $as_nop
  #       include <sys/ioccom.h>
  #       include <netinet/in.h>
  #undef minor_t