debian/changelog

@@ -83,6 +83,78 @@ glibc (2.38-1) experimental; urgency=medium
  -- Aurelien Jarno <aurel32@debian.org>  Fri, 04 Aug 2023 12:50:01 +0200
+glibc (2.37-13) unstable; urgency=medium
+
+  [ Aurelien Jarno ]
+  * debian/rules.d/control.mk: enable build on loong64.  Closes: #1053717.
+  * debian/patches/git-updates.diff: update from upstream stable branch.
+  * debian/patches/any/local-tcsetaddr.diff: fix a thinko in handling of
+    CREAD, CSIZE, PARENB bits in tcsetaddr(). Thanks to Ian Abbott for the
+    hint.  Closes: #1050290.
+  * Update Swedish debconf translation, by Martin Bagge.  Closes: #1056957.
+  * debian/local/manpages/getconf.1: fix issues reported py mandoc.  Closes:
+    #1052267.
+
+  [ Samuel Thibault ]
+  * debian/patches/hurd-i386/git-statfs_f_ffree.patch: Add missing f_ffree
+    conversion.
+  * debian/patches/hurd-i386/git-send_interrupt.diff: Fix spurious send
+    interrupts.
+  * debian/patches/hurd-i386/git-exec-intr.diff: Fix "invalid destination"
+    errors during ghc builds.
+  * debian/patches/hurd-i386/git-ioctls-bsd.diff: Fix missing BSD macros after
+    including termios.h then ioctl.h
+  * debian/patches/hurd-i386/git-dtable_reauth.diff: Fix restarting
+    reauth_dtable on signal.
+
+ -- Aurelien Jarno <aurel32@debian.org>  Sun, 03 Dec 2023 14:23:52 +0100
+
+glibc (2.37-12) unstable; urgency=critical
+
+  [ Samuel Thibault ]
+  * debian/testsuite-xfail-debian.mk: Update xfails for hurd-i386.
+
+  [ Aurelien Jarno ]
+  * debian/patches/git-updates.diff: update from upstream stable branch:
+    - Fix a buffer overflow in the dynamic loader's processing of the
+      GLIBC_TUNABLES environment variable (CVE-2023-4911).
+  * Set urgency to critical given the security issue.
+
+ -- Aurelien Jarno <aurel32@debian.org>  Tue, 03 Oct 2023 19:14:06 +0200
+
+glibc (2.37-11) unstable; urgency=medium
+
+  [ Samuel Thibault ]
+  * debian/testsuite-xfail-debian.mk: Update xfails for hurd-i386.
+
+  [ Aurelien Jarno ]
+  * debian/patches/git-updates.diff: update from upstream stable branch:
+    - Fix a memory leak in getaddrinfo introduced by fix for CVE-2023-4806
+      (CVE-2023-5156).  Closes: #1053002.
+
+ -- Aurelien Jarno <aurel32@debian.org>  Wed, 27 Sep 2023 20:50:25 +0200
+
+glibc (2.37-10) unstable; urgency=medium
+
+  * debian/patches/git-updates.diff: update from upstream stable branch:
+    - Fix use after free in getcanonname (CVE-2023-4806).
+
+ -- Aurelien Jarno <aurel32@debian.org>  Sat, 16 Sep 2023 11:12:43 +0200
+
+glibc (2.37-9) unstable; urgency=medium
+
+  [ Samuel Thibault ]
+  * debian/testsuite-xfail-debian.mk: Update xfails for hurd-i386.
+  * debian/patches/hurd-i386/git-main_stack.diff: Avoid exposing the vm_region
+    symbol.
+
+  [ Aurelien Jarno ]
+  * debian/patches/git-updates.diff: update from upstream stable branch:
+    - Fix a stack read overflow in getaddrinfo in no-aaaa mode
+      (CVE-2023-4527).  Closes: #1051958.
+
+ -- Aurelien Jarno <aurel32@debian.org>  Fri, 15 Sep 2023 07:33:43 +0200
+
 glibc (2.37-8) unstable; urgency=medium
   [ Samuel Thibault ]

debian/control

@@ -9,7 +9,7 @@ Build-Depends: gettext, dpkg (>= 1.18.7), dpkg-dev (>= 1.17.14), xz-utils, file,
  hurd-dev (>= 1:0.9.git20201127-4~) [hurd-any] | hurd-headers-dev [hurd-any],
  binutils-for-host (>= 2.38),
  g++-12 <!cross>, g++-12 (>= 12.3.0-2) [alpha] <!cross>, g++-12-multilib [amd64 i386 mips mipsel mipsn32 mipsn32el mips64 mips64el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el powerpc ppc64 s390x sparc sparc64 x32] <!nobiarch>,
- g++-12-x86-64-linux-gnu [amd64] <cross>, g++-12-arc-linux-gnu [arc] <cross>, g++-12-aarch64-linux-gnu [arm64] <cross>, g++-12-arm-linux-gnueabi [armel] <cross>, g++-12-arm-linux-gnueabihf [armhf] <cross>, g++-12-hppa-linux-gnu [hppa] <cross>, g++-12-i686-linux-gnu [i386] <cross>, g++-12-m68k-linux-gnu [m68k] <cross>, g++-12-mips-linux-gnu [mips] <cross>, g++-12-mipsel-linux-gnu [mipsel] <cross>, g++-12-mips64-linux-gnuabin32 [mipsn32] <cross>, g++-12-mips64el-linux-gnuabin32 [mipsn32el] <cross>, g++-12-mips64-linux-gnuabi64 [mips64] <cross>, g++-12-mips64el-linux-gnuabi64 [mips64el] <cross>, g++-12-mipsisa32r6-linux-gnu [mipsr6] <cross>, g++-12-mipsisa32r6el-linux-gnu [mipsr6el] <cross>, g++-12-mipsisa64r6-linux-gnuabin32 [mipsn32r6] <cross>, g++-12-mipsisa64r6el-linux-gnuabin32 [mipsn32r6el] <cross>, g++-12-mipsisa64r6-linux-gnuabi64 [mips64r6] <cross>, g++-12-mipsisa64r6el-linux-gnuabi64 [mips64r6el] <cross>, g++-12-nios2-linux-gnu [nios2] <cross>, g++-12-powerpc-linux-gnu [powerpc] <cross>, g++-12-powerpc64-linux-gnu [ppc64] <cross>, g++-12-powerpc64le-linux-gnu [ppc64el] <cross>, g++-12-riscv64-linux-gnu [riscv64] <cross>, g++-12-sparc-linux-gnu [sparc] <cross>, g++-12-sparc64-linux-gnu [sparc64] <cross>, g++-12-s390x-linux-gnu [s390x] <cross>, g++-12-sh3-linux-gnu [sh3] <cross>, g++-12-sh4-linux-gnu [sh4] <cross>, g++-12-x86-64-linux-gnux32 [x32] <cross>, g++-12-alpha-linux-gnu [alpha] <cross>, g++-12-ia64-linux-gnu [ia64] <cross>,
+ g++-12-x86-64-linux-gnu [amd64] <cross>, g++-12-arc-linux-gnu [arc] <cross>, g++-12-aarch64-linux-gnu [arm64] <cross>, g++-12-arm-linux-gnueabi [armel] <cross>, g++-12-arm-linux-gnueabihf [armhf] <cross>, g++-12-hppa-linux-gnu [hppa] <cross>, g++-12-i686-linux-gnu [i386] <cross>, g++-12-loongarch64-linux-gnu [loong64] <cross>, g++-12-m68k-linux-gnu [m68k] <cross>, g++-12-mips-linux-gnu [mips] <cross>, g++-12-mipsel-linux-gnu [mipsel] <cross>, g++-12-mips64-linux-gnuabin32 [mipsn32] <cross>, g++-12-mips64el-linux-gnuabin32 [mipsn32el] <cross>, g++-12-mips64-linux-gnuabi64 [mips64] <cross>, g++-12-mips64el-linux-gnuabi64 [mips64el] <cross>, g++-12-mipsisa32r6-linux-gnu [mipsr6] <cross>, g++-12-mipsisa32r6el-linux-gnu [mipsr6el] <cross>, g++-12-mipsisa64r6-linux-gnuabin32 [mipsn32r6] <cross>, g++-12-mipsisa64r6el-linux-gnuabin32 [mipsn32r6el] <cross>, g++-12-mipsisa64r6-linux-gnuabi64 [mips64r6] <cross>, g++-12-mipsisa64r6el-linux-gnuabi64 [mips64r6el] <cross>, g++-12-nios2-linux-gnu [nios2] <cross>, g++-12-powerpc-linux-gnu [powerpc] <cross>, g++-12-powerpc64-linux-gnu [ppc64] <cross>, g++-12-powerpc64le-linux-gnu [ppc64el] <cross>, g++-12-riscv64-linux-gnu [riscv64] <cross>, g++-12-sparc-linux-gnu [sparc] <cross>, g++-12-sparc64-linux-gnu [sparc64] <cross>, g++-12-s390x-linux-gnu [s390x] <cross>, g++-12-sh3-linux-gnu [sh3] <cross>, g++-12-sh4-linux-gnu [sh4] <cross>, g++-12-x86-64-linux-gnux32 [x32] <cross>, g++-12-alpha-linux-gnu [alpha] <cross>, g++-12-ia64-linux-gnu [ia64] <cross>,
  python3:native,
  libidn2-0 (>= 2.0.5~) <!nocheck>,
  libc-bin (>= 2.38) <cross>,
@@ -156,7 +156,7 @@ Description: GNU C Library: Name Service Cache Daemon
  slow services like LDAP, NIS or NIS+.
 
 Package: libc6
-Architecture: amd64 arc arm64 armel armhf hppa i386 m68k mips mipsel mipsn32 mipsn32el mips64 mips64el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el nios2 powerpc ppc64 ppc64el riscv64 sparc sparc64 s390x sh3 sh4 x32
+Architecture: amd64 arc arm64 armel armhf hppa i386 loong64 m68k mips mipsel mipsn32 mipsn32el mips64 mips64el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el nios2 powerpc ppc64 ppc64el riscv64 sparc sparc64 s390x sh3 sh4 x32
 Section: libs
 Priority: optional
 Multi-Arch: same
@@ -186,7 +186,7 @@ Description: GNU C Library: Shared libraries
  and the standard math library, as well as many others.
 
 Package: libc6-dev
-Architecture: amd64 arc arm64 armel armhf hppa i386 m68k mips mipsel mipsn32 mipsn32el mips64 mips64el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el nios2 powerpc ppc64 ppc64el riscv64 sparc sparc64 s390x sh3 sh4 x32
+Architecture: amd64 arc arm64 armel armhf hppa i386 loong64 m68k mips mipsel mipsn32 mipsn32el mips64 mips64el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el nios2 powerpc ppc64 ppc64el riscv64 sparc sparc64 s390x sh3 sh4 x32
 Section: libdevel
 Priority: optional
 Multi-Arch: same
@@ -201,7 +201,7 @@ Description: GNU C Library: Development Libraries and Header Files
  and link programs which use the standard C library.
 
 Package: libc6-dbg
-Architecture: amd64 arc arm64 armel armhf hppa i386 m68k mips mipsel mipsn32 mipsn32el mips64 mips64el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el nios2 powerpc ppc64 ppc64el riscv64 sparc sparc64 s390x sh3 sh4 x32
+Architecture: amd64 arc arm64 armel armhf hppa i386 loong64 m68k mips mipsel mipsn32 mipsn32el mips64 mips64el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el nios2 powerpc ppc64 ppc64el riscv64 sparc sparc64 s390x sh3 sh4 x32
 Section: debug
 Priority: optional
 Multi-Arch: same
@@ -214,7 +214,7 @@ Description: GNU C Library: detached debugging symbols
 
 Package: libc6-udeb
 Package-Type: udeb
-Architecture: amd64 arc arm64 armel armhf hppa i386 m68k mips mipsel mipsn32 mipsn32el mips64 mips64el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el nios2 powerpc ppc64 ppc64el riscv64 sparc sparc64 s390x sh3 sh4 x32
+Architecture: amd64 arc arm64 armel armhf hppa i386 loong64 m68k mips mipsel mipsn32 mipsn32el mips64 mips64el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el nios2 powerpc ppc64 ppc64el riscv64 sparc sparc64 s390x sh3 sh4 x32
 Section: debian-installer
 Priority: optional
 Provides: libc6, libc-udeb, libnss-dns-udeb, libnss-files-udeb

debian/local/manpages/getconf.1

@@ -40,7 +40,7 @@
 .\"     string Tr holds user defined translation string.
 .\"     Bell System Logo is used as a dummy character.
 .\"
-.tr \(*W-|\(bv\*(Tr
+.tr \(*W-
 .ie n \{\
 .ds -- \(*W-
 .ds PI pi
@@ -65,7 +65,6 @@
 'br\}
 .el\{\
 .ds -- \(em\|
-.tr \*(Tr
 .ds L" ``
 .ds R" ''
 .ds M" ``
@@ -82,9 +81,9 @@
 'br\}
 .\"	If the F register is turned on, we'll generate
 .\"	index entries out stderr for the following things:
-.\"		TH	Title 
+.\"		TH	Title
 .\"		SH	Header
-.\"		Sh	Subsection 
+.\"		Sh	Subsection
 .\"		Ip	Item
 .\"		X<>	Xref  (embedded
 .\"	Of course, you have to process the output yourself
@@ -96,7 +95,7 @@
 .nr % 0
 .rr F
 .\}
-.TH GETCONF 1 "squeeze" "13/Jun/2010" "Debian GNU/Linux"
+.TH GETCONF 1 "June 13, 2010" "" "Debian GNU/Linux"
 .UC
 .if n .hy 0
 .if n .na

debian/patches/any/local-tcsetaddr.diff

@@ -57,8 +57,8 @@
 +	  __set_errno (save);
 +	  retval = 0;
 +	}
-+      else if ((k_termios_old.c_cflag | (PARENB & CREAD & CSIZE)) !=
-+	       (k_termios.c_cflag | (PARENB & CREAD & CSIZE)))
++      else if ((k_termios_old.c_cflag & ~(PARENB | CREAD | CSIZE)) !=
++	       (k_termios.c_cflag & ~(PARENB | CREAD | CSIZE)))
 +	{
 +	  /* Some other c_cflag setting was successfully changed, which
 +	     means we should not return an error. */

debian/patches/hurd-i386/git-dtable_reauth.diff

+commit dd858522bf36ae16496ea01ff8b65e16b4e5c22b
+Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date:   Tue Nov 21 00:55:54 2023 +0100
+
+    hurd: fix restarting reauth_dtable on signal
+    
+    While inside the critical section, RPCs would not be restarted, so we
+    have to handle EINTR errors.
+
+diff --git a/hurd/dtable.c b/hurd/dtable.c
+index 41f4d7afef..eaf4734a35 100644
+--- a/hurd/dtable.c
++++ b/hurd/dtable.c
+@@ -289,6 +289,7 @@ reauth_dtable (void)
+ {
+   int i;
+ 
++retry:
+   HURD_CRITICAL_BEGIN;
+   __mutex_lock (&_hurd_dtable_lock);
+ 
+@@ -296,6 +297,7 @@ reauth_dtable (void)
+     {
+       struct hurd_fd *const d = _hurd_dtable[i];
+       mach_port_t new, newctty, ref;
++      error_t err = 0;
+ 
+       if (d == NULL)
+ 	/* Nothing to do for an unused descriptor cell.  */
+@@ -308,23 +310,23 @@ reauth_dtable (void)
+ 
+       /* Reauthenticate the descriptor's port.  */
+       if (d->port.port != MACH_PORT_NULL
+-	  && ! __io_reauthenticate (d->port.port,
+-				    ref, MACH_MSG_TYPE_MAKE_SEND)
+-	  && ! __USEPORT (AUTH, __auth_user_authenticate
+-			  (port,
+-			   ref, MACH_MSG_TYPE_MAKE_SEND,
+-			   &new)))
++	  && ! (err = __io_reauthenticate (d->port.port,
++					   ref, MACH_MSG_TYPE_MAKE_SEND))
++	  && ! (err = __USEPORT (AUTH, __auth_user_authenticate
++				 (port,
++				  ref, MACH_MSG_TYPE_MAKE_SEND,
++				  &new))))
+ 	{
+ 	  /* Replace the port in the descriptor cell
+ 	     with the newly reauthenticated port.  */
+ 
+ 	  if (d->ctty.port != MACH_PORT_NULL
+-	      && ! __io_reauthenticate (d->ctty.port,
+-					ref, MACH_MSG_TYPE_MAKE_SEND)
+-	      && ! __USEPORT (AUTH, __auth_user_authenticate
+-			      (port,
+-			       ref, MACH_MSG_TYPE_MAKE_SEND,
+-			       &newctty)))
++	      && ! (err = __io_reauthenticate (d->ctty.port,
++					       ref, MACH_MSG_TYPE_MAKE_SEND))
++	      && ! (err = __USEPORT (AUTH, __auth_user_authenticate
++				     (port,
++				      ref, MACH_MSG_TYPE_MAKE_SEND,
++				      &newctty))))
+ 	    _hurd_port_set (&d->ctty, newctty);
+ 
+ 	  _hurd_port_locked_set (&d->port, new);
+@@ -334,6 +336,15 @@ reauth_dtable (void)
+ 	__spin_unlock (&d->port.lock);
+ 
+       __mach_port_destroy (__mach_task_self (), ref);
++
++      if (err == EINTR)
++	{
++	  /* Got a signal while inside an RPC of the critical section,
++	     retry again */
++	  __mutex_unlock (&_hurd_dtable_lock);
++	  HURD_CRITICAL_UNLOCK;
++	  goto retry;
++	}
+     }
+ 
+   __mutex_unlock (&_hurd_dtable_lock);

debian/patches/hurd-i386/git-exec-intr.diff

+commit 49b308a26e2a9e02ef396f67f59c462ad4171ea4
+Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date:   Mon Nov 20 19:19:50 2023 +0100
+
+    hurd: Prevent the final file_exec_paths call from signals
+    
+    Otherwise if the exec server started thrashing the old task,
+    we won't be able to restart the exec.
+    
+    This notably fixes building ghc.
+
+diff --git a/hurd/hurdexec.c b/hurd/hurdexec.c
+index e358d846c8..317d7ea0ad 100644
+--- a/hurd/hurdexec.c
++++ b/hurd/hurdexec.c
+@@ -362,6 +362,7 @@ retry:
+   if (!err)
+     {
+       int flags;
++      sigset_t old, new;
+ 
+       if (pdp)
+ 	{
+@@ -420,6 +421,15 @@ retry:
+       if (__sigismember (&_hurdsig_traced, SIGKILL))
+ 	flags |= EXEC_SIGTRAP;
+ #endif
++
++     /* Avoid getting interrupted while exec(), notably not after the exec
++        server has committed to the exec and started thrashing us.
++
++        TODO Rather add proper interrupt support to the exec server, that
++        avoids interrupts in that period.  */
++      __sigfillset (&new);
++      __sigprocmask (SIG_SETMASK, &new, &old);
++
+       err = __file_exec_paths (file, task, flags,
+ 			       path ? path : "",
+ 			       abspath ? abspath : "",
+@@ -440,6 +450,8 @@ retry:
+ 			   ints, INIT_INT_MAX,
+ 			   please_dealloc, pdp - please_dealloc,
+ 			   portnames, nportnames);
++
++      __sigprocmask (SIG_SETMASK, &old, NULL);
+     }
+ 
+   /* Release references to the standard ports.  */
+diff --git a/sysdeps/mach/hurd/spawni.c b/sysdeps/mach/hurd/spawni.c
+index 9516001817..58a89b45f3 100644
+--- a/sysdeps/mach/hurd/spawni.c
++++ b/sysdeps/mach/hurd/spawni.c
+@@ -812,6 +812,18 @@ retry:
+ 
+     inline error_t exec (file_t file)
+       {
++	sigset_t old, new;
++
++	/* Avoid getting interrupted while exec(), notably not after the exec
++	   server has committed to the exec and started thrashing the task.
++
++	   Various issues otherwise show up when building e.g. ghc.
++
++	   TODO Rather add proper interrupt support to the exec server, that
++	   avoids interrupts in that period.  */
++	__sigfillset(&new);
++	__sigprocmask (SIG_SETMASK, &new, &old);
++
+ 	error_t err = __file_exec_paths
+ 	  (file, task,
+ 	   __sigismember (&_hurdsig_traced, SIGKILL) ? EXEC_SIGTRAP : 0,
+@@ -824,7 +836,7 @@ retry:
+ 	/* Fallback for backwards compatibility.  This can just be removed
+ 	   when __file_exec goes away.  */
+ 	if (err == MIG_BAD_ID)
+-	  return __file_exec (file, task,
++	  err = __file_exec (file, task,
+ 			      (__sigismember (&_hurdsig_traced, SIGKILL)
+ 			      ? EXEC_SIGTRAP : 0),
+ 			      args, argslen, env, envlen,
+@@ -833,6 +845,8 @@ retry:
+ 			      ints, INIT_INT_MAX,
+ 			      NULL, 0, NULL, 0);
+ 
++	__sigprocmask (SIG_SETMASK, &old, NULL);
++
+ 	return err;
+       }
+ 

debian/patches/hurd-i386/git-ioctls-bsd.diff

+commit 2fb85a37874c09fb22cd069f7c3c7fd6d8eb2f8f
+Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date:   Sat Dec 2 21:24:58 2023 +0100
+
+    hurd: [!__USE_MISC] Do not #undef BSD macros in ioctls
+    
+    When e.g. including termios.h first and then sys/ioctl.h, without e.g.
+    _BSD_SOURCE, the latter would #undef e.g. ECHO, without defining it.
+
+diff --git a/sysdeps/mach/hurd/bits/ioctls.h b/sysdeps/mach/hurd/bits/ioctls.h
+index 943d5e4287..1b2fd6b33f 100644
+--- a/sysdeps/mach/hurd/bits/ioctls.h
++++ b/sysdeps/mach/hurd/bits/ioctls.h
+@@ -25,6 +25,7 @@
+ /* These macros are also defined in <bits/termios.h> (with numerically
+    identical values) but this serves to shut up cpp's complaining. */
+ 
++#ifdef __USE_MISC
+ #ifdef NL0
+ # undef NL0
+ #endif
+@@ -82,6 +83,7 @@
+ #ifdef NOFLSH
+ # undef NOFLSH
+ #endif
++#endif
+ 
+ /* Hurd ioctl request are made up of several fields:
+ 

debian/patches/hurd-i386/git-main_stack.diff

@@ -28,7 +28,7 @@ index 030a7c7a9e..afef7841f8 100644
 +      memory_object_name_t obj;
 +      vm_offset_t offset;
 +
-+      if (vm_region (__mach_task_self (), &addr,
++      if (__vm_region (__mach_task_self (), &addr,
 +		     &vm_size, &prot, &max_prot, &inherit, &is_shared,
 +		     &obj, &offset) == KERN_SUCCESS)
 +	__mach_port_deallocate (__mach_task_self (), obj);

debian/patches/hurd-i386/git-send_interrupt.diff

+commit 8f22e36238c94e2a89da624e03c224895f9dd691
+Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date:   Tue Nov 14 02:03:35 2023 +0100
+
+    hurd: Make _hurd_intr_rpc_mach_msg avoid returning MACH_SEND_INTERRUPTED
+    
+    When the given options do not include MACH_SEND_INTERRUPT,
+    _hurd_intr_rpc_mach_msg (aka mach_msg) is not supposed to return
+    MACH_SEND_INTERRUPTED.  In such a case we thus have to retry sending the
+    message.
+    
+    This was observed to fix various occurrences of spurious
+    "(ipc/send) interrupted" errors when running haskell programs.
+
+diff --git a/hurd/intr-msg.c b/hurd/intr-msg.c
+index bc1f43d383..98f588f206 100644
+--- a/hurd/intr-msg.c
++++ b/hurd/intr-msg.c
+@@ -143,6 +143,12 @@ _hurd_intr_rpc_mach_msg (mach_msg_header_t *msg,
+ 	     XXX */
+ 	  goto retry_receive;
+ 	}
++      if (!(option & MACH_SEND_INTERRUPT))
++	{
++	  option = user_option;
++	  timeout = user_timeout;
++	  goto message;
++	}
+       /* FALLTHROUGH */
+ 
+       /* These are the other codes that mean a pseudo-receive modified

debian/patches/hurd-i386/git-statfs_f_ffree.patch

+commit 091ee2190dd5f30ca5eb4549f531ab7b75a1fd6e
+Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date:   Tue Nov 7 12:51:25 2023 +0100
+
+    hurd: statfsconv: Add missing f_ffree conversion
+
+diff --git a/sysdeps/mach/hurd/statfsconv.c b/sysdeps/mach/hurd/statfsconv.c
+index 8a2051c269..87c9688e08 100644
+--- a/sysdeps/mach/hurd/statfsconv.c
++++ b/sysdeps/mach/hurd/statfsconv.c
+@@ -34,6 +34,7 @@ statfs64_conv (struct statfs *buf, const struct statfs64 *buf64)
+   DO (f_bfree);
+   DO (f_bavail);
+   DO (f_files);
++  DO (f_ffree);
+   DO (f_fsid);
+   DO (f_namelen);
+   DO (f_favail);

debian/patches/series

@@ -38,6 +38,11 @@ hurd-i386/git-tls_dtors.diff
 hurd-i386/git-main_stack.diff
 hurd-i386/git-ucontext.diff
 hurd-i386/git-clean_ports.diff
+hurd-i386/git-statfs_f_ffree.patch
+hurd-i386/git-send_interrupt.diff
+hurd-i386/git-exec-intr.diff
+hurd-i386/git-ioctls-bsd.diff
+hurd-i386/git-dtable_reauth.diff
 
 hurd-i386/local-enable-ldconfig.diff
 hurd-i386/tg-sysvshm.diff

debian/po/sv.po

 # Translation of glibc debconf template to Swedish
-# Copyright (C) 2014 Martin Bagge <brother@bsnet.se>
+# Copyright (C) 2023 Martin Bagge <brother@persilja.net>
 # This file is distributed under the same license as the glibc package.
 #
-# Martin Bagge <brother@bsnet.se>, 2008, 2011, 2014
+# Martin Bagge <brother@persilja.net>, 2008, 2011, 2014, 2023
 msgid ""
 msgstr ""
 "Project-Id-Version: glibc_2.7-11_sv\n"
 "Report-Msgid-Bugs-To: glibc@packages.debian.org\n"
 "POT-Creation-Date: 2023-01-03 21:34+0100\n"
-"PO-Revision-Date: 2014-06-12 22:58+0200\n"
-"Last-Translator: Martin Bagge / brother <brother@bsnet.se>\n"
+"PO-Revision-Date: 2023-11-27 09:01+0100\n"
+"Last-Translator: Martin Bagge / brother <brother@persilja.net>\n"
 "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
 "Language: Swedish\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.4\n"
 
 #. Type: multiselect
 #. Choices
@@ -243,7 +242,7 @@ msgstr ""
 #. Description
 #: ../debhelper.in/libc.templates:6001
 msgid "Kernel must be upgraded"
-msgstr ""
+msgstr "Kärnan måste uppgraderas"
 
 #. Type: error
 #. Description
@@ -253,12 +252,16 @@ msgid ""
 "later.  Please upgrade your kernel and reboot before installing glibc. You "
 "may need to use \"apt -f install\" after reboot to solve dependencies."
 msgstr ""
+"Den här versionen av GNU libc behöver åtminstone version ${kernel_ver} av "
+"kärnan. Uppgradera kärnan och starta om systemet före glibc installeras. Det "
+"kan tänkas att du behöver köra \"apt -f install\" för att lösa "
+"beroendeknutar efter omstart."
 
 #. Type: note
 #. Description
 #: ../debhelper.in/libc.templates:7001
 msgid "Kernel version not supported"
-msgstr ""
+msgstr "Kärnans version har inget stöd"
 
 #. Type: note
 #. Description
@@ -268,3 +271,7 @@ msgid ""
 "later.  Older versions might work but are not officially supported by "
 "Debian.  Please consider upgrading your kernel."
 msgstr ""
+"Den här versionen av GNU libc behöver åtminstone version ${kernel_ver} av "
+"kärnan. Äldre versioner kan eventuellt fungera men det finns inget "
+"officiellt stöd för dessa från Debianprojektet. Överväg att uppgradera din "
+"kärna."

debian/rules.d/control.mk

 libc_packages := libc6 libc6.1 libc0.3
 libc0_3_archs := hurd-i386 hurd-amd64
-libc6_archs   := amd64 arc arm64 armel armhf hppa i386 m68k mips mipsel mipsn32 mipsn32el mips64 mips64el mipsr6 mipsr6el \
+libc6_archs   := amd64 arc arm64 armel armhf hppa i386 loong64 m68k \
+                 mips mipsel mipsn32 mipsn32el mips64 mips64el mipsr6 mipsr6el \
                  mipsn32r6 mipsn32r6el mips64r6 mips64r6el nios2 powerpc ppc64 ppc64el riscv64 \
                  sparc sparc64 s390x sh3 sh4 x32
 libc6_1_archs := alpha ia64

debian/testsuite-xfail-debian.mk

@@ -372,6 +372,12 @@ test-xfail-tst-nss-gai-actions = yes
 
 # new in 2.37
 test-xfail-tst-fcntl-lock = yes
+test-xfail-tst-fcntl-lock-lfs = yes
+test-xfail-tst-nss-gai-hv2-canonname = yes
+
+# missing RLIMIT_AS support
+test-xfail-tst-vfprintf-width-prec-mem = yes
+test-xfail-tst-vfprintf-width-prec = yes
 
 # new in 2.38
 test-xfail-tst-sprof-basic = yes