debian/changelog

@@ -26,17 +26,34 @@ glibc (2.36-0experimental0) UNRELEASED; urgency=medium
  -- Aurelien Jarno <aurel32@debian.org>  Sat, 10 Sep 2022 22:40:45 +0200
-glibc (2.35-0experimental4) UNRELEASED; urgency=medium
+glibc (2.35-1) unstable; urgency=medium
   [ Samuel Thibault ]
   * debian/patches/hurd-i386/git-strerror_X.diff: Fix tst-sprintf-errno test.
+  * debian/patches/hurd-i386/git-readlink-fifo.diff: Fix readlink() on fifos.
+  * debian/patches/hurd-i386/git-net-route.h.diff: Add ifrtreq structure and
+    fix SIOCADD/DELRT ioctls.
+  * debian/patches/hurd-i386/submitted-net.diff: Drop net/route.h part.
   [ Aurelien Jarno ]
   * debian/control.in/main: add a breaks against dh-lua (<< 27+nmu1~) to
     libc-bin. See #1017832.
   * debian/patches/git-updates.diff: update from upstream stable branch.
- -- Samuel Thibault <sthibault@debian.org>  Sun, 11 Sep 2022 14:22:55 +0200
+  * 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.
+
+  [ Luca Boccassi ]
+  * debian/debhelper.in/libc-alt.preinst: libc6-<arch>: create merged-usr
+    symlinks via preinst script.  Closes: #926699.
+
+  [ Gioele Barabucci ]
+  * debian/debhelper.in/libc.preinst: avoid using pidof.
+ -- Aurelien Jarno <aurel32@debian.org>  Thu, 22 Sep 2022 22:02:00 +0200
 glibc (2.35-0experimental3) experimental; urgency=medium
@@ -127,12 +144,6 @@ glibc (2.35-0experimental0) experimental; urgency=medium
  -- Aurelien Jarno <aurel32@debian.org>  Sun, 07 Aug 2022 22:25:02 +0200
-glibc (2.34-9) UNRELEASED; urgency=medium
-
-  * debian/patches/hurd-i386/git-readlink-fifo.diff: Fix readlink() on fifos.
-
- -- Samuel Thibault <sthibault@debian.org>  Wed, 14 Sep 2022 18:59:18 +0200
-
 glibc (2.34-8) unstable; urgency=medium
   [ Samuel Thibault ]

debian/control

@@ -16,6 +16,7 @@ Build-Depends: gettext, dpkg (>= 1.18.7), dpkg-dev (>= 1.17.14), xz-utils, file,
  libc-bin (>= 2.36) <cross>,
  libgd-dev <!stage1> <!stage2>,
 Build-Depends-Indep: perl, po-debconf (>= 1.0)
+Rules-Requires-Root: no
 Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
 Uploaders: Clint Adams <clint@debian.org>, Aurelien Jarno <aurel32@debian.org>, Samuel Thibault <sthibault@debian.org>
 Standards-Version: 4.6.1

debian/control.in/main

@@ -16,6 +16,7 @@ Build-Depends: gettext, dpkg (>= 1.18.7), dpkg-dev (>= 1.17.14), xz-utils, file,
  libc-bin (>= @DEB_VERSION_UPSTREAM@) <cross>,
  libgd-dev <!stage1> <!stage2>,
 Build-Depends-Indep: perl, po-debconf (>= 1.0)
+Rules-Requires-Root: no
 Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
 Uploaders: Clint Adams <clint@debian.org>, Aurelien Jarno <aurel32@debian.org>, Samuel Thibault <sthibault@debian.org>
 Standards-Version: 4.6.1

debian/debhelper.in/libc-alt.preinst

+#!/bin/sh
+set -e
+
+# We create the top-level lib symlink on merged-usr systems, so that we can
+# cover cases where for example libc-i386 on amd64 is installed and then removed
+# (which deletes the symlink too). Note that we only suppor the simplest case,
+# no conversion (moving files) is done here, as that's the job of the usrmerge
+# package. See: https://bugs.debian.org/926699
+# Once all packages install only under /usr, this can be removed, as removing
+# this package will no longer result in the symlink being deleted.
+if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then
+    if [ -L /lib ]; then
+        # Has the link already been created?
+        # If it has not, is a directory already there? Half-merged systems are
+        # the problem of usrmerge, simply ignore them here.
+        if [ ! -L SLIBDIR ] && [ ! -d SLIBDIR ]; then
+            mkdir -p /usrSLIBDIR
+            ln -s usrSLIBDIR SLIBDIR
+        fi
+    fi
+fi
+
+#DEBHELPER#
+

debian/debhelper.in/libc.preinst

@@ -166,7 +166,7 @@ then
     if [ -n "$preversion" ] && [ -x "$(command -v ischroot)" ] && ! ischroot; then
 	# NSS authentication trouble guard
 	if dpkg --compare-versions "$preversion" lt DEB_VERSION_UPSTREAM; then
-	    if pidof xscreensaver xlockmore >/dev/null; then
+	    if grep -E -q '(^|/)(xscreensaver|xlockmore)' /proc/*/cmdline 2>/dev/null; then
 		if [ "$USE_DEBCONF" ] ; then
 		    db_version 2.0
 		    db_reset glibc/disable-screensaver
@@ -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

debian/patches/hurd-i386/git-net-route.h.diff

+commit ffd0b295d96aa58d65e642d7519f4d8c33acb3f0
+Author: Damien Zammit <damien@zamaudio.com>
+Date:   Wed Sep 21 00:41:31 2022 +0200
+
+    hurd: Add ifrtreq structure to net/route.h
+    
+    As used by the hurdish route ioctls.
+
+Index: glibc-2.34/sysdeps/mach/hurd/net/route.h
+===================================================================
+--- glibc-2.34.orig/sysdeps/mach/hurd/net/route.h
++++ glibc-2.34/sysdeps/mach/hurd/net/route.h
+@@ -25,44 +25,24 @@
+ #include <sys/socket.h>
+ #include <sys/types.h>
+ #include <netinet/in.h>
++#include <net/if.h>
+ 
+ 
+-/* This structure gets passed by the SIOCADDRT and SIOCDELRT calls. */
+-struct rtentry
++typedef struct ifrtreq
+   {
+-    unsigned long int rt_pad1;
+-    struct sockaddr rt_dst;		/* Target address.  */
+-    struct sockaddr rt_gateway;		/* Gateway addr (RTF_GATEWAY).  */
+-    struct sockaddr rt_genmask;		/* Target network mask (IP).  */
+-    unsigned short int rt_flags;
+-    short int rt_pad2;
+-    unsigned long int rt_pad3;
+-    unsigned char rt_tos;
+-    unsigned char rt_class;
+-    short int rt_pad4;
+-    short int rt_metric;		/* +1 for binary compatibility!  */
+-    char *rt_dev;			/* Forcing the device at add.  */
+-    unsigned long int rt_mtu;		/* Per route MTU/Window.  */
+-    unsigned long int rt_window;	/* Window clamping.  */
+-    unsigned short int rt_irtt;		/* Initial RTT.  */
+-  };
+-/* Compatibility hack.  */
+-#define rt_mss	rt_mtu
+-
+-
+-struct in6_rtmsg
+-  {
+-    struct in6_addr rtmsg_dst;
+-    struct in6_addr rtmsg_src;
+-    struct in6_addr rtmsg_gateway;
+-    uint32_t rtmsg_type;
+-    uint16_t rtmsg_dst_len;
+-    uint16_t rtmsg_src_len;
+-    uint32_t rtmsg_metric;
+-    unsigned long int rtmsg_info;
+-    uint32_t rtmsg_flags;
+-    int rtmsg_ifindex;
+-  };
++    char ifname[IF_NAMESIZE];
++    in_addr_t rt_dest;
++    in_addr_t rt_mask;
++    in_addr_t rt_gateway;
++    int rt_flags;
++    int rt_metric;
++    int rt_mtu;
++    int rt_window;
++    int rt_irtt;
++    int rt_tos;
++    int rt_class;
++  } ifrtreq_t;
++#define _IOT_ifrtreq _IOT (_IOTS(char), IF_NAMESIZE, _IOTS(int), 10, 0, 0)
+ 
+ 
+ #define	RTF_UP		0x0001		/* Route usable.  */
+Index: glibc-2.34/sysdeps/mach/hurd/bits/ioctls.h
+===================================================================
+--- glibc-2.34.orig/sysdeps/mach/hurd/bits/ioctls.h
++++ glibc-2.34/sysdeps/mach/hurd/bits/ioctls.h
+@@ -281,8 +281,8 @@ enum __ioctl_datum { IOC_8, IOC_16, IOC_
+ #define	SIOCSPGRP	_IOW('s',  8, int)		/* set process group */
+ #define	SIOCGPGRP	_IOR('s',  9, int)		/* get process group */
+ 
+-#define	SIOCADDRT	_IOW('r', 10, struct ortentry)	/* add route */
+-#define	SIOCDELRT	_IOW('r', 11, struct ortentry)	/* delete route */
++#define	SIOCADDRT	_IOW('r', 10, struct ifrtreq)	/* add route */
++#define	SIOCDELRT	_IOW('r', 11, struct ifrtreq)	/* delete route */
+ 
+ #define	SIOCSIFADDR	_IOW('i', 12, struct ifreq)	/* set ifnet address */
+ #define	OSIOCGIFADDR	_IOWR('i',13, struct ifreq)	/* get ifnet address */

debian/patches/hurd-i386/local-disable-ioctls.diff

@@ -8,17 +8,6 @@ so let's make packages not believe these are available.
 
 --- a/sysdeps/mach/hurd/bits/ioctls.h
 +++ b/sysdeps/mach/hurd/bits/ioctls.h
-@@ -281,8 +281,10 @@
- #define	SIOCSPGRP	_IOW('s',  8, int)		/* set process group */
- #define	SIOCGPGRP	_IOR('s',  9, int)		/* get process group */
- 
-+#if 0
- #define	SIOCADDRT	_IOW('r', 10, struct ortentry)	/* add route */
- #define	SIOCDELRT	_IOW('r', 11, struct ortentry)	/* delete route */
-+#endif
- 
- #define	SIOCSIFADDR	_IOW('i', 12, struct ifreq)	/* set ifnet address */
- #define	OSIOCGIFADDR	_IOWR('i',13, struct ifreq)	/* get ifnet address */
 @@ -304,12 +306,16 @@
  #define	SIOCGIFMETRIC	_IOWR('i',23, struct ifreq_int)	/* get IF metric */
  #define	SIOCSIFMETRIC	_IOW('i',24, struct ifreq_int)	/* set IF metric */

debian/patches/series

@@ -36,6 +36,7 @@ hurd-i386/git-cond-destroy.diff
 hurd-i386/git-strerror_X.diff
 hurd-i386/git-xpg_strerror.diff
 hurd-i386/git-readlink-fifo.diff
+hurd-i386/git-net-route.h.diff
 
 hurd-i386/local-enable-ldconfig.diff
 hurd-i386/tg-sysvshm.diff

debian/rules.d/build.mk

@@ -317,6 +317,16 @@ ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
 
 	$(call xx,extra_install)
 endif
+
+	# With Rules-Requires-Root=no, the upstream makefile fails to set the
+	# correct chmod for pt_chown as it tries to set the owner at the same
+	# time. Fix the permissions, dpkg-deb will "fix" the owner.
+ifeq ($(pt_chown),yes)
+	if [ $$(stat -c "%u" $(CURDIR)/$(debian-tmp)/usr/lib/pt_chown) != 0 ]; then \
+	  chmod 4755 $(CURDIR)/$(debian-tmp)/usr/lib/pt_chown ; \
+	fi
+endif
+
 	touch $@
 
 #