cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net-mgmt/lldpd: Update to 0.9.9

Browse Source 
Patches removed were incorporated upstream.

Changes:	https://github.com/vincentbernat/lldpd/blob/0.9.9/NEWS

PR:		225595
Reported by:	Denny Page <dennypage@me.com>
Approved by:	Mathieu Simon <freebsd@simweb.ch> (maintainer)
This commit is contained in:
Danilo G. Baio 2018-02-21 21:42:02 +00:00
parent 5960d1f56f
commit 0c563e581b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=462545
6 changed files with 14 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net-mgmt/lldpd/Makefile
View File

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= lldpd
PORTVERSION= 0.9.4
PORTREVISION= 3
PORTVERSION= 0.9.9
CATEGORIES= net-mgmt
MASTER_SITES= http://media.luffy.cx/files/${PORTNAME}/ \
http://mirror.1labs.ch/${PORTNAME}/
@ -12,10 +11,12 @@ MAINTAINER= freebsd@simweb.ch
COMMENT= LLDP (802.1ab)/CDP/EDP/SONMP/FDP daemon and SNMP subagent
LICENSE= ISCL
LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libevent.so:devel/libevent
USES= libtool
USE_CSTD= gnu99
USE_LDCONFIG= yes
USE_RC_SUBR= ${PORTNAME}
GNU_CONFIGURE= yes
@ -53,6 +54,7 @@ PROPRIETARY_CONFIGURE_ENABLE= cdp edp fdp sonmp
JSON_LIB_DEPENDS= libjansson.so:devel/jansson
JSON_USES= pkgconfig
SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp
SNMP_USES= ssl
XML_LIB_DEPENDS= libxml2.so:textproc/libxml2
post-patch:
@ -61,7 +63,7 @@ post-patch:
${WRKSRC}/src/client/Makefile.am \
${WRKSRC}/src/client/Makefile.in
post-install:
post-install-DOCS-on:
${INSTALL_DATA} ${FILESDIR}/README.bsd ${STAGEDIR}${DOCSDIR}
.include <bsd.port.mk>

6
net-mgmt/lldpd/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1466250111
SHA256 (lldpd-0.9.4.tar.gz) = eb1f5beff2ff5c13c5e0342b5b9da815ed4a63866262445e1168a79ee65c9079
SIZE (lldpd-0.9.4.tar.gz) = 1604103
TIMESTAMP = 1518448953
SHA256 (lldpd-0.9.9.tar.gz) = 5e9e08f500d21376631cbc9f8e19a4b167cd38eb2d8fd9e660b8e80507f802db
SIZE (lldpd-0.9.9.tar.gz) = 1615627

11
net-mgmt/lldpd/files/patch-configure.ac
View File

@ -1,11 +0,0 @@
--- configure.ac.orig 2016-06-10 06:11:26 UTC
+++ configure.ac
@@ -90,6 +90,8 @@ AX_CFLAGS_GCC_OPTION([-Wno-sign-compare]
AX_LDFLAGS_OPTION([-Wl,-z,relro], [LLDP_LDFLAGS])
AX_LDFLAGS_OPTION([-Wl,-z,now], [LLDP_LDFLAGS])
+AC_C_TYPEOF
+
# Hardening
AC_ARG_ENABLE([hardening],
[AS_HELP_STRING([--enable-hardening],

14
net-mgmt/lldpd/files/patch-src_daemon_interfaces-bsd.c
View File

@ -1,14 +0,0 @@
--- src/daemon/interfaces-bsd.c.orig 2016-06-13 06:38:49 UTC
+++ src/daemon/interfaces-bsd.c
@@ -470,7 +470,11 @@ ifbsd_macphy(struct lldpd *cfg,
{
#ifdef ENABLE_DOT3
struct ifmediareq ifmr = {};
+#ifdef HAVE_TYPEOF
typeof(ifmr.ifm_ulist[0]) media_list[32] = {};
+#else
+ int media_list[32] = {};
+#endif
ifmr.ifm_ulist = media_list;
ifmr.ifm_count = 32;
struct lldpd_port *port = &hardware->h_lport;

25
net-mgmt/lldpd/files/patch-src_lib_Makefile.in
View File

@ -1,25 +0,0 @@
--- src/lib/Makefile.in.orig 2016-06-17 17:20:00 UTC
+++ src/lib/Makefile.in
@@ -895,8 +895,9 @@ uninstall-am: uninstall-includeHEADERS u
atom-glue.c: $(ATOM_FILES) Makefile
- $(AM_V_GEN)($(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(ATOM_FILES:%=$(srcdir)/%) | \
+ $(AM_V_GEN)(for f in $(ATOM_FILES:%=$(srcdir)/%); do \
+ $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $$f; done | \
$(SED) -n 's+^void init_atom_builder_\([^(]*\)().*, \([0-9]*\)).*+\2 \1+p' | \
sort | \
$(AWK) '{ atoms[$$2] = 1 } \
@@ -905,8 +906,9 @@ atom-glue.c: $(ATOM_FILES) Makefile
print " static int init = 0; if (init) return; init++;"; \
for (atom in atoms) { print " init_atom_builder_"atom"();" } \
print "}"; }' && \
+ for f in $(ATOM_FILES:%=$(srcdir)/%); do \
$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(ATOM_FILES:%=$(srcdir)/%) | \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $$f; done | \
$(SED) -n 's+^void init_atom_map_\([^(]*\)().*, \([0-9]*\)).*+\2 \1+p' | \
sort -n | \
$(AWK) '{ atoms[$$2] = 1 } \

11
net-mgmt/lldpd/pkg-plist
View File

@ -13,9 +13,10 @@ sbin/lldpcli
sbin/lldpctl
sbin/lldpd
%%BASH%%share/bash-completion/completions/lldpcli
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTE.md
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/NEWS
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/README.bsd
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/README.md
%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTE.md
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
%%PORTDOCS%%%%DOCSDIR%%/LICENSE
%%PORTDOCS%%%%DOCSDIR%%/NEWS
%%PORTDOCS%%%%DOCSDIR%%/README.bsd
%%PORTDOCS%%%%DOCSDIR%%/README.md
%%ZSH%%share/zsh/site-functions/_lldpcli