system/busybox: Updated for version 1.36.1.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

system/busybox/README

@@ -7,3 +7,10 @@ fewer options than their full-featured GNU cousins; however, the
 options that are included provide the expected functionality and behave
 very much like their GNU counterparts. BusyBox provides a fairly
 complete environment for any small or embedded system.
+
+The SlackBuilds version is built statically, with near-vanilla configs.
+
+If you wish to customize the build, you can place your custom BusyBox
+build ".config" file in the SlackBuild directory with the file name
+"build-config" before executing the SlackBuild script.  The script will
+pick the "build-config" file up and use it instead of the default one.

system/busybox/build-config.patch

@@ -0,0 +1,85 @@
+diff -Naur a/.config b/.config
+
+# Modify default build configs to:
+#   1. Build statically, allowing busybox to work standalone anywhere.
+#   2. Disable system executables' replacements installed as busybox symlinks.
+#   2. Add support for ar, uncompress, inotifyd, rfkill, reiserfs formatting,
+#      and GPT / BSD disk labels.
+
+--- a/.config	2024-09-17 18:29:07.290065454 +0000
++++ b/.config	2024-09-17 18:29:57.554730930 +0000
+@@ -40,7 +40,7 @@
+ #
+ # Build Options
+ #
+-# CONFIG_STATIC is not set
++CONFIG_STATIC=y
+ # CONFIG_PIE is not set
+ # CONFIG_NOMMU is not set
+ # CONFIG_BUILD_LIBBUSYBOX is not set
+@@ -59,10 +59,10 @@
+ #
+ # Installation Options ("make install" behavior)
+ #
+-CONFIG_INSTALL_APPLET_SYMLINKS=y
++# CONFIG_INSTALL_APPLET_SYMLINKS is not set
+ # CONFIG_INSTALL_APPLET_HARDLINKS is not set
+ # CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set
+-# CONFIG_INSTALL_APPLET_DONT is not set
++CONFIG_INSTALL_APPLET_DONT=y
+ # CONFIG_INSTALL_SH_APPLET_SYMLINK is not set
+ # CONFIG_INSTALL_SH_APPLET_HARDLINK is not set
+ # CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set
+@@ -142,10 +142,10 @@
+ CONFIG_FEATURE_SEAMLESS_BZ2=y
+ CONFIG_FEATURE_SEAMLESS_GZ=y
+ # CONFIG_FEATURE_SEAMLESS_Z is not set
+-# CONFIG_AR is not set
+-# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
+-# CONFIG_FEATURE_AR_CREATE is not set
+-# CONFIG_UNCOMPRESS is not set
++CONFIG_AR=y
++CONFIG_FEATURE_AR_LONG_FILENAMES=y
++CONFIG_FEATURE_AR_CREATE=y
++CONFIG_UNCOMPRESS=y
+ CONFIG_GUNZIP=y
+ CONFIG_ZCAT=y
+ CONFIG_FEATURE_GUNZIP_LONG_OPTIONS=y
+@@ -625,8 +625,8 @@
+ # CONFIG_FEATURE_AIX_LABEL is not set
+ # CONFIG_FEATURE_SGI_LABEL is not set
+ # CONFIG_FEATURE_SUN_LABEL is not set
+-# CONFIG_FEATURE_OSF_LABEL is not set
+-# CONFIG_FEATURE_GPT_LABEL is not set
++CONFIG_FEATURE_OSF_LABEL=y
++CONFIG_FEATURE_GPT_LABEL=y
+ CONFIG_FEATURE_FDISK_ADVANCED=y
+ CONFIG_FINDFS=y
+ CONFIG_FLOCK=y
+@@ -663,7 +663,7 @@
+ CONFIG_MKFS_EXT2=y
+ CONFIG_MKFS_MINIX=y
+ CONFIG_FEATURE_MINIX2=y
+-# CONFIG_MKFS_REISER is not set
++CONFIG_MKFS_REISER=y
+ CONFIG_MKDOSFS=y
+ CONFIG_MKFS_VFAT=y
+ CONFIG_MKSWAP=y
+@@ -808,7 +808,7 @@
+ CONFIG_I2CDUMP=y
+ CONFIG_I2CDETECT=y
+ CONFIG_I2CTRANSFER=y
+-# CONFIG_INOTIFYD is not set
++CONFIG_INOTIFYD=y
+ CONFIG_LESS=y
+ CONFIG_FEATURE_LESS_MAXLINES=9999999
+ CONFIG_FEATURE_LESS_BRACKETS=y
+@@ -835,7 +835,7 @@
+ CONFIG_PARTPROBE=y
+ CONFIG_RAIDAUTORUN=y
+ CONFIG_READAHEAD=y
+-# CONFIG_RFKILL is not set
++CONFIG_RFKILL=y
+ CONFIG_RUNLEVEL=y
+ CONFIG_RX=y
+ CONFIG_SEEDRNG=y

system/busybox/busybox.SlackBuild

@@ -2,7 +2,8 @@
 
 # Slackware build script for busybox
 
-# Copyright 2018 Jan F. Chadima <jfch@jagda.eu>
+# Copyright 2018-2024 Jan F. Chadima <jfch@jagda.eu>
+# Copyright 2024 Lumin Etherlight <lumin+slackbuilds@etherlight.link>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,14 +23,18 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# ChangeLog:
+#
+# 2024-09-16 lumin: New maintainer.
+#
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=busybox
-VERSION=${VERSION:-1.32.1}
+VERSION=${VERSION:-1.36.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
-K_CONFIG=${K_CONFIG:-5}		# set to 2 for kernel 2.*.*
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -53,16 +58,12 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
 fi
 
 set -e
@@ -80,32 +81,20 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-CONFIG_VER=$(echo "$VERSION" | sed 's/[0-9]*$/x/')
+make defconfig
 
-# Do not put busybox to the path directly. Link it where is necesary;
+# Apply custom user build config if found.
-# or modify the PATH.
+if [ -f "$CWD/build-config" ]; then
-sed -e "s#^CONFIG_PREFIX=.*#CONFIG_PREFIX=\"$PKG/lib$LIBDIRSUFFIX/busybox\"#" \
+    cp "$CWD/build-config" ".config"
-  $CWD/$K_CONFIG-busybox-dot-config.$CONFIG_VER > .config
+else
+    patch -p1 < $CWD/build-config.patch
+fi
 
-make oldconfig
+sed 's#CONFIG_PREFIX=.*#CONFIG_PREFIX="'"$PKG"'"#' < .config > .config.tmp
-CFLAGS="$SLKCFLAGS" \
+mv .config.tmp .config
-CXXFLAGS="$SLKCFLAGS" \
-make
-make install DESTDIR=$PKG
 
-# Put it all to one directory
+make CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS"
-(cd $PKG/lib$LIBDIRSUFFIX/busybox
+make install
-  if [ -d bin ] ; then
-    mv bin/* .
-    rmdir bin
-  fi
-  if [ -d sbin ] ; then
-    for fn in sbin/* ; do
-      ln -sf busybox "$(basename "$fn")"
-    done
-    rm -rf sbin
-  fi
-)
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -132,6 +121,8 @@ cp -a \
   docs/*.html docs/cgi docs/busybox.net \
   $PKG/usr/doc/$PRGNAM-$VERSION/html
 
+cp -a examples $PKG/usr/doc/$PRGNAM-$VERSION/
+
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install

system/busybox/busybox.info

@@ -1,10 +1,10 @@
 PRGNAM="busybox"
-VERSION="1.32.1"
+VERSION="1.36.1"
 HOMEPAGE="https://www.busybox.net/"
-DOWNLOAD="https://www.busybox.net/downloads/busybox-1.32.1.tar.bz2"
+DOWNLOAD="https://www.busybox.net/downloads/busybox-1.36.1.tar.bz2"
-MD5SUM="6273c550ab6a32e8ff545e00e831efc5"
+MD5SUM="0fc591bc9f4e365dfd9ade0014f32561"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Jan F. Chadima"
+MAINTAINER="Lumin Etherlight"
-EMAIL="jfch@jagda.eu"
+EMAIL="lumin+slackbuilds@etherlight.link"