diff --git a/net-mgmt/lldpd/Makefile b/net-mgmt/lldpd/Makefile index 27f8394569db..c7c2a92de72b 100644 --- a/net-mgmt/lldpd/Makefile +++ b/net-mgmt/lldpd/Makefile @@ -1,11 +1,11 @@ PORTNAME= lldpd -PORTVERSION= 1.0.14 -PORTREVISION= 1 +DISTVERSION= 1.0.18 CATEGORIES= net-mgmt -MASTER_SITES= http://media.luffy.cx/files/${PORTNAME}/ +MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${DISTVERSION}/ \ + https://media.luffy.cx/files/${PORTNAME}/ -MAINTAINER= freebsd@simweb.ch -COMMENT= LLDP (802.1ab)/CDP/EDP/SONMP/FDP daemon and SNMP subagent +MAINTAINER= john@saltant.com +COMMENT= Link-Layer Discovery Protocol (LLDP 802.1ab) daemon WWW= https://lldpd.github.io/ LICENSE= ISCL @@ -13,68 +13,64 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libevent.so:devel/libevent -USES= cpe libtool +FLAVORS= default tiny +FLAVOR?= ${FLAVORS:[1]} +tiny_PKGNAMESUFFIX= -tiny + +USES= autoreconf cpe libtool pkgconfig CPE_VENDOR= ${PORTNAME}_project -USE_CSTD= gnu99 USE_LDCONFIG= yes -USE_RC_SUBR= ${PORTNAME} + +CONFLICTS_INSTALL= ${FLAVORS:N${FLAVOR}:S/^/${PORTNAME}-/} +EXTRACT_AFTER_ARGS= --exclude ${DISTNAME}/libevent \ + --no-same-owner --no-same-permissions + GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share +USE_CSTD= c99 +USE_RC_SUBR= ${PORTNAME} +USERS= _lldpd +GROUPS= _lldpd + +INSTALL_TARGET= install-strip + +.if ${FLAVOR:U} == tiny +OPTIONS_EXCLUDE= ${OPTIONS_DEFINE} +.endif + 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 -INSTALL_TARGET= install-strip - -USERS= _lldpd -GROUPS= _lldpd - -FLAVORS= default tiny + --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \ + --without-embedded-libevent -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 -# 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 -OPTIONS_EXCLUDE_armv6= DTRACE -OPTIONS_EXCLUDE_armv7= DTRACE +OPTIONS_DEFINE= BASH DOCS PIE PROPRIETARY READLINE SNMP XML ZSH +OPTIONS_DEFAULT=BASH PROPRIETARY SNMP XML ZSH 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 + SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp SNMP_USES= ssl +SNMP_LDFLAGS= -Wl,--as-needed 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 index 4b0b01c8fbbc..8969b0b93699 100644 --- 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 index 069583854e20..9310f0b3275b 100644 --- a/net-mgmt/lldpd/files/README.bsd +++ b/net-mgmt/lldpd/files/README.bsd @@ -14,12 +14,5 @@ Short examples: * 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 , Tue, 06 Oct 2015 13:20:00 +02:00 diff --git a/net-mgmt/lldpd/files/patch-Makefile.am b/net-mgmt/lldpd/files/patch-Makefile.am new file mode 100644 index 000000000000..7ed491c9f38d --- /dev/null +++ b/net-mgmt/lldpd/files/patch-Makefile.am @@ -0,0 +1,45 @@ +--- Makefile.am.orig 2022-03-12 13:07:18 UTC ++++ Makefile.am +@@ -4,7 +4,7 @@ EXTRA_DIST = $(DX_CONFIG) include get-version autoge + + SUBDIRS = src/compat src src/daemon src/lib src/client tests osx + EXTRA_DIST = $(DX_CONFIG) include get-version autogen.sh +-DIST_SUBDIRS = $(SUBDIRS) libevent ++DIST_SUBDIRS = $(SUBDIRS) + DISTCLEANFILES = ChangeLog + + dist_doc_DATA = README.md NEWS CONTRIBUTE.md LICENSE +@@ -12,20 +12,20 @@ ChangeLog: __force-changelog-generation + + __force-changelog-generation: + ChangeLog: __force-changelog-generation +- $(AM_V_GEN)if test -e $(top_srcdir)/.git; then \ +- prev=$$(git describe --tags --always --match '[0-9]*' 2> /dev/null) ; \ +- for tag in $$(git tag | $(EGREP) '^[0-9]+(\.[0-9]+){1,}$$' | sort -t. -k 1,1nr -k 2,2nr -k 3,3nr); do \ +- if [ x"$$prev" = x ]; then prev=$$tag ; fi ; \ +- if [ x"$$prev" = x"$$tag" ]; then continue; fi ; \ +- echo "$$prev [$$(git log --no-merges $$prev -1 --pretty=format:'%ai')]:" ; \ +- echo "" ; \ +- git log --pretty=' - [%h] %s (%an)' $$tag..$$prev ; \ +- echo "" ; \ +- prev=$$tag ; \ +- done > $@ ; \ +- else \ ++# $(AM_V_GEN)if test -e $(top_srcdir)/.git; then \ ++# prev=$$(git describe --tags --always --match '[0-9]*' 2> /dev/null) ; \ ++# for tag in $$(git tag | $(EGREP) '^[0-9]+(\.[0-9]+){1,}$$' | sort -t. -k 1,1nr -k 2,2nr -k 3,3nr); do \ ++# if [ x"$$prev" = x ]; then prev=$$tag ; fi ; \ ++# if [ x"$$prev" = x"$$tag" ]; then continue; fi ; \ ++# echo "$$prev [$$(git log --no-merges $$prev -1 --pretty=format:'%ai')]:" ; \ ++# echo "" ; \ ++# git log --pretty=' - [%h] %s (%an)' $$tag..$$prev ; \ ++# echo "" ; \ ++# prev=$$tag ; \ ++# done > $@ ; \ ++# else \ + touch $@ ; \ +- fi ++# fi + + dist-hook: + echo $(VERSION) > $(distdir)/.dist-version diff --git a/net-mgmt/lldpd/files/patch-m4_libevent.m4 b/net-mgmt/lldpd/files/patch-m4_libevent.m4 new file mode 100644 index 000000000000..7d37d0d19787 --- /dev/null +++ b/net-mgmt/lldpd/files/patch-m4_libevent.m4 @@ -0,0 +1,29 @@ +--- m4/libevent.m4.orig 2024-07-20 19:40:20 UTC ++++ m4/libevent.m4 +@@ -53,16 +53,16 @@ AC_DEFUN([lldp_CHECK_LIBEVENT], [ + fi + + # Call ./configure in libevent. Need it for make dist... +- libevent_configure_args="$libevent_configure_args --disable-libevent-regress" +- libevent_configure_args="$libevent_configure_args --disable-thread-support" +- libevent_configure_args="$libevent_configure_args --disable-openssl" +- libevent_configure_args="$libevent_configure_args --disable-malloc-replacement" +- libevent_configure_args="$libevent_configure_args --disable-debug-mode" +- libevent_configure_args="$libevent_configure_args --enable-function-sections" +- libevent_configure_args="$libevent_configure_args --disable-shared" +- libevent_configure_args="$libevent_configure_args --with-pic" +- libevent_configure_args="$libevent_configure_args --enable-static" +- lldp_CONFIG_SUBDIRS([libevent], [$libevent_configure_args]) ++ #libevent_configure_args="$libevent_configure_args --disable-libevent-regress" ++ #libevent_configure_args="$libevent_configure_args --disable-thread-support" ++ #libevent_configure_args="$libevent_configure_args --disable-openssl" ++ #libevent_configure_args="$libevent_configure_args --disable-malloc-replacement" ++ #libevent_configure_args="$libevent_configure_args --disable-debug-mode" ++ #libevent_configure_args="$libevent_configure_args --enable-function-sections" ++ #libevent_configure_args="$libevent_configure_args --disable-shared" ++ #libevent_configure_args="$libevent_configure_args --with-pic" ++ #libevent_configure_args="$libevent_configure_args --enable-static" ++ #lldp_CONFIG_SUBDIRS([libevent], [$libevent_configure_args]) + + AM_CONDITIONAL([LIBEVENT_EMBEDDED], [test x"$LIBEVENT_EMBEDDED" != x]) + AC_SUBST([libevent_LIBS]) diff --git a/net-mgmt/lldpd/pkg-plist b/net-mgmt/lldpd/pkg-plist index 00af41872d22..8b80edcb75ef 100644 --- a/net-mgmt/lldpd/pkg-plist +++ b/net-mgmt/lldpd/pkg-plist @@ -20,3 +20,4 @@ sbin/lldpd %%PORTDOCS%%%%DOCSDIR%%/README.bsd %%PORTDOCS%%%%DOCSDIR%%/README.md %%ZSH%%share/zsh/site-functions/_lldpcli +@dir(_llpd,_lldpd,750) /var/run/lldpd