From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 30 Sep 2018 22:01:50 +0000 (+0200)
Subject: lldpd: Update to 1.0.1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa279d21426a907aaa229d13f00b43bbd75ff5f0;p=ipfire-3.x.git

lldpd: Update to 1.0.1

This also disables sending the kernel release over
the wire and will only announce the release version
of the distribution.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/lldpd/lldpd.nm b/lldpd/lldpd.nm
index b315be38d..20542cb50 100644
--- a/lldpd/lldpd.nm
+++ b/lldpd/lldpd.nm
@@ -4,25 +4,23 @@
 ###############################################################################
 
 name       = lldpd
-version    = 0.9.7
+version    = 1.0.1
 release    = 1
 
 groups     = Networking/Tools
 url        = http://vincentbernat.github.com/lldpd/
-license    = GPL
-summary    = Utilities for the Link Layer Discovery Protocol.
+license    = ISC
+summary    = Utilities for the Link Layer Discovery Protocol
 
 description
 	The LLDPD project aims to provide a comprehensive implementation of
 	the IEEE standard 802.1AB Link Layer Discovery Protocol.
 end
 
-source_dl = https://github.com/vincentbernat/lldpd/archive/%{version}.tar.gz#/
+source_dl = https://media.luffy.cx/files/lldpd/
 
 build
 	requires
-		autoconf
-		automake
 		libevent-devel
 		libxml2-devel
 		pkg-config
@@ -39,8 +37,6 @@ build
 
 	prepare_cmds
 		%{create_user}
-
-		./autogen.sh
 	end
 
 	install_cmds
diff --git a/lldpd/systemd/lldpd.service b/lldpd/systemd/lldpd.service
index fed63a575..932da0673 100644
--- a/lldpd/systemd/lldpd.service
+++ b/lldpd/systemd/lldpd.service
@@ -3,9 +3,7 @@ Description=Link Layer Discovery Protocol Daemon
 After=network.target
 
 [Service]
-RemainAfterExit=yes
-ExecStartPre=/sbin/modprobe 8021q
-ExecStart=/usr/sbin/lldpd -d -c
+ExecStart=/usr/sbin/lldpd -d -k
 Restart=on-failure
 
 [Install]