busybox: bump version

Bump version and update busybox Config.in files.
Also use the HTTPS URL for downloading.

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
[mol: add selinux build fix]
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

6 files changed, 35 insertions, 7 deletions

diff --git a/patches/busybox-1.24.2/0200-reactivate-check-for-tty.patch b/patches/busybox-1.25.1/0200-reactivate-check-for-tty.patch
index 55869e9fe..55869e9fe 100644
--- a/patches/busybox-1.24.2/0200-reactivate-check-for-tty.patch
+++ b/patches/busybox-1.25.1/0200-reactivate-check-for-tty.patch
diff --git a/patches/busybox-1.24.2/0201-Fix-the-format-warning-when-building-applets-usage_p.patch b/patches/busybox-1.25.1/0201-Fix-the-format-warning-when-building-applets-usage_p.patch
index 98ad36e1d..98ad36e1d 100644
--- a/patches/busybox-1.24.2/0201-Fix-the-format-warning-when-building-applets-usage_p.patch
+++ b/patches/busybox-1.25.1/0201-Fix-the-format-warning-when-building-applets-usage_p.patch
diff --git a/patches/busybox-1.24.2/0202-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch b/patches/busybox-1.25.1/0202-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch
index d3027e0c2..4148a80e0 100644
--- a/patches/busybox-1.24.2/0202-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch
+++ b/patches/busybox-1.25.1/0202-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch
@@ -10,10 +10,10 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  1 file changed, 1 insertion(+)
 
 diff --git a/Makefile.flags b/Makefile.flags
-index 307afa7f5212..d68c9c4e97c6 100644
+index 65021de25ffb..b9d0abb0dce5 100644
 --- a/Makefile.flags
 +++ b/Makefile.flags
-@@ -141,6 +141,7 @@ ifeq ($(CONFIG_SELINUX),y)
+@@ -153,6 +153,7 @@ ifeq ($(CONFIG_SELINUX),y)
  SELINUX_PC_MODULES = libselinux libsepol
  $(eval $(call pkg_check_modules,SELINUX,$(SELINUX_PC_MODULES)))
  CPPFLAGS += $(SELINUX_CFLAGS)
diff --git a/patches/busybox-1.24.2/0203-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch b/patches/busybox-1.25.1/0203-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch
index 08f12b500..94bb37c8e 100644
--- a/patches/busybox-1.24.2/0203-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch
+++ b/patches/busybox-1.25.1/0203-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch
@@ -9,10 +9,10 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  1 file changed, 14 insertions(+), 3 deletions(-)
 
 diff --git a/scripts/trylink b/scripts/trylink
-index 5da494fbba4c..66e66139b5bd 100755
+index 145df9959091..3f3000141627 100755
 --- a/scripts/trylink
 +++ b/scripts/trylink
-@@ -241,7 +241,12 @@ if test "$CONFIG_BUILD_LIBBUSYBOX" = y; then
+@@ -264,7 +264,12 @@ if test "$CONFIG_BUILD_LIBBUSYBOX" = y; then
  	cat $EXE.out
  	exit 1
      }
@@ -26,7 +26,7 @@ index 5da494fbba4c..66e66139b5bd 100755
      chmod a+x "$sharedlib_dir/libbusybox.so.$BB_VER"
      echo "libbusybox: $sharedlib_dir/libbusybox.so.$BB_VER"
  fi
-@@ -262,7 +267,11 @@ if test "$CONFIG_FEATURE_SHARED_BUSYBOX" = y; then
+@@ -285,7 +290,11 @@ if test "$CONFIG_FEATURE_SHARED_BUSYBOX" = y; then
  	cat $EXE.out
  	exit 1
      }
@@ -39,7 +39,7 @@ index 5da494fbba4c..66e66139b5bd 100755
      echo "busybox linked against libbusybox: $sharedlib_dir/busybox"
  fi
  
-@@ -299,7 +308,9 @@ int main(int argc, char **argv)
+@@ -322,7 +331,9 @@ int main(int argc, char **argv)
  	    exit 1
  	}
  	rm -- "$sharedlib_dir/applet.c" $EXE.out
diff --git a/patches/busybox-1.25.1/0204-setfiles-fix-build-error.patch b/patches/busybox-1.25.1/0204-setfiles-fix-build-error.patch
new file mode 100644
index 000000000..fb25b8ac4
--- /dev/null
+++ b/patches/busybox-1.25.1/0204-setfiles-fix-build-error.patch
@@ -0,0 +1,27 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Mon, 28 Nov 2016 10:26:54 +0100
+Subject: [PATCH] setfiles: fix build error
+
+Otherwise building fails with:
+
+[...]
+selinux/setfiles.c:150:22: error: 'bb_common_bufsiz1' undeclared (first use in this function)
+[...]
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ selinux/setfiles.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/selinux/setfiles.c b/selinux/setfiles.c
+index 51a7e63bd741..d8083d4fd580 100644
+--- a/selinux/setfiles.c
++++ b/selinux/setfiles.c
+@@ -46,6 +46,7 @@
+ //usage:     "\n		if it has changed"
+ 
+ #include "libbb.h"
++#include "common_bufsiz.h"
+ #if ENABLE_FEATURE_SETFILES_CHECK_OPTION
+ #include <sepol/sepol.h>
+ #endif
diff --git a/patches/busybox-1.24.2/series b/patches/busybox-1.25.1/series
index 84c80aa6e..c4176a290 100644
--- a/patches/busybox-1.24.2/series
+++ b/patches/busybox-1.25.1/series
@@ -7,4 +7,5 @@
 0201-Fix-the-format-warning-when-building-applets-usage_p.patch
 0202-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch
 0203-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch
-# 0036b420b1a49106a872780e90251289  - git-ptx-patches magic
+0204-setfiles-fix-build-error.patch
+# 85c3e49d1a3d51e934d942443f99beba  - git-ptx-patches magic