From d28d24dbc543cf8365a11582bdf1b8aa0e39bc89 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 23 Sep 2024 19:06:36 +0200 Subject: [PATCH 1/4] package/busybox: patch to fix tc build on 6.8+ kernels Fixes a build error introduced by bumping the linux kernel headers to 6.8 with buildroot commit 807a44925697b9567d5bd9872a334a073b3dcf55. No autobuilder failures were recorded with this problem. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- ...emoved-the-definitions-related-to-CB.patch | 70 +++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 package/busybox/0010-Linux-v6.8-rc1-removed-the-definitions-related-to-CB.patch diff --git a/package/busybox/0010-Linux-v6.8-rc1-removed-the-definitions-related-to-CB.patch b/package/busybox/0010-Linux-v6.8-rc1-removed-the-definitions-related-to-CB.patch new file mode 100644 index 000000000000..d997f00e82e8 --- /dev/null +++ b/package/busybox/0010-Linux-v6.8-rc1-removed-the-definitions-related-to-CB.patch @@ -0,0 +1,70 @@ +From c4f93565acf3718111cdbaea15e1a8aacf2f44cf Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= +Date: Mon, 23 Sep 2024 18:56:00 +0200 +Subject: [PATCH] tc: Fix compilation with Linux v6.8-rc1 + +Linux v6.8-rc1 removed the definitions related to CBQ: +https://github.com/torvalds/linux/commit/33241dca486264193ed68167c8eeae1fb197f3df +making tc fail to build. +Add some #ifdefs to handle this missing support. + +Upstream: http://lists.busybox.net/pipermail/busybox/2024-March/090678.html +Bug report: https://bugs.busybox.net/show_bug.cgi?id=15931 + +Signed-off-by: Bernd Kuhls +--- + networking/tc.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/networking/tc.c b/networking/tc.c +index 3a79fd2d9..d08fd1359 100644 +--- a/networking/tc.c ++++ b/networking/tc.c +@@ -231,6 +231,13 @@ static int cbq_parse_opt(int argc, char **argv, struct nlmsghdr *n) + return 0; + } + #endif ++ ++#ifndef TCA_CBQ_MAX ++/* ++ * Linux v6.8-rc1~131^2~60^2^2 removed the uapi definitions for CBQ. ++ * See https://git.kernel.org/linus/33241dca48626 ++ */ ++#else + static int cbq_print_opt(struct rtattr *opt) + { + struct rtattr *tb[TCA_CBQ_MAX+1]; +@@ -322,6 +329,7 @@ static int cbq_print_opt(struct rtattr *opt) + done: + return 0; + } ++#endif + + static FAST_FUNC int print_qdisc( + const struct sockaddr_nl *who UNUSED_PARAM, +@@ -372,8 +380,10 @@ static FAST_FUNC int print_qdisc( + int qqq = index_in_strings(_q_, name); + if (qqq == 0) { /* pfifo_fast aka prio */ + prio_print_opt(tb[TCA_OPTIONS]); ++#ifdef TCA_CBQ_MAX + } else if (qqq == 1) { /* class based queuing */ + cbq_print_opt(tb[TCA_OPTIONS]); ++#endif + } else { + /* don't know how to print options for this qdisc */ + printf("(options for %s)", name); +@@ -442,9 +452,11 @@ static FAST_FUNC int print_class( + int qqq = index_in_strings(_q_, name); + if (qqq == 0) { /* pfifo_fast aka prio */ + /* nothing. */ /*prio_print_opt(tb[TCA_OPTIONS]);*/ ++#ifdef TCA_CBQ_MAX + } else if (qqq == 1) { /* class based queuing */ + /* cbq_print_copt() is identical to cbq_print_opt(). */ + cbq_print_opt(tb[TCA_OPTIONS]); ++#endif + } else { + /* don't know how to print options for this class */ + printf("(options for %s)", name); +-- +2.39.5 + From 1c2fa85cb12de3992b275068890508983973fcdd Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 23 Sep 2024 06:02:47 +0200 Subject: [PATCH 2/4] package/httping: update to latest git Changes made to the Buildroot package: - use github url for download - switch to cmake infrastructure - add new option for TUI support - add new option for SSL support - TFO is always enabled now, and therefore we don't need to add Config.in.legacy handling for this option - remove no longer required patches 0001/0002 - update license file to LICENSE - update license to AGPLv3 - always build without gettext support Signed-off-by: Waldemar Brodkorb [yann.morin.1998@free.fr: - update .checkpackageignore - don't use $(call github...) ] Signed-off-by: Yann E. MORIN --- .checkpackageignore | 2 - .../0001-fix-math-library-linking.patch | 27 ----------- ...Makefile-allow-build-without-gettext.patch | 48 ------------------- package/httping/Config.in | 13 ++++- package/httping/httping.hash | 4 +- package/httping/httping.mk | 41 +++++----------- 6 files changed, 26 insertions(+), 109 deletions(-) delete mode 100644 package/httping/0001-fix-math-library-linking.patch delete mode 100644 package/httping/0002-Makefile-allow-build-without-gettext.patch diff --git a/.checkpackageignore b/.checkpackageignore index c24b94a794d2..0cc742bf0960 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -584,8 +584,6 @@ package/heirloom-mailx/0001-fix-libressl-support.patch lib_patch.Upstream package/hplip/0001-build-use-pkg-config-to-discover-libusb.patch lib_patch.Upstream package/hplip/0002-configure.in-fix-AM_INIT_AUTOMAKE-call.patch lib_patch.Upstream package/htpdate/S43htpdate Shellcheck -package/httping/0001-fix-math-library-linking.patch lib_patch.Upstream -package/httping/0002-Makefile-allow-build-without-gettext.patch lib_patch.Upstream package/i2pd/S99i2pd Shellcheck lib_sysv.Indent lib_sysv.Variables package/i7z/0001-fix-build-with-gcc-10.patch lib_patch.Upstream package/ibm-sw-tpm2/0001-Use-LONG_BIT-to-define-RADIX_BITS.patch lib_patch.Upstream diff --git a/package/httping/0001-fix-math-library-linking.patch b/package/httping/0001-fix-math-library-linking.patch deleted file mode 100644 index 582fb9e91787..000000000000 --- a/package/httping/0001-fix-math-library-linking.patch +++ /dev/null @@ -1,27 +0,0 @@ -Move LDFLAGS+=-lm option to the end. -The order of the math library directive '-lm' matters. - -Signed-off-by: Yuvaraj Patil -[Fabrice: make the patch to be applied with fuzz factor 0] -Signed-off-by: Fabrice Fontaine ---- -diff -Nurp httping-2.3.4_orig/Makefile httping-2.3.4/Makefile ---- httping-2.3.4_orig/Makefile 2014-07-23 16:16:36.495546288 +0530 -+++ httping-2.3.4/Makefile 2014-07-23 16:18:42.547541002 +0530 -@@ -36,7 +36,6 @@ DEBUG=yes - WFLAGS=-Wall -W -Wextra -pedantic -D_FORTIFY_SOURCE=2 - OFLAGS= - CFLAGS+=$(WFLAGS) $(OFLAGS) -DVERSION=\"$(VERSION)\" -DLOCALEDIR=\"$(LOCALEDIR)\" --LDFLAGS+=-lm - - PACKAGE=$(TARGET)-$(VERSION) - PREFIX?=/usr -@@ -97,6 +96,8 @@ ifeq ($(ARM),yes) - CC=arm-linux-gcc - endif - -+LDFLAGS+=-lm -+ - all: $(TARGET) $(TRANSLATIONS) - - $(TARGET): $(OBJS) diff --git a/package/httping/0002-Makefile-allow-build-without-gettext.patch b/package/httping/0002-Makefile-allow-build-without-gettext.patch deleted file mode 100644 index aec1de47d1c2..000000000000 --- a/package/httping/0002-Makefile-allow-build-without-gettext.patch +++ /dev/null @@ -1,48 +0,0 @@ -From fe7d6c5a0e5dfe129f228498037393d23d6ae890 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Tue, 18 Jul 2017 19:09:03 +0300 -Subject: [PATCH] Makefile: allow build without gettext - -The msgfmt command is part of the gettext package, and is used to generate -binary translation files. When gettext is not installed, build fails. -Translation files are not always needed on size constrained embedded targets. -Add an option to disable translation files generation using the NO_GETTEXT -variable. - -Signed-off-by: Baruch Siach ---- -Upstream status: https://github.com/flok99/httping/pull/36 - - Makefile | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/Makefile b/Makefile -index 46127f4cdde1..160cc1794ec8 100644 ---- a/Makefile -+++ b/Makefile -@@ -55,7 +55,9 @@ MKDIR=/bin/mkdir - ARCHIVE=/bin/tar cf - - COMPRESS=/bin/gzip -9 - -+ifneq ($(NO_GETTEXT),yes) - TRANSLATIONS=nl.mo ru.mo -+endif - - OBJS=gen.o http.o io.o error.o utils.o main.o tcp.o res.o socks5.o kalman.o cookies.o help.o colors.o - -@@ -118,10 +120,12 @@ install: $(TARGET) $(TRANSLATIONS) - ifneq ($(DEBUG),yes) - $(STRIP) $(DESTDIR)/$(BINDIR)/$(TARGET) - endif -+ifneq ($(NO_GETTEXT),yes) - mkdir -p $(DESTDIR)/$(PREFIX)/share/locale/nl/LC_MESSAGES - cp nl.mo $(DESTDIR)/$(PREFIX)/share/locale/nl/LC_MESSAGES/httping.mo - mkdir -p $(DESTDIR)/$(PREFIX)/share/locale/ru/LC_MESSAGES - cp ru.mo $(DESTDIR)/$(PREFIX)/share/locale/ru/LC_MESSAGES/httping.mo -+endif - - - makefile.inc: --- -2.13.2 - diff --git a/package/httping/Config.in b/package/httping/Config.in index c0e5071ce871..d21b97ea1db5 100644 --- a/package/httping/Config.in +++ b/package/httping/Config.in @@ -16,7 +16,16 @@ config BR2_PACKAGE_HTTPING if BR2_PACKAGE_HTTPING -config BR2_PACKAGE_HTTPING_TFO - bool "TCP Fast Open (TFO) support" +config BR2_PACKAGE_HTTPING_SSL + bool "enable SSL support" + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_CA_CERTIFICATES # runtime + +config BR2_PACKAGE_HTTPING_TUI + bool "enable TUI support" + select BR2_PACKAGE_NCURSES + select BR2_PACKAGE_NCURSES_WCHAR + select BR2_PACKAGE_FFTW + select BR2_PACKAGE_FFTW_DOUBLE endif diff --git a/package/httping/httping.hash b/package/httping/httping.hash index 3178c32377db..e07f3e32e015 100644 --- a/package/httping/httping.hash +++ b/package/httping/httping.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3e895a0a6d7bd79de25a255a1376d4da88eb09c34efdd0476ab5a907e75bfaf8 httping-2.5.tgz -sha256 c5db2e5b9a692fcdf2bd370f1533529063fbcf8947a8f5ee9d4b050a14e0566d license.txt +sha256 4bf8641ebc44a6fa52086f82c60a29051e094424996d972263155d267c96d305 httping-0e26c53d5fe504eb7204d64b23513729aa4a5bb0-git4.tar.gz +sha256 8486a10c4393cee1c25392769ddd3b2d6c242d6ec7928e1414efff7dfb2f07ef LICENSE diff --git a/package/httping/httping.mk b/package/httping/httping.mk index b3a625a8e109..8cb4f7f2f9ce 100644 --- a/package/httping/httping.mk +++ b/package/httping/httping.mk @@ -4,34 +4,19 @@ # ################################################################################ -HTTPING_VERSION = 2.5 -HTTPING_SOURCE = httping-$(HTTPING_VERSION).tgz -HTTPING_SITE = http://www.vanheusden.com/httping -HTTPING_LICENSE = GPL-2.0 -HTTPING_LICENSE_FILES = license.txt -HTTPING_LDFLAGS = $(TARGET_LDFLAGS) \ - $(TARGET_NLS_LIBS) \ - $(if $(BR2_PACKAGE_LIBICONV),-liconv) -HTTPING_DEPENDENCIES = \ - $(TARGET_NLS_DEPENDENCIES) \ - $(if $(BR2_PACKAGE_LIBICONV),libiconv) \ - $(if $(BR2_PACKAGE_NCURSES_WCHAR),ncurses) \ - $(if $(BR2_PACKAGE_OPENSSL),openssl) \ - $(if $(BR2_PACKAGE_FFTW_DOUBLE),fftw-double) -HTTPING_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) \ - FW=$(if $(BR2_PACKAGE_FFTW_DOUBLE),yes,no) \ - NC=$(if $(BR2_PACKAGE_NCURSES_WCHAR),yes,no) \ - SSL=$(if $(BR2_PACKAGE_OPENSSL),yes,no) \ - TFO=$(if $(BR2_PACKAGE_HTTPING_TFO),yes,no) \ - NO_GETTEXT=$(if $(BR2_SYSTEM_ENABLE_NLS),no,yes) +HTTPING_VERSION = 0e26c53d5fe504eb7204d64b23513729aa4a5bb0 +HTTPING_SITE = https://github.com/folkertvanheusden/HTTPing +HTTPING_SITE_METHOD = git +HTTPING_LICENSE = AGPL-3.0 +HTTPING_LICENSE_FILES = LICENSE -define HTTPING_BUILD_CMDS - $(HTTPING_MAKE_OPTS) LDFLAGS="$(HTTPING_LDFLAGS)" \ - $(MAKE) DEBUG=no -C $(@D) -endef +ifeq ($(BR2_PACKAGE_HTTPING_TUI),y) +HTTPING_DEPENDENCIES += ncurses fftw-double +HTTPING_CONF_OPTS += -DUSE_TUI=1 +endif -define HTTPING_INSTALL_TARGET_CMDS - $(HTTPING_MAKE_OPTS) $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install -endef +ifeq ($(BR2_PACKAGE_HTTPING_SSL),y) +HTTPING_DEPENDENCIES += openssl +endif -$(eval $(generic-package)) +$(eval $(cmake-package)) From ad831a3de122e0719cf10b6f6209af86847bdb86 Mon Sep 17 00:00:00 2001 From: Akhilesh Nema Date: Sun, 22 Sep 2024 13:41:45 -0700 Subject: [PATCH 3/4] package/tcpdump: bump version to 4.99.5 Changelog: https://github.com/the-tcpdump-group/tcpdump/blob/4a789712f187e3ac7b2c0044c3a3f8c71b83646e/CHANGES Signed-off-by: Akhilesh Nema Signed-off-by: Yann E. MORIN --- package/tcpdump/tcpdump.hash | 4 ++-- package/tcpdump/tcpdump.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/tcpdump/tcpdump.hash b/package/tcpdump/tcpdump.hash index 1a22889851c3..b29ac06060d1 100644 --- a/package/tcpdump/tcpdump.hash +++ b/package/tcpdump/tcpdump.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature at -# https://www.tcpdump.org/release/tcpdump-4.99.3.tar.gz.sig +# https://www.tcpdump.org/release/tcpdump-4.99.5.tar.gz.sig # using key 1F166A5742ABB9E0249A8D30E089DEF1D9C15D0D -sha256 0232231bb2f29d6bf2426e70a08a7e0c63a0d59a9b44863b7f5e2357a6e49fea tcpdump-4.99.4.tar.gz +sha256 8c75856e00addeeadf70dad67c9ff3dd368536b2b8563abf6854d7c764cd3adb tcpdump-4.99.5.tar.gz sha256 8a54594d257e14a5260ac770f1633516cb51e3fc28c40136ce2697014eda7afd LICENSE diff --git a/package/tcpdump/tcpdump.mk b/package/tcpdump/tcpdump.mk index 91643e7beaa6..f4086ef12484 100644 --- a/package/tcpdump/tcpdump.mk +++ b/package/tcpdump/tcpdump.mk @@ -4,7 +4,7 @@ # ################################################################################ -TCPDUMP_VERSION = 4.99.4 +TCPDUMP_VERSION = 4.99.5 TCPDUMP_SITE = https://www.tcpdump.org/release TCPDUMP_LICENSE = BSD-3-Clause TCPDUMP_LICENSE_FILES = LICENSE From 0982498c6735a2d90b5540370d17e48c31c962bc Mon Sep 17 00:00:00 2001 From: Akhilesh Nema Date: Sun, 22 Sep 2024 13:57:44 -0700 Subject: [PATCH 4/4] package/libpcap: bump version to 1.10.5 Changelog: https://github.com/the-tcpdump-group/libpcap/blob/bbcbc9174df3298a854daee2b3e666a4b6e5383a/CHANGES Signed-off-by: Akhilesh Nema Signed-off-by: Yann E. MORIN --- package/libpcap/libpcap.hash | 4 ++-- package/libpcap/libpcap.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libpcap/libpcap.hash b/package/libpcap/libpcap.hash index 34339c126196..7f53b99b8ca1 100644 --- a/package/libpcap/libpcap.hash +++ b/package/libpcap/libpcap.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://www.tcpdump.org/release/libpcap-1.10.4.tar.gz.sig -sha256 ed19a0383fad72e3ad435fd239d7cd80d64916b87269550159d20e47160ebe5f libpcap-1.10.4.tar.gz +# https://www.tcpdump.org/release/libpcap-1.10.5.tar.gz.sig +sha256 37ced90a19a302a7f32e458224a00c365c117905c2cd35ac544b6880a81488f0 libpcap-1.10.5.tar.gz # Hash for license file: sha256 8a54594d257e14a5260ac770f1633516cb51e3fc28c40136ce2697014eda7afd LICENSE diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk index 3d05590da304..67adb0a9789f 100644 --- a/package/libpcap/libpcap.mk +++ b/package/libpcap/libpcap.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPCAP_VERSION = 1.10.4 +LIBPCAP_VERSION = 1.10.5 LIBPCAP_SITE = https://www.tcpdump.org/release LIBPCAP_LICENSE = BSD-3-Clause LIBPCAP_LICENSE_FILES = LICENSE