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

busybox-1.4.2.tar.bz2

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

busybox-1.6.1.tar.bz2

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

busybox.SuSE.config

@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.4.2
+# Busybox version: 1.6.1
-# Sat Apr 28 20:40:31 2007
+# Sun Jul 15 08:40:07 2007
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -25,12 +25,14 @@ CONFIG_FEATURE_COMPRESS_USAGE=y
 CONFIG_GETOPT_LONG=y
 CONFIG_FEATURE_DEVPTS=y
 # CONFIG_FEATURE_CLEAN_UP is not set
+CONFIG_FEATURE_PIDFILE=y
 CONFIG_FEATURE_SUID=y
 CONFIG_FEATURE_SYSLOG=y
 # CONFIG_FEATURE_SUID_CONFIG is not set
 # CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
 CONFIG_FEATURE_HAVE_RPC=y
 # CONFIG_SELINUX is not set
+# CONFIG_FEATURE_PREFER_APPLETS is not set
 CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
 
 #
@@ -47,8 +49,8 @@ CONFIG_BUILD_AT_ONCE=y
 # Debugging Options
 #
 # CONFIG_DEBUG is not set
-# CONFIG_DEBUG_PESSIMIZE is not set
+# CONFIG_WERROR is not set
-# CONFIG_NO_DEBUG_LIB is not set
+CONFIG_NO_DEBUG_LIB=y
 # CONFIG_DMALLOC is not set
 # CONFIG_EFENCE is not set
 CONFIG_INCLUDE_SUSv2=y
@@ -67,6 +69,14 @@ CONFIG_PREFIX="/usr"
 #
 CONFIG_PASSWORD_MINLEN=6
 CONFIG_MD5_SIZE_VS_SPEED=2
+CONFIG_FEATURE_EDITING=y
+CONFIG_FEATURE_EDITING_FANCY_KEYS=y
+# CONFIG_FEATURE_EDITING_VI is not set
+CONFIG_FEATURE_EDITING_HISTORY=666
+CONFIG_FEATURE_EDITING_SAVEHISTORY=y
+CONFIG_FEATURE_TAB_COMPLETION=y
+# CONFIG_FEATURE_USERNAME_COMPLETION is not set
+# CONFIG_FEATURE_EDITING_FANCY_PROMPT is not set
 
 #
 # Applets
@@ -189,6 +199,8 @@ CONFIG_SLEEP=y
 # CONFIG_FEATURE_FANCY_SLEEP is not set
 CONFIG_SORT=y
 CONFIG_FEATURE_SORT_BIG=y
+CONFIG_SPLIT=y
+CONFIG_FEATURE_SPLIT_FANCY=y
 CONFIG_STAT=y
 CONFIG_FEATURE_STAT_FORMAT=y
 CONFIG_STTY=y
@@ -265,6 +277,7 @@ CONFIG_READLINK=y
 # CONFIG_FEATURE_READLINK_FOLLOW is not set
 CONFIG_RUN_PARTS=y
 CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
+CONFIG_FEATURE_RUN_PARTS_FANCY=y
 # CONFIG_START_STOP_DAEMON is not set
 # CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set
 # CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set
@@ -304,6 +317,15 @@ CONFIG_FEATURE_FIND_XDEV=y
 CONFIG_FEATURE_FIND_NEWER=y
 CONFIG_FEATURE_FIND_INUM=y
 CONFIG_FEATURE_FIND_EXEC=y
+CONFIG_FEATURE_FIND_USER=y
+CONFIG_FEATURE_FIND_GROUP=y
+CONFIG_FEATURE_FIND_NOT=y
+CONFIG_FEATURE_FIND_DEPTH=y
+CONFIG_FEATURE_FIND_PAREN=y
+CONFIG_FEATURE_FIND_SIZE=y
+CONFIG_FEATURE_FIND_PRUNE=y
+# CONFIG_FEATURE_FIND_DELETE is not set
+CONFIG_FEATURE_FIND_PATH=y
 CONFIG_GREP=y
 CONFIG_FEATURE_GREP_EGREP_ALIAS=y
 CONFIG_FEATURE_GREP_FGREP_ALIAS=y
@@ -321,6 +343,7 @@ CONFIG_INIT=y
 CONFIG_DEBUG_INIT=y
 CONFIG_FEATURE_USE_INITTAB=y
 CONFIG_FEATURE_INIT_SCTTY=y
+CONFIG_FEATURE_INIT_SYSLOG=y
 CONFIG_FEATURE_EXTRA_QUIET=y
 CONFIG_FEATURE_INIT_COREDUMPS=y
 CONFIG_FEATURE_INITRD=y
@@ -334,7 +357,9 @@ CONFIG_FEATURE_SHADOWPASSWDS=y
 CONFIG_USE_BB_SHADOW=y
 CONFIG_USE_BB_PWD_GRP=y
 CONFIG_ADDGROUP=y
+# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set
 CONFIG_DELGROUP=y
+# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set
 CONFIG_ADDUSER=y
 CONFIG_DELUSER=y
 CONFIG_GETTY=y
@@ -345,6 +370,7 @@ CONFIG_LOGIN=y
 CONFIG_FEATURE_SECURETTY=y
 CONFIG_PASSWD=y
 # CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set
+CONFIG_CRYPTPW=y
 CONFIG_SU=y
 CONFIG_FEATURE_SU_SYSLOG=y
 CONFIG_FEATURE_SU_CHECKS_SHELLS=y
@@ -444,6 +470,7 @@ CONFIG_FEATURE_MTAB_SUPPORT=y
 #
 CONFIG_ADJTIMEX=y
 # CONFIG_BBCONFIG is not set
+CONFIG_CHRT=y
 CONFIG_CROND=y
 # CONFIG_DEBUG_CROND_OPTION is not set
 CONFIG_FEATURE_CROND_CALL_SENDMAIL=y
@@ -491,6 +518,7 @@ CONFIG_WATCHDOG=y
 # Networking Utilities
 #
 CONFIG_FEATURE_IPV6=y
+CONFIG_VERBOSE_RESOLUTION_ERRORS=y
 CONFIG_ARP=y
 CONFIG_ARPING=y
 CONFIG_DNSD=y
@@ -522,8 +550,8 @@ CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y
 # CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set
 CONFIG_FEATURE_IFUPDOWN_IPV4=y
 CONFIG_FEATURE_IFUPDOWN_IPV6=y
-CONFIG_FEATURE_IFUPDOWN_IPX=y
 CONFIG_FEATURE_IFUPDOWN_MAPPING=y
+# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set
 # CONFIG_INETD is not set
 # CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set
 # CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set
@@ -551,11 +579,11 @@ CONFIG_NC=y
 CONFIG_NC_SERVER=y
 CONFIG_NC_EXTRA=y
 CONFIG_NETSTAT=y
+CONFIG_FEATURE_NETSTAT_WIDE=y
 CONFIG_NSLOOKUP=y
 CONFIG_PING=y
-CONFIG_FEATURE_FANCY_PING=y
 CONFIG_PING6=y
-CONFIG_FEATURE_FANCY_PING6=y
+CONFIG_FEATURE_FANCY_PING=y
 CONFIG_ROUTE=y
 CONFIG_TELNET=y
 CONFIG_FEATURE_TELNET_TTYPE=y
@@ -577,11 +605,11 @@ CONFIG_FEATURE_TRACEROUTE_USE_ICMP=y
 CONFIG_APP_UDHCPC=y
 # CONFIG_FEATURE_UDHCP_SYSLOG is not set
 # CONFIG_FEATURE_UDHCP_DEBUG is not set
+CONFIG_FEATURE_RFC3397=y
 CONFIG_VCONFIG=y
 CONFIG_WGET=y
 CONFIG_FEATURE_WGET_STATUSBAR=y
 CONFIG_FEATURE_WGET_AUTHENTICATION=y
-CONFIG_FEATURE_WGET_IP6_LITERAL=y
 CONFIG_FEATURE_WGET_LONG_OPTIONS=y
 # CONFIG_ZCIP is not set
 
@@ -632,6 +660,12 @@ CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
 # CONFIG_ASH_RANDOM_SUPPORT is not set
 # CONFIG_ASH_EXPAND_PRMT is not set
 # CONFIG_HUSH is not set
+# CONFIG_HUSH_HELP is not set
+# CONFIG_HUSH_INTERACTIVE is not set
+# CONFIG_HUSH_JOB is not set
+# CONFIG_HUSH_TICK is not set
+# CONFIG_HUSH_IF is not set
+# CONFIG_HUSH_LOOPS is not set
 # CONFIG_LASH is not set
 # CONFIG_MSH is not set
 
@@ -639,14 +673,8 @@ CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
 # Bourne Shell Options
 #
 # CONFIG_FEATURE_SH_EXTRA_QUIET is not set
-# CONFIG_FEATURE_SH_STANDALONE_SHELL is not set
+# CONFIG_FEATURE_SH_STANDALONE is not set
-CONFIG_FEATURE_COMMAND_EDITING=y
+CONFIG_CTTYHACK=y
-CONFIG_FEATURE_COMMAND_EDITING_VI=y
-CONFIG_FEATURE_COMMAND_HISTORY=666
-CONFIG_FEATURE_COMMAND_SAVEHISTORY=y
-CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y
-# CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set
-CONFIG_FEATURE_SH_FANCY_PROMPT=y
 
 #
 # System Logging Utilities
@@ -673,3 +701,19 @@ CONFIG_SVLOGD=y
 # CONFIG_ENVUIDGID is not set
 # CONFIG_ENVDIR is not set
 # CONFIG_SOFTLIMIT is not set
+# CONFIG_CHCON is not set
+# CONFIG_FEATURE_CHCON_LONG_OPTIONS 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_FEATURE_RUNCON_LONG_OPTIONS is not set
+# CONFIG_SELINUXENABLED is not set
+# CONFIG_SETENFORCE is not set
+
+#
+# ipsvd utilities
+#
+# CONFIG_TCPSVD is not set
+# CONFIG_UDPSVD is not set

busybox.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Jul 15 10:47:28 CEST 2007 - olh@suse.de
+
+- update to 1.6.1
+  see http://www.busybox.net/ for full changelog
+
 -------------------------------------------------------------------
 Fri May 11 16:18:53 CEST 2007 - olh@suse.de
 

busybox.dmesg-size.patch

@@ -2,13 +2,11 @@
  util-linux/dmesg.c |   10 +++++++++-
  1 file changed, 9 insertions(+), 1 deletion(-)
 
-Index: busybox-1.4.2/util-linux/dmesg.c
+--- a/util-linux/dmesg.c
-===================================================================
++++ b/util-linux/dmesg.c
---- busybox-1.4.2.orig/util-linux/dmesg.c
+@@ -12,6 +12,14 @@
-+++ busybox-1.4.2/util-linux/dmesg.c
-@@ -13,6 +13,14 @@
- #include <unistd.h>
  #include <sys/klog.h>
+ #include "libbb.h"
  
 +static int kernel_ringbuffer_size(void)
 +{
@@ -18,10 +16,10 @@ Index: busybox-1.4.2/util-linux/dmesg.c
 +	return 16384;
 +}
 +
- int dmesg_main(int argc, char *argv[])
+ int dmesg_main(int argc, char **argv);
+ int dmesg_main(int argc, char **argv)
  {
- 	char *size, *level;
+@@ -25,7 +33,7 @@ int dmesg_main(int argc, char **argv)
-@@ -25,7 +33,7 @@ int dmesg_main(int argc, char *argv[])
  		int len;
  		char *buf;
  

busybox.install.patch

@@ -2,10 +2,8 @@
  applets/install.sh |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: busybox-1.4.2/applets/install.sh
+--- a/applets/install.sh
-===================================================================
++++ b/applets/install.sh
---- busybox-1.4.2.orig/applets/install.sh
-+++ busybox-1.4.2/applets/install.sh
 @@ -8,7 +8,7 @@ if [ -z "$prefix" ]; then
  	echo "usage: applets/install.sh DESTINATION [--symlinks/--hardlinks]"
  	exit 1;

busybox.libunarchive-array.patch

@@ -8,11 +8,9 @@ make[1]: *** [archival/libunarchive/get_header_tar.o] Error 1
  archival/libunarchive/get_header_tar.c |   12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)
 
-Index: busybox-1.4.2/archival/libunarchive/get_header_tar.c
+--- a/archival/libunarchive/get_header_tar.c
-===================================================================
++++ b/archival/libunarchive/get_header_tar.c
---- busybox-1.4.2.orig/archival/libunarchive/get_header_tar.c
+@@ -143,8 +143,8 @@ char get_header_tar(archive_handle_t *ar
-+++ busybox-1.4.2/archival/libunarchive/get_header_tar.c
-@@ -136,8 +136,8 @@ char get_header_tar(archive_handle_t *ar
  	}
  	file_header->link_name = NULL;
  	if (!linkname && parse_names && tar.linkname[0]) {
@@ -23,7 +21,7 @@ Index: busybox-1.4.2/archival/libunarchive/get_header_tar.c
  		file_header->link_name = xstrdup(tar.linkname);
  		/* FIXME: what if we have non-link object with link_name? */
  		/* Will link_name be free()ed? */
-@@ -151,11 +151,11 @@ char get_header_tar(archive_handle_t *ar
+@@ -158,11 +158,11 @@ char get_header_tar(archive_handle_t *ar
  
  	file_header->name = NULL;
  	if (!longname && parse_names) {

busybox.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package busybox (Version 1.4.2)
+# spec file for package busybox (Version 1.6.1)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -13,15 +13,14 @@
 Name:           busybox
 BuildRequires:  dietlibc
 URL:            http://www.busybox.net/
-Version:        1.4.2
+Version:        1.6.1
-Release:        5
+Release:        1
 Summary:        The Swiss Army Knife of Embedded Linux
-License:        GNU General Public License (GPL)
+License:        GPL v2 or later
 Group:          System/Base
 Autoreqprov:    on
 Source:         http://busybox.net/downloads/%{name}-%{version}.tar.bz2
-Source2:        SuSE.config
+Source2:        busybox.SuSE.config
-Patch0:         busybox.taskset-range.patch
 Patch1:         busybox.install.patch
 Patch2:         busybox.libunarchive-array.patch
 Patch3:         busybox.dmesg-size.patch
@@ -46,7 +45,6 @@ Authors:
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -74,7 +72,7 @@ install -m 644 docs/BusyBox.1 $RPM_BUILD_ROOT%_mandir/man1
 
 %files
 %defattr(-,root,root)
-%doc docs/* testsuite
+%doc docs/mdev.txt
 %doc %{_mandir}/man1/BusyBox.1.gz
 /usr/bin/busybox
 /usr/bin/busybox.install
@@ -82,6 +80,9 @@ install -m 644 docs/BusyBox.1 $RPM_BUILD_ROOT%_mandir/man1
 %config /usr/share/busybox/busybox.links
 
 %changelog
+* Sun Jul 15 2007 - olh@suse.de
+- update to 1.6.1
+  see http://www.busybox.net/ for full changelog
 * Fri May 11 2007 - olh@suse.de
 - increase ash cmdline history size
   user kernel ringbuffer size for dmesg

busybox.taskset-range.patch

@@ -1,17 +0,0 @@
----
- miscutils/taskset.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: busybox-1.4.2/miscutils/taskset.c
-===================================================================
---- busybox-1.4.2.orig/miscutils/taskset.c
-+++ busybox-1.4.2/miscutils/taskset.c
-@@ -62,7 +62,7 @@ int taskset_main(int argc, char** argv)
- 		aff = *++argv; /* <aff> <cmd...> */
- 	if (aff) {
- 		unsigned i = 0;
--		unsigned long l = xstrtol_range(aff, 16, 1, ULONG_MAX);
-+		unsigned long l = xstrtol_range(aff, 0, 1, LONG_MAX);
- 
- 		CPU_ZERO(&new_mask);
- 		while (i < CPU_SETSIZE && l >= (1<<i)) {