diff --git a/srcpkgs/busybox/files/busybox.dotconfig b/srcpkgs/busybox/files/busybox.dotconfig index b83ef020aed..939cefff88d 100644 --- a/srcpkgs/busybox/files/busybox.dotconfig +++ b/srcpkgs/busybox/files/busybox.dotconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.28.0 -# Sat Jan 20 01:38:27 2018 +# Busybox version: 1.29.1 +# Sun Jul 15 12:26:38 2018 # CONFIG_HAVE_DOT_CONFIG=y @@ -12,27 +12,27 @@ CONFIG_DESKTOP=y # 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_LONG_OPTS=y CONFIG_SHOW_USAGE=y # CONFIG_FEATURE_VERBOSE_USAGE is not set CONFIG_FEATURE_COMPRESS_USAGE=y -CONFIG_BUSYBOX=y -# CONFIG_FEATURE_INSTALLER is not set -# CONFIG_INSTALL_NO_USR is not set +CONFIG_LFS=y # 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_BUSYBOX=y +# CONFIG_FEATURE_INSTALLER is not set +# CONFIG_INSTALL_NO_USR is not set CONFIG_FEATURE_SUID=y # CONFIG_FEATURE_SUID_CONFIG is not set # CONFIG_FEATURE_SUID_CONFIG_QUIET is not set -# CONFIG_SELINUX is not set # CONFIG_FEATURE_PREFER_APPLETS is not set CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" +# CONFIG_SELINUX is not set +# CONFIG_FEATURE_CLEAN_UP is not set CONFIG_FEATURE_SYSLOG=y CONFIG_PLATFORM_LINUX=y @@ -46,12 +46,13 @@ CONFIG_PLATFORM_LINUX=y # CONFIG_FEATURE_LIBBUSYBOX_STATIC is not set # CONFIG_FEATURE_INDIVIDUAL is not set # CONFIG_FEATURE_SHARED_BUSYBOX is not set -CONFIG_LFS=y CONFIG_CROSS_COMPILER_PREFIX="" CONFIG_SYSROOT="" CONFIG_EXTRA_CFLAGS="" CONFIG_EXTRA_LDFLAGS="" CONFIG_EXTRA_LDLIBS="" +# CONFIG_USE_PORTABLE_CODE is not set +CONFIG_STACK_OPTIMIZATION_386=y # # Installation Options ("make install" behavior) @@ -90,6 +91,7 @@ CONFIG_MD5_SMALL=1 CONFIG_SHA3_SMALL=1 # CONFIG_FEATURE_FAST_TOP is not set # CONFIG_FEATURE_ETC_NETWORKS is not set +# CONFIG_FEATURE_ETC_SERVICES is not set CONFIG_FEATURE_EDITING=y CONFIG_FEATURE_EDITING_MAX_LEN=1024 # CONFIG_FEATURE_EDITING_VI is not set @@ -100,6 +102,7 @@ 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_WINCH=y # CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set CONFIG_LOCALE_SUPPORT=y CONFIG_UNICODE_SUPPORT=y @@ -145,11 +148,11 @@ CONFIG_BZCAT=y # CONFIG_UNLZMA is not set CONFIG_LZCAT=y # CONFIG_LZMA is not set -# CONFIG_FEATURE_LZMA_FAST is not set CONFIG_UNXZ=y CONFIG_XZCAT=y CONFIG_XZ=y CONFIG_BZIP2=y +CONFIG_BZIP2_SMALL=8 CONFIG_FEATURE_BZIP2_DECOMPRESS=y # CONFIG_CPIO is not set # CONFIG_FEATURE_CPIO_O is not set @@ -184,6 +187,7 @@ CONFIG_FEATURE_UNZIP_CDF=y CONFIG_FEATURE_UNZIP_BZIP2=y CONFIG_FEATURE_UNZIP_LZMA=y CONFIG_FEATURE_UNZIP_XZ=y +# CONFIG_FEATURE_LZMA_FAST is not set # # Coreutils @@ -286,6 +290,7 @@ CONFIG_FEATURE_FANCY_SLEEP=y CONFIG_FEATURE_FLOAT_SLEEP=y CONFIG_SORT=y CONFIG_FEATURE_SORT_BIG=y +# CONFIG_FEATURE_SORT_OPTIMIZE_MEMORY is not set CONFIG_SPLIT=y # CONFIG_FEATURE_SPLIT_FANCY is not set CONFIG_STAT=y @@ -359,10 +364,6 @@ 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 @@ -477,6 +478,7 @@ CONFIG_FEATURE_XARGS_SUPPORT_ARGS_FILE=y # CONFIG_HALT is not set # CONFIG_POWEROFF is not set # CONFIG_REBOOT is not set +# CONFIG_FEATURE_WAIT_FOR_INIT is not set # CONFIG_FEATURE_CALL_TELINIT is not set CONFIG_TELINIT_PATH="" # CONFIG_INIT is not set @@ -704,6 +706,7 @@ CONFIG_FEATURE_VOLUMEID_FAT=y # CONFIG_FEATURE_VOLUMEID_HFS is not set CONFIG_FEATURE_VOLUMEID_ISO9660=y # CONFIG_FEATURE_VOLUMEID_JFS is not set +CONFIG_FEATURE_VOLUMEID_LFS=y # CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y CONFIG_FEATURE_VOLUMEID_LUKS=y @@ -780,6 +783,8 @@ CONFIG_FEATURE_LESS_WINCH=y CONFIG_FEATURE_LESS_ASK_TERMINAL=y CONFIG_FEATURE_LESS_DASHCMD=y CONFIG_FEATURE_LESS_LINENUMS=y +CONFIG_FEATURE_LESS_RAW=y +CONFIG_FEATURE_LESS_ENV=y CONFIG_LSSCSI=y # CONFIG_MAKEDEVS is not set # CONFIG_FEATURE_MAKEDEVS_LEAF is not set @@ -899,6 +904,8 @@ CONFIG_NETSTAT=y CONFIG_FEATURE_NETSTAT_WIDE=y CONFIG_FEATURE_NETSTAT_PRG=y CONFIG_NSLOOKUP=y +CONFIG_FEATURE_NSLOOKUP_BIG=y +CONFIG_FEATURE_NSLOOKUP_LONG_OPTIONS=y CONFIG_NTPD=y CONFIG_FEATURE_NTPD_SERVER=y CONFIG_FEATURE_NTPD_CONF=y @@ -909,6 +916,8 @@ CONFIG_FEATURE_FANCY_PING=y # CONFIG_ROUTE is not set # CONFIG_SLATTACH is not set CONFIG_SSL_CLIENT=y +CONFIG_TC=y +CONFIG_FEATURE_TC_INGRESS=y # CONFIG_TCPSVD is not set # CONFIG_UDPSVD is not set CONFIG_TELNET=y @@ -919,15 +928,11 @@ CONFIG_FEATURE_TELNET_WIDTH=y # CONFIG_FEATURE_TELNETD_STANDALONE is not set # CONFIG_FEATURE_TELNETD_INETD_WAIT is not set # CONFIG_TFTP is not set +# CONFIG_FEATURE_TFTP_PROGRESS_BAR 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 -# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set # CONFIG_TFTP_DEBUG is not set CONFIG_TLS=y # CONFIG_TRACEROUTE is not set @@ -946,13 +951,9 @@ CONFIG_FEATURE_WGET_HTTPS=y CONFIG_FEATURE_WGET_OPENSSL=y CONFIG_WHOIS=y # CONFIG_ZCIP is not set -# CONFIG_UDHCPC6 is not set -# CONFIG_FEATURE_UDHCPC6_RFC3646 is not set -# CONFIG_FEATURE_UDHCPC6_RFC4704 is not set -# CONFIG_FEATURE_UDHCPC6_RFC4833 is not set # CONFIG_UDHCPD is not set -# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set # CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set +# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set CONFIG_DHCPD_LEASES_FILE="" # CONFIG_DUMPLEASES is not set # CONFIG_DHCPRELAY is not set @@ -960,15 +961,20 @@ CONFIG_UDHCPC=y CONFIG_FEATURE_UDHCPC_ARPING=y CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y CONFIG_UDHCPC_DEFAULT_SCRIPT="" +# CONFIG_UDHCPC6 is not set +# CONFIG_FEATURE_UDHCPC6_RFC3646 is not set +# CONFIG_FEATURE_UDHCPC6_RFC4704 is not set +# CONFIG_FEATURE_UDHCPC6_RFC4833 is not set +# CONFIG_FEATURE_UDHCPC6_RFC5970 is not set # # Common options for DHCP applets # CONFIG_FEATURE_UDHCP_PORT=y CONFIG_UDHCP_DEBUG=0 +CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0 CONFIG_FEATURE_UDHCP_RFC3397=y CONFIG_FEATURE_UDHCP_8021Q=y -CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0 CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="" # @@ -1046,6 +1052,7 @@ CONFIG_CHPST=y CONFIG_SV=y CONFIG_SV_DEFAULT_SERVICE_DIR="/var/service" # CONFIG_SVC is not set +CONFIG_SVOK=y # CONFIG_SVLOGD is not set # CONFIG_CHCON is not set # CONFIG_GETENFORCE is not set @@ -1074,6 +1081,8 @@ CONFIG_ASH=y CONFIG_ASH_OPTIMIZE_FOR_SIZE=y CONFIG_ASH_INTERNAL_GLOB=y CONFIG_ASH_BASH_COMPAT=y +# CONFIG_ASH_BASH_SOURCE_CURDIR is not set +CONFIG_ASH_BASH_NOT_FOUND_HOOK=y CONFIG_ASH_JOB_CONTROL=y CONFIG_ASH_ALIAS=y CONFIG_ASH_RANDOM_SUPPORT=y @@ -1090,6 +1099,8 @@ CONFIG_ASH_CMDCMD=y # CONFIG_HUSH is not set # CONFIG_HUSH_BASH_COMPAT is not set # CONFIG_HUSH_BRACE_EXPANSION is not set +# CONFIG_HUSH_LINENO_VAR is not set +# CONFIG_HUSH_BASH_SOURCE_CURDIR is not set # CONFIG_HUSH_INTERACTIVE is not set # CONFIG_HUSH_SAVEHISTORY is not set # CONFIG_HUSH_JOB is not set @@ -1110,6 +1121,7 @@ CONFIG_ASH_CMDCMD=y # CONFIG_HUSH_READONLY is not set # CONFIG_HUSH_KILL is not set # CONFIG_HUSH_WAIT is not set +# CONFIG_HUSH_COMMAND is not set # CONFIG_HUSH_TRAP is not set # CONFIG_HUSH_TYPE is not set # CONFIG_HUSH_TIMES is not set diff --git a/srcpkgs/busybox/patches/testsuite-fix-pidof.patch b/srcpkgs/busybox/patches/testsuite-fix-pidof.patch deleted file mode 100644 index d1e4194a710..00000000000 --- a/srcpkgs/busybox/patches/testsuite-fix-pidof.patch +++ /dev/null @@ -1,24 +0,0 @@ -The test assumes the system runs a binary called init as pid1 but Void Linux runs runit -which does not call itself init, so we adjust this test. - ---- testsuite/pidof.tests -+++ testsuite/pidof.tests -@@ -19,15 +19,15 @@ testing "pidof (exit with success)" "pidof pidof > /dev/null; echo \$?" \ - testing "pidof this" "pidof pidof.tests | grep -o -w $$" "$$\n" "" "" - - optional FEATURE_PIDOF_SINGLE --testing "pidof -s" "pidof -s init" "1\n" "" "" -+testing "pidof -s" "pidof -s runit" "1\n" "" "" - SKIP= - - optional FEATURE_PIDOF_OMIT FEATURE_PIDOF_SINGLE - # This test fails now because process name matching logic has changed, - # but new logic is not "wrong" either... see find_pid_by_name.c comments - #testing "pidof -o %PPID" "pidof -o %PPID pidof.tests | grep -o -w $$" "" "" "" --testing "pidof -o %PPID NOP" "pidof -o %PPID -s init" "1\n" "" "" --testing "pidof -o init" "pidof -o 1 init | grep -o -w 1" "" "" "" -+testing "pidof -o %PPID NOP" "pidof -o %PPID -s runit" "1\n" "" "" -+testing "pidof -o runit" "pidof -o 1 runit | grep -o -w 1" "" "" "" - SKIP= - - exit $FAILCOUNT diff --git a/srcpkgs/busybox/template b/srcpkgs/busybox/template index bd9acdde2e8..a7fcf6d0c8c 100644 --- a/srcpkgs/busybox/template +++ b/srcpkgs/busybox/template @@ -1,6 +1,6 @@ # Template file for 'busybox' pkgname=busybox -version=1.28.4 +version=1.29.1 revision=1 hostmakedepends="perl" checkdepends="zip" @@ -8,8 +8,8 @@ short_desc="The Swiss Army Knife of Embedded Linux" maintainer="Juan RP " license="GPL-2.0-only" homepage="http://www.busybox.net" -distfiles="${homepage}/downloads/busybox-$version.tar.bz2" -checksum=e3c14a3699dc7e82fed397392957afc78e37bdf25398ac38ead6e84621b2ae6a +distfiles="${homepage}/downloads/busybox-${version}.tar.bz2" +checksum=fc250730ea16d28839bfecda3c431683fa6bd4273ffca6b632cbeb3556c914c3 alternatives=" awk:awk:/usr/bin/busybox