From 996613364a3548df27b1446794fc526168df4800 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 25 Dec 2025 15:32:25 +0100 Subject: [PATCH] package/dump1090: bump version to 10.2 Drop now upstreamed patch 0001: https://github.com/flightaware/dump1090/commit/84d68c628508360c47aa47691ec9d98dc6026ed5 And rename remaining patches. Signed-off-by: Peter Korsgaard Signed-off-by: Julien Olivain --- ... => 0001-Fix-compilation-with-GCC15.patch} | 0 .../0001-swap-size-arguments-to-calloc.patch | 43 ------------------- package/dump1090/dump1090.hash | 2 +- package/dump1090/dump1090.mk | 2 +- 4 files changed, 2 insertions(+), 45 deletions(-) rename package/dump1090/{0002-Fix-compilation-with-GCC15.patch => 0001-Fix-compilation-with-GCC15.patch} (100%) delete mode 100644 package/dump1090/0001-swap-size-arguments-to-calloc.patch diff --git a/package/dump1090/0002-Fix-compilation-with-GCC15.patch b/package/dump1090/0001-Fix-compilation-with-GCC15.patch similarity index 100% rename from package/dump1090/0002-Fix-compilation-with-GCC15.patch rename to package/dump1090/0001-Fix-compilation-with-GCC15.patch diff --git a/package/dump1090/0001-swap-size-arguments-to-calloc.patch b/package/dump1090/0001-swap-size-arguments-to-calloc.patch deleted file mode 100644 index 1c2d502793..0000000000 --- a/package/dump1090/0001-swap-size-arguments-to-calloc.patch +++ /dev/null @@ -1,43 +0,0 @@ -From be8f5b7ab1223076ba0086f14aeeb53ace2d4b5c Mon Sep 17 00:00:00 2001 -From: Jeff Lawson -Date: Tue, 18 Jun 2024 15:58:24 +0000 -Subject: [PATCH] swap size arguments to calloc - -fixes #241 - -Signed-off-by: Peter Korsgaard -Upstream: https://github.com/flightaware/dump1090/pull/243 ---- - adaptive.c | 2 +- - net_io.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/adaptive.c b/adaptive.c -index f16e16c..d656433 100644 ---- a/adaptive.c -+++ b/adaptive.c -@@ -195,7 +195,7 @@ void adaptive_init() - adaptive_burst_window_remaining = adaptive_samples_per_window; - adaptive_burst_window_counter = 0; - -- adaptive_range_radix = calloc(sizeof(unsigned), 65536); -+ adaptive_range_radix = calloc(65536, sizeof(unsigned)); - adaptive_range_state = RANGE_RESCAN_UP; - - // select and enforce gain limits -diff --git a/net_io.c b/net_io.c -index bf98028..8abd510 100644 ---- a/net_io.c -+++ b/net_io.c -@@ -104,7 +104,7 @@ struct net_service *serviceInit(const char *descr, struct net_writer *writer, he - { - struct net_service *service; - -- if (!(service = calloc(sizeof(*service), 1))) { -+ if (!(service = calloc(1, sizeof(*service)))) { - fprintf(stderr, "Out of memory allocating service %s\n", descr); - exit(1); - } --- -2.39.2 - diff --git a/package/dump1090/dump1090.hash b/package/dump1090/dump1090.hash index a493e76560..0683e6ef62 100644 --- a/package/dump1090/dump1090.hash +++ b/package/dump1090/dump1090.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6190622c3625713ec9cff882a9d6f6a51b6d2f83ef20e6e1905a3902c7b08483 dump1090-9.0.tar.gz +sha256 1135588ea8f3d045601e8ab45702648e339168eee0792b2c4f62fae3d2cc9f3b dump1090-10.2.tar.gz sha256 804f68c803eb5c127c53ad17c4f4e5033ef158e514bb76950dc7b1773f9ce4b0 LICENSE diff --git a/package/dump1090/dump1090.mk b/package/dump1090/dump1090.mk index e06babb082..1ecdfca47f 100644 --- a/package/dump1090/dump1090.mk +++ b/package/dump1090/dump1090.mk @@ -4,7 +4,7 @@ # ################################################################################ -DUMP1090_VERSION = 9.0 +DUMP1090_VERSION = 10.2 DUMP1090_SITE = $(call github,flightaware,dump1090,v$(DUMP1090_VERSION)) DUMP1090_LICENSE = GPL-2.0+ DUMP1090_LICENSE_FILES = LICENSE