diff --git a/busybox-1.32.1.tar.bz2 b/busybox-1.32.1.tar.bz2 deleted file mode 100644 index f83fb78..0000000 --- a/busybox-1.32.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9d57c4bd33974140fd4111260468af22856f12f5b5ef7c70c8d9b75c712a0dee -size 2444679 diff --git a/busybox-1.33.0.tar.bz2 b/busybox-1.33.0.tar.bz2 new file mode 100644 index 0000000..f1c4f01 --- /dev/null +++ b/busybox-1.33.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d568681c91a85edc6710770cebc1e80e042ad74d305b5c2e6d57a5f3de3b8fbd +size 2448841 diff --git a/busybox-static.config b/busybox-static.config index 6c60481..ad77223 100644 --- a/busybox-static.config +++ b/busybox-static.config @@ -55,6 +55,7 @@ CONFIG_EXTRA_LDFLAGS="" CONFIG_EXTRA_LDLIBS="" # CONFIG_USE_PORTABLE_CODE is not set CONFIG_STACK_OPTIMIZATION_386=y +CONFIG_STATIC_LIBGCC=y # # Installation Options ("make install" behavior) @@ -331,6 +332,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 @@ -715,6 +717,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 diff --git a/busybox.changes b/busybox.changes index 8caba1c..ab6d9f5 100644 --- a/busybox.changes +++ b/busybox.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Jan 28 15:22:02 UTC 2021 - Thorsten Kukuk + +- Update to version 1.33.0 + - many bug fixes and new features +- update_passwd_selinux_fix.patch upstream compile fix for SELinux + ------------------------------------------------------------------- Tue Jan 5 08:17:09 UTC 2021 - Thorsten Kukuk diff --git a/busybox.config b/busybox.config index 3091898..4bf8ef8 100644 --- a/busybox.config +++ b/busybox.config @@ -55,6 +55,7 @@ CONFIG_EXTRA_LDFLAGS="" CONFIG_EXTRA_LDLIBS="" # CONFIG_USE_PORTABLE_CODE is not set CONFIG_STACK_OPTIMIZATION_386=y +CONFIG_STATIC_LIBGCC=y # # Installation Options ("make install" behavior) @@ -331,6 +332,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 @@ -715,6 +717,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 diff --git a/busybox.spec b/busybox.spec index 7461fce..714e8f4 100644 --- a/busybox.spec +++ b/busybox.spec @@ -17,7 +17,7 @@ Name: busybox -Version: 1.32.1 +Version: 1.33.0 Release: 0 Summary: Minimalist variant of UNIX utilities linked in a single executable License: GPL-2.0-or-later @@ -30,6 +30,8 @@ Source3: busybox-static.config Source4: man.conf Patch0: cpio-long-opt.patch Patch1: sendmail-ignore-F-option.patch +# Compile fix from upstream +Patch10: update_passwd_selinux_fix.patch # other patches Patch100: busybox.install.patch Provides: useradd_or_adduser_dep @@ -74,6 +76,7 @@ PATH=/usr/share/busybox:$PATH SKIP_KNOWN_BUGS=1 ./runtest %setup -q %patch0 -p1 %patch1 -p1 +%patch10 -p1 %patch100 -p0 cp -a %{SOURCE1} docs/ find "(" -name CVS -o -name .cvsignore -o -name .svn -o -name .gitignore ")" \ @@ -93,7 +96,8 @@ mv busybox busybox-static make -e %{?_smp_mflags} clean cp -a %{SOURCE2} .config make %{?_smp_mflags} -e oldconfig -make -e %{?_smp_mflags} +#make -e %{?_smp_mflags} +make -e make -e doc busybox.links %{?_smp_mflags} %if 0%{?usrmerged} sed -i -e 's,^/\(s\?bin\)/,/usr/\1/,' busybox.links diff --git a/update_passwd_selinux_fix.patch b/update_passwd_selinux_fix.patch new file mode 100644 index 0000000..f2fbe9a --- /dev/null +++ b/update_passwd_selinux_fix.patch @@ -0,0 +1,39 @@ +From 808d93c0eca49e0b22056e23d965f0d967433fbb Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sun, 10 Jan 2021 13:20:44 +0100 +Subject: update_passwd: fix context variable + +Commit +https://git.busybox.net/busybox/commit/libbb/update_passwd.c?id=2496616b0a8d1c80cd1416b73a4847b59b9f969a + +changed the variable used from context to seuser but forgot this +change resulting in build errors detected by buildroot autobuilders: + +http://autobuild.buildroot.net/results/b89/b89b7d0f0601bb706e76cea31cf4e43326e5540c//build-end.log + +libbb/update_passwd.c:51:11: error: 'context' undeclared (first use in + this function); did you mean 'ucontext'? + freecon(context); + +Signed-off-by: Bernd Kuhls +Signed-off-by: Denys Vlasenko +--- + libbb/update_passwd.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libbb/update_passwd.c b/libbb/update_passwd.c +index 7b67f30cd..a228075cc 100644 +--- a/libbb/update_passwd.c ++++ b/libbb/update_passwd.c +@@ -48,7 +48,7 @@ static void check_selinux_update_passwd(const char *username) + bb_simple_error_msg_and_die("SELinux: access denied"); + } + if (ENABLE_FEATURE_CLEAN_UP) +- freecon(context); ++ freecon(seuser); + } + #else + # define check_selinux_update_passwd(username) ((void)0) +-- +cgit v1.2.1 +