git: ea359999d845 - main - sysutils/busybox: update to 1.34.1

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Oleksii Samorukov <samm_at_FreeBSD.org>
Date: Sun, 28 Nov 2021 23:38:13 UTC
The branch main has been updated by samm:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ea359999d845dd038066c9bb4ad7d21a04cd17f8

commit ea359999d845dd038066c9bb4ad7d21a04cd17f8
Author:     Oleksii Samorukov <samm@FreeBSD.org>
AuthorDate: 2021-11-28 23:21:51 +0000
Commit:     Oleksii Samorukov <samm@FreeBSD.org>
CommitDate: 2021-11-28 23:37:45 +0000

    sysutils/busybox: update to 1.34.1
---
 sysutils/busybox/Makefile                          |  3 +-
 sysutils/busybox/distinfo                          |  6 +--
 sysutils/busybox/files/data-.config                | 40 ++++++++++------
 sysutils/busybox/files/patch-Makefile.flags        | 12 -----
 sysutils/busybox/files/patch-coreutils_mknod.c     | 12 -----
 sysutils/busybox/files/patch-editors_awk.c         | 11 +++++
 sysutils/busybox/files/patch-include_libbb.h       | 14 ------
 sysutils/busybox/files/patch-include_platform.h    | 11 -----
 sysutils/busybox/files/patch-libbb_pw__encrypt.c   | 12 -----
 sysutils/busybox/files/patch-mailutils_mail.c      | 30 ------------
 sysutils/busybox/files/patch-networking_httpd.c    | 14 ------
 sysutils/busybox/files/patch-networking_ntpd.c     | 15 ------
 sysutils/busybox/files/patch-networking_ping.c     | 55 ----------------------
 .../busybox/files/patch-networking_traceroute.c    | 39 +++++----------
 sysutils/busybox/files/patch-shell_hush.c          | 12 ++---
 sysutils/busybox/files/patch-shell_shell__common.c | 12 -----
 sysutils/busybox/files/patch-sysklogd_klogd.c      | 11 -----
 17 files changed, 60 insertions(+), 249 deletions(-)

diff --git a/sysutils/busybox/Makefile b/sysutils/busybox/Makefile
index 5b4fafde1f09..6219f6986ea0 100644
--- a/sysutils/busybox/Makefile
+++ b/sysutils/busybox/Makefile
@@ -1,8 +1,7 @@
 # Created by: luigi@FreeBSD.org
 
 PORTNAME=	busybox
-PORTVERSION=	1.32.1
-PORTREVISION=	1
+PORTVERSION=	1.34.1
 CATEGORIES=	sysutils misc shells
 MASTER_SITES=	https://busybox.net/downloads/
 
diff --git a/sysutils/busybox/distinfo b/sysutils/busybox/distinfo
index 5679f7f1c6bf..abf6181288cf 100644
--- a/sysutils/busybox/distinfo
+++ b/sysutils/busybox/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1609623487
-SHA256 (busybox-1.32.1.tar.bz2) = 9d57c4bd33974140fd4111260468af22856f12f5b5ef7c70c8d9b75c712a0dee
-SIZE (busybox-1.32.1.tar.bz2) = 2444679
+TIMESTAMP = 1638131025
+SHA256 (busybox-1.34.1.tar.bz2) = 415fbd89e5344c96acf449d94a6f956dbed62e18e835fc83e064db33a34bd549
+SIZE (busybox-1.34.1.tar.bz2) = 2476932
diff --git a/sysutils/busybox/files/data-.config b/sysutils/busybox/files/data-.config
index 1989e48c14c2..fab6efd74a41 100644
--- a/sysutils/busybox/files/data-.config
+++ b/sysutils/busybox/files/data-.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.31.0
-# Mon Oct 14 17:36:36 2019
+# Busybox version: 1.34.1
+# Sun Nov 28 21:01:17 2021
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -36,7 +36,6 @@ CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
 # CONFIG_FEATURE_CLEAN_UP is not set
 CONFIG_FEATURE_SYSLOG_INFO=y
 CONFIG_FEATURE_SYSLOG=y
-CONFIG_PLATFORM_LINUX=y
 
 #
 # Build Options
@@ -55,6 +54,7 @@ CONFIG_EXTRA_LDFLAGS=""
 CONFIG_EXTRA_LDLIBS=""
 CONFIG_USE_PORTABLE_CODE=y
 # CONFIG_STACK_OPTIMIZATION_386 is not set
+# CONFIG_STATIC_LIBGCC is not set
 
 #
 # Installation Options ("make install" behavior)
@@ -76,6 +76,7 @@ CONFIG_PREFIX="./_install"
 # CONFIG_DEBUG_SANITIZE is not set
 # CONFIG_UNIT_TEST is not set
 # CONFIG_WERROR is not set
+# CONFIG_WARN_SIMPLE_MSG is not set
 CONFIG_NO_DEBUG_LIB=y
 # CONFIG_DMALLOC is not set
 # CONFIG_EFENCE is not set
@@ -206,11 +207,13 @@ CONFIG_CHOWN=y
 CONFIG_FEATURE_CHOWN_LONG_OPTIONS=y
 CONFIG_CHROOT=y
 CONFIG_CKSUM=y
+CONFIG_CRC32=y
 CONFIG_COMM=y
 CONFIG_CP=y
 CONFIG_FEATURE_CP_LONG_OPTIONS=y
 CONFIG_FEATURE_CP_REFLINK=y
 CONFIG_CUT=y
+CONFIG_FEATURE_CUT_REGEX=y
 CONFIG_DATE=y
 CONFIG_FEATURE_DATE_ISOFMT=y
 # CONFIG_FEATURE_DATE_NANO is not set
@@ -315,7 +318,6 @@ 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
@@ -330,6 +332,7 @@ CONFIG_UNIQ=y
 CONFIG_UNLINK=y
 CONFIG_USLEEP=y
 CONFIG_UUDECODE=y
+CONFIG_BASE32=y
 CONFIG_BASE64=y
 CONFIG_UUENCODE=y
 CONFIG_WC=y
@@ -418,6 +421,7 @@ CONFIG_VI=y
 CONFIG_FEATURE_VI_MAX_LEN=1024
 CONFIG_FEATURE_VI_8BIT=y
 CONFIG_FEATURE_VI_COLON=y
+CONFIG_FEATURE_VI_COLON_EXPAND=y
 CONFIG_FEATURE_VI_YANKMARK=y
 CONFIG_FEATURE_VI_SEARCH=y
 # CONFIG_FEATURE_VI_REGEX_SEARCH is not set
@@ -431,6 +435,7 @@ CONFIG_FEATURE_VI_ASK_TERMINAL=y
 CONFIG_FEATURE_VI_UNDO=y
 CONFIG_FEATURE_VI_UNDO_QUEUE=y
 CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=256
+CONFIG_FEATURE_VI_VERBOSE_STATUS=y
 CONFIG_FEATURE_ALLOW_EXEC=y
 
 #
@@ -458,6 +463,7 @@ CONFIG_FEATURE_FIND_SIZE=y
 CONFIG_FEATURE_FIND_PRUNE=y
 CONFIG_FEATURE_FIND_QUIT=y
 CONFIG_FEATURE_FIND_DELETE=y
+CONFIG_FEATURE_FIND_EMPTY=y
 CONFIG_FEATURE_FIND_PATH=y
 CONFIG_FEATURE_FIND_REGEX=y
 # CONFIG_FEATURE_FIND_CONTEXT is not set
@@ -617,7 +623,6 @@ CONFIG_FLOCK=y
 CONFIG_GETOPT=y
 CONFIG_FEATURE_GETOPT_LONG=y
 CONFIG_HEXDUMP=y
-# CONFIG_FEATURE_HEXDUMP_REVERSE is not set
 CONFIG_HD=y
 CONFIG_XXD=y
 # CONFIG_HWCLOCK is not set
@@ -688,6 +693,7 @@ CONFIG_SETSID=y
 # CONFIG_SWITCH_ROOT is not set
 # CONFIG_TASKSET is not set
 # CONFIG_FEATURE_TASKSET_FANCY is not set
+# CONFIG_FEATURE_TASKSET_CPULIST is not set
 # CONFIG_UEVENT is not set
 # CONFIG_UMOUNT is not set
 # CONFIG_FEATURE_UMOUNT_ALL is not set
@@ -700,6 +706,7 @@ CONFIG_WALL=y
 # CONFIG_FEATURE_VOLUMEID_BCACHE is not set
 # CONFIG_FEATURE_VOLUMEID_BTRFS is not set
 # CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
+# CONFIG_FEATURE_VOLUMEID_EROFS is not set
 # CONFIG_FEATURE_VOLUMEID_EXFAT is not set
 # CONFIG_FEATURE_VOLUMEID_EXT is not set
 # CONFIG_FEATURE_VOLUMEID_F2FS is not set
@@ -727,6 +734,7 @@ CONFIG_WALL=y
 # Miscellaneous Utilities
 #
 # CONFIG_ADJTIMEX is not set
+CONFIG_ASCII=y
 # CONFIG_BBCONFIG is not set
 # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
 CONFIG_BC=y
@@ -797,6 +805,7 @@ CONFIG_FEATURE_LESS_ENV=y
 # CONFIG_FEATURE_MAKEDEVS_TABLE is not set
 CONFIG_MAN=y
 CONFIG_MICROCOM=y
+CONFIG_MIM=y
 # CONFIG_MT is not set
 # CONFIG_NANDWRITE is not set
 # CONFIG_NANDDUMP is not set
@@ -821,6 +830,7 @@ CONFIG_TTYSIZE=y
 # CONFIG_UBIRENAME is not set
 CONFIG_VOLNAME=y
 # CONFIG_WATCHDOG is not set
+# CONFIG_FEATURE_WATCHDOG_OPEN_TWICE is not set
 
 #
 # Networking Utilities
@@ -858,6 +868,10 @@ CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y
 CONFIG_FEATURE_HTTPD_ERROR_PAGES=y
 CONFIG_FEATURE_HTTPD_PROXY=y
 CONFIG_FEATURE_HTTPD_GZIP=y
+CONFIG_FEATURE_HTTPD_ETAG=y
+CONFIG_FEATURE_HTTPD_LAST_MODIFIED=y
+CONFIG_FEATURE_HTTPD_DATE=y
+CONFIG_FEATURE_HTTPD_ACL_IP=y
 # CONFIG_IFCONFIG is not set
 # CONFIG_FEATURE_IFCONFIG_STATUS is not set
 # CONFIG_FEATURE_IFCONFIG_SLIP is not set
@@ -928,7 +942,6 @@ CONFIG_SSL_CLIENT=y
 # CONFIG_TC is not set
 # CONFIG_FEATURE_TC_INGRESS is not set
 CONFIG_TCPSVD=y
-# DOes not work on FreeBSD
 # CONFIG_UDPSVD is not set
 CONFIG_TELNET=y
 CONFIG_FEATURE_TELNET_TTYPE=y
@@ -956,6 +969,7 @@ CONFIG_FEATURE_TRACEROUTE_USE_ICMP=y
 CONFIG_WGET=y
 CONFIG_FEATURE_WGET_LONG_OPTIONS=y
 CONFIG_FEATURE_WGET_STATUSBAR=y
+CONFIG_FEATURE_WGET_FTP=y
 CONFIG_FEATURE_WGET_AUTHENTICATION=y
 CONFIG_FEATURE_WGET_TIMEOUT=y
 CONFIG_FEATURE_WGET_HTTPS=y
@@ -977,6 +991,7 @@ CONFIG_UDHCPC_DEFAULT_SCRIPT=""
 # CONFIG_FEATURE_UDHCPC6_RFC4704 is not set
 # CONFIG_FEATURE_UDHCPC6_RFC4833 is not set
 # CONFIG_FEATURE_UDHCPC6_RFC5970 is not set
+CONFIG_UDHCPC_DEFAULT_INTERFACE=""
 # CONFIG_FEATURE_UDHCP_PORT is not set
 CONFIG_UDHCP_DEBUG=0
 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0
@@ -1084,6 +1099,7 @@ CONFIG_SH_IS_ASH=y
 # CONFIG_BASH_IS_ASH is not set
 # CONFIG_BASH_IS_HUSH is not set
 CONFIG_BASH_IS_NONE=y
+CONFIG_SHELL_ASH=y
 CONFIG_ASH=y
 CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
 CONFIG_ASH_INTERNAL_GLOB=y
@@ -1104,12 +1120,13 @@ CONFIG_ASH_GETOPTS=y
 CONFIG_ASH_CMDCMD=y
 CONFIG_CTTYHACK=y
 CONFIG_HUSH=y
+CONFIG_SHELL_HUSH=y
 CONFIG_HUSH_BASH_COMPAT=y
 CONFIG_HUSH_BRACE_EXPANSION=y
-CONFIG_HUSH_LINENO_VAR=y
 # CONFIG_HUSH_BASH_SOURCE_CURDIR is not set
+CONFIG_HUSH_LINENO_VAR=y
 CONFIG_HUSH_INTERACTIVE=y
-CONFIG_HUSH_SAVEHISTORY=y
+# CONFIG_HUSH_SAVEHISTORY is not set
 CONFIG_HUSH_JOB=y
 CONFIG_HUSH_TICK=y
 CONFIG_HUSH_IF=y
@@ -1170,13 +1187,8 @@ CONFIG_FEATURE_ROTATE_LOGFILE=y
 CONFIG_FEATURE_REMOTE_LOG=y
 CONFIG_FEATURE_SYSLOGD_DUP=y
 CONFIG_FEATURE_SYSLOGD_CFG=y
+# CONFIG_FEATURE_SYSLOGD_PRECISE_TIMESTAMPS is not set
 CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256
 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
diff --git a/sysutils/busybox/files/patch-Makefile.flags b/sysutils/busybox/files/patch-Makefile.flags
deleted file mode 100644
index a2136dedaf79..000000000000
--- a/sysutils/busybox/files/patch-Makefile.flags
+++ /dev/null
@@ -1,12 +0,0 @@
---- Makefile.flags.orig	2021-01-03 14:40:37 UTC
-+++ Makefile.flags
-@@ -180,7 +180,9 @@ LDLIBS += $(if $(SELINUX_LIBS),$(SELINUX_LIBS:-l%=%),$
- endif
- 
- ifeq ($(CONFIG_FEATURE_NSLOOKUP_BIG),y)
-+ifeq ($(CONFIG_UNAME_OSNAME),Linux)
- LDLIBS += resolv
-+endif
- endif
- 
- ifeq ($(CONFIG_EFENCE),y)
diff --git a/sysutils/busybox/files/patch-coreutils_mknod.c b/sysutils/busybox/files/patch-coreutils_mknod.c
deleted file mode 100644
index a166e320359d..000000000000
--- a/sysutils/busybox/files/patch-coreutils_mknod.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- coreutils/mknod.c.orig	2021-01-01 10:52:27 UTC
-+++ coreutils/mknod.c
-@@ -36,7 +36,9 @@
- //usage:       "$ mknod /dev/fd0 b 2 0\n"
- //usage:       "$ mknod -m 644 /tmp/pipe p\n"
- 
-+#ifdef __linux__
- #include <sys/sysmacros.h>  // For makedev
-+#endif
- 
- #include "libbb.h"
- #include "libcoreutils/coreutils.h"
diff --git a/sysutils/busybox/files/patch-editors_awk.c b/sysutils/busybox/files/patch-editors_awk.c
new file mode 100644
index 000000000000..487e6a5e1ff6
--- /dev/null
+++ b/sysutils/busybox/files/patch-editors_awk.c
@@ -0,0 +1,11 @@
+--- editors/awk.c.orig	2021-11-28 21:53:43 UTC
++++ editors/awk.c
+@@ -3238,7 +3238,7 @@ static var *evaluate(node *op, var *res)
+ 				if (op1)
+ 					syntax_error("Too many arguments");
+ 			{
+-#if RAND_MAX >= 0x7fffffff
++#if RAND_MAX >= 0x7ffffffd
+ 				uint32_t u = ((uint32_t)rand() << 16) ^ rand();
+ 				uint64_t v = ((uint64_t)rand() << 32) | u;
+ 				/* the above shift+or is optimized out on 32-bit arches */
diff --git a/sysutils/busybox/files/patch-include_libbb.h b/sysutils/busybox/files/patch-include_libbb.h
deleted file mode 100644
index a4bd33838b78..000000000000
--- a/sysutils/busybox/files/patch-include_libbb.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- include/libbb.h.orig	2021-01-04 13:16:47 UTC
-+++ include/libbb.h
-@@ -106,7 +106,11 @@
- #  define updwtmpx updwtmp
- #  define _PATH_UTMPX _PATH_UTMP
- # else
-+#ifndef __FreeBSD__
- #  include <utmp.h>
-+#else
-+#define  _PATH_UTMPX "/var/run/utx.active"
-+#endif
- #  include <utmpx.h>
- #  if defined _PATH_UTMP && !defined _PATH_UTMPX
- #   define _PATH_UTMPX _PATH_UTMP
diff --git a/sysutils/busybox/files/patch-include_platform.h b/sysutils/busybox/files/patch-include_platform.h
deleted file mode 100644
index b55ee80327fd..000000000000
--- a/sysutils/busybox/files/patch-include_platform.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/platform.h.orig	2021-01-01 13:30:02 UTC
-+++ include/platform.h
-@@ -319,7 +319,7 @@ typedef unsigned smalluint;
- #endif
- 
- /* Define bb_setpgrp */
--#if defined(__digital__) && defined(__unix__)
-+#if (defined(__digital__) && defined(__unix__) || defined(__FreeBSD__))
- /* use legacy setpgrp(pid_t, pid_t) for now.  move to platform.c */
- # define bb_setpgrp() do { pid_t __me = getpid(); setpgrp(__me, __me); } while (0)
- #else
diff --git a/sysutils/busybox/files/patch-libbb_pw__encrypt.c b/sysutils/busybox/files/patch-libbb_pw__encrypt.c
deleted file mode 100644
index a482e9e30ac5..000000000000
--- a/sysutils/busybox/files/patch-libbb_pw__encrypt.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- libbb/pw_encrypt.c.orig	2021-01-01 13:30:02 UTC
-+++ libbb/pw_encrypt.c
-@@ -7,7 +7,9 @@
-  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
-  */
- #if !ENABLE_USE_BB_CRYPT
-+#ifndef __FreeBSD__
- #include <crypt.h>
-+#endif
- #endif
- #include "libbb.h"
- 
diff --git a/sysutils/busybox/files/patch-mailutils_mail.c b/sysutils/busybox/files/patch-mailutils_mail.c
deleted file mode 100644
index 7056767ab857..000000000000
--- a/sysutils/busybox/files/patch-mailutils_mail.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- mailutils/mail.c.orig	2018-12-05 14:44:34 UTC
-+++ mailutils/mail.c
-@@ -6,7 +6,13 @@
-  *
-  * Licensed under GPLv2, see file LICENSE in this source tree.
-  */
-+#ifdef __Linux__
- #include <sys/prctl.h>
-+#define PRCTL
-+#elif defined(__FreeBSD__)
-+#include <sys/procctl.h>
-+#define PROCCTL
-+#endif
- #include "libbb.h"
- #include "mail.h"
- 
-@@ -60,7 +66,12 @@ void FAST_FUNC launch_helper(const char 
- 	if (!G.helper_pid) {
- 		// child
- 		// if parent dies, get SIGTERM
--		prctl(PR_SET_PDEATHSIG, SIGTERM, 0, 0, 0);
-+		int signum = SIGTERM;
-+#ifdef PRCTL
-+		prctl(PR_SET_PDEATHSIG, signum, 0, 0, 0);
-+#elif defined PROCCTL
-+		procctl(P_PID, 0, PROC_PDEATHSIG_CTL, &signum);
-+#endif
- 		// try to execute connection helper
- 		// NB: SIGCHLD & SIGALRM revert to SIG_DFL on exec
- 		BB_EXECVP_or_die((char**)argv);
diff --git a/sysutils/busybox/files/patch-networking_httpd.c b/sysutils/busybox/files/patch-networking_httpd.c
deleted file mode 100644
index b60b94972e5c..000000000000
--- a/sysutils/busybox/files/patch-networking_httpd.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- networking/httpd.c.orig	2021-01-01 13:30:02 UTC
-+++ networking/httpd.c
-@@ -267,6 +267,11 @@
- 
- #define HEADER_READ_TIMEOUT 60
- 
-+/* see sys/netinet6/in6.h */
-+#ifdef __FreeBSD__
-+#define s6_addr32 __u6_addr.__u6_addr32
-+#endif
-+
- static const char DEFAULT_PATH_HTTPD_CONF[] ALIGN1 = "/etc";
- static const char HTTPD_CONF[] ALIGN1 = "httpd.conf";
- static const char HTTP_200[] ALIGN1 = "HTTP/1.0 200 OK\r\n";
diff --git a/sysutils/busybox/files/patch-networking_ntpd.c b/sysutils/busybox/files/patch-networking_ntpd.c
deleted file mode 100644
index bef648d45669..000000000000
--- a/sysutils/busybox/files/patch-networking_ntpd.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- networking/ntpd.c.orig	2018-12-30 15:14:20 UTC
-+++ networking/ntpd.c
-@@ -114,6 +114,12 @@
- # define IPTOS_DSCP_AF21 0x48
- #endif
- 
-+#ifdef __FreeBSD__
-+#define adjtimex ntp_adjtime
-+#define ADJ_OFFSET     MOD_OFFSET
-+#define ADJ_STATUS     MOD_STATUS
-+#define ADJ_TIMECONST  MOD_TIMECONST
-+#endif
- 
- /* Verbosity control (max level of -dddd options accepted).
-  * max 6 is very talkative (and bloated). 3 is non-bloated,
diff --git a/sysutils/busybox/files/patch-networking_ping.c b/sysutils/busybox/files/patch-networking_ping.c
deleted file mode 100644
index 884881198fa2..000000000000
--- a/sysutils/busybox/files/patch-networking_ping.c
+++ /dev/null
@@ -1,55 +0,0 @@
---- networking/ping.c.orig	2021-01-01 13:30:02 UTC
-+++ networking/ping.c
-@@ -119,6 +119,10 @@
- //usage:       "round-trip min/avg/max = 20.1/20.1/20.1 ms\n"
- 
- #include <net/if.h>
-+#ifdef __FreeBSD__
-+#include <netinet/in.h> /* struct ip and friends */
-+#include <netinet/ip.h>
-+#endif
- #include <netinet/ip_icmp.h>
- #include "libbb.h"
- #include "common_bufsiz.h"
-@@ -155,6 +159,41 @@
- #  undef IPV6_HOPLIMIT
- #  define IPV6_HOPLIMIT IPV6_2292HOPLIMIT
- # endif
-+#endif
-+
-+#if defined(__FreeBSD__) || defined(__APPLE__)
-+/**
-+ * On BSD the IPv4 struct is called struct ip and instead of iXX
-+ * the members are called ip_XX. One could change this code to use
-+ * struct ip but that would require to define _BSD_SOURCE and that
-+ * might have other complications. Instead make sure struct iphdr
-+ * is present on FreeBSD. The below is taken from GLIBC.
-+ *
-+ * The GNU C Library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ */
-+struct iphdr
-+  {
-+#if BYTE_ORDER == LITTLE_ENDIAN
-+    unsigned int ihl:4;
-+    unsigned int version:4;
-+#elif BYTE_ORDER == BIG_ENDIAN
-+    unsigned int version:4;
-+    unsigned int ihl:4;
-+#endif
-+    u_int8_t tos;
-+    u_int16_t tot_len;
-+    u_int16_t id;
-+    u_int16_t frag_off;
-+    u_int8_t ttl;
-+    u_int8_t protocol;
-+    u_int16_t check;
-+    u_int32_t saddr;
-+    u_int32_t daddr;
-+    /*The options start here. */
-+  };
- #endif
- 
- enum {
diff --git a/sysutils/busybox/files/patch-networking_traceroute.c b/sysutils/busybox/files/patch-networking_traceroute.c
index 9ef5f3d6f18c..f900d21eba08 100644
--- a/sysutils/busybox/files/patch-networking_traceroute.c
+++ b/sysutils/busybox/files/patch-networking_traceroute.c
@@ -1,28 +1,15 @@
---- networking/traceroute.c.orig	2021-01-01 13:30:02 UTC
+--- networking/traceroute.c.orig	2021-08-15 18:44:35 UTC
 +++ networking/traceroute.c
-@@ -634,8 +634,8 @@ packet4_ok(int read_len, const struct sockaddr_in *fro
- // Off: since we do not form the entire IP packet,
- // but defer it to kernel, we can't set source port,
- // and thus can't check it here in the reply
--			/* && up->source == htons(ident) */
--			 && up->dest == htons(port + seq)
-+			/* && up->uh_sport == htons(ident) */
-+			 && up->uh_dport == htons(port + seq)
- 			) {
- 				return (type == ICMP_TIMXCEED ? -1 : code + 1);
- 			}
-@@ -932,8 +932,13 @@ common_traceroute_main(int op, char **argv)
- 		setsockopt_SOL_SOCKET_1(rcvsock, SO_DONTROUTE);
- 
- #if ENABLE_TRACEROUTE6
-+#ifdef __FreeBSD__
-+#define SOL_V6_OPTION SOL_IPV6
-+#else
-+#define SOL_V6_OPTION SOL_RAW
+@@ -963,8 +963,12 @@ traceroute_init(int op, char **argv)
+ 	if (af == AF_INET) {
+ 		xmove_fd(xsocket(AF_INET, SOCK_RAW, IPPROTO_ICMP), rcvsock);
+ #if ENABLE_FEATURE_TRACEROUTE_VERBOSE
++#if defined(IP_PKTINFO)
+ 		/* want recvmsg to report target local address (for -v) */
+ 		setsockopt_1(rcvsock, IPPROTO_IP, IP_PKTINFO);
++#elif defined(IP_RECVDSTADDR)
++		setsockopt_1(rcvsock, IPPROTO_IP, IP_RECVDSTADDR);
 +#endif
- 	if (af == AF_INET6) {
--		if (setsockopt_int(rcvsock, SOL_RAW, IPV6_CHECKSUM, 2) != 0)
-+		if (setsockopt_int(rcvsock, SOL_V6_OPTION, IPV6_CHECKSUM, 2) != 0)
- 			bb_perror_msg_and_die("setsockopt(%s)", "IPV6_CHECKSUM");
- 		xmove_fd(xsocket(af, SOCK_DGRAM, 0), sndsock);
- 	} else
+ #endif
+ 	}
+ #if ENABLE_TRACEROUTE6
diff --git a/sysutils/busybox/files/patch-shell_hush.c b/sysutils/busybox/files/patch-shell_hush.c
index 0abc3df66689..5e7d3066a44b 100644
--- a/sysutils/busybox/files/patch-shell_hush.c
+++ b/sysutils/busybox/files/patch-shell_hush.c
@@ -1,6 +1,6 @@
---- shell/hush.c.orig	2021-01-01 13:30:58 UTC
+--- shell/hush.c.orig	2021-08-15 18:44:35 UTC
 +++ shell/hush.c
-@@ -348,7 +348,7 @@
+@@ -346,7 +346,7 @@
  #if !(defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) \
  	|| defined(__APPLE__) \
      )
@@ -9,8 +9,8 @@
  #endif
  #include <glob.h>
  /* #include <dmalloc.h> */
-@@ -2091,6 +2091,18 @@ static void hush_exit(int exitcode)
- #endif
+@@ -2211,6 +2211,18 @@ static int check_and_run_traps(void)
+ 	return last_sig;
  }
  
 +#if defined(__FreeBSD__) && __FreeBSD_version < 1202000
@@ -26,5 +26,5 @@
 +}
 +#endif
  
- //TODO: return a mask of ALL handled sigs?
- static int check_and_run_traps(void)
+ static const char *get_cwd(int force)
+ {
diff --git a/sysutils/busybox/files/patch-shell_shell__common.c b/sysutils/busybox/files/patch-shell_shell__common.c
deleted file mode 100644
index f3db3627e0a5..000000000000
--- a/sysutils/busybox/files/patch-shell_shell__common.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- shell/shell_common.c.orig	2021-01-01 13:30:58 UTC
-+++ shell/shell_common.c
-@@ -327,7 +327,9 @@ struct limits {
- static const struct limits limits_tbl[] = {
- 	{ RLIMIT_CORE,		9,	}, // -c
- 	{ RLIMIT_DATA,		10,	}, // -d
-+#ifdef RLIMIT_NICE
- 	{ RLIMIT_NICE,		0,	}, // -e
-+#endif
- 	{ RLIMIT_FSIZE,		9,	}, // -f
- #define LIMIT_F_IDX     3
- #ifdef RLIMIT_SIGPENDING
diff --git a/sysutils/busybox/files/patch-sysklogd_klogd.c b/sysutils/busybox/files/patch-sysklogd_klogd.c
deleted file mode 100644
index db2f7c6456a4..000000000000
--- a/sysutils/busybox/files/patch-sysklogd_klogd.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- sysklogd/klogd.c.orig	2018-12-30 15:14:20 UTC
-+++ sysklogd/klogd.c
-@@ -101,7 +101,7 @@ static void klogd_close(void)
- #else
- 
- # ifndef _PATH_KLOG
--#  ifdef __GNU__
-+#  if defined(__GNU__) || defined (__FreeBSD__)
- #   define _PATH_KLOG "/dev/klog"
- #  else
- #   error "your system's _PATH_KLOG is unknown"