Ubuntu
dhcpcd5 package

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

  1. Git
  2. lp:~zhsj/ubuntu/+source/dhcpcd5
  3. ubuntu/mantic
  4. Merge into ubuntu/devel
Proposed by Shengjing Zhu
Status: Merged
Merge reported by: Robie Basak
Merged at revision: c48de24c136a369b86b187b5bd0cc3976ddb2d90
Proposed branch: ~zhsj/ubuntu/+source/dhcpcd5:ubuntu/mantic
Merge into: ubuntu/+source/dhcpcd5:ubuntu/devel
Diff against target: 283 lines (+120/-25)
10 files modified
debian/changelog (+17/-0)
debian/control (+3/-4)
debian/patches/0009_allow_newfstatat_syscall.patch (+25/-0)
debian/patches/0010_miss_seccomp_on_ppc64el.patch (+29/-0)
debian/patches/series (+2/-0)
debian/tests/common-ntp-servers-from-dhcp (+5/-0)
debian/tests/control (+0/-8)
debian/upstream/signing-key.asc (+37/-0)
debian/watch (+2/-3)
dev/null (+0/-10)
Reviewer Review Type Date Requested Status
Ubuntu Sponsors Pending
git-ubuntu import Pending
Review via email: mp+443474@code.launchpad.net

This proposal supersedes a proposal from 2023-05-24.

To post a comment you must log in.
Revision history for this message
Shengjing Zhu (zhsj) wrote :

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

Revision history for this message
Athos Ribeiro (athos-ribeiro) wrote :

This has landed and can be closed now.

Revision history for this message
Shengjing Zhu (zhsj) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/debian/changelog b/debian/changelog
index 9b47e66..0653f8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
1dhcpcd5 (9.4.1-21ubuntu1) mantic; urgency=medium
2
3 [ Martin-Éric Racine ]
4 * Migrate debian/watch to Github in cadence with upstream.
5
6 [ Shengjing Zhu ]
7 * Fix autopkgtests (Closes: #1036098)
8 + Use bind-interfaces in dnsmasq conf
9 + Wait until ntp server is reloaded.
10 * Backport seccomp patch to allow newfstatat syscall (Closes: #1034465)
11 * Backport seccomp patch for missing SECCOMP_AUDIT_ARCH on ppc64el (Closes: #1036662)
12 * Drop incompatible ntpd integration. (Closes: #1036092)
13 No longer working after ntpd was replaced by ntpsec.
14 * Remove Conflicts/Replaces dhcp-client (Closes: #1036085)
15
16 -- Shengjing Zhu <shengjing.zhu@canonical.com> Wed, 24 May 2023 16:05:40 +0800
17
1dhcpcd5 (9.4.1-21) unstable; urgency=medium18dhcpcd5 (9.4.1-21) unstable; urgency=medium
219
3 * Document migration to Predictable Network Interface Names in NEWS.Debian.20 * 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
2Section: net2Section: net
3Priority: optional3Priority: optional
4Homepage: https://roy.marples.name/projects/dhcpcd4Homepage: https://roy.marples.name/projects/dhcpcd
5Maintainer: Martin-Éric Racine <martin-eric.racine@iki.fi>5Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
6XSBC-Original-Maintainer: Martin-Éric Racine <martin-eric.racine@iki.fi>
6Build-Depends: debhelper-compat (= 13),7Build-Depends: debhelper-compat (= 13),
7 libudev-dev [linux-any],8 libudev-dev [linux-any],
8 pkg-config9 pkg-config
@@ -13,10 +14,8 @@ Vcs-Git: https://salsa.debian.org/debian/dhcpcd5.git
1314
14Package: dhcpcd-base15Package: dhcpcd-base
15Architecture: any16Architecture: any
16Conflicts: dhcp-client
17Provides: dhcp-client17Provides: dhcp-client
18Replaces: dhcp-client,18Replaces: dhcpcd5 (<< 9.4.1-2)
19 dhcpcd5 (<< 9.4.1-2)
20Breaks: dhcpcd5 (<< 9.4.1-2)19Breaks: dhcpcd5 (<< 9.4.1-2)
21Depends: adduser,20Depends: adduser,
22 ${misc:Depends},21 ${misc:Depends},
diff --git a/debian/hooks/66-ntp.conf b/debian/hooks/66-ntp.conf
23deleted file mode 10064422deleted file mode 100644
index 4fa88b0..0000000
--- a/debian/hooks/66-ntp.conf
+++ /dev/null
@@ -1,34 +0,0 @@
1# vi: ft=sh
2
3SERVERFILE_IPV4="/run/ntp.conf.dhcp"
4SERVERFILE_IPV6="$SERVERFILE_IPV4"
5
6add_servers() {
7 # exit early if there's nothing to do
8 if [ "$new_ntp_servers" = "$old_ntp_servers" ]; then
9 return
10 fi
11
12 insert_servers iburst
13 reload_config
14}
15
16remove_servers() {
17 SERVERFILE=$SERVERFILE_IPV4
18
19 # exit early if there's nothing to do
20 if [ ! -f $SERVERFILE ]; then
21 return
22 fi
23
24 withdraw_servers
25 reload_config
26}
27
28reload_config() {
29 invoke-rc.d ntp try-restart || :
30}
31
32if [ -e /etc/ntp.conf ]; then
33 handle_reason
34fi
diff --git a/debian/patches/0009_allow_newfstatat_syscall.patch b/debian/patches/0009_allow_newfstatat_syscall.patch
35new file mode 1006440new file mode 100644
index 0000000..93f6d1b
--- /dev/null
+++ b/debian/patches/0009_allow_newfstatat_syscall.patch
@@ -0,0 +1,25 @@
1From 38befd4e867583002b96ec39df733585d74c4ff5 Mon Sep 17 00:00:00 2001
2From: Roy Marples <roy@marples.name>
3Date: Fri, 26 Aug 2022 09:24:50 +0100
4Subject: [PATCH] privsep: Allow newfstatat syscall as well
5
6Allows newer glibc variants to work apparently.
7As reported in #84 and #89.
8---
9 src/privsep-linux.c | 3 +++
10 1 file changed, 3 insertions(+)
11
12diff --git a/src/privsep-linux.c b/src/privsep-linux.c
13index 4d5c195d..66aeb490 100644
14--- a/src/privsep-linux.c
15+++ b/src/privsep-linux.c
16@@ -353,6 +353,9 @@ static struct sock_filter ps_seccomp_filter[] = {
17 #ifdef __NR_nanosleep
18 SECCOMP_ALLOW(__NR_nanosleep), /* XXX should use ppoll instead */
19 #endif
20+#ifdef __NR_newfstatat
21+ SECCOMP_ALLOW(__NR_newfstatat),
22+#endif
23 #ifdef __NR_ppoll
24 SECCOMP_ALLOW(__NR_ppoll),
25 #endif
diff --git a/debian/patches/0010_miss_seccomp_on_ppc64el.patch b/debian/patches/0010_miss_seccomp_on_ppc64el.patch
0new file mode 10064426new file mode 100644
index 0000000..969a191
--- /dev/null
+++ b/debian/patches/0010_miss_seccomp_on_ppc64el.patch
@@ -0,0 +1,29 @@
1From 7a2d9767585ed2c407d4985bd2d81552034fb90a Mon Sep 17 00:00:00 2001
2From: CHEN Xiangyu <xiangyu.chen@aol.com>
3Date: Thu, 9 Feb 2023 18:41:52 +0800
4Subject: [PATCH] privsep-linux: fix SECCOMP_AUDIT_ARCH missing ppc64le (#181)
5
6when dhcpcd running on ppc64le platform, it would be killed by SIGSYS.
7
8Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com>
9---
10 src/privsep-linux.c | 6 +++++-
11 1 file changed, 5 insertions(+), 1 deletion(-)
12
13diff --git a/src/privsep-linux.c b/src/privsep-linux.c
14index 7372d26b..6a301950 100644
15--- a/src/privsep-linux.c
16+++ b/src/privsep-linux.c
17@@ -232,7 +232,11 @@ ps_root_sendnetlink(struct dhcpcd_ctx *ctx, int protocol, struct msghdr *msg)
18 #elif defined(__or1k__)
19 # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_OPENRISC
20 #elif defined(__powerpc64__)
21-# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC64
22+# if (BYTE_ORDER == LITTLE_ENDIAN)
23+# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC64LE
24+# else
25+# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC64
26+# endif
27 #elif defined(__powerpc__)
28 # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC
29 #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 @@
60006_skip_hooks_with_tilde.patch60006_skip_hooks_with_tilde.patch
70007_set_buffer_lenght_to_0.patch70007_set_buffer_lenght_to_0.patch
80008_fix_incorrect_assert.patch80008_fix_incorrect_assert.patch
90009_allow_newfstatat_syscall.patch
100010_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() {
24 echo "Preparing dnsmasq configuration..."24 echo "Preparing dnsmasq configuration..."
25 cat <<EOF > /etc/dnsmasq.conf25 cat <<EOF > /etc/dnsmasq.conf
26interface=veth026interface=veth0
27bind-interfaces
27dhcp-range=192.168.1.100,192.168.1.150,12h28dhcp-range=192.168.1.100,192.168.1.150,12h
28dhcp-range=fdae:9322:f1cc::9,fdae:9322:f1cc::99,64,12h29dhcp-range=fdae:9322:f1cc::9,fdae:9322:f1cc::99,64,12h
29dhcp-option=option:ntp-server,$ntp_server_ipv430dhcp-option=option:ntp-server,$ntp_server_ipv4
@@ -117,9 +118,13 @@ run_test() {
117 sleep 5118 sleep 5
118119
119 configure_interface120 configure_interface
121 # wait until ntp server is reloaded with new configuration
122 sleep 5
120 check_ntp_server_obtained123 check_ntp_server_obtained
121124
122 deconfigure_interface125 deconfigure_interface
126 # wait until ntp server is reloaded with new configuration
127 sleep 5
123 check_ntp_server_gone128 check_ntp_server_gone
124129
125 check_conf_hash130 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,
13 @13 @
14Restrictions: isolation-machine, needs-root, breaks-testbed14Restrictions: isolation-machine, needs-root, breaks-testbed
1515
16Tests: ntpd-ntp-servers-from-dhcp
17Depends: dnsmasq,
18 ethtool,
19 iproute2,
20 ntp,
21 @
22Restrictions: isolation-machine, needs-root, breaks-testbed
23
24Tests: openntpd-ntp-servers-from-dhcp16Tests: openntpd-ntp-servers-from-dhcp
25Depends: dnsmasq,17Depends: dnsmasq,
26 ethtool,18 ethtool,
diff --git a/debian/tests/ntpd-ntp-servers-from-dhcp b/debian/tests/ntpd-ntp-servers-from-dhcp
27deleted file mode 10064419deleted file mode 100644
index b1663a2..0000000
--- a/debian/tests/ntpd-ntp-servers-from-dhcp
+++ /dev/null
@@ -1,10 +0,0 @@
1#!/bin/sh
2set -e
3
4added_servers_ipv4="/run/ntp.conf.dhcp"
5added_servers_ipv6="$added_servers_ipv4"
6server_list_cmd="ntpq -nwc lpeers"
7
8. debian/tests/common-ntp-servers-from-dhcp
9
10run_test
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
11new file mode 1006440new file mode 100644
index 0000000..44d4252
--- /dev/null
+++ b/debian/upstream/signing-key.asc
@@ -0,0 +1,37 @@
1-----BEGIN PGP PUBLIC KEY BLOCK-----
2
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
36=wWGO
37-----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 @@
1version=41version=4
2https://roy.marples.name/downloads/dhcpcd/dhcpcd-([0-9\.]*)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) \2opts="mode=git,pgpmode=gittag" \
3https://github.com/NetworkConfiguration/dhcpcd.git refs/tags/v([\d\.]+) \
3debian uupdate --no-symlink4debian uupdate --no-symlink
4#opts="mode=git,pgpmode=gittag" \
5#https://github.com/NetworkConfiguration/dhcpcd.git refs/tags/dhcpcd-([\d\.]+) \

Subscribers

People subscribed via source and target branches