From b74a891479879d432a0a1d80301aa1b8b5d43833 Mon Sep 17 00:00:00 2001 From: Yuusha Spacewolf Date: Sat, 20 Jan 2018 01:42:01 -0600 Subject: [PATCH] busybox: update to 1.28.0. Closes: #10994 [via git-merge-pr] --- srcpkgs/busybox/files/busybox.dotconfig | 68 +++++++++++++++++-------- srcpkgs/busybox/template | 6 +-- 2 files changed, 49 insertions(+), 25 deletions(-) diff --git a/srcpkgs/busybox/files/busybox.dotconfig b/srcpkgs/busybox/files/busybox.dotconfig index d338b637f47..b83ef020aed 100644 --- a/srcpkgs/busybox/files/busybox.dotconfig +++ b/srcpkgs/busybox/files/busybox.dotconfig @@ -1,12 +1,12 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.27.2 -# Sat Aug 19 18:31:11 2017 +# Busybox version: 1.28.0 +# Sat Jan 20 01:38:27 2018 # CONFIG_HAVE_DOT_CONFIG=y # -# Busybox Settings +# Settings # CONFIG_DESKTOP=y # CONFIG_EXTRA_COMPAT is not set @@ -34,7 +34,6 @@ CONFIG_FEATURE_SUID=y # CONFIG_FEATURE_PREFER_APPLETS is not set CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" CONFIG_FEATURE_SYSLOG=y -CONFIG_FEATURE_HAVE_RPC=y CONFIG_PLATFORM_LINUX=y # @@ -44,6 +43,7 @@ CONFIG_PLATFORM_LINUX=y # CONFIG_PIE is not set # CONFIG_NOMMU is not set # CONFIG_BUILD_LIBBUSYBOX is not set +# CONFIG_FEATURE_LIBBUSYBOX_STATIC is not set # CONFIG_FEATURE_INDIVIDUAL is not set # CONFIG_FEATURE_SHARED_BUSYBOX is not set CONFIG_LFS=y @@ -78,7 +78,7 @@ CONFIG_NO_DEBUG_LIB=y # CONFIG_EFENCE is not set # -# Busybox Library Tuning +# Library Tuning # # CONFIG_FEATURE_USE_BSS_TAIL is not set CONFIG_FEATURE_RTMINMAX=y @@ -96,8 +96,8 @@ CONFIG_FEATURE_EDITING_MAX_LEN=1024 CONFIG_FEATURE_EDITING_HISTORY=15 # CONFIG_FEATURE_EDITING_SAVEHISTORY is not set # CONFIG_FEATURE_EDITING_SAVE_ON_EXIT is not set -# CONFIG_FEATURE_REVERSE_SEARCH is not set -# CONFIG_FEATURE_TAB_COMPLETION is not set +CONFIG_FEATURE_REVERSE_SEARCH=y +CONFIG_FEATURE_TAB_COMPLETION=y # CONFIG_FEATURE_USERNAME_COMPLETION is not set # CONFIG_FEATURE_EDITING_FANCY_PROMPT is not set # CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set @@ -190,6 +190,7 @@ CONFIG_FEATURE_UNZIP_XZ=y # CONFIG_BASENAME=y CONFIG_CAT=y +CONFIG_FEATURE_CATN=y CONFIG_FEATURE_CATV=y CONFIG_CHGRP=y CONFIG_CHMOD=y @@ -220,11 +221,8 @@ CONFIG_DU=y CONFIG_ECHO=y CONFIG_FEATURE_FANCY_ECHO=y CONFIG_ENV=y -CONFIG_FEATURE_ENV_LONG_OPTIONS=y CONFIG_EXPAND=y -CONFIG_FEATURE_EXPAND_LONG_OPTIONS=y -# CONFIG_UNEXPAND is not set -# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set +CONFIG_UNEXPAND=y CONFIG_EXPR=y CONFIG_EXPR_MATH_SUPPORT_64=y CONFIG_FACTOR=y @@ -262,12 +260,10 @@ CONFIG_SHA3SUM=y # # CONFIG_FEATURE_MD5_SHA1_SUM_CHECK is not set 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=y CONFIG_NICE=y CONFIG_NL=y CONFIG_NOHUP=y @@ -282,7 +278,6 @@ CONFIG_FEATURE_READLINK_FOLLOW=y CONFIG_REALPATH=y CONFIG_RM=y CONFIG_RMDIR=y -CONFIG_FEATURE_RMDIR_LONG_OPTIONS=y CONFIG_SEQ=y CONFIG_SHRED=y CONFIG_SHUF=y @@ -321,6 +316,7 @@ CONFIG_TRUNCATE=y CONFIG_TTY=y CONFIG_UNAME=y CONFIG_UNAME_OSNAME="Linux" +CONFIG_BB_ARCH=y CONFIG_UNIQ=y CONFIG_UNLINK=y # CONFIG_USLEEP is not set @@ -363,6 +359,10 @@ CONFIG_KBD_MODE=y # CONFIG_SETFONT is not set # CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set CONFIG_DEFAULT_SETFONT_DIR="" + +# +# Common options for loadfont and setfont +# # CONFIG_FEATURE_LOADFONT_PSF2 is not set # CONFIG_FEATURE_LOADFONT_RAW is not set CONFIG_LOADKMAP=y @@ -388,6 +388,14 @@ CONFIG_FEATURE_RUN_PARTS_FANCY=y # CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set CONFIG_WHICH=y +# +# klibc-utils +# +# CONFIG_MINIPS is not set +# CONFIG_NUKE is not set +# CONFIG_RESUME is not set +# CONFIG_RUN_INIT is not set + # # Editors # @@ -457,6 +465,8 @@ 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 +CONFIG_FEATURE_XARGS_SUPPORT_PARALLEL=y +CONFIG_FEATURE_XARGS_SUPPORT_ARGS_FILE=y # # Init Utilities @@ -492,10 +502,8 @@ CONFIG_INIT_TERMINAL_TYPE="" # CONFIG_ADD_SHELL is not set # CONFIG_REMOVE_SHELL is not set # CONFIG_ADDGROUP is not set -# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set # CONFIG_FEATURE_ADDUSER_TO_GROUP 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 @@ -605,7 +613,6 @@ CONFIG_FEATURE_HEXDUMP_REVERSE=y # CONFIG_HD is not set CONFIG_XXD=y CONFIG_HWCLOCK=y -CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y CONFIG_IONICE=y CONFIG_IPCRM=y @@ -645,7 +652,6 @@ CONFIG_FEATURE_MOUNT_FSTAB=y CONFIG_FEATURE_MOUNT_OTHERTAB=y # CONFIG_MOUNTPOINT is not set CONFIG_NSENTER=y -CONFIG_FEATURE_NSENTER_LONG_OPTS=y CONFIG_PIVOT_ROOT=y # CONFIG_RDATE is not set # CONFIG_RDEV is not set @@ -659,11 +665,15 @@ CONFIG_SETARCH=y CONFIG_LINUX32=y CONFIG_LINUX64=y CONFIG_SETPRIV=y +CONFIG_FEATURE_SETPRIV_DUMP=y +CONFIG_FEATURE_SETPRIV_CAPABILITIES=y +CONFIG_FEATURE_SETPRIV_CAPABILITY_NAMES=y CONFIG_SETSID=y CONFIG_SWAPON=y CONFIG_FEATURE_SWAPON_DISCARD=y CONFIG_FEATURE_SWAPON_PRI=y CONFIG_SWAPOFF=y +CONFIG_FEATURE_SWAPONOFF_LABEL=y CONFIG_SWITCH_ROOT=y # CONFIG_TASKSET is not set # CONFIG_FEATURE_TASKSET_FANCY is not set @@ -697,6 +707,7 @@ CONFIG_FEATURE_VOLUMEID_ISO9660=y # CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y CONFIG_FEATURE_VOLUMEID_LUKS=y +# CONFIG_FEATURE_VOLUMEID_MINIX is not set CONFIG_FEATURE_VOLUMEID_NILFS=y CONFIG_FEATURE_VOLUMEID_NTFS=y # CONFIG_FEATURE_VOLUMEID_OCFS2 is not set @@ -729,6 +740,7 @@ CONFIG_FEATURE_BEEP_LENGTH_MS=0 # CONFIG_CROND is not set # CONFIG_FEATURE_CROND_D is not set # CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set +# CONFIG_FEATURE_CROND_SPECIAL_TIMES is not set CONFIG_FEATURE_CROND_DIR="" # CONFIG_CRONTAB is not set CONFIG_DC=y @@ -751,6 +763,7 @@ CONFIG_FEATURE_DC_LIBM=y # 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_HEXEDIT=y CONFIG_I2CGET=y CONFIG_I2CSET=y CONFIG_I2CDUMP=y @@ -782,6 +795,7 @@ CONFIG_PARTPROBE=y CONFIG_RFKILL=y # CONFIG_RUNLEVEL is not set # CONFIG_RX is not set +CONFIG_SETFATTR=y # CONFIG_SETSERIAL is not set CONFIG_STRINGS=y CONFIG_TIME=y @@ -877,6 +891,7 @@ CONFIG_FEATURE_IP_NEIGH=y # CONFIG_FEATURE_NAMEIF_EXTENDED is not set # CONFIG_NBDCLIENT is not set CONFIG_NC=y +# CONFIG_NETCAT is not set CONFIG_NC_SERVER=y CONFIG_NC_EXTRA=y # CONFIG_NC_110_COMPAT is not set @@ -905,6 +920,10 @@ CONFIG_FEATURE_TELNET_WIDTH=y # CONFIG_FEATURE_TELNETD_INETD_WAIT is not set # CONFIG_TFTP is not set # CONFIG_TFTPD is not set +# +# Common options for tftp/tftpd +# + # CONFIG_FEATURE_TFTP_GET is not set # CONFIG_FEATURE_TFTP_PUT is not set # CONFIG_FEATURE_TFTP_BLOCKSIZE is not set @@ -941,6 +960,10 @@ CONFIG_UDHCPC=y CONFIG_FEATURE_UDHCPC_ARPING=y CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y CONFIG_UDHCPC_DEFAULT_SCRIPT="" + +# +# Common options for DHCP applets +# CONFIG_FEATURE_UDHCP_PORT=y CONFIG_UDHCP_DEBUG=0 CONFIG_FEATURE_UDHCP_RFC3397=y @@ -1025,13 +1048,11 @@ CONFIG_SV_DEFAULT_SERVICE_DIR="/var/service" # CONFIG_SVC is not set # CONFIG_SVLOGD 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_SESTATUS is not set # CONFIG_SETENFORCE is not set @@ -1086,26 +1107,29 @@ CONFIG_ASH_CMDCMD=y # CONFIG_HUSH_HELP is not set # CONFIG_HUSH_EXPORT is not set # CONFIG_HUSH_EXPORT_N is not set +# CONFIG_HUSH_READONLY 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_TIMES 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_GETOPTS is not set # CONFIG_HUSH_MEMLEAK is not set -# CONFIG_MSH is not set # # 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_EXTRA_QUIET=y # CONFIG_FEATURE_SH_STANDALONE is not set # CONFIG_FEATURE_SH_NOFORK is not set +CONFIG_FEATURE_SH_READ_FRAC=y CONFIG_FEATURE_SH_HISTFILESIZE=y # diff --git a/srcpkgs/busybox/template b/srcpkgs/busybox/template index e60f269b861..eeb7f949899 100644 --- a/srcpkgs/busybox/template +++ b/srcpkgs/busybox/template @@ -1,6 +1,6 @@ # Build template for 'busybox'. pkgname=busybox -version=1.27.2 +version=1.28.0 revision=1 hostmakedepends="perl" checkdepends="zip" @@ -9,7 +9,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://www.busybox.net" distfiles="${homepage}/downloads/busybox-$version.tar.bz2" -checksum=9d4be516b61e6480f156b11eb42577a13529f75d3383850bb75c50c285de63df +checksum=604553b7dbd59ded9e3ad7c6af49ed2cff599adf3e54d9463e5e0027b362019c alternatives=" awk:awk:/usr/bin/busybox @@ -62,7 +62,7 @@ do_configure() { do_build() { local t for t in busybox busybox-static; do - make -C $t SKIP_STRIP=y CFLAGS="$(_cflags $t)" ${makejobs} + make -C $t SKIP_STRIP=y CFLAGS="$(_cflags $t)" LFLAGS="$LDFLAGS" ${makejobs} done } do_check() {