sysutils/busybox: update to the 1.31.0 version
- Update to the 1.31.0 Approved by: araujo (mentor) Differential Revision: https://reviews.freebsd.org/D22022
This commit is contained in:
parent
0f54bf6ebc
commit
bfd2fd8462
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=514610
5 changed files with 17 additions and 23 deletions
|
@ -2,8 +2,7 @@
|
|||
# $FreeBSD$
|
||||
|
||||
PORTNAME= busybox
|
||||
PORTVERSION= 1.30.1
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= 1.31.0
|
||||
CATEGORIES= sysutils misc shells
|
||||
MASTER_SITES= https://busybox.net/downloads/
|
||||
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1561964361
|
||||
SHA256 (busybox-1.30.1.tar.bz2) = 3d1d04a4dbd34048f4794815a5c48ebb9eb53c5277e09ffffc060323b95dfbdc
|
||||
SIZE (busybox-1.30.1.tar.bz2) = 7793781
|
||||
TIMESTAMP = 1571066965
|
||||
SHA256 (busybox-1.31.0.tar.bz2) = 0e4925392fd9f3743cc517e031b68b012b24a63b0cf6c1ff03cce7bb3846cc99
|
||||
SIZE (busybox-1.31.0.tar.bz2) = 2427873
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#
|
||||
# Automatically generated make config: don't edit
|
||||
# Busybox version: 1.30.1
|
||||
# Mon Jul 8 22:30:54 2019
|
||||
# Busybox version: 1.31.0
|
||||
# Mon Oct 14 17:36:36 2019
|
||||
#
|
||||
CONFIG_HAVE_DOT_CONFIG=y
|
||||
|
||||
|
@ -34,6 +34,7 @@ CONFIG_FEATURE_SUID_CONFIG_QUIET=y
|
|||
CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
|
||||
# CONFIG_SELINUX is not set
|
||||
# CONFIG_FEATURE_CLEAN_UP is not set
|
||||
CONFIG_FEATURE_SYSLOG_INFO=y
|
||||
CONFIG_FEATURE_SYSLOG=y
|
||||
CONFIG_PLATFORM_LINUX=y
|
||||
|
||||
|
@ -236,7 +237,6 @@ 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
|
||||
|
@ -303,6 +303,7 @@ CONFIG_STTY=y
|
|||
CONFIG_SUM=y
|
||||
CONFIG_SYNC=y
|
||||
# CONFIG_FEATURE_SYNC_FANCY is not set
|
||||
CONFIG_FSYNC=y
|
||||
# CONFIG_TAC is not set
|
||||
CONFIG_TAIL=y
|
||||
CONFIG_FEATURE_FANCY_TAIL=y
|
||||
|
@ -635,6 +636,7 @@ CONFIG_XXD=y
|
|||
# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
|
||||
# CONFIG_FEATURE_MDEV_EXEC is not set
|
||||
# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set
|
||||
# CONFIG_FEATURE_MDEV_DAEMON is not set
|
||||
# CONFIG_MESG is not set
|
||||
# CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set
|
||||
# CONFIG_MKE2FS is not set
|
||||
|
@ -774,6 +776,7 @@ CONFIG_HEXEDIT=y
|
|||
# CONFIG_I2CSET is not set
|
||||
# CONFIG_I2CDUMP is not set
|
||||
# CONFIG_I2CDETECT is not set
|
||||
# CONFIG_I2CTRANSFER is not set
|
||||
# CONFIG_INOTIFYD is not set
|
||||
CONFIG_LESS=y
|
||||
CONFIG_FEATURE_LESS_MAXLINES=9999999
|
||||
|
@ -807,6 +810,7 @@ CONFIG_MICROCOM=y
|
|||
# CONFIG_SETSERIAL is not set
|
||||
CONFIG_STRINGS=y
|
||||
# CONFIG_TIME is not set
|
||||
CONFIG_TS=y
|
||||
CONFIG_TTYSIZE=y
|
||||
# CONFIG_UBIATTACH is not set
|
||||
# CONFIG_UBIDETACH is not set
|
||||
|
@ -934,6 +938,7 @@ CONFIG_FEATURE_TELNETD_STANDALONE=y
|
|||
CONFIG_FEATURE_TELNETD_INETD_WAIT=y
|
||||
CONFIG_TFTP=y
|
||||
CONFIG_FEATURE_TFTP_PROGRESS_BAR=y
|
||||
CONFIG_FEATURE_TFTP_HPA_COMPAT=y
|
||||
CONFIG_TFTPD=y
|
||||
CONFIG_FEATURE_TFTP_GET=y
|
||||
CONFIG_FEATURE_TFTP_PUT=y
|
||||
|
@ -1139,6 +1144,7 @@ CONFIG_CTTYHACK=y
|
|||
#
|
||||
CONFIG_FEATURE_SH_MATH=y
|
||||
CONFIG_FEATURE_SH_MATH_64=y
|
||||
CONFIG_FEATURE_SH_MATH_BASE=y
|
||||
CONFIG_FEATURE_SH_EXTRA_QUIET=y
|
||||
# CONFIG_FEATURE_SH_STANDALONE is not set
|
||||
# CONFIG_FEATURE_SH_NOFORK is not set
|
||||
|
|
|
@ -1,11 +0,0 @@
|
|||
--- miscutils/man.c.orig 2018-12-30 15:14:20 UTC
|
||||
+++ miscutils/man.c
|
||||
@@ -265,7 +265,7 @@ int man_main(int argc UNUSED_PARAM, char
|
||||
if (!man_path_list) {
|
||||
/* default, may be overridden by /etc/man.conf */
|
||||
man_path_list = xzalloc(2 * sizeof(man_path_list[0]));
|
||||
- man_path_list[0] = (char*)"/usr/man";
|
||||
+ man_path_list[0] = (char*)"/usr/share/man";
|
||||
/* count_mp stays 0.
|
||||
* Thus, man.conf will overwrite man_path_list[0]
|
||||
* if a path is defined there.
|
|
@ -1,17 +1,17 @@
|
|||
--- networking/httpd.c.orig 2018-12-05 14:44:34 UTC
|
||||
--- networking/httpd.c.orig 2019-06-10 09:09:31 UTC
|
||||
+++ networking/httpd.c
|
||||
@@ -2109,10 +2109,10 @@ static void handle_incoming_and_exit(con
|
||||
@@ -2135,10 +2135,10 @@ static void handle_incoming_and_exit(con
|
||||
}
|
||||
#if ENABLE_FEATURE_IPV6
|
||||
if (fromAddr->u.sa.sa_family == AF_INET6
|
||||
- && fromAddr->u.sin6.sin6_addr.s6_addr32[0] == 0
|
||||
- && fromAddr->u.sin6.sin6_addr.s6_addr32[1] == 0
|
||||
- && ntohl(fromAddr->u.sin6.sin6_addr.s6_addr32[2]) == 0xffff)
|
||||
- rmt_ip = ntohl(fromAddr->u.sin6.sin6_addr.s6_addr32[3]);
|
||||
- remote_ip = ntohl(fromAddr->u.sin6.sin6_addr.s6_addr32[3]);
|
||||
+ && fromAddr->u.sin6.sin6_addr.s6_addr[0] == 0
|
||||
+ && fromAddr->u.sin6.sin6_addr.s6_addr[1] == 0
|
||||
+ && ntohl(fromAddr->u.sin6.sin6_addr.s6_addr[2]) == 0xffff)
|
||||
+ rmt_ip = ntohl(fromAddr->u.sin6.sin6_addr.s6_addr[3]);
|
||||
+ remote_ip = ntohl(fromAddr->u.sin6.sin6_addr.s6_addr[3]);
|
||||
#endif
|
||||
if (ENABLE_FEATURE_HTTPD_CGI || DEBUG || verbose) {
|
||||
/* NB: can be NULL (user runs httpd -i by hand?) */
|
||||
|
|
Loading…
Reference in a new issue