Re: Patch to update lldpd to 1.0.1

[Patrick Welche <prlw1%cam.ac.uk@localhost>]

On Fri, Aug 03, 2018 at 09:10:06PM +0100, Mike Pumford wrote:
> This patch actually makes lldpd function on NetBSD as this version includes
> an upstream fix that stops the daemon hanging at boot.
> 
> Output from the system where I tested it against a Netgear managed switch:
> #lldpcli show neighbors details
> -------------------------------------------------------------------------------
> LLDP neighbors:
> -------------------------------------------------------------------------------
> Interface:    wm0, via: LLDP, RID: 1, Time: 0 day, 00:07:48
>   Chassis:
>     ChassisID:    mac 10:da:43:20:3b:25
>     MgmtIP:       192.168.1.254
>   Port:
>     PortID:       local g8
>     TTL:          120
> #
> 
> I'll raise a PR with the patch if that makes it easier to get integrated.
> 
> I'm also planing on bringing jansson up to date (its a dependency of lldpd)
> which should get rid of the security warning against the current 2.7
> version.

What do you think of this very slightly different version (just fiddled
the examples directory)?

Cheers,

Patrick

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/lldpd/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- Makefile	2 Feb 2018 13:55:04 -0000	1.19
+++ Makefile	7 Aug 2018 16:13:29 -0000
@@ -1,7 +1,6 @@
 # $NetBSD: Makefile,v 1.19 2018/02/02 13:55:04 jperkin Exp $
 
-DISTNAME=		lldpd-0.7.15
-PKGREVISION=		4
+DISTNAME=		lldpd-1.0.1
 CATEGORIES=		net
 MASTER_SITES=		http://media.luffy.cx/files/lldpd/
 
@@ -27,10 +26,8 @@
 CONFIGURE_ARGS+=       --localstatedir=${VARBASE}
 BUILD_DEFS+=		VARBASE
 
-CONF_FILES=		${EXAMPLE_DIR}/README.conf etc/lldpd.d/README.conf
-CONF_FILES+=		${EXAMPLE_DIR}/lldpcli.bash-completion \
-	         etc/bash_completion.d/lldpcli.bash-completion
-EXAMPLE_DIR=		${PREFIX}/share/${PKGBASE}/conf
+EGDIR=			${PREFIX}/share/examples/${PKGBASE}
+CONF_FILES=		${EGDIR}/README.conf ${PKG_SYSCONFDIR}/lldpd.d/README.conf
 
 #  CCLD     lldpd
 #  ld: cannot find -lperl
@@ -46,14 +43,12 @@
 TEST_TARGET=		check
 
 INSTALLATION_DIRS+=	sbin ${PKGMANDIR}/man5 ${PKGMANDIR}/man8
-INSTALLATION_DIRS+=	share/${PKGBASE}/conf
+INSTALLATION_DIRS+=	${EGDIR}
 
 .include "options.mk"
 
 post-install:
-.for i in etc/lldpd.d/README.conf etc/bash_completion.d/lldpcli.bash-completion
-	 ${MV} ${DESTDIR}${PREFIX}/${i} ${DESTDIR}${EXAMPLE_DIR}
-.endfor
+	${MV} ${DESTDIR}${PREFIX}/etc/lldpd.d/README.conf ${DESTDIR}${EGDIR}
 
 BUILDLINK_API_DEPENDS.libevent+=	libevent>=2.0.5
 .include "../../devel/libevent/buildlink3.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/net/lldpd/PLIST,v
retrieving revision 1.5
diff -u -r1.5 PLIST
--- PLIST	13 Dec 2014 14:14:49 -0000	1.5
+++ PLIST	7 Aug 2018 16:13:29 -0000
@@ -9,10 +9,11 @@
 sbin/lldpcli
 sbin/lldpctl
 sbin/lldpd
+share/bash-completion/completions/lldpcli
 share/doc/lldpd/CONTRIBUTE.md
 share/doc/lldpd/ChangeLog
+share/doc/lldpd/LICENSE
 share/doc/lldpd/NEWS
 share/doc/lldpd/README.md
-share/lldpd/conf/README.conf
-share/lldpd/conf/lldpcli.bash-completion
-share/zsh/vendor-completions/_lldpcli
+share/examples/lldpd/README.conf
+share/zsh/site-functions/_lldpcli
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/net/lldpd/distinfo,v
retrieving revision 1.12
diff -u -r1.12 distinfo
--- distinfo	4 Nov 2015 00:35:10 -0000	1.12
+++ distinfo	7 Aug 2018 16:13:29 -0000
@@ -1,6 +1,6 @@
 $NetBSD: distinfo,v 1.12 2015/11/04 00:35:10 agc Exp $
 
-SHA1 (lldpd-0.7.15.tar.gz) = 59044b44e449610b150fe5f82688e3685fe06b58
-RMD160 (lldpd-0.7.15.tar.gz) = 8a099b3da799e3b4d06c2bea032dc974bf417400
-SHA512 (lldpd-0.7.15.tar.gz) = cd1a897c364aed953ed737827018accfb7d6cfba32606e3843d52a81a85694fa947cbe5385b5c703ba6a80edc620a402d419ecba196bbae24beef28b2c943016
-Size (lldpd-0.7.15.tar.gz) = 1529127 bytes
+SHA1 (lldpd-1.0.1.tar.gz) = ffae3bd667f7edae300b0c63a5f0103eb8c1118f
+RMD160 (lldpd-1.0.1.tar.gz) = df4ad2ff8badda0cfef602090be5d2e1a80453b4
+SHA512 (lldpd-1.0.1.tar.gz) = 61b2a7a3a78276c613c6d0b34eb625e69e5c8a206b6658a167d6a09ac6d0e1c943e46c0ff6fc3538a791d9947f193185b65848da581b3d6ecb9bc0befadde8dd
+Size (lldpd-1.0.1.tar.gz) = 1590903 bytes