aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/busybox/checksums8
-rw-r--r--core/busybox/files/.config13
-rw-r--r--core/busybox/files/.config-suid13
-rw-r--r--core/busybox/patches/modprobe-kernel-version.patch16
-rw-r--r--core/busybox/sources2
-rw-r--r--core/busybox/version2
6 files changed, 32 insertions, 22 deletions
diff --git a/core/busybox/checksums b/core/busybox/checksums
index 44caba97..1168bb9d 100644
--- a/core/busybox/checksums
+++ b/core/busybox/checksums
@@ -1,6 +1,6 @@
-c35d87f1d04b2b153d33c275c2632e40d388a88f19a9e71727e0bbbff51fe689 busybox-1.32.0.tar.bz2
-bebffb7d56289cb006ba8c52b7351d1bdaf60845a8c092f184c9297cdf7ffd98 .config
-b3dc5a78ec33af72e54e2689d9205c249a91115166a77db6989c176b5c112ed9 .config-suid
+d568681c91a85edc6710770cebc1e80e042ad74d305b5c2e6d57a5f3de3b8fbd busybox-1.33.0.tar.bz2
+4b6e42049ce4cf78b109741917aa5f44b9daf8ada37860cdc8af6b21a59faf2c .config
+4e6932d1b5fd50758b7c1d94783897782d8f04fefa4daa8245a9252600f6cb8c .config-suid
ebd61afac770d3d9cae5c411f44002496fb18b28cf7b77520072a3909852246e acpid.run
814dea14ac612125e97dcc1d619219b2c9dfc14850bf48d858421fb2c98eca12 crond.run
c8b3502bf493336542247683f8d291753130141e5b20ecfda7077936751e83a7 inittab
@@ -11,7 +11,7 @@ af4c302ed9ae6fa1cd8aa51c6f94de11550625e6f1dc0b138605e3429214d082 mdev.conf
2c6012579f669ea790785bb522a879a2005aad0d7977f96863918d3ed3cb03dd ntp.conf
8ce7d65bc9a6da2003bd4dfd89aa355fd8f24fc1fafc37400400f7ac10958caf udhcpc.script
8d84b1719dca2a751c09072c20cd782a3c47f119a68d35316f89d851daf67b88 fsck-resolve-uuid.patch
-0f54301a73af461e8066bc805b48d991cfed513d08a2f036e015b19f97cb424a modprobe-kernel-version.patch
+e31be17d2e058c0bde645f12b38dd6d5a22f8751204304a2df994fc7e523ae9c modprobe-kernel-version.patch
09c2f601fec4e5c10664c22f787dafb9424efe219bf826727c356da90dfd60d5 adduser-no-setgid.patch
f0e17fefc0af6b10205d72b242b6ef7481a58ff07726c62890ebc5893b96a396 install-fix-chown.patch
68e0c7d5e96902d3b890e89d9b018ae11d53ed3104bfedd624a1485df58b11cb print-unicode.patch
diff --git a/core/busybox/files/.config b/core/busybox/files/.config
index ae496d8e..ecf6c334 100644
--- a/core/busybox/files/.config
+++ b/core/busybox/files/.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Busybox version: 1.32.0
-# Sat Jun 27 23:39:25 2020
+# Busybox version: 1.33.0
+# Fri Jan 1 16:14:15 2021
#
CONFIG_HAVE_DOT_CONFIG=y
@@ -36,7 +36,6 @@ CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
# CONFIG_FEATURE_CLEAN_UP is not set
CONFIG_FEATURE_SYSLOG_INFO=y
CONFIG_FEATURE_SYSLOG=y
-CONFIG_PLATFORM_LINUX=y
#
# Build Options
@@ -55,6 +54,7 @@ CONFIG_EXTRA_LDFLAGS=""
CONFIG_EXTRA_LDLIBS=""
CONFIG_USE_PORTABLE_CODE=y
CONFIG_STACK_OPTIMIZATION_386=y
+CONFIG_STATIC_LIBGCC=y
#
# Installation Options ("make install" behavior)
@@ -331,6 +331,7 @@ CONFIG_UNIQ=y
CONFIG_UNLINK=y
CONFIG_USLEEP=y
CONFIG_UUDECODE=y
+CONFIG_BASE32=y
CONFIG_BASE64=y
CONFIG_UUENCODE=y
CONFIG_WC=y
@@ -623,7 +624,6 @@ CONFIG_FINDFS=y
CONFIG_GETOPT=y
CONFIG_FEATURE_GETOPT_LONG=y
# CONFIG_HEXDUMP is not set
-# CONFIG_FEATURE_HEXDUMP_REVERSE is not set
# CONFIG_HD is not set
# CONFIG_XXD is not set
# CONFIG_HWCLOCK is not set
@@ -715,6 +715,7 @@ CONFIG_VOLUMEID=y
CONFIG_FEATURE_VOLUMEID_BCACHE=y
CONFIG_FEATURE_VOLUMEID_BTRFS=y
CONFIG_FEATURE_VOLUMEID_CRAMFS=y
+CONFIG_FEATURE_VOLUMEID_EROFS=y
CONFIG_FEATURE_VOLUMEID_EXFAT=y
CONFIG_FEATURE_VOLUMEID_EXT=y
CONFIG_FEATURE_VOLUMEID_F2FS=y
@@ -874,6 +875,10 @@ CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y
CONFIG_FEATURE_HTTPD_ERROR_PAGES=y
CONFIG_FEATURE_HTTPD_PROXY=y
CONFIG_FEATURE_HTTPD_GZIP=y
+CONFIG_FEATURE_HTTPD_ETAG=y
+CONFIG_FEATURE_HTTPD_LAST_MODIFIED=y
+CONFIG_FEATURE_HTTPD_DATE=y
+# CONFIG_FEATURE_HTTPD_ACL_IP is not set
CONFIG_IFCONFIG=y
CONFIG_FEATURE_IFCONFIG_STATUS=y
CONFIG_FEATURE_IFCONFIG_SLIP=y
diff --git a/core/busybox/files/.config-suid b/core/busybox/files/.config-suid
index 2489211d..b4e6730a 100644
--- a/core/busybox/files/.config-suid
+++ b/core/busybox/files/.config-suid
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Busybox version: 1.32.0
-# Sat Jun 27 23:40:13 2020
+# Busybox version: 1.33.0
+# Fri Jan 1 16:17:16 2021
#
CONFIG_HAVE_DOT_CONFIG=y
@@ -36,7 +36,6 @@ CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
# CONFIG_FEATURE_CLEAN_UP is not set
CONFIG_FEATURE_SYSLOG_INFO=y
CONFIG_FEATURE_SYSLOG=y
-CONFIG_PLATFORM_LINUX=y
#
# Build Options
@@ -55,6 +54,7 @@ CONFIG_EXTRA_LDFLAGS=""
CONFIG_EXTRA_LDLIBS=""
# CONFIG_USE_PORTABLE_CODE is not set
# CONFIG_STACK_OPTIMIZATION_386 is not set
+CONFIG_STATIC_LIBGCC=y
#
# Installation Options ("make install" behavior)
@@ -327,6 +327,7 @@ CONFIG_UNAME_OSNAME=""
# CONFIG_UNLINK is not set
# CONFIG_USLEEP is not set
# CONFIG_UUDECODE is not set
+# CONFIG_BASE32 is not set
# CONFIG_BASE64 is not set
# CONFIG_UUENCODE is not set
# CONFIG_WC is not set
@@ -607,7 +608,6 @@ CONFIG_DEFAULT_DEPMOD_FILE=""
# CONFIG_GETOPT is not set
# CONFIG_FEATURE_GETOPT_LONG is not set
# CONFIG_HEXDUMP is not set
-# CONFIG_FEATURE_HEXDUMP_REVERSE is not set
# CONFIG_HD is not set
# CONFIG_XXD is not set
# CONFIG_HWCLOCK is not set
@@ -691,6 +691,7 @@ CONFIG_DEFAULT_DEPMOD_FILE=""
# CONFIG_FEATURE_VOLUMEID_BCACHE is not set
# CONFIG_FEATURE_VOLUMEID_BTRFS is not set
# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
+# CONFIG_FEATURE_VOLUMEID_EROFS is not set
# CONFIG_FEATURE_VOLUMEID_EXFAT is not set
# CONFIG_FEATURE_VOLUMEID_EXT is not set
# CONFIG_FEATURE_VOLUMEID_F2FS is not set
@@ -850,6 +851,10 @@ CONFIG_FEATURE_LESS_MAXLINES=0
# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
# CONFIG_FEATURE_HTTPD_PROXY is not set
# CONFIG_FEATURE_HTTPD_GZIP is not set
+# CONFIG_FEATURE_HTTPD_ETAG is not set
+# CONFIG_FEATURE_HTTPD_LAST_MODIFIED is not set
+# CONFIG_FEATURE_HTTPD_DATE is not set
+# CONFIG_FEATURE_HTTPD_ACL_IP is not set
# CONFIG_IFCONFIG is not set
# CONFIG_FEATURE_IFCONFIG_STATUS is not set
# CONFIG_FEATURE_IFCONFIG_SLIP is not set
diff --git a/core/busybox/patches/modprobe-kernel-version.patch b/core/busybox/patches/modprobe-kernel-version.patch
index 2d4274ad..fb9b1859 100644
--- a/core/busybox/patches/modprobe-kernel-version.patch
+++ b/core/busybox/patches/modprobe-kernel-version.patch
@@ -1,8 +1,8 @@
diff --git a/modutils/modprobe.c b/modutils/modprobe.c
-index 0a372a049..ecb29a8fd 100644
+index c334186b8..ff08b256f 100644
--- a/modutils/modprobe.c
+++ b/modutils/modprobe.c
-@@ -111,7 +111,7 @@
+@@ -110,7 +110,7 @@
//usage: " from the command line\n"
//usage:
//usage:#define modprobe_trivial_usage
@@ -11,7 +11,7 @@ index 0a372a049..ecb29a8fd 100644
//usage: " MODULE" IF_FEATURE_CMDLINE_MODULE_OPTIONS(" [SYMBOL=VALUE]...")
//usage:#define modprobe_full_usage "\n\n"
//usage: " -a Load multiple MODULEs"
-@@ -121,6 +121,7 @@
+@@ -120,6 +120,7 @@
//usage: "\n -v Verbose"
//usage: "\n -s Log to syslog"
//usage: "\n -D Show dependencies"
@@ -19,7 +19,7 @@ index 0a372a049..ecb29a8fd 100644
//usage: IF_FEATURE_MODPROBE_BLACKLIST(
//usage: "\n -b Apply blacklist to module names too"
//usage: )
-@@ -131,7 +132,7 @@
+@@ -130,7 +131,7 @@
* Note2: -b is always accepted, but if !FEATURE_MODPROBE_BLACKLIST,
* it is a no-op.
*/
@@ -28,7 +28,7 @@ index 0a372a049..ecb29a8fd 100644
/* -a and -D _are_ in fact compatible */
#define MODPROBE_COMPLEMENTARY "q-v:v-q:l--arD:r--alD:a--lr:D--rl"
//#define MODPROBE_OPTS "acd:lnrt:C:b"
-@@ -147,7 +148,8 @@ enum {
+@@ -146,7 +147,8 @@ enum {
//OPT_VERONLY = (INSMOD_OPT_UNUSED << x), /* V */
//OPT_CONFIGFILE = (INSMOD_OPT_UNUSED << x), /* C */
OPT_SHOW_DEPS = (INSMOD_OPT_UNUSED << 3), /* D */
@@ -38,7 +38,7 @@ index 0a372a049..ecb29a8fd 100644
};
#if ENABLE_LONG_OPTS
static const char modprobe_longopts[] ALIGN1 =
-@@ -560,6 +562,7 @@ int modprobe_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+@@ -557,6 +559,7 @@ int modprobe_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int modprobe_main(int argc UNUSED_PARAM, char **argv)
{
int rc;
@@ -46,7 +46,7 @@ index 0a372a049..ecb29a8fd 100644
unsigned opt;
struct module_entry *me;
-@@ -567,13 +570,20 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
+@@ -564,13 +567,20 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
opt = getopt32long(argv, "^" INSMOD_OPTS MODPROBE_OPTS "\0" MODPROBE_COMPLEMENTARY,
modprobe_longopts
@@ -68,4 +68,4 @@ index 0a372a049..ecb29a8fd 100644
- uname(&G.uts);
xchdir(G.uts.release);
- if (opt & OPT_LIST_ONLY) { \ No newline at end of file
+ if (opt & OPT_LIST_ONLY) {
diff --git a/core/busybox/sources b/core/busybox/sources
index 98daae7b..25b78974 100644
--- a/core/busybox/sources
+++ b/core/busybox/sources
@@ -1,4 +1,4 @@
-https://busybox.net/downloads/busybox-1.32.0.tar.bz2
+https://busybox.net/downloads/busybox-1.33.0.tar.bz2
files/.config
files/.config-suid
files/acpid.run
diff --git a/core/busybox/version b/core/busybox/version
index b9c04f8c..311e9969 100644
--- a/core/busybox/version
+++ b/core/busybox/version
@@ -1 +1 @@
-1.32.0 1
+1.33.0 1
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-25 17:19:52 +0000