pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/net/lldpd
Module Name: pkgsrc
Committed By: hauke
Date: Thu Jun 18 19:40:33 UTC 2020
Modified Files:
pkgsrc/net/lldpd: Makefile distinfo options.mk
Log Message:
Update net/lldpd to v1.0.5
# pkgsrc changes
No OWNDIR needed for daemon's HOME
Add Perl path to LDFLAGS only when it is needed (snmp support)
List INSTALLATION_DIRS explicitly
Set PKG_SYSCONFSUBDIR, so that README.conf actually gets installed
Since editline is fully functional, avoid linking against the GPLv3 readline
# upstream changes
Numerous small changes, see ChangeLog.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 pkgsrc/net/lldpd/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/net/lldpd/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/lldpd/options.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/net/lldpd/Makefile
diff -u pkgsrc/net/lldpd/Makefile:1.26 pkgsrc/net/lldpd/Makefile:1.27
--- pkgsrc/net/lldpd/Makefile:1.26 Tue Jun 2 08:24:33 2020
+++ pkgsrc/net/lldpd/Makefile Thu Jun 18 19:40:32 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2020/06/02 08:24:33 adam Exp $
+# $NetBSD: Makefile,v 1.27 2020/06/18 19:40:32 hauke Exp $
-DISTNAME= lldpd-1.0.1
-PKGREVISION= 4
+DISTNAME= lldpd-1.0.5
+#PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= http://media.luffy.cx/files/lldpd/
@@ -9,50 +9,60 @@ MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://vincentbernat.github.com/lldpd/
COMMENT= 802.1ab (LLDP) implementation
LICENSE= isc
-# `lldpcli` will be linked to GNU Readline (which is GPL licensed)
-# if available. To avoid this, use `--without-readline` as a configure
-# option.
# interfaces-bsd.c:45:34: error: net/agr/if_agrioctl.h: No such file or directory
-NOT_FOR_PLATFORM= NetBSD-5*-*
-USE_LIBTOOL= yes
-USE_LANGUAGES= c c++
+NOT_FOR_PLATFORM= NetBSD-5.*-*
+
USE_TOOLS+= pkg-config
+
GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
+USE_LANGUAGES= c
+
CONFIGURE_ARGS+= --with-privsep-chroot=${PKG_HOME._lldpd}
-# Leave pkgsrc to handle security features.
+# Let pkgsrc handle security features.
CONFIGURE_ARGS+= --disable-hardening
+
+CONFIGURE_ARGS+= --with-embedded-libevent=no
+CONFIGURE_ARGS+= --with-readline
+
# run/lldpd.socket is created under this directory
# (the default is ${PRERIX}/var, changed since 0.7.9)
CONFIGURE_ARGS+= --localstatedir=${VARBASE}
BUILD_DEFS+= VARBASE
-EGDIR= ${PREFIX}/share/examples/${PKGBASE}
-CONF_FILES= ${EGDIR}/README.conf ${PKG_SYSCONFDIR}/lldpd.d/README.conf
-
-# CCLD lldpd
-# ld: cannot find -lperl
-LDFLAGS+= -L${PREFIX}/${PERL5_SUB_INSTALLARCHLIB}/CORE
+PKG_SYSCONFSUBDIR= lldpd.d
+EGDIR= share/examples/${PKGBASE}
+CONF_FILES= ${EGDIR}/README.conf ${PKG_SYSCONFDIR}/README.conf
RCD_SCRIPTS= lldpd
-PKG_GROUPS= _lldpd
-PKG_USERS= _lldpd:_lldpd
-PKG_HOME._lldpd= ${VARBASE}/chroot/lldpd
-OWN_DIRS= ${VARBASE}/chroot/lldpd
-AUTO_MKDIRS= yes
+LLDPD_USER?= _lldpd
+LLDPD_GROUP?= _lldpd
+LLDPD_HOME= ${VARBASE}/chroot/lldpd
+
+PKG_GROUPS_VARS+= LLDPD_GROUP
+PKG_USERS_VARS+= LLDPD_USER
+
+PKG_GROUPS= ${LLDPD_GROUP}
+PKG_USERS= ${LLDPD_USER}:${LLDPD_GROUP}
+PKG_HOME.${LLDPD_USER}= ${LLDPD_HOME}
+
TEST_TARGET= check
-INSTALLATION_DIRS+= sbin ${PKGMANDIR}/man5 ${PKGMANDIR}/man8
-INSTALLATION_DIRS+= ${EGDIR}
+INSTALLATION_DIRS+= sbin include lib ${PKGMANDIR}/man5 ${PKGMANDIR}/man8
+INSTALLATION_DIRS+= ${EGDIR} share/doc
+INSTALLATION_DIRS+= share/bash-completion share/zsh/site-functions
.include "options.mk"
post-install:
- ${MV} ${DESTDIR}${PREFIX}/etc/lldpd.d/README.conf ${DESTDIR}${EGDIR}
+ ${MV} ${DESTDIR}${PREFIX}/etc/lldpd.d/README.conf \
+ ${DESTDIR}${PREFIX}/${EGDIR}
+
BUILDLINK_API_DEPENDS.libevent+= libevent>=2.0.5
.include "../../devel/libevent/buildlink3.mk"
-.include "../../mk/readline.buildlink3.mk"
+.include "../../devel/editline/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/net/lldpd/distinfo
diff -u pkgsrc/net/lldpd/distinfo:1.13 pkgsrc/net/lldpd/distinfo:1.14
--- pkgsrc/net/lldpd/distinfo:1.13 Wed Aug 8 14:10:16 2018
+++ pkgsrc/net/lldpd/distinfo Thu Jun 18 19:40:32 2020
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.13 2018/08/08 14:10:16 prlw1 Exp $
+$NetBSD: distinfo,v 1.14 2020/06/18 19:40:32 hauke Exp $
-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
+SHA1 (lldpd-1.0.5.tar.gz) = ee911186120f482f5e9bbd80023bcf5b0a628161
+RMD160 (lldpd-1.0.5.tar.gz) = 2e8a2982dbdd6e73c865d6cad3a0c821e2538369
+SHA512 (lldpd-1.0.5.tar.gz) = ce6075b6e2f847c4854c117ffc81d6e9f852e857d2bf88151ea7b3d40fbebcf980f65d4a21f17332de7f27fc696ce3ada3c063b8fa7677d7b9eee3e4634e898e
+Size (lldpd-1.0.5.tar.gz) = 1624872 bytes
Index: pkgsrc/net/lldpd/options.mk
diff -u pkgsrc/net/lldpd/options.mk:1.4 pkgsrc/net/lldpd/options.mk:1.5
--- pkgsrc/net/lldpd/options.mk:1.4 Sun May 31 15:42:08 2020
+++ pkgsrc/net/lldpd/options.mk Thu Jun 18 19:40:32 2020
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2020/05/31 15:42:08 rillig Exp $
+# $NetBSD: options.mk,v 1.5 2020/06/18 19:40:32 hauke Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.lldpd
PKG_SUPPORTED_OPTIONS= json snmp xml
@@ -11,8 +11,10 @@ PKG_SUGGESTED_OPTIONS= json snmp xml
.if !empty(PKG_OPTIONS:Msnmp)
. include "../../net/net-snmp/buildlink3.mk"
-USE_TOOLS+= perl
. include "../../lang/perl5/buildlink3.mk"
+# CCLD lldpd
+# ld: cannot find -lperl
+LDFLAGS+= -L${PREFIX}/${PERL5_SUB_INSTALLARCHLIB}/CORE
CONFIGURE_ARGS+= --with-snmp
.endif
Home |
Main Index |
Thread Index |
Old Index