git: 941306d39fe4 - main - www/squid: Update 6.12 => 6.13

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Vladimir Druzenko <vvd_at_FreeBSD.org>
Date: Fri, 20 Jun 2025 21:43:34 UTC
The branch main has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=941306d39fe47259c25f5b2b197d06bf6496dd12

commit 941306d39fe47259c25f5b2b197d06bf6496dd12
Author:     Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2025-06-20 21:32:19 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2025-06-20 21:42:40 +0000

    www/squid: Update 6.12 => 6.13
    
    Changelog:
    https://github.com/squid-cache/squid/releases/tag/SQUID_6_13
    
    - Move MASTER_SITES to github - upstream stopped publishing archives
      anywhere except github.
    - Improve local patches for build NIS support.
    - Rename patch-src-cf.data.pre to patch-src_cf.data.pre and refresh.
    
    PR:             285493
    Approved by:    Pavel Timofeev <timp87@gmail.com> (maintainer)
    Co-authored-by: Pavel Timofeev <timp87@gmail.com>
    MFH:            2025Q2
---
 www/squid/Makefile                                 | 21 +++++++------
 www/squid/distinfo                                 |  6 ++--
 www/squid/files/patch-configure                    | 34 +++++++---------------
 ...patch-src-cf.data.pre => patch-src_cf.data.pre} |  4 +--
 4 files changed, 26 insertions(+), 39 deletions(-)

diff --git a/www/squid/Makefile b/www/squid/Makefile
index 33b326d4413a..43984fbbbe58 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,12 +1,7 @@
 PORTNAME=	squid
-DISTVERSION=	6.12
-PORTREVISION=	1
+DISTVERSION=	6.13
 CATEGORIES=	www
-MASTER_SITES=	http://www2.pl.squid-cache.org/Versions/v6/ \
-		http://www1.il.squid-cache.org/Versions/v6/ \
-		http://www2.gr.squid-cache.org/Versions/v6/ \
-		http://ca2.squid-cache.org/Versions/v6/ \
-		https://www.squid-cache.org/Versions/v6/
+MASTER_SITES=	https://github.com/${PORTNAME}-cache/${PORTNAME}/releases/download/${PORTNAME:tu}_${DISTVERSION:S|.|_|g}/
 
 PATCH_SITES=	http://www2.pl.squid-cache.org/%SUBDIR%/ \
 		http://www1.il.squid-cache.org/%SUBDIR%/ \
@@ -17,7 +12,8 @@ PATCH_SITE_SUBDIR=	Versions/v6/changesets
 
 MAINTAINER=	timp87@gmail.com
 COMMENT=	HTTP Caching Proxy
-WWW=		https://www.squid-cache.org/
+WWW=		https://www.squid-cache.org/ \
+		https://github.com/squid-cache/squid/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
@@ -209,9 +205,11 @@ WCCP_CONFIGURE_ENABLE=		wccp
 MYDOCS=		QUICKSTART README RELEASENOTES.html doc/debug-sections.txt
 
 change_files=	ChangeLog errors/Makefile.am errors/Makefile.in \
-		src/auth/basic/SMB_LM/README.html src/Makefile.am \
-		src/Makefile.in src/cf_gen.cc src/squid.8.in \
-		test-suite/Makefile.in tools/Makefile.am tools/Makefile.in
+		src/auth/basic/SMB_LM/README.html \
+		src/Makefile.am src/Makefile.in \
+		src/cf_gen.cc src/squid.8.in \
+		test-suite/Makefile.in test-suite/Makefile.am \
+		tools/Makefile.am tools/Makefile.in
 
 .include <bsd.port.options.mk>
 
@@ -223,6 +221,7 @@ EXTERNAL_ACL+=	file_userip unix_group delayer
 # POLA: allow the old global make.conf(5) (pre src.conf(5)) defines, too:
 .if ${PORT_OPTIONS:MAUTH_NIS} && !defined(NO_NIS) && !defined(WITHOUT_NIS)
 BASIC_AUTH+=	NIS
+CPPFLAGS+=	-DBOOL_DEFINED
 .endif
 
 # POLA: allow the old global make.conf(5) (pre src.conf(5)) defines, too:
diff --git a/www/squid/distinfo b/www/squid/distinfo
index a716d8c3cf74..3482b7d60f5c 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1733684468
-SHA256 (squid-6.12.tar.xz) = f3df3abb2603a513266f24a5d4699a9f0d76b9f554d1848b67f9c51cd3b3cb50
-SIZE (squid-6.12.tar.xz) = 2548220
+TIMESTAMP = 1749986346
+SHA256 (squid-6.13.tar.xz) = 232e0567946ccc0115653c3c18f01e83f2d9cc49c43d9dead8b319af0b35ad52
+SIZE (squid-6.13.tar.xz) = 2548680
diff --git a/www/squid/files/patch-configure b/www/squid/files/patch-configure
index c98cda36c325..0aa171813c01 100644
--- a/www/squid/files/patch-configure
+++ b/www/squid/files/patch-configure
@@ -1,27 +1,15 @@
---- configure.orig	2024-10-11 07:24:17 UTC
+--- configure.orig	2025-02-01 11:08:28 UTC
 +++ configure
-@@ -29452,7 +29452,7 @@ fi
- fi
+@@ -43956,7 +43956,7 @@ BUILD_HELPER="NIS"
+ ##
  
- 
--if test "x$with_nettle" != "xno"]
-+if test "x$with_nettle" != "xno"
- then :
- 
- 
-@@ -44043,7 +44043,10 @@ else $as_nop
- 
- else $as_nop
- 
--  BUILD_HELPER=""
-+# XXX: On FreeBSD we have to do this to make NIS work
-+# until https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=188247
-+# is resolved.
-+  BUILD_HELPER="NIS"
- 
- fi
- 
-@@ -50892,6 +50895,7 @@ ac_fn_cxx_check_type "$LINENO" "cpu_set_t" "ac_cv_type
+ BUILD_HELPER="NIS"
+-       for ac_header in sys/types.h rpc/rpc.h rpcsvc/ypclnt.h rpcsvc/yp_prot.h crypt.h
++       for ac_header in sys/types.h rpc/rpc.h rpcsvc/ypclnt.h rpcsvc/yp_prot.h rpcsvc/crypt.h
+ 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" "
+@@ -50825,6 +50825,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
@@ -29,7 +17,7 @@
  #include <sched.h>
  #endif
  
-@@ -53860,6 +53864,7 @@ else $as_nop
+@@ -53793,6 +53794,7 @@ else $as_nop
  #       include <sys/ioccom.h>
  #       include <netinet/in.h>
  #undef minor_t
diff --git a/www/squid/files/patch-src-cf.data.pre b/www/squid/files/patch-src_cf.data.pre
similarity index 76%
rename from www/squid/files/patch-src-cf.data.pre
rename to www/squid/files/patch-src_cf.data.pre
index bfcdb4b2bc8a..5d2e4ecc1086 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	2024-03-04 05:45:51 UTC
+--- src/cf.data.pre.orig	2025-01-31 08:52:43 UTC
 +++ src/cf.data.pre
-@@ -5526,6 +5526,10 @@ DEFAULT: @DEFAULT_PID_FILE@
+@@ -5552,6 +5552,10 @@ DOC_START
  LOC: Config.pidFilename
  DOC_START
  	A filename to write the process-id to.  To disable, enter "none".