From: Stijn Tintel <stijn@linux-ipv6.be>
Date: Mon, 5 Apr 2021 14:35:39 +0000 (+0300)
Subject: lldpd: bump to 1.0.9
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=8946be0ab568f7321c6c932ce94593ca52cd51cd;p=openwrt%2Fstaging%2Fblogic.git

lldpd: bump to 1.0.9

Contains fixes related to CVE-2020-27827.

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
---

diff --git a/package/network/services/lldpd/Makefile b/package/network/services/lldpd/Makefile
index 1329abe8747f..5f5ff8974093 100644
--- a/package/network/services/lldpd/Makefile
+++ b/package/network/services/lldpd/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lldpd
-PKG_VERSION:=1.0.7
-PKG_RELEASE:=2
+PKG_VERSION:=1.0.9
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://media.luffy.cx/files/lldpd
-PKG_HASH:=1df79179d489c841b49265f2ab5ff05f284a647e95862d2f3c02b3fb079a87e1
+PKG_HASH:=6b64eb3125952b1e33472198b054e8aa0dee45f45d3d4be22789090a474949f5
 
 PKG_MAINTAINER:=Stijn Tintel <stijn@linux-ipv6.be>
 PKG_LICENSE:=ISC
diff --git a/package/network/services/lldpd/patches/002-fix-AX_LIB_READLINE-macro-conflict.patch b/package/network/services/lldpd/patches/002-fix-AX_LIB_READLINE-macro-conflict.patch
deleted file mode 100644
index 9cdf66f2e7ad..000000000000
--- a/package/network/services/lldpd/patches/002-fix-AX_LIB_READLINE-macro-conflict.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 23509dc05b24a28fb46022800e0e271ae0118de2 Mon Sep 17 00:00:00 2001
-From: Jo-Philipp Wich <jo@mein.io>
-Date: Wed, 9 Dec 2020 12:04:04 +0100
-Subject: [PATCH] build: prevent conflict with official AX_LIB_READLINE macro
-
-On systems where the official AX_LIB_READLINE (ax_lib_readline.m4) is
-present in a globally shared autoconf include directory, auto(re)conf
-will prefer including that offical version over the local variant due
-to the offical macro having a higher serial number.
-
-As a consequence, @READLINE_LIBS@ will not be substituted in *.in files,
-eventually failing the compilation with errors similar to:
-
-    gcc: error: READLINE_LIBS@: No such file or directory
-
-Avoid this problem by renaming the incompatible local macro to
-AX_LIB_READLINE_LLDPD which is sufficient to prevent any clashes.
-
-We encountered this problem on OpenWrt which uses GNU autoconf-archive
-to provide commonly used M4 macros through a global include directory,
-which happens to ship AX_LIB_READLINE as well.
-
-Signed-off-by: Jo-Philipp Wich <jo@mein.io>
----
- configure.ac          | 2 +-
- m4/ax_lib_readline.m4 | 6 +++---
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -273,7 +273,7 @@ AC_ARG_WITH([readline],
-   [],
-   [with_readline=auto])
- if test x"$with_readline" != x"no"; then
--   AX_LIB_READLINE
-+   AX_LIB_READLINE_LLDPD
-    if test x"$with_readline" != x"check" -a x"$with_readline" != x"auto"; then
-      if test x"$ax_cv_lib_readline" = x"no"; then
-        AC_MSG_FAILURE([*** no readline support found])
---- a/m4/ax_lib_readline.m4
-+++ b/m4/ax_lib_readline.m4
-@@ -4,7 +4,7 @@
- #
- # SYNOPSIS
- #
--#   AX_LIB_READLINE
-+#   AX_LIB_READLINE_LLDPD
- #
- # DESCRIPTION
- #
-@@ -66,8 +66,8 @@
- 
- #serial 6
- 
--AU_ALIAS([VL_LIB_READLINE], [AX_LIB_READLINE])
--AC_DEFUN([AX_LIB_READLINE], [
-+AU_ALIAS([VL_LIB_READLINE], [AX_LIB_READLINE_LLDPD])
-+AC_DEFUN([AX_LIB_READLINE_LLDPD], [
-   AC_CACHE_CHECK([for a readline compatible library],
-                  ax_cv_lib_readline, [
-     _save_LIBS="$LIBS"