[packages/busybox] Up to 1.36.1
arekm
arekm at pld-linux.org
Thu May 8 15:20:15 CEST 2025
commit 8464414601f0d0a4264cb59673c70ab99a3d997c
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Thu May 8 14:38:50 2025 +0200
Up to 1.36.1
busybox-1.36.1-kernel-6.8.patch | 57 +++++++++++++++++++++++++++++++++++++++++
busybox-initrd.config | 12 ++++++++-
busybox.config | 12 ++++++++-
busybox.spec | 30 ++++++++++++----------
4 files changed, 95 insertions(+), 16 deletions(-)
---
diff --git a/busybox.spec b/busybox.spec
index 5e3783f..d933303 100644
--- a/busybox.spec
+++ b/busybox.spec
@@ -37,18 +37,19 @@ Summary(pl.UTF-8): Zestaw narzędzi uniksowych dla systemów wbudowanych
Summary(pt_BR.UTF-8): BusyBox é um conjunto de utilitários UNIX em um único binário
Name: busybox
# stable line only
-Version: 1.35.0
-Release: 8
+Version: 1.36.1
+Release: 1
License: GPL v2
Group: Applications
Source0: http://www.busybox.net/downloads/%{name}-%{version}.tar.bz2
-# Source0-md5: 585949b1dd4292b604b7d199866e9913
+# Source0-md5: 0fc591bc9f4e365dfd9ade0014f32561
Source1: %{name}.config
Source2: %{name}-initrd.config
%{?with_altconfig:Source3: %{cfgfile}}
Patch0: x32.patch
Patch1: %{name}-logconsole.patch
Patch2: %{name}-printf-gettext.patch
+Patch3: busybox-1.36.1-kernel-6.8.patch
Patch4: %{name}-kernel_headers.patch
Patch5: %{name}-insmod-morearchs.patch
Patch6: %{name}-dhcp.patch
@@ -194,17 +195,18 @@ Statycznie skonsolidowany busybox dla initrd.
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
+%patch -P0 -p1
+%patch -P1 -p1
+%patch -P2 -p1
+%patch -P3 -p1
+%patch -P4 -p1
+%patch -P5 -p1
+%patch -P6 -p1
+%patch -P7 -p1
+%patch -P8 -p1
+%patch -P9 -p1
+%patch -P10 -p1
+%patch -P11 -p1
%build
install -d built
diff --git a/busybox-1.36.1-kernel-6.8.patch b/busybox-1.36.1-kernel-6.8.patch
new file mode 100644
index 0000000..400618d
--- /dev/null
+++ b/busybox-1.36.1-kernel-6.8.patch
@@ -0,0 +1,57 @@
+http://lists.busybox.net/pipermail/busybox/2024-March/090678.html
+https://bugs.gentoo.org/926872
+
+Linux v6.8-rc1 removed the definitions related to CBQ making tc fail to
+build. Add some #ifdefs to handle this missing support.
+--- a/networking/tc.c
++++ b/networking/tc.c
+@@ -231,6 +231,13 @@ static int cbq_parse_opt(int argc, char **argv, struct nlmsghdr *n)
+ return 0;
+ }
+ #endif
++
++#ifndef TCA_CBQ_MAX
++/*
++ * Linux v6.8-rc1~131^2~60^2^2 removed the uapi definitions for CBQ.
++ * See <A HREF="https://git.kernel.org/linus/33241dca48626">https://git.kernel.org/linus/33241dca48626</A>
++ */
++#else
+ static int cbq_print_opt(struct rtattr *opt)
+ {
+ struct rtattr *tb[TCA_CBQ_MAX+1];
+@@ -322,6 +329,7 @@ static int cbq_print_opt(struct rtattr *opt)
+ done:
+ return 0;
+ }
++#endif
+
+ static FAST_FUNC int print_qdisc(
+ const struct sockaddr_nl *who UNUSED_PARAM,
+@@ -375,6 +375,7 @@ static FAST_FUNC int print_qdisc(
+ }
+ if (msg->tcm_info != 1)
+ printf("refcnt %d ", msg->tcm_info);
++#ifdef TCA_CBQ_MAX
+ if (tb[TCA_OPTIONS]) {
+ static const char _q_[] ALIGN1 = "pfifo_fast\0""cbq\0";
+ int qqq = index_in_strings(_q_, name);
+@@ -387,6 +388,7 @@ static FAST_FUNC int print_qdisc(
+ printf("(options for %s)", name);
+ }
+ }
++#endif
+ bb_putchar('\n');
+ return 0;
+ }
+@@ -452,9 +452,11 @@ static FAST_FUNC int print_class(
+ int qqq = index_in_strings(_q_, name);
+ if (qqq == 0) { /* pfifo_fast aka prio */
+ /* nothing. */ /*prio_print_opt(tb[TCA_OPTIONS]);*/
++#ifdef TCA_CBQ_MAX
+ } else if (qqq == 1) { /* class based queuing */
+ /* cbq_print_copt() is identical to cbq_print_opt(). */
+ cbq_print_opt(tb[TCA_OPTIONS]);
++#endif
+ } else {
+ /* don't know how to print options for this class */
+ printf("(options for %s)", name);
diff --git a/busybox-initrd.config b/busybox-initrd.config
index b801dec..2429d6c 100644
--- a/busybox-initrd.config
+++ b/busybox-initrd.config
@@ -101,6 +101,8 @@ CONFIG_FEATURE_RTMINMAX_USE_LIBC_DEFINITIONS=y
CONFIG_FEATURE_SKIP_ROOTFS=y
CONFIG_PASSWORD_MINLEN=6
CONFIG_MD5_SMALL=1
+CONFIG_SHA1_SMALL=3
+CONFIG_SHA1_HWACCEL=y
CONFIG_SHA3_SMALL=1
# CONFIG_FEATURE_FAST_TOP is not set
# CONFIG_FEATURE_ETC_NETWORKS is not set
@@ -263,6 +265,7 @@ CONFIG_RM=y
CONFIG_SHRED=y
# CONFIG_SHA1SUM is not set
# CONFIG_SHA256SUM is not set
+# CONFIG_SHA256_HWACCEL is not set
# CONFIG_SHA512SUM is not set
# CONFIG_SHA3SUM is not set
CONFIG_SLEEP=y
@@ -288,11 +291,14 @@ CONFIG_TEST2=y
# CONFIG_TOUCH is not set
# CONFIG_TR is not set
# CONFIG_TRUNCATE is not set
+# CONFIG_TSORT is not set
+# CONFIG_SEEDRNG is not set
# CONFIG_UNLINK is not set
# CONFIG_BASE64 is not set
# CONFIG_FEATURE_TR_CLASSES is not set
# CONFIG_FEATURE_TR_EQUIV is not set
CONFIG_TRUE=y
+# CONFIG_TREE is not set
# CONFIG_TTY is not set
CONFIG_UNAME=y
CONFIG_UNAME_OSNAME="PLD/Linux"
@@ -660,7 +666,9 @@ CONFIG_UEVENT=y
#
# Common options for mount/umount
-#
+# CONFIG_LOOP_CONFIGURE is not set
+# CONFIG_NO_LOOP_CONFIGURE is not set
+CONFIG_TRY_LOOP_CONFIGURE=y
CONFIG_FEATURE_MOUNT_LOOP=y
CONFIG_FEATURE_MOUNT_LOOP_CREATE=y
# CONFIG_FEATURE_MTAB_SUPPORT is not set
@@ -910,6 +918,7 @@ CONFIG_FEATURE_WGET_TIMEOUT=y
# CONFIG_UDPSVD is not set
# CONFIG_TUNCTL is not set
CONFIG_UDHCPC6=y
+CONFIG_UDHCPC6_DEFAULT_SCRIPT="/usr/share/udhcpc/default6.script"
CONFIG_FEATURE_UDHCPC6_RFC3646=y
CONFIG_FEATURE_UDHCPC6_RFC4704=y
CONFIG_FEATURE_UDHCPC6_RFC4833=y
@@ -984,6 +993,7 @@ CONFIG_ASH_GETOPTS=y
# CONFIG_ASH_MAIL is not set
CONFIG_ASH_ECHO=y
CONFIG_ASH_PRINTF=y
+CONFIG_ASH_SLEEP=y
CONFIG_ASH_TEST=y
CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
CONFIG_ASH_INTERNAL_GLOB=y
diff --git a/busybox.config b/busybox.config
index a500f5f..ecf5297 100644
--- a/busybox.config
+++ b/busybox.config
@@ -107,6 +107,8 @@ CONFIG_FEATURE_RTMINMAX=y
CONFIG_FEATURE_RTMINMAX_USE_LIBC_DEFINITIONS=y
CONFIG_PASSWORD_MINLEN=6
CONFIG_MD5_SMALL=1
+CONFIG_SHA1_SMALL=3
+CONFIG_SHA1_HWACCEL=y
CONFIG_SHA3_SMALL=1
CONFIG_FEATURE_FAST_TOP=y
# CONFIG_FEATURE_ETC_NETWORKS is not set
@@ -295,6 +297,7 @@ CONFIG_SEQ=y
CONFIG_SHRED=y
CONFIG_SHA1SUM=y
CONFIG_SHA256SUM=y
+CONFIG_SHA256_HWACCEL=y
CONFIG_SHA512SUM=y
CONFIG_SHA3SUM=y
CONFIG_SLEEP=y
@@ -328,8 +331,11 @@ CONFIG_TR=y
CONFIG_UNLINK=y
CONFIG_FEATURE_TR_CLASSES=y
CONFIG_FEATURE_TR_EQUIV=y
+# CONFIG_SEEDRNG is not set
CONFIG_TRUNCATE=y
CONFIG_TRUE=y
+CONFIG_TSORT=y
+CONFIG_TREE=y
CONFIG_TTY=y
CONFIG_UNAME=y
CONFIG_UNAME_OSNAME="PLD/Linux"
@@ -756,10 +762,12 @@ CONFIG_FEATURE_UMOUNT_ALL=y
#
# Common options for mount/umount
#
+# CONFIG_LOOP_CONFIGURE is not set
+# CONFIG_NO_LOOP_CONFIGURE is not set
+CONFIG_TRY_LOOP_CONFIGURE=y
CONFIG_FEATURE_MOUNT_LOOP=y
CONFIG_FEATURE_MOUNT_LOOP_CREATE=y
CONFIG_FEATURE_MTAB_SUPPORT=y
-
#
# Miscellaneous Utilities
#
@@ -1041,6 +1049,7 @@ CONFIG_TCPSVD=y
CONFIG_UDPSVD=y
CONFIG_TUNCTL=y
CONFIG_UDHCPC6=y
+CONFIG_UDHCPC6_DEFAULT_SCRIPT="/usr/share/udhcpc/default6.script"
CONFIG_FEATURE_UDHCPC6_RFC3646=y
CONFIG_FEATURE_UDHCPC6_RFC4704=y
CONFIG_FEATURE_UDHCPC6_RFC4833=y
@@ -1170,6 +1179,7 @@ CONFIG_ASH_CMDCMD=y
CONFIG_ASH_MAIL=y
CONFIG_ASH_ECHO=y
CONFIG_ASH_PRINTF=y
+CONFIG_ASH_SLEEP=y
CONFIG_ASH_TEST=y
CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
CONFIG_ASH_INTERNAL_GLOB=y
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/busybox.git/commitdiff/8464414601f0d0a4264cb59673c70ab99a3d997c
More information about the pld-cvs-commit
mailing list