Attachment #190547 for bug #225595




# $FreeBSD$

PORTNAME=	lldpd
PORTVERSION=	0.9.9
PORTREVISION=	3
CATEGORIES=	net-mgmt
MASTER_SITES=	http://media.luffy.cx/files/${PORTNAME}/
		http://mirror.1labs.ch/${PORTNAME}/

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 \
		libpkg.so:ports-mgmt/pkg

USES=		libtool ssl
USE_CSTD=	gnu99
USE_LDCONFIG=	yes
USE_RC_SUBR=	${PORTNAME}
GNU_CONFIGURE=	yes

		${WRKSRC}/src/client/Makefile.am \
		${WRKSRC}/src/client/Makefile.in

post-install-DOCS-on:
	${INSTALL_DATA} ${FILESDIR}/README.bsd ${STAGEDIR}${DOCSDIR}

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)net-mgmt/lldpd/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1466250111	1	TIMESTAMP = 1518448953
2	SHA256 (lldpd-0.9.4.tar.gz) = eb1f5beff2ff5c13c5e0342b5b9da815ed4a63866262445e1168a79ee65c9079	2	SHA256 (lldpd-0.9.9.tar.gz) = 5e9e08f500d21376631cbc9f8e19a4b167cd38eb2d8fd9e660b8e80507f802db
3	SIZE (lldpd-0.9.4.tar.gz) = 1604103	3	SIZE (lldpd-0.9.9.tar.gz) = 1615627




--- 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],
yes
native
text/plain




--- 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;
yes
native
text/plain




--- 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 } \
yes
native
text/plain

Lines 13-21 Link Here

(-)net-mgmt/lldpd/pkg-plist (-5 / +6 lines)
13	sbin/lldpctl	13	sbin/lldpctl
14	sbin/lldpd	14	sbin/lldpd
15	%%BASH%%share/bash-completion/completions/lldpcli	15	%%BASH%%share/bash-completion/completions/lldpcli
16	%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTE.md	16	%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTE.md
17	%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/ChangeLog	17	%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
18	%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/NEWS	18	%%PORTDOCS%%%%DOCSDIR%%/LICENSE
19	%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/README.bsd	19	%%PORTDOCS%%%%DOCSDIR%%/NEWS
20	%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/README.md	20	%%PORTDOCS%%%%DOCSDIR%%/README.bsd
		21	%%PORTDOCS%%%%DOCSDIR%%/README.md
21	%%ZSH%%share/zsh/site-functions/_lldpcli	22	%%ZSH%%share/zsh/site-functions/_lldpcli

Return to bug 225595

Lines 2-21 Link Here

(-)net-mgmt/lldpd/Makefile (-7 / +8 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= lldpd	4	PORTNAME= lldpd
5	PORTVERSION= 0.9.4	5	PORTVERSION= 0.9.9
6	PORTREVISION= 3
7	CATEGORIES= net-mgmt	6	CATEGORIES= net-mgmt
8	MASTER_SITES= http://media.luffy.cx/files/${PORTNAME}/ \	7	MASTER_SITES= http://media.luffy.cx/files/${PORTNAME}/
9	http://mirror.1labs.ch/${PORTNAME}/
10		8
11	MAINTAINER= freebsd@simweb.ch	9	MAINTAINER= freebsd@simweb.ch
12	COMMENT= LLDP (802.1ab)/CDP/EDP/SONMP/FDP daemon and SNMP subagent	10	COMMENT= LLDP (802.1ab)/CDP/EDP/SONMP/FDP daemon and SNMP subagent
13		11
14	LICENSE= ISCL	12	LICENSE= ISCL
		13	LICENSE_FILE= ${WRKSRC}/LICENSE
15		14
16	LIB_DEPENDS= libevent.so:devel/libevent	15	LIB_DEPENDS= libevent.so:devel/libevent \
		16	libpkg.so:ports-mgmt/pkg
17		17
18	USES= libtool	18	USES= libtool ssl
		19	USE_CSTD= gnu99
19	USE_LDCONFIG= yes	20	USE_LDCONFIG= yes
20	USE_RC_SUBR= ${PORTNAME}	21	USE_RC_SUBR= ${PORTNAME}
21	GNU_CONFIGURE= yes	22	GNU_CONFIGURE= yes
Lines 61-67 Link Here
61	${WRKSRC}/src/client/Makefile.am \	62	${WRKSRC}/src/client/Makefile.am \
62	${WRKSRC}/src/client/Makefile.in	63	${WRKSRC}/src/client/Makefile.in
63		64
64	post-install:	65	post-install-DOCS-on:
65	${INSTALL_DATA} ${FILESDIR}/README.bsd ${STAGEDIR}${DOCSDIR}	66	${INSTALL_DATA} ${FILESDIR}/README.bsd ${STAGEDIR}${DOCSDIR}
66		67
67	.include <bsd.port.mk>	68	.include <bsd.port.mk>

Lines 1-11 Link Here

(-)net-mgmt/lldpd/files/patch-configure.ac (-14 lines)
1	--- configure.ac.orig 2016-06-10 06:11:26 UTC
2	+++ configure.ac
3	@@ -90,6 +90,8 @@ AX_CFLAGS_GCC_OPTION([-Wno-sign-compare]
4	AX_LDFLAGS_OPTION([-Wl,-z,relro], [LLDP_LDFLAGS])
5	AX_LDFLAGS_OPTION([-Wl,-z,now], [LLDP_LDFLAGS])
6
7	+AC_C_TYPEOF
8	+
9	# Hardening
10	AC_ARG_ENABLE([hardening],
11	[AS_HELP_STRING([--enable-hardening],
12	yes
13	native
14	text/plain

Lines 1-14 Link Here

(-)net-mgmt/lldpd/files/patch-src_daemon_interfaces-bsd.c (-17 lines)
1	--- src/daemon/interfaces-bsd.c.orig 2016-06-13 06:38:49 UTC
2	+++ src/daemon/interfaces-bsd.c
3	@@ -470,7 +470,11 @@ ifbsd_macphy(struct lldpd *cfg,
4	{
5	#ifdef ENABLE_DOT3
6	struct ifmediareq ifmr = {};
7	+#ifdef HAVE_TYPEOF
8	typeof(ifmr.ifm_ulist[0]) media_list[32] = {};
9	+#else
10	+ int media_list[32] = {};
11	+#endif
12	ifmr.ifm_ulist = media_list;
13	ifmr.ifm_count = 32;
14	struct lldpd_port *port = &hardware->h_lport;
15	yes
16	native
17	text/plain

Lines 1-25 Link Here

(-)net-mgmt/lldpd/files/patch-src_lib_Makefile.in (-28 lines)
1	--- src/lib/Makefile.in.orig 2016-06-17 17:20:00 UTC
2	+++ src/lib/Makefile.in
3	@@ -895,8 +895,9 @@ uninstall-am: uninstall-includeHEADERS u
4
5
6	atom-glue.c: $(ATOM_FILES) Makefile
7	- $(AM_V_GEN)($(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
8	- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(ATOM_FILES:%=$(srcdir)/%) \| \
9	+ $(AM_V_GEN)(for f in $(ATOM_FILES:%=$(srcdir)/%); do \
10	+ $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
11	+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $$f; done \| \
12	$(SED) -n 's+^void init_atom_builder_\([^(]\)()., \([0-9]\)).+\2 \1+p' \| \
13	sort \| \
14	$(AWK) '{ atoms[$$2] = 1 } \
15	@@ -905,8 +906,9 @@ atom-glue.c: $(ATOM_FILES) Makefile
16	print " static int init = 0; if (init) return; init++;"; \
17	for (atom in atoms) { print " init_atom_builder_"atom"();" } \
18	print "}"; }' && \
19	+ for f in $(ATOM_FILES:%=$(srcdir)/%); do \
20	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
21	- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(ATOM_FILES:%=$(srcdir)/%) \| \
22	+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $$f; done \| \
23	$(SED) -n 's+^void init_atom_map_\([^(]\)()., \([0-9]\)).+\2 \1+p' \| \
24	sort -n \| \
25	$(AWK) '{ atoms[$$2] = 1 } \
26	yes
27	native
28	text/plain