databases/clickhouse: Update version 25.11.1.558=>25.11.2.24

- Take MAINTAINERSHIP but pi@ has implicit permission
- Refactor the module generation with curl instead of fetch as we are
  hitting the Github API limit

Changelog: https://github.com/ClickHouse/ClickHouse/releases/tag/v25.11.2.24-stable

2 files changed, 22 insertions, 18 deletions

diff --git a/databases/clickhouse/Makefile b/databases/clickhouse/Makefile
index 65bb6462b75b..9cee9b5d1b94 100644
--- a/databases/clickhouse/Makefile
+++ b/databases/clickhouse/Makefile
@@ -1,12 +1,12 @@
 PORTNAME=	clickhouse
 DISTVERSIONPREFIX=	v
-DISTVERSION=	25.11.1.558
+DISTVERSION=	25.11.2.24
 DISTVERSIONSUFFIX=-stable
 CATEGORIES=	databases
 DIST_SUBDIR=	${PORTNAME}
 
-# implicit-approval+: bofh
-MAINTAINER=	pi@FreeBSD.org
+# implicit-approval+: pi
+MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Fast open-source OLAP database management system
 WWW=		https://clickhouse.com/
 
@@ -117,7 +117,7 @@ do-test-TEST-on:
 	cd ${WRKSRC} && ctest -j4 -V
 
 .if defined(MAINTAINER_MODE)
-_make-touples:
+_make-touples: extract
 	@set -eu; \
 	_REPO=${GH_ACCOUNT}/${GH_PROJECT}; \
 	_API="https://api.github.com/repos/$${_REPO}"; \
@@ -125,17 +125,21 @@ _make-touples:
 	_TMPDIR=$$(mktemp -d -t clickhouse-submods); \
 	trap 'rm -rf "$${_TMPDIR}"' EXIT INT TERM; \
 	_OUTFILE="$$(pwd)/Makefile.submodules"; \
+	_CURL_OPTS="-s"; \
+	if [ -n "$${GH_TOKEN}" ]; then \
+		_CURL_OPTS="$${_CURL_OPTS} -H Authorization:\ Bearer\ $${GH_TOKEN}"; \
+	fi; \
 	${ECHO_CMD} "===> Resolving tag $${_TAG}"; \
-	_COMMIT=$$(${FETCH_CMD} -qo - "$${_API}/git/refs/tags/$${_TAG}" \
+	_COMMIT=$$(curl $${_CURL_OPTS} "$${_API}/git/refs/tags/$${_TAG}" \
 	  | jq -r 'if type=="array" then .[0].object.sha else .object.sha end'); \
 	${ECHO_CMD} "===> Commit: $${_COMMIT}"; \
 	${ECHO_CMD} "===> Fetching contrib tree"; \
-	${FETCH_CMD} -qo - "$${_API}/git/trees/$${_COMMIT}?recursive=1" \
-	  | jq -r '.tree[] | select(.path|startswith("contrib/")) | select(.type=="commit") | "\(.path) \(.sha)"' \
-	  > "$${_TMPDIR}/tree.txt"; \
+	curl $${_CURL_OPTS} "$${_API}/git/trees/$${_COMMIT}?recursive=1" \
+	 | jq -r '.tree[] | select(.path|startswith("contrib/")) | select(.type=="commit") | "\(.path) \(.sha)"' \
+	 > "$${_TMPDIR}/tree.txt"; \
 	${ECHO_CMD} "===> Fetching .gitmodules"; \
-	${FETCH_CMD} -qo "$${_TMPDIR}/.gitmodules" \
-	  "https://raw.githubusercontent.com/$${_REPO}/$${_TAG}/.gitmodules" 2>/dev/null || true; \
+	curl -so "$${_TMPDIR}/.gitmodules" \
+	 "https://raw.githubusercontent.com/$${_REPO}/$${_TAG}/.gitmodules" 2>/dev/null || true; \
 	${SED} -e 's/\r$$//' "$${_TMPDIR}/.gitmodules" > "$${_TMPDIR}/.gitmodules.lf"; \
 	${AWK} '/^[[:space:]]*path[[:space:]]*=/ { \
 			gsub(/^[[:space:]]*path[[:space:]]*=[[:space:]]*/, "", $$0); \
@@ -148,15 +152,15 @@ _make-touples:
 	${ECHO_CMD} "===> Generating Makefile.gh-touples"; \
 	${AWK} 'NR==FNR { urls[$$1]=$$2; next } \
 		{ path=$$1; sha=$$2; url=urls[path]; if (url == "") next; \
-		  n=split(url, parts, "/"); org=parts[n-1]; repo=parts[n]; sub(/\.git$$/, "", repo); \
-		  org_repl=org; repo_repl=repo; gsub(/[-.]/, "_", org_repl); gsub(/[-.]/, "_", repo_repl); \
-		  printf("GH_TUPLE+=\t%s:%s:%s:%s_%s/%s\n", \
-		         org, repo, substr(sha,1,8), org_repl, repo_repl, path); }' \
+		 n=split(url, parts, "/"); org=parts[n-1]; repo=parts[n]; sub(/\.git$$/, "", repo); \
+		 org_repl=org; repo_repl=repo; gsub(/[-.]/, "_", org_repl); gsub(/[-.]/, "_", repo_repl); \
+		 printf("GH_TUPLE+=\t%s:%s:%s:%s_%s/%s\n", \
+		        org, repo, substr(sha,1,8), org_repl, repo_repl, path); }' \
 		"$${_TMPDIR}/modules.txt" "$${_TMPDIR}/tree.txt" > "$${_OUTFILE}"; \
 	${ECHO_CMD} "===> Writing $${_OUTFILE} completed"
 	${REINPLACE_CMD} -e 's|unum-cloud:usearch|unum-cloud:USearch|' \
 		${.CURDIR}/Makefile.submodules
-	${RM} ${.CURDIR}/Makefile.submodules.bak
+	if [ -f ${.CURDIR}/Makefile.submodules.bak ]; then ${RM} ${.CURDIR}/Makefile.submodules.bak; fi
 .endif
 
 .include <bsd.port.mk>
diff --git a/databases/clickhouse/distinfo b/databases/clickhouse/distinfo
index 69ef99d7479d..b617dd0063b7 100644
--- a/databases/clickhouse/distinfo
+++ b/databases/clickhouse/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1764408880
-SHA256 (clickhouse/ClickHouse-ClickHouse-v25.11.1.558-stable_GH0.tar.gz) = f5cc0eb8e37a9fc536bae396288a1c8521c21e86420b533269fb676429d245bf
-SIZE (clickhouse/ClickHouse-ClickHouse-v25.11.1.558-stable_GH0.tar.gz) = 71506095
+TIMESTAMP = 1778679272
+SHA256 (clickhouse/ClickHouse-ClickHouse-v25.11.2.24-stable_GH0.tar.gz) = b7fbb641c40e4e865aaa3d1d119eb3f285f3371cff37ade0f1cd6009bbc8568d
+SIZE (clickhouse/ClickHouse-ClickHouse-v25.11.2.24-stable_GH0.tar.gz) = 71508857
 SHA256 (clickhouse/ClickHouse-AMQP-CPP-00f09897_GH0.tar.gz) = 45bc5b52e28fd3b76af5bb1b8ad48a80936cc3e1fb019b04a09d6bf078014871
 SIZE (clickhouse/ClickHouse-AMQP-CPP-00f09897_GH0.tar.gz) = 160562
 SHA256 (clickhouse/Maratyszcza-FP16-0a92994d_GH0.tar.gz) = 72c55523880227b72fc97cee52d0082f44ec8d57d09a385cd6db22cfcb4a1d15