[arch-commits] Commit in busybox/trunk (PKGBUILD config)

[Eli Schwartz]

    Date: Tuesday, May 4, 2021 @ 03:42:44
  Author: eschwartz
Revision: 927338

upgpkg: busybox 1.33.1-1: upstream release

Modified:
  busybox/trunk/PKGBUILD
  busybox/trunk/config

----------+
 PKGBUILD |   25 ++++++-------------------
 config   |   12 ++++++++----
 2 files changed, 14 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-04 02:44:29 UTC (rev 927337)
+++ PKGBUILD	2021-05-04 03:42:44 UTC (rev 927338)
@@ -3,8 +3,8 @@
 # Contributor: Jens Pranaitis <jens at jenux.homelinux.org>
 
 pkgname=busybox
-pkgver=1.32.1
-pkgrel=4
+pkgver=1.33.1
+pkgrel=1
 pkgdesc="Utilities for rescue and embedded systems"
 arch=("x86_64")
 url="https://www.busybox.net"
@@ -12,27 +12,14 @@
 makedepends=("ncurses" "musl" "kernel-headers-musl")
 validpgpkeys=('C9E9416F76E610DBD09D040F47B70C55ACC9965B')
 source=("$url/downloads/$pkgname-$pkgver.tar.bz2"{,.sig}
-        '0001-ash-fix-unset_var-pattern-repl.patch'
-        "CVE-2021-28831.patch::https://git.busybox.net/busybox/patch/?id=f25d254dfd4243698c31a4f3153d4ac72aa9e9bd"
         "config")
-sha256sums=('9d57c4bd33974140fd4111260468af22856f12f5b5ef7c70c8d9b75c712a0dee'
+sha256sums=('12cec6bd2b16d8a9446dd16130f2b92982f1819f6e1c5f5887b6db03f5660d28'
             'SKIP'
-            '4e4fb268c51e378a3ad0a12f903a601a136d31cae8b684a51ebabbc9a6cf9250'
-            '108096d1eee47136756e7250ac136aea926c4edaabe707fda1404022806f160b'
-            '0b1df86c2fd0c8869c67096777960bddf7db2c54efab5ad890fc83e1b3cbf027')
-b2sums=('b0258345d40628d8c12b4cc5c3efdb318cfb469e029242942cdad22aeec5142963291a746fbac450b43a4a1f2f7e9204442456691fa98f18eeaa58c70d714caf'
+            '6dd9c0f03fecb61994ffd9774307a34bcf1af120c0d590eeaba3c9135073221e')
+b2sums=('2dce3427ab7703c56cbb3bdc0c93c1fe1c6dc24c5b467b6213b8f9cf55223ec63136b3837970e41293cc3d55d320599945d29a69a4ef8b4b3ab9fb5e2a527632'
         'SKIP'
-        '6ce36c1e467c55b3405af58b19636daaf1ead2a5a630ed93c0e86912ecccbce359df3061718f99f08204e705eb1352c00801af3f4241e470f7d64ef6367f3c7e'
-        '1d70db3703e235c5f577f46753be456d45e40f2786ee3a152ebab667e122d31bc687c5ba41697ffb2eeb6aaa48d1b70465633c69e43573269668b10d099d59b0'
-        '1ad361dd163e589aa85822834b7e5ec421c1fc7bfab1e481520a8d90ee920c2f1a07709871f864173c3cfb6eacf60f54a4e2adba4e061ae1a9a883e368f1893e')
+        'f0fda13da199b358866e5d628dbf0f6a09e306f4624d227f29cc35da148fa77695b4c301fe109c03da2640985a1a6f82ef4b02a2ba3e385e550f2bb27cadee20')
 
-prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  patch -Np1 < ../0001-ash-fix-unset_var-pattern-repl.patch
-  patch -p1 -i ../CVE-2021-28831.patch
-}
-
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 

Modified: config
===================================================================
--- config	2021-05-04 02:44:29 UTC (rev 927337)
+++ config	2021-05-04 03:42:44 UTC (rev 927338)
@@ -1,7 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.32.1
-# Sun Jan  3 01:47:48 2021
+# Busybox version: 1.33.1
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -36,7 +35,6 @@
 # CONFIG_FEATURE_CLEAN_UP is not set
 CONFIG_FEATURE_SYSLOG_INFO=y
 CONFIG_FEATURE_SYSLOG=y
-CONFIG_PLATFORM_LINUX=y
 
 #
 # Build Options
@@ -55,6 +53,7 @@
 CONFIG_EXTRA_LDLIBS=""
 # CONFIG_USE_PORTABLE_CODE is not set
 CONFIG_STACK_OPTIMIZATION_386=y
+# CONFIG_STATIC_LIBGCC is not set
 
 #
 # Installation Options ("make install" behavior)
@@ -331,6 +330,7 @@
 CONFIG_UNLINK=y
 CONFIG_USLEEP=y
 CONFIG_UUDECODE=y
+CONFIG_BASE32=y
 CONFIG_BASE64=y
 CONFIG_UUENCODE=y
 CONFIG_WC=y
@@ -623,7 +623,6 @@
 CONFIG_GETOPT=y
 CONFIG_FEATURE_GETOPT_LONG=y
 CONFIG_HEXDUMP=y
-CONFIG_FEATURE_HEXDUMP_REVERSE=y
 CONFIG_HD=y
 CONFIG_XXD=y
 CONFIG_HWCLOCK=y
@@ -715,6 +714,7 @@
 CONFIG_FEATURE_VOLUMEID_BCACHE=y
 CONFIG_FEATURE_VOLUMEID_BTRFS=y
 CONFIG_FEATURE_VOLUMEID_CRAMFS=y
+CONFIG_FEATURE_VOLUMEID_EROFS=y
 CONFIG_FEATURE_VOLUMEID_EXFAT=y
 CONFIG_FEATURE_VOLUMEID_EXT=y
 CONFIG_FEATURE_VOLUMEID_F2FS=y
@@ -874,6 +874,10 @@
 CONFIG_FEATURE_HTTPD_ERROR_PAGES=y
 CONFIG_FEATURE_HTTPD_PROXY=y
 CONFIG_FEATURE_HTTPD_GZIP=y
+CONFIG_FEATURE_HTTPD_ETAG=y
+CONFIG_FEATURE_HTTPD_LAST_MODIFIED=y
+CONFIG_FEATURE_HTTPD_DATE=y
+CONFIG_FEATURE_HTTPD_ACL_IP=y
 CONFIG_IFCONFIG=y
 CONFIG_FEATURE_IFCONFIG_STATUS=y
 CONFIG_FEATURE_IFCONFIG_SLIP=y