On 2017/05/12 18:04, Stefan Sperling wrote:
> +Index: make/Makefile.obsd
..
> ++ifdef LIBNET
> ++CPPFLAGS += -DSPOOF -I$(PREFIX)/include/libnet-1.1
> ++LIBS += -L$(PREFIX)/lib/libnet-1.1 -lnet
> ++endif
s/PREFIX/LOCALBASE/
(PREFIX is "this port", LOCALBASE is "installed on the system" - it doesn't
entirely make sense to me what use it is to have separate values for these,
but that's how it is..)
> Index: patches/patch-src_bsd_net_c
..
> + /* initialize IP ID field if necessary */
> + if (ip_id == 0) {
> +- ip_id = (u_int16_t) (olsr_random() & 0xffff);
> ++ ip_id = (u_int16_t) (arc4random() & 0xffff);
> + }
ok, though it might be better to modify olsr_random() in src/olsr_random.h
instead, so we get the other callers too? it shouldn't really matter in
terms of randomness but it avoids hitting the device node.
> Index: patches/patch-src_plugin_loader_c
.
> ++++ src/plugin_loader.c Sun Apr 3 14:06:06 2016
> +@@ -88,20 +88,14 @@ olsr_load_plugins(void)
> static int
> olsr_load_dl(char *libname, struct plugin_param *params)
> {
> --#if TESTLIB_PATH
> +-#if defined TESTLIB_PATH && TESTLIB_PATH
> - char path[256] = "/usr/testlib/";
> --#endif
> -+ char path[256] = "${LOCALBASE}/lib/olsrd-plugins/";
> +-#endif /* defined TESTLIB_PATH && TESTLIB_PATH */
> ++ char path[256] = "/usr/local/lib/olsrd-plugins/";
the ${LOCALBASE} bit should stay, this probably got changed by running
update-patches after a build.
> Index: pkg/PLIST-main
..
> -@pkgpath net/olsrd
please keep this, and add
@pkgpath net/olsrd,-plugins
@conflict olsrd-plugins-*
please also cvs rm -f pkg/*-plugins.
rest looks good, though untested.
