Merge ~zhsj/ubuntu/+source/dhcpcd5:ubuntu/mantic into ubuntu/+source/dhcpcd5:ubuntu/devel

[Shengjing Zhu]

[Shengjing Zhu (zhsj)]

superseded by https://launchpad.net/ubuntu/+source/dhcpcd5/9.4.1-22ubuntu1

[Athos Ribeiro (athos-ribeiro)]

This has landed and can be closed now.

[Shengjing Zhu (zhsj)]

@athos-ribeiro do you know how to close the merge proposal? i only see the delete option.

diff --git a/debian/changelog b/debian/changelog
index 9b47e66..0653f8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+dhcpcd5 (9.4.1-21ubuntu1) mantic; urgency=medium
+
+  [ Martin-Éric Racine ]
+  * Migrate debian/watch to Github in cadence with upstream.
+
+  [ Shengjing Zhu ]
+  * Fix autopkgtests (Closes: #1036098)
+    + Use bind-interfaces in dnsmasq conf
+    + Wait until ntp server is reloaded.
+  * Backport seccomp patch to allow newfstatat syscall (Closes: #1034465)
+  * Backport seccomp patch for missing SECCOMP_AUDIT_ARCH on ppc64el (Closes: #1036662)
+  * Drop incompatible ntpd integration. (Closes: #1036092)
+    No longer working after ntpd was replaced by ntpsec.
+  * Remove Conflicts/Replaces dhcp-client (Closes: #1036085)
+
+ -- Shengjing Zhu <[e-mail]>  Wed, 24 May 2023 16:05:40 +0800
+
 dhcpcd5 (9.4.1-21) unstable; urgency=medium
 
   * Document migration to Predictable Network Interface Names in NEWS.Debian.
diff --git a/debian/control b/debian/control
index 0d417e6..999f016 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,8 @@ Source: dhcpcd5
 Section: net
 Priority: optional
 Homepage: https://roy.marples.name/projects/dhcpcd
-Maintainer: Martin-Éric Racine <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Martin-Éric Racine <[e-mail]>
 Build-Depends: debhelper-compat (= 13),
                libudev-dev [linux-any],
                pkg-config
@@ -13,10 +14,8 @@ Vcs-Git: https://salsa.debian.org/debian/dhcpcd5.git
 
 Package: dhcpcd-base
 Architecture: any
-Conflicts: dhcp-client
 Provides: dhcp-client
-Replaces: dhcp-client,
-          dhcpcd5 (<< 9.4.1-2)
+Replaces: dhcpcd5 (<< 9.4.1-2)
 Breaks: dhcpcd5 (<< 9.4.1-2)
 Depends: adduser,
          ${misc:Depends},
diff --git a/debian/hooks/66-ntp.conf b/debian/hooks/66-ntp.conf
deleted file mode 100644
index 4fa88b0..0000000
--- a/debian/hooks/66-ntp.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-# vi: ft=sh
-
-SERVERFILE_IPV4="/run/ntp.conf.dhcp"
-SERVERFILE_IPV6="$SERVERFILE_IPV4"
-
-add_servers() {
-	# exit early if there's nothing to do
-	if [ "$new_ntp_servers" = "$old_ntp_servers" ]; then
-		return
-	fi
-
-	insert_servers iburst
-	reload_config
-}
-
-remove_servers() {
-	SERVERFILE=$SERVERFILE_IPV4
-
-	# exit early if there's nothing to do
-	if [ ! -f $SERVERFILE ]; then
-		return
-	fi
-
-	withdraw_servers
-	reload_config
-}
-
-reload_config() {
-	invoke-rc.d ntp try-restart || :
-}
-
-if [ -e /etc/ntp.conf ]; then
-	handle_reason
-fi
diff --git a/debian/patches/0009_allow_newfstatat_syscall.patch b/debian/patches/0009_allow_newfstatat_syscall.patch
new file mode 100644
index 0000000..93f6d1b
--- /dev/null
+++ b/debian/patches/0009_allow_newfstatat_syscall.patch
@@ -0,0 +1,25 @@
+From 38befd4e867583002b96ec39df733585d74c4ff5 Mon Sep 17 00:00:00 2001
+From: Roy Marples <[e-mail]>
+Date: Fri, 26 Aug 2022 09:24:50 +0100
+Subject: [PATCH] privsep: Allow newfstatat syscall as well
+
+Allows newer glibc variants to work apparently.
+As reported in #84 and #89.
+---
+ src/privsep-linux.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/privsep-linux.c b/src/privsep-linux.c
+index 4d5c195d..66aeb490 100644
+--- a/src/privsep-linux.c
++++ b/src/privsep-linux.c
+@@ -353,6 +353,9 @@ static struct sock_filter ps_seccomp_filter[] = {
+ #ifdef __NR_nanosleep
+ 	SECCOMP_ALLOW(__NR_nanosleep),	/* XXX should use ppoll instead */
+ #endif
++#ifdef __NR_newfstatat
++	SECCOMP_ALLOW(__NR_newfstatat),
++#endif
+ #ifdef __NR_ppoll
+ 	SECCOMP_ALLOW(__NR_ppoll),
+ #endif
diff --git a/debian/patches/0010_miss_seccomp_on_ppc64el.patch b/debian/patches/0010_miss_seccomp_on_ppc64el.patch
new file mode 100644
index 0000000..969a191
--- /dev/null
+++ b/debian/patches/0010_miss_seccomp_on_ppc64el.patch
@@ -0,0 +1,29 @@
+From 7a2d9767585ed2c407d4985bd2d81552034fb90a Mon Sep 17 00:00:00 2001
+From: CHEN Xiangyu <[e-mail]>
+Date: Thu, 9 Feb 2023 18:41:52 +0800
+Subject: [PATCH] privsep-linux: fix SECCOMP_AUDIT_ARCH missing ppc64le (#181)
+
+when dhcpcd running on ppc64le platform, it would be killed by SIGSYS.
+
+Signed-off-by: Xiangyu Chen <[e-mail]>
+---
+ src/privsep-linux.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/privsep-linux.c b/src/privsep-linux.c
+index 7372d26b..6a301950 100644
+--- a/src/privsep-linux.c
++++ b/src/privsep-linux.c
+@@ -232,7 +232,11 @@ ps_root_sendnetlink(struct dhcpcd_ctx *ctx, int protocol, struct msghdr *msg)
+ #elif defined(__or1k__)
+ #  define SECCOMP_AUDIT_ARCH AUDIT_ARCH_OPENRISC
+ #elif defined(__powerpc64__)
+-#  define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC64
++#  if (BYTE_ORDER == LITTLE_ENDIAN)
++#    define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC64LE
++#  else
++#    define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC64
++#  endif
+ #elif defined(__powerpc__)
+ #  define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC
+ #elif defined(__riscv)
diff --git a/debian/patches/series b/debian/patches/series
index 476dd9e..0e7ab06 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,5 @@
 0006_skip_hooks_with_tilde.patch
 0007_set_buffer_lenght_to_0.patch
 0008_fix_incorrect_assert.patch
+0009_allow_newfstatat_syscall.patch
+0010_miss_seccomp_on_ppc64el.patch
diff --git a/debian/tests/common-ntp-servers-from-dhcp b/debian/tests/common-ntp-servers-from-dhcp
index 98848ef..bbb5dbc 100644
--- a/debian/tests/common-ntp-servers-from-dhcp
+++ b/debian/tests/common-ntp-servers-from-dhcp
@@ -24,6 +24,7 @@ dnsmasq_config() {
 	echo "Preparing dnsmasq configuration..."
 	cat <<EOF > /etc/dnsmasq.conf
 interface=veth0
+bind-interfaces
 dhcp-range=192.168.1.100,192.168.1.150,12h
 dhcp-range=fdae:9322:f1cc::9,fdae:9322:f1cc::99,64,12h
 dhcp-option=option:ntp-server,$ntp_server_ipv4
@@ -117,9 +118,13 @@ run_test() {
 	sleep 5
 
 	configure_interface
+	# wait until ntp server is reloaded with new configuration
+	sleep 5
 	check_ntp_server_obtained
 
 	deconfigure_interface
+	# wait until ntp server is reloaded with new configuration
+	sleep 5
 	check_ntp_server_gone
 
 	check_conf_hash
diff --git a/debian/tests/control b/debian/tests/control
index bda624b..0c34d92 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -13,14 +13,6 @@ Depends: dnsmasq,
          @
 Restrictions: isolation-machine, needs-root, breaks-testbed
 
-Tests: ntpd-ntp-servers-from-dhcp
-Depends: dnsmasq,
-         ethtool,
-         iproute2,
-         ntp,
-         @
-Restrictions: isolation-machine, needs-root, breaks-testbed
-
 Tests: openntpd-ntp-servers-from-dhcp
 Depends: dnsmasq,
          ethtool,
diff --git a/debian/tests/ntpd-ntp-servers-from-dhcp b/debian/tests/ntpd-ntp-servers-from-dhcp
deleted file mode 100644
index b1663a2..0000000
--- a/debian/tests/ntpd-ntp-servers-from-dhcp
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-set -e
-
-added_servers_ipv4="/run/ntp.conf.dhcp"
-added_servers_ipv6="$added_servers_ipv4"
-server_list_cmd="ntpq -nwc lpeers"
-
-. debian/tests/common-ntp-servers-from-dhcp
-
-run_test
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
new file mode 100644
index 0000000..44d4252
--- /dev/null
+++ b/debian/upstream/signing-key.asc
@@ -0,0 +1,37 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=wWGO
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/debian/watch b/debian/watch
index 4b892e9..9ff12d3 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,4 @@
 version=4
-https://roy.marples.name/downloads/dhcpcd/dhcpcd-([0-9\.]*)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) \
+opts="mode=git,pgpmode=gittag" \
+https://github.com/NetworkConfiguration/dhcpcd.git refs/tags/v([\d\.]+) \
 debian uupdate --no-symlink
-#opts="mode=git,pgpmode=gittag" \
-#https://github.com/NetworkConfiguration/dhcpcd.git refs/tags/dhcpcd-([\d\.]+) \