Merge updates from debian/bookworm

debian/changelog

+glibc (2.36-9+deb12u9) bookworm; urgency=medium
+
+  * debian/testsuite-xfail-debian.mk: mark tst-support_descriptors as XFAIL,
+    due to sbuild bug #1070003.
+  * debian/patches/localedata/git-locale-hr_HR-euro.diff: change Croatian
+    locale to use Euro as currency.
+  * debian/patches/git-updates.diff: update from upstream stable branch:
+    - resolv: do not ignore short error responses (as generated by e.g.
+      Unbound) to avoid timeouts.
+    - resolv: fix timeouts when single-request mode is enabled in resolv.conf.
+    - resolv: fix reloading resolv.conf when a nameserver has been
+      automatically switched to single-request mode.
+    - mremap(): fix support for the MREMAP_DONTUNMAP option.
+    - fortification: fix name space violation in fortify wrappers.
+    - vfscanf(): fix matches longer than INT_MAX.
+    - ungetc(): fix uninitialized read when putting into unused streams.
+    - ungetc(): fix backup buffer leak on program exit.
+  * patches/arm64/local-revert-aarch64-check-kernel-version-for-sve-ifuncs.diff:
+    revert upstream commit as it changes the GLIBC_PRIVATE ABI, causing
+    crashes with static binaries using dlopened NSS functions.  Closes:
+    #1083095.
+
+ -- Aurelien Jarno <aurel32@debian.org>  Fri, 01 Nov 2024 13:42:20 +0100
+
 glibc (2.36-9+deb12u8+apertis1) apertis; urgency=medium
   * Sync from debian/bookworm.

debian/patches/arm64/local-revert-aarch64-check-kernel-version-for-sve-ifuncs.diff

+From 8191e8bdb07fd35d25bc3a50353f188e88fb11ac Mon Sep 17 00:00:00 2001
+From: Aurelien Jarno <aurelien@aurel32.net>
+Date: Sat, 26 Oct 2024 22:41:09 +0200
+Subject: [PATCH] Revert "AArch64: Check kernel version for SVE ifuncs"
+
+This reverts commit 24de733967029fd902c34073d2ab25b900887352.
+---
+ sysdeps/aarch64/multiarch/init-arch.h         |  2 -
+ sysdeps/aarch64/multiarch/memcpy.c            |  2 +-
+ sysdeps/aarch64/multiarch/memmove.c           |  2 +-
+ .../unix/sysv/linux/aarch64/cpu-features.c    | 48 -------------------
+ .../unix/sysv/linux/aarch64/cpu-features.h    |  1 -
+ 5 files changed, 2 insertions(+), 53 deletions(-)
+
+diff --git a/sysdeps/aarch64/multiarch/init-arch.h b/sysdeps/aarch64/multiarch/init-arch.h
+index 5b2cf5cb12..5da1656954 100644
+--- a/sysdeps/aarch64/multiarch/init-arch.h
++++ b/sysdeps/aarch64/multiarch/init-arch.h
+@@ -36,7 +36,5 @@
+     MTE_ENABLED ();							      \
+   bool __attribute__((unused)) sve =					      \
+     GLRO(dl_aarch64_cpu_features).sve;					      \
+-  bool __attribute__((unused)) prefer_sve_ifuncs =			      \
+-    GLRO(dl_aarch64_cpu_features).prefer_sve_ifuncs;			      \
+   bool __attribute__((unused)) mops =					      \
+     GLRO(dl_aarch64_cpu_features).mops;
+diff --git a/sysdeps/aarch64/multiarch/memcpy.c b/sysdeps/aarch64/multiarch/memcpy.c
+index 3de66c14d4..d1cf5bec16 100644
+--- a/sysdeps/aarch64/multiarch/memcpy.c
++++ b/sysdeps/aarch64/multiarch/memcpy.c
+@@ -47,7 +47,7 @@ select_memcpy_ifunc (void)
+     {
+       if (IS_A64FX (midr))
+ 	return __memcpy_a64fx;
+-      return prefer_sve_ifuncs ? __memcpy_sve : __memcpy_generic;
++      return __memcpy_sve;
+     }
+ 
+   if (IS_THUNDERX (midr))
+diff --git a/sysdeps/aarch64/multiarch/memmove.c b/sysdeps/aarch64/multiarch/memmove.c
+index fdcf418820..90729e0275 100644
+--- a/sysdeps/aarch64/multiarch/memmove.c
++++ b/sysdeps/aarch64/multiarch/memmove.c
+@@ -47,7 +47,7 @@ select_memmove_ifunc (void)
+     {
+       if (IS_A64FX (midr))
+ 	return __memmove_a64fx;
+-      return prefer_sve_ifuncs ? __memmove_sve : __memmove_generic;
++      return __memmove_sve;
+     }
+ 
+   if (IS_THUNDERX (midr))
+diff --git a/sysdeps/unix/sysv/linux/aarch64/cpu-features.c b/sysdeps/unix/sysv/linux/aarch64/cpu-features.c
+index 2543128352..6ee1cb4bc2 100644
+--- a/sysdeps/unix/sysv/linux/aarch64/cpu-features.c
++++ b/sysdeps/unix/sysv/linux/aarch64/cpu-features.c
+@@ -20,7 +20,6 @@
+ #include <sys/auxv.h>
+ #include <elf/dl-hwcaps.h>
+ #include <sys/prctl.h>
+-#include <sys/utsname.h>
+ 
+ #define DCZID_DZP_MASK (1 << 4)
+ #define DCZID_BS_MASK (0xf)
+@@ -60,46 +59,6 @@ get_midr_from_mcpu (const char *mcpu)
+ }
+ #endif
+ 
+-#if __LINUX_KERNEL_VERSION < 0x060200
+-
+-/* Return true if we prefer using SVE in string ifuncs.  Old kernels disable
+-   SVE after every system call which results in unnecessary traps if memcpy
+-   uses SVE.  This is true for kernels between 4.15.0 and before 6.2.0, except
+-   for 5.14.0 which was patched.  For these versions return false to avoid using
+-   SVE ifuncs.
+-   Parse the kernel version into a 24-bit kernel.major.minor value without
+-   calling any library functions.  If uname() is not supported or if the version
+-   format is not recognized, assume the kernel is modern and return true.  */
+-
+-static inline bool
+-prefer_sve_ifuncs (void)
+-{
+-  struct utsname buf;
+-  const char *p = &buf.release[0];
+-  int kernel = 0;
+-  int val;
+-
+-  if (__uname (&buf) < 0)
+-    return true;
+-
+-  for (int shift = 16; shift >= 0; shift -= 8)
+-    {
+-      for (val = 0; *p >= '0' && *p <= '9'; p++)
+-	val = val * 10 + *p - '0';
+-      kernel |= (val & 255) << shift;
+-      if (*p++ != '.')
+-	break;
+-    }
+-
+-  if (kernel >= 0x060200 || kernel == 0x050e00)
+-    return true;
+-  if (kernel >= 0x040f00)
+-    return false;
+-  return true;
+-}
+-
+-#endif
+-
+ static inline void
+ init_cpu_features (struct cpu_features *cpu_features)
+ {
+@@ -166,13 +125,6 @@ init_cpu_features (struct cpu_features *cpu_features)
+   /* Check if SVE is supported.  */
+   cpu_features->sve = GLRO (dl_hwcap) & HWCAP_SVE;
+ 
+-  cpu_features->prefer_sve_ifuncs = cpu_features->sve;
+-
+-#if __LINUX_KERNEL_VERSION < 0x060200
+-  if (cpu_features->sve)
+-    cpu_features->prefer_sve_ifuncs = prefer_sve_ifuncs ();
+-#endif
+-
+   /* Check if MOPS is supported.  */
+   cpu_features->mops = GLRO (dl_hwcap2) & HWCAP2_MOPS;
+ }
+diff --git a/sysdeps/unix/sysv/linux/aarch64/cpu-features.h b/sysdeps/unix/sysv/linux/aarch64/cpu-features.h
+index d51597b923..b4bd43a228 100644
+--- a/sysdeps/unix/sysv/linux/aarch64/cpu-features.h
++++ b/sysdeps/unix/sysv/linux/aarch64/cpu-features.h
+@@ -71,7 +71,6 @@ struct cpu_features
+   /* Currently, the GLIBC memory tagging tunable only defines 8 bits.  */
+   uint8_t mte_state;
+   bool sve;
+-  bool prefer_sve_ifuncs;
+   bool mops;
+ };
+ 
+-- 
+2.45.2
+

debian/patches/localedata/git-locale-hr_HR-euro.diff

+commit 559010e471acb3cb292615b71b248aba73e5c2fe
+Author: Dragan Stanojević (Nevidljivi) <neville.ravenwood@gmail.com>
+Date:   Wed Feb 7 16:31:04 2024 +0100
+
+    localedata: hr_HR: change currency to EUR/€
+    
+    Resolves: BZ # 29845
+
+diff --git a/localedata/locales/hr_HR b/localedata/locales/hr_HR
+index 83087a3b02..d00e6bee25 100644
+--- a/localedata/locales/hr_HR
++++ b/localedata/locales/hr_HR
+@@ -24,8 +24,8 @@ tel        ""
+ fax        ""
+ language   "Croatian"
+ territory  "Croatia"
+-revision   "2.3"
+-date       "2016-04-16"
++revision   "2.4"
++date       "2022-12-03"
+ 
+ category "i18n:2012";LC_IDENTIFICATION
+ category "i18n:2012";LC_CTYPE
+@@ -171,8 +171,8 @@ nostr   "ne"
+ END LC_MESSAGES
+ 
+ LC_MONETARY
+-int_curr_symbol           "HRK "
+-currency_symbol           "kn"
++int_curr_symbol           "EUR "
++currency_symbol           "€"
+ mon_decimal_point         ","
+ mon_thousands_sep         "."
+ mon_grouping              3;3
+diff --git a/stdlib/tst-strfmon_l.c b/stdlib/tst-strfmon_l.c
+index cc5da3e2ba..73ca0ea7b7 100644
+--- a/stdlib/tst-strfmon_l.c
++++ b/stdlib/tst-strfmon_l.c
+@@ -181,12 +181,12 @@ static const struct locale_pair tests[] =
+       "hr_HR.UTF-8",
+       {
+         {
+-          "HRK 1.234.567,89", "1.234.567,89 kn",
+-          "HRK 1234567,89", "1234567,89 kn"
++          "EUR 1.234.567,89", "1.234.567,89 €",
++          "EUR 1234567,89", "1234567,89 €"
+         },
+         {
+-          "-HRK 1.234.567,89", "-1.234.567,89 kn",
+-          "-HRK 1234567,89", "-1234567,89 kn"
++          "-EUR 1.234.567,89", "-1.234.567,89 €",
++          "-EUR 1234567,89", "-1234567,89 €"
+         }
+       }
+     },

debian/patches/series

@@ -13,6 +13,7 @@ localedata/locale-en_DK.diff
 localedata/locale-zh_TW.diff
 localedata/tailor-iso14651_t1.diff
 localedata/submitted-es_MX-decimal_point.diff
+localedata/git-locale-hr_HR-euro.diff
 
 alpha/local-gcc4.1.diff
 alpha/submitted-dl-support.diff
@@ -25,6 +26,8 @@ arm/unsubmitted-ldso-multilib.diff
 arm/local-arm-futex.diff
 arm/git-atomic-compiler-builtins.diff
 
+arm64/local-revert-aarch64-check-kernel-version-for-sve-ifuncs.diff
+
 hppa/local-inlining.diff
 
 # 2.37

debian/testsuite-xfail-debian.mk

@@ -11,6 +11,10 @@ test-xfail-tst-timer = yes
 # control, we'll just let it fail
 test-xfail-tst-create-detached = yes
 
+# Due to a bug/limitation in sbuild, this test fails when running unshare
+# chroot mode, see bug #1070003.
+test-xfail-tst-support_descriptors = yes
+
 ######################################################################
 # alpha (including optimized flavours)
 ######################################################################