debian/changelog

+glibc (2.39-3) experimental; urgency=medium
+
+  [ Aurelien Jarno ]
+  * debian/patches/arm64/local-remove-aarch64-bits-math-vector-h.diff: drop,
+    buggy packages should be fixed instead.
+  * debian/patches/git-updates.diff: update from upstream stable branch.
+
+ -- Aurelien Jarno <aurel32@debian.org>  Sat, 01 Jun 2024 23:26:50 +0200
+
 glibc (2.39-2) experimental; urgency=medium
   [ Aurelien Jarno ]
@@ -57,6 +66,26 @@ glibc (2.39-1) experimental; urgency=medium
  -- Aurelien Jarno <aurel32@debian.org>  Sat, 04 May 2024 00:35:25 +0200
+glibc (2.38-12) unstable; urgency=medium
+
+  [ Aurelien Jarno ]
+  * debian/debhelper.in/libc.postinst: do not try to call telinit if it is
+    provided by systemd, it is just broken.  Closes: #1071462.
+  * debian/debhelper.in/libc.postinst: test for $DPKG_ROOT first.
+  * debian/debhelper.in/libc.postinst: emit libc-upgrade trigger on every
+    upgrade and libc-major-upgrade on major glibc upgrade. This interface
+    should be used by depending packages to restart themselves if needed.
+  * debian/patches/git-updates.diff: update from upstream stable branch.
+
+  [ Dominik Stadler ]
+  * debian/local/usr_sbin/update-locale: improve error reporting in
+   update-locale.  Closes: #1071084.
+
+  [ Bjarni Ingi Gislason ]
+  * debian/local/manpages/gencat.1: editorial fixes.  Closes: #1071549.
+
+ -- Aurelien Jarno <aurel32@debian.org>  Sat, 01 Jun 2024 23:16:35 +0200
+
 glibc (2.38-11) unstable; urgency=medium
   [ Aurelien Jarno ]

debian/debhelper.in/libc.postinst

@@ -151,12 +151,12 @@ then
     # assumes anything else is going to not fail at behaving like
     # sysvinit:
     TELINIT=yes
-    if ischroot 2>/dev/null; then
-        # Don't bother trying to re-exec init from a chroot:
-        TELINIT=no
-    elif [ -n "${DPKG_ROOT:-}" ]; then
+    if [ -n "${DPKG_ROOT:-}" ]; then
         # Do not re-exec init if we are operating on a chroot from outside:
         TELINIT=no
+    elif ischroot 2>/dev/null; then
+        # Don't bother trying to re-exec init from a chroot:
+        TELINIT=no
     elif [ -d /run/systemd/system ]; then
         # Restart systemd on upgrade, but carefully.
         # The restart is wanted because of LP: #1942276 and Bug: #993821
@@ -170,10 +170,25 @@ then
         else
             echo "Error: Could not restart systemd, systemd binary not working" >&2
         fi
+    elif ! command -v telinit >/dev/null; then
+        # There is not telinit binary:
+        TELINIT=no
+    elif readlink $(command -v telinit) | grep -q systemctl; then
+        # Systemd's telinit tends to do bad things (#1063147, #1071462), so
+        # just ignore that case:
+        TELINIT=no
     fi
     if [ "$TELINIT" = "yes" ]; then
         telinit u 2>/dev/null || true ; sleep 1
     fi
+
+    # Emit triggers to allow depending packages to restart themselves if
+    # needed.  The triggers are called with "--no-await", as packages with the
+    # triggers-awaited state do not satisfy dependencies.
+    dpkg-trigger --no-await libc-upgrade
+    if [ -n "$preversion" ] && dpkg --compare-versions "$preversion" lt DEB_VERSION_UPSTREAM; then
+        dpkg-trigger --no-await libc-major-upgrade
+    fi
 fi
 
 #DEBHELPER#

debian/local/manpages/gencat.1

@@ -27,7 +27,7 @@
 .PP
 ..
 .de Sp
-.if t .sp .5v
+.if t .sp 0.5v
 .if n .sp
 ..
 .de Ip
@@ -94,14 +94,14 @@
 '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
 .\"	in some meaningful fashion.
-.if \nF \{
+.if \nF \{\
 .de IX
 .tm Index:\\$1\t\\n%\t"\\$2"
 ..
@@ -112,7 +112,7 @@
 .UC
 .if n .hy 0
 .if n .na
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
+.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s+2\v'.1v'\h'-1p'
 .de CQ          \" put $1 in typewriter font
 .ft CW
 'if n "\c
@@ -128,14 +128,14 @@
 .	\" fudge factors for nroff and troff
 .if n \{\
 .	ds #H 0
-.	ds #V .8m
-.	ds #F .3m
+.	ds #V 0.8m
+.	ds #F 0.3m
 .	ds #[ \f1
 .	ds #] \fP
 .\}
 .if t \{\
 .	ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.	ds #V .6m
+.	ds #V 0.6m
 .	ds #F 0
 .	ds #[ \&
 .	ds #] \&
@@ -166,10 +166,10 @@
 .	\" troff and (daisy-wheel) nroff accents
 .ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
 .ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds v \\k:\h'-(\\n(.wu*9/10-\*(#H)'\v'-\*(#V'\*(#[\s-4v\s0\v'\*(#V'\h'|\\n:u'\*(#]
+.ds v \\k:\h'-(\\n(.wu*9/10-\*(#H)'\v'-\*(#V'\*(#[\s-4v\s+4\v'\*(#V'\h'|\\n:u'\*(#]
 .ds _ \\k:\h'-(\\n(.wu*9/10-\*(#H+(\*(#F*2/3))'\v'-.4m'\z\(hy\v'.4m'\h'|\\n:u'
 .ds . \\k:\h'-(\\n(.wu*8/10)'\v'\*(#V*4/10'\z.\v'-\*(#V*4/10'\h'|\\n:u'
-.ds 3 \*(#[\v'.2m'\s-2\&3\s0\v'-.2m'\*(#]
+.ds 3 \*(#[\v'.2m'\s-2\&3\s+2\v'-.2m'\*(#]
 .ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
 .ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
 .ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
@@ -205,21 +205,21 @@
 .SH "NAME"
 gencat \- Generate message catalog
 .SH "SYNOPSIS"
-gencat [OPTION...] -o OUTPUT-FILE [INPUT-FILE]...
+gencat [OPTION ...\&] \-o OUTPUT-FILE [INPUT-FILE ...]
 .SH "DESCRIPTION"
 The \fBgencat\fR program is specified in the X/Open standard and the
 GNU implementation follows this specification and so processes all
-correctly formed input files. Additionally some extension are implemented
+correctly formed input files.
+Additionally some extension are implemented
 which help to work in a more reasonable way with the \fBcatgets\fR(3) functions.
-.PP
 .TP
-\fB-H\fR, \fB--header\fR \fINAME\fR
+\fB\-H\fR, \fB\-\-header\fR \fINAME\fR
 Create C header file NAME containing symbol definitions
 .TP
-\fB--new\fR
+\fB\-\-new\fR
 Do not use existing catalog, force new output file
 .TP
-\fB-o\fR, \fB--output\fR \fINAME\fR
+\fB\-o\fR, \fB\-\-output\fR \fINAME\fR
 Write output to file NAME
 .SH "AUTHOR"
 \fIgencat\fR was written by Ulrich Drepper as part of the GNU C Library.

debian/local/usr_sbin/update-locale

@@ -88,7 +88,7 @@ if ($no_checks == 0)
 {
 	#  Check that this locale does exist
 	my $charset = `LANG= LC_CTYPE= LC_NUMERIC= LC_TIME= LC_COLLATE= LC_MONETARY= LC_MESSAGES= LC_PAPER= LC_NAME= LC_ADDRESS= LC_TELEPHONE= LC_MEASUREMENT= LC_IDENTIFICATION= LC_ALL= $env locale charmap 2>&1`;
-	die "*** $progname: Error: invalid locale settings: $env\n"
+	die "*** $progname: Error: invalid locale settings: $env\n----------\n$charset----------\n"
 		if ($charset =~ m/Cannot set/);
 	#  If LANGUAGE is set, its first value must be compatible with LC_MESSAGES
 	if (defined $arg{LANGUAGE})

debian/patches/arm64/local-remove-aarch64-bits-math-vector-h.diff

-Temporarily remove bits/math-vector.h as it causes a few packages to FTBFS:
-- #1070441 cmbc: arm64 FTBFS with glibc 2.38
-- #1070443 aspectc++: arm64 FTBFS with glibc 2.38
-- #1070444 cxref: arm64 FTBFS with glibc 2.38
-- #1070446 rocm-hipamd: arm64 FTBFS with glibc 2.38
-
-See upstream bug https://sourceware.org/bugzilla/show_bug.cgi?id=30909
-
-
-diff --git a/sysdeps/aarch64/fpu/bits/math-vector.h b/sysdeps/aarch64/fpu/bits/math-vector.h
-deleted file mode 100644
-index 04837bdcd7..0000000000
---- a/sysdeps/aarch64/fpu/bits/math-vector.h
-+++ /dev/null
-@@ -1,188 +0,0 @@
--/* Platform-specific SIMD declarations of math functions.
--
--   Copyright (C) 2023-2024 Free Software Foundation, Inc.
--   This file is part of the GNU C Library.
--
--   The GNU C Library is free software; you can redistribute it and/or
--   modify it under the terms of the GNU Lesser General Public
--   License as published by the Free Software Foundation; either
--   version 2.1 of the License, or (at your option) any later version.
--
--   The GNU C Library is distributed in the hope that it will be useful,
--   but WITHOUT ANY WARRANTY; without even the implied warranty of
--   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
--   Lesser General Public License for more details.
--
--   You should have received a copy of the GNU Lesser General Public
--   License along with the GNU C Library; if not, see
--   <https://www.gnu.org/licenses/>.  */
--
--#ifndef _MATH_H
--#  error "Never include <bits/math-vector.h> directly;\
-- include <math.h> instead."
--#endif
--
--/* Get default empty definitions for simd declarations.  */
--#include <bits/libm-simd-decl-stubs.h>
--
--#if defined __aarch64__ && defined __FAST_MATH__ && __GNUC_PREREQ (6, 0)
--/* Requires GCC >= 6 for __attribute__ ((__simd__)).  */
--# define __DECL_SIMD_aarch64 __attribute__ ((__simd__ ("notinbranch"), const))
--
--# undef __DECL_SIMD_acos
--# define __DECL_SIMD_acos __DECL_SIMD_aarch64
--# undef __DECL_SIMD_acosf
--# define __DECL_SIMD_acosf __DECL_SIMD_aarch64
--# undef __DECL_SIMD_asin
--# define __DECL_SIMD_asin __DECL_SIMD_aarch64
--# undef __DECL_SIMD_asinf
--# define __DECL_SIMD_asinf __DECL_SIMD_aarch64
--# undef __DECL_SIMD_atan
--# define __DECL_SIMD_atan __DECL_SIMD_aarch64
--# undef __DECL_SIMD_atanf
--# define __DECL_SIMD_atanf __DECL_SIMD_aarch64
--# undef __DECL_SIMD_atan2
--# define __DECL_SIMD_atan2 __DECL_SIMD_aarch64
--# undef __DECL_SIMD_atan2f
--# define __DECL_SIMD_atan2f __DECL_SIMD_aarch64
--# undef __DECL_SIMD_cos
--# define __DECL_SIMD_cos __DECL_SIMD_aarch64
--# undef __DECL_SIMD_cosf
--# define __DECL_SIMD_cosf __DECL_SIMD_aarch64
--# undef __DECL_SIMD_exp
--# define __DECL_SIMD_exp __DECL_SIMD_aarch64
--# undef __DECL_SIMD_expf
--# define __DECL_SIMD_expf __DECL_SIMD_aarch64
--# undef __DECL_SIMD_exp10
--# define __DECL_SIMD_exp10 __DECL_SIMD_aarch64
--# undef __DECL_SIMD_exp10f
--# define __DECL_SIMD_exp10f __DECL_SIMD_aarch64
--# undef __DECL_SIMD_exp2
--# define __DECL_SIMD_exp2 __DECL_SIMD_aarch64
--# undef __DECL_SIMD_exp2f
--# define __DECL_SIMD_exp2f __DECL_SIMD_aarch64
--# undef __DECL_SIMD_expm1
--# define __DECL_SIMD_expm1 __DECL_SIMD_aarch64
--# undef __DECL_SIMD_expm1f
--# define __DECL_SIMD_expm1f __DECL_SIMD_aarch64
--# undef __DECL_SIMD_log
--# define __DECL_SIMD_log __DECL_SIMD_aarch64
--# undef __DECL_SIMD_logf
--# define __DECL_SIMD_logf __DECL_SIMD_aarch64
--# undef __DECL_SIMD_log10
--# define __DECL_SIMD_log10 __DECL_SIMD_aarch64
--# undef __DECL_SIMD_log10f
--# define __DECL_SIMD_log10f __DECL_SIMD_aarch64
--# undef __DECL_SIMD_log1p
--# define __DECL_SIMD_log1p __DECL_SIMD_aarch64
--# undef __DECL_SIMD_log1pf
--# define __DECL_SIMD_log1pf __DECL_SIMD_aarch64
--# undef __DECL_SIMD_log2
--# define __DECL_SIMD_log2 __DECL_SIMD_aarch64
--# undef __DECL_SIMD_log2f
--# define __DECL_SIMD_log2f __DECL_SIMD_aarch64
--# undef __DECL_SIMD_sin
--# define __DECL_SIMD_sin __DECL_SIMD_aarch64
--# undef __DECL_SIMD_sinf
--# define __DECL_SIMD_sinf __DECL_SIMD_aarch64
--# undef __DECL_SIMD_tan
--# define __DECL_SIMD_tan __DECL_SIMD_aarch64
--# undef __DECL_SIMD_tanf
--# define __DECL_SIMD_tanf __DECL_SIMD_aarch64
--#endif
--
--#if __GNUC_PREREQ(9, 0)
--#  define __ADVSIMD_VEC_MATH_SUPPORTED
--typedef __Float32x4_t __f32x4_t;
--typedef __Float64x2_t __f64x2_t;
--#elif __glibc_clang_prereq(8, 0)
--#  define __ADVSIMD_VEC_MATH_SUPPORTED
--typedef __attribute__ ((__neon_vector_type__ (4))) float __f32x4_t;
--typedef __attribute__ ((__neon_vector_type__ (2))) double __f64x2_t;
--#endif
--
--#if __GNUC_PREREQ(10, 0) || __glibc_clang_prereq(11, 0)
--#  define __SVE_VEC_MATH_SUPPORTED
--typedef __SVFloat32_t __sv_f32_t;
--typedef __SVFloat64_t __sv_f64_t;
--typedef __SVBool_t __sv_bool_t;
--#endif
--
--/* If vector types and vector PCS are unsupported in the working
--   compiler, no choice but to omit vector math declarations.  */
--
--#ifdef __ADVSIMD_VEC_MATH_SUPPORTED
--
--#  define __vpcs __attribute__ ((__aarch64_vector_pcs__))
--
--__vpcs __f32x4_t _ZGVnN4vv_atan2f (__f32x4_t, __f32x4_t);
--__vpcs __f32x4_t _ZGVnN4v_acosf (__f32x4_t);
--__vpcs __f32x4_t _ZGVnN4v_asinf (__f32x4_t);
--__vpcs __f32x4_t _ZGVnN4v_atanf (__f32x4_t);
--__vpcs __f32x4_t _ZGVnN4v_cosf (__f32x4_t);
--__vpcs __f32x4_t _ZGVnN4v_expf (__f32x4_t);
--__vpcs __f32x4_t _ZGVnN4v_exp10f (__f32x4_t);
--__vpcs __f32x4_t _ZGVnN4v_exp2f (__f32x4_t);
--__vpcs __f32x4_t _ZGVnN4v_expm1f (__f32x4_t);
--__vpcs __f32x4_t _ZGVnN4v_logf (__f32x4_t);
--__vpcs __f32x4_t _ZGVnN4v_log10f (__f32x4_t);
--__vpcs __f32x4_t _ZGVnN4v_log1pf (__f32x4_t);
--__vpcs __f32x4_t _ZGVnN4v_log2f (__f32x4_t);
--__vpcs __f32x4_t _ZGVnN4v_sinf (__f32x4_t);
--__vpcs __f32x4_t _ZGVnN4v_tanf (__f32x4_t);
--
--__vpcs __f64x2_t _ZGVnN2vv_atan2 (__f64x2_t, __f64x2_t);
--__vpcs __f64x2_t _ZGVnN2v_acos (__f64x2_t);
--__vpcs __f64x2_t _ZGVnN2v_asin (__f64x2_t);
--__vpcs __f64x2_t _ZGVnN2v_atan (__f64x2_t);
--__vpcs __f64x2_t _ZGVnN2v_cos (__f64x2_t);
--__vpcs __f64x2_t _ZGVnN2v_exp (__f64x2_t);
--__vpcs __f64x2_t _ZGVnN2v_exp10 (__f64x2_t);
--__vpcs __f64x2_t _ZGVnN2v_exp2 (__f64x2_t);
--__vpcs __f64x2_t _ZGVnN2v_expm1 (__f64x2_t);
--__vpcs __f64x2_t _ZGVnN2v_log (__f64x2_t);
--__vpcs __f64x2_t _ZGVnN2v_log10 (__f64x2_t);
--__vpcs __f64x2_t _ZGVnN2v_log1p (__f64x2_t);
--__vpcs __f64x2_t _ZGVnN2v_log2 (__f64x2_t);
--__vpcs __f64x2_t _ZGVnN2v_sin (__f64x2_t);
--__vpcs __f64x2_t _ZGVnN2v_tan (__f64x2_t);
--
--#  undef __ADVSIMD_VEC_MATH_SUPPORTED
--#endif /* __ADVSIMD_VEC_MATH_SUPPORTED */
--
--#ifdef __SVE_VEC_MATH_SUPPORTED
--
--__sv_f32_t _ZGVsMxvv_atan2f (__sv_f32_t, __sv_f32_t, __sv_bool_t);
--__sv_f32_t _ZGVsMxv_acosf (__sv_f32_t, __sv_bool_t);
--__sv_f32_t _ZGVsMxv_asinf (__sv_f32_t, __sv_bool_t);
--__sv_f32_t _ZGVsMxv_atanf (__sv_f32_t, __sv_bool_t);
--__sv_f32_t _ZGVsMxv_cosf (__sv_f32_t, __sv_bool_t);
--__sv_f32_t _ZGVsMxv_expf (__sv_f32_t, __sv_bool_t);
--__sv_f32_t _ZGVsMxv_exp10f (__sv_f32_t, __sv_bool_t);
--__sv_f32_t _ZGVsMxv_exp2f (__sv_f32_t, __sv_bool_t);
--__sv_f32_t _ZGVsMxv_expm1f (__sv_f32_t, __sv_bool_t);
--__sv_f32_t _ZGVsMxv_logf (__sv_f32_t, __sv_bool_t);
--__sv_f32_t _ZGVsMxv_log10f (__sv_f32_t, __sv_bool_t);
--__sv_f32_t _ZGVsMxv_log1pf (__sv_f32_t, __sv_bool_t);
--__sv_f32_t _ZGVsMxv_log2f (__sv_f32_t, __sv_bool_t);
--__sv_f32_t _ZGVsMxv_sinf (__sv_f32_t, __sv_bool_t);
--__sv_f32_t _ZGVsMxv_tanf (__sv_f32_t, __sv_bool_t);
--
--__sv_f64_t _ZGVsMxvv_atan2 (__sv_f64_t, __sv_f64_t, __sv_bool_t);
--__sv_f64_t _ZGVsMxv_acos (__sv_f64_t, __sv_bool_t);
--__sv_f64_t _ZGVsMxv_asin (__sv_f64_t, __sv_bool_t);
--__sv_f64_t _ZGVsMxv_atan (__sv_f64_t, __sv_bool_t);
--__sv_f64_t _ZGVsMxv_cos (__sv_f64_t, __sv_bool_t);
--__sv_f64_t _ZGVsMxv_exp (__sv_f64_t, __sv_bool_t);
--__sv_f64_t _ZGVsMxv_exp10 (__sv_f64_t, __sv_bool_t);
--__sv_f64_t _ZGVsMxv_exp2 (__sv_f64_t, __sv_bool_t);
--__sv_f64_t _ZGVsMxv_expm1 (__sv_f64_t, __sv_bool_t);
--__sv_f64_t _ZGVsMxv_log (__sv_f64_t, __sv_bool_t);
--__sv_f64_t _ZGVsMxv_log10 (__sv_f64_t, __sv_bool_t);
--__sv_f64_t _ZGVsMxv_log1p (__sv_f64_t, __sv_bool_t);
--__sv_f64_t _ZGVsMxv_log2 (__sv_f64_t, __sv_bool_t);
--__sv_f64_t _ZGVsMxv_sin (__sv_f64_t, __sv_bool_t);
--__sv_f64_t _ZGVsMxv_tan (__sv_f64_t, __sv_bool_t);
--
--#  undef __SVE_VEC_MATH_SUPPORTED
--#endif /* __SVE_VEC_MATH_SUPPORTED */

debian/patches/series

@@ -23,8 +23,6 @@ arm/local-sigaction.diff
 arm/unsubmitted-ldso-multilib.diff
 arm/local-arm-futex.diff
 
-arm64/local-remove-aarch64-bits-math-vector-h.diff
-
 hppa/local-inlining.diff
 
 # Committed for 2.40