pool/busybox
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1157908 from Base:System

Browse Source 
- tc-no-TCA_CBQ.patch: Disable TCA_CBQ code if kernel headers don't 
  support them.

OBS-URL: https://build.opensuse.org/request/show/1157908
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/busybox?expand=0&rev=86
This commit is contained in:
Ana Guerrero 2024-03-14 16:43:56 +00:00 committed by Git OBS Bridge
commit c7852a0427
3 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
busybox.changes
View File

@ -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>

3
busybox.spec
View File

@ -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

18
tc-no-TCA_CBQ.patch Normal file
View File

@ -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;
}