[PR PATCH] busybox: update to 1.32.1

Github messages for voidlinux
 help / color / mirror / Atom feed

* [PR PATCH] busybox: update to 1.32.1
@ 2021-02-14  6:26 CameronNemo
  2021-02-14  7:21 ` ericonr
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: CameronNemo @ 2021-02-14  6:26 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1578 bytes --]

There is a new pull request by CameronNemo against master on the void-packages repository

https://github.com/CameronNemo/void-packages busybox-1.32.1
https://github.com/void-linux/void-packages/pull/28747

busybox: update to 1.32.1
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ x ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/28747.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-busybox-1.32.1-28747.patch --]
[-- Type: text/x-diff, Size: 23950 bytes --]

From efa0c16b6ebcd388632ba9a55736d0c9145dd815 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 13 Feb 2021 18:44:35 -0800
Subject: [PATCH] busybox: update to 1.32.1

---
 srcpkgs/busybox/files/dotconfig               | 36 +++++---
 srcpkgs/busybox/files/dotconfig.d/huge.patch  | 92 +++++++++----------
 .../busybox/files/dotconfig.d/sysklogd.patch  | 14 ++-
 .../busybox/files/dotconfig.d/udhcpc.patch    | 26 +++---
 srcpkgs/busybox/patches/missing-stime.patch   | 32 -------
 .../testsuite-fix-cpio-and-patch-tests.patch  | 79 ----------------
 srcpkgs/busybox/patches/time64.patch          | 38 --------
 srcpkgs/busybox/template                      |  8 +-
 8 files changed, 92 insertions(+), 233 deletions(-)
 delete mode 100644 srcpkgs/busybox/patches/missing-stime.patch
 delete mode 100644 srcpkgs/busybox/patches/testsuite-fix-cpio-and-patch-tests.patch
 delete mode 100644 srcpkgs/busybox/patches/time64.patch

diff --git a/srcpkgs/busybox/files/dotconfig b/srcpkgs/busybox/files/dotconfig
index b3c2a607ecc..b661bbda790 100644
--- a/srcpkgs/busybox/files/dotconfig
+++ b/srcpkgs/busybox/files/dotconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.29.1
-# Sun Jul 15 12:26:38 2018
+# Busybox version: 1.32.1
+# Sat Feb 13 17:25:59 2021
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -24,8 +24,8 @@ CONFIG_FEATURE_DEVPTS=y
 # CONFIG_FEATURE_PIDFILE is not set
 CONFIG_PID_FILE_PATH=""
 CONFIG_BUSYBOX=y
-# CONFIG_FEATURE_INSTALLER is not set
 # CONFIG_FEATURE_SHOW_SCRIPT is not set
+# CONFIG_FEATURE_INSTALLER is not set
 # CONFIG_INSTALL_NO_USR is not set
 CONFIG_FEATURE_SUID=y
 # CONFIG_FEATURE_SUID_CONFIG is not set
@@ -76,6 +76,7 @@ CONFIG_PREFIX="./_install"
 # CONFIG_DEBUG_SANITIZE is not set
 # CONFIG_UNIT_TEST is not set
 # CONFIG_WERROR is not set
+# CONFIG_WARN_SIMPLE_MSG is not set
 CONFIG_NO_DEBUG_LIB=y
 # CONFIG_DMALLOC is not set
 # CONFIG_EFENCE is not set
@@ -237,7 +238,6 @@ CONFIG_EXPR_MATH_SUPPORT_64=y
 CONFIG_FACTOR=y
 CONFIG_FALSE=y
 CONFIG_FOLD=y
-CONFIG_FSYNC=y
 CONFIG_HEAD=y
 CONFIG_FEATURE_FANCY_HEAD=y
 # CONFIG_HOSTID is not set
@@ -304,6 +304,7 @@ CONFIG_STTY=y
 CONFIG_SUM=y
 CONFIG_SYNC=y
 CONFIG_FEATURE_SYNC_FANCY=y
+CONFIG_FSYNC=y
 CONFIG_TAC=y
 CONFIG_TAIL=y
 CONFIG_FEATURE_FANCY_TAIL=y
@@ -458,6 +459,7 @@ CONFIG_FEATURE_FIND_SIZE=y
 CONFIG_FEATURE_FIND_PRUNE=y
 CONFIG_FEATURE_FIND_QUIT=y
 CONFIG_FEATURE_FIND_DELETE=y
+CONFIG_FEATURE_FIND_EMPTY=y
 CONFIG_FEATURE_FIND_PATH=y
 CONFIG_FEATURE_FIND_REGEX=y
 # CONFIG_FEATURE_FIND_CONTEXT is not set
@@ -654,7 +656,7 @@ CONFIG_FEATURE_MOUNT_FAKE=y
 CONFIG_FEATURE_MOUNT_VERBOSE=y
 CONFIG_FEATURE_MOUNT_HELPERS=y
 CONFIG_FEATURE_MOUNT_LABEL=y
-CONFIG_FEATURE_MOUNT_NFS=n
+# CONFIG_FEATURE_MOUNT_NFS is not set
 CONFIG_FEATURE_MOUNT_CIFS=y
 CONFIG_FEATURE_MOUNT_FLAGS=y
 CONFIG_FEATURE_MOUNT_FSTAB=y
@@ -688,6 +690,7 @@ CONFIG_FEATURE_SWAPONOFF_LABEL=y
 CONFIG_SWITCH_ROOT=y
 # CONFIG_TASKSET is not set
 # CONFIG_FEATURE_TASKSET_FANCY is not set
+# CONFIG_FEATURE_TASKSET_CPULIST is not set
 CONFIG_UEVENT=y
 CONFIG_UMOUNT=y
 CONFIG_FEATURE_UMOUNT_ALL=y
@@ -738,6 +741,11 @@ CONFIG_FEATURE_VOLUMEID_XFS=y
 # CONFIG_BBCONFIG is not set
 # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
 # CONFIG_BC is not set
+CONFIG_DC=y
+# CONFIG_FEATURE_DC_BIG is not set
+CONFIG_FEATURE_DC_LIBM=y
+# CONFIG_FEATURE_BC_INTERACTIVE is not set
+# CONFIG_FEATURE_BC_LONG_OPTIONS is not set
 # CONFIG_BEEP is not set
 CONFIG_FEATURE_BEEP_FREQ=0
 CONFIG_FEATURE_BEEP_LENGTH_MS=0
@@ -756,9 +764,6 @@ CONFIG_FEATURE_BEEP_LENGTH_MS=0
 # CONFIG_FEATURE_CROND_SPECIAL_TIMES is not set
 CONFIG_FEATURE_CROND_DIR=""
 # CONFIG_CRONTAB is not set
-CONFIG_DC=y
-# CONFIG_FEATURE_DC_BIG is not set
-CONFIG_FEATURE_DC_LIBM=y
 # CONFIG_DEVFSD is not set
 # CONFIG_DEVFSD_MODLOAD is not set
 # CONFIG_DEVFSD_FG_NP is not set
@@ -803,6 +808,7 @@ CONFIG_LSSCSI=y
 # CONFIG_FEATURE_MAKEDEVS_TABLE is not set
 # CONFIG_MAN is not set
 # CONFIG_MICROCOM is not set
+# CONFIG_MIM is not set
 # CONFIG_MT is not set
 # CONFIG_NANDWRITE is not set
 # CONFIG_NANDDUMP is not set
@@ -944,6 +950,7 @@ CONFIG_FEATURE_TELNET_WIDTH=y
 # CONFIG_FEATURE_TELNETD_INETD_WAIT is not set
 # CONFIG_TFTP is not set
 # CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set
+# CONFIG_FEATURE_TFTP_HPA_COMPAT is not set
 # CONFIG_TFTPD is not set
 # CONFIG_FEATURE_TFTP_GET is not set
 # CONFIG_FEATURE_TFTP_PUT is not set
@@ -981,13 +988,9 @@ CONFIG_UDHCPC_DEFAULT_SCRIPT=""
 # CONFIG_FEATURE_UDHCPC6_RFC4704 is not set
 # CONFIG_FEATURE_UDHCPC6_RFC4833 is not set
 # CONFIG_FEATURE_UDHCPC6_RFC5970 is not set
-
-#
-# Common options for DHCP applets
-#
 # CONFIG_FEATURE_UDHCP_PORT is not set
-# CONFIG_UDHCP_DEBUG is not set
-# CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS is not set
+CONFIG_UDHCP_DEBUG=0
+CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0
 # CONFIG_FEATURE_UDHCP_RFC3397 is not set
 # CONFIG_FEATURE_UDHCP_8021Q is not set
 CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS=""
@@ -1092,6 +1095,7 @@ CONFIG_SH_IS_ASH=y
 # CONFIG_BASH_IS_ASH is not set
 # CONFIG_BASH_IS_HUSH is not set
 CONFIG_BASH_IS_NONE=y
+CONFIG_SHELL_ASH=y
 CONFIG_ASH=y
 CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
 CONFIG_ASH_INTERNAL_GLOB=y
@@ -1112,6 +1116,7 @@ CONFIG_ASH_GETOPTS=y
 CONFIG_ASH_CMDCMD=y
 CONFIG_CTTYHACK=y
 # CONFIG_HUSH is not set
+# CONFIG_SHELL_HUSH is not set
 # CONFIG_HUSH_BASH_COMPAT is not set
 # CONFIG_HUSH_BRACE_EXPANSION is not set
 # CONFIG_HUSH_LINENO_VAR is not set
@@ -1157,9 +1162,9 @@ CONFIG_FEATURE_SH_MATH_BASE=y
 CONFIG_FEATURE_SH_EXTRA_QUIET=y
 # CONFIG_FEATURE_SH_STANDALONE is not set
 # CONFIG_FEATURE_SH_NOFORK is not set
-# CONFIG_FEATURE_SH_EMBEDDED_SCRIPTS is not set
 CONFIG_FEATURE_SH_READ_FRAC=y
 CONFIG_FEATURE_SH_HISTFILESIZE=y
+# CONFIG_FEATURE_SH_EMBEDDED_SCRIPTS is not set
 
 #
 # System Logging Utilities
@@ -1174,6 +1179,7 @@ CONFIG_LOGGER=y
 # CONFIG_FEATURE_REMOTE_LOG is not set
 # CONFIG_FEATURE_SYSLOGD_DUP is not set
 # CONFIG_FEATURE_SYSLOGD_CFG is not set
+# CONFIG_FEATURE_SYSLOGD_PRECISE_TIMESTAMPS is not set
 CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0
 # CONFIG_FEATURE_IPC_SYSLOG is not set
 CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
diff --git a/srcpkgs/busybox/files/dotconfig.d/huge.patch b/srcpkgs/busybox/files/dotconfig.d/huge.patch
index 1ef1465cffd..b31b7974ecd 100644
--- a/srcpkgs/busybox/files/dotconfig.d/huge.patch
+++ b/srcpkgs/busybox/files/dotconfig.d/huge.patch
@@ -1,4 +1,4 @@
-@@ -93,7 +93,7 @@
+@@ -94,7 +94,7 @@
  CONFIG_PASSWORD_MINLEN=6
  CONFIG_MD5_SMALL=1
  CONFIG_SHA3_SMALL=1
@@ -7,7 +7,7 @@
  # CONFIG_FEATURE_ETC_NETWORKS is not set
  # CONFIG_FEATURE_ETC_SERVICES is not set
  CONFIG_FEATURE_EDITING=y
-@@ -124,7 +124,7 @@
+@@ -125,7 +125,7 @@
  CONFIG_FEATURE_USE_SENDFILE=y
  CONFIG_FEATURE_COPYBUF_KB=4
  CONFIG_FEATURE_SKIP_ROOTFS=y
@@ -16,7 +16,7 @@
  # CONFIG_IOCTL_HEX2STR_ERROR is not set
  # CONFIG_FEATURE_HWIB is not set
  
-@@ -158,9 +158,9 @@
+@@ -159,9 +159,9 @@
  CONFIG_BZIP2=y
  CONFIG_BZIP2_SMALL=8
  CONFIG_FEATURE_BZIP2_DECOMPRESS=y
@@ -29,7 +29,7 @@
  # CONFIG_DPKG is not set
  # CONFIG_DPKG_DEB is not set
  CONFIG_GZIP=y
-@@ -191,7 +191,7 @@
+@@ -192,7 +192,7 @@
  CONFIG_FEATURE_UNZIP_BZIP2=y
  CONFIG_FEATURE_UNZIP_LZMA=y
  CONFIG_FEATURE_UNZIP_XZ=y
@@ -38,7 +38,7 @@
  
  #
  # Coreutils
-@@ -205,7 +205,7 @@
+@@ -206,7 +206,7 @@
  CONFIG_CHOWN=y
  CONFIG_FEATURE_CHOWN_LONG_OPTIONS=y
  CONFIG_CHROOT=y
@@ -47,7 +47,7 @@
  CONFIG_COMM=y
  CONFIG_CP=y
  CONFIG_FEATURE_CP_LONG_OPTIONS=y
-@@ -213,11 +213,11 @@
+@@ -214,11 +214,11 @@
  CONFIG_CUT=y
  CONFIG_DATE=y
  CONFIG_FEATURE_DATE_ISOFMT=y
@@ -61,7 +61,7 @@
  CONFIG_FEATURE_DD_IBS_OBS=y
  CONFIG_FEATURE_DD_STATUS=y
  CONFIG_DF=y
-@@ -267,7 +266,7 @@
+@@ -267,7 +267,7 @@
  #
  # Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum
  #
@@ -70,7 +70,7 @@
  CONFIG_MKDIR=y
  CONFIG_MKFIFO=y
  CONFIG_MKNOD=y
-@@ -313,7 +313,7 @@
+@@ -314,7 +314,7 @@
  CONFIG_TEST1=y
  CONFIG_TEST2=y
  CONFIG_FEATURE_TEST_64=y
@@ -79,7 +79,7 @@
  CONFIG_TOUCH=y
  CONFIG_FEATURE_TOUCH_NODEREF=y
  CONFIG_FEATURE_TOUCH_SUSV3=y
-@@ -328,7 +328,7 @@
+@@ -329,7 +329,7 @@
  CONFIG_BB_ARCH=y
  CONFIG_UNIQ=y
  CONFIG_UNLINK=y
@@ -88,7 +88,7 @@
  CONFIG_UUDECODE=y
  CONFIG_BASE64=y
  CONFIG_UUENCODE=y
-@@ -371,7 +371,7 @@
+@@ -372,7 +372,7 @@
  # CONFIG_FEATURE_LOADFONT_PSF2 is not set
  # CONFIG_FEATURE_LOADFONT_RAW is not set
  CONFIG_LOADKMAP=y
@@ -97,7 +97,7 @@
  CONFIG_RESET=y
  # CONFIG_RESIZE is not set
  # CONFIG_FEATURE_RESIZE_PRINT is not set
-@@ -543,7 +543,7 @@
+@@ -545,7 +545,7 @@
  #
  CONFIG_CHATTR=y
  # CONFIG_FSCK is not set
@@ -106,7 +106,7 @@
  # CONFIG_TUNE2FS is not set
  
  #
-@@ -586,7 +586,7 @@
+@@ -588,7 +588,7 @@
  CONFIG_BLKID=y
  CONFIG_FEATURE_BLKID_TYPE=y
  # CONFIG_BLOCKDEV is not set
@@ -115,7 +115,7 @@
  # CONFIG_CHRT is not set
  CONFIG_DMESG=y
  CONFIG_FEATURE_DMESG_PRETTY=y
-@@ -639,13 +639,13 @@
+@@ -641,13 +641,13 @@
  CONFIG_FEATURE_MDEV_DAEMON=y
  # CONFIG_MESG is not set
  # CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set
@@ -133,13 +133,7 @@
  CONFIG_MKSWAP=y
  CONFIG_FEATURE_MKSWAP_UUID=y
  CONFIG_MORE=y
-@@ -654,24 +654,24 @@
- CONFIG_FEATURE_MOUNT_VERBOSE=y
- CONFIG_FEATURE_MOUNT_HELPERS=y
- CONFIG_FEATURE_MOUNT_LABEL=y
--CONFIG_FEATURE_MOUNT_NFS=n
-+# CONFIG_FEATURE_MOUNT_NFS is not set
- CONFIG_FEATURE_MOUNT_CIFS=y
+@@ -661,19 +661,19 @@
  CONFIG_FEATURE_MOUNT_FLAGS=y
  CONFIG_FEATURE_MOUNT_FSTAB=y
  CONFIG_FEATURE_MOUNT_OTHERTAB=y
@@ -155,33 +149,40 @@
  # CONFIG_READPROFILE is not set
  CONFIG_RENICE=y
 -# CONFIG_REV is not set
-+CONFIG_REV=y
- # CONFIG_RTCWAKE is not set
+-# CONFIG_RTCWAKE is not set
 -# CONFIG_SCRIPT is not set
 -# CONFIG_SCRIPTREPLAY is not set
++CONFIG_REV=y
++CONFIG_RTCWAKE=y
 +CONFIG_SCRIPT=y
 +CONFIG_SCRIPTREPLAY=y
  CONFIG_SETARCH=y
  CONFIG_LINUX32=y
  CONFIG_LINUX64=y
-@@ -686,8 +686,8 @@
+@@ -688,9 +688,9 @@
  CONFIG_SWAPOFF=y
  CONFIG_FEATURE_SWAPONOFF_LABEL=y
  CONFIG_SWITCH_ROOT=y
 -# CONFIG_TASKSET is not set
 -# CONFIG_FEATURE_TASKSET_FANCY is not set
+-# CONFIG_FEATURE_TASKSET_CPULIST is not set
 +CONFIG_TASKSET=y
 +CONFIG_FEATURE_TASKSET_FANCY=y
++CONFIG_FEATURE_TASKSET_CPULIST=y
  CONFIG_UEVENT=y
  CONFIG_UMOUNT=y
  CONFIG_FEATURE_UMOUNT_ALL=y
-@@ -737,7 +737,12 @@
+@@ -740,12 +740,12 @@
  # CONFIG_ADJTIMEX is not set
  # CONFIG_BBCONFIG is not set
  # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
 -# CONFIG_BC is not set
 +CONFIG_BC=y
-+CONFIG_DC=y
+ CONFIG_DC=y
+-# CONFIG_FEATURE_DC_BIG is not set
+-CONFIG_FEATURE_DC_LIBM=y
+-# CONFIG_FEATURE_BC_INTERACTIVE is not set
+-# CONFIG_FEATURE_BC_LONG_OPTIONS is not set
 +CONFIG_FEATURE_DC_BIG=y
 +# CONFIG_FEATURE_DC_LIBM is not set
 +CONFIG_FEATURE_BC_INTERACTIVE=y
@@ -189,26 +190,16 @@
  # CONFIG_BEEP is not set
  CONFIG_FEATURE_BEEP_FREQ=0
  CONFIG_FEATURE_BEEP_LENGTH_MS=0
-@@ -756,9 +761,6 @@
- # CONFIG_FEATURE_CROND_SPECIAL_TIMES is not set
- CONFIG_FEATURE_CROND_DIR=""
- # CONFIG_CRONTAB is not set
--CONFIG_DC=y
--# CONFIG_FEATURE_DC_BIG is not set
--CONFIG_FEATURE_DC_LIBM=y
- # CONFIG_DEVFSD is not set
- # CONFIG_DEVFSD_MODLOAD is not set
- # CONFIG_DEVFSD_FG_NP is not set
-@@ -802,7 +804,7 @@
+@@ -807,7 +807,7 @@
  # CONFIG_FEATURE_MAKEDEVS_LEAF is not set
  # CONFIG_FEATURE_MAKEDEVS_TABLE is not set
  # CONFIG_MAN is not set
 -# CONFIG_MICROCOM is not set
 +CONFIG_MICROCOM=y
+ # CONFIG_MIM is not set
  # CONFIG_MT is not set
  # CONFIG_NANDWRITE is not set
- # CONFIG_NANDDUMP is not set
-@@ -813,7 +815,7 @@
+@@ -819,7 +819,7 @@
  # CONFIG_RUNLEVEL is not set
  # CONFIG_RX is not set
  CONFIG_SETFATTR=y
@@ -217,7 +208,7 @@
  CONFIG_STRINGS=y
  CONFIG_TIME=y
  CONFIG_TS=y
-@@ -836,20 +838,20 @@
+@@ -842,20 +842,20 @@
  CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
  # CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
  # CONFIG_FEATURE_TLS_SHA1 is not set
@@ -248,7 +239,7 @@
  CONFIG_HOSTNAME=y
  CONFIG_DNSDOMAINNAME=y
  CONFIG_HTTPD=y
-@@ -880,12 +882,12 @@
+@@ -886,12 +886,12 @@
  # CONFIG_FEATURE_IFUPDOWN_IPV6 is not set
  # CONFIG_FEATURE_IFUPDOWN_MAPPING is not set
  # CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set
@@ -267,7 +258,7 @@
  # CONFIG_FEATURE_INETD_RPC is not set
  CONFIG_IP=y
  CONFIG_IPADDR=y
-@@ -906,11 +908,11 @@
+@@ -912,11 +912,11 @@
  # CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
  # CONFIG_FEATURE_IPCALC_FANCY is not set
  # CONFIG_FAKEIDENTD is not set
@@ -283,7 +274,7 @@
  CONFIG_NC_SERVER=y
  CONFIG_NC_EXTRA=y
  # CONFIG_NC_110_COMPAT is not set
-@@ -928,13 +930,13 @@
+@@ -934,13 +934,13 @@
  CONFIG_PING6=y
  CONFIG_FEATURE_FANCY_PING=y
  # CONFIG_PSCAN is not set
@@ -300,12 +291,13 @@
  CONFIG_TELNET=y
  CONFIG_FEATURE_TELNET_TTYPE=y
  CONFIG_FEATURE_TELNET_AUTOLOGIN=y
-@@ -942,20 +944,21 @@
+@@ -948,21 +948,21 @@
  # CONFIG_TELNETD is not set
  # CONFIG_FEATURE_TELNETD_STANDALONE is not set
  # CONFIG_FEATURE_TELNETD_INETD_WAIT is not set
 -# CONFIG_TFTP is not set
 -# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set
+-# CONFIG_FEATURE_TFTP_HPA_COMPAT is not set
 -# CONFIG_TFTPD is not set
 -# CONFIG_FEATURE_TFTP_GET is not set
 -# CONFIG_FEATURE_TFTP_PUT is not set
@@ -334,7 +326,7 @@
  # CONFIG_VCONFIG is not set
  CONFIG_WGET=y
  CONFIG_FEATURE_WGET_LONG_OPTIONS=y
-@@ -966,21 +969,21 @@
+@@ -973,21 +973,21 @@
  CONFIG_FEATURE_WGET_OPENSSL=y
  CONFIG_WHOIS=y
  # CONFIG_ZCIP is not set
@@ -350,7 +342,7 @@
  CONFIG_UDHCPC=y
  CONFIG_FEATURE_UDHCPC_ARPING=y
  CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y
- CONFIG_UDHCPC_DEFAULT_SCRIPT=""
+ CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
 -# CONFIG_UDHCPC6 is not set
 -# CONFIG_FEATURE_UDHCPC6_RFC3646 is not set
 -# CONFIG_FEATURE_UDHCPC6_RFC4704 is not set
@@ -364,7 +356,7 @@
  
  #
  # Common options for DHCP applets
-@@ -1002,13 +1005,13 @@
+@@ -1009,13 +1009,13 @@
  #
  # Mail Utilities
  #
@@ -383,7 +375,7 @@
  
  #
  # Process Utilities
-@@ -1021,7 +1024,7 @@
+@@ -1028,7 +1028,7 @@
  CONFIG_KILLALL5=y
  CONFIG_LSOF=y
  CONFIG_MPSTAT=y
@@ -392,7 +384,7 @@
  CONFIG_PGREP=y
  CONFIG_PKILL=y
  CONFIG_PIDOF=y
-@@ -1037,7 +1040,7 @@
+@@ -1044,7 +1044,7 @@
  CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS=y
  CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y
  CONFIG_PSTREE=y
@@ -401,7 +393,7 @@
  # CONFIG_SMEMCAP is not set
  CONFIG_BB_SYSCTL=y
  CONFIG_TOP=y
-@@ -1050,7 +1053,7 @@
+@@ -1057,7 +1057,7 @@
  CONFIG_FEATURE_TOPMEM=y
  CONFIG_UPTIME=y
  # CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set
@@ -410,7 +402,7 @@
  CONFIG_FEATURE_SHOW_THREADS=y
  
  #
-@@ -1068,7 +1071,7 @@
+@@ -1075,7 +1075,7 @@
  CONFIG_SV_DEFAULT_SERVICE_DIR="/var/service"
  # CONFIG_SVC is not set
  CONFIG_SVOK=y
diff --git a/srcpkgs/busybox/files/dotconfig.d/sysklogd.patch b/srcpkgs/busybox/files/dotconfig.d/sysklogd.patch
index f051b8f8355..a6a7d549584 100644
--- a/srcpkgs/busybox/files/dotconfig.d/sysklogd.patch
+++ b/srcpkgs/busybox/files/dotconfig.d/sysklogd.patch
@@ -1,23 +1,27 @@
-@@ -1147,17 +1147,17 @@
+@@ -1173,18 +1173,18 @@
  #
  # System Logging Utilities
  #
 -# CONFIG_KLOGD is not set
+-# CONFIG_FEATURE_KLOGD_KLOGCTL is not set
 +CONFIG_KLOGD=y
- # CONFIG_FEATURE_KLOGD_KLOGCTL is not set
++CONFIG_FEATURE_KLOGD_KLOGCTL=y
  CONFIG_LOGGER=y
 -# CONFIG_LOGREAD is not set
-+CONFIG_LOGREAD=y
- # CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
+-# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
 -# CONFIG_SYSLOGD is not set
 -# CONFIG_FEATURE_ROTATE_LOGFILE is not set
 -# CONFIG_FEATURE_REMOTE_LOG is not set
 -# CONFIG_FEATURE_SYSLOGD_DUP is not set
+-# CONFIG_FEATURE_SYSLOGD_CFG is not set
++CONFIG_LOGREAD=y
++CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y
 +CONFIG_SYSLOGD=y
 +CONFIG_FEATURE_ROTATE_LOGFILE=y
 +CONFIG_FEATURE_REMOTE_LOG=y
 +CONFIG_FEATURE_SYSLOGD_DUP=y
- # CONFIG_FEATURE_SYSLOGD_CFG is not set
++CONFIG_FEATURE_SYSLOGD_CFG=y
+ # CONFIG_FEATURE_SYSLOGD_PRECISE_TIMESTAMPS is not set
 -CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0
 -# CONFIG_FEATURE_IPC_SYSLOG is not set
 -CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
diff --git a/srcpkgs/busybox/files/dotconfig.d/udhcpc.patch b/srcpkgs/busybox/files/dotconfig.d/udhcpc.patch
index 059ea72a3c1..14ae8cccbbb 100644
--- a/srcpkgs/busybox/files/dotconfig.d/udhcpc.patch
+++ b/srcpkgs/busybox/files/dotconfig.d/udhcpc.patch
@@ -1,30 +1,34 @@
-@@ -957,9 +957,9 @@
+@@ -979,20 +979,24 @@
  CONFIG_DHCPD_LEASES_FILE=""
  # CONFIG_DUMPLEASES is not set
  # CONFIG_DHCPRELAY is not set
 -# CONFIG_UDHCPC is not set
 -# CONFIG_FEATURE_UDHCPC_ARPING is not set
 -# CONFIG_FEATURE_UDHCPC_SANITIZEOPT is not set
+-CONFIG_UDHCPC_DEFAULT_SCRIPT=""
 +CONFIG_UDHCPC=y
 +CONFIG_FEATURE_UDHCPC_ARPING=y
 +CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y
- CONFIG_UDHCPC_DEFAULT_SCRIPT=""
++CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
  # CONFIG_UDHCPC6 is not set
  # CONFIG_FEATURE_UDHCPC6_RFC3646 is not set
-@@ -970,11 +970,11 @@
- #
- # Common options for DHCP applets
- #
+ # CONFIG_FEATURE_UDHCPC6_RFC4704 is not set
+ # CONFIG_FEATURE_UDHCPC6_RFC4833 is not set
+ # CONFIG_FEATURE_UDHCPC6_RFC5970 is not set
 -# CONFIG_FEATURE_UDHCP_PORT is not set
--# CONFIG_UDHCP_DEBUG is not set
--# CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS is not set
+-CONFIG_UDHCP_DEBUG=0
+-CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0
 -# CONFIG_FEATURE_UDHCP_RFC3397 is not set
 -# CONFIG_FEATURE_UDHCP_8021Q is not set
++
++#
++# Common options for DHCP applets
++#
 +CONFIG_FEATURE_UDHCP_PORT=y
-+CONFIG_UDHCP_DEBUG=0
-+CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0
++CONFIG_UDHCP_DEBUG=2
++CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
 +CONFIG_FEATURE_UDHCP_RFC3397=y
 +CONFIG_FEATURE_UDHCP_8021Q=y
  CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS=""
- 
+
  #
diff --git a/srcpkgs/busybox/patches/missing-stime.patch b/srcpkgs/busybox/patches/missing-stime.patch
deleted file mode 100644
index 7cef477c756..00000000000
--- a/srcpkgs/busybox/patches/missing-stime.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- libbb/missing_syscalls.c	2019-06-10 12:50:53.000000000 +0200
-+++ libbb/missing_syscalls.c	2021-01-29 20:48:33.413486161 +0100
-@@ -7,14 +7,6 @@
- 
- #include "libbb.h"
- 
--#if defined(ANDROID) || defined(__ANDROID__)
--/*# include <linux/timex.h> - for struct timex, but may collide with <time.h> */
--# include <sys/syscall.h>
--pid_t getsid(pid_t pid)
--{
--	return syscall(__NR_getsid, pid);
--}
--
- int stime(const time_t *t)
- {
- 	struct timeval tv;
-@@ -23,6 +15,14 @@
- 	return settimeofday(&tv, NULL);
- }
- 
-+#if defined(ANDROID) || defined(__ANDROID__)
-+/*# include <linux/timex.h> - for struct timex, but may collide with <time.h> */
-+# include <sys/syscall.h>
-+pid_t getsid(pid_t pid)
-+{
-+	return syscall(__NR_getsid, pid);
-+}
-+
- int sethostname(const char *name, size_t len)
- {
- 	return syscall(__NR_sethostname, name, len);
diff --git a/srcpkgs/busybox/patches/testsuite-fix-cpio-and-patch-tests.patch b/srcpkgs/busybox/patches/testsuite-fix-cpio-and-patch-tests.patch
deleted file mode 100644
index 8dd3034be2e..00000000000
--- a/srcpkgs/busybox/patches/testsuite-fix-cpio-and-patch-tests.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 9a522cf388e321b47f9462bbbd7726323095f8db Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Thu, 6 Jul 2017 13:41:32 +0200
-Subject: [PATCH 11/11] testsuite: fix cpio tests
-
-The cpio tests don't search for the right output line correctly,
-using a hardcoded tail offset. Instead, grep for the file entry
-just added.
-
-The reverse-hunk patch tests seem to get the output order wrong,
-and the tests pass when this is corrected.
----
- testsuite/cpio.tests  | 6 +++---
- testsuite/patch.tests | 4 ++--
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
---- testsuite/cpio.tests
-+++ testsuite/cpio.tests
-@@ -129,7 +129,7 @@ SKIP=
- 
- optional FEATURE_CPIO_O
- testing "cpio uses by default uid/gid" \
--"echo $0 | cpio -o -H newc | cpio -tv 2>&1 | tail -n +2 | awk ' { print \$2 } '; echo \$?" \
-+"echo $0 | cpio -o -H newc | cpio -tv 2>&1 | grep -F $(basename $0) | awk ' { print \$2 } '; echo \$?" \
- "\
- $user/$group
- 0
-@@ -138,7 +138,7 @@ SKIP=
- 
- optional FEATURE_CPIO_O
- testing "cpio -R with create" \
--"echo $0 | cpio -o -H newc -R 1234:5678 | cpio -tv 2>&1 | tail -n +2 | awk ' { print \$2 } '; echo \$?" \
-+"echo $0 | cpio -o -H newc -R 1234:5678 | cpio -tv 2>&1 | grep -F $(basename $0) | awk ' { print \$2 } '; echo \$?" \
- "\
- 1234/5678
- 0
-@@ -147,7 +147,7 @@ SKIP=
- 
- optional FEATURE_CPIO_O
- testing "cpio -R with extract" \
--"echo $0 | cpio -o -H newc | cpio -tv -R 8765:4321 2>&1 | tail -n +2 | awk ' { print \$2 } '; echo \$?" \
-+"echo $0 | cpio -o -H newc | cpio -tv -R 8765:4321 2>&1 | grep -F $(basename $0) | awk ' { print \$2 } '; echo \$?" \
- "\
- 8765/4321
- 0
---- testsuite/patch.tests
-+++ testsuite/patch.tests
-@@ -75,12 +75,12 @@ zxc
- testing "patch detects already applied hunk" \
- 	'patch 2>&1; echo $?; cat input' \
- "\
-+patching file input
- Possibly reversed hunk 1 at 4
- Hunk 1 FAILED 1/1.
-  abc
- +def
-  123
--patching file input
- 1
- abc
- def
-@@ -103,12 +103,12 @@ def
- testing "patch detects already applied hunk at the EOF" \
- 	'patch 2>&1; echo $?; cat input' \
- "\
-+patching file input
- Possibly reversed hunk 1 at 4
- Hunk 1 FAILED 1/1.
-  abc
-  123
- +456
--patching file input
- 1
- abc
- 123
--- 
-2.13.2
-
-
diff --git a/srcpkgs/busybox/patches/time64.patch b/srcpkgs/busybox/patches/time64.patch
deleted file mode 100644
index fc6531e85b0..00000000000
--- a/srcpkgs/busybox/patches/time64.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git coreutils/date.c coreutils/date.c
-index 3414d38..6e12f36 100644
---- coreutils/date.c
-+++ coreutils/date.c
-@@ -272,9 +272,7 @@ int date_main(int argc UNUSED_PARAM, char **argv)
- #endif
- 	} else {
- #if ENABLE_FEATURE_DATE_NANO
--		/* libc has incredibly messy way of doing this,
--		 * typically requiring -lrt. We just skip all this mess */
--		syscall(__NR_clock_gettime, CLOCK_REALTIME, &ts);
-+		clock_gettime(CLOCK_REALTIME, &ts);
- #else
- 		time(&ts.tv_sec);
- #endif
-diff --git libbb/time.c libbb/time.c
-index f9b8da0..600b60b 100644
---- libbb/time.c
-+++ libbb/time.c
-@@ -247,17 +247,10 @@ char* FAST_FUNC strftime_YYYYMMDDHHMMSS(char *buf, unsigned len, time_t *tp)
- #if ENABLE_MONOTONIC_SYSCALL
- 
- #include <sys/syscall.h>
--/* Old glibc (< 2.3.4) does not provide this constant. We use syscall
-- * directly so this definition is safe. */
--#ifndef CLOCK_MONOTONIC
--#define CLOCK_MONOTONIC 1
--#endif
- 
--/* libc has incredibly messy way of doing this,
-- * typically requiring -lrt. We just skip all this mess */
- static void get_mono(struct timespec *ts)
- {
--	if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts))
-+	if (clock_gettime(CLOCK_MONOTONIC, ts))
- 		bb_error_msg_and_die("clock_gettime(MONOTONIC) failed");
- }
- unsigned long long FAST_FUNC monotonic_ns(void)
diff --git a/srcpkgs/busybox/template b/srcpkgs/busybox/template
index 57728f1fe1f..de8a606f02d 100644
--- a/srcpkgs/busybox/template
+++ b/srcpkgs/busybox/template
@@ -1,7 +1,7 @@
 # Template file for 'busybox'
 pkgname=busybox
-version=1.31.1
-revision=6
+version=1.32.1
+revision=1
 hostmakedepends="perl"
 checkdepends="tar which zip"
 short_desc="Swiss Army Knife of Embedded Linux"
@@ -9,7 +9,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-2.0-only"
 homepage="http://www.busybox.net"
 distfiles="${homepage}/downloads/busybox-${version}.tar.bz2"
-checksum=d0f940a72f648943c1f2211e0e3117387c31d765137d92bd8284a3fb9752a998
+checksum=9d57c4bd33974140fd4111260468af22856f12f5b5ef7c70c8d9b75c712a0dee
 
 _alternatives_core="
  ash:ash:/usr/bin/busybox
@@ -33,6 +33,7 @@ _patch_config() {
 	while [ "$1" ]; do
 		local p="$1"
 		shift
+		echo "Applying $p..."
 		patch "${t}/.config" <"${FILESDIR}/dotconfig.d/${p}.patch"
 	done
 }
@@ -63,6 +64,7 @@ do_configure() {
 	_patch_config busybox-huge udhcpc ntpd httpd mdev sysklogd huge
 
 	for t in busybox-core busybox busybox-static busybox-huge; do
+		make -C "${t}" KBUILD_SRC="${wrksrc}/src" -f "${wrksrc}/src/Makefile" oldconfig
 		make -C "${t}" KBUILD_SRC="${wrksrc}/src" -f "${wrksrc}/src/Makefile" prepare "${makejobs}"
 	done
 

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: busybox: update to 1.32.1
  2021-02-14  6:26 [PR PATCH] busybox: update to 1.32.1 CameronNemo
@ 2021-02-14  7:21 ` ericonr
  2021-02-14 10:56 ` saqfish
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 5+ messages in thread
From: ericonr @ 2021-02-14  7:21 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 176 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28747#issuecomment-778739503

Comment:
Any specific reason not to do 1.33?

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: busybox: update to 1.32.1
  2021-02-14  6:26 [PR PATCH] busybox: update to 1.32.1 CameronNemo
  2021-02-14  7:21 ` ericonr
@ 2021-02-14 10:56 ` saqfish
  2021-02-14 18:25 ` CameronNemo
  2021-02-24 15:25 ` [PR PATCH] [Merged]: " ericonr
  3 siblings, 0 replies; 5+ messages in thread
From: saqfish @ 2021-02-14 10:56 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 202 bytes --]

New comment by saqfish on void-packages repository

https://github.com/void-linux/void-packages/pull/28747#issuecomment-778761004

Comment:
> Any specific reason not to do 1.33?

Isn't 1.33 unstable?

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: busybox: update to 1.32.1
  2021-02-14  6:26 [PR PATCH] busybox: update to 1.32.1 CameronNemo
  2021-02-14  7:21 ` ericonr
  2021-02-14 10:56 ` saqfish
@ 2021-02-14 18:25 ` CameronNemo
  2021-02-24 15:25 ` [PR PATCH] [Merged]: " ericonr
  3 siblings, 0 replies; 5+ messages in thread
From: CameronNemo @ 2021-02-14 18:25 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 179 bytes --]

New comment by CameronNemo on void-packages repository

https://github.com/void-linux/void-packages/pull/28747#issuecomment-778819001

Comment:
yeah the .0 releases are unstable.

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PR PATCH] [Merged]: busybox: update to 1.32.1
  2021-02-14  6:26 [PR PATCH] busybox: update to 1.32.1 CameronNemo
                   ` (2 preceding siblings ...)
  2021-02-14 18:25 ` CameronNemo
@ 2021-02-24 15:25 ` ericonr
  3 siblings, 0 replies; 5+ messages in thread
From: ericonr @ 2021-02-24 15:25 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1412 bytes --]

There's a merged pull request on the void-packages repository

busybox: update to 1.32.1
https://github.com/void-linux/void-packages/pull/28747

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ x ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2021-02-24 15:25 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-14  6:26 [PR PATCH] busybox: update to 1.32.1 CameronNemo
2021-02-14  7:21 ` ericonr
2021-02-14 10:56 ` saqfish
2021-02-14 18:25 ` CameronNemo
2021-02-24 15:25 ` [PR PATCH] [Merged]: " ericonr

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).