From 80cc31766fd8c235b375f490d8a3bf99ea4ffb83be36f207778ea04649c8ccce Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk Date: Fri, 8 Dec 2023 13:53:15 +0000 Subject: [PATCH] Accepting request 1132109 from home:kukuk:branches:Base:System - Install udhcpc and udhcpc6 into the same directory (udhcp6-install-path.patch) - Fully enable udhcpc and document that this tool needs special configuration and does not work out of the box [bsc#1217883] OBS-URL: https://build.opensuse.org/request/show/1132109 OBS-URL: https://build.opensuse.org/package/show/Base:System/busybox?expand=0&rev=124 --- busybox.changes | 8 ++++++++ busybox.config | 14 +++++++------- busybox.spec | 4 ++++ udhcp6-install-path.patch | 11 +++++++++++ 4 files changed, 30 insertions(+), 7 deletions(-) create mode 100644 udhcp6-install-path.patch diff --git a/busybox.changes b/busybox.changes index 724670b..1f8e8a1 100644 --- a/busybox.changes +++ b/busybox.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Dec 8 10:47:35 UTC 2023 - Thorsten Kukuk + +- Install udhcpc and udhcpc6 into the same directory + (udhcp6-install-path.patch) +- Fully enable udhcpc and document that this tool needs special + configuration and does not work out of the box [bsc#1217883] + ------------------------------------------------------------------- Tue Aug 29 09:55:24 UTC 2023 - Radoslav Kolev diff --git a/busybox.config b/busybox.config index e7d0c06..fcd5c98 100644 --- a/busybox.config +++ b/busybox.config @@ -1017,11 +1017,11 @@ CONFIG_UDHCPC=y # CONFIG_FEATURE_UDHCPC_SANITIZEOPT is not set CONFIG_UDHCPC_DEFAULT_SCRIPT="" CONFIG_UDHCPC6_DEFAULT_SCRIPT="" -# CONFIG_UDHCPC6 is not set -# CONFIG_FEATURE_UDHCPC6_RFC3646 is not set -# CONFIG_FEATURE_UDHCPC6_RFC4704 is not set -# CONFIG_FEATURE_UDHCPC6_RFC4833 is not set -# CONFIG_FEATURE_UDHCPC6_RFC5970 is not set +CONFIG_UDHCPC6=y +CONFIG_FEATURE_UDHCPC6_RFC3646=y +CONFIG_FEATURE_UDHCPC6_RFC4704=y +CONFIG_FEATURE_UDHCPC6_RFC4833=y +CONFIG_FEATURE_UDHCPC6_RFC5970=y # # Common options for DHCP applets @@ -1030,8 +1030,8 @@ CONFIG_UDHCPC_DEFAULT_INTERFACE="" # CONFIG_FEATURE_UDHCP_PORT is not set CONFIG_UDHCP_DEBUG=0 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0 -# CONFIG_FEATURE_UDHCP_RFC3397 is not set -# CONFIG_FEATURE_UDHCP_8021Q is not set +CONFIG_FEATURE_UDHCP_RFC3397=y +CONFIG_FEATURE_UDHCP_8021Q=y CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n" # diff --git a/busybox.spec b/busybox.spec index 1e2651a..9946721 100644 --- a/busybox.spec +++ b/busybox.spec @@ -44,6 +44,7 @@ Patch1: sendmail-ignore-F-option.patch Patch2: testsuite-gnu-echo.patch # PATCH-FIX-UPSTREAM shell: avoid segfault on ${0::0/0~09J} (CVE-2022-48174) https://git.busybox.net/busybox/commit/?id=d417193cf Patch3: ash-fix-segfault-d417193cf.patch +Patch4: udhcp6-install-path.patch # other patches Patch100: busybox.install.patch Provides: useradd_or_adduser_dep @@ -67,6 +68,9 @@ environment for small or embedded systems. The utilities in BusyBox generally have fewer options than their GNU cousins. The options that are included provide the expected functionality and behave much like their GNU counterparts. +BusyBox is for emergency and special use cases. Replacing the standard +tools in a system is not supported. Some tools don't work out of the +box but need special configuration, like udhcpc, the dhcp client. %package static Summary: Static linked version of Busybox, a compact UNIX utility collection diff --git a/udhcp6-install-path.patch b/udhcp6-install-path.patch new file mode 100644 index 0000000..c11ad59 --- /dev/null +++ b/udhcp6-install-path.patch @@ -0,0 +1,11 @@ +--- busybox-1.36.1/networking/udhcp/d6_dhcpc.c.old 2023-01-03 15:14:43.000000000 +0100 ++++ busybox-1.36.1/networking/udhcp/d6_dhcpc.c 2023-12-08 11:46:16.570298842 +0100 +@@ -45,7 +45,7 @@ + //config: You can request bootfile-url with "-O bootfile_url" and + //config: bootfile-params with "-O bootfile_params". + +-//applet:IF_UDHCPC6(APPLET(udhcpc6, BB_DIR_USR_BIN, BB_SUID_DROP)) ++//applet:IF_UDHCPC6(APPLET(udhcpc6, BB_DIR_USR_SBIN, BB_SUID_DROP)) + + //kbuild:lib-$(CONFIG_UDHCPC6) += d6_dhcpc.o d6_packet.o d6_socket.o common.o socket.o signalpipe.o + //kbuild:lib-$(CONFIG_FEATURE_UDHCPC6_RFC3646) += domain_codec.o