From 6e9ff6ceed7bdcef54d055f04a02f924264216f6 Mon Sep 17 00:00:00 2001 From: Markham Date: Thu, 19 Apr 2018 13:21:51 +0200 Subject: [PATCH] bump version busybox-1.28.3 --- ...sybox-1.28.1-no-unsafe-symlink-check.patch | 23 ------------------- ...-order-sys-tree-is-scanned-with-mdev.diff} | 0 ...1-cst.config => busybox-1.28.3-cst.config} | 0 ...diff => busybox-1.28.3-fix-df-uclibc.diff} | 0 ...busybox-1.28.3-flashcp-small-output.patch} | 0 ... busybox-1.28.3-hack-init-s-console.patch} | 0 ...1.1-mdev.diff => busybox-1.28.3-mdev.diff} | 0 ...ode.patch => busybox-1.28.3-unicode.patch} | 0 make/applications.mk | 17 +++++++------- make/versions.mk | 2 +- 10 files changed, 9 insertions(+), 33 deletions(-) delete mode 100644 archive-patches/busybox-1.28.1-no-unsafe-symlink-check.patch rename archive-patches/{busybox-1.21.1-changing-the-order-sys-tree-is-scanned-with-mdev.diff => busybox-1.28.3-changing-the-order-sys-tree-is-scanned-with-mdev.diff} (100%) rename archive-patches/{busybox-1.28.1-cst.config => busybox-1.28.3-cst.config} (100%) rename archive-patches/{busybox-1.26.2-fix-df-uclibc.diff => busybox-1.28.3-fix-df-uclibc.diff} (100%) rename archive-patches/{busybox-1.28.1-flashcp-small-output.patch => busybox-1.28.3-flashcp-small-output.patch} (100%) rename archive-patches/{busybox-1.18-hack-init-s-console.patch => busybox-1.28.3-hack-init-s-console.patch} (100%) rename archive-patches/{busybox-1.21.1-mdev.diff => busybox-1.28.3-mdev.diff} (100%) rename archive-patches/{busybox-1.28.1-unicode.patch => busybox-1.28.3-unicode.patch} (100%) diff --git a/archive-patches/busybox-1.28.1-no-unsafe-symlink-check.patch b/archive-patches/busybox-1.28.1-no-unsafe-symlink-check.patch deleted file mode 100644 index 0d4d998..0000000 --- a/archive-patches/busybox-1.28.1-no-unsafe-symlink-check.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/archival/libarchive/unsafe_symlink_target_org.c 2017-08-17 13:50:45.000000000 +0200 -+++ b/archival/libarchive/unsafe_symlink_target.c 2018-01-12 15:42:58.479995606 +0100 -@@ -16,8 +16,9 @@ - if (var) { - if (LONE_CHAR(var, '1')) - return 0; /* pretend it's safe */ -- return 1; /* "UNSAFE!" */ -+ return 0; /* "UNSAFE! */ - } -+#if 0 - bb_error_msg("skipping unsafe symlink to '%s' in archive," - " set %s=1 to extract", - target, -@@ -25,7 +26,8 @@ - ); - /* Prevent further messages */ - setenv("EXTRACT_UNSAFE_SYMLINKS", "0", 0); -- return 1; /* "UNSAFE!" */ -+#endif -+ return 0; /* "UNSAFE!" */ - } - - dot = target; diff --git a/archive-patches/busybox-1.21.1-changing-the-order-sys-tree-is-scanned-with-mdev.diff b/archive-patches/busybox-1.28.3-changing-the-order-sys-tree-is-scanned-with-mdev.diff similarity index 100% rename from archive-patches/busybox-1.21.1-changing-the-order-sys-tree-is-scanned-with-mdev.diff rename to archive-patches/busybox-1.28.3-changing-the-order-sys-tree-is-scanned-with-mdev.diff diff --git a/archive-patches/busybox-1.28.1-cst.config b/archive-patches/busybox-1.28.3-cst.config similarity index 100% rename from archive-patches/busybox-1.28.1-cst.config rename to archive-patches/busybox-1.28.3-cst.config diff --git a/archive-patches/busybox-1.26.2-fix-df-uclibc.diff b/archive-patches/busybox-1.28.3-fix-df-uclibc.diff similarity index 100% rename from archive-patches/busybox-1.26.2-fix-df-uclibc.diff rename to archive-patches/busybox-1.28.3-fix-df-uclibc.diff diff --git a/archive-patches/busybox-1.28.1-flashcp-small-output.patch b/archive-patches/busybox-1.28.3-flashcp-small-output.patch similarity index 100% rename from archive-patches/busybox-1.28.1-flashcp-small-output.patch rename to archive-patches/busybox-1.28.3-flashcp-small-output.patch diff --git a/archive-patches/busybox-1.18-hack-init-s-console.patch b/archive-patches/busybox-1.28.3-hack-init-s-console.patch similarity index 100% rename from archive-patches/busybox-1.18-hack-init-s-console.patch rename to archive-patches/busybox-1.28.3-hack-init-s-console.patch diff --git a/archive-patches/busybox-1.21.1-mdev.diff b/archive-patches/busybox-1.28.3-mdev.diff similarity index 100% rename from archive-patches/busybox-1.21.1-mdev.diff rename to archive-patches/busybox-1.28.3-mdev.diff diff --git a/archive-patches/busybox-1.28.1-unicode.patch b/archive-patches/busybox-1.28.3-unicode.patch similarity index 100% rename from archive-patches/busybox-1.28.1-unicode.patch rename to archive-patches/busybox-1.28.3-unicode.patch diff --git a/make/applications.mk b/make/applications.mk index 5523f73..0b1f5db 100755 --- a/make/applications.mk +++ b/make/applications.mk @@ -21,7 +21,7 @@ busyboxconfig: $(ARCHIVE)/busybox-$(BUSYBOX_VER).tar.bz2 | $(TARGETPREFIX) $(START_BUILD) $(UNTAR)/busybox-$(BUSYBOX_VER).tar.bz2 pushd $(BUILD_TMP)/busybox-$(BUSYBOX_VER) && \ - cp $(PATCHES)/busybox-1.22.1-hd1.config .config && \ + cp $(PATCHES)/busybox-1.28.3-cst.config .config && \ make ARCH=arm CROSS_COMPILE=$(TARGET)- menuconfig # Link against libtirpc so that we can leverage its RPC @@ -48,20 +48,19 @@ BUSYBOX_MAKE_OPTS = \ CONFIG_PREFIX="$(TARGETPREFIX)" ifeq ($(PLATFORM), $(filter $(PLATFORM), apollo kronos)) -DF_FIX = $(PATCH)/busybox-1.26.2-fix-df-uclibc.diff; +DF_FIX = $(PATCH)/busybox-1.28.3-fix-df-uclibc.diff; endif $(D)/busybox: $(D)/libtirpc $(ARCHIVE)/busybox-$(BUSYBOX_VER).tar.bz2 | $(TARGETPREFIX) $(START_BUILD) $(UNTAR)/busybox-$(BUSYBOX_VER).tar.bz2 pushd $(BUILD_TMP)/busybox-$(BUSYBOX_VER) && \ - $(PATCH)/busybox-1.18-hack-init-s-console.patch; \ - $(PATCH)/busybox-1.21.1-changing-the-order-sys-tree-is-scanned-with-mdev.diff; \ - $(PATCH)/busybox-1.21.1-mdev.diff; \ - $(PATCH)/busybox-1.28.1-unicode.patch; \ - $(PATCH)/busybox-1.28.1-flashcp-small-output.patch; \ - $(PATCH)/busybox-1.28.1-no-unsafe-symlink-check.patch; \ + $(PATCH)/busybox-1.28.3-hack-init-s-console.patch; \ + $(PATCH)/busybox-1.28.3-changing-the-order-sys-tree-is-scanned-with-mdev.diff; \ + $(PATCH)/busybox-1.28.3-mdev.diff; \ + $(PATCH)/busybox-1.28.3-unicode.patch; \ + $(PATCH)/busybox-1.28.3-flashcp-small-output.patch; \ $(DF_FIX) \ - cp $(PATCHES)/busybox-1.28.1-cst.config .config && \ + cp $(PATCHES)/busybox-1.28.3-cst.config .config && \ $(BUSYBOX_MAKE_ENV) $(MAKE) busybox $(BUSYBOX_MAKE_OPTS) && \ $(BUSYBOX_MAKE_ENV) $(MAKE) install $(BUSYBOX_MAKE_OPTS) $(REMOVE)/busybox-$(BUSYBOX_VER) diff --git a/make/versions.mk b/make/versions.mk index c12e8ad..f721959 100644 --- a/make/versions.mk +++ b/make/versions.mk @@ -10,7 +10,7 @@ AUTOFS5_MINOR = 1 AUTOFS5_MICRO = 4 AUTOFS5_VER = $(AUTOFS5_MAJOR).$(AUTOFS5_MINOR).$(AUTOFS5_MICRO) -BUSYBOX_VER = 1.28.1 +BUSYBOX_VER = 1.28.3 # cortex-strings; optimized string routines for ARM and AArch64 CORTEX_STRINGS_VER = 48fd30c -- 2.39.5