Index: sysutils/busybox/Makefile =================================================================== --- sysutils/busybox/Makefile +++ sysutils/busybox/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= busybox -PORTVERSION= 1.31.1 +PORTVERSION= 1.32.1 CATEGORIES= sysutils misc shells MASTER_SITES= https://busybox.net/downloads/ Index: sysutils/busybox/distinfo =================================================================== --- sysutils/busybox/distinfo +++ sysutils/busybox/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1588539347 -SHA256 (busybox-1.31.1.tar.bz2) = d0f940a72f648943c1f2211e0e3117387c31d765137d92bd8284a3fb9752a998 -SIZE (busybox-1.31.1.tar.bz2) = 2430221 +TIMESTAMP = 1609623487 +SHA256 (busybox-1.32.1.tar.bz2) = 9d57c4bd33974140fd4111260468af22856f12f5b5ef7c70c8d9b75c712a0dee +SIZE (busybox-1.32.1.tar.bz2) = 2444679 Index: sysutils/busybox/files/data-.config =================================================================== --- sysutils/busybox/files/data-.config +++ sysutils/busybox/files/data-.config @@ -927,7 +927,8 @@ CONFIG_SSL_CLIENT=y # CONFIG_TC is not set # CONFIG_FEATURE_TC_INGRESS is not set -# CONFIG_TCPSVD is not set +CONFIG_TCPSVD=y +# udpsvd is broken on FreeBSD ATM, so not enabled # CONFIG_UDPSVD is not set CONFIG_TELNET=y CONFIG_FEATURE_TELNET_TTYPE=y @@ -1173,3 +1174,9 @@ CONFIG_FEATURE_IPC_SYSLOG=y CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 CONFIG_FEATURE_KMSG_SYSLOG=y + +CONFIG_WARN_SIMPLE_MSG=n +CONFIG_FEATURE_FIND_EMPTY=y +CONFIG_MIM=y +CONFIG_SHELL_HUSH=n +CONFIG_FEATURE_SYSLOGD_PRECISE_TIMESTAMPS=n Index: sysutils/busybox/files/patch-Makefile.flags =================================================================== --- sysutils/busybox/files/patch-Makefile.flags +++ sysutils/busybox/files/patch-Makefile.flags @@ -1,21 +1,6 @@ ---- Makefile.flags.orig 2018-12-05 14:44:34 UTC +--- Makefile.flags.orig 2021-01-01 13:30:02 UTC +++ Makefile.flags -@@ -47,12 +47,11 @@ endif - # gcc 3.x emits bogus "old style proto" warning on find.c:alloc_action() - CFLAGS += $(call cc-ifversion, -ge, 0400, -Wold-style-definition) - --CFLAGS += $(call cc-option,-fno-builtin-strlen -finline-limit=0 -fomit-frame-pointer -ffunction-sections -fdata-sections,) -+CFLAGS += $(call cc-option,-fno-builtin-strlen -fomit-frame-pointer -ffunction-sections -fdata-sections,) - # -fno-guess-branch-probability: prohibit pseudo-random guessing - # of branch probabilities (hopefully makes bloatcheck more stable): - CFLAGS += $(call cc-option,-fno-guess-branch-probability,) --CFLAGS += $(call cc-option,-funsigned-char -static-libgcc,) --CFLAGS += $(call cc-option,-falign-functions=1 -falign-jumps=1 -falign-labels=1 -falign-loops=1,) -+CFLAGS += $(call cc-option,-funsigned-char,) - # Defeat .eh_frame bloat (gcc 4.6.3 x86-32 defconfig: 20% smaller busybox binary): - CFLAGS += $(call cc-option,-fno-unwind-tables,) - CFLAGS += $(call cc-option,-fno-asynchronous-unwind-tables,) -@@ -156,9 +155,9 @@ CPPFLAGS += $(SELINUX_CFLAGS) +@@ -179,9 +179,9 @@ CPPFLAGS += $(SELINUX_CFLAGS) LDLIBS += $(if $(SELINUX_LIBS),$(SELINUX_LIBS:-l%=%),$(SELINUX_PC_MODULES:lib%=%)) endif Index: sysutils/busybox/files/patch-include_libbb.h =================================================================== --- sysutils/busybox/files/patch-include_libbb.h +++ sysutils/busybox/files/patch-include_libbb.h @@ -1,4 +1,4 @@ ---- include/libbb.h.orig 2019-02-14 13:31:15 UTC +--- include/libbb.h.orig 2021-01-01 13:30:02 UTC +++ include/libbb.h @@ -53,6 +53,9 @@ #include @@ -10,13 +10,13 @@ #include #include #if ENABLE_FEATURE_SHADOWPASSWDS -@@ -160,9 +163,6 @@ +@@ -159,9 +162,6 @@ + #endif #ifndef HAVE_FDATASYNC # define fdatasync fsync - #endif +-#endif -#ifndef HAVE_XTABS -# define XTABS TAB3 --#endif + #endif /* * Use '%m' to append error string on platforms that support it, - * '%s' and strerror() on those that don't. Index: sysutils/busybox/files/patch-include_platform.h =================================================================== --- sysutils/busybox/files/patch-include_platform.h +++ sysutils/busybox/files/patch-include_platform.h @@ -1,6 +1,6 @@ ---- include/platform.h.orig 2018-12-05 14:44:34 UTC +--- include/platform.h.orig 2021-01-01 13:30:02 UTC +++ include/platform.h -@@ -315,7 +315,7 @@ typedef unsigned smalluint; +@@ -319,7 +319,7 @@ typedef unsigned smalluint; #endif /* Define bb_setpgrp */ Index: sysutils/busybox/files/patch-libbb_pw__encrypt.c =================================================================== --- sysutils/busybox/files/patch-libbb_pw__encrypt.c +++ sysutils/busybox/files/patch-libbb_pw__encrypt.c @@ -1,11 +1,11 @@ ---- libbb/pw_encrypt.c.orig 2018-12-05 14:44:34 UTC +--- libbb/pw_encrypt.c.orig 2021-01-01 13:30:02 UTC +++ libbb/pw_encrypt.c -@@ -6,7 +6,7 @@ - * +@@ -7,7 +7,7 @@ * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ + #if !ENABLE_USE_BB_CRYPT -#include +#include + #endif #include "libbb.h" - /* static const uint8_t ascii64[] ALIGN1 = Index: sysutils/busybox/files/patch-networking_ping.c =================================================================== --- sysutils/busybox/files/patch-networking_ping.c +++ sysutils/busybox/files/patch-networking_ping.c @@ -1,4 +1,4 @@ ---- networking/ping.c.orig 2018-12-30 15:14:20 UTC +--- networking/ping.c.orig 2021-01-01 13:30:02 UTC +++ networking/ping.c @@ -119,7 +119,12 @@ //usage: "round-trip min/avg/max = 20.1/20.1/20.1 ms\n" @@ -13,10 +13,11 @@ #include "libbb.h" #include "common_bufsiz.h" -@@ -147,6 +152,42 @@ +@@ -146,6 +151,42 @@ + #ifndef SOL_RAW # define SOL_RAW IPPROTO_RAW #endif - ++ +#if defined(__FreeBSD__) || defined(__APPLE__) +/** + * On BSD the IPv4 struct is called struct ip and instead of iXX @@ -52,7 +53,6 @@ + }; +#endif + -+ + #if ENABLE_PING6 # include - /* I see RENUMBERED constants in bits/in.h - !!? Index: sysutils/busybox/files/patch-shell_shell__common.c =================================================================== --- sysutils/busybox/files/patch-shell_shell__common.c +++ sysutils/busybox/files/patch-shell_shell__common.c @@ -1,12 +1,12 @@ ---- shell/shell_common.c.orig 2019-06-10 09:09:31 UTC +--- shell/shell_common.c.orig 2021-01-01 13:30:58 UTC +++ shell/shell_common.c -@@ -328,7 +328,9 @@ struct limits { +@@ -327,7 +327,9 @@ struct limits { static const struct limits limits_tbl[] = { - { RLIMIT_CORE, 9, "core file size (blocks)" }, // -c - { RLIMIT_DATA, 10, "data seg size (kb)" }, // -d + { RLIMIT_CORE, 9, }, // -c + { RLIMIT_DATA, 10, }, // -d +#ifdef RLIMIT_NICE - { RLIMIT_NICE, 0, "scheduling priority" }, // -e + { RLIMIT_NICE, 0, }, // -e +#endif - { RLIMIT_FSIZE, 9, "file size (blocks)" }, // -f + { RLIMIT_FSIZE, 9, }, // -f #define LIMIT_F_IDX 3 #ifdef RLIMIT_SIGPENDING