Page MenuHomeFreeBSD

D45168.diff
No OneTemporary

D45168.diff

diff --git a/net-mgmt/lldpd/Makefile b/net-mgmt/lldpd/Makefile
--- a/net-mgmt/lldpd/Makefile
+++ b/net-mgmt/lldpd/Makefile
@@ -1,11 +1,10 @@
PORTNAME= lldpd
-PORTVERSION= 1.0.14
-PORTREVISION= 1
+PORTVERSION= 1.0.18
CATEGORIES= net-mgmt
MASTER_SITES= http://media.luffy.cx/files/${PORTNAME}/
MAINTAINER= freebsd@simweb.ch
-COMMENT= LLDP (802.1ab)/CDP/EDP/SONMP/FDP daemon and SNMP subagent
+COMMENT= Link-Layer Discovery Protocol (LLDP 802.1ab) daemon
WWW= https://lldpd.github.io/
LICENSE= ISCL
@@ -13,7 +12,10 @@
LIB_DEPENDS= libevent.so:devel/libevent
-USES= cpe libtool
+FLAVORS= default tiny
+tiny_PKGNAMESUFFIX= -tiny
+
+USES= cpe libtool pkgconfig
CPE_VENDOR= ${PORTNAME}_project
USE_CSTD= gnu99
USE_LDCONFIG= yes
@@ -23,7 +25,7 @@
CONFIGURE_ARGS= --disable-doxygen-doc \
--enable-hardening \
--enable-privsep \
- --with-privsep-chroot=/var/empty \
+ --with-privsep-chroot=/var/run/lldpd \
--with-lldpd-ctl-socket=/var/run/lldpd.socket \
--with-lldpd-pid-file=/var/run/lldpd.pid \
--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
@@ -32,12 +34,10 @@
USERS= _lldpd
GROUPS= _lldpd
-FLAVORS= default tiny
-
-CONFLICTS_INSTALL= ${FLAVORS:N${FLAVOR}:S/^/${PORTNAME}-/}
+CONFLICTS_INSTALL= ${FLAVORS:N${FLAVOR}:S/^/${PORTNAME}-/}
-OPTIONS_DEFINE= BASH DOCS DTRACE JSON PIE PROPRIETARY READLINE SNMP XML ZSH
-OPTIONS_DEFAULT= BASH JSON PROPRIETARY SNMP XML ZSH
+OPTIONS_DEFINE= BASH DOCS DTRACE PIE PROPRIETARY READLINE SNMP XML ZSH
+OPTIONS_DEFAULT= BASH PROPRIETARY SNMP XML ZSH
# ld(1) fails to link probes: Relocations in generic ELF (EM: 0)
OPTIONS_EXCLUDE_aarch64= DTRACE
# dt_modtext:opensolaris/lib/libdtrace/common/dt_link.c: arm not implemented
@@ -46,22 +46,16 @@
OPTIONS_SUB= yes
.if ${FLAVOR:U} == tiny
-PKGNAMESUFFIX= -tiny
-COMMENT= LLDP (802.1ab) daemon
OPTIONS_DEFAULT:=
.endif
DTRACE_DESC= DTrace support (BROKEN)
-JSON_DESC= JSON output support
PIE_DESC= Build PIE (position independant executables)
PROPRIETARY_DESC= Support proprietary protocols (CDP/EDP/FDP/SONMP)
-SNMP_DESC= Enable the use of SNMP
+SNMP_DESC= Enable SNMP sub-agent (AgentX)
XML_DESC= XML output support
DTRACE_CONFIGURE_ENABLE= dtrace
-JSON_LIB_DEPENDS= libjansson.so:devel/jansson
-JSON_USES= pkgconfig
-JSON_CONFIGURE_WITH= json
PIE_CONFIGURE_ENABLE= pie
PROPRIETARY_CONFIGURE_ENABLE= cdp edp fdp sonmp
READLINE_CONFIGURE_WITH= readline
@@ -69,12 +63,10 @@
SNMP_USES= ssl
SNMP_CONFIGURE_WITH= snmp
XML_LIB_DEPENDS= libxml2.so:textproc/libxml2
-# libedit needed in combination of READLINE and XML
-XML_USES= libedit
XML_CONFIGURE_WITH= xml
-post-patch:
- @${REINPLACE_CMD} -e 's|/etc|${PREFIX}|g' ${WRKSRC}/src/daemon/lldpd.8.in
+post-install:
+ ${MKDIR} ${STAGEDIR}/var/run/lldpd
post-install-DOCS-on:
${INSTALL_DATA} ${FILESDIR}/README.bsd ${STAGEDIR}${DOCSDIR}
diff --git a/net-mgmt/lldpd/distinfo b/net-mgmt/lldpd/distinfo
--- a/net-mgmt/lldpd/distinfo
+++ b/net-mgmt/lldpd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1653940567
-SHA256 (lldpd-1.0.14.tar.gz) = a74819214f116a5dbc407a3d490caa01ba401a249517ac826a374059c12d12e8
-SIZE (lldpd-1.0.14.tar.gz) = 1979314
+TIMESTAMP = 1715532062
+SHA256 (lldpd-1.0.18.tar.gz) = 4b320675d608901a4a0d4feff8f96bb846d4913d914b0cf75b7d0ae80490f2f7
+SIZE (lldpd-1.0.18.tar.gz) = 1988753
diff --git a/net-mgmt/lldpd/files/README.bsd b/net-mgmt/lldpd/files/README.bsd
--- a/net-mgmt/lldpd/files/README.bsd
+++ b/net-mgmt/lldpd/files/README.bsd
@@ -14,12 +14,5 @@
* Listen on all interfaces, except em0:
lldpd_flags="-I *,!em0"
-A whitelisted interface beats a blacklisted interface which beats a simple
+An allowlisted interface beats a blocklisted interface which beats a simple
matched interface. See lldpd(8), which contains the complete documentation.
-
-## Compatibility
-
-This port should work equally well on both FreeBSD and DragonFly BSD, though
-the later might be a bit less regularly tested.
-
--- Mathieu Simon <freebsd@simweb.ch>, Tue, 06 Oct 2015 13:20:00 +02:00
diff --git a/net-mgmt/lldpd/pkg-plist b/net-mgmt/lldpd/pkg-plist
--- a/net-mgmt/lldpd/pkg-plist
+++ b/net-mgmt/lldpd/pkg-plist
@@ -20,3 +20,4 @@
%%PORTDOCS%%%%DOCSDIR%%/README.bsd
%%PORTDOCS%%%%DOCSDIR%%/README.md
%%ZSH%%share/zsh/site-functions/_lldpcli
+@dir(_llpd,_lldpd,750) /var/run/lldpd

File Metadata

Mime Type
text/plain
Expires
Fri, Jan 24, 6:58 AM (17 h, 29 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16080556
Default Alt Text
D45168.diff (4 KB)

Event Timeline