[packages/busybox] up to 1.38.0
arekm
arekm at pld-linux.org
Tue Aug 18 09:22:09 CEST 2026
commit adc6ed3076947ead2a27d61e65f5e1a793acb026
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Tue Aug 18 09:08:15 2026 +0200
up to 1.38.0
...ck-ELF-header-before-calling-finit_module.patch | 152 ---------------------
busybox-inetd-rpc-portno.patch | 11 ++
busybox-initrd.config | 13 +-
busybox-printf-gettext.patch | 16 +--
busybox.config | 20 +++
busybox.spec | 14 +-
strip-quotes.patch | 11 --
x32.patch | 23 ----
8 files changed, 55 insertions(+), 205 deletions(-)
---
diff --git a/busybox.spec b/busybox.spec
index 878ea67..e6ba234 100644
--- a/busybox.spec
+++ b/busybox.spec
@@ -37,16 +37,15 @@ 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.36.1
+Version: 1.38.0
Release: 1
License: GPL v2
Group: Applications
Source0: https://www.busybox.net/downloads/%{name}-%{version}.tar.bz2
-# Source0-md5: 0fc591bc9f4e365dfd9ade0014f32561
+# Source0-md5: 2a76df79da776a165bf85257403c97bc
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
@@ -56,8 +55,7 @@ Patch6: %{name}-dhcp.patch
Patch7: %{name}-fix_64_archs.patch
Patch8: busybox-1.31.1-stime-fix.patch
Patch9: %{name}-ash-export-PATH.patch
-Patch10: 0001-modutils-check-ELF-header-before-calling-finit_module.patch
-Patch11: strip-quotes.patch
+Patch12: %{name}-inetd-rpc-portno.patch
URL: https://www.busybox.net/
BuildRequires: gcc >= 3.2
BuildRequires: perl-tools-pod
@@ -195,7 +193,6 @@ Statycznie skonsolidowany busybox dla initrd.
%prep
%setup -q
-%patch -P0 -p1
%patch -P1 -p1
%patch -P2 -p1
%patch -P3 -p1
@@ -205,8 +202,7 @@ Statycznie skonsolidowany busybox dla initrd.
%patch -P7 -p1
%patch -P8 -p1
%patch -P9 -p1
-%patch -P10 -p1
-%patch -P11 -p1
+%patch -P12 -p1
%build
install -d built
@@ -244,7 +240,7 @@ mv -f busybox built/busybox.initrd
install %{SOURCE3} .config
%else
install %{SOURCE1} .config
-echo 'CONFIG_EXTRA_LDLIBS="%{?with_glibc:%{tirpcslibs}} %{?with_musl:%{tirpcslibs}}""' >> .config
+echo 'CONFIG_EXTRA_LDLIBS="%{?with_glibc:%{tirpcslibs}} %{?with_musl:%{tirpcslibs}}"' >> .config
%endif
%if %{with musl}
sed -i -e 's|CONFIG_FEATURE_VI_REGEX_SEARCH=y|# CONFIG_FEATURE_VI_REGEX_SEARCH is not set|g' .config
diff --git a/0001-modutils-check-ELF-header-before-calling-finit_module.patch b/0001-modutils-check-ELF-header-before-calling-finit_module.patch
deleted file mode 100644
index 813010e..0000000
--- a/0001-modutils-check-ELF-header-before-calling-finit_module.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-Patch-Source: http://lists.busybox.net/pipermail/busybox/2021-January/088398.html
-Patch-Source: http://lists.busybox.net/pipermail/busybox/2021-January/088399.html
-See-Also: https://gitlab.alpinelinux.org/alpine/aports/-/issues/13427
-
-The purpose of this patch is to remove confusing error messages
-"Module has invalid ELF structures" produced by kernel when loading gzip
-compressed kernel modules using busybox modprobe.
---
-From: Qu Wenruo <wqu at suse.com>
-Date: Sun, 03 Jan 2021 04:10:52 +0000
-Subject: [PATCH v2] modutils: check ELF header before calling finit_module()
-
-finit_module() and init_module() system calls have clear specification
-to only accept valid ELF image.
-
-Although we try finit_module() on compressed modules to let the kernel
-determine if it's an ELF image, but it's not ideal, especially when
-newer kernel will complain when some invalid files/memory is passed in.
-
-Treat the kernel better by just doing a very basic ELF header check
-before calling finit_module().
-
-Signed-off-by: Qu Wenruo <wqu at suse.com>
-
-diff --git a/modutils/modutils.c b/modutils/modutils.c
-index f7ad5e8058fe..037d609e42df 100644
---- a/modutils/modutils.c
-+++ b/modutils/modutils.c
-@@ -7,6 +7,7 @@
- */
- #include "modutils.h"
-
-+#include <elf.h>
- #include <sys/syscall.h>
-
- #define init_module(mod, len, opts) syscall(__NR_init_module, mod, len, opts)
-@@ -186,6 +187,33 @@ void* FAST_FUNC try_to_mmap_module(const char *filename, size_t *image_size_p)
- }
- #endif
-
-+#ifdef __NR_finit_module
-+/*
-+ * Return:
-+ * 0 on success,
-+ * <0 for error.
-+ *
-+ * finit_module()/init_module() only accepts ELF format.
-+ * Do basic ELF check to avoid calling finit_module() with compressed module.
-+ */
-+static int check_elf_header(int fd)
-+{
-+ unsigned char buf[EI_NIDENT];
-+ int ret;
-+
-+ ret = pread(fd, buf, sizeof(buf), 0);
-+ if (ret < sizeof(buf))
-+ return -EIO;
-+ if (buf[EI_MAG0] != ELFMAG0 ||
-+ buf[EI_MAG1] != ELFMAG1 ||
-+ buf[EI_MAG2] != ELFMAG2 ||
-+ buf[EI_MAG3] != ELFMAG3)
-+ return -EINVAL;
-+ /* Other more comprehensive check will be done inside kernel */
-+ return 0;
-+}
-+#endif
-+
- /* Return:
- * 0 on success,
- * -errno on open/read error,
-@@ -212,12 +240,19 @@ int FAST_FUNC bb_init_module(const char *filename, const char *options)
- * to only allow loading of modules off of secure storage (like a read-
- * only rootfs) which needs the finit_module call. If it fails, we fall
- * back to normal module loading to support compressed modules.
-+ *
-+ * Note that finit_module()/init_module() only accept ELF image, do
-+ * basic check before calling finit_module() to avoid kernel
-+ * complaining.
- */
- # ifdef __NR_finit_module
- {
- int fd = open(filename, O_RDONLY | O_CLOEXEC);
- if (fd >= 0) {
-- rc = finit_module(fd, options, 0) != 0;
-+ if (!check_elf_header(fd))
-+ rc = finit_module(fd, options, 0) != 0;
-+ else
-+ rc = 1;
- close(fd);
- if (rc == 0)
- return rc;
-
-diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c
-index db44a2ed0ab5..d2cd6a64c1d0 100644
---- a/modutils/modprobe-small.c
-+++ b/modutils/modprobe-small.c
-@@ -24,6 +24,7 @@
- //kbuild:lib-$(CONFIG_MODPROBE_SMALL) += modprobe-small.o
-
- #include "libbb.h"
-+#include <elf.h> /* for ELF header magic */
- /* After libbb.h, since it needs sys/types.h on some systems */
- #include <sys/utsname.h> /* uname() */
- #include <fnmatch.h>
-@@ -249,6 +250,33 @@ static const char *moderror(int err)
- }
- }
-
-+#ifdef __NR_finit_module
-+/*
-+ * Return:
-+ * 0 on success,
-+ * <0 for error.
-+ *
-+ * finit_module()/init_module() only accepts ELF format.
-+ * Do basic ELF check to avoid calling finit_module() with compressed module.
-+ */
-+static int check_elf_header(int fd)
-+{
-+ unsigned char buf[EI_NIDENT];
-+ int ret;
-+
-+ ret = pread(fd, buf, sizeof(buf), 0);
-+ if (ret < sizeof(buf))
-+ return -EIO;
-+ if (buf[EI_MAG0] != ELFMAG0 ||
-+ buf[EI_MAG1] != ELFMAG1 ||
-+ buf[EI_MAG2] != ELFMAG2 ||
-+ buf[EI_MAG3] != ELFMAG3)
-+ return -EINVAL;
-+ /* Other more comprehensive check will be done inside kernel */
-+ return 0;
-+}
-+#endif
-+
- static int load_module(const char *fname, const char *options)
- {
- #if 1
-@@ -272,7 +300,10 @@ static int load_module(const char *fname, const char *options)
- {
- int fd = open(fname, O_RDONLY | O_CLOEXEC);
- if (fd >= 0) {
-- r = finit_module(fd, options, 0) != 0;
-+ if (!check_elf_header(fd))
-+ r = finit_module(fd, options, 0) != 0;
-+ else
-+ r = 1;
- close(fd);
- }
- }
---
-2.29.2
diff --git a/busybox-inetd-rpc-portno.patch b/busybox-inetd-rpc-portno.patch
new file mode 100644
index 0000000..19c05f1
--- /dev/null
+++ b/busybox-inetd-rpc-portno.patch
@@ -0,0 +1,11 @@
+--- busybox-1.38.0.org/networking/inetd.c
++++ busybox-1.38.0/networking/inetd.c
+@@ -1043,7 +1043,7 @@ static void reread_config_file(int sig U
+ portno = bb_strtou(sep->se_service, NULL, 10);
+ #if ENABLE_FEATURE_INETD_RPC
+ if (is_rpc_service(sep)) {
+- sep->se_rpcprog = n;
++ sep->se_rpcprog = portno;
+ if (errno) { /* se_service is not numeric */
+ struct rpcent *rp = getrpcbyname(sep->se_service);
+ if (rp == NULL) {
diff --git a/busybox-initrd.config b/busybox-initrd.config
index 2429d6c..e34a0ca 100644
--- a/busybox-initrd.config
+++ b/busybox-initrd.config
@@ -21,6 +21,7 @@ CONFIG_SHOW_USAGE=y
# CONFIG_FEATURE_VERBOSE_USAGE is not set
# CONFIG_FEATURE_COMPRESS_USAGE is not set
# CONFIG_FEATURE_INSTALLER is not set
+CONFIG_FEATURE_VERSION=y
# CONFIG_LOCALE_SUPPORT is not set
CONFIG_UNICODE_SUPPORT=y
# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set
@@ -57,6 +58,7 @@ CONFIG_FEATURE_HAVE_RPC=y
# CONFIG_FEATURE_INDIVIDUAL is not set
# CONFIG_FEATURE_SHARED_BUSYBOX is not set
CONFIG_LFS=y
+CONFIG_TIME64=y
CONFIG_CROSS_COMPILER_PREFIX=""
CONFIG_SYSROOT=""
CONFIG_EXTRA_CFLAGS=""
@@ -172,6 +174,7 @@ CONFIG_IOCTL_HEX2STR_ERROR=y
# CONFIG_UNXZ is not set
# CONFIG_XZ is not set
# CONFIG_FEATURE_LZMA_FAST is not set
+# CONFIG_FEATURE_PATH_TRAVERSAL_PROTECTION is not set
# CONFIG_UNZIP is not set
#
@@ -265,6 +268,7 @@ CONFIG_RM=y
CONFIG_SHRED=y
# CONFIG_SHA1SUM is not set
# CONFIG_SHA256SUM is not set
+CONFIG_SHA384SUM=y
# CONFIG_SHA256_HWACCEL is not set
# CONFIG_SHA512SUM is not set
# CONFIG_SHA3SUM is not set
@@ -592,6 +596,7 @@ CONFIG_FREERAMDISK=y
# CONFIG_IPCRM is not set
# CONFIG_IPCS is not set
CONFIG_LOSETUP=y
+CONFIG_LSBLK=y
CONFIG_LSPCI=y
# CONFIG_LSUSB is not set
CONFIG_MDEV=y
@@ -660,6 +665,7 @@ CONFIG_SWITCH_ROOT=y
CONFIG_UMOUNT=y
CONFIG_FEATURE_UMOUNT_ALL=y
# CONFIG_UNSHARE is not set
+CONFIG_UUIDGEN=y
# CONFIG_ACPID is not set
# CONFIG_REV is not set
CONFIG_UEVENT=y
@@ -711,6 +717,7 @@ CONFIG_FEATURE_MOUNT_LOOP_CREATE=y
# CONFIG_FALLOCATE is not set
# CONFIG_FBSPLASH is not set
# CONFIG_FLASHCP is not set
+CONFIG_GETFATTR=y
# CONFIG_FLASH_LOCK is not set
# CONFIG_FLASH_UNLOCK is not set
# CONFIG_FLASH_ERASEALL is not set
@@ -835,11 +842,13 @@ CONFIG_IFUPDOWN_IFSTATE_PATH=""
# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set
# CONFIG_FEATURE_INETD_RPC is not set
CONFIG_IP=y
-CONFIG_FEATURE_IP_ADDRESS=u
+CONFIG_FEATURE_IP_ADDRESS=y
CONFIG_FEATURE_IP_LINK=y
+CONFIG_FEATURE_IP_LINK_CAN=y
CONFIG_FEATURE_IP_ROUTE=y
CONFIG_FEATURE_IP_TUNNEL=y
CONFIG_FEATURE_IP_RULE=y
+CONFIG_FEATURE_IP_NEIGH=y
CONFIG_FEATURE_IP_SHORT_FORMS=y
CONFIG_FEATURE_IP_RARE_PROTOCOLS=y
CONFIG_IPADDR=y
@@ -872,6 +881,7 @@ CONFIG_ROUTE=y
# CONFIG_SENDMAIL is not set
# CONFIG_SLATTACH is not set
# CONFIG_SSL_CLIENT is not set
+CONFIG_SSL_SERVER=y
CONFIG_TC=y
CONFIG_FEATURE_TC_INGRESS=y
# CONFIG_TELNET is not set
@@ -960,6 +970,7 @@ CONFIG_FEATURE_SHOW_THREADS=y
# CONFIG_FEATURE_TOPMEM is not set
# CONFIG_SMEMCAP is not set
# CONFIG_UPTIME is not set
+CONFIG_VMSTAT=y
# CONFIG_WATCH is not set
#
diff --git a/busybox-printf-gettext.patch b/busybox-printf-gettext.patch
index 923a523..3f5f2e9 100644
--- a/busybox-printf-gettext.patch
+++ b/busybox-printf-gettext.patch
@@ -1,6 +1,5 @@
-diff -urNp -x '*.orig' busybox-1.31.1.org/coreutils/printf.c busybox-1.31.1/coreutils/printf.c
---- busybox-1.31.1.org/coreutils/printf.c 2019-06-10 12:50:53.000000000 +0200
-+++ busybox-1.31.1/coreutils/printf.c 2021-10-21 10:28:37.833148938 +0200
+--- busybox-1.38.0.org/coreutils/printf.c
++++ busybox-1.38.0/coreutils/printf.c
@@ -59,6 +59,9 @@
//usage: "$ printf \"Val=%d\\n\" 5\n"
//usage: "Val=5\n"
@@ -11,7 +10,7 @@ diff -urNp -x '*.orig' busybox-1.31.1.org/coreutils/printf.c busybox-1.31.1/core
#include "libbb.h"
/* A note on bad input: neither bash 3.2 nor coreutils 6.10 stop on it.
-@@ -400,11 +403,132 @@ static char **print_formatted(char *f, c
+@@ -401,11 +404,132 @@ static char **print_formatted(char *f, c
return argv;
}
@@ -144,14 +143,13 @@ diff -urNp -x '*.orig' busybox-1.31.1.org/coreutils/printf.c busybox-1.31.1/core
/* We must check that stdout is not closed.
* The reason for this is highly non-obvious.
-@@ -436,8 +560,8 @@ int printf_main(int argc UNUSED_PARAM, c
+@@ -437,8 +561,7 @@ int printf_main(int argc UNUSED_PARAM, c
bb_show_usage();
}
-- format = argv[1];
-- argv2 = argv + 2;
-+ argv += optind;
-+ argv2 = argv;
+- format = argv[0];
+- argv2 = argv + 1;
++ argv2 = argv + (optind - 1);
conv_err = 0;
do {
diff --git a/busybox.config b/busybox.config
index ecf5297..010d612 100644
--- a/busybox.config
+++ b/busybox.config
@@ -24,6 +24,7 @@ CONFIG_SHOW_USAGE=y
CONFIG_FEATURE_VERBOSE_USAGE=y
CONFIG_FEATURE_COMPRESS_USAGE=y
CONFIG_FEATURE_INSTALLER=y
+CONFIG_FEATURE_VERSION=y
CONFIG_BUSYBOX=y
CONFIG_FEATURE_SHOW_SCRIPT=y
# CONFIG_LOCALE_SUPPORT is not set
@@ -62,6 +63,7 @@ CONFIG_PLATFORM_LINUX=y
# CONFIG_FEATURE_INDIVIDUAL is not set
# CONFIG_FEATURE_SHARED_BUSYBOX is not set
CONFIG_LFS=y
+CONFIG_TIME64=y
CONFIG_CROSS_COMPILER_PREFIX=""
CONFIG_SYSROOT=""
CONFIG_EXTRA_CFLAGS=""
@@ -152,6 +154,7 @@ CONFIG_BUNZIP2=y
CONFIG_BZCAT=y
CONFIG_BZIP2=y
CONFIG_BZIP2_SMALL=8
+CONFIG_FEATURE_BZIP2_DECOMPRESS=y
CONFIG_CPIO=y
CONFIG_FEATURE_CPIO_O=y
CONFIG_FEATURE_CPIO_P=y
@@ -167,6 +170,7 @@ CONFIG_GZIP=y
CONFIG_FEATURE_GZIP_LONG_OPTIONS=y
CONFIG_GZIP_FAST=0
CONFIG_FEATURE_GZIP_LEVELS=y
+CONFIG_FEATURE_GZIP_DECOMPRESS=y
CONFIG_LZOP=y
CONFIG_LZOP_COMPR_HIGH=y
CONFIG_UNLZOP=y
@@ -191,6 +195,7 @@ CONFIG_UNXZ=y
CONFIG_XZCAT=y
CONFIG_XZ=y
# CONFIG_FEATURE_LZMA_FAST is not set
+# CONFIG_FEATURE_PATH_TRAVERSAL_PROTECTION is not set
CONFIG_LZMA=y
CONFIG_UNZIP=y
CONFIG_FEATURE_UNZIP_CDF=y
@@ -297,6 +302,7 @@ CONFIG_SEQ=y
CONFIG_SHRED=y
CONFIG_SHA1SUM=y
CONFIG_SHA256SUM=y
+CONFIG_SHA384SUM=y
CONFIG_SHA256_HWACCEL=y
CONFIG_SHA512SUM=y
CONFIG_SHA3SUM=y
@@ -486,6 +492,7 @@ CONFIG_FEATURE_FIND_INUM=y
CONFIG_FEATURE_FIND_SAMEFILE=y
CONFIG_FEATURE_FIND_EXEC=y
CONFIG_FEATURE_FIND_EXEC_PLUS=y
+CONFIG_FEATURE_FIND_EXEC_OK=y
CONFIG_FEATURE_FIND_USER=y
CONFIG_FEATURE_FIND_GROUP=y
CONFIG_FEATURE_FIND_NOT=y
@@ -643,6 +650,7 @@ CONFIG_FDFLUSH=y
CONFIG_FDFORMAT=y
CONFIG_FDISK=y
CONFIG_FDISK_SUPPORT_LARGE_DISKS=y
+CONFIG_FEATURE_FDISK_BLKSIZE=y
CONFIG_FEATURE_FDISK_WRITABLE=y
# CONFIG_FEATURE_AIX_LABEL is not set
# CONFIG_FEATURE_SGI_LABEL is not set
@@ -663,6 +671,7 @@ CONFIG_MKDOSFS=y
CONFIG_REV=y
CONFIG_UEVENT=y
CONFIG_UNSHARE=y
+CONFIG_UUIDGEN=y
#
# Minix filesystem support
@@ -680,9 +689,11 @@ CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
CONFIG_IPCRM=y
CONFIG_IPCS=y
CONFIG_LOSETUP=y
+CONFIG_LSBLK=y
CONFIG_LSPCI=y
CONFIG_LSUSB=y
# CONFIG_FLASHCP is not set
+CONFIG_GETFATTR=y
CONFIG_MDEV=y
CONFIG_WALL=y
CONFIG_FEATURE_MDEV_CONF=y
@@ -806,6 +817,7 @@ CONFIG_I2CDUMP=y
CONFIG_I2CDETECT=y
CONFIG_I2CTRANSFER=y
CONFIG_DC=y
+CONFIG_FEATURE_DC_BIG=y
CONFIG_FEATURE_DC_LIBM=y
# CONFIG_DEVFSD is not set
# CONFIG_DEVFSD_MODLOAD is not set
@@ -953,6 +965,7 @@ CONFIG_FEATURE_INETD_RPC=y
CONFIG_IP=y
CONFIG_FEATURE_IP_ADDRESS=y
CONFIG_FEATURE_IP_LINK=y
+CONFIG_FEATURE_IP_LINK_CAN=y
CONFIG_FEATURE_IP_ROUTE=y
CONFIG_FEATURE_IP_ROUTE_DIR="/etc/iproute2"
CONFIG_FEATURE_IP_TUNNEL=y
@@ -994,6 +1007,7 @@ CONFIG_PSCAN=y
CONFIG_ROUTE=y
CONFIG_SLATTACH=y
CONFIG_SSL_CLIENT=y
+CONFIG_SSL_SERVER=y
CONFIG_TC=y
CONFIG_FEATURE_TC_INGRESS=y
CONFIG_TELNET=y
@@ -1001,6 +1015,7 @@ CONFIG_FEATURE_TELNET_TTYPE=y
CONFIG_FEATURE_TELNET_AUTOLOGIN=y
CONFIG_FEATURE_TELNET_WIDTH=y
CONFIG_TELNETD=y
+# CONFIG_FEATURE_TELNETD_SELFTEST_DEBUG is not set
CONFIG_FEATURE_TELNETD_STANDALONE=y
CONFIG_FEATURE_TELNETD_PORT_DEFAULT=23
CONFIG_FEATURE_TELNETD_INETD_WAIT=y
@@ -1018,6 +1033,7 @@ CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE=y
CONFIG_FEATURE_TRACEROUTE_USE_ICMP=y
CONFIG_TRACEROUTE6=y
CONFIG_UDHCPD=y
+CONFIG_FEATURE_UDHCPD_BOOTP=y
CONFIG_UDHCP_DEBUG=9
CONFIG_FEATURE_UDHCP_RFC3397=y
CONFIG_DHCPRELAY=y
@@ -1116,6 +1132,7 @@ CONFIG_FEATURE_SHOW_THREADS=y
CONFIG_SMEMCAP=y
CONFIG_UPTIME=y
CONFIG_FEATURE_UPTIME_UTMP_SUPPORT=y
+CONFIG_VMSTAT=y
CONFIG_WATCH=y
#
@@ -1186,6 +1203,7 @@ CONFIG_ASH_INTERNAL_GLOB=y
CONFIG_ASH_RANDOM_SUPPORT=y
CONFIG_ASH_EXPAND_PRMT=y
# CONFIG_SHELL_HUSH is not set
+CONFIG_HUSH_NEED_FOR_SPEED=y
CONFIG_HUSH=y
CONFIG_HUSH_BASH_COMPAT=y
CONFIG_HUSH_BRACE_EXPANSION=y
@@ -1216,7 +1234,9 @@ CONFIG_HUSH_TICK=y
CONFIG_HUSH_IF=y
CONFIG_HUSH_LOOPS=y
CONFIG_HUSH_CASE=y
+CONFIG_HUSH_ALIAS=y
CONFIG_HUSH_FUNCTIONS=y
+CONFIG_HUSH_FUNCTION_KEYWORD=y
CONFIG_HUSH_LOCAL=y
CONFIG_HUSH_EXPORT_N=y
CONFIG_HUSH_READONLY=y
diff --git a/strip-quotes.patch b/strip-quotes.patch
deleted file mode 100644
index 6d45292..0000000
--- a/strip-quotes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- busybox-1.35.0/Makefile~ 2022-06-15 10:08:14.000000000 +0200
-+++ busybox-1.35.0/Makefile 2022-06-15 10:11:50.040293067 +0200
-@@ -612,7 +612,7 @@ quiet_cmd_busybox__ ?= LINK $@
- "$(core-y)" \
- "$(libs-y)" \
- "$(LDLIBS)" \
-- "$(CONFIG_EXTRA_LDLIBS)" \
-+ "$(strip $(subst ",,$(CONFIG_EXTRA_LDLIBS)))" \
- && $(srctree)/scripts/generate_BUFSIZ.sh --post include/common_bufsiz.h
-
- # Generate System.map
diff --git a/x32.patch b/x32.patch
deleted file mode 100644
index 2874cb0..0000000
--- a/x32.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ur busybox-1.35.0.orig/include/libbb.h busybox-1.35.0/include/libbb.h
---- busybox-1.35.0.orig/include/libbb.h 2021-12-26 16:53:26.000000000 +0000
-+++ busybox-1.35.0/include/libbb.h 2022-04-03 22:02:20.060835065 +0000
-@@ -312,11 +312,19 @@
- * gcc will throw warnings on printf("%d", off_t)... Have to use %ld etc.
- */
- # if UINT_MAX == ULONG_MAX
-+#ifdef __ILP32__
-+typedef unsigned long long uoff_t;
-+# define XATOOFF(a) xatoull_range((a), 0, LLONG_MA_STRTOOFF bb_strX)
-+# define BBtoull
-+# define STRTOOFF strtoull
-+# define OFF_FMT "ll"
-+#else
- typedef unsigned long uoff_t;
- # define XATOOFF(a) xatoi_positive(a)
- # define BB_STRTOOFF bb_strtou
- # define STRTOOFF strtol
- # define OFF_FMT "l"
-+#endif
- # else
- typedef unsigned long uoff_t;
- # define XATOOFF(a) xatoul_range((a), 0, LONG_MAX)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/busybox.git/commitdiff/adc6ed3076947ead2a27d61e65f5e1a793acb026
More information about the pld-cvs-commit
mailing list