Date: Mon, 26 Jan 2026 23:42:54 +0000 From: Vladimir Druzenko <vvd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Cc: Pavel Timofeev <timp87@gmail.com> Subject: git: c37b2beb606f - main - www/squid: Update 7.3 => 7.4 Message-ID: <6977fbfe.3f0fe.ce77d3c@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=c37b2beb606f05364abdbe8bf4a9574c253f4c7d commit c37b2beb606f05364abdbe8bf4a9574c253f4c7d Author: Pavel Timofeev <timp87@gmail.com> AuthorDate: 2026-01-26 23:39:46 +0000 Commit: Vladimir Druzenko <vvd@FreeBSD.org> CommitDate: 2026-01-26 23:39:46 +0000 www/squid: Update 7.3 => 7.4 Changelog: https://github.com/squid-cache/squid/releases/tag/SQUID_7_4 - Rework GSSAPI option a bit to make them more reliable. - Update files/patch-configure to follow upstream changes. - Split post-install - create post-install-*-on. PR: 292732 --- www/squid/Makefile | 37 ++++++++++++++++++---------------- www/squid/distinfo | 6 +++--- www/squid/files/patch-configure | 44 ++++++++++++++++++++--------------------- 3 files changed, 45 insertions(+), 42 deletions(-) diff --git a/www/squid/Makefile b/www/squid/Makefile index 253b7c629874..8e69f05dd578 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -1,6 +1,5 @@ PORTNAME= squid -DISTVERSION= 7.3 -PORTREVISION= 2 +DISTVERSION= 7.4 CATEGORIES= www MASTER_SITES= https://github.com/${PORTNAME}-cache/${PORTNAME}/releases/download/${PORTNAME:tu}_${DISTVERSION:S|.|_|g}/ @@ -135,25 +134,25 @@ FS_DISKD_VARS= DISKIO_MODULES+=DiskDaemon \ STORAGE_SCHEMES+=diskd FS_ROCK_VARS= STORAGE_SCHEMES+=rock GSSAPI_BASE_USES= gssapi -GSSAPI_BASE_CONFIGURE_ON= ${GSSAPI_CONFIGURE_ARGS} \ - krb5_config=${GSSAPIBASEDIR}/bin/krb5-config .if exists(/usr/libdata/pkgconfig/mit-krb5.pc) -GSSAPI_BASE_CONFIGURE_ON+= --with-mit-krb5=${GSSAPIBASEDIR} +GSSAPI_BASE_CONFIGURE_ON= --with-mit-krb5=${GSSAPIBASEDIR} \ + --without-heimdal-krb5 +GSSAPI_BASE_CONFIGURE_ENV= LIBMIT_KRB5_CFLAGS="${GSSAPICPPFLAGS}" \ + LIBMIT_KRB5_LIBS="${GSSAPILIBS}" .else -GSSAPI_BASE_CONFIGURE_ON+= --with-heimdal-krb5=${GSSAPIBASEDIR} \ +GSSAPI_BASE_CONFIGURE_ON= --with-heimdal-krb5=${GSSAPIBASEDIR} \ --without-mit-krb5 +GSSAPI_BASE_CONFIGURE_ENV= LIBHEIMDAL_KRB5_CFLAGS="${GSSAPICPPFLAGS}" \ + LIBHEIMDAL_KRB5_LIBS="${GSSAPILIBS}" .endif GSSAPI_BASE_PLIST_SUB= AUTH_KERB="" GSSAPI_HEIMDAL_USES= gssapi:heimdal -GSSAPI_HEIMDAL_CONFIGURE_ON= ${GSSAPI_CONFIGURE_ARGS} \ - --with-heimdal-krb5=${GSSAPIBASEDIR} \ - --without-mit-krb5 \ - krb5_config=${GSSAPIBASEDIR}/bin/krb5-config +GSSAPI_HEIMDAL_CONFIGURE_ON= --with-heimdal-krb5=yes \ + --without-mit-krb5 GSSAPI_HEIMDAL_PLIST_SUB= AUTH_KERB="" GSSAPI_MIT_USES= gssapi:mit -GSSAPI_MIT_CONFIGURE_ON= ${GSSAPI_CONFIGURE_ARGS} \ - --with-mit-krb5=${GSSAPIBASEDIR} \ - krb5_config=${GSSAPIBASEDIR}/bin/krb5-config +GSSAPI_MIT_CONFIGURE_ON= --with-mit-krb5=yes \ + --without-heimdal-krb5 GSSAPI_MIT_PLIST_SUB= AUTH_KERB="" GSSAPI_NONE_CONFIGURE_ON= --without-gss \ --without-heimdal-krb5 \ @@ -267,13 +266,17 @@ post-patch-IPV6-off: ${WRKSRC}/src/cf.data.pre post-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/weekly \ - ${STAGEDIR}${EXAMPLESDIR} \ - ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/weekly ${INSTALL_SCRIPT} ${WRKDIR}/900.squid-rotate-log \ ${STAGEDIR}${PREFIX}/etc/periodic/weekly + +post-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} ${MYDOCS} ${STAGEDIR}${DOCSDIR}) + +post-install-EXAMPLES-on: + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/src/auth/basic/DB/passwd.sql \ ${STAGEDIR}${EXAMPLESDIR} - (cd ${WRKSRC} && ${INSTALL_DATA} ${MYDOCS} ${STAGEDIR}${DOCSDIR}) .include <bsd.port.mk> diff --git a/www/squid/distinfo b/www/squid/distinfo index f30455af983d..c75a21e8fc90 100644 --- a/www/squid/distinfo +++ b/www/squid/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1761688531 -SHA256 (squid-7.3.tar.xz) = dadc2a9a3926ce1b3babeaa7a7d7b21cbb089025876daa3f5c19e7eb6391ddcd -SIZE (squid-7.3.tar.xz) = 2441828 +TIMESTAMP = 1769176987 +SHA256 (squid-7.4.tar.xz) = e31976edd755c295bd5842a349c9c7dad16a683d066337cc09033c1302b4fed4 +SIZE (squid-7.4.tar.xz) = 2441824 diff --git a/www/squid/files/patch-configure b/www/squid/files/patch-configure index 029b914fd6be..d3d51f3e4145 100644 --- a/www/squid/files/patch-configure +++ b/www/squid/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2025-10-28 20:25:31 UTC +--- configure.orig 2026-01-20 21:46:17 UTC +++ configure -@@ -29214,7 +29214,14 @@ fi +@@ -29211,7 +29211,14 @@ fi fi @@ -16,26 +16,26 @@ #if HAVE_SYS_TYPES_H #include <sys/types.h> #endif -@@ -32420,15 +32427,15 @@ then : +@@ -32417,15 +32424,15 @@ then : with_mit_krb5=yes if test -d "$withval/lib64" then : -- LIB_KRB5_PATH+="-L$withval/lib64" -+ LIBMIT_KRB5_LIBS="$LIBMIT_KRB5_LIBS -L$withval/lib64" +- LIBMIT_KRB5_PATH+="-L$withval/lib64" ++ LIBMIT_KRB5_PATH="$LIBMIT_KRB5_PATH -L$withval/lib64" fi if test -d "$withval/lib" then : -- LIB_KRB5_PATH+="-L$withval/lib" -+ LIBMIT_KRB5_LIBS="$LIBMIT_KRB5_LIBS -L$withval/lib" +- LIBMIT_KRB5_PATH+="-L$withval/lib" ++ LIBMIT_KRB5_PATH="$LIBMIT_KRB5_PATH -L$withval/lib" fi if test -d "$withval/include" then : -- LIB_KRB5_CFLAGS+="-I$withval/include" +- LIBMIT_KRB5_CFLAGS+="-I$withval/include" + LIBMIT_KRB5_CFLAGS="$LIBMIT_KRB5_CFLAGS -I$withval/include" fi ;; esac -@@ -33791,9 +33798,6 @@ else $as_nop +@@ -33669,9 +33676,6 @@ else $as_nop #elif HAVE_GSSAPI_H #include <gssapi.h> #endif @@ -45,7 +45,7 @@ #if HAVE_GSSAPI_GSSAPI_GENERIC_H #include <gssapi/gssapi_generic.h> #endif -@@ -33871,9 +33875,6 @@ else $as_nop +@@ -33749,9 +33753,6 @@ else $as_nop #elif HAVE_GSSAPI_H #include <gssapi.h> #endif @@ -55,7 +55,7 @@ #if HAVE_GSSAPI_GSSAPI_GENERIC_H #include <gssapi/gssapi_generic.h> #endif -@@ -35197,9 +35198,6 @@ else $as_nop +@@ -35075,9 +35076,6 @@ else $as_nop #elif HAVE_GSSAPI_H #include <gssapi.h> #endif @@ -65,7 +65,7 @@ #if HAVE_GSSAPI_GSSAPI_GENERIC_H #include <gssapi/gssapi_generic.h> #endif -@@ -35277,9 +35275,6 @@ else $as_nop +@@ -35155,9 +35153,6 @@ else $as_nop #elif HAVE_GSSAPI_H #include <gssapi.h> #endif @@ -75,17 +75,17 @@ #if HAVE_GSSAPI_GSSAPI_GENERIC_H #include <gssapi/gssapi_generic.h> #endif -@@ -35530,15 +35525,15 @@ then : +@@ -35408,15 +35403,15 @@ then : with_heimdal_krb5=yes if test -d "$withval/lib64" then : - LIBHEIMDAL_KRB5_PATH+="-L$withval/lib64" -+ LIBHEIMDAL_KRB5_LIBS="$LIBHEIMDAL_KRB5_LIBS -L$withval/lib64" ++ LIBHEIMDAL_KRB5_PATH="$LIBHEIMDAL_KRB5_PATH -L$withval/lib64" fi if test -d "$withval/lib" then : - LIBHEIMDAL_KRB5_PATH+="-L$withval/lib" -+ LIBHEIMDAL_KRB5_LIBS="$LIBHEIMDAL_KRB5_LIBS -L$withval/lib" ++ LIBHEIMDAL_KRB5_PATH="$LIBHEIMDAL_KRB5_PATH -L$withval/lib" fi if test -d "$withval/include" then : @@ -94,7 +94,7 @@ fi ;; esac -@@ -36777,9 +36772,6 @@ else $as_nop +@@ -36680,9 +36675,6 @@ else $as_nop #elif HAVE_GSSAPI_H #include <gssapi.h> #endif @@ -104,7 +104,7 @@ #if HAVE_GSSAPI_GSSAPI_GENERIC_H #include <gssapi/gssapi_generic.h> #endif -@@ -36857,9 +36849,6 @@ else $as_nop +@@ -36760,9 +36752,6 @@ else $as_nop #elif HAVE_GSSAPI_H #include <gssapi.h> #endif @@ -114,7 +114,7 @@ #if HAVE_GSSAPI_GSSAPI_GENERIC_H #include <gssapi/gssapi_generic.h> #endif -@@ -37250,9 +37239,6 @@ else $as_nop +@@ -37153,9 +37142,6 @@ else $as_nop #elif HAVE_GSSAPI_H #include <gssapi.h> #endif @@ -124,7 +124,7 @@ #if HAVE_GSSAPI_GSSAPI_GENERIC_H #include <gssapi/gssapi_generic.h> #endif -@@ -37329,9 +37315,6 @@ else $as_nop +@@ -37232,9 +37218,6 @@ else $as_nop #elif HAVE_GSSAPI_H #include <gssapi.h> #endif @@ -134,7 +134,7 @@ #if HAVE_GSSAPI_GSSAPI_GENERIC_H #include <gssapi/gssapi_generic.h> #endif -@@ -40801,7 +40784,7 @@ BUILD_HELPER="NIS" +@@ -40704,7 +40687,7 @@ BUILD_HELPER="NIS" ## BUILD_HELPER="NIS" @@ -143,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 +47272,7 @@ ac_fn_cxx_check_type "$LINENO" "cpu_set_t" "ac_cv_type +@@ -47192,6 +47175,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 @@ -151,7 +151,7 @@ #include <sched.h> #endif -@@ -49806,6 +49790,7 @@ else $as_nop +@@ -49709,6 +49693,7 @@ else $as_nop # include <sys/ioccom.h> # include <netinet/in.h> #undef minor_thome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6977fbfe.3f0fe.ce77d3c>