From cde9e9f35761ee71b2a6efa07de4d52918684002 Mon Sep 17 00:00:00 2001
From: hgy59 <hpgy59@gmail.com>
Date: Mon, 25 Nov 2024 21:49:56 +0100
Subject: [PATCH] update lldpd

- update lldpd to v1.0.18
- remove obsolete privilege and PLIST file
- enable all built in protocols
- build binaries into bin folder (instead of sbin)
- use quadratic shape for logo
- use group synocommunity (for DSM 7 compatibility)
- user SERVICE_USER = auto (other values are not supported)
---
 cross/lldpd/Makefile           |  20 +++++++++++++++-----
 cross/lldpd/PLIST              |   9 +++++----
 cross/lldpd/digests            |   6 +++---
 spk/lldpd/Makefile             |  22 +++++++---------------
 spk/lldpd/PLIST                |   0
 spk/lldpd/src/conf/privilege   |  31 -------------------------------
 spk/lldpd/src/lldpd.png        | Bin 1809 -> 9728 bytes
 spk/lldpd/src/service-setup.sh |   8 +++++---
 8 files changed, 35 insertions(+), 61 deletions(-)
 delete mode 100644 spk/lldpd/PLIST
 delete mode 100644 spk/lldpd/src/conf/privilege

diff --git a/cross/lldpd/Makefile b/cross/lldpd/Makefile
index 73e254d71de..21c53e9828c 100644
--- a/cross/lldpd/Makefile
+++ b/cross/lldpd/Makefile
@@ -1,16 +1,26 @@
 PKG_NAME = lldpd
-PKG_VERS = 1.0.10
+PKG_VERS = 1.0.18
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
-PKG_DIST_SITE = https://media.luffy.cx/files/lldpd
+PKG_DIST_SITE = https://github.com/lldpd/lldpd/releases/download/$(PKG_VERS)
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
-DEPENDS = 
+DEPENDS = cross/libcap cross/libxml2 cross/readline
 
 HOMEPAGE = https://lldpd.github.io
-COMMENT  = lldpd is a 802.1AB implementation (LLDP) to help you locate neighbors of all your equipments
+COMMENT  = lldpd is a 802.1AB implementation (LLDP) to help you locate neighbors of all your equipments.
 LICENSE  = ISC
 
 GNU_CONFIGURE = 1
-CONFIGURE_ARGS = --enable-privsep --disable-cdp --disable-fdp --disable-edp --disable-sonmp --with-privsep-user=sc-lldpd --with-privsep-group=lldpd
+CONFIGURE_ARGS  = --disable-static
+CONFIGURE_ARGS += --disable-doxygen-doc --disable-doxygen-html --disable-doxygen-pdf
+CONFIGURE_ARGS += --with-readline
+# build service and cli tools into bin instead of sbin folder
+CONFIGURE_ARGS += --sbindir=$(INSTALL_PREFIX)/bin
+# Enable Privilege separation and specify user:group as sc-lldpd:synocommunity
+CONFIGURE_ARGS += --enable-privsep --with-privsep-user=sc-lldpd --with-privsep-group=synocommunity
+CONFIGURE_ARGS += --runstatedir=$(INSTALL_PREFIX_VAR)
+
+ADDITIONAL_CFLAGS = -O2
+
 include ../../mk/spksrc.cross-cc.mk
diff --git a/cross/lldpd/PLIST b/cross/lldpd/PLIST
index e320f985645..6d9d8d78c29 100644
--- a/cross/lldpd/PLIST
+++ b/cross/lldpd/PLIST
@@ -1,5 +1,6 @@
+bin:bin/lldpcli
+lnk:bin/lldpctl
+bin:bin/lldpd
+lnk:lib/liblldpctl.so
 lnk:lib/liblldpctl.so.4
-lib:lib/liblldpctl.so.4.9.0
-bin:sbin/lldpcli
-bin:sbin/lldpctl
-bin:sbin/lldpd
+lib:lib/liblldpctl.so.4.9.1
diff --git a/cross/lldpd/digests b/cross/lldpd/digests
index b6b2f16b79e..5e94976202d 100644
--- a/cross/lldpd/digests
+++ b/cross/lldpd/digests
@@ -1,3 +1,3 @@
-lldpd-1.0.10.tar.gz SHA1 feb556445811c61df81d3dfe8818cda59a371247
-lldpd-1.0.10.tar.gz SHA256 445b2d76037ef3ebd03d40e1fc1f29ef08102faa3a09fe846b952797c8bc7722
-lldpd-1.0.10.tar.gz MD5 233e9a2e12d319bc362cba2ed74076b4
+lldpd-1.0.18.tar.gz SHA1 49d21ad64809d146930977d7327d3c4ada4d0549
+lldpd-1.0.18.tar.gz SHA256 38cd319aa02ab61d9a2ad130e22f906795ccca9ac73a0a0d9dac19ca99a8a870
+lldpd-1.0.18.tar.gz MD5 53e8db980c97197547fd3fe9ed2e6d50
diff --git a/spk/lldpd/Makefile b/spk/lldpd/Makefile
index ca4c9ebac39..58745f0c568 100644
--- a/spk/lldpd/Makefile
+++ b/spk/lldpd/Makefile
@@ -1,31 +1,23 @@
 SPK_NAME = lldpd
-SPK_VERS = 1.0.10
+SPK_VERS = 1.0.18
 SPK_REV = 1
 SPK_ICON = src/lldpd.png
 
-DEPENDS = cross/$(SPK_NAME)
+DEPENDS = cross/lldpd
 
 MAINTAINER = SynoCommunity
-DESCRIPTION = LLDP (Link Layer Discovery Protocol) is an industry standard protocol designed to supplant proprietary Link-Layer protocols such as Extreme's EDP (Extreme Discovery Protocol) and CDP (Cisco Discovery Protocol). The goal of LLDP is to provide an inter-vendor compatible mechanism to deliver Link-Layer notifications to adjacent network devices.
+DESCRIPTION = LLDP \(Link Layer Discovery Protocol\) is an industry standard protocol designed to supplant proprietary Link-Layer protocols such as Extreme's EDP \(Extreme Discovery Protocol\) and CDP \(Cisco Discovery Protocol\). The goal of LLDP is to provide an inter-vendor compatible mechanism to deliver Link-Layer notifications to adjacent network devices.
 DISPLAY_NAME = lldpd
-CHANGELOG = "Initial release"
+CHANGELOG = "Initial package release."
 
 HOMEPAGE = https://lldpd.github.io
 LICENSE  = ISC
 
-CONF_DIR = src/conf
-SERVICE_USER = sc-lldpd
-STARTABLE  = yes
-
-POST_STRIP_TARGET = lldpd_extra_install
+SERVICE_USER = auto
+STARTABLE = yes
 
 SERVICE_SETUP = src/service-setup.sh
 
-SPK_COMMANDS = sbin/lldpcli sbin/lldpctl
+SPK_COMMANDS = bin/lldpcli bin/lldpctl
 
 include ../../mk/spksrc.spk.mk
-
-.PHONY: lldpd_extra_install
-lldpd_extra_install:
-	install -m 755 -d $(STAGING_DIR)/var
-	install -m 755 -d $(STAGING_DIR)/var/run
diff --git a/spk/lldpd/PLIST b/spk/lldpd/PLIST
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/spk/lldpd/src/conf/privilege b/spk/lldpd/src/conf/privilege
deleted file mode 100644
index dc14bf2e726..00000000000
--- a/spk/lldpd/src/conf/privilege
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-	"defaults":{
-		"run-as": "package"
-	},
-	"username": "sc-lldpd",
-	"ctrl-script": [{
-		"action": "preinst",
-		"run-as": "root"
-	}, {
-		"action": "postinst",
-		"run-as": "root"
-	}, {
-		"action": "preuninst",
-		"run-as": "root"
-	}, {
-		"action": "postuninst",
-		"run-as": "root"
-	}, {
-		"action": "preupgrade",
-		"run-as": "root"
-	}, {
-		"action": "postupgrade",
-		"run-as": "root"
-	}, {
-		"action": "start",
-		"run-as": "root"
-	}, {
-		"action": "stop",
-		"run-as": "root"
-	}]
-}
diff --git a/spk/lldpd/src/lldpd.png b/spk/lldpd/src/lldpd.png
index 106a60f735aacf06e3aab8c9b46ee09fcc6797ca..0582c26118f0671956d19df48c21a04342d7e709 100644
GIT binary patch
literal 9728
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

literal 1809
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

diff --git a/spk/lldpd/src/service-setup.sh b/spk/lldpd/src/service-setup.sh
index 9d31211e5be..609c7fc9231 100644
--- a/spk/lldpd/src/service-setup.sh
+++ b/spk/lldpd/src/service-setup.sh
@@ -1,3 +1,5 @@
-PATH="${SYNOPKG_PKGDEST}/bin:${PATH}"
-LLDPD="${SYNOPKG_PKGDEST}/sbin/lldpd"
-SERVICE_COMMAND="${LLDPD} -p ${PID_FILE}"
+
+# required for DSM < 7 only:
+GROUP=synocommunity
+
+SERVICE_COMMAND="${SYNOPKG_PKGDEST}/bin/lldpd -p ${PID_FILE}"