DELTA 473998 111 488 SVN|| R)S2ENDREP DELTA SVNz|zz--- 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)) \ ENDREP DELTA SVN%'%%--- 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)) ENDREP DELTA SVNfx^N0)`ӦqE4ba@kR;rǹ4P$|w.ndSmߋ8nH"Q zug&{wwd~=&)) J ̇V ^pgB(T2AJ'SgEFݝM 2Np/#WR{unQFYo6q{}?|cFRrl :OMqԴa6ʝs>@+#hsf]P%FhOuI;JKC+)hV,+6d{3(.]b|hW~A!7 9&ZrIe^-8@hMufYOZ`᳎4nT,>@2 F%MRf2EKM3zy鏁Rf:3:qtOWl>v4LEmAq0zжX4/@5zHk1D34k;_4N\i$-bNq ˃&έC!7F^)KF>Tq󻘱(韱߄#nlժ[#!ͳy7f&=^Y"N+ k:{ ~XxENDREP DELTA SVN=R==x^R]k0}6ҽhW;6oصql*iu9:6Bs=1dn˕c+neJ6:0q2CǁՒ"۶*x [}W30e*h!Rr# "!64/J}Y4w߈ ޟ,Rq0],l4J!O &!ZCwQm==Lq: ^=X&WXF'.4BW!,4/x\B|W6!ǺkW[ENDREP DELTA SVNOcOOx^oo0_'Ti!jPNXi@DӮw (C"s4MxwdiJFC+")Le:.N귺]@Vu]M_fvEIqnjn'3] l< :9@0 CXxzAUˀ))EԂ Y"aHkfQJV*ɟj*R`4'45 %L;h;wETxN "5P xQ4ƺ#XGp*ױ{zDZ G6PO{dxqqMοN4晔4Ӹj mEe{ [ВAujhW*8ICC;;Y/#d|5RN7Ր,N}g^@Jr9~j8}LGkmYd3i?tևw%~eDYbp!fs)-ĔAIVT1H3Zz9H 4Ye}F4b9b.2wE!VHA^e OX6Y!I%-/O46gHӖU鸆Ӗar?bUY23&oUi@kXuӃ9 ~5DskUz᪢ }%I9~9W&jg 4iXvg/qENDREP DELTA SVNgggx^QN0<'_GH\* p{Z NGz4wgfwv)fOS E-:-Q+4/ /|Ϗ8M1%l>$ O>ZNj-H lzC8[3o1L1!*SM˶4" p1\wLC͗5HZVc;K:Ժc\tUً7M[878*nRF↉#VENDREP DELTA SVN--- 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); } } ENDREP DELTA SVNOQOO--- 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; ENDREP DELTA SVNikii--- 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); } ENDREP DELTA SVN&.&&x^R]k0}]aŊĩ)۲j${#{bIj-V cҹ㛦)<ȝce*ߎ!mlzO7pEI]]AN2H3:UFz^q򠴗4B>VugGX"~:EY7+}A`#e@mՁ)<2a0RBT 8x>ϖl_bq%{==UP)5 geRj~ 008QKflUpy5/nVJ~Gb"y xI}dJǀ7 _I<8J3(4' ' C gSA'ENDREP DELTA SVN  x^QAN0<ǯJH\V(PDV-7+.\JϬfdJ)|Fnэ}4΋Oh1<'d #IgρNEV䐆ZI@6c3:Wa?&Dl # #f