bug#32452: 26.1; gnutls_try_handshake maxes out cpu retrying when server is a bit busy

[Paul Eggert <eggert@cs.ucla.edu>]

[-- Attachment #1: Type: text/plain, Size: 772 bytes --]

On 2/24/22 00:57, Lars Ingebrigtsen wrote:

> The problem was that I was running admin/merge-gnulib from a fresh
> checkout -- you have to run (at least) autogen.sh first.  Perhaps that
> should be noted in admin/notes/repo, or possibly fixed in the
> merge-gnulib script?

Thanks for reporting that; I installed the attached.

> In any case, if I do that now, I get a diff that's just a single line:
> 
> -CXXCPP = @CXXCPP@

That's probably due to differing versions of Autoconf. It shouldn't 
matter for Emacs since Emacs doesn't use CXXCPP.

It is annoying that this difference would occur on different platforms; 
for now, I wouldn't worry about it (or install the change, as it'll just 
be overwritten the next time I do a Gnulib update).

I use Fedora autoconf FWIW.

[-- Attachment #2: 0001-admin-merge-gnulib-fix-bare-checkout-Bug-32452-65.patch --]
[-- Type: text/x-patch, Size: 692 bytes --]

From bd17fa2c7565f180cedbfa396c0b159e144178cb Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 24 Feb 2022 10:12:50 -0800
Subject: [PATCH] * admin/merge-gnulib: fix bare checkout (Bug#32452#65)

---
 admin/merge-gnulib | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index 4045eabf4e..4aabffa0dc 100755
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -102,6 +102,9 @@ gnulib_srcdir=
   exit 1
 }
 
+# gnulib-tool has problems with a bare checkout (Bug#32452#65).
+test -f configure || ./autogen.sh
+
 avoided_flags=
 for module in $AVOIDED_MODULES; do
   avoided_flags="$avoided_flags --avoid=$module"
-- 
2.32.0