From: Stijn Tintel <stijn@linux-ipv6.be>
Date: Thu, 20 Feb 2020 21:39:06 +0000 (+0200)
Subject: lldpd: bump to 1.0.5
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=a9b5473c92c01bce9b5f42659b0271bd141e3428;p=openwrt%2Fstaging%2Fstintel.git

lldpd: bump to 1.0.5

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

diff --git a/package/network/services/lldpd/Makefile b/package/network/services/lldpd/Makefile
index eb1fe6539d..48a3993492 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.3
-PKG_RELEASE:=2
+PKG_VERSION:=1.0.5
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://media.luffy.cx/files/lldpd
-PKG_HASH:=39fced395168015416bfe78b95414facf066f841f349024433aa20ab54e4c360
+PKG_HASH:=2dd3b212f4dbabfcbb2794c0010b245f9f8e74b387984e757be6243a74c6cb99
 
 PKG_MAINTAINER:=Stijn Tintel <stijn@linux-ipv6.be>
 PKG_LICENSE:=ISC
diff --git a/package/network/services/lldpd/patches/001-disable_libcap.patch b/package/network/services/lldpd/patches/001-disable_libcap.patch
index 9b03d84381..96cf00a653 100644
--- a/package/network/services/lldpd/patches/001-disable_libcap.patch
+++ b/package/network/services/lldpd/patches/001-disable_libcap.patch
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -244,7 +244,13 @@ PKG_CHECK_MODULES([check], [check >= 0.9
+@@ -246,7 +246,13 @@ PKG_CHECK_MODULES([check], [check >= 0.9
  
  # Third-party libraries
  lldp_CHECK_LIBEVENT
diff --git a/package/network/services/lldpd/patches/010-limits.patch b/package/network/services/lldpd/patches/010-limits.patch
deleted file mode 100644
index 1672145384..0000000000
--- a/package/network/services/lldpd/patches/010-limits.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From b2eebb31fc21b5ce12ef8944b50088119f1b9427 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Mon, 25 Mar 2019 18:43:03 +0100
-Subject: [PATCH] priv: include limits.h for PATH_MAX
-
----
- src/daemon/priv.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/src/daemon/priv.c
-+++ b/src/daemon/priv.c
-@@ -27,6 +27,7 @@
- #include <unistd.h>
- #include <signal.h>
- #include <errno.h>
-+#include <limits.h>
- #include <sys/wait.h>
- #include <sys/stat.h>
- #include <sys/socket.h>