- updated to 1.35.0, still fails to link

diff --git a/busybox-initrd.config b/busybox-initrd.config
index 05e391afb80e9dff0299611d52213888dad72d0d..3c3892384215490de8e1926e034d3cc6e58c2dc3 100644 (file)
--- a/busybox-initrd.config
+++ b/busybox-initrd.config
@@ -61,6 +61,7 @@ CONFIG_CROSS_COMPILER_PREFIX=""
 CONFIG_SYSROOT=""
 CONFIG_EXTRA_CFLAGS=""
 CONFIG_EXTRA_LDFLAGS=""
+CONFIG_EXTRA_LDLIBS=""
 
 #
 # Debugging Options

diff --git a/busybox.config b/busybox.config
index 290c057380bc582e73267f7d39625299737201de..61cf0d593db94be6f1a14c34378a2bc99029a1b7 100644 (file)
--- a/busybox.config
+++ b/busybox.config
@@ -66,6 +66,7 @@ CONFIG_CROSS_COMPILER_PREFIX=""
 CONFIG_SYSROOT=""
 CONFIG_EXTRA_CFLAGS=""
 CONFIG_EXTRA_LDFLAGS=""
+CONFIG_EXTRA_LDLIBS=""
 
 #
 # Debugging Options
@@ -153,6 +154,8 @@ CONFIG_BZIP2_SMALL=8
 CONFIG_CPIO=y
 CONFIG_FEATURE_CPIO_O=y
 CONFIG_FEATURE_CPIO_P=y
+CONFIG_FEATURE_CPIO_IGNORE_DEVNO=y
+CONFIG_FEATURE_CPIO_RENUMBER_INODES=y
 CONFIG_DPKG=y
 CONFIG_DPKG_DEB=y
 CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY=y
@@ -193,6 +196,7 @@ CONFIG_FEATURE_UNZIP_CDF=y
 CONFIG_FEATURE_UNZIP_BZIP2=y
 CONFIG_FEATURE_UNZIP_LZMA=y
 CONFIG_FEATURE_UNZIP_XZ=y
+CONFIG_FEATURE_TIMEZONE=y
 
 #
 # Coreutils
@@ -462,7 +466,11 @@ CONFIG_FEATURE_ALLOW_EXEC=y
 CONFIG_FIND=y
 CONFIG_FEATURE_FIND_PRINT0=y
 CONFIG_FEATURE_FIND_MTIME=y
+CONFIG_FEATURE_FIND_ATIME=y
+CONFIG_FEATURE_FIND_CTIME=y
 CONFIG_FEATURE_FIND_MMIN=y
+CONFIG_FEATURE_FIND_AMIN=y
+CONFIG_FEATURE_FIND_CMIN=y
 CONFIG_FEATURE_FIND_PERM=y
 CONFIG_FEATURE_FIND_TYPE=y
 CONFIG_FEATURE_FIND_EXECUTABLE=y
@@ -470,6 +478,7 @@ CONFIG_FEATURE_FIND_XDEV=y
 CONFIG_FEATURE_FIND_MAXDEPTH=y
 CONFIG_FEATURE_FIND_NEWER=y
 CONFIG_FEATURE_FIND_INUM=y
+CONFIG_FEATURE_FIND_SAMEFILE=y
 CONFIG_FEATURE_FIND_EXEC=y
 CONFIG_FEATURE_FIND_EXEC_PLUS=y
 CONFIG_FEATURE_FIND_USER=y
@@ -892,6 +901,7 @@ CONFIG_FTPPUT=y
 CONFIG_HOSTNAME=y
 CONFIG_DNSDOMAINNAME=y
 CONFIG_HTTPD=y
+CONFIG_FEATURE_HTTPD_PORT_DEFAULT=80
 CONFIG_FEATURE_HTTPD_RANGES=y
 CONFIG_FEATURE_HTTPD_SETUID=y
 CONFIG_FEATURE_HTTPD_BASIC_AUTH=y
@@ -985,6 +995,7 @@ CONFIG_FEATURE_TELNET_AUTOLOGIN=y
 CONFIG_FEATURE_TELNET_WIDTH=y
 CONFIG_TELNETD=y
 CONFIG_FEATURE_TELNETD_STANDALONE=y
+CONFIG_FEATURE_TELNETD_PORT_DEFAULT=23
 CONFIG_FEATURE_TELNETD_INETD_WAIT=y
 CONFIG_TFTP=y
 CONFIG_TFTPD=y

diff --git a/busybox.spec b/busybox.spec
index d114b836010744bfab74e3047d86245aae0d095a..4076bdb12cd6459a5f4471c11ed5a60e3f5029d9 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.34.1
+Version:       1.35.0
 Release:       0.1
 License:       GPL v2
 Group:         Applications
 Source0:       http://www.busybox.net/downloads/%{name}-%{version}.tar.bz2
-# Source0-md5: 5ad7368a73d12b8c4f8881bf7afb3d82
+# Source0-md5: 585949b1dd4292b604b7d199866e9913
 Source1:       %{name}.config
 Source2:       %{name}-initrd.config
 %{?with_altconfig:Source3:     %{cfgfile}}

diff --git a/x32.patch b/x32.patch
index 0be941e011e6523efe33ddadffbfbed4a49de35b..2874cb0043c76c799bcf21301cc6163319f43076 100644 (file)
--- a/x32.patch
+++ b/x32.patch
@@ -1,20 +1,19 @@
---- busybox-1.22.1/include/libbb.h.orig        2015-01-26 19:38:58.762414035 +0000
-+++ busybox-1.22.1/include/libbb.h     2015-01-26 19:39:20.749079926 +0000
-@@ -232,6 +232,13 @@
- #else
- /* CONFIG_LFS is off */
- # if UINT_MAX == 0xffffffff
+diff -ur busybox-1.35.0.orig/include/libbb.h busybox-1.35.0/include/libbb.h
+--- busybox-1.35.0.orig/include/libbb.h        2021-12-26 16:53:26.000000000 +0000
++++ busybox-1.35.0/include/libbb.h     2022-04-03 22:02:20.060835065 +0000
+@@ -312,11 +312,19 @@
+  * gcc will throw warnings on printf("%d", off_t)... Have to use %ld etc.
+  */
+ # if UINT_MAX == ULONG_MAX
 +#ifdef __ILP32__
 +typedef unsigned long long uoff_t;
-+#  define XATOOFF(a) xatoull_range((a), 0, LLONG_MAX)
-+#  define BB_STRTOOFF bb_strtoull
++#  define XATOOFF(a) xatoull_range((a), 0, LLONG_MA_STRTOOFF bb_strX)
++#  define BBtoull
 +#  define STRTOOFF strtoull
 +#  define OFF_FMT "ll"
 +#else
- /* While sizeof(off_t) == sizeof(int), off_t is typedef'ed to long anyway.
-  * gcc will throw warnings on printf("%d", off_t). Crap... */
  typedef unsigned long uoff_t;
-@@ -239,6 +246,7 @@
+ #  define XATOOFF(a) xatoi_positive(a)
  #  define BB_STRTOOFF bb_strtou
  #  define STRTOOFF strtol
  #  define OFF_FMT "l"