From 252023ffe7e464c9b8518dcb7be748ce7a0786cc Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 23 May 2025 08:54:17 -0700 Subject: [PATCH] maint: secondary updates from make fetch. * maintainer/maint.mk (git-sv-host): switch to cgit.git.savannah.gnu.org/cgit, since https://git.savannah.gnu.org has become unreliable, due to AI crawler bombardment. (SV_GIT_CF, SV_GIT_GL): update. https://lists.gnu.org/archive/html/savannah-hackers-public/2025-05/msg00040.html * lib/INSTALL: update with make fetch. * lib/gendocs.sh: likewise. --- lib/INSTALL | 14 +++++++++++++- lib/gendocs.sh | 6 +++--- maintainer/maint.mk | 16 ++++++++++++---- 3 files changed, 28 insertions(+), 8 deletions(-) diff --git a/lib/INSTALL b/lib/INSTALL index 8c608b8f4..d43221a2c 100644 --- a/lib/INSTALL +++ b/lib/INSTALL @@ -104,6 +104,18 @@ editing ‘configure’ directly. 9. If the package follows the GNU Coding Standards, you can type ‘make uninstall’ to remove the installed files. +Installation Prerequisites +========================== + + Installation requires a POSIX-like environment with a shell and at +least the following standard utilities: + + awk cat cp diff echo expr false ls mkdir mv printf pwd rm rmdir sed + sort test tr + +This package’s installation may need other standard utilities such as +‘grep’, ‘make’, ‘sleep’ and ‘touch’, along with compilers like ‘gcc’. + Compilers and Options ===================== @@ -359,7 +371,7 @@ more details. Copyright notice ================ - Copyright © 1994–1996, 1999–2002, 2004–2017, 2020–2024 Free Software + Copyright © 1994–1996, 1999–2002, 2004–2017, 2020–2025 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, diff --git a/lib/gendocs.sh b/lib/gendocs.sh index f7d862d90..b73b52425 100755 --- a/lib/gendocs.sh +++ b/lib/gendocs.sh @@ -2,7 +2,7 @@ # gendocs.sh -- generate a GNU manual in many formats. This script is # mentioned in maintain.texi. See the help message below for usage details. -scriptversion=2025-01-01.00 +scriptversion=2025-04-26.12 # Copyright 2003-2025 Free Software Foundation, Inc. # @@ -232,8 +232,8 @@ fi # Function to return size of $1 in something resembling kilobytes. calcsize() { - size=`ls -ksl $1 | awk '{print $1}'` - echo $size + set `ls -ks "$1"` + echo $1 } # copy_images OUTDIR HTML-FILE... diff --git a/maintainer/maint.mk b/maintainer/maint.mk index 41af2048a..5672d91f5 100644 --- a/maintainer/maint.mk +++ b/maintainer/maint.mk @@ -348,11 +348,19 @@ CLEANFILES += announcement # --------------------------------------------------------------------- # # Git repositories on Savannah. -git-sv-host = git.savannah.gnu.org +# In May 2025, we switched away from https://git.savannah.gnu.org/gitweb +# because it has become unreliable, often returning 502 Bad Gateway +# due to endless crawler bombardment of Savannah. The new +# https://cgi.git.savannah.gnu.org url is an experimental read-only +# mirror. It would probably be better to just switch to assuming local +# checkouts instead of retrieving via a web interface. See thread around +# https://lists.gnu.org/archive/html/savannah-hackers-public/2025-05/msg00040.html + +git-sv-host = cgit.git.savannah.gnu.org/cgit # Some repositories we sync files from. -SV_GIT_CF = 'https://$(git-sv-host)/gitweb/?p=config.git;a=blob_plain;hb=HEAD;f=' -SV_GIT_GL = 'https://$(git-sv-host)/gitweb/?p=gnulib.git;a=blob_plain;hb=HEAD;f=' +SV_GIT_CF = https://$(git-sv-host)/config.git/plain/ +SV_GIT_GL = https://$(git-sv-host)/gnulib.git/plain/ # Files that we fetch and which we compare against. # Note that the 'lib/COPYING' file and help2man must still be synced by hand. @@ -374,7 +382,7 @@ FETCHFILES = \ fetch: $(AM_V_at)rm -rf Fetchdir $(AM_V_at)mkdir Fetchdir - $(AM_V_GEN)set -e; \ + $(AM_V_GEN)set -ex; \ if $(AM_V_P); then wget_opts=; else wget_opts=-nv; fi; \ for url in $(FETCHFILES); do \ file=`printf '%s\n' "$$url" | sed 's|^.*/||; s|^.*=||'`; \ -- 2.47.3