From 50bbf4023465b7b8de5ea21d7c1ff792b9428c1d Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Thu, 9 Apr 2015 21:33:47 +0200 Subject: [PATCH] - updated to 1.23.2 - updated configs --- busybox-initrd.config | 24 ++++++++++++++++++++++-- busybox.config | 26 +++++++++++++++++++++++--- busybox.spec | 22 +++------------------- 3 files changed, 48 insertions(+), 24 deletions(-) diff --git a/busybox-initrd.config b/busybox-initrd.config index d34776b..29b5a56 100644 --- a/busybox-initrd.config +++ b/busybox-initrd.config @@ -29,6 +29,8 @@ CONFIG_UNICODE_COMBINING_WCHARS=y CONFIG_UNICODE_WIDE_WCHARS=y # CONFIG_UNICODE_BIDI_SUPPORT is not set CONFIG_UNICODE_PRESERVE_BROKEN=y +# CONFIG_PAM is not set +CONFIG_FEATURE_USE_SENDFILE=y CONFIG_FEATURE_DEVPTS=y # CONFIG_FEATURE_CLEAN_UP is not set # CONFIG_FEATURE_PIDFILE is not set @@ -61,6 +63,7 @@ CONFIG_EXTRA_LDLIBS="" # Debugging Options # # CONFIG_DEBUG is not set +# CONFIG_UNIT_TEST is not set # CONFIG_WERROR is not set CONFIG_NO_DEBUG_LIB=y # CONFIG_DMALLOC is not set @@ -192,6 +195,7 @@ CONFIG_HEAD=y # CONFIG_HOSTID is not set # CONFIG_ID is not set # CONFIG_GROUPS is not set +# CONFIG_SHUF is not set # CONFIG_INSTALL is not set # CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set CONFIG_LN=y @@ -249,6 +253,7 @@ CONFIG_TEST=y # CONFIG_FEATURE_TEST_64 is not set # CONFIG_TOUCH is not set # CONFIG_TR is not set +# CONFIG_UNLINK is not set # CONFIG_BASE64 is not set # CONFIG_FEATURE_TR_CLASSES is not set # CONFIG_FEATURE_TR_EQUIV is not set @@ -266,6 +271,15 @@ CONFIG_USLEEP=y # CONFIG_WHO is not set # CONFIG_WHOAMI is not set # CONFIG_YES is not set + +# +# Common options +# +# CONFIG_FEATURE_VERBOSE is not set + +# +# Common options for cp and mv +# # CONFIG_FEATURE_PRESERVE_HARDLINKS is not set # @@ -277,6 +291,10 @@ CONFIG_USLEEP=y # Common options for df, du, ls # # CONFIG_FEATURE_HUMAN_READABLE is not set + +# +# Common options for md5sum, sha1sum +# # CONFIG_FEATURE_MD5_SHA1_SUM_CHECK is not set # @@ -338,6 +356,7 @@ CONFIG_FEATURE_VI_REGEX_SEARCH=y CONFIG_FEATURE_VI_USE_SIGNALS=y CONFIG_FEATURE_VI_DOT_CMD=y CONFIG_FEATURE_VI_ASK_TERMINAL=y +# CONFIG_FEATURE_VI_UNDO is not set # CONFIG_FEATURE_VI_READONLY is not set # CONFIG_FEATURE_VI_SETOPTS is not set # CONFIG_FEATURE_VI_SET is not set @@ -419,7 +438,6 @@ CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE=y # CONFIG_FEATURE_UTMP is not set # CONFIG_FEATURE_WTMP is not set # CONFIG_LOGIN is not set -# CONFIG_PAM is not set # CONFIG_LOGIN_SCRIPTS is not set # CONFIG_FEATURE_NOLOGIN is not set # CONFIG_FEATURE_SECURETTY is not set @@ -473,6 +491,7 @@ CONFIG_FEATURE_INSMOD_TRY_MMAP=y # CONFIG_BLKID is not set CONFIG_DMESG=y # CONFIG_BLOCKDEV is not set +# CONFIG_FATATTR is not set # CONFIG_FSTRIM is not set # CONFIG_FEATURE_DMESG_PRETTY is not set # CONFIG_FBSET is not set @@ -672,7 +691,6 @@ CONFIG_VERBOSE_RESOLUTION_ERRORS=y CONFIG_HOSTNAME=y # CONFIG_HTTPD is not set # CONFIG_FEATURE_HTTPD_RANGES is not set -# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set # CONFIG_FEATURE_HTTPD_SETUID is not set # CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set # CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set @@ -759,6 +777,7 @@ CONFIG_ROUTE=y CONFIG_DHCPD_LEASES_FILE="" CONFIG_UDHCPC=y # CONFIG_FEATURE_UDHCPC_ARPING is not set +CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y # CONFIG_FEATURE_UDHCP_PORT is not set CONFIG_UDHCP_DEBUG=0 # CONFIG_FEATURE_UDHCP_RFC3397 is not set @@ -835,6 +854,7 @@ CONFIG_ASH_ALIAS=y # CONFIG_ASH_BUILTIN_ECHO is not set # CONFIG_ASH_BUILTIN_PRINTF is not set # CONFIG_ASH_BUILTIN_TEST is not set +# CONFIG_ASH_HELP is not set # CONFIG_ASH_CMDCMD is not set # CONFIG_ASH_MAIL is not set CONFIG_ASH_OPTIMIZE_FOR_SIZE=y diff --git a/busybox.config b/busybox.config index 4b5b5b5..93a5dcf 100644 --- a/busybox.config +++ b/busybox.config @@ -32,6 +32,8 @@ CONFIG_UNICODE_WIDE_WCHARS=y CONFIG_UNICODE_BIDI_SUPPORT=y CONFIG_UNICODE_NEUTRAL_TABLE=y CONFIG_UNICODE_PRESERVE_BROKEN=y +# CONFIG_PAM is not set +CONFIG_FEATURE_USE_SENDFILE=y CONFIG_FEATURE_DEVPTS=y # CONFIG_FEATURE_CLEAN_UP is not set CONFIG_FEATURE_PIDFILE=y @@ -66,6 +68,7 @@ CONFIG_EXTRA_LDLIBS="" # Debugging Options # # CONFIG_DEBUG is not set +# CONFIG_UNIT_TEST is not set # CONFIG_DEBUG_PESSIMIZE is not set # CONFIG_WERROR is not set CONFIG_NO_DEBUG_LIB=y @@ -215,6 +218,7 @@ CONFIG_FEATURE_FANCY_HEAD=y CONFIG_HOSTID=y CONFIG_ID=y CONFIG_GROUPS=y +CONFIG_SHUF=y CONFIG_INSTALL=y # CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set CONFIG_LN=y @@ -275,6 +279,7 @@ CONFIG_TOUCH=y CONFIG_FEATURE_TOUCH_SUSV3=y CONFIG_FEATURE_TOUCH_NODEREF=y CONFIG_TR=y +CONFIG_UNLINK=y CONFIG_FEATURE_TR_CLASSES=y CONFIG_FEATURE_TR_EQUIV=y CONFIG_TRUE=y @@ -293,6 +298,11 @@ CONFIG_USERS=y CONFIG_WHOAMI=y CONFIG_YES=y +# +# Common options +# +CONFIG_FEATURE_VERBOSE=y + # # Common options for cp and mv # @@ -383,6 +393,9 @@ CONFIG_FEATURE_VI_SETOPTS=y CONFIG_FEATURE_VI_SET=y # CONFIG_FEATURE_VI_WIN_RESIZE is not set 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_ALLOW_EXEC=y # @@ -399,6 +412,7 @@ CONFIG_FEATURE_FIND_MAXDEPTH=y CONFIG_FEATURE_FIND_NEWER=y CONFIG_FEATURE_FIND_INUM=y CONFIG_FEATURE_FIND_EXEC=y +CONFIG_FEATURE_FIND_EXEC_PLUS=y CONFIG_FEATURE_FIND_USER=y CONFIG_FEATURE_FIND_GROUP=y CONFIG_FEATURE_FIND_NOT=y @@ -420,6 +434,7 @@ CONFIG_XARGS=y CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y +CONFIG_FEATURE_XARGS_SUPPORT_REPL_STR=y # # Init Utilities @@ -455,16 +470,16 @@ CONFIG_LAST_SYSTEM_ID=999 CONFIG_FEATURE_ADDUSER_TO_GROUP=y CONFIG_DELGROUP=y CONFIG_FEATURE_DEL_USER_FROM_GROUP=y -# CONFIG_FEATURE_CHECK_NAMES is not set CONFIG_ADDUSER=y # CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set +# CONFIG_FEATURE_CHECK_NAMES is not set +CONFIG_LAST_ID=60000 CONFIG_DELUSER=y CONFIG_GETTY=y CONFIG_FEATURE_UTMP=y CONFIG_FEATURE_WTMP=y CONFIG_LOGIN=y CONFIG_LOGIN_SESSION_AS_CHILD=y -# CONFIG_PAM is not set # CONFIG_LOGIN_SCRIPTS is not set CONFIG_FEATURE_NOLOGIN=y CONFIG_FEATURE_SECURETTY=y @@ -528,6 +543,7 @@ CONFIG_FEATURE_ACPID_COMPAT=y CONFIG_BLKID=y CONFIG_FEATURE_BLKID_TYPE=y CONFIG_BLOCKDEV=y +CONFIG_FATATTR=y CONFIG_FSTRIM=y CONFIG_DMESG=y CONFIG_FEATURE_DMESG_PRETTY=y @@ -624,6 +640,7 @@ CONFIG_SCRIPT=y CONFIG_SCRIPTREPLAY=y CONFIG_SETARCH=y CONFIG_SWAPONOFF=y +CONFIG_FEATURE_SWAPON_DISCARD=y CONFIG_FEATURE_SWAPON_PRI=y CONFIG_SWITCH_ROOT=y CONFIG_UMOUNT=y @@ -743,13 +760,13 @@ CONFIG_FAKEIDENTD=y CONFIG_FTPD=y CONFIG_FEATURE_FTP_WRITE=y CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y +CONFIG_FEATURE_FTP_AUTHENTICATION=y CONFIG_FTPGET=y CONFIG_FTPPUT=y # CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set CONFIG_HOSTNAME=y CONFIG_HTTPD=y CONFIG_FEATURE_HTTPD_RANGES=y -CONFIG_FEATURE_HTTPD_USE_SENDFILE=y CONFIG_FEATURE_HTTPD_SETUID=y CONFIG_FEATURE_HTTPD_BASIC_AUTH=y CONFIG_FEATURE_HTTPD_AUTH_MD5=y @@ -812,6 +829,7 @@ CONFIG_FEATURE_NETSTAT_PRG=y CONFIG_NSLOOKUP=y CONFIG_NTPD=y CONFIG_FEATURE_NTPD_SERVER=y +CONFIG_FEATURE_NTPD_CONF=y CONFIG_PING=y CONFIG_PING6=y CONFIG_FEATURE_FANCY_PING=y @@ -847,6 +865,7 @@ CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC=y CONFIG_DHCPD_LEASES_FILE="/var/run/udhcpd.leases" CONFIG_UDHCPC=y CONFIG_FEATURE_UDHCPC_ARPING=y +CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y CONFIG_FEATURE_UDHCP_PORT=y CONFIG_FEATURE_UDHCP_8021Q=y CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script" @@ -977,6 +996,7 @@ CONFIG_ASH_GETOPTS=y CONFIG_ASH_BUILTIN_ECHO=y CONFIG_ASH_BUILTIN_PRINTF=y CONFIG_ASH_BUILTIN_TEST=y +CONFIG_ASH_HELP=y CONFIG_ASH_CMDCMD=y CONFIG_ASH_MAIL=y CONFIG_ASH_OPTIMIZE_FOR_SIZE=y diff --git a/busybox.spec b/busybox.spec index f5636d7..944a6b3 100644 --- a/busybox.spec +++ b/busybox.spec @@ -41,27 +41,15 @@ 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.22.1 -Release: 6 +Version: 1.23.2 +Release: 1 License: GPL v2 Group: Applications Source0: http://www.busybox.net/downloads/%{name}-%{version}.tar.bz2 -# Source0-md5: 337d1a15ab1cb1d4ed423168b1eb7d7e +# Source0-md5: 7925683d7dd105aabe9b6b618d48cc73 Source1: %{name}.config Source2: %{name}-initrd.config %{?with_altconfig:Source3: %{cfgfile}} -Patch100: http://busybox.net/downloads/fixes-1.22.1/busybox-1.22.1-ash.patch -# Patch100-md5: 538d8cddbdfc449239b25a40bc8d1575 -Patch101: http://busybox.net/downloads/fixes-1.22.1/busybox-1.22.1-date.patch -# Patch101-md5: bc381f9ceb3824141c968f5bc4353943 -Patch102: http://busybox.net/downloads/fixes-1.22.1/busybox-1.22.1-iplink.patch -# Patch102-md5: 24686ec2750a8703feb57fc9c6aaed1d -Patch103: http://busybox.net/downloads/fixes-1.22.1/busybox-1.22.1-nc.patch -# Patch103-md5: 69eecaae5f812d08655dfdf34b60503f -Patch104: http://busybox.net/downloads/fixes-1.22.1/busybox-1.22.1-lzop.patch -# Patch104-md5: 14fb3bf7ffaba153b3cad385677b18c3 -Patch105: http://busybox.net/downloads/fixes-1.22.1/busybox-1.22.1-zcat-no-ext.patch -# Patch105-md5: 158c8c4c73db6d920bdd7d4b9b65b2a5 Patch0: x32.patch Patch1: %{name}-logconsole.patch Patch2: %{name}-printf-gettext.patch @@ -169,10 +157,6 @@ Statycznie skonsolidowany busybox dla initrd. %prep %setup -q -%patch100 -p1 -%patch101 -p1 -%patch102 -p1 -%patch103 -p1 %patch0 -p1 %patch1 -p1 %patch2 -p1 -- 2.44.0