From 9da16c7fa11492b1b7bf4999117c85fa540a655c812be726f618b5a978be9826 Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk Date: Tue, 26 Oct 2021 14:04:43 +0000 Subject: [PATCH] Accepting request 926821 from home:coolo:branches:openSUSE:Factory - Remove the duplicated config entries and construct the snippets on the fly based on the main config. This way it's easier to keep track of what's different - Update to 1.34.1: * build system: use SOURCE_DATE_EPOCH for timestamp if available * many bug fixes and new features * touch: make FEATURE_TOUCH_NODEREF unconditional OBS-URL: https://build.opensuse.org/request/show/926821 OBS-URL: https://build.opensuse.org/package/show/Base:System/busybox?expand=0&rev=91 --- busybox-1.33.1.tar.bz2 | 3 - busybox-1.33.1.tar.bz2.sig | Bin 95 -> 0 bytes busybox-1.34.1.tar.bz2 | 3 + busybox-1.34.1.tar.bz2.sig | Bin 0 -> 121 bytes busybox-static.config | 1193 ------------------------------- busybox-warewulf3.config | 1193 ------------------------------- busybox.changes | 15 + busybox.config | 35 +- busybox.config.static | 17 + busybox.config.static.warewulf3 | 4 + busybox.spec | 18 +- 11 files changed, 72 insertions(+), 2409 deletions(-) delete mode 100644 busybox-1.33.1.tar.bz2 delete mode 100644 busybox-1.33.1.tar.bz2.sig create mode 100644 busybox-1.34.1.tar.bz2 create mode 100644 busybox-1.34.1.tar.bz2.sig delete mode 100644 busybox-static.config delete mode 100644 busybox-warewulf3.config create mode 100644 busybox.config.static create mode 100644 busybox.config.static.warewulf3 diff --git a/busybox-1.33.1.tar.bz2 b/busybox-1.33.1.tar.bz2 deleted file mode 100644 index a73aae3..0000000 --- a/busybox-1.33.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:12cec6bd2b16d8a9446dd16130f2b92982f1819f6e1c5f5887b6db03f5660d28 -size 2453694 diff --git a/busybox-1.33.1.tar.bz2.sig b/busybox-1.33.1.tar.bz2.sig deleted file mode 100644 index a7439557f4d75af2a4239ea5fed8c4e42ef28e265bc08234efe439c58e2ef807..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 95 zcmeB(WnmCxVvrS6WI6fLF~97Y!0iijS@_+z^MtNBIW3x%DPe;3KL##N0hkD1AH#wh wQa^5%2tS^Eqp|7i_b*3(FS_Fr$}qoRkH6CYSppk#6?WV@&NuI&@ZB#H00*ZlMgRZ+ diff --git a/busybox-1.34.1.tar.bz2 b/busybox-1.34.1.tar.bz2 new file mode 100644 index 0000000..e12cf2c --- /dev/null +++ b/busybox-1.34.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:415fbd89e5344c96acf449d94a6f956dbed62e18e835fc83e064db33a34bd549 +size 2476932 diff --git a/busybox-1.34.1.tar.bz2.sig b/busybox-1.34.1.tar.bz2.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..bef089039e13b0cba5db19f4b5c1fbbf6c351f7a60306329cb8058345f1890f6 GIT binary patch literal 121 zcmeAuXJHUzVlWp|WI6fLF~97Y!0iijS@_+z^MtNBIW3x%DKShgT~ekjB~dRYGq1G5 zAw54oJts9cF*8RmIX{ + +- Remove the duplicated config entries and construct the snippets + on the fly based on the main config. This way it's easier to + keep track of what's different + +------------------------------------------------------------------- +Thu Oct 21 16:36:27 UTC 2021 - Stephan Kulow + +- Update to 1.34.1: + * build system: use SOURCE_DATE_EPOCH for timestamp if available + * many bug fixes and new features + * touch: make FEATURE_TOUCH_NODEREF unconditional + ------------------------------------------------------------------- Sat Oct 9 13:16:11 UTC 2021 - Egbert Eich diff --git a/busybox.config b/busybox.config index 4bf8ef8..4539dc8 100644 --- a/busybox.config +++ b/busybox.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.32.0 -# Wed Jul 22 15:14:27 2020 +# Busybox version: 1.34.1 +# Thu Oct 21 18:43:16 2021 # CONFIG_HAVE_DOT_CONFIG=y @@ -36,7 +36,6 @@ CONFIG_SELINUX=y # CONFIG_FEATURE_CLEAN_UP is not set # CONFIG_FEATURE_SYSLOG_INFO is not set CONFIG_FEATURE_SYSLOG=y -CONFIG_PLATFORM_LINUX=y # # Build Options @@ -208,11 +207,13 @@ CONFIG_CHOWN=y CONFIG_FEATURE_CHOWN_LONG_OPTIONS=y CONFIG_CHROOT=y CONFIG_CKSUM=y +CONFIG_CRC32=y CONFIG_COMM=y CONFIG_CP=y CONFIG_FEATURE_CP_LONG_OPTIONS=y CONFIG_FEATURE_CP_REFLINK=y CONFIG_CUT=y +CONFIG_FEATURE_CUT_REGEX=y CONFIG_DATE=y CONFIG_FEATURE_DATE_ISOFMT=y # CONFIG_FEATURE_DATE_NANO is not set @@ -317,7 +318,6 @@ CONFIG_TEST2=y CONFIG_FEATURE_TEST_64=y CONFIG_TIMEOUT=y CONFIG_TOUCH=y -CONFIG_FEATURE_TOUCH_NODEREF=y CONFIG_FEATURE_TOUCH_SUSV3=y CONFIG_TR=y CONFIG_FEATURE_TR_CLASSES=y @@ -337,10 +337,10 @@ CONFIG_BASE64=y CONFIG_UUENCODE=y CONFIG_WC=y CONFIG_FEATURE_WC_LARGE=y -CONFIG_WHOAMI=y CONFIG_WHO=y CONFIG_W=y CONFIG_USERS=y +CONFIG_WHOAMI=y CONFIG_YES=y # @@ -425,6 +425,7 @@ CONFIG_VI=y CONFIG_FEATURE_VI_MAX_LEN=4096 CONFIG_FEATURE_VI_8BIT=y CONFIG_FEATURE_VI_COLON=y +CONFIG_FEATURE_VI_COLON_EXPAND=y CONFIG_FEATURE_VI_YANKMARK=y CONFIG_FEATURE_VI_SEARCH=y # CONFIG_FEATURE_VI_REGEX_SEARCH is not set @@ -438,6 +439,7 @@ CONFIG_FEATURE_VI_ASK_TERMINAL=y CONFIG_FEATURE_VI_UNDO=y CONFIG_FEATURE_VI_UNDO_QUEUE=y CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=256 +CONFIG_FEATURE_VI_VERBOSE_STATUS=y CONFIG_FEATURE_ALLOW_EXEC=y # @@ -515,10 +517,10 @@ CONFIG_FEATURE_SHADOWPASSWDS=y # CONFIG_USE_BB_SHADOW is not set # CONFIG_USE_BB_CRYPT is not set # CONFIG_USE_BB_CRYPT_SHA is not set -CONFIG_ADDGROUP=y -CONFIG_FEATURE_ADDUSER_TO_GROUP=y # CONFIG_ADD_SHELL is not set # CONFIG_REMOVE_SHELL is not set +CONFIG_ADDGROUP=y +CONFIG_FEATURE_ADDUSER_TO_GROUP=y CONFIG_ADDUSER=y # CONFIG_FEATURE_CHECK_NAMES is not set CONFIG_LAST_ID=65535 @@ -625,7 +627,6 @@ CONFIG_FLOCK=y CONFIG_GETOPT=y CONFIG_FEATURE_GETOPT_LONG=y CONFIG_HEXDUMP=y -CONFIG_FEATURE_HEXDUMP_REVERSE=y # CONFIG_HD is not set CONFIG_XXD=y # CONFIG_HWCLOCK is not set @@ -745,6 +746,7 @@ CONFIG_FEATURE_VOLUMEID_XFS=y # Miscellaneous Utilities # # CONFIG_ADJTIMEX is not set +CONFIG_ASCII=y # CONFIG_BBCONFIG is not set # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set CONFIG_BC=y @@ -778,10 +780,10 @@ CONFIG_FEATURE_CROND_DIR="" # CONFIG_FEATURE_DEVFS is not set # CONFIG_DEVMEM is not set # CONFIG_FBSPLASH is not set -# CONFIG_FLASHCP is not set # CONFIG_FLASH_ERASEALL is not set # CONFIG_FLASH_LOCK is not set # CONFIG_FLASH_UNLOCK is not set +# CONFIG_FLASHCP is not set # CONFIG_HDPARM is not set # CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set # CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set @@ -831,15 +833,16 @@ CONFIG_STRINGS=y CONFIG_TIME=y # CONFIG_TS is not set CONFIG_TTYSIZE=y -# CONFIG_UBIRENAME is not set # CONFIG_UBIATTACH is not set # CONFIG_UBIDETACH is not set # CONFIG_UBIMKVOL is not set # CONFIG_UBIRMVOL is not set # CONFIG_UBIRSVOL is not set # CONFIG_UBIUPDATEVOL is not set +# CONFIG_UBIRENAME is not set # CONFIG_VOLNAME is not set # CONFIG_WATCHDOG is not set +# CONFIG_FEATURE_WATCHDOG_OPEN_TWICE is not set # # Networking Utilities @@ -877,6 +880,10 @@ CONFIG_DNSDOMAINNAME=y # CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set # CONFIG_FEATURE_HTTPD_PROXY is not set # CONFIG_FEATURE_HTTPD_GZIP is not set +# CONFIG_FEATURE_HTTPD_ETAG is not set +# CONFIG_FEATURE_HTTPD_LAST_MODIFIED is not set +# CONFIG_FEATURE_HTTPD_DATE is not set +# CONFIG_FEATURE_HTTPD_ACL_IP is not set CONFIG_IFCONFIG=y CONFIG_FEATURE_IFCONFIG_STATUS=y CONFIG_FEATURE_IFCONFIG_SLIP=y @@ -974,6 +981,7 @@ CONFIG_VCONFIG=y CONFIG_WGET=y CONFIG_FEATURE_WGET_LONG_OPTIONS=y CONFIG_FEATURE_WGET_STATUSBAR=y +CONFIG_FEATURE_WGET_FTP=y CONFIG_FEATURE_WGET_AUTHENTICATION=y CONFIG_FEATURE_WGET_TIMEOUT=y CONFIG_FEATURE_WGET_HTTPS=y @@ -995,6 +1003,7 @@ CONFIG_UDHCPC_DEFAULT_SCRIPT="" # CONFIG_FEATURE_UDHCPC6_RFC4704 is not set # CONFIG_FEATURE_UDHCPC6_RFC4833 is not set # CONFIG_FEATURE_UDHCPC6_RFC5970 is not set +CONFIG_UDHCPC_DEFAULT_INTERFACE="" # CONFIG_FEATURE_UDHCP_PORT is not set CONFIG_UDHCP_DEBUG=0 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0 @@ -1079,6 +1088,10 @@ CONFIG_SV_DEFAULT_SERVICE_DIR="" # CONFIG_SVC is not set # CONFIG_SVOK is not set # CONFIG_SVLOGD is not set + +# +# SELinux Utilities +# CONFIG_CHCON=y CONFIG_GETENFORCE=y CONFIG_GETSEBOOL=y @@ -1126,8 +1139,8 @@ CONFIG_HUSH=y CONFIG_SHELL_HUSH=y CONFIG_HUSH_BASH_COMPAT=y CONFIG_HUSH_BRACE_EXPANSION=y -CONFIG_HUSH_LINENO_VAR=y # CONFIG_HUSH_BASH_SOURCE_CURDIR is not set +CONFIG_HUSH_LINENO_VAR=y CONFIG_HUSH_INTERACTIVE=y CONFIG_HUSH_SAVEHISTORY=y CONFIG_HUSH_JOB=y diff --git a/busybox.config.static b/busybox.config.static new file mode 100644 index 0000000..69a2e62 --- /dev/null +++ b/busybox.config.static @@ -0,0 +1,17 @@ +# CONFIG_SELINUX is not set +CONFIG_STATIC=y +# CONFIG_PIE is not set +# CONFIG_FEATURE_TAR_SELINUX is not set +# CONFIG_CHCON is not set +# CONFIG_GETENFORCE is not set +# CONFIG_GETSEBOOL is not set +# CONFIG_LOAD_POLICY is not set +# CONFIG_MATCHPATHCON is not set +# CONFIG_RUNCON is not set +# CONFIG_SELINUXENABLED is not set +# CONFIG_SESTATUS is not set +# CONFIG_SETENFORCE is not set +# CONFIG_SETFILES is not set +# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set +# CONFIG_RESTORECON is not set +# CONFIG_SETSEBOOL is not set diff --git a/busybox.config.static.warewulf3 b/busybox.config.static.warewulf3 new file mode 100644 index 0000000..7c4a345 --- /dev/null +++ b/busybox.config.static.warewulf3 @@ -0,0 +1,4 @@ +CONFIG_REBOOT=y +CONFIG_SWITCH_ROOT=y +CONFIG_CTTYHACK=y + diff --git a/busybox.spec b/busybox.spec index 169d79e..bbeede3 100644 --- a/busybox.spec +++ b/busybox.spec @@ -17,7 +17,7 @@ Name: busybox -Version: 1.33.1 +Version: 1.34.1 Release: 0 Summary: Minimalist variant of UNIX utilities linked in a single executable License: GPL-2.0-or-later @@ -28,11 +28,11 @@ Source1: BusyBox.1 Source2: busybox.config # Make sure busybox-static.config stays in sync with busybox.config - # exception: SELinux commands - these do not build statically. -Source3: busybox-static.config +Source3: busybox.config.static Source4: man.conf Source5: https://busybox.net/downloads/%{name}-%{version}.tar.bz2.sig Source6: https://busybox.net/~vda/vda_pubkey.gpg#/%{name}.keyring -Source7: busybox-warewulf3.config +Source7: busybox.config.static.warewulf3 Patch0: cpio-long-opt.patch Patch1: sendmail-ignore-F-option.patch # other patches @@ -80,11 +80,11 @@ Requires: %{name} = %{version} Requires: zip %description testsuite -Using this package you can test the busybox build on different kernels and glibc. +Using this package you can test the busybox build on different kernels and glibc. It needs to run with permission to the current directory, so either copy it away as is or run as root: -cd /usr/share/busybox/testsuite +cd /usr/share/busybox/testsuite PATH=/usr/share/busybox:$PATH SKIP_KNOWN_BUGS=1 ./runtest %prep @@ -103,14 +103,14 @@ export BUILD_VERBOSE=2 export CFLAGS="%{optflags} -fno-strict-aliasing -I/usr/include/tirpc" export CC="gcc" export HOSTCC=gcc -cp -a %{SOURCE3} .config +cat %{SOURCE3} %{SOURCE2} > .config make %{?_smp_mflags} -e oldconfig make -e %{?_smp_mflags} mv busybox busybox-static %if 0%{?build_ww3} make -e %{?_smp_mflags} clean -cp -a %{SOURCE7} .config +cat %{SOURCE7} %{SOURCE3} %{SOURCE2} > .config make %{?_smp_mflags} -e oldconfig make -e %{?_smp_mflags} mv busybox busybox-warewulf3 @@ -156,8 +156,8 @@ export BUILD_VERBOSE=2 export CFLAGS="%{optflags} -fno-strict-aliasing -I/usr/include/tirpc" export CC="gcc" export HOSTCC=gcc -export SKIP_KNOWN_BUGS=1 -export SKIP_INTERNET_TESTS=1 +export SKIP_KNOWN_BUGS=1 +export SKIP_INTERNET_TESTS=1 make -e %{?_smp_mflags} test %files