From f86cbb7b3bb39ae558ddf2a8f219edac56a1fb1259c4cb5bdf14ea6025815b7c Mon Sep 17 00:00:00 2001
From: Thorsten Kukuk <kukuk@suse.com>
Date: Thu, 14 Mar 2024 09:16:11 +0000
Subject: [PATCH] - tc-no-TCA_CBQ.patch: Disable TCA_CBQ code if kernel headers
 don't   support them.

OBS-URL: https://build.opensuse.org/package/show/Base:System/busybox?expand=0&rev=126
---
 busybox.changes     |  6 ++++++
 busybox.spec        |  3 ++-
 tc-no-TCA_CBQ.patch | 18 ++++++++++++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 tc-no-TCA_CBQ.patch

diff --git a/busybox.changes b/busybox.changes
index 1f8e8a1..208d379 100644
--- a/busybox.changes
+++ b/busybox.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Mar 14 09:15:13 UTC 2024 - Thorsten Kukuk <kukuk@suse.com>
+
+- tc-no-TCA_CBQ.patch: Disable TCA_CBQ code if kernel headers don't 
+  support them.
+
 -------------------------------------------------------------------
 Fri Dec  8 10:47:35 UTC 2023 - Thorsten Kukuk <kukuk@suse.com>
 
diff --git a/busybox.spec b/busybox.spec
index 9946721..c4d6b85 100644
--- a/busybox.spec
+++ b/busybox.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package busybox
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -45,6 +45,7 @@ Patch2:         testsuite-gnu-echo.patch
 # PATCH-FIX-UPSTREAM shell: avoid segfault on ${0::0/0~09J} (CVE-2022-48174) https://git.busybox.net/busybox/commit/?id=d417193cf
 Patch3:         ash-fix-segfault-d417193cf.patch
 Patch4:         udhcp6-install-path.patch
+Patch5:         tc-no-TCA_CBQ.patch
 # other patches
 Patch100:       busybox.install.patch
 Provides:       useradd_or_adduser_dep
diff --git a/tc-no-TCA_CBQ.patch b/tc-no-TCA_CBQ.patch
new file mode 100644
index 0000000..c2a8fc9
--- /dev/null
+++ b/tc-no-TCA_CBQ.patch
@@ -0,0 +1,18 @@
+--- busybox-1.36.1/networking/tc.c.old	2023-01-03 15:14:43.000000000 +0100
++++ busybox-1.36.1/networking/tc.c	2024-03-14 10:04:19.733155657 +0100
+@@ -233,6 +233,7 @@
+ #endif
+ static int cbq_print_opt(struct rtattr *opt)
+ {
++#ifdef TCA_CBQ_MAX
+ 	struct rtattr *tb[TCA_CBQ_MAX+1];
+ 	struct tc_ratespec *r = NULL;
+ 	struct tc_cbq_lssopt *lss = NULL;
+@@ -320,6 +321,7 @@
+ 		}
+ 	}
+  done:
++#endif
+ 	return 0;
+ }
+