lldpd: bump to 1.0.3

This commit is contained in:
CN_SZTL 2020-01-15 02:11:07 +08:00
parent 70d9ab2cdc
commit f152def3ad
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
3 changed files with 43 additions and 10 deletions

View File

@ -8,17 +8,18 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=lldpd
PKG_VERSION:=1.0.1
PKG_VERSION:=1.0.3
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://media.luffy.cx/files/lldpd
PKG_HASH:=450b622aac7ae1758f1ef82f3b7b94ec47f2ff33abfb0e6ac82555b9ee55f151
PKG_HASH:=39fced395168015416bfe78b95414facf066f841f349024433aa20ab54e4c360
PKG_MAINTAINER:=Stijn Tintel <stijn@linux-ipv6.be>
PKG_LICENSE:=ISC
PKG_FIXUP:=autoreconf
PKG_BUILD_PARALLEL:=1
PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
@ -95,6 +96,7 @@ CONFIGURE_ARGS += \
--with-embedded-libevent=no \
--disable-hardening \
--without-xml \
--disable-doxygen-doc \
--sysconfdir=/tmp \
$(if $(CONFIG_LLDPD_WITH_CDP),,--disable-cdp) \
$(if $(CONFIG_LLDPD_WITH_FDP),,--disable-fdp) \
@ -104,13 +106,8 @@ CONFIGURE_ARGS += \
$(if $(CONFIG_LLDPD_WITH_DOT3),,--disable-dot3) \
$(if $(CONFIG_LLDPD_WITH_CUSTOM),,--disable-custom) \
$(if $(CONFIG_LLDPD_WITH_SONMP),,--disable-sonmp) \
$(if $(CONFIG_LLDPD_WITH_JSON),--with-json=json-c,--with-json=no) \
$(if $(CONFIG_LLDPD_WITH_SNMP),--with-snmp,)
# there is no flag to disable libbsd
CONFIGURE_VARS += \
$(if $(CONFIG_USE_GLIBC),,libbsd_CFLAGS=-ldo-not-link-bsd) \
$(if $(CONFIG_USE_GLIBC),,libbsd_LDFLAGS=-ldo-not-link-bsd) \
$(if $(CONFIG_USE_GLIBC),,libbsd_LIBS="-lNONexistent")
$(if $(CONFIG_LLDPD_WITH_JSON),--enable-json0,) \
$(if $(CONFIG_LLDPD_WITH_SNMP),--with-snmp,) \
$(if $(CONFIG_USE_GLIBC),,--without-libbsd)
$(eval $(call BuildPackage,lldpd))

View File

@ -0,0 +1,17 @@
--- a/configure.ac
+++ b/configure.ac
@@ -244,7 +244,13 @@ PKG_CHECK_MODULES([check], [check >= 0.9
# Third-party libraries
lldp_CHECK_LIBEVENT
-lldp_CHECK_LIBCAP
+
+#libcap is not a core package so disable this capability
+#lldp_CHECK_LIBCAP
+libcap_LIBS=
+libcap_CFLAGS=
+AC_SUBST([libcap_LIBS])
+AC_SUBST([libcap_CFLAGS])
# Compatibility with pkg.m4 < 0.27
m4_ifdef([PKG_INSTALLDIR], [PKG_INSTALLDIR],

View File

@ -0,0 +1,19 @@
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>