On Thu, Aug 10, 2017 at 08:36:01AM +0000, Florian Obser wrote: > On Wed, Aug 09, 2017 at 09:34:58PM +0100, Stuart Henderson wrote: > > On 2017/08/09 13:07, Jeremie Courreges-Anglas wrote: > > > On Wed, Aug 09 2017, Florian Obser <flor...@openbsd.org> wrote: > > > > I just noticed that dhcpcd looks at flags in struct nd_ifinfo which I > > > > removed in r1.72, this fixes the build. > > > > Sorry about that. > > > > > > > > OK? > > > > > > ok, but: > > > - you may want sthen@ to take a look (maintainer) > > > - please bump REVISION, 'cause in _if_checkipv6 this code would trigger > > > using an old package: > > > > +1 > > > > Would you mind sending it upstream too? https://dev.marples.name/ is > > probably the best option. > > I was going to, that's why I came up with that particular diff, it looked > like it could be fed upstream. > Now I looked and version 7 currently in development / beta shuffled quite > a lot of code around and I'm in some ifdef hell :( not sure if I can make > this work. > > If it were more than one port I would even consider bringing the flags > member back and always have it 0.
https://dev.marples.name/T132 > > > > > > #ifdef ND6_IFF_PERFORMNUD > > > if (set_if_nd6_flag(s, ifp, ND6_IFF_PERFORMNUD) == -1) { > > > logger(ifp->ctx, LOG_ERR, > > > "%s: set_if_nd6_flag: ND6_IFF_PERFORMNUD: %m", > > > ifp->name); > > > return -1; > > > } > > > #endif > > > > > > > > > > diff --git net/dhcpcd/patches/patch-if-bsd_c > > > > net/dhcpcd/patches/patch-if-bsd_c > > > > index 0046ef8ca11..0b2ed02e562 100644 > > > > --- net/dhcpcd/patches/patch-if-bsd_c > > > > +++ net/dhcpcd/patches/patch-if-bsd_c > > > > @@ -3,8 +3,11 @@ $OpenBSD: patch-if-bsd_c,v 1.1 2017/04/21 16:41:20 > > > > sthen Exp $ > > > > Workaround for our old broken behaviour no longer needed. > > > > Fixed with netinet6/in6.c r1.202. > > > > > > > > ---- if-bsd.c.orig Fri Apr 21 13:38:38 2017 > > > > -+++ if-bsd.c Fri Apr 21 13:39:38 2017 > > > > +netinet6/nd6.h r1.72 removed ND6_IFF_PERFORMNUD > > > > + > > > > +Index: if-bsd.c > > > > +--- if-bsd.c.orig > > > > ++++ if-bsd.c > > > > @@ -985,7 +985,7 @@ if_address6(unsigned char cmd, const struct > > > > ipv6_addr > > > > } > > > > #endif > > > > @@ -14,3 +17,19 @@ Fixed with netinet6/in6.c r1.202. > > > > /* BUT OpenBSD does not reset the address lifetime > > > > * for subsequent calls... > > > > * Luckily dhcpcd will remove the lease when it expires so > > > > +@@ -1688,6 +1688,7 @@ ip6_temp_valid_lifetime(__unused const char > > > > *ifname) > > > > + } > > > > + #endif > > > > + > > > > ++#if defined(ND6_IFF_AUTO_LINKLOCAL) || defined(ND6_IFF_PERFORMNUD) || > > > > defined(ND6_IFF_ACCEPT_RTADV) || defined(ND6_IFF_IFDISABLED) > > > > + #define del_if_nd6_flag(s, ifname, flag) if_nd6_flag((s), (ifp), > > > > (flag), -1) > > > > + #define get_if_nd6_flag(s, ifname, flag) if_nd6_flag((s), (ifp), > > > > (flag), 0) > > > > + #define set_if_nd6_flag(s, ifname, flag) if_nd6_flag((s), (ifp), > > > > (flag), 1) > > > > +@@ -1713,6 +1714,7 @@ if_nd6_flag(int s, const struct interface *ifp, > > > > unsign > > > > + return 0; > > > > + return ioctl(s, SIOCSIFINFO_FLAGS, &nd); > > > > + } > > > > ++#endif > > > > + > > > > + static int > > > > + if_raflush(int s) > > > > > > -- > > > jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 > > > E7EE > > > > > > > -- > I'm not entirely sure you are real. > -- I'm not entirely sure you are real.
