Index: head/net/frr4/Makefile =================================================================== --- head/net/frr4/Makefile (revision 489705) +++ head/net/frr4/Makefile (revision 489706) @@ -1,87 +1,86 @@ # $FreeBSD$ PORTNAME= frr -PORTVERSION= 4.0 +PORTVERSION= 4.0.1 DISTVERSIONPREFIX= frr- -PORTREVISION= 7 CATEGORIES= net ipv6 PKGNAMESUFFIX= 4 MAINTAINER= olivier@FreeBSD.org COMMENT= IP routing protocol suite including BGP, IS-IS, OSPF and RIP LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= gawk:lang/gawk LIB_DEPENDS= libjson-c.so:devel/json-c CONFLICTS= openbgpd openospfd zebra quagga frr3 frr5 frr6 USES= autoreconf bison compiler:c++11-lang gmake pkgconfig libtool \ makeinfo python:2.7,build readline GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= FRRouting INFO= frr OPTIONS_DEFINE= FPM LDPD PAM SHELLACCESS TCPSOCKETS VTYSH MULTIPATH TCMALLOC RPKI OPTIONS_DEFAULT= VTYSH RPKI OPTIONS_SUB= yes # SNMP option build failed # checksum.c:79:21: warning: implicit declaration of function 'typeof' is # invalid in C99 [-Wimplicit-function-declaration] # IRDP option needs something freebsd does not seem to have: # configure: error: 'IRDP requires in_pktinfo at the moment!' FPM_DESC= Enable Forwarding Plane Manager support LDPD_DESC= Build ldpd MULTIPATH_DESC= Enable multipath function PAM_DESC= Use libpam for PAM support in vtysh RPKI_DESC= Add BGP RPKI (RFC 6810) support SHELLACCESS_DESC= Allow users to access shell/telnet/ssh SNMP_DESC= SNMP support TCMALLOC_DESC= Use tcmalloc TCPSOCKETS_DESC= Use TCP/IP sockets for protocol daemons VTYSH_DESC= Build integrated vty shell USERS= frr GROUPS= frr frrvty CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib # PIM compile but didn't work on FreeBSD CONFIGURE_ARGS= --enable-user=frr \ --enable-group=frr \ --enable-vty-group=frrvty \ --sysconfdir=${ETCDIR} \ --localstatedir=/var/run/frr \ --disable-nhrpd \ --disable-pimd SHELLACCESS_CONFIGURE_ENABLE= shell-access FPM_CONFIGURE_ENABLE= fpm PAM_CONFIGURE_WITH= libpam LDPD_CONFIGURE_ENABLE= ldpd MULTIPATH_CONFIGURE_ON= --enable-multipath=64 RPKI_CONFIGURE_ENABLE= rpki RPKI_LIB_DEPENDS= librtr.so:net-mgmt/rtrlib \ libssh.so:security/libssh TCMALLOC_CONFIGURE_ENABLE= tcmalloc TCMALLOC_LIB_DEPENDS= libtcmalloc.so:devel/google-perftools SNMP_CONFIGURE_ENABLE= snmp SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp TCPSOCKETS_CONFIGURE_ENABLE= tcp-zebra VTYSH_CONFIGURE_ENABLE= vtysh USE_RC_SUBR= frr watchfrr post-install: ${MKDIR} ${STAGEDIR}/var/run/frr .include Index: head/net/frr4/distinfo =================================================================== --- head/net/frr4/distinfo (revision 489705) +++ head/net/frr4/distinfo (revision 489706) @@ -1,3 +1,3 @@ -TIMESTAMP = 1520970456 -SHA256 (FRRouting-frr-frr-4.0_GH0.tar.gz) = a9932ef116106d56b0e17aa569aa56a458acdd50e0d07c042fd5cc725bf742cc -SIZE (FRRouting-frr-frr-4.0_GH0.tar.gz) = 3989206 +TIMESTAMP = 1546958139 +SHA256 (FRRouting-frr-frr-4.0.1_GH0.tar.gz) = c897e32604215e4eb3af0bdc908ff3caed7343f0356ca3343d6177418ab0278f +SIZE (FRRouting-frr-frr-4.0.1_GH0.tar.gz) = 3990506 Index: head/net/frr4/files/patch-zebra_if__netlink.c =================================================================== --- head/net/frr4/files/patch-zebra_if__netlink.c (revision 489705) +++ head/net/frr4/files/patch-zebra_if__netlink.c (nonexistent) @@ -1,14 +0,0 @@ ---- zebra/if_netlink.c.orig 2018-03-12 00:53:37 UTC -+++ zebra/if_netlink.c -@@ -985,9 +985,11 @@ int netlink_interface_addr(struct sockaddr_nl *snl, st - & (IFA_F_DADFAILED | IFA_F_TENTATIVE))) - connected_add_ipv6(ifp, flags, - (struct in6_addr *)addr, -+ (struct in6_addr *)broad, - ifa->ifa_prefixlen, label); - } else - connected_delete_ipv6(ifp, (struct in6_addr *)addr, -+ (struct in6_addr *)broad, - ifa->ifa_prefixlen); - } - Property changes on: head/net/frr4/files/patch-zebra_if__netlink.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/frr4/files/patch-zebra_if__ioctl__solaris.c =================================================================== --- head/net/frr4/files/patch-zebra_if__ioctl__solaris.c (revision 489705) +++ head/net/frr4/files/patch-zebra_if__ioctl__solaris.c (nonexistent) @@ -1,11 +0,0 @@ ---- zebra/if_ioctl_solaris.c.orig 2018-03-12 00:53:37 UTC -+++ zebra/if_ioctl_solaris.c -@@ -315,7 +315,7 @@ static int if_get_addr(struct interface *ifp, struct s - connected_add_ipv4(ifp, flags, &SIN(addr)->sin_addr, prefixlen, - (struct in_addr *)dest_pnt, label); - else if (af == AF_INET6) -- connected_add_ipv6(ifp, flags, &SIN6(addr)->sin6_addr, -+ connected_add_ipv6(ifp, flags, &SIN6(addr)->sin6_addr, NULL, - prefixlen, label); - - return 0; Property changes on: head/net/frr4/files/patch-zebra_if__ioctl__solaris.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/frr4/files/patch-lib_linklist.h =================================================================== --- head/net/frr4/files/patch-lib_linklist.h (revision 489705) +++ head/net/frr4/files/patch-lib_linklist.h (nonexistent) @@ -1,12 +0,0 @@ ---- lib/linklist.h.orig 2018-07-12 06:56:52 UTC -+++ lib/linklist.h -@@ -84,9 +84,6 @@ extern void *listnode_head(struct list *); - * and remove list_delete_original and the list_delete #define - * Additionally remove list_free entirely - */ --#if CONFDATE > 20181001 --CPP_NOTICE("list_delete without double pointer is deprecated, please fixup") --#endif - extern void list_delete_and_null(struct list **); - extern void list_delete_original(struct list *); - #define list_delete(X) list_delete_original((X)) \ Property changes on: head/net/frr4/files/patch-lib_linklist.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/frr4/files/patch-zebra_connected.c =================================================================== --- head/net/frr4/files/patch-zebra_connected.c (revision 489705) +++ head/net/frr4/files/patch-zebra_connected.c (nonexistent) @@ -1,61 +0,0 @@ ---- zebra/connected.c.orig 2018-03-12 01:53:37.000000000 +0100 -+++ zebra/connected.c 2018-07-12 09:11:27.490278000 +0200 -@@ -486,7 +486,9 @@ - - /* Add connected IPv6 route to the interface. */ - void connected_add_ipv6(struct interface *ifp, int flags, struct in6_addr *addr, -- u_char prefixlen, const char *label) -+ struct in6_addr *broad, uint8_t prefixlen, -+ const char *label) -+ - { - struct prefix_ipv6 *p; - struct connected *ifc; -@@ -508,6 +510,19 @@ - IPV6_ADDR_COPY(&p->prefix, addr); - p->prefixlen = prefixlen; - ifc->address = (struct prefix *)p; -+ if (broad) { -+ p = prefix_ipv6_new(); -+ p->family = AF_INET6; -+ IPV6_ADDR_COPY(&p->prefix, broad); -+ p->prefixlen = prefixlen; -+ ifc->destination = (struct prefix *)p; -+ } else { -+ if (CHECK_FLAG(ifc->flags, ZEBRA_IFA_PEER)) { -+ zlog_warn("warning: %s called for interface %s with peer flag set, but no peer address supplied", -+ __func__, ifp->name); -+ UNSET_FLAG(ifc->flags, ZEBRA_IFA_PEER); -+ } -+ } - - /* Label of this address. */ - if (label) -@@ -527,9 +542,9 @@ - } - - void connected_delete_ipv6(struct interface *ifp, struct in6_addr *address, -- u_char prefixlen) -+ struct in6_addr *broad, uint8_t prefixlen) - { -- struct prefix p; -+ struct prefix p, d; - struct connected *ifc; - - memset(&p, 0, sizeof(struct prefix)); -@@ -537,7 +552,14 @@ - memcpy(&p.u.prefix6, address, sizeof(struct in6_addr)); - p.prefixlen = prefixlen; - -- ifc = connected_check(ifp, &p); -+ if (broad) { -+ memset(&d, 0, sizeof(struct prefix)); -+ d.family = AF_INET6; -+ IPV6_ADDR_COPY(&d.u.prefix, broad); -+ d.prefixlen = prefixlen; -+ ifc = connected_check_ptp(ifp, &p, &d); -+ } else -+ ifc = connected_check_ptp(ifp, &p, NULL); - - connected_delete_helper(ifc, &p); - } Property changes on: head/net/frr4/files/patch-zebra_connected.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/frr4/files/patch-lib_zclient.h =================================================================== --- head/net/frr4/files/patch-lib_zclient.h (revision 489705) +++ head/net/frr4/files/patch-lib_zclient.h (nonexistent) @@ -1,24 +0,0 @@ ---- lib/zclient.h.orig 2018-07-12 06:57:20 UTC -+++ lib/zclient.h -@@ -353,10 +353,6 @@ struct zclient_options { - /* Prototypes of zebra client service functions. */ - extern struct zclient *zclient_new(struct thread_master *); - --#if CONFDATE > 20181101 --CPP_NOTICE("zclient_new_notify can take over or zclient_new now"); --#endif -- - extern struct zclient_options zclient_options_default; - - extern struct zclient *zclient_new_notify(struct thread_master *m, -@@ -421,10 +417,6 @@ extern struct interface *zebra_interface_vrf_update_re - vrf_id_t *new_vrf_id); - extern void zebra_interface_if_set_value(struct stream *, struct interface *); - extern void zebra_router_id_update_read(struct stream *s, struct prefix *rid); -- --#if CONFDATE > 20180823 --CPP_NOTICE("zapi_ipv4_route, zapi_ipv6_route, zapi_ipv4_route_ipv6_nexthop as well as the zapi_ipv4 and zapi_ipv6 data structures should be removed now"); --#endif - - extern int zapi_ipv4_route(u_char, struct zclient *, struct prefix_ipv4 *, - struct zapi_ipv4 *) __attribute__((deprecated)); Property changes on: head/net/frr4/files/patch-lib_zclient.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/frr4/files/patch-zebra_if__ioctl.c =================================================================== --- head/net/frr4/files/patch-zebra_if__ioctl.c (revision 489705) +++ head/net/frr4/files/patch-zebra_if__ioctl.c (nonexistent) @@ -1,11 +0,0 @@ ---- zebra/if_ioctl.c.orig 2018-03-12 00:53:37 UTC -+++ zebra/if_ioctl.c -@@ -249,7 +249,7 @@ static int if_getaddrs(void) - } - #endif - -- connected_add_ipv6(ifp, flags, &addr->sin6_addr, -+ connected_add_ipv6(ifp, flags, &addr->sin6_addr, NULL, - prefixlen, NULL); - } - } Property changes on: head/net/frr4/files/patch-zebra_if__ioctl.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/frr4/files/patch-ospf6d_ospf6__top.c =================================================================== --- head/net/frr4/files/patch-ospf6d_ospf6__top.c (revision 489705) +++ head/net/frr4/files/patch-ospf6d_ospf6__top.c (nonexistent) @@ -1,21 +0,0 @@ ---- ospf6d/ospf6_top.c.orig 2018-07-12 06:58:31 UTC -+++ ospf6d/ospf6_top.c -@@ -363,18 +363,12 @@ DEFUN(no_ospf6_router_id, - return CMD_SUCCESS; - } - --#if CONFDATE > 20180828 --CPP_NOTICE("ospf6: `router-id A.B.C.D` deprecated 2017/08/28") --#endif - ALIAS_HIDDEN(ospf6_router_id, - ospf6_router_id_hdn_cmd, - "router-id A.B.C.D", - "Configure OSPF6 Router-ID\n" - V4NOTATION_STR) - --#if CONFDATE > 20180828 --CPP_NOTICE("ospf6: `no router-id A.B.C.D` deprecated 2017/08/28") --#endif - ALIAS_HIDDEN(no_ospf6_router_id, - no_ospf6_router_id_hdn_cmd, - "no router-id [A.B.C.D]", Property changes on: head/net/frr4/files/patch-ospf6d_ospf6__top.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/frr4/files/patch-zebra_connected.h =================================================================== --- head/net/frr4/files/patch-zebra_connected.h (revision 489705) +++ head/net/frr4/files/patch-zebra_connected.h (nonexistent) @@ -1,17 +0,0 @@ ---- zebra/connected.h.orig 2018-03-12 00:53:37 UTC -+++ zebra/connected.h -@@ -42,10 +42,11 @@ extern void connected_up(struct interface *ifp, struct - extern void connected_down(struct interface *ifp, struct connected *ifc); - - extern void connected_add_ipv6(struct interface *ifp, int flags, -- struct in6_addr *address, u_char prefixlen, -- const char *label); -+ struct in6_addr *address, struct in6_addr *broad, -+ uint8_t prefixlen, const char *label); - extern void connected_delete_ipv6(struct interface *ifp, -- struct in6_addr *address, u_char prefixlen); -+ struct in6_addr *address, -+ struct in6_addr *broad, uint8_t prefixlen); - - extern int connected_is_unnumbered(struct interface *); - Property changes on: head/net/frr4/files/patch-zebra_connected.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/frr4/files/patch-lib_vty.h =================================================================== --- head/net/frr4/files/patch-lib_vty.h (revision 489705) +++ head/net/frr4/files/patch-lib_vty.h (nonexistent) @@ -1,48 +0,0 @@ ---- lib/vty.h.orig 2018-03-12 00:53:37 UTC -+++ lib/vty.h -@@ -189,45 +189,6 @@ struct vty_arg { - /* Integrated configuration file. */ - #define INTEGRATE_DEFAULT_CONFIG "frr.conf" - --#if CONFDATE > 20180401 --CPP_NOTICE("It's probably time to remove VTY_NEWLINE compatibility foo.") --#endif -- --/* for compatibility */ --#define VNL "\n" CPP_WARN("VNL has been replaced with \\n.") --#define VTYNL "\n" CPP_WARN("VTYNL has been replaced with \\n.") --#define VTY_NEWLINE "\n" CPP_WARN("VTY_NEWLINE has been replaced with \\n.") --#define VTY_GET_INTEGER(desc, v, str) \ -- { \ -- (v) = strtoul((str), NULL, 10); \ -- } \ -- CPP_WARN("VTY_GET_INTEGER is no longer useful, use strtoul() or DEFPY.") --#define VTY_GET_INTEGER_RANGE(desc, v, str, min, max) \ -- { \ -- (v) = strtoul((str), NULL, 10); \ -- } \ -- CPP_WARN( \ -- "VTY_GET_INTEGER_RANGE is no longer useful, use strtoul() or DEFPY.") --#define VTY_GET_ULONG(desc, v, str) \ -- { \ -- (v) = strtoul((str), NULL, 10); \ -- } \ -- CPP_WARN("VTY_GET_ULONG is no longer useful, use strtoul() or DEFPY.") --#define VTY_GET_ULL(desc, v, str) \ -- { \ -- (v) = strtoull((str), NULL, 10); \ -- } \ -- CPP_WARN("VTY_GET_ULL is no longer useful, use strtoull() or DEFPY.") --#define VTY_GET_IPV4_ADDRESS(desc, v, str) \ -- inet_aton((str), &(v)) CPP_WARN( \ -- "VTY_GET_IPV4_ADDRESS is no longer useful, use inet_aton() or DEFPY.") --#define VTY_GET_IPV4_PREFIX(desc, v, str) \ -- str2prefix_ipv4((str), &(v)) CPP_WARN( \ -- "VTY_GET_IPV4_PREFIX is no longer useful, use str2prefix_ipv4() or DEFPY.") --#define vty_outln(vty, str, ...) \ -- vty_out(vty, str "\n", ##__VA_ARGS__) CPP_WARN( \ -- "vty_outln is no longer useful, use vty_out(...\\n...)") -- - /* Default time out value */ - #define VTY_TIMEOUT_DEFAULT 600 - Property changes on: head/net/frr4/files/patch-lib_vty.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/frr4/files/patch-ospfd_ospf__vty.c =================================================================== --- head/net/frr4/files/patch-ospfd_ospf__vty.c (revision 489705) +++ head/net/frr4/files/patch-ospfd_ospf__vty.c (nonexistent) @@ -1,22 +0,0 @@ ---- ospfd/ospf_vty.c.orig 2018-07-12 06:56:11 UTC -+++ ospfd/ospf_vty.c -@@ -2337,9 +2337,6 @@ DEFUN (no_ospf_timers_lsa_min_arrival, - return CMD_SUCCESS; - } - --#if CONFDATE > 20180708 --CPP_NOTICE("ospf: `timers lsa arrival (0-1000)` deprecated 2017/07/08") --#endif - ALIAS_HIDDEN (ospf_timers_lsa_min_arrival, - ospf_timers_lsa_arrival_cmd, - "timers lsa arrival (0-1000)", -@@ -2348,9 +2345,6 @@ ALIAS_HIDDEN (ospf_timers_lsa_min_arrival, - "ospf minimum arrival interval delay\n" - "delay (msec) between accepted lsas\n"); - --#if CONFDATE > 20180708 --CPP_NOTICE("ospf: `no timers lsa arrival (0-1000)` deprecated 2017/07/08") --#endif - ALIAS_HIDDEN (no_ospf_timers_lsa_min_arrival, - no_ospf_timers_lsa_arrival_cmd, - "no timers lsa arrival (0-1000)", Property changes on: head/net/frr4/files/patch-ospfd_ospf__vty.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/frr4/files/patch-zebra_ioctl.c =================================================================== --- head/net/frr4/files/patch-zebra_ioctl.c (revision 489705) +++ head/net/frr4/files/patch-zebra_ioctl.c (nonexistent) @@ -1,20 +0,0 @@ ---- zebra/ioctl.c.orig 2018-03-12 00:53:37 UTC -+++ zebra/ioctl.c -@@ -395,10 +395,13 @@ void if_get_flags(struct interface *ifp) - strncpy(ifmr.ifm_name, ifp->name, IFNAMSIZ); - - /* Seems not all interfaces implement this ioctl */ -- if (if_ioctl(SIOCGIFMEDIA, (caddr_t)&ifmr) < 0) -- zlog_err("if_ioctl(SIOCGIFMEDIA) failed: %s", -- safe_strerror(errno)); -- else if (ifmr.ifm_status & IFM_AVALID) /* Link state is valid */ -+ if (if_ioctl(SIOCGIFMEDIA, (caddr_t)&ifmr) < 0) { -+ /* Ignore EINVAL to avoid being too verbose */ -+ if (errno != EINVAL) -+ zlog_err("if_ioctl(SIOCGIFMEDIA) failed: %s", -+ safe_strerror(errno)); -+ } else if (ifmr.ifm_status -+ & IFM_AVALID) /* Link state is valid */ - { - if (ifmr.ifm_status & IFM_ACTIVE) - SET_FLAG(ifreq.ifr_flags, IFF_RUNNING); Property changes on: head/net/frr4/files/patch-zebra_ioctl.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/frr4/files/patch-zebra_kernel__socket.c =================================================================== --- head/net/frr4/files/patch-zebra_kernel__socket.c (revision 489705) +++ head/net/frr4/files/patch-zebra_kernel__socket.c (nonexistent) @@ -1,15 +0,0 @@ ---- zebra/kernel_socket.c.orig 2018-03-12 00:53:37 UTC -+++ zebra/kernel_socket.c -@@ -771,10 +771,11 @@ int ifam_read(struct ifa_msghdr *ifam) - - if (ifam->ifam_type == RTM_NEWADDR) - connected_add_ipv6(ifp, flags, &addr.sin6.sin6_addr, -+ NULL, - ip6_masklen(mask.sin6.sin6_addr), - (isalias ? ifname : NULL)); - else -- connected_delete_ipv6(ifp, &addr.sin6.sin6_addr, -+ connected_delete_ipv6(ifp, &addr.sin6.sin6_addr, NULL, - ip6_masklen(mask.sin6.sin6_addr)); - break; - default: Property changes on: head/net/frr4/files/patch-zebra_kernel__socket.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/frr4/files/patch-lib_stream.h =================================================================== --- head/net/frr4/files/patch-lib_stream.h (revision 489705) +++ head/net/frr4/files/patch-lib_stream.h (nonexistent) @@ -1,12 +0,0 @@ ---- lib/stream.h.orig 2018-07-12 06:57:53 UTC -+++ lib/stream.h -@@ -123,9 +123,6 @@ struct stream_fifo { - #define STREAM_CONCAT_REMAIN(S1, S2, size) ((size) - (S1)->endp - (S2)->endp) - - /* deprecated macros - do not use in new code */ --#if CONFDATE > 20181128 --CPP_NOTICE("lib: time to remove deprecated stream.h macros") --#endif - #define STREAM_PNT(S) stream_pnt((S)) - #define STREAM_REMAIN(S) STREAM_WRITEABLE((S)) - Property changes on: head/net/frr4/files/patch-lib_stream.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/frr4/files/patch-Makefile.am =================================================================== --- head/net/frr4/files/patch-Makefile.am (revision 489705) +++ head/net/frr4/files/patch-Makefile.am (revision 489706) @@ -1,11 +1,11 @@ ---- Makefile.am.orig 2018-03-13 22:21:12 UTC +--- Makefile.am.orig 2019-01-08 09:30:08 UTC +++ Makefile.am -@@ -41,7 +41,7 @@ include zebra/subdir.am +@@ -42,7 +42,7 @@ include zebra/subdir.am include watchfrr/subdir.am include qpb/subdir.am include fpm/subdir.am -include tools/subdir.am +#include tools/subdir.am include ripd/subdir.am include ripngd/subdir.am