From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8E3A01396D0 for ; Sun, 3 Sep 2017 04:46:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B3C2CE0E5A; Sun, 3 Sep 2017 04:46:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 82665E0E5A for ; Sun, 3 Sep 2017 04:46:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EC14A33BEAE for ; Sun, 3 Sep 2017 04:46:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8667A8C1F for ; Sun, 3 Sep 2017 04:46:04 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1504413105.c397b91d0d12367fa2fe98bea0830a0e781d630d.robbat2@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: patches/busybox/1.20.2/, patches/busybox/1.27.2/, patches/busybox/1.19.3/, ... X-VCS-Repository: proj/genkernel X-VCS-Files: defaults/busy-config patches/busybox/1.18.1/1.18.1-mdstart.diff patches/busybox/1.18.1/1.18.1-openvt.diff patches/busybox/1.18.1/README patches/busybox/1.18.1/busybox-1.7.4-signal-hack.patch patches/busybox/1.19.3/1.18.1-openvt.diff patches/busybox/1.19.3/busybox-1.19.3-mdstart.patch patches/busybox/1.19.3/busybox-1.7.4-signal-hack.patch patches/busybox/1.20.1/1.18.1-openvt.diff patches/busybox/1.20.1/busybox-1.20.1-mdstart.patch patches/busybox/1.20.1/busybox-1.7.4-signal-hack.patch patches/busybox/1.20.2/1.18.1-openvt.diff patches/busybox/1.20.2/busybox-1.20.1-mdstart.patch patches/busybox/1.20.2/busybox-1.20.2-bunzip2.patch patches/busybox/1.20.2/busybox-1.20.2-glibc-sys-resource.patch patches/busybox/1.20.2/busybox-1.20.2-modprobe.patch patches/busybox/1.20.2/busybox-1.7.4-signal-hack.patch patches/busybox/1.26.0/1.18.1-openvt.diff patches/busybox/1.26.0/busybox-1.20.2-modprobe.patch patches/busybox/1.26.0/busybox-1.26.0-mdstart.patch patches/busybox/1.26.0/busybox-1 .7.4-signal-hack.patch patches/busybox/1.27.2/1.18.1-openvt.diff patches/busybox/1.27.2/README patches/busybox/1.27.2/busybox-1.20.2-modprobe.patch patches/busybox/1.27.2/busybox-1.26.0-mdstart.patch patches/busybox/1.27.2/busybox-1.7.4-signal-hack.patch X-VCS-Directories: patches/busybox/1.20.2/ patches/busybox/1.27.2/ patches/busybox/1.19.3/ patches/busybox/1.18.1/ defaults/ patches/busybox/1.26.0/ patches/busybox/1.20.1/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: c397b91d0d12367fa2fe98bea0830a0e781d630d X-VCS-Branch: master Date: Sun, 3 Sep 2017 04:46:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e81f51c6-c4e0-408a-ac14-b32415a57835 X-Archives-Hash: 016f0f54159bc538e9763fefcb6e7754 commit: c397b91d0d12367fa2fe98bea0830a0e781d630d Author: Robin H. Johnson gentoo org> AuthorDate: Sun Sep 3 04:31:45 2017 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Sun Sep 3 04:31:45 2017 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=c397b91d busybox: move to 1.27.2 Signed-off-by: Robin H. Johnson gentoo.org> defaults/busy-config | 685 ++++++++++++--------- patches/busybox/1.18.1/1.18.1-mdstart.diff | 122 ---- patches/busybox/1.19.3/1.18.1-openvt.diff | 19 - .../busybox/1.19.3/busybox-1.19.3-mdstart.patch | 130 ---- .../busybox/1.19.3/busybox-1.7.4-signal-hack.patch | 28 - patches/busybox/1.20.1/1.18.1-openvt.diff | 19 - .../busybox/1.20.1/busybox-1.20.1-mdstart.patch | 130 ---- .../busybox/1.20.1/busybox-1.7.4-signal-hack.patch | 28 - patches/busybox/1.20.2/1.18.1-openvt.diff | 19 - .../busybox/1.20.2/busybox-1.20.1-mdstart.patch | 130 ---- .../busybox/1.20.2/busybox-1.20.2-bunzip2.patch | 12 - .../1.20.2/busybox-1.20.2-glibc-sys-resource.patch | 109 ---- .../busybox/1.20.2/busybox-1.7.4-signal-hack.patch | 28 - patches/busybox/1.26.0/1.18.1-openvt.diff | 19 - .../busybox/1.26.0/busybox-1.20.2-modprobe.patch | 26 - .../busybox/1.26.0/busybox-1.7.4-signal-hack.patch | 28 - .../busybox/{1.18.1 => 1.27.2}/1.18.1-openvt.diff | 0 patches/busybox/{1.18.1 => 1.27.2}/README | 0 .../busybox-1.20.2-modprobe.patch | 0 .../busybox-1.26.0-mdstart.patch | 0 .../busybox-1.7.4-signal-hack.patch | 0 21 files changed, 411 insertions(+), 1121 deletions(-) diff --git a/defaults/busy-config b/defaults/busy-config index 9561aa1..3393cf8 100644 --- a/defaults/busy-config +++ b/defaults/busy-config @@ -1,47 +1,55 @@ +# Gentoo patch: +CONFIG_MDSTART=y +# Options to match older versions of busybox: +CONFIG_ASH_BUILTIN_ECHO=y +CONFIG_ASH_BUILTIN_PRINTF=y +CONFIG_ASH_BUILTIN_TEST=y +CONFIG_FEATURE_AUTOWIDTH=y +CONFIG_FEATURE_BASH_IS_NONE=y +CONFIG_FEATURE_EXTRA_QUIET=y +CONFIG_FEATURE_FTP_WRITE=y +CONFIG_FEATURE_GREP_EGREP_ALIAS=y +CONFIG_FEATURE_GREP_FGREP_ALIAS=y +CONFIG_FEATURE_INITRD=y +CONFIG_FEATURE_IP_SHORT_FORMS=y +CONFIG_FEATURE_SH_IS_ASH=y +CONFIG_FEATURE_SYSTEMD=y +CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE=y +CONFIG_FEATURE_USE_TERMIOS=y +CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y +CONFIG_SH_MATH_SUPPORT_64=y +CONFIG_SH_MATH_SUPPORT=y +CONFIG_SWAPONOFF=y + # # Automatically generated make config: don't edit -# Busybox version: 1.20.2 -# Mon Jul 4 10:39:35 2016 +# Busybox version: 1.27.2 +# Sat Sep 2 21:29:42 2017 # CONFIG_HAVE_DOT_CONFIG=y # # Busybox Settings # - -# -# General Configuration -# # CONFIG_DESKTOP is not set # CONFIG_EXTRA_COMPAT is not set +# CONFIG_FEDORA_COMPAT is not set # CONFIG_INCLUDE_SUSv2 is not set # CONFIG_USE_PORTABLE_CODE is not set -CONFIG_PLATFORM_LINUX=y -CONFIG_FEATURE_BUFFERS_USE_MALLOC=y -# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set -# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set CONFIG_SHOW_USAGE=y CONFIG_FEATURE_VERBOSE_USAGE=y CONFIG_FEATURE_COMPRESS_USAGE=y +CONFIG_BUSYBOX=y CONFIG_FEATURE_INSTALLER=y # CONFIG_INSTALL_NO_USR is not set -# CONFIG_LOCALE_SUPPORT is not set -CONFIG_UNICODE_SUPPORT=y -# CONFIG_UNICODE_USING_LOCALE is not set -# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set -CONFIG_SUBST_WCHAR=63 -CONFIG_LAST_SUPPORTED_WCHAR=767 -# CONFIG_UNICODE_COMBINING_WCHARS is not set -# CONFIG_UNICODE_WIDE_WCHARS is not set -# CONFIG_UNICODE_BIDI_SUPPORT is not set -# CONFIG_UNICODE_NEUTRAL_TABLE is not set -# CONFIG_UNICODE_PRESERVE_BROKEN is not set +# CONFIG_PAM is not set CONFIG_LONG_OPTS=y CONFIG_FEATURE_DEVPTS=y # CONFIG_FEATURE_CLEAN_UP is not set # CONFIG_FEATURE_UTMP is not set # CONFIG_FEATURE_WTMP is not set # CONFIG_FEATURE_PIDFILE is not set +CONFIG_PID_FILE_PATH="" CONFIG_FEATURE_SUID=y # CONFIG_FEATURE_SUID_CONFIG is not set # CONFIG_FEATURE_SUID_CONFIG_QUIET is not set @@ -49,7 +57,8 @@ CONFIG_FEATURE_SUID=y CONFIG_FEATURE_PREFER_APPLETS=y CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" CONFIG_FEATURE_SYSLOG=y -CONFIG_FEATURE_HAVE_RPC=y +# CONFIG_FEATURE_HAVE_RPC is not set +CONFIG_PLATFORM_LINUX=y # # Build Options @@ -68,16 +77,6 @@ CONFIG_EXTRA_LDFLAGS="" CONFIG_EXTRA_LDLIBS="" # -# Debugging Options -# -# CONFIG_DEBUG is not set -# CONFIG_DEBUG_PESSIMIZE is not set -# CONFIG_WERROR is not set -CONFIG_NO_DEBUG_LIB=y -# CONFIG_DMALLOC is not set -# CONFIG_EFENCE is not set - -# # Installation Options ("make install" behavior) # CONFIG_INSTALL_APPLET_SYMLINKS=y @@ -90,15 +89,30 @@ CONFIG_INSTALL_APPLET_SYMLINKS=y CONFIG_PREFIX="./_install" # +# Debugging Options +# +# CONFIG_DEBUG is not set +# CONFIG_DEBUG_PESSIMIZE is not set +# CONFIG_DEBUG_SANITIZE is not set +# CONFIG_UNIT_TEST is not set +# CONFIG_WERROR is not set +CONFIG_NO_DEBUG_LIB=y +# CONFIG_DMALLOC is not set +# CONFIG_EFENCE is not set + +# # Busybox Library Tuning # -CONFIG_FEATURE_SYSTEMD=y +# CONFIG_FEATURE_USE_BSS_TAIL is not set CONFIG_FEATURE_RTMINMAX=y +CONFIG_FEATURE_BUFFERS_USE_MALLOC=y +# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set +# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set CONFIG_PASSWORD_MINLEN=6 CONFIG_MD5_SMALL=1 +CONFIG_SHA3_SMALL=1 # CONFIG_FEATURE_FAST_TOP is not set # CONFIG_FEATURE_ETC_NETWORKS is not set -CONFIG_FEATURE_USE_TERMIOS=y CONFIG_FEATURE_EDITING=y CONFIG_FEATURE_EDITING_MAX_LEN=1024 # CONFIG_FEATURE_EDITING_VI is not set @@ -110,8 +124,20 @@ CONFIG_FEATURE_TAB_COMPLETION=y # CONFIG_FEATURE_USERNAME_COMPLETION is not set CONFIG_FEATURE_EDITING_FANCY_PROMPT=y # CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set +# CONFIG_LOCALE_SUPPORT is not set +CONFIG_UNICODE_SUPPORT=y +# CONFIG_UNICODE_USING_LOCALE is not set +# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set +CONFIG_SUBST_WCHAR=63 +CONFIG_LAST_SUPPORTED_WCHAR=767 +# CONFIG_UNICODE_COMBINING_WCHARS is not set +# CONFIG_UNICODE_WIDE_WCHARS is not set +# CONFIG_UNICODE_BIDI_SUPPORT is not set +# CONFIG_UNICODE_NEUTRAL_TABLE is not set +# CONFIG_UNICODE_PRESERVE_BROKEN is not set CONFIG_FEATURE_NON_POSIX_CP=y # CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set +CONFIG_FEATURE_USE_SENDFILE=y CONFIG_FEATURE_COPYBUF_KB=4 CONFIG_FEATURE_SKIP_ROOTFS=y CONFIG_MONOTONIC_SYSCALL=y @@ -133,66 +159,61 @@ CONFIG_FEATURE_SEAMLESS_GZ=y CONFIG_AR=y CONFIG_FEATURE_AR_LONG_FILENAMES=y # CONFIG_FEATURE_AR_CREATE is not set +CONFIG_UNCOMPRESS=y +CONFIG_GUNZIP=y +CONFIG_ZCAT=y +CONFIG_FEATURE_GUNZIP_LONG_OPTIONS=y CONFIG_BUNZIP2=y +CONFIG_BZCAT=y +CONFIG_UNLZMA=y +CONFIG_LZCAT=y +CONFIG_LZMA=y +CONFIG_FEATURE_LZMA_FAST=y +CONFIG_UNXZ=y +CONFIG_XZCAT=y +CONFIG_XZ=y CONFIG_BZIP2=y +CONFIG_FEATURE_BZIP2_DECOMPRESS=y CONFIG_CPIO=y CONFIG_FEATURE_CPIO_O=y CONFIG_FEATURE_CPIO_P=y CONFIG_DPKG=y CONFIG_DPKG_DEB=y -# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set -CONFIG_GUNZIP=y CONFIG_GZIP=y CONFIG_FEATURE_GZIP_LONG_OPTIONS=y CONFIG_GZIP_FAST=0 +# CONFIG_FEATURE_GZIP_LEVELS is not set +CONFIG_FEATURE_GZIP_DECOMPRESS=y CONFIG_LZOP=y +CONFIG_UNLZOP=y +CONFIG_LZOPCAT=y # CONFIG_LZOP_COMPR_HIGH is not set CONFIG_RPM2CPIO=y CONFIG_RPM=y CONFIG_TAR=y +CONFIG_FEATURE_TAR_LONG_OPTIONS=y CONFIG_FEATURE_TAR_CREATE=y CONFIG_FEATURE_TAR_AUTODETECT=y CONFIG_FEATURE_TAR_FROM=y CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y # CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y -CONFIG_FEATURE_TAR_LONG_OPTIONS=y CONFIG_FEATURE_TAR_TO_COMMAND=y CONFIG_FEATURE_TAR_UNAME_GNAME=y CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y # CONFIG_FEATURE_TAR_SELINUX is not set -CONFIG_UNCOMPRESS=y -CONFIG_UNLZMA=y -CONFIG_FEATURE_LZMA_FAST=y -CONFIG_LZMA=y -CONFIG_UNXZ=y -CONFIG_XZ=y CONFIG_UNZIP=y +CONFIG_FEATURE_UNZIP_CDF=y +# CONFIG_FEATURE_UNZIP_BZIP2 is not set +# CONFIG_FEATURE_UNZIP_LZMA is not set +# CONFIG_FEATURE_UNZIP_XZ is not set # # Coreutils # CONFIG_BASENAME=y CONFIG_CAT=y -CONFIG_DATE=y -CONFIG_FEATURE_DATE_ISOFMT=y -# CONFIG_FEATURE_DATE_NANO is not set -CONFIG_FEATURE_DATE_COMPAT=y -CONFIG_HOSTID=y -CONFIG_ID=y -CONFIG_GROUPS=y -CONFIG_TEST=y -CONFIG_FEATURE_TEST_64=y -CONFIG_TOUCH=y -CONFIG_FEATURE_TOUCH_SUSV3=y -CONFIG_TR=y -CONFIG_FEATURE_TR_CLASSES=y -CONFIG_FEATURE_TR_EQUIV=y -CONFIG_BASE64=y -# CONFIG_WHO is not set -# CONFIG_USERS is not set -# CONFIG_CAL is not set -# CONFIG_CATV is not set +CONFIG_FEATURE_CATV=y CONFIG_CHGRP=y CONFIG_CHMOD=y CONFIG_CHOWN=y @@ -203,10 +224,15 @@ CONFIG_COMM=y CONFIG_CP=y CONFIG_FEATURE_CP_LONG_OPTIONS=y CONFIG_CUT=y +CONFIG_DATE=y +CONFIG_FEATURE_DATE_ISOFMT=y +CONFIG_FEATURE_DATE_NANO=y +CONFIG_FEATURE_DATE_COMPAT=y CONFIG_DD=y CONFIG_FEATURE_DD_SIGNAL_HANDLING=y CONFIG_FEATURE_DD_THIRD_STATUS_LINE=y # CONFIG_FEATURE_DD_IBS_OBS is not set +CONFIG_FEATURE_DD_STATUS=y CONFIG_DF=y CONFIG_FEATURE_DF_FANCY=y CONFIG_DIRNAME=y @@ -220,36 +246,57 @@ CONFIG_ENV=y # CONFIG_FEATURE_ENV_LONG_OPTIONS is not set # CONFIG_EXPAND is not set # CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set +# CONFIG_UNEXPAND is not set +# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set CONFIG_EXPR=y CONFIG_EXPR_MATH_SUPPORT_64=y +CONFIG_FACTOR=y CONFIG_FALSE=y CONFIG_FOLD=y CONFIG_FSYNC=y CONFIG_HEAD=y CONFIG_FEATURE_FANCY_HEAD=y +CONFIG_HOSTID=y +CONFIG_ID=y +CONFIG_GROUPS=y CONFIG_INSTALL=y CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y +CONFIG_LINK=y CONFIG_LN=y # CONFIG_LOGNAME is not set CONFIG_LS=y CONFIG_FEATURE_LS_FILETYPES=y CONFIG_FEATURE_LS_FOLLOWLINKS=y CONFIG_FEATURE_LS_RECURSIVE=y +CONFIG_FEATURE_LS_WIDTH=y CONFIG_FEATURE_LS_SORTFILES=y CONFIG_FEATURE_LS_TIMESTAMPS=y CONFIG_FEATURE_LS_USERNAME=y CONFIG_FEATURE_LS_COLOR=y # CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set CONFIG_MD5SUM=y +CONFIG_SHA1SUM=y +CONFIG_SHA256SUM=y +CONFIG_SHA512SUM=y +CONFIG_SHA3SUM=y + +# +# Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum +# +CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y CONFIG_MKDIR=y CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y CONFIG_MKFIFO=y CONFIG_MKNOD=y +CONFIG_MKTEMP=y CONFIG_MV=y # CONFIG_FEATURE_MV_LONG_OPTIONS is not set CONFIG_NICE=y +CONFIG_NL=y CONFIG_NOHUP=y +CONFIG_NPROC=y CONFIG_OD=y +CONFIG_PASTE=y CONFIG_PRINTENV=y CONFIG_PRINTF=y CONFIG_PWD=y @@ -260,9 +307,8 @@ CONFIG_RM=y CONFIG_RMDIR=y CONFIG_FEATURE_RMDIR_LONG_OPTIONS=y CONFIG_SEQ=y -CONFIG_SHA1SUM=y -CONFIG_SHA256SUM=y -CONFIG_SHA512SUM=y +CONFIG_SHRED=y +CONFIG_SHUF=y CONFIG_SLEEP=y CONFIG_FEATURE_FANCY_SLEEP=y CONFIG_FEATURE_FLOAT_SLEEP=y @@ -272,37 +318,55 @@ CONFIG_SPLIT=y CONFIG_FEATURE_SPLIT_FANCY=y CONFIG_STAT=y CONFIG_FEATURE_STAT_FORMAT=y +CONFIG_FEATURE_STAT_FILESYSTEM=y CONFIG_STTY=y # CONFIG_SUM is not set CONFIG_SYNC=y +CONFIG_FEATURE_SYNC_FANCY=y CONFIG_TAC=y CONFIG_TAIL=y CONFIG_FEATURE_FANCY_TAIL=y CONFIG_TEE=y CONFIG_FEATURE_TEE_USE_BLOCK_IO=y +CONFIG_TEST=y +CONFIG_TEST1=y +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 +CONFIG_FEATURE_TR_EQUIV=y CONFIG_TRUE=y +CONFIG_TRUNCATE=y CONFIG_TTY=y CONFIG_UNAME=y -# CONFIG_UNEXPAND is not set -# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set +CONFIG_UNAME_OSNAME="GNU/Linux" CONFIG_UNIQ=y +CONFIG_UNLINK=y CONFIG_USLEEP=y # CONFIG_UUDECODE is not set +CONFIG_BASE64=y # CONFIG_UUENCODE is not set CONFIG_WC=y CONFIG_FEATURE_WC_LARGE=y CONFIG_WHOAMI=y +# CONFIG_WHO is not set +# CONFIG_W is not set +# CONFIG_USERS is not set CONFIG_YES=y # -# Common options for cp and mv +# Common options # -CONFIG_FEATURE_PRESERVE_HARDLINKS=y +CONFIG_FEATURE_VERBOSE=y # -# Common options for ls, more and telnet +# Common options for cp and mv # -CONFIG_FEATURE_AUTOWIDTH=y +CONFIG_FEATURE_PRESERVE_HARDLINKS=y # # Common options for df, du, ls @@ -310,20 +374,24 @@ CONFIG_FEATURE_AUTOWIDTH=y CONFIG_FEATURE_HUMAN_READABLE=y # -# Common options for md5sum, sha1sum, sha256sum, sha512sum -# -CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y - -# # Console Utilities # CONFIG_CHVT=y -CONFIG_FGCONSOLE=y CONFIG_CLEAR=y CONFIG_DEALLOCVT=y CONFIG_DUMPKMAP=y +CONFIG_FGCONSOLE=y CONFIG_KBD_MODE=y CONFIG_LOADFONT=y +CONFIG_SETFONT=y +CONFIG_FEATURE_SETFONT_TEXTUAL_MAP=y +CONFIG_DEFAULT_SETFONT_DIR="" + +# +# Common options for loadfont and setfont +# +CONFIG_FEATURE_LOADFONT_PSF2=y +CONFIG_FEATURE_LOADFONT_RAW=y CONFIG_LOADKMAP=y CONFIG_OPENVT=y CONFIG_RESET=y @@ -331,36 +399,35 @@ CONFIG_RESIZE=y CONFIG_FEATURE_RESIZE_PRINT=y CONFIG_SETCONSOLE=y CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS=y -CONFIG_SETFONT=y -CONFIG_FEATURE_SETFONT_TEXTUAL_MAP=y -CONFIG_DEFAULT_SETFONT_DIR="" CONFIG_SETKEYCODES=y CONFIG_SETLOGCONS=y CONFIG_SHOWKEY=y # -# Common options for loadfont and setfont -# -CONFIG_FEATURE_LOADFONT_PSF2=y -CONFIG_FEATURE_LOADFONT_RAW=y - -# # Debian Utilities # -CONFIG_MKTEMP=y # CONFIG_PIPE_PROGRESS 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 +# CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set CONFIG_WHICH=y # # Editors # -# CONFIG_PATCH is not set +CONFIG_AWK=y +CONFIG_FEATURE_AWK_LIBM=y +CONFIG_FEATURE_AWK_GNU_EXTENSIONS=y +CONFIG_CMP=y +CONFIG_DIFF=y +CONFIG_FEATURE_DIFF_LONG_OPTIONS=y +CONFIG_FEATURE_DIFF_DIR=y +CONFIG_ED=y +CONFIG_PATCH=y +CONFIG_SED=y CONFIG_VI=y CONFIG_FEATURE_VI_MAX_LEN=4096 # CONFIG_FEATURE_VI_8BIT is not set @@ -375,15 +442,9 @@ CONFIG_FEATURE_VI_SETOPTS=y CONFIG_FEATURE_VI_SET=y CONFIG_FEATURE_VI_WIN_RESIZE=y # CONFIG_FEATURE_VI_ASK_TERMINAL is not set -CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y -CONFIG_AWK=y -CONFIG_FEATURE_AWK_LIBM=y -CONFIG_CMP=y -CONFIG_DIFF=y -# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set -CONFIG_FEATURE_DIFF_DIR=y -# CONFIG_ED is not set -CONFIG_SED=y +CONFIG_FEATURE_VI_UNDO=y +CONFIG_FEATURE_VI_UNDO_QUEUE=y +CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=256 CONFIG_FEATURE_ALLOW_EXEC=y # @@ -400,6 +461,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 @@ -413,14 +475,15 @@ CONFIG_FEATURE_FIND_REGEX=y # CONFIG_FEATURE_FIND_CONTEXT is not set CONFIG_FEATURE_FIND_LINKS=y CONFIG_GREP=y -CONFIG_FEATURE_GREP_EGREP_ALIAS=y -CONFIG_FEATURE_GREP_FGREP_ALIAS=y +CONFIG_EGREP=y +CONFIG_FGREP=y CONFIG_FEATURE_GREP_CONTEXT=y CONFIG_XARGS=y # CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set 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 @@ -429,57 +492,60 @@ CONFIG_BOOTCHARTD=y CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER=y CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE=y CONFIG_HALT=y +CONFIG_POWEROFF=y +CONFIG_REBOOT=y # CONFIG_FEATURE_CALL_TELINIT is not set CONFIG_TELINIT_PATH="" CONFIG_INIT=y +# CONFIG_LINUXRC is not set CONFIG_FEATURE_USE_INITTAB=y # CONFIG_FEATURE_KILL_REMOVED is not set CONFIG_FEATURE_KILL_DELAY=0 # CONFIG_FEATURE_INIT_SCTTY is not set # CONFIG_FEATURE_INIT_SYSLOG is not set -CONFIG_FEATURE_EXTRA_QUIET=y +# CONFIG_FEATURE_INIT_QUIET is not set # CONFIG_FEATURE_INIT_COREDUMPS is not set -CONFIG_FEATURE_INITRD=y CONFIG_INIT_TERMINAL_TYPE="linux" -CONFIG_MESG=y -CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP=y +# CONFIG_FEATURE_INIT_MODIFY_CMDLINE is not set # # Login/Password Management Utilities # -# CONFIG_ADD_SHELL is not set -# CONFIG_REMOVE_SHELL is not set CONFIG_FEATURE_SHADOWPASSWDS=y CONFIG_USE_BB_PWD_GRP=y CONFIG_USE_BB_SHADOW=y CONFIG_USE_BB_CRYPT=y CONFIG_USE_BB_CRYPT_SHA=y +# CONFIG_ADDGROUP is not set +# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set +# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set +# CONFIG_ADD_SHELL is not set +# CONFIG_REMOVE_SHELL is not set # CONFIG_ADDUSER is not set # CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set # CONFIG_FEATURE_CHECK_NAMES is not set +CONFIG_LAST_ID=0 CONFIG_FIRST_SYSTEM_ID=0 CONFIG_LAST_SYSTEM_ID=0 -# CONFIG_ADDGROUP is not set -# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set -# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set +CONFIG_CHPASSWD=y +CONFIG_FEATURE_DEFAULT_PASSWD_ALGO="des" +# CONFIG_CRYPTPW is not set +CONFIG_MKPASSWD=y # CONFIG_DELUSER is not set # CONFIG_DELGROUP is not set # CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set CONFIG_GETTY=y CONFIG_LOGIN=y # CONFIG_LOGIN_SESSION_AS_CHILD is not set -# CONFIG_PAM is not set # CONFIG_LOGIN_SCRIPTS is not set CONFIG_FEATURE_NOLOGIN=y # CONFIG_FEATURE_SECURETTY is not set CONFIG_PASSWD=y CONFIG_FEATURE_PASSWD_WEAK_CHECK=y -# CONFIG_CRYPTPW is not set -CONFIG_CHPASSWD=y -CONFIG_FEATURE_DEFAULT_PASSWD_ALGO="des" # CONFIG_SU is not set # CONFIG_FEATURE_SU_SYSLOG is not set # CONFIG_FEATURE_SU_CHECKS_SHELLS is not set +# CONFIG_FEATURE_SU_BLANK_PW_NEEDS_SECURE_TTY is not set # CONFIG_SULOGIN is not set # CONFIG_VLOCK is not set @@ -494,29 +560,29 @@ CONFIG_FEATURE_DEFAULT_PASSWD_ALGO="des" # # Linux Module Utilities # -CONFIG_MODINFO=y # CONFIG_MODPROBE_SMALL is not set -# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set -# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set +CONFIG_DEPMOD=y CONFIG_INSMOD=y -CONFIG_RMMOD=y CONFIG_LSMOD=y CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y +CONFIG_MODINFO=y CONFIG_MODPROBE=y CONFIG_FEATURE_MODPROBE_BLACKLIST=y -CONFIG_DEPMOD=y +CONFIG_RMMOD=y # # Options common to multiple modutils # +CONFIG_FEATURE_CMDLINE_MODULE_OPTIONS=y +# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set # CONFIG_FEATURE_2_4_MODULES is not set -CONFIG_FEATURE_INSMOD_TRY_MMAP=y # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set # CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set # CONFIG_FEATURE_INSMOD_LOAD_MAP is not set # CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set CONFIG_FEATURE_CHECK_TAINTED_MODULE=y +CONFIG_FEATURE_INSMOD_TRY_MMAP=y CONFIG_FEATURE_MODUTILS_ALIAS=y CONFIG_FEATURE_MODUTILS_SYMBOLS=y CONFIG_DEFAULT_MODULES_DIR="/lib/modules" @@ -525,27 +591,26 @@ CONFIG_DEFAULT_DEPMOD_FILE="modules.dep" # # Linux System Utilities # -CONFIG_BLOCKDEV=y -CONFIG_MDEV=y -CONFIG_FEATURE_MDEV_CONF=y -CONFIG_FEATURE_MDEV_RENAME=y -# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set -CONFIG_FEATURE_MDEV_EXEC=y -CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y -CONFIG_REV=y CONFIG_ACPID=y CONFIG_FEATURE_ACPID_COMPAT=y +CONFIG_BLKDISCARD=y CONFIG_BLKID=y # CONFIG_FEATURE_BLKID_TYPE is not set +CONFIG_BLOCKDEV=y +# CONFIG_CAL is not set +# CONFIG_CHRT is not set CONFIG_DMESG=y CONFIG_FEATURE_DMESG_PRETTY=y +# CONFIG_EJECT is not set +# CONFIG_FEATURE_EJECT_SCSI is not set +CONFIG_FALLOCATE=y +CONFIG_FATATTR=y # CONFIG_FBSET is not set # CONFIG_FEATURE_FBSET_FANCY is not set # CONFIG_FEATURE_FBSET_READMODE is not set -# CONFIG_FDFLUSH is not set # CONFIG_FDFORMAT is not set CONFIG_FDISK=y -CONFIG_FDISK_SUPPORT_LARGE_DISKS=y +# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set CONFIG_FEATURE_FDISK_WRITABLE=y CONFIG_FEATURE_AIX_LABEL=y CONFIG_FEATURE_SGI_LABEL=y @@ -555,27 +620,43 @@ CONFIG_FEATURE_GPT_LABEL=y CONFIG_FEATURE_FDISK_ADVANCED=y CONFIG_FINDFS=y CONFIG_FLOCK=y +# CONFIG_FDFLUSH is not set CONFIG_FREERAMDISK=y # CONFIG_FSCK_MINIX is not set -CONFIG_MKFS_EXT2=y -# CONFIG_MKFS_MINIX is not set -# CONFIG_FEATURE_MINIX2 is not set -# CONFIG_MKFS_REISER is not set -CONFIG_MKFS_VFAT=y +CONFIG_FSFREEZE=y +CONFIG_FSTRIM=y CONFIG_GETOPT=y CONFIG_FEATURE_GETOPT_LONG=y CONFIG_HEXDUMP=y CONFIG_FEATURE_HEXDUMP_REVERSE=y CONFIG_HD=y +CONFIG_XXD=y CONFIG_HWCLOCK=y CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y # CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set +CONFIG_IONICE=y # CONFIG_IPCRM is not set # CONFIG_IPCS is not set +# CONFIG_LAST is not set +# CONFIG_FEATURE_LAST_FANCY is not set CONFIG_LOSETUP=y CONFIG_LSPCI=y CONFIG_LSUSB=y -CONFIG_MDSTART=y +CONFIG_MDEV=y +CONFIG_FEATURE_MDEV_CONF=y +CONFIG_FEATURE_MDEV_RENAME=y +# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set +CONFIG_FEATURE_MDEV_EXEC=y +CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y +CONFIG_MESG=y +CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP=y +CONFIG_MKE2FS=y +CONFIG_MKFS_EXT2=y +# CONFIG_MKFS_MINIX is not set +# CONFIG_FEATURE_MINIX2 is not set +# CONFIG_MKFS_REISER is not set +CONFIG_MKDOSFS=y +CONFIG_MKFS_VFAT=y CONFIG_MKSWAP=y CONFIG_FEATURE_MKSWAP_UUID=y CONFIG_MORE=y @@ -588,19 +669,36 @@ CONFIG_FEATURE_MOUNT_LABEL=y CONFIG_FEATURE_MOUNT_CIFS=y CONFIG_FEATURE_MOUNT_FLAGS=y CONFIG_FEATURE_MOUNT_FSTAB=y +CONFIG_FEATURE_MOUNT_OTHERTAB=y +CONFIG_MOUNTPOINT=y +CONFIG_NSENTER=y +CONFIG_FEATURE_NSENTER_LONG_OPTS=y CONFIG_PIVOT_ROOT=y CONFIG_RDATE=y CONFIG_RDEV=y # CONFIG_READPROFILE is not set +CONFIG_RENICE=y +CONFIG_REV=y CONFIG_RTCWAKE=y CONFIG_SCRIPT=y CONFIG_SCRIPTREPLAY=y CONFIG_SETARCH=y -CONFIG_SWAPONOFF=y +CONFIG_LINUX32=y +CONFIG_LINUX64=y +CONFIG_SETPRIV=y +CONFIG_SETSID=y +CONFIG_SWAPON=y +CONFIG_FEATURE_SWAPON_DISCARD=y CONFIG_FEATURE_SWAPON_PRI=y +CONFIG_SWAPOFF=y CONFIG_SWITCH_ROOT=y +# CONFIG_TASKSET is not set +# CONFIG_FEATURE_TASKSET_FANCY is not set +CONFIG_UEVENT=y CONFIG_UMOUNT=y CONFIG_FEATURE_UMOUNT_ALL=y +CONFIG_UNSHARE=y +# CONFIG_WALL is not set # # Common options for mount/umount @@ -613,47 +711,33 @@ CONFIG_VOLUMEID=y # # Filesystem/Volume identification # -CONFIG_FEATURE_VOLUMEID_EXT=y +CONFIG_FEATURE_VOLUMEID_BCACHE=y CONFIG_FEATURE_VOLUMEID_BTRFS=y -CONFIG_FEATURE_VOLUMEID_REISERFS=y +CONFIG_FEATURE_VOLUMEID_CRAMFS=y +CONFIG_FEATURE_VOLUMEID_EXFAT=y +CONFIG_FEATURE_VOLUMEID_EXT=y +CONFIG_FEATURE_VOLUMEID_F2FS=y CONFIG_FEATURE_VOLUMEID_FAT=y CONFIG_FEATURE_VOLUMEID_HFS=y -CONFIG_FEATURE_VOLUMEID_JFS=y -CONFIG_FEATURE_VOLUMEID_XFS=y -CONFIG_FEATURE_VOLUMEID_NTFS=y CONFIG_FEATURE_VOLUMEID_ISO9660=y -CONFIG_FEATURE_VOLUMEID_UDF=y -CONFIG_FEATURE_VOLUMEID_LUKS=y +CONFIG_FEATURE_VOLUMEID_JFS=y +CONFIG_FEATURE_VOLUMEID_LINUXRAID=y CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y -CONFIG_FEATURE_VOLUMEID_CRAMFS=y +CONFIG_FEATURE_VOLUMEID_LUKS=y +CONFIG_FEATURE_VOLUMEID_NILFS=y +CONFIG_FEATURE_VOLUMEID_NTFS=y +CONFIG_FEATURE_VOLUMEID_OCFS2=y +CONFIG_FEATURE_VOLUMEID_REISERFS=y CONFIG_FEATURE_VOLUMEID_ROMFS=y +# CONFIG_FEATURE_VOLUMEID_SQUASHFS is not set CONFIG_FEATURE_VOLUMEID_SYSV=y -CONFIG_FEATURE_VOLUMEID_OCFS2=y -CONFIG_FEATURE_VOLUMEID_LINUXRAID=y +CONFIG_FEATURE_VOLUMEID_UBIFS=y +CONFIG_FEATURE_VOLUMEID_UDF=y +CONFIG_FEATURE_VOLUMEID_XFS=y # # Miscellaneous Utilities # -CONFIG_CONSPY=y -CONFIG_LESS=y -CONFIG_FEATURE_LESS_MAXLINES=0 -# CONFIG_FEATURE_LESS_BRACKETS is not set -# CONFIG_FEATURE_LESS_FLAGS is not set -# CONFIG_FEATURE_LESS_MARKS is not set -# CONFIG_FEATURE_LESS_REGEXP is not set -# CONFIG_FEATURE_LESS_WINCH is not set -# CONFIG_FEATURE_LESS_ASK_TERMINAL is not set -# CONFIG_FEATURE_LESS_DASHCMD is not set -# CONFIG_FEATURE_LESS_LINENUMS is not set -# CONFIG_NANDWRITE is not set -# CONFIG_NANDDUMP is not set -CONFIG_SETSERIAL=y -CONFIG_UBIATTACH=y -CONFIG_UBIDETACH=y -CONFIG_UBIMKVOL=y -CONFIG_UBIRMVOL=y -CONFIG_UBIRSVOL=y -CONFIG_UBIUPDATEVOL=y # CONFIG_ADJTIMEX is not set CONFIG_BBCONFIG=y CONFIG_FEATURE_COMPRESS_BBCONFIG=y @@ -668,7 +752,7 @@ CONFIG_FEATURE_BEEP_LENGTH_MS=30 # CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set # CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set # CONFIG_FEATURE_CHAT_CLR_ABORT is not set -# CONFIG_CHRT is not set +CONFIG_CONSPY=y # CONFIG_CROND is not set # CONFIG_FEATURE_CROND_D is not set # CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set @@ -682,64 +766,68 @@ CONFIG_DC=y # CONFIG_DEVFSD_VERBOSE is not set # CONFIG_FEATURE_DEVFS is not set CONFIG_DEVMEM=y -# CONFIG_EJECT is not set -# CONFIG_FEATURE_EJECT_SCSI is not set CONFIG_FBSPLASH=y # CONFIG_FLASHCP is not set +# CONFIG_FLASH_ERASEALL is not set # CONFIG_FLASH_LOCK is not set # CONFIG_FLASH_UNLOCK is not set -# CONFIG_FLASH_ERASEALL is not set -CONFIG_IONICE=y +CONFIG_HDPARM=y +CONFIG_FEATURE_HDPARM_GET_IDENTITY=y +CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF=y +CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF=y +CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET=y +CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF=y +CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA=y +CONFIG_I2CGET=y +CONFIG_I2CSET=y +CONFIG_I2CDUMP=y +CONFIG_I2CDETECT=y # CONFIG_INOTIFYD is not set -# CONFIG_LAST is not set -# CONFIG_FEATURE_LAST_SMALL is not set -# CONFIG_FEATURE_LAST_FANCY 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 -# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set -# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set +CONFIG_LESS=y +CONFIG_FEATURE_LESS_MAXLINES=0 +# CONFIG_FEATURE_LESS_BRACKETS is not set +# CONFIG_FEATURE_LESS_FLAGS is not set +CONFIG_FEATURE_LESS_TRUNCATE=y +# CONFIG_FEATURE_LESS_MARKS is not set +# CONFIG_FEATURE_LESS_REGEXP is not set +# CONFIG_FEATURE_LESS_WINCH is not set +# CONFIG_FEATURE_LESS_ASK_TERMINAL is not set +# CONFIG_FEATURE_LESS_DASHCMD is not set +# CONFIG_FEATURE_LESS_LINENUMS is not set +CONFIG_LSSCSI=y CONFIG_MAKEDEVS=y CONFIG_FEATURE_MAKEDEVS_LEAF=y # CONFIG_FEATURE_MAKEDEVS_TABLE is not set CONFIG_MAN=y CONFIG_MICROCOM=y -CONFIG_MOUNTPOINT=y CONFIG_MT=y +# CONFIG_NANDWRITE is not set +# CONFIG_NANDDUMP is not set +CONFIG_PARTPROBE=y CONFIG_RAIDAUTORUN=y CONFIG_READAHEAD=y # CONFIG_RFKILL is not set # CONFIG_RUNLEVEL is not set CONFIG_RX=y -CONFIG_SETSID=y +CONFIG_SETSERIAL=y CONFIG_STRINGS=y -# CONFIG_TASKSET is not set -# CONFIG_FEATURE_TASKSET_FANCY is not set CONFIG_TIME=y -CONFIG_TIMEOUT=y CONFIG_TTYSIZE=y +CONFIG_UBIRENAME=y +CONFIG_UBIATTACH=y +CONFIG_UBIDETACH=y +CONFIG_UBIMKVOL=y +CONFIG_UBIRMVOL=y +CONFIG_UBIRSVOL=y +CONFIG_UBIUPDATEVOL=y CONFIG_VOLNAME=y -# CONFIG_WALL is not set # CONFIG_WATCHDOG is not set # # Networking Utilities # -# CONFIG_NAMEIF is not set -# CONFIG_FEATURE_NAMEIF_EXTENDED is not set -CONFIG_NBDCLIENT=y -CONFIG_NC=y -CONFIG_NC_SERVER=y -CONFIG_NC_EXTRA=y -# CONFIG_NC_110_COMPAT is not set -CONFIG_PING=y -CONFIG_PING6=y -CONFIG_FEATURE_FANCY_PING=y -CONFIG_WHOIS=y CONFIG_FEATURE_IPV6=y -# CONFIG_FEATURE_UNIX_LOCAL is not set +CONFIG_FEATURE_UNIX_LOCAL=y # CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set CONFIG_VERBOSE_RESOLUTION_ERRORS=y # CONFIG_ARP is not set @@ -749,17 +837,17 @@ CONFIG_FEATURE_BRCTL_FANCY=y CONFIG_FEATURE_BRCTL_SHOW=y # CONFIG_DNSD is not set # CONFIG_ETHER_WAKE is not set -# CONFIG_FAKEIDENTD is not set CONFIG_FTPD=y -CONFIG_FEATURE_FTP_WRITE=y +CONFIG_FEATURE_FTPD_WRITE=y CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y +CONFIG_FEATURE_FTPD_AUTHENTICATION=y CONFIG_FTPGET=y CONFIG_FTPPUT=y # CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set CONFIG_HOSTNAME=y +CONFIG_DNSDOMAINNAME=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 @@ -778,11 +866,10 @@ CONFIG_FEATURE_IFCONFIG_HW=y CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y CONFIG_IFENSLAVE=y CONFIG_IFPLUGD=y -# CONFIG_IFUPDOWN is not set +CONFIG_IFUP=y +CONFIG_IFDOWN=y CONFIG_IFUPDOWN_IFSTATE_PATH="" # CONFIG_FEATURE_IFUPDOWN_IP is not set -# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set -# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set # CONFIG_FEATURE_IFUPDOWN_IPV4 is not set # CONFIG_FEATURE_IFUPDOWN_IPV6 is not set # CONFIG_FEATURE_IFUPDOWN_MAPPING is not set @@ -795,34 +882,51 @@ CONFIG_IFUPDOWN_IFSTATE_PATH="" # CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set # CONFIG_FEATURE_INETD_RPC is not set CONFIG_IP=y +CONFIG_IPADDR=y +CONFIG_IPLINK=y +CONFIG_IPROUTE=y +CONFIG_IPTUNNEL=y +CONFIG_IPRULE=y +CONFIG_IPNEIGH=y CONFIG_FEATURE_IP_ADDRESS=y CONFIG_FEATURE_IP_LINK=y CONFIG_FEATURE_IP_ROUTE=y +CONFIG_FEATURE_IP_ROUTE_DIR="/etc/iproute2" CONFIG_FEATURE_IP_TUNNEL=y CONFIG_FEATURE_IP_RULE=y -CONFIG_FEATURE_IP_SHORT_FORMS=y +CONFIG_FEATURE_IP_NEIGH=y # CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set -CONFIG_IPADDR=y -CONFIG_IPLINK=y -CONFIG_IPROUTE=y -CONFIG_IPTUNNEL=y -CONFIG_IPRULE=y CONFIG_IPCALC=y -CONFIG_FEATURE_IPCALC_FANCY=y CONFIG_FEATURE_IPCALC_LONG_OPTIONS=y +CONFIG_FEATURE_IPCALC_FANCY=y +# CONFIG_FAKEIDENTD is not set +CONFIG_NAMEIF=y +CONFIG_FEATURE_NAMEIF_EXTENDED=y +CONFIG_NBDCLIENT=y +CONFIG_NC=y +CONFIG_NC_SERVER=y +CONFIG_NC_EXTRA=y +# CONFIG_NC_110_COMPAT is not set CONFIG_NETSTAT=y CONFIG_FEATURE_NETSTAT_WIDE=y 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 CONFIG_PSCAN=y CONFIG_ROUTE=y # CONFIG_SLATTACH is not set +CONFIG_SSL_CLIENT=y # CONFIG_TCPSVD is not set +# CONFIG_UDPSVD is not set # CONFIG_TELNET is not set # CONFIG_FEATURE_TELNET_TTYPE is not set # CONFIG_FEATURE_TELNET_AUTOLOGIN is not set +# CONFIG_FEATURE_TELNET_WIDTH is not set # CONFIG_TELNETD is not set # CONFIG_FEATURE_TELNETD_STANDALONE is not set # CONFIG_FEATURE_TELNETD_INETD_WAIT is not set @@ -837,37 +941,43 @@ CONFIG_FEATURE_TFTP_PUT=y CONFIG_FEATURE_TFTP_BLOCKSIZE=y CONFIG_FEATURE_TFTP_PROGRESS_BAR=y # CONFIG_TFTP_DEBUG is not set +CONFIG_TLS=y CONFIG_TRACEROUTE=y -# CONFIG_TRACEROUTE6 is not set +CONFIG_TRACEROUTE6=y CONFIG_FEATURE_TRACEROUTE_VERBOSE=y -CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE=y CONFIG_FEATURE_TRACEROUTE_USE_ICMP=y CONFIG_TUNCTL=y CONFIG_FEATURE_TUNCTL_UG=y +CONFIG_VCONFIG=y +CONFIG_WGET=y +CONFIG_FEATURE_WGET_LONG_OPTIONS=y +CONFIG_FEATURE_WGET_STATUSBAR=y +CONFIG_FEATURE_WGET_AUTHENTICATION=y +CONFIG_FEATURE_WGET_TIMEOUT=y +CONFIG_FEATURE_WGET_HTTPS=y +# CONFIG_FEATURE_WGET_OPENSSL is not set +CONFIG_WHOIS=y +CONFIG_ZCIP=y CONFIG_UDHCPC6=y +CONFIG_FEATURE_UDHCPC6_RFC3646=y +CONFIG_FEATURE_UDHCPC6_RFC4704=y +CONFIG_FEATURE_UDHCPC6_RFC4833=y # CONFIG_UDHCPD is not set -# CONFIG_DHCPRELAY is not set -# CONFIG_DUMPLEASES is not set # CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set # CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set -CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases" +CONFIG_DHCPD_LEASES_FILE="" +# CONFIG_DUMPLEASES is not set +# CONFIG_DHCPRELAY is not set CONFIG_UDHCPC=y CONFIG_FEATURE_UDHCPC_ARPING=y +CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y +CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script" # CONFIG_FEATURE_UDHCP_PORT is not set CONFIG_UDHCP_DEBUG=9 CONFIG_FEATURE_UDHCP_RFC3397=y CONFIG_FEATURE_UDHCP_8021Q=y -CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script" CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="" -# CONFIG_UDPSVD is not set -CONFIG_VCONFIG=y -CONFIG_WGET=y -CONFIG_FEATURE_WGET_STATUSBAR=y -CONFIG_FEATURE_WGET_AUTHENTICATION=y -CONFIG_FEATURE_WGET_LONG_OPTIONS=y -CONFIG_FEATURE_WGET_TIMEOUT=y -CONFIG_ZCIP=y # # Print Utilities @@ -880,107 +990,116 @@ CONFIG_ZCIP=y # Mail Utilities # CONFIG_MAKEMIME=y -CONFIG_FEATURE_MIME_CHARSET="us-ascii" CONFIG_POPMAILDIR=y CONFIG_FEATURE_POPMAILDIR_DELIVERY=y CONFIG_REFORMIME=y CONFIG_FEATURE_REFORMIME_COMPAT=y CONFIG_SENDMAIL=y +CONFIG_FEATURE_MIME_CHARSET="us-ascii" # # Process Utilities # -CONFIG_IOSTAT=y -CONFIG_LSOF=y -CONFIG_MPSTAT=y -# CONFIG_NMETER is not set -CONFIG_PMAP=y -CONFIG_POWERTOP=y -CONFIG_PSTREE=y -CONFIG_PWDX=y -CONFIG_SMEMCAP=y -CONFIG_UPTIME=y -# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set CONFIG_FREE=y -# CONFIG_FUSER is not set +CONFIG_FUSER=y +CONFIG_IOSTAT=y CONFIG_KILL=y CONFIG_KILLALL=y # CONFIG_KILLALL5 is not set +CONFIG_LSOF=y +CONFIG_MPSTAT=y +# CONFIG_NMETER is not set CONFIG_PGREP=y +CONFIG_PKILL=y CONFIG_PIDOF=y CONFIG_FEATURE_PIDOF_SINGLE=y CONFIG_FEATURE_PIDOF_OMIT=y -CONFIG_PKILL=y +CONFIG_PMAP=y +CONFIG_POWERTOP=y +CONFIG_FEATURE_POWERTOP_INTERACTIVE=y CONFIG_PS=y CONFIG_FEATURE_PS_WIDE=y CONFIG_FEATURE_PS_LONG=y # CONFIG_FEATURE_PS_TIME is not set -# CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set # CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set -CONFIG_RENICE=y +# CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set +CONFIG_PSTREE=y +CONFIG_PWDX=y +CONFIG_SMEMCAP=y CONFIG_BB_SYSCTL=y CONFIG_TOP=y +CONFIG_FEATURE_TOP_INTERACTIVE=y CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y # CONFIG_FEATURE_TOP_SMP_CPU is not set # CONFIG_FEATURE_TOP_DECIMALS is not set # CONFIG_FEATURE_TOP_SMP_PROCESS is not set -# CONFIG_FEATURE_TOPMEM is not set +CONFIG_FEATURE_TOPMEM=y +CONFIG_UPTIME=y +# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set +CONFIG_WATCH=y CONFIG_FEATURE_SHOW_THREADS=y -# CONFIG_WATCH is not set # # Runit Utilities # +# CONFIG_CHPST is not set +# CONFIG_SETUIDGID is not set +# CONFIG_ENVUIDGID is not set +# CONFIG_ENVDIR is not set +# CONFIG_SOFTLIMIT is not set # CONFIG_RUNSV is not set # CONFIG_RUNSVDIR is not set # CONFIG_FEATURE_RUNSVDIR_LOG is not set # CONFIG_SV is not set CONFIG_SV_DEFAULT_SERVICE_DIR="" +# CONFIG_SVC is not set # CONFIG_SVLOGD is not set -# CONFIG_CHPST is not set -# CONFIG_SETUIDGID is not set -# 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_RESTORECON is not set # CONFIG_RUNCON is not set # CONFIG_FEATURE_RUNCON_LONG_OPTIONS 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 -# CONFIG_SESTATUS is not set # # Shells # +CONFIG_SH_IS_ASH=y +# CONFIG_SH_IS_HUSH is not set +# CONFIG_SH_IS_NONE is not set +# CONFIG_BASH_IS_ASH is not set +# CONFIG_BASH_IS_HUSH is not set +CONFIG_BASH_IS_NONE=y CONFIG_ASH=y +CONFIG_ASH_OPTIMIZE_FOR_SIZE=y +CONFIG_ASH_INTERNAL_GLOB=y CONFIG_ASH_BASH_COMPAT=y -CONFIG_ASH_IDLE_TIMEOUT=y CONFIG_ASH_JOB_CONTROL=y CONFIG_ASH_ALIAS=y -CONFIG_ASH_GETOPTS=y -CONFIG_ASH_BUILTIN_ECHO=y -CONFIG_ASH_BUILTIN_PRINTF=y -CONFIG_ASH_BUILTIN_TEST=y -CONFIG_ASH_CMDCMD=y -CONFIG_ASH_MAIL=y -CONFIG_ASH_OPTIMIZE_FOR_SIZE=y CONFIG_ASH_RANDOM_SUPPORT=y # CONFIG_ASH_EXPAND_PRMT is not set +CONFIG_ASH_IDLE_TIMEOUT=y +CONFIG_ASH_MAIL=y +CONFIG_ASH_ECHO=y +CONFIG_ASH_PRINTF=y +CONFIG_ASH_TEST=y +CONFIG_ASH_HELP=y +CONFIG_ASH_GETOPTS=y +CONFIG_ASH_CMDCMD=y CONFIG_CTTYHACK=y # CONFIG_HUSH is not set # CONFIG_HUSH_BASH_COMPAT is not set # CONFIG_HUSH_BRACE_EXPANSION is not set -# CONFIG_HUSH_HELP is not set # CONFIG_HUSH_INTERACTIVE is not set # CONFIG_HUSH_SAVEHISTORY is not set # CONFIG_HUSH_JOB is not set @@ -991,17 +1110,30 @@ CONFIG_CTTYHACK=y # CONFIG_HUSH_FUNCTIONS is not set # CONFIG_HUSH_LOCAL is not set # CONFIG_HUSH_RANDOM_SUPPORT is not set -# CONFIG_HUSH_EXPORT_N is not set # CONFIG_HUSH_MODE_X is not set +# CONFIG_HUSH_ECHO is not set +# CONFIG_HUSH_PRINTF is not set +# CONFIG_HUSH_TEST is not set +# CONFIG_HUSH_HELP is not set +# CONFIG_HUSH_EXPORT is not set +# CONFIG_HUSH_EXPORT_N is not set +# CONFIG_HUSH_KILL is not set +# CONFIG_HUSH_WAIT is not set +# CONFIG_HUSH_TRAP is not set +# CONFIG_HUSH_TYPE is not set +# CONFIG_HUSH_READ is not set +# CONFIG_HUSH_SET is not set +# CONFIG_HUSH_UNSET is not set +# CONFIG_HUSH_ULIMIT is not set +# CONFIG_HUSH_UMASK is not set +# CONFIG_HUSH_MEMLEAK is not set # CONFIG_MSH is not set -CONFIG_FEATURE_SH_IS_ASH=y -# CONFIG_FEATURE_SH_IS_HUSH is not set -# CONFIG_FEATURE_SH_IS_NONE is not set -# CONFIG_FEATURE_BASH_IS_ASH is not set -# CONFIG_FEATURE_BASH_IS_HUSH is not set -CONFIG_FEATURE_BASH_IS_NONE=y -CONFIG_SH_MATH_SUPPORT=y -CONFIG_SH_MATH_SUPPORT_64=y + +# +# Options common to all shells +# +CONFIG_FEATURE_SH_MATH=y +CONFIG_FEATURE_SH_MATH_64=y # CONFIG_FEATURE_SH_EXTRA_QUIET is not set # CONFIG_FEATURE_SH_STANDALONE is not set # CONFIG_FEATURE_SH_NOFORK is not set @@ -1010,6 +1142,15 @@ CONFIG_FEATURE_SH_HISTFILESIZE=y # # System Logging Utilities # +CONFIG_KLOGD=y + +# +# klogd should not be used together with syslog to kernel printk buffer +# +# CONFIG_FEATURE_KLOGD_KLOGCTL is not set +CONFIG_LOGGER=y +CONFIG_LOGREAD=y +# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set CONFIG_SYSLOGD=y CONFIG_FEATURE_ROTATE_LOGFILE=y # CONFIG_FEATURE_REMOTE_LOG is not set @@ -1018,8 +1159,4 @@ CONFIG_FEATURE_ROTATE_LOGFILE=y CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256 CONFIG_FEATURE_IPC_SYSLOG=y CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 -CONFIG_LOGREAD=y -# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set -CONFIG_KLOGD=y -# CONFIG_FEATURE_KLOGD_KLOGCTL is not set -CONFIG_LOGGER=y +CONFIG_FEATURE_KMSG_SYSLOG=y diff --git a/patches/busybox/1.18.1/1.18.1-mdstart.diff b/patches/busybox/1.18.1/1.18.1-mdstart.diff deleted file mode 100644 index d4e1d77..0000000 --- a/patches/busybox/1.18.1/1.18.1-mdstart.diff +++ /dev/null @@ -1,122 +0,0 @@ -Based on: - -> Forward-port the old mdstart tool from the Gentoo Busybox-1.1.3. -> Only fires the RAID_AUTORUN ioctl on existing /dev/md nodes. - -diff -pruN a/include/applets.src.h mdstart/include/applets.src.h ---- a/include/applets.src.h 2011-01-20 01:08:05.470632138 +0100 -+++ mdstart/include/applets.src.h 2011-01-20 01:09:13.198003320 +0100 -@@ -235,6 +235,7 @@ IF_MAN(APPLET(man, _BB_DIR_SBIN, _BB_SUI - IF_MATCHPATHCON(APPLET(matchpathcon, _BB_DIR_USR_SBIN, _BB_SUID_DROP)) - IF_MD5SUM(APPLET_NOEXEC(md5sum, md5_sha1_sum, _BB_DIR_USR_BIN, _BB_SUID_DROP, md5sum)) - IF_MDEV(APPLET(mdev, _BB_DIR_SBIN, _BB_SUID_DROP)) -+IF_MDSTART(APPLET(mdstart, _BB_DIR_SBIN, _BB_SUID_DROP)) - IF_MICROCOM(APPLET(microcom, _BB_DIR_USR_BIN, _BB_SUID_DROP)) - IF_MKDIR(APPLET_NOFORK(mkdir, mkdir, _BB_DIR_BIN, _BB_SUID_DROP, mkdir)) - IF_MKFS_VFAT(APPLET_ODDNAME(mkdosfs, mkfs_vfat, _BB_DIR_SBIN, _BB_SUID_DROP, mkfs_vfat)) -diff -pruN a/include/usage.src.h mdstart/include/usage.src.h ---- a/include/usage.src.h 2010-12-21 06:29:45.000000000 +0200 -+++ mdstart/include/usage.src.h 2011-01-12 21:29:47.000000000 +0200 -@@ -847,6 +847,11 @@ INSERT - "$ dirname /tmp/foo/\n" \ - "/tmp\n" - -+#define mdstart_trivial_usage \ -+ "{[PARTITION] MD-NODE}..." -+#define mdstart_full_usage \ -+ "Run the RAID_AUTORUN ioctl on the given MD number" -+ - #define dmesg_trivial_usage \ - "[-c] [-n LEVEL] [-s SIZE]" - #define dmesg_full_usage "\n\n" \ -diff -pruN a/util-linux/Config.src mdstart/util-linux/Config.src ---- a/util-linux/Config.src 2010-12-20 02:41:27.000000000 +0200 -+++ mdstart/util-linux/Config.src 2011-01-12 21:30:09.000000000 +0200 -@@ -456,6 +456,13 @@ config FEATURE_MDEV_LOAD_FIRMWARE - /lib/firmware/ and if it exists, send it to the kernel for - loading into the hardware. - -+config MDSTART -+ bool "mdstart" -+ default n -+ help -+ Allows you to autostart /dev/md devices if using an initramfs to -+ boot. -+ - config MKSWAP - bool "mkswap" - default y -diff -pruN a/util-linux/Kbuild.src mdstart/util-linux/Kbuild.src ---- a/util-linux/Kbuild.src 2010-12-20 02:41:27.000000000 +0200 -+++ mdstart/util-linux/Kbuild.src 2011-01-12 21:30:09.000000000 +0200 -@@ -24,6 +24,7 @@ lib-$(CONFIG_HWCLOCK) += hwclo - lib-$(CONFIG_IPCRM) += ipcrm.o - lib-$(CONFIG_IPCS) += ipcs.o - lib-$(CONFIG_LOSETUP) += losetup.o -+lib-$(CONFIG_MDSTART) += mdStart.o - lib-$(CONFIG_LSPCI) += lspci.o - lib-$(CONFIG_LSUSB) += lsusb.o - lib-$(CONFIG_MDEV) += mdev.o -diff -pruN a/util-linux/mdStart.c mdstart/util-linux/mdStart.c ---- a/util-linux/mdStart.c 1970-01-01 03:00:00.000000000 +0300 -+++ mdstart/util-linux/mdStart.c 2011-01-12 21:30:09.000000000 +0200 -@@ -0,0 +1,59 @@ -+/* -+ * Linux 2.6(+) RAID Autostarter -+ * -+ * Copyright (C) 2005 by Tim Yamin -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ * -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+ -+extern int -+mdstart_main(int argc, char *argv[]) -+{ -+ int i, fd, part = 0, retval = 0; -+ -+ if(argc < 2) -+ { -+ bb_show_usage(); -+ } -+ -+ for(i = 1; i < argc; i++) -+ { -+ if(sscanf(argv[i], "%d", &part) == 1) -+ continue; -+ -+ fd = open(argv[i], 0, 0); -+ if (fd >= 0) -+ { -+ ioctl(fd, RAID_AUTORUN, part); -+ close(fd); -+ } else -+ { -+ printf("Error: Failed to open %s!\n", argv[i]); -+ retval=1; -+ } -+ -+ part = 0; -+ } -+ -+ return retval; -+} diff --git a/patches/busybox/1.19.3/1.18.1-openvt.diff b/patches/busybox/1.19.3/1.18.1-openvt.diff deleted file mode 100644 index b8a9f8a..0000000 --- a/patches/busybox/1.19.3/1.18.1-openvt.diff +++ /dev/null @@ -1,19 +0,0 @@ -Based on: - -> Allow a slightly wider range of valid vt numbers. Forward-ported from Gentoo -> Busybox 1.1.3. - -> The previous spin of this patch on 1.1.3 had a 'wait(NULL);' right before -> return EXIT_SUCCESS. I don't think it's needed anymore, so I left it out. - ---- a/console-tools/openvt.c 2010-11-22 22:24:58.000000000 +0200 -+++ b/console-tools/openvt.c 2010-11-29 15:32:18.000000000 +0200 -@@ -124,7 +124,7 @@ int openvt_main(int argc UNUSED_PARAM, c - - if (flags & OPT_c) { - /* Check for illegal vt number: < 1 or > 63 */ -- vtno = xatou_range(str_c, 1, 63); -+ vtno = xatou_range(str_c, 0, 63); - } else { - vtno = find_free_vtno(); - } diff --git a/patches/busybox/1.19.3/busybox-1.19.3-mdstart.patch b/patches/busybox/1.19.3/busybox-1.19.3-mdstart.patch deleted file mode 100644 index 8e59595..0000000 --- a/patches/busybox/1.19.3/busybox-1.19.3-mdstart.patch +++ /dev/null @@ -1,130 +0,0 @@ -From b971b7317af525b1887d4af473307f8084015f02 Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping -Date: Sat, 14 Jan 2012 23:38:17 +0100 -Subject: [PATCH] Port mdstart patch to busybox 1.19.3 - ---- - include/applets.src.h | 1 + - util-linux/Config.src | 7 +++++ - util-linux/Kbuild.src | 1 + - util-linux/mdStart.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++ - 4 files changed, 75 insertions(+), 0 deletions(-) - create mode 100644 util-linux/mdStart.c - -diff --git a/include/applets.src.h b/include/applets.src.h -index 87d9cbb..331145c 100644 ---- a/include/applets.src.h -+++ b/include/applets.src.h -@@ -241,6 +241,7 @@ IF_MAN(APPLET(man, BB_DIR_SBIN, BB_SUID_DROP)) - IF_MATCHPATHCON(APPLET(matchpathcon, BB_DIR_USR_SBIN, BB_SUID_DROP)) - IF_MD5SUM(APPLET_NOEXEC(md5sum, md5_sha1_sum, BB_DIR_USR_BIN, BB_SUID_DROP, md5sum)) - IF_MDEV(APPLET(mdev, BB_DIR_SBIN, BB_SUID_DROP)) -+IF_MDSTART(APPLET(mdstart, BB_DIR_SBIN, BB_SUID_DROP)) - IF_MICROCOM(APPLET(microcom, BB_DIR_USR_BIN, BB_SUID_DROP)) - IF_MKDIR(APPLET_NOFORK(mkdir, mkdir, BB_DIR_BIN, BB_SUID_DROP, mkdir)) - IF_MKFS_VFAT(APPLET_ODDNAME(mkdosfs, mkfs_vfat, BB_DIR_SBIN, BB_SUID_DROP, mkfs_vfat)) -diff --git a/util-linux/Config.src b/util-linux/Config.src -index bb45705..2f60d04 100644 ---- a/util-linux/Config.src -+++ b/util-linux/Config.src -@@ -462,6 +462,13 @@ config FEATURE_MDEV_LOAD_FIRMWARE - /lib/firmware/ and if it exists, send it to the kernel for - loading into the hardware. - -+config MDSTART -+ bool "mdstart" -+ default n -+ help -+ Allows you to autostart /dev/md devices if using an initramfs to -+ boot. -+ - config MKSWAP - bool "mkswap" - default y -diff --git a/util-linux/Kbuild.src b/util-linux/Kbuild.src -index c06d911..98cbb09 100644 ---- a/util-linux/Kbuild.src -+++ b/util-linux/Kbuild.src -@@ -24,6 +24,7 @@ lib-$(CONFIG_HWCLOCK) += hwclock.o - lib-$(CONFIG_IPCRM) += ipcrm.o - lib-$(CONFIG_IPCS) += ipcs.o - lib-$(CONFIG_LOSETUP) += losetup.o -+lib-$(CONFIG_MDSTART) += mdStart.o - lib-$(CONFIG_LSPCI) += lspci.o - lib-$(CONFIG_LSUSB) += lsusb.o - lib-$(CONFIG_MDEV) += mdev.o -diff --git a/util-linux/mdStart.c b/util-linux/mdStart.c -new file mode 100644 -index 0000000..0c55bab ---- /dev/null -+++ b/util-linux/mdStart.c -@@ -0,0 +1,66 @@ -+/* -+ * Linux 2.6(+) RAID Autostarter -+ * -+ * Copyright (C) 2005 by Tim Yamin -+ * Copyright (C) 2012 by Sebastian Pipping -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ * -+ */ -+ -+//usage:#define mdstart_trivial_usage -+//usage: "[PARTITION] MD-NODE [[PARTITION] MD-NODE ...]" -+//usage: -+//usage:#define mdstart_full_usage "\n\n" -+//usage: "Run the RAID_AUTORUN ioctl on the given MD number" -+ -+#include -+#include -+#include -+#include -+#include -+#include -+ -+extern int -+mdstart_main(int argc, char *argv[]) -+{ -+ int i, fd, part = 0, retval = 0; -+ -+ if(argc < 2) -+ { -+ bb_show_usage(); -+ } -+ -+ for(i = 1; i < argc; i++) -+ { -+ if(sscanf(argv[i], "%d", &part) == 1) -+ continue; -+ -+ fd = open(argv[i], 0, 0); -+ if (fd >= 0) -+ { -+ ioctl(fd, RAID_AUTORUN, part); -+ close(fd); -+ } else -+ { -+ printf("Error: Failed to open %s!\n", argv[i]); -+ retval=1; -+ } -+ -+ part = 0; -+ } -+ -+ return retval; -+} --- -1.7.8.3 - diff --git a/patches/busybox/1.19.3/busybox-1.7.4-signal-hack.patch b/patches/busybox/1.19.3/busybox-1.7.4-signal-hack.patch deleted file mode 100644 index ba11830..0000000 --- a/patches/busybox/1.19.3/busybox-1.7.4-signal-hack.patch +++ /dev/null @@ -1,28 +0,0 @@ -workaround while we get it fixed upstream - -http://bugs.gentoo.org/201114 - ---- libbb/u_signal_names.c -+++ libbb/u_signal_names.c -@@ -66,7 +66,7 @@ - #ifdef SIGTERM - [SIGTERM ] = "TERM", - #endif --#ifdef SIGSTKFLT -+#if defined(SIGSTKFLT) && SIGSTKFLT < 32 - [SIGSTKFLT] = "STKFLT", - #endif - #ifdef SIGCHLD -@@ -90,10 +90,10 @ - #ifdef SIGURG - [SIGURG ] = "URG", - #endif --#ifdef SIGXCPU -+#if defined(SIGXCPU) && SIGXCPU < 32 - [SIGXCPU ] = "XCPU", - #endif --#ifdef SIGXFSZ -+#if defined(SIGXFSZ) && SIGXFSZ < 32 - [SIGXFSZ ] = "XFSZ", - #endif - #ifdef SIGVTALRM diff --git a/patches/busybox/1.20.1/1.18.1-openvt.diff b/patches/busybox/1.20.1/1.18.1-openvt.diff deleted file mode 100644 index b8a9f8a..0000000 --- a/patches/busybox/1.20.1/1.18.1-openvt.diff +++ /dev/null @@ -1,19 +0,0 @@ -Based on: - -> Allow a slightly wider range of valid vt numbers. Forward-ported from Gentoo -> Busybox 1.1.3. - -> The previous spin of this patch on 1.1.3 had a 'wait(NULL);' right before -> return EXIT_SUCCESS. I don't think it's needed anymore, so I left it out. - ---- a/console-tools/openvt.c 2010-11-22 22:24:58.000000000 +0200 -+++ b/console-tools/openvt.c 2010-11-29 15:32:18.000000000 +0200 -@@ -124,7 +124,7 @@ int openvt_main(int argc UNUSED_PARAM, c - - if (flags & OPT_c) { - /* Check for illegal vt number: < 1 or > 63 */ -- vtno = xatou_range(str_c, 1, 63); -+ vtno = xatou_range(str_c, 0, 63); - } else { - vtno = find_free_vtno(); - } diff --git a/patches/busybox/1.20.1/busybox-1.20.1-mdstart.patch b/patches/busybox/1.20.1/busybox-1.20.1-mdstart.patch deleted file mode 100644 index 5ca3eca..0000000 --- a/patches/busybox/1.20.1/busybox-1.20.1-mdstart.patch +++ /dev/null @@ -1,130 +0,0 @@ -From d1f76c9546758611bcadd6ad10fc0c4c1ceb14ee Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping -Date: Sun, 10 Jun 2012 19:05:38 +0200 -Subject: [PATCH] Port mdstart patch from busybox 1.19.3 to 1.20.1 - ---- - include/applets.src.h | 1 + - util-linux/Config.src | 7 ++++++ - util-linux/Kbuild.src | 1 + - util-linux/mdStart.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++ - 4 files changed, 75 insertions(+) - create mode 100644 util-linux/mdStart.c - -diff --git a/include/applets.src.h b/include/applets.src.h -index 252a060..0b199bc 100644 ---- a/include/applets.src.h -+++ b/include/applets.src.h -@@ -239,6 +239,7 @@ IF_MAKEMIME(APPLET(makemime, BB_DIR_BIN, BB_SUID_DROP)) - IF_MAN(APPLET(man, BB_DIR_SBIN, BB_SUID_DROP)) - IF_MATCHPATHCON(APPLET(matchpathcon, BB_DIR_USR_SBIN, BB_SUID_DROP)) - IF_MD5SUM(APPLET_NOEXEC(md5sum, md5_sha1_sum, BB_DIR_USR_BIN, BB_SUID_DROP, md5sum)) -+IF_MDSTART(APPLET(mdstart, BB_DIR_SBIN, BB_SUID_DROP)) - IF_MICROCOM(APPLET(microcom, BB_DIR_USR_BIN, BB_SUID_DROP)) - IF_MKDIR(APPLET_NOFORK(mkdir, mkdir, BB_DIR_BIN, BB_SUID_DROP, mkdir)) - IF_MKFS_VFAT(APPLET_ODDNAME(mkdosfs, mkfs_vfat, BB_DIR_SBIN, BB_SUID_DROP, mkfs_vfat)) -diff --git a/util-linux/Config.src b/util-linux/Config.src -index 57a52ce..e07fe2b 100644 ---- a/util-linux/Config.src -+++ b/util-linux/Config.src -@@ -404,6 +404,13 @@ config LSUSB - - This version uses sysfs (/sys/bus/usb/devices) only. - -+config MDSTART -+ bool "mdstart" -+ default n -+ help -+ Allows you to autostart /dev/md devices if using an initramfs to -+ boot. -+ - config MKSWAP - bool "mkswap" - default y -diff --git a/util-linux/Kbuild.src b/util-linux/Kbuild.src -index 468fc6b..0bc9a9b 100644 ---- a/util-linux/Kbuild.src -+++ b/util-linux/Kbuild.src -@@ -24,6 +24,7 @@ lib-$(CONFIG_HWCLOCK) += hwclock.o - lib-$(CONFIG_IPCRM) += ipcrm.o - lib-$(CONFIG_IPCS) += ipcs.o - lib-$(CONFIG_LOSETUP) += losetup.o -+lib-$(CONFIG_MDSTART) += mdStart.o - lib-$(CONFIG_LSPCI) += lspci.o - lib-$(CONFIG_LSUSB) += lsusb.o - lib-$(CONFIG_MKFS_EXT2) += mkfs_ext2.o -diff --git a/util-linux/mdStart.c b/util-linux/mdStart.c -new file mode 100644 -index 0000000..0c55bab ---- /dev/null -+++ b/util-linux/mdStart.c -@@ -0,0 +1,66 @@ -+/* -+ * Linux 2.6(+) RAID Autostarter -+ * -+ * Copyright (C) 2005 by Tim Yamin -+ * Copyright (C) 2012 by Sebastian Pipping -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ * -+ */ -+ -+//usage:#define mdstart_trivial_usage -+//usage: "[PARTITION] MD-NODE [[PARTITION] MD-NODE ...]" -+//usage: -+//usage:#define mdstart_full_usage "\n\n" -+//usage: "Run the RAID_AUTORUN ioctl on the given MD number" -+ -+#include -+#include -+#include -+#include -+#include -+#include -+ -+extern int -+mdstart_main(int argc, char *argv[]) -+{ -+ int i, fd, part = 0, retval = 0; -+ -+ if(argc < 2) -+ { -+ bb_show_usage(); -+ } -+ -+ for(i = 1; i < argc; i++) -+ { -+ if(sscanf(argv[i], "%d", &part) == 1) -+ continue; -+ -+ fd = open(argv[i], 0, 0); -+ if (fd >= 0) -+ { -+ ioctl(fd, RAID_AUTORUN, part); -+ close(fd); -+ } else -+ { -+ printf("Error: Failed to open %s!\n", argv[i]); -+ retval=1; -+ } -+ -+ part = 0; -+ } -+ -+ return retval; -+} --- -1.7.10.2 - diff --git a/patches/busybox/1.20.1/busybox-1.7.4-signal-hack.patch b/patches/busybox/1.20.1/busybox-1.7.4-signal-hack.patch deleted file mode 100644 index ba11830..0000000 --- a/patches/busybox/1.20.1/busybox-1.7.4-signal-hack.patch +++ /dev/null @@ -1,28 +0,0 @@ -workaround while we get it fixed upstream - -http://bugs.gentoo.org/201114 - ---- libbb/u_signal_names.c -+++ libbb/u_signal_names.c -@@ -66,7 +66,7 @@ - #ifdef SIGTERM - [SIGTERM ] = "TERM", - #endif --#ifdef SIGSTKFLT -+#if defined(SIGSTKFLT) && SIGSTKFLT < 32 - [SIGSTKFLT] = "STKFLT", - #endif - #ifdef SIGCHLD -@@ -90,10 +90,10 @ - #ifdef SIGURG - [SIGURG ] = "URG", - #endif --#ifdef SIGXCPU -+#if defined(SIGXCPU) && SIGXCPU < 32 - [SIGXCPU ] = "XCPU", - #endif --#ifdef SIGXFSZ -+#if defined(SIGXFSZ) && SIGXFSZ < 32 - [SIGXFSZ ] = "XFSZ", - #endif - #ifdef SIGVTALRM diff --git a/patches/busybox/1.20.2/1.18.1-openvt.diff b/patches/busybox/1.20.2/1.18.1-openvt.diff deleted file mode 100644 index b8a9f8a..0000000 --- a/patches/busybox/1.20.2/1.18.1-openvt.diff +++ /dev/null @@ -1,19 +0,0 @@ -Based on: - -> Allow a slightly wider range of valid vt numbers. Forward-ported from Gentoo -> Busybox 1.1.3. - -> The previous spin of this patch on 1.1.3 had a 'wait(NULL);' right before -> return EXIT_SUCCESS. I don't think it's needed anymore, so I left it out. - ---- a/console-tools/openvt.c 2010-11-22 22:24:58.000000000 +0200 -+++ b/console-tools/openvt.c 2010-11-29 15:32:18.000000000 +0200 -@@ -124,7 +124,7 @@ int openvt_main(int argc UNUSED_PARAM, c - - if (flags & OPT_c) { - /* Check for illegal vt number: < 1 or > 63 */ -- vtno = xatou_range(str_c, 1, 63); -+ vtno = xatou_range(str_c, 0, 63); - } else { - vtno = find_free_vtno(); - } diff --git a/patches/busybox/1.20.2/busybox-1.20.1-mdstart.patch b/patches/busybox/1.20.2/busybox-1.20.1-mdstart.patch deleted file mode 100644 index 5ca3eca..0000000 --- a/patches/busybox/1.20.2/busybox-1.20.1-mdstart.patch +++ /dev/null @@ -1,130 +0,0 @@ -From d1f76c9546758611bcadd6ad10fc0c4c1ceb14ee Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping -Date: Sun, 10 Jun 2012 19:05:38 +0200 -Subject: [PATCH] Port mdstart patch from busybox 1.19.3 to 1.20.1 - ---- - include/applets.src.h | 1 + - util-linux/Config.src | 7 ++++++ - util-linux/Kbuild.src | 1 + - util-linux/mdStart.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++ - 4 files changed, 75 insertions(+) - create mode 100644 util-linux/mdStart.c - -diff --git a/include/applets.src.h b/include/applets.src.h -index 252a060..0b199bc 100644 ---- a/include/applets.src.h -+++ b/include/applets.src.h -@@ -239,6 +239,7 @@ IF_MAKEMIME(APPLET(makemime, BB_DIR_BIN, BB_SUID_DROP)) - IF_MAN(APPLET(man, BB_DIR_SBIN, BB_SUID_DROP)) - IF_MATCHPATHCON(APPLET(matchpathcon, BB_DIR_USR_SBIN, BB_SUID_DROP)) - IF_MD5SUM(APPLET_NOEXEC(md5sum, md5_sha1_sum, BB_DIR_USR_BIN, BB_SUID_DROP, md5sum)) -+IF_MDSTART(APPLET(mdstart, BB_DIR_SBIN, BB_SUID_DROP)) - IF_MICROCOM(APPLET(microcom, BB_DIR_USR_BIN, BB_SUID_DROP)) - IF_MKDIR(APPLET_NOFORK(mkdir, mkdir, BB_DIR_BIN, BB_SUID_DROP, mkdir)) - IF_MKFS_VFAT(APPLET_ODDNAME(mkdosfs, mkfs_vfat, BB_DIR_SBIN, BB_SUID_DROP, mkfs_vfat)) -diff --git a/util-linux/Config.src b/util-linux/Config.src -index 57a52ce..e07fe2b 100644 ---- a/util-linux/Config.src -+++ b/util-linux/Config.src -@@ -404,6 +404,13 @@ config LSUSB - - This version uses sysfs (/sys/bus/usb/devices) only. - -+config MDSTART -+ bool "mdstart" -+ default n -+ help -+ Allows you to autostart /dev/md devices if using an initramfs to -+ boot. -+ - config MKSWAP - bool "mkswap" - default y -diff --git a/util-linux/Kbuild.src b/util-linux/Kbuild.src -index 468fc6b..0bc9a9b 100644 ---- a/util-linux/Kbuild.src -+++ b/util-linux/Kbuild.src -@@ -24,6 +24,7 @@ lib-$(CONFIG_HWCLOCK) += hwclock.o - lib-$(CONFIG_IPCRM) += ipcrm.o - lib-$(CONFIG_IPCS) += ipcs.o - lib-$(CONFIG_LOSETUP) += losetup.o -+lib-$(CONFIG_MDSTART) += mdStart.o - lib-$(CONFIG_LSPCI) += lspci.o - lib-$(CONFIG_LSUSB) += lsusb.o - lib-$(CONFIG_MKFS_EXT2) += mkfs_ext2.o -diff --git a/util-linux/mdStart.c b/util-linux/mdStart.c -new file mode 100644 -index 0000000..0c55bab ---- /dev/null -+++ b/util-linux/mdStart.c -@@ -0,0 +1,66 @@ -+/* -+ * Linux 2.6(+) RAID Autostarter -+ * -+ * Copyright (C) 2005 by Tim Yamin -+ * Copyright (C) 2012 by Sebastian Pipping -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ * -+ */ -+ -+//usage:#define mdstart_trivial_usage -+//usage: "[PARTITION] MD-NODE [[PARTITION] MD-NODE ...]" -+//usage: -+//usage:#define mdstart_full_usage "\n\n" -+//usage: "Run the RAID_AUTORUN ioctl on the given MD number" -+ -+#include -+#include -+#include -+#include -+#include -+#include -+ -+extern int -+mdstart_main(int argc, char *argv[]) -+{ -+ int i, fd, part = 0, retval = 0; -+ -+ if(argc < 2) -+ { -+ bb_show_usage(); -+ } -+ -+ for(i = 1; i < argc; i++) -+ { -+ if(sscanf(argv[i], "%d", &part) == 1) -+ continue; -+ -+ fd = open(argv[i], 0, 0); -+ if (fd >= 0) -+ { -+ ioctl(fd, RAID_AUTORUN, part); -+ close(fd); -+ } else -+ { -+ printf("Error: Failed to open %s!\n", argv[i]); -+ retval=1; -+ } -+ -+ part = 0; -+ } -+ -+ return retval; -+} --- -1.7.10.2 - diff --git a/patches/busybox/1.20.2/busybox-1.20.2-bunzip2.patch b/patches/busybox/1.20.2/busybox-1.20.2-bunzip2.patch deleted file mode 100644 index f46a4a5..0000000 --- a/patches/busybox/1.20.2/busybox-1.20.2-bunzip2.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr busybox-1.20.2.orig/archival/libarchive/decompress_bunzip2.c busybox-1.20.2/archival/libarchive/decompress_bunzip2.c ---- busybox-1.20.2.orig/archival/libarchive/decompress_bunzip2.c 2014-01-20 11:16:01.817359481 +0100 -+++ busybox-1.20.2/archival/libarchive/decompress_bunzip2.c 2014-01-20 11:16:47.492875819 +0100 -@@ -440,7 +440,7 @@ - literal used is the one at the head of the mtfSymbol array.) */ - if (runPos != 0) { - uint8_t tmp_byte; -- if (dbufCount + runCnt >= dbufSize) return RETVAL_DATA_ERROR; -+ if (dbufCount + runCnt > dbufSize) return RETVAL_DATA_ERROR; - tmp_byte = symToByte[mtfSymbol[0]]; - byteCount[tmp_byte] += runCnt; - while (--runCnt >= 0) dbuf[dbufCount++] = (uint32_t)tmp_byte; diff --git a/patches/busybox/1.20.2/busybox-1.20.2-glibc-sys-resource.patch b/patches/busybox/1.20.2/busybox-1.20.2-glibc-sys-resource.patch deleted file mode 100644 index f682d00..0000000 --- a/patches/busybox/1.20.2/busybox-1.20.2-glibc-sys-resource.patch +++ /dev/null @@ -1,109 +0,0 @@ -https://bugs.gentoo.org/424954 - -From c5fe9f7b723f949457263ef8e22ab807d5b549ce Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Thu, 5 Jul 2012 23:19:09 -0400 -Subject: [PATCH] include sys/resource.h where needed - -We use functions from sys/resource.h in misc applets, but don't include -the header. This breaks building with newer glibc versions, so add the -include where needed. - -Signed-off-by: Mike Frysinger ---- - loginutils/passwd.c | 1 + - miscutils/time.c | 1 + - networking/inetd.c | 1 + - networking/ntpd.c | 1 + - networking/ntpd_simple.c | 1 + - runit/chpst.c | 1 + - shell/shell_common.c | 1 + - 7 files changed, 7 insertions(+) - -diff --git a/loginutils/passwd.c b/loginutils/passwd.c -index b83db00..a7006f0 100644 ---- a/loginutils/passwd.c -+++ b/loginutils/passwd.c -@@ -15,6 +15,7 @@ - - #include "libbb.h" - #include -+#include /* setrlimit */ - - static void nuke_str(char *str) - { -diff --git a/miscutils/time.c b/miscutils/time.c -index 945f15f..ffed386 100644 ---- a/miscutils/time.c -+++ b/miscutils/time.c -@@ -16,6 +16,7 @@ - //usage: "\n -v Verbose" - - #include "libbb.h" -+#include /* getrusage */ - - /* Information on the resources used by a child process. */ - typedef struct { -diff --git a/networking/inetd.c b/networking/inetd.c -index 1308d74..00baf69 100644 ---- a/networking/inetd.c -+++ b/networking/inetd.c -@@ -165,6 +165,7 @@ - //usage: "\n (default: 0 - disabled)" - - #include -+#include /* setrlimit */ - #include - - #include "libbb.h" -diff --git a/networking/ntpd.c b/networking/ntpd.c -index 72e9d0b..5b92db6 100644 ---- a/networking/ntpd.c -+++ b/networking/ntpd.c -@@ -46,6 +46,7 @@ - #include "libbb.h" - #include - #include /* For IPTOS_LOWDELAY definition */ -+#include /* setpriority */ - #include - #ifndef IPTOS_LOWDELAY - # define IPTOS_LOWDELAY 0x10 -diff --git a/networking/ntpd_simple.c b/networking/ntpd_simple.c -index 4ad44e4..1b7c66b 100644 ---- a/networking/ntpd_simple.c -+++ b/networking/ntpd_simple.c -@@ -7,6 +7,7 @@ - */ - #include "libbb.h" - #include /* For IPTOS_LOWDELAY definition */ -+#include /* setpriority */ - #ifndef IPTOS_LOWDELAY - # define IPTOS_LOWDELAY 0x10 - #endif -diff --git a/runit/chpst.c b/runit/chpst.c -index ac296ba..ed72c8b 100644 ---- a/runit/chpst.c -+++ b/runit/chpst.c -@@ -91,6 +91,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - //usage: "\n a SIGXCPU after N seconds" - - #include "libbb.h" -+#include /* getrlimit */ - - /* - Five applets here: chpst, envdir, envuidgid, setuidgid, softlimit. -diff --git a/shell/shell_common.c b/shell/shell_common.c -index 51c92d6..780e27e 100644 ---- a/shell/shell_common.c -+++ b/shell/shell_common.c -@@ -18,6 +18,7 @@ - */ - #include "libbb.h" - #include "shell_common.h" -+#include /* getrlimit */ - - const char defifsvar[] ALIGN1 = "IFS= \t\n"; - --- -1.7.9.7 - diff --git a/patches/busybox/1.20.2/busybox-1.7.4-signal-hack.patch b/patches/busybox/1.20.2/busybox-1.7.4-signal-hack.patch deleted file mode 100644 index ba11830..0000000 --- a/patches/busybox/1.20.2/busybox-1.7.4-signal-hack.patch +++ /dev/null @@ -1,28 +0,0 @@ -workaround while we get it fixed upstream - -http://bugs.gentoo.org/201114 - ---- libbb/u_signal_names.c -+++ libbb/u_signal_names.c -@@ -66,7 +66,7 @@ - #ifdef SIGTERM - [SIGTERM ] = "TERM", - #endif --#ifdef SIGSTKFLT -+#if defined(SIGSTKFLT) && SIGSTKFLT < 32 - [SIGSTKFLT] = "STKFLT", - #endif - #ifdef SIGCHLD -@@ -90,10 +90,10 @ - #ifdef SIGURG - [SIGURG ] = "URG", - #endif --#ifdef SIGXCPU -+#if defined(SIGXCPU) && SIGXCPU < 32 - [SIGXCPU ] = "XCPU", - #endif --#ifdef SIGXFSZ -+#if defined(SIGXFSZ) && SIGXFSZ < 32 - [SIGXFSZ ] = "XFSZ", - #endif - #ifdef SIGVTALRM diff --git a/patches/busybox/1.26.0/1.18.1-openvt.diff b/patches/busybox/1.26.0/1.18.1-openvt.diff deleted file mode 100644 index b8a9f8a..0000000 --- a/patches/busybox/1.26.0/1.18.1-openvt.diff +++ /dev/null @@ -1,19 +0,0 @@ -Based on: - -> Allow a slightly wider range of valid vt numbers. Forward-ported from Gentoo -> Busybox 1.1.3. - -> The previous spin of this patch on 1.1.3 had a 'wait(NULL);' right before -> return EXIT_SUCCESS. I don't think it's needed anymore, so I left it out. - ---- a/console-tools/openvt.c 2010-11-22 22:24:58.000000000 +0200 -+++ b/console-tools/openvt.c 2010-11-29 15:32:18.000000000 +0200 -@@ -124,7 +124,7 @@ int openvt_main(int argc UNUSED_PARAM, c - - if (flags & OPT_c) { - /* Check for illegal vt number: < 1 or > 63 */ -- vtno = xatou_range(str_c, 1, 63); -+ vtno = xatou_range(str_c, 0, 63); - } else { - vtno = find_free_vtno(); - } diff --git a/patches/busybox/1.26.0/busybox-1.20.2-modprobe.patch b/patches/busybox/1.26.0/busybox-1.20.2-modprobe.patch deleted file mode 100644 index 491eb05..0000000 --- a/patches/busybox/1.26.0/busybox-1.20.2-modprobe.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/modutils/modprobe.c b/modutils/modprobe.c -index fb6c659..11fa521 100644 ---- a/modutils/modprobe.c -+++ b/modutils/modprobe.c -@@ -413,7 +413,7 @@ static int do_modprobe(struct module_entry *m) - rc = 0; - while (m->deps) { - struct module_entry *m2; -- char *fn, *options; -+ char *fn, *options, *path; - - rc = 0; - fn = llist_pop(&m->deps); /* we leak it */ -@@ -460,7 +460,11 @@ static int do_modprobe(struct module_entry *m) - continue; - } - -- rc = bb_init_module(fn, options); -+ path = xmalloc(strlen(fn) + strlen(CONFIG_DEFAULT_MODULES_DIR) + strlen(G.uts.release) + 3); -+ sprintf(path, "%s/%s/%s", CONFIG_DEFAULT_MODULES_DIR, G.uts.release, fn); -+ -+ rc = bb_init_module(path, options); -+ free(path); - DBG("loaded %s '%s', rc:%d", fn, options, rc); - if (rc == EEXIST) - rc = 0; diff --git a/patches/busybox/1.26.0/busybox-1.7.4-signal-hack.patch b/patches/busybox/1.26.0/busybox-1.7.4-signal-hack.patch deleted file mode 100644 index ba11830..0000000 --- a/patches/busybox/1.26.0/busybox-1.7.4-signal-hack.patch +++ /dev/null @@ -1,28 +0,0 @@ -workaround while we get it fixed upstream - -http://bugs.gentoo.org/201114 - ---- libbb/u_signal_names.c -+++ libbb/u_signal_names.c -@@ -66,7 +66,7 @@ - #ifdef SIGTERM - [SIGTERM ] = "TERM", - #endif --#ifdef SIGSTKFLT -+#if defined(SIGSTKFLT) && SIGSTKFLT < 32 - [SIGSTKFLT] = "STKFLT", - #endif - #ifdef SIGCHLD -@@ -90,10 +90,10 @ - #ifdef SIGURG - [SIGURG ] = "URG", - #endif --#ifdef SIGXCPU -+#if defined(SIGXCPU) && SIGXCPU < 32 - [SIGXCPU ] = "XCPU", - #endif --#ifdef SIGXFSZ -+#if defined(SIGXFSZ) && SIGXFSZ < 32 - [SIGXFSZ ] = "XFSZ", - #endif - #ifdef SIGVTALRM diff --git a/patches/busybox/1.18.1/1.18.1-openvt.diff b/patches/busybox/1.27.2/1.18.1-openvt.diff similarity index 100% rename from patches/busybox/1.18.1/1.18.1-openvt.diff rename to patches/busybox/1.27.2/1.18.1-openvt.diff diff --git a/patches/busybox/1.18.1/README b/patches/busybox/1.27.2/README similarity index 100% rename from patches/busybox/1.18.1/README rename to patches/busybox/1.27.2/README diff --git a/patches/busybox/1.20.2/busybox-1.20.2-modprobe.patch b/patches/busybox/1.27.2/busybox-1.20.2-modprobe.patch similarity index 100% rename from patches/busybox/1.20.2/busybox-1.20.2-modprobe.patch rename to patches/busybox/1.27.2/busybox-1.20.2-modprobe.patch diff --git a/patches/busybox/1.26.0/busybox-1.26.0-mdstart.patch b/patches/busybox/1.27.2/busybox-1.26.0-mdstart.patch similarity index 100% rename from patches/busybox/1.26.0/busybox-1.26.0-mdstart.patch rename to patches/busybox/1.27.2/busybox-1.26.0-mdstart.patch diff --git a/patches/busybox/1.18.1/busybox-1.7.4-signal-hack.patch b/patches/busybox/1.27.2/busybox-1.7.4-signal-hack.patch similarity index 100% rename from patches/busybox/1.18.1/busybox-1.7.4-signal-hack.patch rename to patches/busybox/1.27.2/busybox-1.7.4-signal-hack.patch