Index: branches/2014Q4/net/zebra/Makefile =================================================================== --- branches/2014Q4/net/zebra/Makefile (revision 370473) +++ branches/2014Q4/net/zebra/Makefile (revision 370474) @@ -1,90 +1,90 @@ # Created by: Andreas Klemm # $FreeBSD$ PORTNAME= zebra PORTVERSION= 0.95a -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net ipv6 MASTER_SITES= ftp://ftp.pop-pr.rnp.br/pub/GNU/ftp.zebra.org/zebra/ \ ftp://ftp.ripe.net/mirrors/sites/ftp.zebra.org/pub/zebra/ \ http://ftp.sunet.se/pub/network/zebra/ MAINTAINER= bdrewery@FreeBSD.org COMMENT= Free RIPv1, RIPv2, OSPFv2, BGP4 route software (server/reflector) LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi CONFLICTS= openbgpd-[0-9]* quagga-[0-9]* quagga-re-[0-9]* openospfd-[0-9]* SUB_FILES= pkg-message zebractl SUB_LIST= BGPDARGS=${BGPDARGS} \ OSPFDARGS=${OSPFDARGS} \ OSPF6DARGS=${OSPFDARGS} \ RIPDARGS=${RIPDARGS} \ RIPNGDARGS=${RIPNGDARGS} \ ZEBRAARGS=${ZEBRAARGS} USE_SUBMAKE= yes GNU_CONFIGURE= yes USES= readline CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/etc/zebra PORTSCOUT= ignore:1 SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" OPTIONS_DEFINE= IPV6 PAM OSPFNSSA SNMP TCPZEBRA BGPD OSPF6D OSPFD RIPD RIPNGD VTYSH PAM_DESC= PAM authentication for vtysh OSPFNSSA_DESC= undergoing NSSA feature TCPZEBRA_DESC= TCP/IP socket connection BGPD_DESC= BGPD support OSPF6D_DESC= OSPF6D support OSPFD_DESC= OSPFD support RIPD_DESC= RIPD support RIPNGD_DESC= RIPNGD support VTYSH_DESC= VTYSH support OPTIONS_DEFAULT= IPV6 BGPD OSPF6D OSPFD RIPD RIPNGD VTYSH OPTIONS_SUB= yes NO_OPTIONS_SORT= yes PAM_CONFIGURE_WITH= pam OSPFNSSA_CONFIGURE_ENABLE= nssa SNMP_CONFIGURE_ENABLE= snmp SNMP_LIB_DEPENDS+= libsnmp.so:${PORTSDIR}/net-mgmt/net-snmp TCPZEBRA_CONFIGURE_ENABLE= tcp-zebra BGPD_CONFIGURE_ENABLE= bgpd OSPF6D_CONFIGURE_ENABLE= ospf6d OSPFD_CONFIGURE_ENABLE= ospfd RIPD_CONFIGURE_ENABLE= ripd RIPNGD_CONFIGURE_ENABLE= ripngd VTYSH_CONFIGURE_ENABLE= vtysh IPV6_CONFIGURE_ENABLE= ipv6 INFO= zebra BGPDARGS?= -d OSPFDARGS?= -d OSPF6DARGS?= -d RIPDARGS?= -d RIPNGDARGS?= -d ZEBRAARGS?= -d .include .if !${PORT_OPTIONS:MIPV6} && ${PORT_OPTIONS:MOSPF6D} -IGNORE= OSPF6D requires IPV6 option. +IGNORE= OSPF6D requires IPV6 option .endif .if !${PORT_OPTIONS:MIPV6} && ${PORT_OPTIONS:MRIPNGD} -IGNORE= RIPNGD requires IPV6 option. +IGNORE= RIPNGD requires IPV6 option .endif post-install: @( cd ${WRKSRC}/doc; ${RM} -f zebra*info*; \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} zebra.info install ) @${ECHO_MSG} "===> installing zebra startup file..." ${INSTALL_SCRIPT} ${WRKDIR}/zebractl ${STAGEDIR}${PREFIX}/sbin/zebractl @${ECHO_MSG} "done." .include Index: branches/2014Q4/net/zebra/files/patch-ospfd_ospf_dump.c =================================================================== --- branches/2014Q4/net/zebra/files/patch-ospfd_ospf_dump.c (nonexistent) +++ branches/2014Q4/net/zebra/files/patch-ospfd_ospf_dump.c (revision 370474) @@ -0,0 +1,11 @@ +--- ospfd/ospf_dump.c.orig 2003-11-04 20:10:17.000000000 +0100 ++++ ospfd/ospf_dump.c 2014-03-18 14:22:06.123332679 +0100 +@@ -607,7 +607,7 @@ + + iph = (struct ip *) STREAM_PNT (s); + +-#ifdef GNU_LINUX ++#ifdef GNU_LINUX || ((defined(__FreeBSD__) && (__FreeBSD_version >= 1100030)) + length = ntohs (iph->ip_len); + #else /* GNU_LINUX */ + length = iph->ip_len; Property changes on: branches/2014Q4/net/zebra/files/patch-ospfd_ospf_dump.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2014Q4/net/zebra/files/patch-ospfd_ospf_packet.c =================================================================== --- branches/2014Q4/net/zebra/files/patch-ospfd_ospf_packet.c (nonexistent) +++ branches/2014Q4/net/zebra/files/patch-ospfd_ospf_packet.c (revision 370474) @@ -0,0 +1,30 @@ +--- ospfd/ospf_packet.c.orig 2005-06-21 02:58:24.000000000 +0200 ++++ ospfd/ospf_packet.c 2014-03-18 14:22:06.129332906 +0100 +@@ -528,7 +528,8 @@ + iph.ip_hl = sizeof (struct ip) >> 2; + iph.ip_v = IPVERSION; + iph.ip_tos = IPTOS_PREC_INTERNETCONTROL; +-#if defined(__NetBSD__) || defined(__FreeBSD__) ++#if defined(__NetBSD__) \ ++ || (defined(__FreeBSD__) && (__FreeBSD_version < 1100030)) + iph.ip_len = iph.ip_hl*4 + op->length; + #else + iph.ip_len = htons (iph.ip_hl*4 + op->length); +@@ -1893,13 +1894,15 @@ + return NULL; + } + +-#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(OpenBSD_IP_LEN) ++#if defined(__NetBSD__) \ ++ || (defined(__FreeBSD__) && (__FreeBSD_version < 1100030)) \ ++ || defined(OpenBSD_IP_LEN) + ip_len = iph.ip_len; + #else + ip_len = ntohs (iph.ip_len); + #endif + +-#if !defined(GNU_LINUX) && !defined(OpenBSD_IP_LEN) ++#if !defined(GNU_LINUX) && !defined(OpenBSD_IP_LEN) && (__FreeBSD_version < 1000000) + /* + * Kernel network code touches incoming IP header parameters, + * before protocol specific processing. Property changes on: branches/2014Q4/net/zebra/files/patch-ospfd_ospf_packet.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2014Q4 =================================================================== --- branches/2014Q4 (revision 370473) +++ branches/2014Q4 (revision 370474) Property changes on: branches/2014Q4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r370473