Skip to contentSkip to conversation

dhcpcd: upgrade 9.3.2 -> 9.3.4

PATCH New Yi Zhao 1 participant 1 message Dec 9, 2020

lore
Share & tools
lore

Yi Zhao

author
#0 lore raw

PATCH 1/1 dhcpcd: upgrade 9.3.2 -> 9.3.4

Backport a patch to fix privsep build error on ppc.

---
 .../{dhcpcd_9.3.2.bb => dhcpcd_9.3.4.bb}      |  3 +-
 ...p-build-by-including-sys-termios.h-f.patch | 29 +++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)
 rename meta/recipes-connectivity/dhcpcd/{dhcpcd_9.3.2.bb => dhcpcd_9.3.4.bb} (91%)
 create mode 100644 meta/recipes-connectivity/dhcpcd/files/0001-Linux-Fix-privsep-build-by-including-sys-termios.h-f.patch
meta/recipes-connectivity/dhcpcd/dhcpcd_9.3.4.bb renamed from meta/recipes-connectivity/dhcpcd/dhcpcd_9.3.2.bb +2 -1
similarity index 91%
rename from meta/recipes-connectivity/dhcpcd/dhcpcd_9.3.2.bb
rename to meta/recipes-connectivity/dhcpcd/dhcpcd_9.3.4.bb
index cca60ddae2..cd81f17773 100644
@@ -13,11 +13,12 @@ UPSTREAM_CHECK_URI = "https://roy.marples.name/downloads/dhcpcd/"
 
 SRC_URI = "https://roy.marples.name/downloads/${BPN}/${BPN}-${PV}.tar.xz \
            file://0001-remove-INCLUDEDIR-to-prevent-build-issues.patch \
+           file://0001-Linux-Fix-privsep-build-by-including-sys-termios.h-f.patch \
            file://dhcpcd.service \
            file://[email protected] \
            "
 
-SRC_URI[sha256sum] = "6d49af5e766a2515e6366e4f669663df04ecdf90a1a60ddb1d7a2feb4b5d2566"
+SRC_URI[sha256sum] = "5c823a0b981b52e7e0fd3183ae220422d6fcc3aa511af31dcb1a7ee6cb0f1c39"
 
 inherit pkgconfig autotools-brokensep systemd useradd
 
meta/recipes-connectivity/dhcpcd/files/0001-Linux-Fix-privsep-build-by-including-sys-termios.h-f.patch new file +29 -0
new file mode 100644
index 0000000000..095e3eb409
@@ -0,0 +1,29 @@
+From e7c22336461ee345a5668eed6158e935cd4cdf1a Mon Sep 17 00:00:00 2001
+From: Mikhail Efremov <[email protected]>
+Date: Tue, 8 Dec 2020 16:15:28 +0000
+Subject: [PATCH] Linux: Fix privsep build by including sys/termios.h for all
+ platforms
+
+Upstream-Status: Backport
+[https://roy.marples.name/cgit/dhcpcd.git/commit/?id=e7c22336461ee345a5668eed6158e935cd4cdf1a]
+
+Signed-off-by: Yi Zhao <[email protected]>
+---
+ src/privsep-linux.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/privsep-linux.c b/src/privsep-linux.c
+index e588ecd7..1fbe97fa 100644
+--- a/src/privsep-linux.c
++++ b/src/privsep-linux.c
+@@ -29,6 +29,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/prctl.h>
+ #include <sys/syscall.h>
++#include <sys/termios.h>	/* For TCGETS */
+ 
+ #include <linux/audit.h>
+ #include <linux/filter.h>
+-- 
+2.25.1
+
Signature · 1 line
2.25.1