svn commit: r378095 - in head/sysutils: busybox busybox-unstable busybox/files
Matthias Andree
mandree at FreeBSD.org
Wed Jan 28 22:16:59 UTC 2015
Author: mandree
Date: Wed Jan 28 22:16:56 2015
New Revision: 378095
URL: https://svnweb.freebsd.org/changeset/ports/378095
QAT: https://qat.redports.org/buildarchive/r378095/
Log:
Upgrade busybox to stable 1.23.1, setting busybox-unstable to IGNORE
because it is older. Work around missing mempcpy().
Added:
head/sysutils/busybox/files/patch-include_platform.h (contents, props changed)
Deleted:
head/sysutils/busybox/files/patch-include__platform.h
head/sysutils/busybox/files/patch-libbb__speed_table.c
Modified:
head/sysutils/busybox-unstable/Makefile
head/sysutils/busybox/Makefile
head/sysutils/busybox/distinfo
head/sysutils/busybox/files/data-.config
Modified: head/sysutils/busybox-unstable/Makefile
==============================================================================
--- head/sysutils/busybox-unstable/Makefile Wed Jan 28 21:52:32 2015 (r378094)
+++ head/sysutils/busybox-unstable/Makefile Wed Jan 28 22:16:56 2015 (r378095)
@@ -21,10 +21,10 @@ BUILD_DEPENDS= gsed:${PORTSDIR}/textproc
CONFLICTS_INSTALL= busybox-[1-9]*
-#IGNORE= is older than stable version. Use sysutils/busybox
-BROKEN= uses mempcpy() GNU-ism
+IGNORE= is older than stable version. Use sysutils/busybox
+#BROKEN= uses mempcpy() GNU-ism
-PORTSCOUT= skipv:1.22.1
+PORTSCOUT= skipv:1.23.*
MAKE_ARGS+= SKIP_STRIP=y CC="${CC}" HOSTCC="${CC}" CXX="${CXX}" HOSTCXX="${CXX}"
# findutils/find.c l. 752+, uses a GCC extension/invalid C code:
Modified: head/sysutils/busybox/Makefile
==============================================================================
--- head/sysutils/busybox/Makefile Wed Jan 28 21:52:32 2015 (r378094)
+++ head/sysutils/busybox/Makefile Wed Jan 28 22:16:56 2015 (r378095)
@@ -2,20 +2,13 @@
# $FreeBSD$
PORTNAME= busybox
-PORTVERSION= 1.22.1
-PORTREVISION= 2
+PORTVERSION= 1.23.1
CATEGORIES= sysutils misc shells
MASTER_SITES= http://www.busybox.net/downloads/
PATCH_SITES= http://www.busybox.net/downloads/fixes-${PORTVERSION}/
PATCH_DIST_STRIP= -p1
-PATCHFILES= busybox-1.22.1-ash.patch \
- busybox-1.22.1-date.patch \
- busybox-1.22.1-iplink.patch \
- busybox-1.22.1-lzop.patch \
- busybox-1.22.1-nc.patch \
- busybox-1.22.1-zcat-no-ext.patch \
- #
+PATCHFILES=
MAINTAINER= mandree at FreeBSD.org
COMMENT= Busybox for FreeBSD
@@ -26,11 +19,12 @@ BUILD_DEPENDS= gsed:${PORTSDIR}/textproc
CONFLICTS_INSTALL= busybox-unstable-*
-PORTSCOUT= skipv:1.23.0
+PORTSCOUT= skipv:1.24.0
+CFLAGS+= -fno-builtin-mempcpy # avoid -Wshadow warnings
MAKE_ARGS+= SKIP_STRIP=y CC="${CC}" HOSTCC="${CC}" CXX="${CXX}" HOSTCXX="${CXX}"
# findutils/find.c l. 752+, uses a GCC extension/invalid C code:
-USES= compiler:nestedfct gmake tar:bz2
+USES= compiler:nestedfct gmake tar:bzip2
PLIST_FILES= bin/busybox
Modified: head/sysutils/busybox/distinfo
==============================================================================
--- head/sysutils/busybox/distinfo Wed Jan 28 21:52:32 2015 (r378094)
+++ head/sysutils/busybox/distinfo Wed Jan 28 22:16:56 2015 (r378095)
@@ -1,14 +1,2 @@
-SHA256 (busybox-1.22.1.tar.bz2) = ae0b029d0a9e4dd71a077a790840e496dd838998e4571b87b60fed7462b6678b
-SIZE (busybox-1.22.1.tar.bz2) = 2218650
-SHA256 (busybox-1.22.1-ash.patch) = c3b5b5c5522fda8014b12a23c370d7f70f6d1625fefa93a62c5c14414528ad12
-SIZE (busybox-1.22.1-ash.patch) = 344
-SHA256 (busybox-1.22.1-date.patch) = 8502dd7454e948a56fcd8201f4fe9d629d2844b9df2bacff7ee0bb09398d12e8
-SIZE (busybox-1.22.1-date.patch) = 1008
-SHA256 (busybox-1.22.1-iplink.patch) = 186b41734e43ee117cb367055ce6a4d5b3aac671c09d71f2a6347793874d653b
-SIZE (busybox-1.22.1-iplink.patch) = 425
-SHA256 (busybox-1.22.1-lzop.patch) = cc70144cd273464502e04050abb1bd1d2a36d9a7f4aeef2b2f8172f6c7bc18eb
-SIZE (busybox-1.22.1-lzop.patch) = 2103
-SHA256 (busybox-1.22.1-nc.patch) = 0d2f9ba2e9e5db813fe9feb6fc84052ac85403ce2debefb8b1281a05aadec052
-SIZE (busybox-1.22.1-nc.patch) = 615
-SHA256 (busybox-1.22.1-zcat-no-ext.patch) = d9843cc5a62d25d328344d31e1d1dc81a245add647bb377d6a871d5f7c1b2cbe
-SIZE (busybox-1.22.1-zcat-no-ext.patch) = 2071
+SHA256 (busybox-1.23.1.tar.bz2) = 300f1db0a7ca4ecee8f8d8027aba250b903372e8339b7d9123d37c1e900473bf
+SIZE (busybox-1.23.1.tar.bz2) = 2252635
Modified: head/sysutils/busybox/files/data-.config
==============================================================================
--- head/sysutils/busybox/files/data-.config Wed Jan 28 21:52:32 2015 (r378094)
+++ head/sysutils/busybox/files/data-.config Wed Jan 28 22:16:56 2015 (r378095)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Busybox version: 1.22.0
-# Wed Jan 1 23:35:42 2014
+# Busybox version: 1.23.0
+# Tue Jan 6 21:43:28 2015
#
CONFIG_HAVE_DOT_CONFIG=y
@@ -36,6 +36,8 @@ CONFIG_LAST_SUPPORTED_WCHAR=767
# CONFIG_UNICODE_BIDI_SUPPORT is not set
# CONFIG_UNICODE_NEUTRAL_TABLE is not set
# CONFIG_UNICODE_PRESERVE_BROKEN is not set
+# CONFIG_PAM is not set
+# CONFIG_FEATURE_USE_SENDFILE is not set
CONFIG_LONG_OPTS=y
CONFIG_FEATURE_DEVPTS=y
# CONFIG_FEATURE_CLEAN_UP is not set
@@ -73,6 +75,7 @@ CONFIG_EXTRA_LDLIBS=""
#
# CONFIG_DEBUG is not set
# CONFIG_DEBUG_PESSIMIZE is not set
+# CONFIG_UNIT_TEST is not set
# CONFIG_WERROR is not set
CONFIG_NO_DEBUG_LIB=y
# CONFIG_DMALLOC is not set
@@ -183,6 +186,7 @@ CONFIG_CAT=y
CONFIG_HOSTID=y
CONFIG_ID=y
CONFIG_GROUPS=y
+CONFIG_SHUF=y
CONFIG_TEST=y
CONFIG_FEATURE_TEST_64=y
CONFIG_TOUCH=y
@@ -191,6 +195,7 @@ CONFIG_FEATURE_TOUCH_SUSV3=y
CONFIG_TR=y
CONFIG_FEATURE_TR_CLASSES=y
CONFIG_FEATURE_TR_EQUIV=y
+CONFIG_UNLINK=y
# CONFIG_BASE64 is not set
# CONFIG_WHO is not set
# CONFIG_USERS is not set
@@ -299,6 +304,11 @@ CONFIG_WHOAMI=y
CONFIG_YES=y
#
+# Common options
+#
+CONFIG_FEATURE_VERBOSE=y
+
+#
# Common options for cp and mv
#
CONFIG_FEATURE_PRESERVE_HARDLINKS=y
@@ -384,6 +394,9 @@ CONFIG_FEATURE_VI_SETOPTS=y
CONFIG_FEATURE_VI_SET=y
CONFIG_FEATURE_VI_WIN_RESIZE=y
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_ALLOW_EXEC=y
#
@@ -400,6 +413,7 @@ CONFIG_FEATURE_FIND_MAXDEPTH=y
CONFIG_FEATURE_FIND_NEWER=y
CONFIG_FEATURE_FIND_INUM=y
CONFIG_FEATURE_FIND_EXEC=y
+CONFIG_FEATURE_FIND_EXEC_PLUS=y
CONFIG_FEATURE_FIND_USER=y
CONFIG_FEATURE_FIND_GROUP=y
CONFIG_FEATURE_FIND_NOT=y
@@ -421,6 +435,7 @@ CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATIO
CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y
CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y
CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
+CONFIG_FEATURE_XARGS_SUPPORT_REPL_STR=y
#
# Init Utilities
@@ -457,6 +472,7 @@ CONFIG_USE_BB_PWD_GRP=y
# CONFIG_ADDUSER is not set
# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set
# CONFIG_FEATURE_CHECK_NAMES is not set
+CONFIG_LAST_ID=60000
CONFIG_FIRST_SYSTEM_ID=100
CONFIG_LAST_SYSTEM_ID=999
CONFIG_ADDGROUP=y
@@ -468,7 +484,6 @@ 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
# CONFIG_FEATURE_SECURETTY is not set
@@ -526,6 +541,7 @@ CONFIG_DEFAULT_DEPMOD_FILE=""
# Linux System Utilities
#
# CONFIG_BLOCKDEV is not set
+CONFIG_FATATTR=y
# CONFIG_FSTRIM is not set
# CONFIG_MDEV is not set
# CONFIG_FEATURE_MDEV_CONF is not set
@@ -597,6 +613,7 @@ CONFIG_READPROFILE=y
CONFIG_SCRIPTREPLAY=y
# CONFIG_SETARCH is not set
# CONFIG_SWAPONOFF is not set
+# CONFIG_FEATURE_SWAPON_DISCARD is not set
# CONFIG_FEATURE_SWAPON_PRI is not set
# CONFIG_SWITCH_ROOT is not set
# CONFIG_UMOUNT is not set
@@ -631,6 +648,10 @@ CONFIG_SCRIPTREPLAY=y
# Miscellaneous Utilities
#
# CONFIG_CONSPY is not set
+# CONFIG_CROND is not set
+# CONFIG_FEATURE_CROND_D is not set
+# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
+CONFIG_FEATURE_CROND_DIR="/var/spool/cron"
CONFIG_LESS=y
CONFIG_FEATURE_LESS_MAXLINES=9999999
CONFIG_FEATURE_LESS_BRACKETS=y
@@ -645,6 +666,8 @@ CONFIG_FEATURE_LESS_REGEXP=y
# CONFIG_NANDDUMP is not set
# CONFIG_RFKILL is not set
# CONFIG_SETSERIAL is not set
+# CONFIG_TASKSET is not set
+# CONFIG_FEATURE_TASKSET_FANCY is not set
# CONFIG_UBIATTACH is not set
# CONFIG_UBIDETACH is not set
# CONFIG_UBIMKVOL is not set
@@ -667,10 +690,6 @@ CONFIG_FEATURE_BEEP_LENGTH_MS=0
# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set
# CONFIG_FEATURE_CHAT_CLR_ABORT is not set
CONFIG_CHRT=y
-# CONFIG_CROND is not set
-# CONFIG_FEATURE_CROND_D is not set
-# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
-CONFIG_FEATURE_CROND_DIR="/var/spool/cron"
CONFIG_CRONTAB=y
CONFIG_DC=y
CONFIG_FEATURE_DC_LIBM=y
@@ -712,8 +731,6 @@ CONFIG_MICROCOM=y
# CONFIG_RX is not set
CONFIG_SETSID=y
CONFIG_STRINGS=y
-# CONFIG_TASKSET is not set
-# CONFIG_FEATURE_TASKSET_FANCY is not set
# CONFIG_TIME is not set
CONFIG_TIMEOUT=y
CONFIG_TTYSIZE=y
@@ -749,13 +766,13 @@ CONFIG_FAKEIDENTD=y
CONFIG_FTPD=y
CONFIG_FEATURE_FTP_WRITE=y
CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y
+CONFIG_FEATURE_FTP_AUTHENTICATION=y
CONFIG_FTPGET=y
CONFIG_FTPPUT=y
CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y
CONFIG_HOSTNAME=y
CONFIG_HTTPD=y
CONFIG_FEATURE_HTTPD_RANGES=y
-# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set
# CONFIG_FEATURE_HTTPD_SETUID is not set
CONFIG_FEATURE_HTTPD_BASIC_AUTH=y
CONFIG_FEATURE_HTTPD_AUTH_MD5=y
@@ -812,6 +829,7 @@ CONFIG_FEATURE_IPCALC_LONG_OPTIONS=y
# CONFIG_NSLOOKUP is not set
# CONFIG_NTPD is not set
# CONFIG_FEATURE_NTPD_SERVER is not set
+# CONFIG_FEATURE_NTPD_CONF is not set
CONFIG_PSCAN=y
# CONFIG_ROUTE is not set
# CONFIG_SLATTACH is not set
@@ -849,6 +867,7 @@ CONFIG_FEATURE_TFTP_PROGRESS_BAR=y
CONFIG_DHCPD_LEASES_FILE=""
# CONFIG_UDHCPC is not set
# CONFIG_FEATURE_UDHCPC_ARPING is not set
+# CONFIG_FEATURE_UDHCPC_SANITIZEOPT is not set
# CONFIG_FEATURE_UDHCP_PORT is not set
CONFIG_UDHCP_DEBUG=0
# CONFIG_FEATURE_UDHCP_RFC3397 is not set
@@ -967,6 +986,7 @@ CONFIG_ASH=y
# CONFIG_ASH_BUILTIN_ECHO is not set
# CONFIG_ASH_BUILTIN_PRINTF is not set
# CONFIG_ASH_BUILTIN_TEST is not set
+CONFIG_ASH_HELP=y
# CONFIG_ASH_CMDCMD is not set
# CONFIG_ASH_MAIL is not set
# CONFIG_ASH_OPTIMIZE_FOR_SIZE is not set
Added: head/sysutils/busybox/files/patch-include_platform.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sysutils/busybox/files/patch-include_platform.h Wed Jan 28 22:16:56 2015 (r378095)
@@ -0,0 +1,13 @@
+--- include/platform.h.orig 2015-01-27 08:49:43 UTC
++++ include/platform.h
+@@ -544,4 +544,10 @@ extern int vasprintf(char **string_ptr,
+ extern ssize_t getline(char **lineptr, size_t *n, FILE *stream) FAST_FUNC;
+ #endif
+
++#include <string.h>
++static ALWAYS_INLINE void *mempcpy(void *dest, const void *src, size_t len)
++{
++ return memcpy(dest, src, len) + len;
++}
++
+ #endif
More information about the svn-ports-head
mailing list