cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update busybox to new stable release 1.24.1, and withdraw busybox-unstable.

Browse Source 
Changes: https://busybox.net/
This commit is contained in:
Matthias Andree 2015-12-20 17:21:10 +00:00
parent b3d9b62218
commit 5312ded598
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=404068
11 changed files with 45 additions and 1180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MOVED
View File

@ -8059,3 +8059,4 @@ astro/roadnav||2015-12-15|Has expired: No releases for 8+ years, no supporting n
www/joomla15||2015-12-18|Has expired: Joomla 1.5.x reached its End of Life in September 2012. Please update to a current version
www/joomla25||2015-12-18|Has expired: Joomla 2.5.x reached its End of Life in December 2014. Please update to a current version
devel/rubygem-tins0||2015-12-18|Has expired: not used by other ports anymore
sysutils/busybox-unstable|sysutils/busybox|2015-12-20|Stable version is more current

63
sysutils/busybox-unstable/Makefile
View File

@ -1,63 +0,0 @@
# Created by: luigi@FreeBSD.org
# $FreeBSD$
PORTNAME= busybox
PORTVERSION= 1.23.0
CATEGORIES= sysutils misc shells
MASTER_SITES= http://www.busybox.net/downloads/
PKGNAMESUFFIX= -unstable
PATCH_SITES= http://www.busybox.net/downloads/fixes-${PORTVERSION}/
PATCH_DIST_STRIP= -p1
PATCHFILES= busybox-1.23.0-ash.patch \
busybox-1.23.0-modprobe.patch
MAINTAINER= mandree@FreeBSD.org
COMMENT= Busybox for FreeBSD
LICENSE= GPLv2
BUILD_DEPENDS= gsed:${PORTSDIR}/textproc/gsed
CONFLICTS_INSTALL= busybox-[1-9]*
IGNORE= is older than stable version. Use sysutils/busybox
PORTSCOUT= limit:.*\.0$$
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:bzip2
PLIST_FILES= bin/busybox
OPTIONS_DEFINE= DOCS
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MDOCS}
USES+= perl5
USE_PERL5= build
PORTDOCS= *
.endif
post-patch:
${REINPLACE_CMD} -e 's/sed/gsed/' ${WRKSRC}/scripts/gen_build_files.sh
${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
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} oldconfig
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
.if ${PORT_OPTIONS:MDOCS}
cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
${RM} -f ${STAGEDIR}${DOCSDIR}/.gitignore
.endif
.include <bsd.port.mk>

6
sysutils/busybox-unstable/distinfo
View File

@ -1,6 +0,0 @@
SHA256 (busybox-1.23.0.tar.bz2) = 483ab594dd962ddbb332fd24e36ffdd6e36ac2182fbff055c56e1ca49fda09e4
SIZE (busybox-1.23.0.tar.bz2) = 2253001
SHA256 (busybox-1.23.0-ash.patch) = fed81c2c8d2cda7d710e2825c549a0fe42fcb58fd342866729c37e9789d5c9e5
SIZE (busybox-1.23.0-ash.patch) = 845
SHA256 (busybox-1.23.0-modprobe.patch) = fd3597476b6b24faf36cae4d0e1d18417cd0336ccbb8e3c9f9c3c0625aa8bc00
SIZE (busybox-1.23.0-modprobe.patch) = 2275

1042
sysutils/busybox-unstable/files/data-.config
View File

File diff suppressed because it is too large Load Diff

22
sysutils/busybox-unstable/files/patch-include__libbb.h
View File

@ -1,22 +0,0 @@
--- ./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
@@ -129,9 +132,6 @@
#ifndef HAVE_FDATASYNC
# define fdatasync fsync
#endif
-#ifndef HAVE_XTABS
-# define XTABS TAB3
-#endif
/* Some libc's forget to declare these, do it ourself */

5
sysutils/busybox-unstable/pkg-descr
View File

@ -1,5 +0,0 @@
busybox is a set of common utilities built as a single
crunched binary, and sometimes stripped down in features
to fit the needs of embedded systems.
WWW: http://www.busybox.net/

6
sysutils/busybox/Makefile
View File

@ -2,9 +2,9 @@
# $FreeBSD$
PORTNAME= busybox
PORTVERSION= 1.23.2
PORTVERSION= 1.24.1
CATEGORIES= sysutils misc shells
MASTER_SITES= http://www.busybox.net/downloads/
MASTER_SITES= http://www.busybox.net/downloads/ LOCAL/mandree
PATCH_SITES= http://www.busybox.net/downloads/fixes-${PORTVERSION}/
PATCH_DIST_STRIP= -p1
@ -18,7 +18,7 @@ BUILD_DEPENDS= gsed:${PORTSDIR}/textproc/gsed
CONFLICTS_INSTALL= busybox-unstable-*
PORTSCOUT= skipv:1.24.0
PORTSCOUT= skipv:1.25.0
CFLAGS+= -fno-builtin-mempcpy # avoid -Wshadow warnings
MAKE_ARGS+= SKIP_STRIP=y CC="${CC}" HOSTCC="${CC}" CXX="${CXX}" HOSTCXX="${CXX}"

4
sysutils/busybox/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (busybox-1.23.2.tar.bz2) = 05a6f9e21aad8c098e388ae77de7b2361941afa7157ef74216703395b14e319a
SIZE (busybox-1.23.2.tar.bz2) = 2252786
SHA256 (busybox-1.24.1.tar.bz2) = 37d03132cc078937360b392170b7a1d0e5b322eee9f57c0b82292a8b1f0afe3d
SIZE (busybox-1.24.1.tar.bz2) = 2068803

57
sysutils/busybox/files/data-.config
View File

@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Busybox version: 1.23.0
# Tue Jan 6 21:43:28 2015
# Busybox version: 1.24.1
# Sun Dec 20 16:49:59 2015
#
CONFIG_HAVE_DOT_CONFIG=y
@ -156,6 +156,7 @@ CONFIG_CPIO=y
CONFIG_GZIP=y
CONFIG_FEATURE_GZIP_LONG_OPTIONS=y
CONFIG_GZIP_FAST=0
# CONFIG_FEATURE_GZIP_LEVELS is not set
CONFIG_LZOP=y
# CONFIG_LZOP_COMPR_HIGH is not set
CONFIG_RPM=y
@ -183,10 +184,17 @@ 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_DD=y
CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
CONFIG_FEATURE_DD_THIRD_STATUS_LINE=y
CONFIG_FEATURE_DD_IBS_OBS=y
CONFIG_FEATURE_DD_STATUS=y
CONFIG_HOSTID=y
CONFIG_ID=y
CONFIG_GROUPS=y
CONFIG_SHUF=y
CONFIG_SYNC=y
# CONFIG_FEATURE_SYNC_FANCY is not set
CONFIG_TEST=y
CONFIG_FEATURE_TEST_64=y
CONFIG_TOUCH=y
@ -195,6 +203,7 @@ CONFIG_FEATURE_TOUCH_SUSV3=y
CONFIG_TR=y
CONFIG_FEATURE_TR_CLASSES=y
CONFIG_FEATURE_TR_EQUIV=y
CONFIG_TRUNCATE=y
CONFIG_UNLINK=y
# CONFIG_BASE64 is not set
# CONFIG_WHO is not set
@ -211,10 +220,6 @@ CONFIG_COMM=y
CONFIG_CP=y
CONFIG_FEATURE_CP_LONG_OPTIONS=y
CONFIG_CUT=y
CONFIG_DD=y
CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
CONFIG_FEATURE_DD_THIRD_STATUS_LINE=y
CONFIG_FEATURE_DD_IBS_OBS=y
# CONFIG_DF is not set
# CONFIG_FEATURE_DF_FANCY is not set
CONFIG_DIRNAME=y
@ -283,7 +288,6 @@ CONFIG_FEATURE_SPLIT_FANCY=y
# CONFIG_FEATURE_STAT_FORMAT is not set
# CONFIG_STTY is not set
CONFIG_SUM=y
CONFIG_SYNC=y
# CONFIG_TAC is not set
CONFIG_TAIL=y
CONFIG_FEATURE_FANCY_TAIL=y
@ -292,6 +296,7 @@ CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
CONFIG_TRUE=y
CONFIG_TTY=y
CONFIG_UNAME=y
CONFIG_UNAME_OSNAME="FreeBSD"
CONFIG_UNEXPAND=y
CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS=y
CONFIG_UNIQ=y
@ -549,7 +554,18 @@ CONFIG_FATATTR=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_MOUNT is not set
# CONFIG_FEATURE_MOUNT_FAKE is not set
# CONFIG_FEATURE_MOUNT_VERBOSE is not set
# CONFIG_FEATURE_MOUNT_HELPERS is not set
# CONFIG_FEATURE_MOUNT_LABEL is not set
# CONFIG_FEATURE_MOUNT_NFS is not set
# CONFIG_FEATURE_MOUNT_CIFS is not set
# CONFIG_FEATURE_MOUNT_FLAGS is not set
# CONFIG_FEATURE_MOUNT_FSTAB is not set
# CONFIG_FEATURE_MOUNT_OTHERTAB is not set
CONFIG_REV=y
# CONFIG_UEVENT is not set
# CONFIG_ACPID is not set
# CONFIG_FEATURE_ACPID_COMPAT is not set
# CONFIG_BLKID is not set
@ -595,15 +611,6 @@ CONFIG_LSUSB=y
# CONFIG_MKSWAP is not set
# CONFIG_FEATURE_MKSWAP_UUID is not set
CONFIG_MORE=y
# CONFIG_MOUNT is not set
# CONFIG_FEATURE_MOUNT_FAKE is not set
# CONFIG_FEATURE_MOUNT_VERBOSE is not set
# CONFIG_FEATURE_MOUNT_HELPERS is not set
# CONFIG_FEATURE_MOUNT_LABEL is not set
# CONFIG_FEATURE_MOUNT_NFS is not set
# CONFIG_FEATURE_MOUNT_CIFS is not set
# CONFIG_FEATURE_MOUNT_FLAGS is not set
# CONFIG_FEATURE_MOUNT_FSTAB is not set
# CONFIG_PIVOT_ROOT is not set
# CONFIG_RDATE is not set
# CONFIG_RDEV is not set
@ -652,10 +659,15 @@ CONFIG_SCRIPTREPLAY=y
# CONFIG_FEATURE_CROND_D is not set
# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
CONFIG_FEATURE_CROND_DIR="/var/spool/cron"
# CONFIG_I2CGET is not set
# CONFIG_I2CSET is not set
# CONFIG_I2CDUMP is not set
# CONFIG_I2CDETECT is not set
CONFIG_LESS=y
CONFIG_FEATURE_LESS_MAXLINES=9999999
CONFIG_FEATURE_LESS_BRACKETS=y
CONFIG_FEATURE_LESS_FLAGS=y
CONFIG_FEATURE_LESS_TRUNCATE=y
CONFIG_FEATURE_LESS_MARKS=y
CONFIG_FEATURE_LESS_REGEXP=y
# CONFIG_FEATURE_LESS_WINCH is not set
@ -750,6 +762,13 @@ CONFIG_NC=y
# CONFIG_PING is not set
# CONFIG_PING6 is not set
# CONFIG_FEATURE_FANCY_PING is not set
CONFIG_WGET=y
CONFIG_FEATURE_WGET_STATUSBAR=y
CONFIG_FEATURE_WGET_AUTHENTICATION=y
CONFIG_FEATURE_WGET_LONG_OPTIONS=y
CONFIG_FEATURE_WGET_TIMEOUT=y
CONFIG_FEATURE_WGET_OPENSSL=y
CONFIG_FEATURE_WGET_SSL_HELPER=y
# CONFIG_WHOIS is not set
# CONFIG_FEATURE_IPV6 is not set
# CONFIG_FEATURE_UNIX_LOCAL is not set
@ -811,6 +830,7 @@ CONFIG_IFUPDOWN_IFSTATE_PATH=""
# CONFIG_FEATURE_IP_ADDRESS is not set
# CONFIG_FEATURE_IP_LINK is not set
# CONFIG_FEATURE_IP_ROUTE is not set
CONFIG_FEATURE_IP_ROUTE_DIR=""
# CONFIG_FEATURE_IP_TUNNEL is not set
# CONFIG_FEATURE_IP_RULE is not set
# CONFIG_FEATURE_IP_SHORT_FORMS is not set
@ -877,11 +897,6 @@ CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0
CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS=""
# CONFIG_UDPSVD is not set
# CONFIG_VCONFIG is not set
CONFIG_WGET=y
CONFIG_FEATURE_WGET_STATUSBAR=y
CONFIG_FEATURE_WGET_AUTHENTICATION=y
CONFIG_FEATURE_WGET_LONG_OPTIONS=y
CONFIG_FEATURE_WGET_TIMEOUT=y
# CONFIG_ZCIP is not set
#

6
sysutils/busybox/files/patch-include__libbb.h
View File

@ -1,5 +1,5 @@
--- ./include/libbb.h.orig 2012-07-02 14:08:25.000000000 +0000
+++ ./include/libbb.h 2012-07-17 02:08:37.000000000 +0000
--- include/libbb.h.orig 2015-10-24 00:24:35 UTC
+++ include/libbb.h
@@ -51,6 +51,9 @@
#include <termios.h>
#include <time.h>
@ -10,7 +10,7 @@
#include <pwd.h>
#include <grp.h>
#if ENABLE_FEATURE_SHADOWPASSWDS
@@ -129,9 +132,6 @@
@@ -152,9 +155,6 @@
#ifndef HAVE_FDATASYNC
# define fdatasync fsync
#endif

13
sysutils/busybox/files/patch-include_platform.h
View File

@ -1,13 +0,0 @@
--- 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