- merged 1.31.1 from PLD

diff --git a/busybox-1.31.1-stime-fix.patch b/busybox-1.31.1-stime-fix.patch
new file mode 100644 (file)
index 0000000..15af327
--- /dev/null
+++ b/busybox-1.31.1-stime-fix.patch
@@ -0,0 +1,24 @@
+diff -up busybox-1.31.1/libbb/Kbuild.src.stime busybox-1.31.1/libbb/Kbuild.src
+--- busybox-1.31.1/libbb/Kbuild.src.stime      2019-11-13 17:08:22.808371597 -0500
++++ busybox-1.31.1/libbb/Kbuild.src    2019-11-13 17:08:50.154882529 -0500
+@@ -198,3 +198,6 @@ lib-$(CONFIG_FEATURE_FIND_REGEX) += xreg
+ 
+ # Add the experimental logging functionality, only used by zcip
+ lib-$(CONFIG_ZCIP) += logenv.o
++
++lib-$(CONFIG_DATE) += stime.o
++lib-$(CONFIG_RDATE) += stime.o
+diff -up busybox-1.31.1/libbb/stime.c.stime busybox-1.31.1/libbb/stime.c
+--- busybox-1.31.1/libbb/stime.c.stime 2019-11-13 17:07:06.905723262 -0500
++++ busybox-1.31.1/libbb/stime.c       2019-11-13 17:07:51.769924328 -0500
+@@ -0,0 +1,10 @@
++#include <time.h>
++#include <sys/time.h>
++
++int stime(const time_t *t) {
++  struct timeval tv;
++
++  tv.tv_sec = *t;
++  tv.tv_usec = 0;
++  return settimeofday(&tv, NULL);
++}

diff --git a/busybox-initrd.config b/busybox-initrd.config
index 9a8052f6b5c9591176900869a53fa1fd78fe3f88..824c4d2a789ba101371a68db92d816d1b93d42c8 100644 (file)
--- a/busybox-initrd.config
+++ b/busybox-initrd.config
@@ -44,6 +44,7 @@ CONFIG_BUSYBOX=y
 CONFIG_BUSYBOX_EXEC_PATH="/bin/busybox"
 CONFIG_FEATURE_SHOW_SCRIPT=n
 CONFIG_FEATURE_SYSLOG=y
+CONFIG_FEATURE_SYSLOG_INFO=y
 CONFIG_FEATURE_HAVE_RPC=y
 
 #
@@ -582,6 +583,7 @@ CONFIG_LOSETUP=y
 # CONFIG_LSUSB is not set
 CONFIG_MDEV=y
 CONFIG_FEATURE_MDEV_CONF=y
+CONFIG_FEATURE_MDEV_DAEMON=y
 CONFIG_FEATURE_MDEV_RENAME=y
 CONFIG_FEATURE_MDEV_EXEC=y
 CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y
@@ -675,6 +677,7 @@ CONFIG_FEATURE_MOUNT_LOOP_CREATE=y
 # CONFIG_I2CSET is not set
 # CONFIG_I2CDUMP is not set
 # CONFIG_I2CDETECT is not set
+# CONFIG_I2CTRANSFER is not set
 # CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
 # CONFIG_CRONTAB is not set
 # CONFIG_DC is not set
@@ -740,6 +743,7 @@ CONFIG_PARTPROBE=y
 # CONFIG_FEATURE_TASKSET_FANCY is not set
 # CONFIG_TIME is not set
 # CONFIG_TIMEOUT is not set
+# CONFIG_TS is not set
 # CONFIG_TTYSIZE is not set
 # CONFIG_UBIATTACH is not set
 # CONFIG_UBIDETACH is not set
@@ -760,6 +764,7 @@ CONFIG_FEATURE_IPV6=y
 CONFIG_FEATURE_HWIB=y
 # CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set
 CONFIG_VERBOSE_RESOLUTION_ERRORS=y
+CONFIG_FEATURE_TLS_SHA1=y
 # CONFIG_ARP is not set
 # CONFIG_ARPING is not set
 # CONFIG_BRCTL is not set
@@ -880,10 +885,13 @@ CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
 CONFIG_FEATURE_UDHCP_8021Q=y
 # CONFIG_VCONFIG is not set
-# CONFIG_WGET is not set
-# CONFIG_FEATURE_WGET_STATUSBAR is not set
-# CONFIG_FEATURE_WGET_AUTHENTICATION is not set
-# CONFIG_FEATURE_WGET_LONG_OPTIONS is not set
+CONFIG_WGET=y
+CONFIG_FEATURE_WGET_STATUSBAR=y
+CONFIG_FEATURE_WGET_AUTHENTICATION=y
+CONFIG_FEATURE_WGET_HTTPS=y
+CONFIG_FEATURE_WGET_LONG_OPTIONS=y
+CONFIG_FEATURE_WGET_OPENSSL=y
+CONFIG_FEATURE_WGET_TIMEOUT=y
 # CONFIG_ZCIP is not set
 # CONFIG_TCPSVD is not set
 # CONFIG_UDPSVD is not set
@@ -978,6 +986,7 @@ CONFIG_ASH_INTERNAL_GLOB=y
 # CONFIG_MSH is not set
 CONFIG_FEATURE_SH_MATH=y
 CONFIG_FEATURE_SH_MATH_64=y
+CONFIG_FEATURE_SH_MATH_BASE=y
 
 #
 # Bourne Shell Options

diff --git a/busybox.config b/busybox.config
index 85af1344a1ef0e307f728bd94cdaa4d6f6d9bd27..1a1ca119a5d99d4cd1391c97e1b03cec5af8b9b1 100644 (file)
--- a/busybox.config
+++ b/busybox.config
@@ -48,6 +48,7 @@ CONFIG_FEATURE_SUID_CONFIG_QUIET=y
 CONFIG_FEATURE_PREFER_APPLETS=y
 CONFIG_BUSYBOX_EXEC_PATH="/bin/busybox"
 CONFIG_FEATURE_SYSLOG=y
+CONFIG_FEATURE_SYSLOG_INFO=y
 CONFIG_FEATURE_HAVE_RPC=y
 CONFIG_PLATFORM_LINUX=y
 
@@ -668,6 +669,7 @@ CONFIG_FEATURE_MDEV_RENAME=y
 CONFIG_FEATURE_MDEV_RENAME_REGEXP=y
 CONFIG_FEATURE_MDEV_EXEC=y
 CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y
+CONFIG_FEATURE_MDEV_DAEMON=y
 CONFIG_MKE2FS=y
 CONFIG_MKSWAP=y
 CONFIG_FEATURE_MKSWAP_UUID=y
@@ -777,6 +779,7 @@ CONFIG_I2CGET=y
 CONFIG_I2CSET=y
 CONFIG_I2CDUMP=y
 CONFIG_I2CDETECT=y
+CONFIG_I2CTRANSFER=y
 CONFIG_DC=y
 CONFIG_FEATURE_DC_LIBM=y
 # CONFIG_DEVFSD is not set
@@ -837,6 +840,7 @@ CONFIG_TASKSET=y
 CONFIG_FEATURE_TASKSET_FANCY=y
 CONFIG_TIME=y
 CONFIG_TIMEOUT=y
+CONFIG_TS=y
 CONFIG_TTYSIZE=y
 # CONFIG_UBIATTACH is not set
 # CONFIG_UBIDETACH is not set
@@ -855,7 +859,7 @@ CONFIG_FEATURE_IPV6=y
 CONFIG_FEATURE_UNIX_LOCAL=y
 # CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set
 CONFIG_VERBOSE_RESOLUTION_ERRORS=y
-# CONFIG_FEATURE_TLS_SHA1 is not set
+CONFIG_FEATURE_TLS_SHA1=y
 CONFIG_ARP=y
 CONFIG_ARPING=y
 CONFIG_BRCTL=y
@@ -973,6 +977,7 @@ CONFIG_FEATURE_TFTP_PUT=y
 CONFIG_FEATURE_TFTP_BLOCKSIZE=y
 # CONFIG_TFTP_DEBUG is not set
 CONFIG_FEATURE_TFTP_PROGRESS_BAR=y
+CONFIG_FEATURE_TFTP_HPA_COMPAT=y
 CONFIG_TRACEROUTE=y
 # CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
 CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE=y
@@ -998,7 +1003,7 @@ CONFIG_VCONFIG=y
 CONFIG_WGET=y
 CONFIG_FEATURE_WGET_STATUSBAR=y
 CONFIG_FEATURE_WGET_AUTHENTICATION=y
-# CONFIG_FEATURE_WGET_LONG_OPTIONS is not set
+CONFIG_FEATURE_WGET_LONG_OPTIONS=y
 CONFIG_FEATURE_WGET_TIMEOUT=y
 CONFIG_FEATURE_WGET_OPENSSL=y
 CONFIG_FEATURE_WGET_SSL_HELPER=y
@@ -1181,6 +1186,7 @@ CONFIG_HUSH_TIMES=y
 CONFIG_MSH=y
 CONFIG_FEATURE_SH_MATH=y
 CONFIG_FEATURE_SH_MATH_64=y
+CONFIG_FEATURE_SH_MATH_BASE=y
 
 #
 # Bourne Shell Options

diff --git a/busybox.spec b/busybox.spec
index faa3f5ff4226cfe7479252ae08ae9d644362a300..447e3c3d5d5afc408e01d88a16d46caa398d6b89 100644 (file)
--- a/busybox.spec
+++ b/busybox.spec
@@ -41,12 +41,12 @@ 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.30.0
-Release:       1
+Version:       1.31.1
+Release:       2
 License:       GPL v2
 Group:         Applications
 Source0:       http://www.busybox.net/downloads/%{name}-%{version}.tar.bz2
-# Source0-md5: 648bab2ee71e8f98ec535ac05d4b024d
+# Source0-md5: 70913edaf2263a157393af07565c17f0
 Source1:       %{name}.config
 Source2:       %{name}-initrd.config
 %{?with_altconfig:Source3:     %{cfgfile}}
@@ -58,6 +58,7 @@ Patch4:               %{name}-kernel_headers.patch
 Patch5:                %{name}-insmod-morearchs.patch
 Patch6:                %{name}-dhcp.patch
 Patch7:                %{name}-fix_64_archs.patch
+Patch8:                busybox-1.31.1-stime-fix.patch
 Patch9:                %{name}-ash-export-PATH.patch
 URL:           http://www.busybox.net/
 BuildRequires: gcc >= 3.2
@@ -167,6 +168,7 @@ Statycznie skonsolidowany busybox dla initrd.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 %patch9 -p1
 
 %build
@@ -177,7 +179,7 @@ install %{SOURCE2} .config
 %{__make} \
        %{?with_verbose:V=1} \
        CROSS_CFLAGS="%{rpmcflags} -Os -D_BSD_SOURCE" \
-       LDFLAGS="%{rpmldflags} -static" \
+       LDFLAGS="%{rpmldflags} -static -Wl,-z,noexecstack" \
 %if %{with dietlibc}
        LIBRARIES="-lrpc" \
        CC="diet %{__cc}"
@@ -208,7 +210,7 @@ install %{SOURCE1} .config
 %{__make} \
        %{?with_verbose:V=1} \
        CROSS_CFLAGS="%{rpmcflags} -Os -D_BSD_SOURCE" \
-       LDFLAGS="%{rpmldflags} -static" \
+       LDFLAGS="%{rpmldflags} -static -Wl,-z,noexecstack" \
 %if %{with dietlibc}
        LIBRARIES="-lrpc" \
        CC="diet %{__cc}"
@@ -234,7 +236,7 @@ mv -f busybox built/busybox.static
        %{?with_verbose:V=1} \
        %{CrossOpts} \
        CFLAGS_EXTRA="%{rpmcflags}" \
-       LDFLAGS="%{rpmldflags}" \
+       LDFLAGS="%{rpmldflags} -Wl,-z,noexecstack" \
        CC="%{__cc}"
 %{__make} busybox.links docs/busybox.1
 %endif