diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD index b4a3a10..9574dab 100644 --- a/trunk/PKGBUILD +++ b/trunk/PKGBUILD @@ -3,20 +3,20 @@ # Contributor: Jens Pranaitis pkgname=busybox -pkgver=1.24.2 +pkgver=1.25.0 pkgrel=1 pkgdesc="Utilities for rescue and embedded systems" arch=("i686" "x86_64") -url="http://www.busybox.net" +url="https://www.busybox.net" license=('GPL') makedepends=("make" "gcc" "sed" "ncurses" "musl" "kernel-headers-musl") install=busybox.install source=("$url/downloads/$pkgname-$pkgver.tar.bz2" "config" ifplugd.patch) -md5sums=('2eaae519cac1143bcf583636a745381f' - '86035b9208a5358b885fbf6b87a0735d' - '187adc8319e45be12d79e8db2c514d74') +sha256sums=('5a0fe06885ee1b805fb459ab6aaa023fe4f2eccee4fb8c0fd9a6c17c0daca2fc' + 'f80ab6ea80c0e572f363114dac4e501284a03f29778fd83708aca9ad7008e26c' + '60b4251d871ac8870832cf9efc72457e9b58859d5c520d225d0946e5016f2d3e') prepare() { cd "$srcdir/$pkgname-$pkgver" @@ -35,4 +35,9 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" install -Dm755 busybox $pkgdir/usr/bin/busybox + install -Dm644 docs/busybox.1 $pkgdir/usr/share/man/man1/busybox.1 + install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE.txt + for doc in BusyBox.html BusyBox.txt; do + install -Dm644 docs/$doc $pkgdir/usr/share/doc/$pkgname/$doc + done } diff --git a/trunk/config b/trunk/config index 8b884b0..51246de 100644 --- a/trunk/config +++ b/trunk/config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.24.1 -# Sat Oct 24 21:33:51 2015 +# Busybox version: 1.25.0 +# Thu Jun 30 09:37:15 2016 # CONFIG_HAVE_DOT_CONFIG=y @@ -23,6 +23,7 @@ CONFIG_FEATURE_BUFFERS_USE_MALLOC=y CONFIG_SHOW_USAGE=y CONFIG_FEATURE_VERBOSE_USAGE=y CONFIG_FEATURE_COMPRESS_USAGE=y +CONFIG_BUSYBOX=y CONFIG_FEATURE_INSTALLER=y # CONFIG_INSTALL_NO_USR is not set CONFIG_LOCALE_SUPPORT=y @@ -75,6 +76,7 @@ CONFIG_EXTRA_LDLIBS="" # # CONFIG_DEBUG is not set # CONFIG_DEBUG_PESSIMIZE is not set +# CONFIG_DEBUG_SANITIZE is not set # CONFIG_UNIT_TEST is not set # CONFIG_WERROR is not set CONFIG_NO_DEBUG_LIB=y @@ -96,7 +98,7 @@ CONFIG_PREFIX="./_install" # # Busybox Library Tuning # -CONFIG_FEATURE_SYSTEMD=y +# CONFIG_FEATURE_USE_BSS_TAIL is not set CONFIG_FEATURE_RTMINMAX=y CONFIG_PASSWORD_MINLEN=6 CONFIG_MD5_SMALL=1 @@ -140,6 +142,7 @@ CONFIG_FEATURE_AR_LONG_FILENAMES=y CONFIG_FEATURE_AR_CREATE=y CONFIG_UNCOMPRESS=y CONFIG_GUNZIP=y +CONFIG_FEATURE_GUNZIP_LONG_OPTIONS=y CONFIG_BUNZIP2=y CONFIG_UNLZMA=y CONFIG_FEATURE_LZMA_FAST=y @@ -159,8 +162,8 @@ CONFIG_GZIP_FAST=0 CONFIG_FEATURE_GZIP_LEVELS=y # CONFIG_LZOP is not set # CONFIG_LZOP_COMPR_HIGH is not set -CONFIG_RPM2CPIO=y # CONFIG_RPM is not set +CONFIG_RPM2CPIO=y CONFIG_TAR=y CONFIG_FEATURE_TAR_CREATE=y CONFIG_FEATURE_TAR_AUTODETECT=y @@ -193,6 +196,9 @@ CONFIG_HOSTID=y CONFIG_ID=y CONFIG_GROUPS=y CONFIG_SHUF=y +CONFIG_STAT=y +CONFIG_FEATURE_STAT_FORMAT=y +CONFIG_FEATURE_STAT_FILESYSTEM=y CONFIG_SYNC=y CONFIG_FEATURE_SYNC_FANCY=y CONFIG_TEST=y @@ -284,8 +290,6 @@ CONFIG_SORT=y CONFIG_FEATURE_SORT_BIG=y CONFIG_SPLIT=y CONFIG_FEATURE_SPLIT_FANCY=y -CONFIG_STAT=y -CONFIG_FEATURE_STAT_FORMAT=y CONFIG_STTY=y CONFIG_SUM=y CONFIG_TAC=y @@ -456,6 +460,7 @@ CONFIG_HALT=y # CONFIG_FEATURE_CALL_TELINIT is not set CONFIG_TELINIT_PATH="" CONFIG_INIT=y +CONFIG_LINUXRC=y CONFIG_FEATURE_USE_INITTAB=y # CONFIG_FEATURE_KILL_REMOVED is not set CONFIG_FEATURE_KILL_DELAY=0 @@ -463,30 +468,34 @@ CONFIG_FEATURE_INIT_SCTTY=y # CONFIG_FEATURE_INIT_SYSLOG is not set CONFIG_FEATURE_EXTRA_QUIET=y CONFIG_FEATURE_INIT_COREDUMPS=y -CONFIG_FEATURE_INITRD=y CONFIG_INIT_TERMINAL_TYPE="linux" +CONFIG_FEATURE_INIT_MODIFY_CMDLINE=y CONFIG_MESG=y CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP=y # # Login/Password Management Utilities # -# CONFIG_ADD_SHELL is not set -# CONFIG_REMOVE_SHELL is not set CONFIG_FEATURE_SHADOWPASSWDS=y CONFIG_USE_BB_PWD_GRP=y CONFIG_USE_BB_SHADOW=y CONFIG_USE_BB_CRYPT=y CONFIG_USE_BB_CRYPT_SHA=y +# CONFIG_ADD_SHELL is not set +# CONFIG_REMOVE_SHELL is not set +CONFIG_ADDGROUP=y +CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS=y +CONFIG_FEATURE_ADDUSER_TO_GROUP=y CONFIG_ADDUSER=y CONFIG_FEATURE_ADDUSER_LONG_OPTIONS=y CONFIG_FEATURE_CHECK_NAMES=y CONFIG_LAST_ID=60000 CONFIG_FIRST_SYSTEM_ID=100 CONFIG_LAST_SYSTEM_ID=999 -CONFIG_ADDGROUP=y -CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS=y -CONFIG_FEATURE_ADDUSER_TO_GROUP=y +CONFIG_CHPASSWD=y +CONFIG_FEATURE_DEFAULT_PASSWD_ALGO="des" +CONFIG_CRYPTPW=y +CONFIG_MKPASSWD=y CONFIG_DELUSER=y CONFIG_DELGROUP=y CONFIG_FEATURE_DEL_USER_FROM_GROUP=y @@ -498,9 +507,6 @@ CONFIG_FEATURE_NOLOGIN=y CONFIG_FEATURE_SECURETTY=y CONFIG_PASSWD=y CONFIG_FEATURE_PASSWD_WEAK_CHECK=y -CONFIG_CRYPTPW=y -CONFIG_CHPASSWD=y -CONFIG_FEATURE_DEFAULT_PASSWD_ALGO="des" CONFIG_SU=y CONFIG_FEATURE_SU_SYSLOG=y CONFIG_FEATURE_SU_CHECKS_SHELLS=y @@ -549,6 +555,7 @@ CONFIG_DEFAULT_DEPMOD_FILE="modules.dep" # # Linux System Utilities # +CONFIG_BLKDISCARD=y CONFIG_BLOCKDEV=y CONFIG_FATATTR=y CONFIG_FSTRIM=y @@ -568,8 +575,12 @@ CONFIG_FEATURE_MOUNT_CIFS=y CONFIG_FEATURE_MOUNT_FLAGS=y CONFIG_FEATURE_MOUNT_FSTAB=y CONFIG_FEATURE_MOUNT_OTHERTAB=y +CONFIG_NSENTER=y +CONFIG_FEATURE_NSENTER_LONG_OPTS=y CONFIG_REV=y +CONFIG_SETARCH=y CONFIG_UEVENT=y +CONFIG_UNSHARE=y CONFIG_ACPID=y CONFIG_FEATURE_ACPID_COMPAT=y CONFIG_BLKID=y @@ -622,7 +633,6 @@ CONFIG_READPROFILE=y CONFIG_RTCWAKE=y CONFIG_SCRIPT=y CONFIG_SCRIPTREPLAY=y -CONFIG_SETARCH=y CONFIG_SWAPONOFF=y CONFIG_FEATURE_SWAPON_DISCARD=y CONFIG_FEATURE_SWAPON_PRI=y @@ -641,6 +651,7 @@ CONFIG_VOLUMEID=y # # Filesystem/Volume identification # +CONFIG_FEATURE_VOLUMEID_BCACHE=y CONFIG_FEATURE_VOLUMEID_BTRFS=y CONFIG_FEATURE_VOLUMEID_CRAMFS=y CONFIG_FEATURE_VOLUMEID_EXFAT=y @@ -698,6 +709,7 @@ CONFIG_UBIMKVOL=y CONFIG_UBIRMVOL=y CONFIG_UBIRSVOL=y CONFIG_UBIUPDATEVOL=y +CONFIG_UBIRENAME=y # CONFIG_WALL is not set CONFIG_ADJTIMEX=y CONFIG_BBCONFIG=y @@ -733,7 +745,6 @@ CONFIG_FBSPLASH=y CONFIG_IONICE=y CONFIG_INOTIFYD=y # CONFIG_LAST is not set -# CONFIG_FEATURE_LAST_SMALL is not set # CONFIG_FEATURE_LAST_FANCY is not set CONFIG_HDPARM=y CONFIG_FEATURE_HDPARM_GET_IDENTITY=y @@ -845,6 +856,7 @@ CONFIG_FEATURE_IP_ROUTE=y CONFIG_FEATURE_IP_ROUTE_DIR="y" CONFIG_FEATURE_IP_TUNNEL=y CONFIG_FEATURE_IP_RULE=y +CONFIG_FEATURE_IP_NEIGH=y CONFIG_FEATURE_IP_SHORT_FORMS=y # CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set CONFIG_IPADDR=y @@ -852,6 +864,7 @@ CONFIG_IPLINK=y CONFIG_IPROUTE=y CONFIG_IPTUNNEL=y CONFIG_IPRULE=y +CONFIG_IPNEIGH=y CONFIG_IPCALC=y CONFIG_FEATURE_IPCALC_FANCY=y CONFIG_FEATURE_IPCALC_LONG_OPTIONS=y @@ -974,17 +987,17 @@ CONFIG_WATCH=y # # Runit Utilities # +CONFIG_CHPST=y +CONFIG_SETUIDGID=y +CONFIG_ENVUIDGID=y +CONFIG_ENVDIR=y +CONFIG_SOFTLIMIT=y CONFIG_RUNSV=y CONFIG_RUNSVDIR=y # CONFIG_FEATURE_RUNSVDIR_LOG is not set CONFIG_SV=y CONFIG_SV_DEFAULT_SERVICE_DIR="/var/service" CONFIG_SVLOGD=y -CONFIG_CHPST=y -CONFIG_SETUIDGID=y -CONFIG_ENVUIDGID=y -CONFIG_ENVDIR=y -CONFIG_SOFTLIMIT=y # CONFIG_CHCON is not set # CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set # CONFIG_GETENFORCE is not set @@ -1053,6 +1066,15 @@ CONFIG_FEATURE_SH_HISTFILESIZE=y # # System Logging Utilities # +CONFIG_KLOGD=y + +# +# klogd should not be used together with syslog to kernel printk buffer +# +CONFIG_FEATURE_KLOGD_KLOGCTL=y +CONFIG_LOGGER=y +CONFIG_LOGREAD=y +CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y CONFIG_SYSLOGD=y CONFIG_FEATURE_ROTATE_LOGFILE=y CONFIG_FEATURE_REMOTE_LOG=y @@ -1061,13 +1083,4 @@ CONFIG_FEATURE_SYSLOGD_CFG=y CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256 CONFIG_FEATURE_IPC_SYSLOG=y CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 -CONFIG_LOGREAD=y -CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y CONFIG_FEATURE_KMSG_SYSLOG=y -CONFIG_KLOGD=y - -# -# klogd should not be used together with syslog to kernel printk buffer -# -CONFIG_FEATURE_KLOGD_KLOGCTL=y -CONFIG_LOGGER=y diff --git a/trunk/ifplugd.patch b/trunk/ifplugd.patch index ffb9f60..aaa1aec 100644 --- a/trunk/ifplugd.patch +++ b/trunk/ifplugd.patch @@ -1,11 +1,13 @@ -networking/ifplugd.c | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) +Refreshed patch ifplugd.patch to work with busybox-1.25.0 -diff --git a/networking/ifplugd.c b/networking/ifplugd.c -index b578f4c..8fad69a 100644 +---- +Signed-off-by: alive4ever + +Index: b/networking/ifplugd.c +=================================================================== --- a/networking/ifplugd.c +++ b/networking/ifplugd.c -@@ -34,16 +34,17 @@ +@@ -34,9 +34,6 @@ #include "libbb.h" #include "fix_u32.h" @@ -13,18 +15,27 @@ index b578f4c..8fad69a 100644 -#include -#include #ifdef HAVE_NET_ETHERNET_H - # include + /* musl breakage: + * In file included from /usr/include/net/ethernet.h:10, +@@ -48,8 +45,20 @@ + * and copy-pasting its definitions here ( is what pulls in + * conflicting definition of struct ethhdr on musl). + */ +-/* # include */ ++# include #endif -+#include -+ -+#include -+#include -+#include ++ #include ++ ++ #include ++ #include ++ #include ++ #include ++ #include ++ #include ++ ++ #define __user ++ #include ++ #include #include #include --#include - - #define __user - #include -