debian/changelog

@@ -10,6 +10,9 @@ glibc (2.35-0experimental4) UNRELEASED; urgency=medium
   * debian/rules.d/build.mk: fix the pt_chown permissions after installation
     when running with Rules-Requires-Root=no (for non-Linux systems).
   * debian/control.in/main: set Rules-Requires-Root: no.
+  * debian/debhelper.in/libc.preinst: only apply NSS workaround when upgrading
+    from glibc < 2.34.
+  * debian/patches/git-updates.diff: update from upstream stable branch.
  -- Samuel Thibault <sthibault@debian.org>  Sun, 11 Sep 2022 14:22:55 +0200

debian/debhelper.in/libc.preinst

@@ -263,8 +263,8 @@ then
             #
             # Note that starting with glibc 2.34, the nss_files is builtin. When glibc >= 2.34
             # ends-up in a stable release, this workaround can therefore be dropped.
-            if [ -d /run/systemd/system ]; then
-                if ! grep -q -E 'libnss_(compat|db|files)' /proc/$(systemctl show --property MainPID --value systemd-logind.service)/maps ; then
+            if dpkg --compare-versions "$preversion" lt 2.34 && [ -d /run/systemd/system ]; then
+                if ! grep -q -E 'libnss_(compat|db|files)' /proc/$(systemctl show --property MainPID --value systemd-logind.service)/maps >/dev/null 2>&1; then
                     echo "Forcing systemd-logind to load NSS modules..."
                     busctl call --system org.freedesktop.login1 /org/freedesktop/login1 org.freedesktop.login1.Manager \
                         SetUserLinger ubb 4294967294 false false >/dev/null 2>&1 || true