osc copypac from project:openSUSE:Factory package:busybox revision:68, using expand

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/busybox?expand=0&rev=70

busybox-1.33.1.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:12cec6bd2b16d8a9446dd16130f2b92982f1819f6e1c5f5887b6db03f5660d28
+size 2453694

busybox-1.34.1.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:415fbd89e5344c96acf449d94a6f956dbed62e18e835fc83e064db33a34bd549
-size 2476932

busybox.changes

@@ -1,30 +1,3 @@
--------------------------------------------------------------------
-Wed Oct 27 17:22:38 UTC 2021 - Egbert Eich <eich@suse.com>
-
-- Build busybox-warewulf3 for i586 as well. This allowes to set up
-  i586 nodes.
-
--------------------------------------------------------------------
-Fri Oct 22 12:10:55 UTC 2021 - Lukas Lansky <lukas.lansky@suse.com>
-
-- Enable fdisk (jsc#CAR-16)
-- Add testsuite-gnu-echo.patch: testing.sh to use GNU echo 
-
--------------------------------------------------------------------
-Thu Oct 21 17:43:22 UTC 2021 - Stephan Kulow <coolo@suse.com>
-
-- 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 <coolo@suse.com>
-
-- 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 <eich@suse.com>
 

busybox.config

@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.34.1
+# Busybox version: 1.32.0
-# Thu Oct 21 18:43:16 2021
+# Wed Jul 22 15:14:27 2020
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -36,6 +36,7 @@ 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
@@ -207,13 +208,11 @@ 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
@@ -318,6 +317,7 @@ 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,7 +425,6 @@ 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
@@ -439,7 +438,6 @@ 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
 
 #
@@ -517,10 +515,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_ADD_SHELL is not set
-# CONFIG_REMOVE_SHELL 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_ADDUSER=y
 # CONFIG_FEATURE_CHECK_NAMES is not set
 CONFIG_LAST_ID=65535
@@ -608,9 +606,9 @@ CONFIG_FATATTR=y
 # CONFIG_FEATURE_FBSET_FANCY is not set
 # CONFIG_FEATURE_FBSET_READMODE is not set
 # CONFIG_FDFORMAT is not set
-CONFIG_FDISK=y
+# CONFIG_FDISK is not set
 # CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set
-CONFIG_FEATURE_FDISK_WRITABLE=y
+# CONFIG_FEATURE_FDISK_WRITABLE is not set
 # CONFIG_FEATURE_AIX_LABEL is not set
 # CONFIG_FEATURE_SGI_LABEL is not set
 # CONFIG_FEATURE_SUN_LABEL is not set
@@ -627,6 +625,7 @@ 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
@@ -746,7 +745,6 @@ 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
@@ -780,10 +778,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
@@ -833,16 +831,15 @@ 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
@@ -880,10 +877,6 @@ 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
@@ -981,7 +974,6 @@ 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
@@ -1003,7 +995,6 @@ 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
@@ -1088,10 +1079,6 @@ 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
@@ -1139,8 +1126,8 @@ CONFIG_HUSH=y
 CONFIG_SHELL_HUSH=y
 CONFIG_HUSH_BASH_COMPAT=y
 CONFIG_HUSH_BRACE_EXPANSION=y
-# CONFIG_HUSH_BASH_SOURCE_CURDIR is not set
 CONFIG_HUSH_LINENO_VAR=y
+# CONFIG_HUSH_BASH_SOURCE_CURDIR is not set
 CONFIG_HUSH_INTERACTIVE=y
 CONFIG_HUSH_SAVEHISTORY=y
 CONFIG_HUSH_JOB=y

busybox.config.static

@@ -1,17 +0,0 @@
-# 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

busybox.config.static.warewulf3

@@ -1,4 +0,0 @@
-CONFIG_REBOOT=y
-CONFIG_SWITCH_ROOT=y
-CONFIG_CTTYHACK=y
-

busybox.spec

@@ -17,7 +17,7 @@
 
 
 Name:           busybox
-Version:        1.34.1
+Version:        1.33.1
 Release:        0
 Summary:        Minimalist variant of UNIX utilities linked in a single executable
 License:        GPL-2.0-or-later
@@ -28,14 +28,13 @@ 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.config.static
+Source3:        busybox-static.config
 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.config.static.warewulf3
+Source7:        busybox-warewulf3.config
 Patch0:         cpio-long-opt.patch
 Patch1:         sendmail-ignore-F-option.patch
-Patch2:         testsuite-gnu-echo.patch
 # other patches
 Patch100:       busybox.install.patch
 Provides:       useradd_or_adduser_dep
@@ -44,7 +43,7 @@ BuildRequires:  pkgconfig(libselinux)
 # for test suite
 BuildRequires:  zip
 
-%ifarch x86_64 aarch64 i586
+%ifarch x86_64 aarch64
 %define build_ww3 1
 %endif
 
@@ -92,7 +91,6 @@ PATH=/usr/share/busybox:$PATH SKIP_KNOWN_BUGS=1 ./runtest
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 %patch100 -p0
 cp -a %{SOURCE1} docs/
 find "(" -name CVS -o -name .cvsignore -o -name .svn -o -name .gitignore ")" \
@@ -105,14 +103,14 @@ export BUILD_VERBOSE=2
 export CFLAGS="%{optflags} -fno-strict-aliasing -I/usr/include/tirpc"
 export CC="gcc"
 export HOSTCC=gcc
-cat %{SOURCE3} %{SOURCE2} > .config
+cp -a %{SOURCE3} .config
 make %{?_smp_mflags} -e oldconfig
 make -e %{?_smp_mflags}
 mv busybox busybox-static
 
 %if 0%{?build_ww3}
 make -e %{?_smp_mflags} clean
-cat %{SOURCE7} %{SOURCE3} %{SOURCE2} > .config
+cp -a %{SOURCE7} .config
 make %{?_smp_mflags} -e oldconfig
 make -e %{?_smp_mflags}
 mv busybox busybox-warewulf3

testsuite-gnu-echo.patch

@@ -1,26 +0,0 @@
-From 0bc41194d1f934f94c84fd0a7b835cee6961d824 Mon Sep 17 00:00:00 2001
-From: Bogdan Lezhepekov <bogdan.lezhepekov@suse.com>
-Date: Thu, 4 Feb 2021 18:02:11 +0200
-Subject: [PATCH v1] testing.sh: Use GNU echo instead of builtin
-
-Signed-off-by: Bogdan Lezhepekov <bogdan.lezhepekov@suse.com>
----
- testsuite/testing.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/testsuite/testing.sh b/testsuite/testing.sh
-index f5b756947..c853f3cfd 100644
---- a/testsuite/testing.sh
-+++ b/testsuite/testing.sh
-@@ -39,7 +39,7 @@ export SKIP=
- # Helper for helpers. Oh my...
- 
- test x"$ECHO" != x"" || {
--	ECHO="echo"
-+	ECHO="/bin/echo"
- 	test x"`echo -ne`" = x"" || {
- 		# Compile and use a replacement 'echo' which understands -e -n
- 		ECHO="$PWD/echo-ne"
--- 
-2.26.2
-