From 885cda7e0d67eff56bf803e85185f9f86f02120f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 26 Dec 2023 22:24:31 +0100 Subject: [PATCH] package/lldpd: bump to version 1.0.17 Drop patch (already in version) https://github.com/lldpd/lldpd/blob/1.0.17/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...-overflow-when-parsing-CDP-addresses.patch | 24 ------------------- package/lldpd/lldpd.hash | 4 ++-- package/lldpd/lldpd.mk | 5 +--- 3 files changed, 3 insertions(+), 30 deletions(-) delete mode 100644 package/lldpd/0001-daemon-fix-read-overflow-when-parsing-CDP-addresses.patch diff --git a/package/lldpd/0001-daemon-fix-read-overflow-when-parsing-CDP-addresses.patch b/package/lldpd/0001-daemon-fix-read-overflow-when-parsing-CDP-addresses.patch deleted file mode 100644 index 05d882a07a..0000000000 --- a/package/lldpd/0001-daemon-fix-read-overflow-when-parsing-CDP-addresses.patch +++ /dev/null @@ -1,24 +0,0 @@ -From a9aeabdf879c25c584852a0bb5523837632f099b Mon Sep 17 00:00:00 2001 -From: Vincent Bernat -Date: Wed, 12 Apr 2023 07:38:31 +0200 -Subject: [PATCH] daemon: fix read overflow when parsing CDP addresses - -Upstream: https://github.com/lldpd/lldpd/commit/a9aeabdf879c25c584852a0bb5523837632f099b -Signed-off-by: Fabrice Fontaine ---- - NEWS | 4 ++++ - src/daemon/protocols/cdp.c | 1 + - 2 files changed, 5 insertions(+) - -diff --git a/src/daemon/protocols/cdp.c b/src/daemon/protocols/cdp.c -index 8a1be863..42861c0e 100644 ---- a/src/daemon/protocols/cdp.c -+++ b/src/daemon/protocols/cdp.c -@@ -466,6 +466,7 @@ cdp_decode(struct lldpd *cfg, char *frame, int s, struct lldpd_hardware *hardwar - goto malformed; - } - PEEK_DISCARD(address_len); -+ addresses_len -= address_len; - (void)PEEK_SAVE(pos_next_address); - /* Next, we go back and try to extract - IPv4 address */ diff --git a/package/lldpd/lldpd.hash b/package/lldpd/lldpd.hash index 6db5ca98f1..e798e2beb2 100644 --- a/package/lldpd/lldpd.hash +++ b/package/lldpd/lldpd.hash @@ -1,5 +1,5 @@ # Locally computed after checking gpg key -# https://media.luffy.cx/files/lldpd/lldpd-1.0.15.tar.gz.gpg +# https://media.luffy.cx/files/lldpd/lldpd-1.0.17.tar.gz.gpg # using key AEF2348766F371C689A7360095A42FE8353525F9 -sha256 f7fe3a130be98a19c491479ef60f36b8ee41a9e6bc4d7f2c41033f63956a3126 lldpd-1.0.15.tar.gz +sha256 9343177f145d2bca66ef03d59528079d3f1663c624b1e2b9d08268efdc6127ce lldpd-1.0.17.tar.gz sha256 0e96a5aea65f16e2239231ce4ab90497f8bc3bb8fe6abe9299aade4726ff7c8d LICENSE diff --git a/package/lldpd/lldpd.mk b/package/lldpd/lldpd.mk index d4abfade81..75457a25e3 100644 --- a/package/lldpd/lldpd.mk +++ b/package/lldpd/lldpd.mk @@ -4,7 +4,7 @@ # ################################################################################ -LLDPD_VERSION = 1.0.15 +LLDPD_VERSION = 1.0.17 LLDPD_SITE = https://media.luffy.cx/files/lldpd LLDPD_DEPENDENCIES = \ $(if $(BR2_PACKAGE_CHECK),check) \ @@ -16,9 +16,6 @@ LLDPD_LICENSE = ISC LLDPD_LICENSE_FILES = LICENSE LLDPD_CPE_ID_VENDOR = lldpd_project -# 0001-daemon-fix-read-overflow-when-parsing-CDP-addresses.patch -LLDPD_IGNORE_CVES += CVE-2023-41910 - # Detection of c99 support in configure fails without WCHAR. To enable # automatic detection of c99 support by configure, we need to enable # WCHAR in toolchain. But actually we do not need WCHAR at lldpd