Accepting request 1132110 from Base:System
OBS-URL: https://build.opensuse.org/request/show/1132110 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/busybox?expand=0&rev=85
This commit is contained in:
commit
dc7002714c
@ -1,3 +1,11 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Dec 8 10:47:35 UTC 2023 - Thorsten Kukuk <kukuk@suse.com>
|
||||||
|
|
||||||
|
- 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 <radoslav.kolev@suse.com>
|
Tue Aug 29 09:55:24 UTC 2023 - Radoslav Kolev <radoslav.kolev@suse.com>
|
||||||
|
|
||||||
|
@ -1017,11 +1017,11 @@ CONFIG_UDHCPC=y
|
|||||||
# CONFIG_FEATURE_UDHCPC_SANITIZEOPT is not set
|
# CONFIG_FEATURE_UDHCPC_SANITIZEOPT is not set
|
||||||
CONFIG_UDHCPC_DEFAULT_SCRIPT=""
|
CONFIG_UDHCPC_DEFAULT_SCRIPT=""
|
||||||
CONFIG_UDHCPC6_DEFAULT_SCRIPT=""
|
CONFIG_UDHCPC6_DEFAULT_SCRIPT=""
|
||||||
# CONFIG_UDHCPC6 is not set
|
CONFIG_UDHCPC6=y
|
||||||
# CONFIG_FEATURE_UDHCPC6_RFC3646 is not set
|
CONFIG_FEATURE_UDHCPC6_RFC3646=y
|
||||||
# CONFIG_FEATURE_UDHCPC6_RFC4704 is not set
|
CONFIG_FEATURE_UDHCPC6_RFC4704=y
|
||||||
# CONFIG_FEATURE_UDHCPC6_RFC4833 is not set
|
CONFIG_FEATURE_UDHCPC6_RFC4833=y
|
||||||
# CONFIG_FEATURE_UDHCPC6_RFC5970 is not set
|
CONFIG_FEATURE_UDHCPC6_RFC5970=y
|
||||||
|
|
||||||
#
|
#
|
||||||
# Common options for DHCP applets
|
# Common options for DHCP applets
|
||||||
@ -1030,8 +1030,8 @@ CONFIG_UDHCPC_DEFAULT_INTERFACE=""
|
|||||||
# CONFIG_FEATURE_UDHCP_PORT is not set
|
# CONFIG_FEATURE_UDHCP_PORT is not set
|
||||||
CONFIG_UDHCP_DEBUG=0
|
CONFIG_UDHCP_DEBUG=0
|
||||||
CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0
|
CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0
|
||||||
# CONFIG_FEATURE_UDHCP_RFC3397 is not set
|
CONFIG_FEATURE_UDHCP_RFC3397=y
|
||||||
# CONFIG_FEATURE_UDHCP_8021Q is not set
|
CONFIG_FEATURE_UDHCP_8021Q=y
|
||||||
CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n"
|
CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n"
|
||||||
|
|
||||||
#
|
#
|
||||||
|
@ -44,6 +44,7 @@ Patch1: sendmail-ignore-F-option.patch
|
|||||||
Patch2: testsuite-gnu-echo.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
|
# 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
|
Patch3: ash-fix-segfault-d417193cf.patch
|
||||||
|
Patch4: udhcp6-install-path.patch
|
||||||
# other patches
|
# other patches
|
||||||
Patch100: busybox.install.patch
|
Patch100: busybox.install.patch
|
||||||
Provides: useradd_or_adduser_dep
|
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
|
generally have fewer options than their GNU cousins. The options that
|
||||||
are included provide the expected functionality and behave much like
|
are included provide the expected functionality and behave much like
|
||||||
their GNU counterparts.
|
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
|
%package static
|
||||||
Summary: Static linked version of Busybox, a compact UNIX utility collection
|
Summary: Static linked version of Busybox, a compact UNIX utility collection
|
||||||
|
11
udhcp6-install-path.patch
Normal file
11
udhcp6-install-path.patch
Normal file
@ -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
|
Loading…
Reference in New Issue
Block a user