From 5f4efd1f30ac621c9fa980ad72c8f1ebee73a2fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Thu, 8 Feb 2024 13:02:25 +0100
Subject: [PATCH] Update busybox

---
 .qubesbuilder                           | 6 +++---
 Makefile.vars                           | 2 +-
 busybox/busybox.config                  | 1 +
 checksums/busybox-1.31.1.tar.bz2.sha512 | 1 -
 checksums/busybox-1.36.1.tar.bz2.sha512 | 1 +
 rpm_spec/xen-hvm-stubdom-linux.spec.in  | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)
 delete mode 100644 checksums/busybox-1.31.1.tar.bz2.sha512
 create mode 100644 checksums/busybox-1.36.1.tar.bz2.sha512

diff --git a/.qubesbuilder b/.qubesbuilder
index 7aa4b17..93f612b 100644
--- a/.qubesbuilder
+++ b/.qubesbuilder
@@ -18,11 +18,11 @@ source:
     uncompress: true
     pubkeys:
     - keys/linux/greg.asc
-  - url: https://busybox.net/downloads/busybox-1.31.1.tar.bz2
-#    signature: https://busybox.net/downloads/busybox-1.31.1.tar.bz2.sig
+  - url: https://busybox.net/downloads/busybox-1.36.1.tar.bz2
+#    signature: https://busybox.net/downloads/busybox-1.36.1.tar.bz2.sig
 #    pubkeys:
 #    - keys/busybox/vda_pubkey.asc
-    sha512: checksums/busybox-1.31.1.tar.bz2.sha512
+    sha512: checksums/busybox-1.36.1.tar.bz2.sha512
   - url: https://www.freedesktop.org/software/pulseaudio/releases/pulseaudio-14.2.tar.xz
     sha512: checksums/pulseaudio-14.2.tar.xz.sha512
   - url: https://github.com/libusb/libusb/releases/download/v1.0.23/libusb-1.0.23.tar.bz2
diff --git a/Makefile.vars b/Makefile.vars
index 6296aff..aa2facf 100644
--- a/Makefile.vars
+++ b/Makefile.vars
@@ -1,5 +1,5 @@
 QEMU_VERSION := 8.1.2
 LINUX_VERSION := 6.6.44
-BUSYBOX_VERSION := 1.31.1
+BUSYBOX_VERSION := 1.36.1
 PULSEAUDIO_VERSION := 14.2
 LIBUSB_VERSION := 1.0.23
diff --git a/busybox/busybox.config b/busybox/busybox.config
index 13d6c54..b61e07c 100644
--- a/busybox/busybox.config
+++ b/busybox/busybox.config
@@ -794,6 +794,7 @@ CONFIG_FEATURE_IP_NEIGH=y
 # CONFIG_ROUTE is not set
 # CONFIG_SLATTACH is not set
 # CONFIG_SSL_CLIENT is not set
+# CONFIG_TC is not set
 # CONFIG_TCPSVD is not set
 # CONFIG_UDPSVD is not set
 # CONFIG_TELNET is not set
diff --git a/checksums/busybox-1.31.1.tar.bz2.sha512 b/checksums/busybox-1.31.1.tar.bz2.sha512
deleted file mode 100644
index bab426a..0000000
--- a/checksums/busybox-1.31.1.tar.bz2.sha512
+++ /dev/null
@@ -1 +0,0 @@
-0d1197c25d963d7f95ef21e08c06c0d6124ac7b59c99989e891f744ffee4878a3b1fe44a247241a9da39fa5de0ba87f1b6d862401b591f277e66e89c02764bbf
diff --git a/checksums/busybox-1.36.1.tar.bz2.sha512 b/checksums/busybox-1.36.1.tar.bz2.sha512
new file mode 100644
index 0000000..d37a3fb
--- /dev/null
+++ b/checksums/busybox-1.36.1.tar.bz2.sha512
@@ -0,0 +1 @@
+8c0c754c9ae04b5e6b23596283a7d3a4ef96225fe179f92d6f6a99c69c0caa95b1aa56c267f52d7c807f6cc69e1f0b7dd29a8ac624098f601738f8c0c57980d4
diff --git a/rpm_spec/xen-hvm-stubdom-linux.spec.in b/rpm_spec/xen-hvm-stubdom-linux.spec.in
index ef2b9ab..87118ba 100644
--- a/rpm_spec/xen-hvm-stubdom-linux.spec.in
+++ b/rpm_spec/xen-hvm-stubdom-linux.spec.in
@@ -1,6 +1,6 @@
 %define QEMU_VERSION 8.1.2
 %define LINUX_VERSION 6.6.44
-%define BUSYBOX_VERSION 1.31.1
+%define BUSYBOX_VERSION 1.36.1
 %define PULSEAUDIO_VERSION 14.2
 %define LIBUSB_VERSION 1.0.23