[ptxdist] [PATCH v2] lldpd: bump version to 0.7.19

[ptxdist] [PATCH v2] lldpd: bump version to 0.7.19

[Clemens Gruber]

Update lldpd to 0.7.19
Add an option for JSON output format and custom TLV support
Update minimum kernel version in LLDP_OLDIES

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 rules/lldpd.in   | 12 +++++++++++-
 rules/lldpd.make |  6 ++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/rules/lldpd.in b/rules/lldpd.in
index c4b4434..950ba7f 100644
--- a/rules/lldpd.in
+++ b/rules/lldpd.in
@@ -7,6 +7,7 @@ menuconfig LLDPD
 	select LIBEVENT
 	select NET_SNMP if LLDPD_SNMP
 	select NET_SNMP_MIB_MODULES_AGENTX if LLDPD_SNMP
+	select JSON_C if LLDPD_JSON
 	select LIBXML2 if LLDPD_XML
 	select BUSYBOX_START_STOP_DAEMON if LLDPD_STARTSCRIPT
 	select BUSYBOX_FEATURE_START_STOP_DAEMON_LONG_OPTIONS if LLDPD_STARTSCRIPT
@@ -66,14 +67,23 @@ config LLDPD_DOT3
 	prompt "Enable Dot3 extension (PHY stuff)"
 	default y
 
+config LLDPD_CUSTOM_TLV
+	bool
+	prompt "Enable Custom TLV support"
+	default y
+
 config LLDPD_OLDIES
 	bool
-	prompt "Enable compatibility with Linux kernel older than 2.6.18"
+	prompt "Enable compatibility with Linux kernel older than 2.6.32"
 
 config LLDPD_SNMP
 	bool
 	prompt "Enable the use of SNMP"
 
+config LLDPD_JSON
+	bool
+	prompt "Enable JSON output via json-c"
+
 config LLDPD_XML
 	bool
 	prompt "Enable XML output via libxml2"
diff --git a/rules/lldpd.make b/rules/lldpd.make
index 37ba590..f2c10c7 100644
--- a/rules/lldpd.make
+++ b/rules/lldpd.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LLDPD) += lldpd
 #
 # Paths and names
 #
-LLDPD_VERSION	:= 0.7.6
-LLDPD_MD5		:= dbd90a68b91448dcb94a4a77c5d8ef65
+LLDPD_VERSION	:= 0.7.19
+LLDPD_MD5		:= 4e924420e00ccd5dc289506f43221820
 LLDPD			:= lldpd-$(LLDPD_VERSION)
 LLDPD_SUFFIX	:= tar.gz
 LLDPD_URL		:= http://media.luffy.cx/files/lldpd//$(LLDPD).$(LLDPD_SUFFIX)
@@ -40,8 +40,10 @@ LLDPD_CONF_OPT	:= $(CROSS_AUTOCONF_USR) \
 	--$(call ptx/endis, PTXCONF_LLDPD_LLDPMED)-lldpmed \
 	--$(call ptx/endis, PTXCONF_LLDPD_DOT1)-dot1 \
 	--$(call ptx/endis, PTXCONF_LLDPD_DOT3)-dot3 \
+	--$(call ptx/endis, PTXCONF_LLDPD_CUSTOM_TLV)-custom \
 	--$(call ptx/endis, PTXCONF_LLDPD_OLDIES)-oldies \
 	--$(call ptx/wwo, PTXCONF_LLDPD_SNMP)-snmp \
+	--$(call ptx/wwo, PTXCONF_LLDPD_JSON)-json \
 	--$(call ptx/wwo, PTXCONF_LLDPD_XML)-xml \
 	--with-privsep-user="$(PTXCONF_LLDPD_PRIVSEP_USER)" \
 	--with-privsep-group="$(PTXCONF_LLDPD_PRIVSEP_GROUP)" \
-- 
2.6.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de