mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-23 00:43:28 +00:00
Update to 1.20.2. Changelog: http://busybox.net/
Rediff patches. Replace alloca.h references by stdlib.h ref's.
This commit is contained in:
parent
19e78d2788
commit
0163460315
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=300988
@ -6,7 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= busybox
|
||||
PORTVERSION= 1.19.4
|
||||
PORTVERSION= 1.20.2
|
||||
CATEGORIES= sysutils misc shells
|
||||
MASTER_SITES= http://www.busybox.net/downloads/
|
||||
|
||||
@ -41,6 +41,8 @@ post-patch:
|
||||
${REINPLACE_CMD} -e 's/<malloc.h>/<stdlib.h>/' \
|
||||
${WRKSRC}/libbb/appletlib.c \
|
||||
${WRKSRC}/shell/hush.c
|
||||
${REINPLACE_CMD} -e 's/<alloca.h>/<stdlib.h>/' \
|
||||
${WRKSRC}/scripts/basic/*.c
|
||||
|
||||
do-configure:
|
||||
${CP} ${FILESDIR}/data-.config ${WRKSRC}/.config
|
||||
|
@ -1,2 +1,2 @@
|
||||
SHA256 (busybox-1.19.4.tar.bz2) = 9b853406da61ffb59eb488495fe99cbb7fb3dd29a31307fcfa9cf070543710ee
|
||||
SIZE (busybox-1.19.4.tar.bz2) = 2167516
|
||||
SHA256 (busybox-1.20.2.tar.bz2) = eb13ff01dae5618ead2ef6f92ba879e9e0390f9583bd545d8789d27cf39b6882
|
||||
SIZE (busybox-1.20.2.tar.bz2) = 2186738
|
||||
|
@ -1,7 +1,7 @@
|
||||
#
|
||||
# Automatically generated make config: don't edit
|
||||
# Busybox version: 1.19.0
|
||||
# Fri Aug 26 00:56:12 2011
|
||||
# Busybox version: 1.20.2
|
||||
# Tue Jul 17 04:11:27 2012
|
||||
#
|
||||
CONFIG_HAVE_DOT_CONFIG=y
|
||||
|
||||
@ -62,7 +62,10 @@ CONFIG_FEATURE_SYSLOG=y
|
||||
# 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=""
|
||||
|
||||
#
|
||||
# Debugging Options
|
||||
@ -92,7 +95,7 @@ CONFIG_PREFIX="./_install"
|
||||
# CONFIG_FEATURE_SYSTEMD is not set
|
||||
CONFIG_FEATURE_RTMINMAX=y
|
||||
CONFIG_PASSWORD_MINLEN=6
|
||||
CONFIG_MD5_SIZE_VS_SPEED=2
|
||||
CONFIG_MD5_SMALL=1
|
||||
CONFIG_FEATURE_FAST_TOP=y
|
||||
# CONFIG_FEATURE_ETC_NETWORKS is not set
|
||||
CONFIG_FEATURE_USE_TERMIOS=y
|
||||
@ -101,6 +104,7 @@ CONFIG_FEATURE_EDITING_MAX_LEN=1024
|
||||
# CONFIG_FEATURE_EDITING_VI is not set
|
||||
CONFIG_FEATURE_EDITING_HISTORY=30
|
||||
# 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=y
|
||||
# CONFIG_FEATURE_USERNAME_COMPLETION is not set
|
||||
@ -140,6 +144,7 @@ CONFIG_CPIO=y
|
||||
CONFIG_GUNZIP=y
|
||||
CONFIG_GZIP=y
|
||||
CONFIG_FEATURE_GZIP_LONG_OPTIONS=y
|
||||
CONFIG_GZIP_FAST=0
|
||||
CONFIG_LZOP=y
|
||||
# CONFIG_LZOP_COMPR_HIGH is not set
|
||||
CONFIG_RPM2CPIO=y
|
||||
@ -173,11 +178,13 @@ CONFIG_CAT=y
|
||||
# CONFIG_FEATURE_DATE_ISOFMT is not set
|
||||
# CONFIG_FEATURE_DATE_NANO is not set
|
||||
# CONFIG_FEATURE_DATE_COMPAT is not set
|
||||
CONFIG_HOSTID=y
|
||||
CONFIG_ID=y
|
||||
CONFIG_GROUPS=y
|
||||
CONFIG_TEST=y
|
||||
CONFIG_FEATURE_TEST_64=y
|
||||
CONFIG_TOUCH=y
|
||||
CONFIG_FEATURE_TOUCH_SUSV3=y
|
||||
CONFIG_TR=y
|
||||
CONFIG_FEATURE_TR_CLASSES=y
|
||||
CONFIG_FEATURE_TR_EQUIV=y
|
||||
@ -220,7 +227,6 @@ CONFIG_FOLD=y
|
||||
CONFIG_FSYNC=y
|
||||
CONFIG_HEAD=y
|
||||
CONFIG_FEATURE_FANCY_HEAD=y
|
||||
CONFIG_HOSTID=y
|
||||
CONFIG_INSTALL=y
|
||||
CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y
|
||||
CONFIG_LN=y
|
||||
@ -457,6 +463,7 @@ CONFIG_DELGROUP=y
|
||||
CONFIG_FEATURE_DEL_USER_FROM_GROUP=y
|
||||
# CONFIG_GETTY is not set
|
||||
# CONFIG_LOGIN is not set
|
||||
# CONFIG_LOGIN_SESSION_AS_CHILD is not set
|
||||
# CONFIG_PAM is not set
|
||||
# CONFIG_LOGIN_SCRIPTS is not set
|
||||
# CONFIG_FEATURE_NOLOGIN is not set
|
||||
@ -465,6 +472,7 @@ CONFIG_FEATURE_DEL_USER_FROM_GROUP=y
|
||||
# CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set
|
||||
# CONFIG_CRYPTPW is not set
|
||||
# CONFIG_CHPASSWD is not set
|
||||
CONFIG_FEATURE_DEFAULT_PASSWD_ALGO=""
|
||||
# CONFIG_SU is not set
|
||||
# CONFIG_FEATURE_SU_SYSLOG is not set
|
||||
# CONFIG_FEATURE_SU_CHECKS_SHELLS is not set
|
||||
@ -514,6 +522,12 @@ CONFIG_DEFAULT_DEPMOD_FILE=""
|
||||
# Linux System Utilities
|
||||
#
|
||||
# CONFIG_BLOCKDEV is not set
|
||||
# CONFIG_MDEV is not set
|
||||
# CONFIG_FEATURE_MDEV_CONF is not set
|
||||
# CONFIG_FEATURE_MDEV_RENAME is not set
|
||||
# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
|
||||
# CONFIG_FEATURE_MDEV_EXEC is not set
|
||||
# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set
|
||||
CONFIG_REV=y
|
||||
# CONFIG_ACPID is not set
|
||||
# CONFIG_FEATURE_ACPID_COMPAT is not set
|
||||
@ -527,7 +541,7 @@ CONFIG_REV=y
|
||||
# CONFIG_FDFLUSH is not set
|
||||
# CONFIG_FDFORMAT is not set
|
||||
# CONFIG_FDISK is not set
|
||||
CONFIG_FDISK_SUPPORT_LARGE_DISKS=y
|
||||
# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set
|
||||
# CONFIG_FEATURE_FDISK_WRITABLE is not set
|
||||
# CONFIG_FEATURE_AIX_LABEL is not set
|
||||
# CONFIG_FEATURE_SGI_LABEL is not set
|
||||
@ -557,12 +571,6 @@ CONFIG_HD=y
|
||||
# CONFIG_LOSETUP is not set
|
||||
CONFIG_LSPCI=y
|
||||
CONFIG_LSUSB=y
|
||||
# CONFIG_MDEV is not set
|
||||
# CONFIG_FEATURE_MDEV_CONF is not set
|
||||
# CONFIG_FEATURE_MDEV_RENAME is not set
|
||||
# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
|
||||
# CONFIG_FEATURE_MDEV_EXEC is not set
|
||||
# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set
|
||||
# CONFIG_MKSWAP is not set
|
||||
# CONFIG_FEATURE_MKSWAP_UUID is not set
|
||||
CONFIG_MORE=y
|
||||
@ -823,6 +831,7 @@ CONFIG_FEATURE_TFTP_PROGRESS_BAR=y
|
||||
# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
|
||||
# CONFIG_TUNCTL is not set
|
||||
# CONFIG_FEATURE_TUNCTL_UG is not set
|
||||
# CONFIG_UDHCPC6 is not set
|
||||
# CONFIG_UDHCPD is not set
|
||||
# CONFIG_DHCPRELAY is not set
|
||||
# CONFIG_DUMPLEASES is not set
|
||||
@ -869,6 +878,7 @@ CONFIG_FEATURE_MIME_CHARSET=""
|
||||
# Process Utilities
|
||||
#
|
||||
CONFIG_IOSTAT=y
|
||||
CONFIG_LSOF=y
|
||||
CONFIG_MPSTAT=y
|
||||
# CONFIG_NMETER is not set
|
||||
CONFIG_PMAP=y
|
||||
@ -890,6 +900,7 @@ CONFIG_PGREP=y
|
||||
CONFIG_PKILL=y
|
||||
CONFIG_PS=y
|
||||
CONFIG_FEATURE_PS_WIDE=y
|
||||
CONFIG_FEATURE_PS_LONG=y
|
||||
# CONFIG_FEATURE_PS_TIME is not set
|
||||
# CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set
|
||||
# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
|
||||
|
@ -1,8 +1,8 @@
|
||||
--- ./archival/unzip.c.orig 2011-08-22 04:57:49.000000000 +0200
|
||||
+++ ./archival/unzip.c 2011-09-22 23:05:09.000000000 +0200
|
||||
--- ./archival/unzip.c.orig 2012-07-02 14:08:25.000000000 +0000
|
||||
+++ ./archival/unzip.c 2012-07-17 02:08:37.000000000 +0000
|
||||
@@ -34,6 +34,8 @@
|
||||
#include "libbb.h"
|
||||
#include "archive.h"
|
||||
#include "bb_archive.h"
|
||||
|
||||
+#include <libgen.h>
|
||||
+
|
||||
|
@ -1,5 +1,5 @@
|
||||
--- ./coreutils/cp.c.orig 2011-08-22 04:57:49.000000000 +0200
|
||||
+++ ./coreutils/cp.c 2011-09-22 23:05:23.000000000 +0200
|
||||
--- ./coreutils/cp.c.orig 2012-06-26 13:35:45.000000000 +0000
|
||||
+++ ./coreutils/cp.c 2012-07-17 02:08:37.000000000 +0000
|
||||
@@ -35,6 +35,8 @@
|
||||
#include "libbb.h"
|
||||
#include "libcoreutils/coreutils.h"
|
||||
|
@ -1,5 +1,5 @@
|
||||
--- ./coreutils/dirname.c.orig 2011-08-22 04:57:49.000000000 +0200
|
||||
+++ ./coreutils/dirname.c 2011-09-22 23:05:09.000000000 +0200
|
||||
--- ./coreutils/dirname.c.orig 2012-06-26 13:35:45.000000000 +0000
|
||||
+++ ./coreutils/dirname.c 2012-07-17 02:08:37.000000000 +0000
|
||||
@@ -23,6 +23,8 @@
|
||||
|
||||
#include "libbb.h"
|
||||
|
@ -1,5 +1,5 @@
|
||||
--- ./coreutils/install.c.orig 2011-08-22 04:57:49.000000000 +0200
|
||||
+++ ./coreutils/install.c 2011-09-22 23:05:09.000000000 +0200
|
||||
--- ./coreutils/install.c.orig 2012-06-26 13:35:45.000000000 +0000
|
||||
+++ ./coreutils/install.c 2012-07-17 02:08:37.000000000 +0000
|
||||
@@ -26,6 +26,8 @@
|
||||
#include "libbb.h"
|
||||
#include "libcoreutils/coreutils.h"
|
||||
|
@ -1,5 +1,5 @@
|
||||
--- ./coreutils/rmdir.c.orig 2011-08-22 04:57:49.000000000 +0200
|
||||
+++ ./coreutils/rmdir.c 2011-09-22 23:05:09.000000000 +0200
|
||||
--- ./coreutils/rmdir.c.orig 2012-07-02 14:08:25.000000000 +0000
|
||||
+++ ./coreutils/rmdir.c 2012-07-17 02:08:37.000000000 +0000
|
||||
@@ -27,6 +27,8 @@
|
||||
|
||||
#include "libbb.h"
|
||||
|
@ -1,16 +1,16 @@
|
||||
--- ./include/libbb.h.orig 2011-08-11 02:23:58.000000000 +0200
|
||||
+++ ./include/libbb.h 2011-08-26 02:10:16.000000000 +0200
|
||||
@@ -75,6 +75,9 @@
|
||||
#ifdef DMALLOC
|
||||
# include <dmalloc.h>
|
||||
#endif
|
||||
--- ./include/libbb.h.orig 2012-07-02 14:08:25.000000000 +0000
|
||||
+++ ./include/libbb.h 2012-07-17 02:08:37.000000000 +0000
|
||||
@@ -51,6 +51,9 @@
|
||||
#include <termios.h>
|
||||
#include <time.h>
|
||||
#include <sys/param.h>
|
||||
+#ifndef HAVE_XTABS
|
||||
+# define XTABS OXTABS
|
||||
+#endif
|
||||
#include <pwd.h>
|
||||
#include <grp.h>
|
||||
#if ENABLE_FEATURE_SHADOWPASSWDS
|
||||
@@ -120,9 +123,6 @@
|
||||
@@ -129,9 +132,6 @@
|
||||
#ifndef HAVE_FDATASYNC
|
||||
# define fdatasync fsync
|
||||
#endif
|
||||
|
@ -1,5 +1,5 @@
|
||||
--- ./include/platform.h.orig 2011-08-28 12:59:56.000000000 +0200
|
||||
+++ ./include/platform.h 2011-09-22 23:05:09.000000000 +0200
|
||||
--- ./include/platform.h.orig 2012-07-02 14:08:25.000000000 +0000
|
||||
+++ ./include/platform.h 2012-07-17 02:08:37.000000000 +0000
|
||||
@@ -423,6 +423,15 @@
|
||||
|
||||
#if defined(__FreeBSD__)
|
||||
|
@ -1,5 +1,5 @@
|
||||
--- ./libbb/speed_table.c.orig 2011-08-11 02:23:58.000000000 +0200
|
||||
+++ ./libbb/speed_table.c 2011-08-28 13:00:03.000000000 +0200
|
||||
--- ./libbb/speed_table.c.orig 2012-06-26 13:35:45.000000000 +0000
|
||||
+++ ./libbb/speed_table.c 2012-07-17 02:08:37.000000000 +0000
|
||||
@@ -10,7 +10,7 @@
|
||||
#include "libbb.h"
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
--- ./scripts/kconfig/mconf.c.orig 2011-08-11 02:23:58.000000000 +0200
|
||||
+++ ./scripts/kconfig/mconf.c 2011-08-26 02:10:16.000000000 +0200
|
||||
--- ./scripts/kconfig/mconf.c.orig 2012-07-02 14:08:25.000000000 +0000
|
||||
+++ ./scripts/kconfig/mconf.c 2012-07-17 02:08:37.000000000 +0000
|
||||
@@ -8,7 +8,6 @@
|
||||
* i18n, 2005, Arnaldo Carvalho de Melo <acme@conectiva.com.br>
|
||||
*/
|
||||
|
@ -1,5 +1,5 @@
|
||||
--- ./sysklogd/logread.c.orig 2011-08-11 02:23:58.000000000 +0200
|
||||
+++ ./sysklogd/logread.c 2011-08-26 02:10:16.000000000 +0200
|
||||
--- ./sysklogd/logread.c.orig 2012-06-26 13:35:45.000000000 +0000
|
||||
+++ ./sysklogd/logread.c 2012-07-17 02:08:37.000000000 +0000
|
||||
@@ -20,6 +20,20 @@
|
||||
#include <sys/sem.h>
|
||||
#include <sys/shm.h>
|
||||
|
Loading…
Reference in New Issue
Block a user