debian/changelog

-glibc (2.35-0experimental3) UNRELEASED; urgency=medium
+glibc (2.35-0experimental3) experimental; urgency=medium
   [ Aurelien Jarno ]
   * debian/control.in/libc: add a breaks against valgrind (<< 1:3.19.0-1~).
@@ -6,7 +6,7 @@ glibc (2.35-0experimental3) UNRELEASED; urgency=medium
   * debian/debhelper.in/libc-bin.install: install /usr/bin/ld.so.
   * debian/rules.d/build.mk: egrep -> grep -E.
- -- Aurelien Jarno <aurel32@debian.org>  Sun, 28 Aug 2022 13:45:56 +0200
+ -- Aurelien Jarno <aurel32@debian.org>  Sun, 11 Sep 2022 11:40:03 +0200
 glibc (2.35-0experimental2) experimental; urgency=medium
@@ -56,6 +56,7 @@ glibc (2.35-0experimental0) experimental; urgency=medium
     - debian/patches/hurd-i386/tg-EIEIO-fr.diff: upstreamed.
     - debian/patches/hurd-i386/tg-EGREGIOUS-fr.diff: upstreamed.
     - debian/patches/hurd-i386/local-tls-ie-align.diff: dropped, obsolete.
+    - debian/patches/hurd-i386/git-thrd_current.diff: dropped, obsolete.
     - debian/patches/kfreebsd/submitted-auxv.diff: rebased.
     - debian/patches/mips/submitted-rld_map.diff: rebased.
     - debian/patches/all/submitted-po-fr-fixes.diff: upstreamed.
@@ -83,6 +84,19 @@ glibc (2.35-0experimental0) experimental; urgency=medium
  -- Aurelien Jarno <aurel32@debian.org>  Sun, 07 Aug 2022 22:25:02 +0200
+glibc (2.34-8) unstable; urgency=medium
+
+  [ Samuel Thibault ]
+  * debian/patches/hurd-i386/git-strerror_X.diff: Fix strerror format.
+  * debian/patches/hurd-i386/git-xpg_strerror.diff: Fix xpg_error behavior.
+  * debian/patches/hurd-i386/git-thrd_current.diff: Fix calling thrd_current
+    without libpthread.
+
+  [ Aurelien Jarno ]
+  * debian/patches/git-updates.diff: update from upstream stable branch.
+
+ -- Aurelien Jarno <aurel32@debian.org>  Sun, 11 Sep 2022 00:05:13 +0200
+
 glibc (2.34-7) unstable; urgency=medium
   [ Samuel Thibault ]

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

+commit 03ad444e8e086391f53d87c3949e0d44adef4bc3
+Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date:   Sat Aug 27 13:52:46 2022 +0200
+
+    mach: Fix incoherency between perror and strerror
+    
+    08d2024b4167 ("string: Simplify strerror_r") inadvertently made
+    __strerror_r print unknown error system in decimal while the original
+    code was printing it in hexadecimal. perror was kept printing in
+    hexadecimal in 725eeb4af14c ("string: Use tls-internal on strerror_l"),
+    let us keep both coherent.
+    
+    This also fixes a duplicate ':'
+    
+    Spotted by the libunistring testsuite test-perror2
+
+diff --git a/sysdeps/mach/_strerror.c b/sysdeps/mach/_strerror.c
+index b179c440d3..acc00612bb 100644
+--- a/sysdeps/mach/_strerror.c
++++ b/sysdeps/mach/_strerror.c
+@@ -40,7 +40,7 @@ __strerror_r (int errnum, char *buf, size_t buflen)
+ 
+   if (system > err_max_system || ! __mach_error_systems[system].bad_sub)
+     {
+-      __snprintf (buf, buflen, "%s: %d", _("Error in unknown error system: "),
++      __snprintf (buf, buflen, "%s%X", _("Error in unknown error system: "),
+ 		  errnum);
+       return buf;
+     }

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

+commit cb033e6b0ca7b8873cd00687ffd1828038a595d3
+Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date:   Sat Aug 27 14:46:23 2022 +0200
+
+    mach: Make xpg_strerror_r set a message on error
+    
+    posix advises to have strerror_r fill a message even when we are returning
+    an error.
+    
+    This makes mach's xpg_strerror_r do this, like the generic version does.
+    
+    Spotted by the libunistring testsuite test-strerror_r
+
+diff --git a/sysdeps/mach/xpg-strerror.c b/sysdeps/mach/xpg-strerror.c
+index 92bb67e2bc..de75cc84ae 100644
+--- a/sysdeps/mach/xpg-strerror.c
++++ b/sysdeps/mach/xpg-strerror.c
+@@ -51,7 +51,11 @@ __xpg_strerror_r (int errnum, char *buf, size_t buflen)
+   code = err_get_code (errnum);
+ 
+   if (system > err_max_system || ! __mach_error_systems[system].bad_sub)
+-    return EINVAL;
++    {
++      __snprintf (buf, buflen, "%s%X", _("Error in unknown error system: "),
++		  errnum);
++      return EINVAL;
++    }
+ 
+   es = &__mach_error_systems[system];
+ 
+@@ -62,11 +66,11 @@ __xpg_strerror_r (int errnum, char *buf, size_t buflen)
+   else
+     estr = (const char *) _(es->subsystem[sub].codes[code]);
+ 
+-  size_t estrlen = strlen (estr) + 1;
++  size_t estrlen = strlen (estr);
+ 
+-  if (buflen < estrlen)
+-    return ERANGE;
++  /* Terminate the string in any case.  */
++  if (buflen > 0)
++    *((char *) __mempcpy (buf, estr, MIN (buflen - 1, estrlen))) = '\0';
+ 
+-  memcpy (buf, estr, estrlen);
+-  return 0;
++  return buflen <= estrlen ? ERANGE : 0;
+ }

debian/patches/series

@@ -37,6 +37,8 @@ hurd-i386/git-ipv6.diff
 hurd-i386/git-ip_mreqn.diff
 hurd-i386/git-bootstrap-enable_secure.diff
 hurd-i386/git-cond-destroy.diff
+hurd-i386/git-strerror_X.diff
+hurd-i386/git-xpg_strerror.diff
 
 hurd-i386/local-enable-ldconfig.diff
 hurd-i386/tg-sysvshm.diff