Skip to content
Permalink
Browse files

net/olsrd: Fix "cp -t" usage and missing ifdef for RTF_CLONING

  • Loading branch information...
decke committed Aug 26, 2019
1 parent 4504a6b commit a5a8944972300f291be88a12766d5a5390e51ed6
@@ -1,4 +1,4 @@
--- Makefile.orig 2016-11-22 19:39:42 UTC
--- Makefile.orig 2019-08-11 08:09:47 UTC
+++ Makefile
@@ -167,20 +167,17 @@ uninstall_bin:
install_olsrd: install_bin
@@ -30,3 +30,16 @@
@echo -------------------------------------------
@echo Edit $(CFGFILE) before running olsrd!!
@echo -------------------------------------------
@@ -196,9 +193,10 @@ ifneq ($(RCDIR),)
endif
ifneq ($(DOCDIR_OLSRD),)
mkdir -p "$(DOCDIR_OLSRD)"
- cp -t "$(DOCDIR_OLSRD)" "CHANGELOG" "README-Olsr-Extensions" \
+ cp "CHANGELOG" "README-Olsr-Extensions" \
"README-LINUX_NL80211.txt" "files/olsrd.conf.default" \
- "files/olsrd.conf.default.txt" "license.txt"
+ "files/olsrd.conf.default.txt" "license.txt" \
+ "$(DOCDIR_OLSRD)"
endif

uninstall_olsrd: uninstall_bin
@@ -0,0 +1,11 @@
--- lib/dot_draw/Makefile.orig 2019-08-11 08:09:47 UTC
+++ lib/dot_draw/Makefile
@@ -63,7 +63,7 @@ install: $(PLUGIN_FULLNAME)
$(INSTALL_LIB)
ifneq ($(DOCDIR_OLSRD),)
mkdir -p "$(DOCDIR_OLSRD)"
- cp -t "$(DOCDIR_OLSRD)" "README_DOT_DRAW" "olsr-topology-view.pl"
+ cp "README_DOT_DRAW" "olsr-topology-view.pl" "$(DOCDIR_OLSRD)"
endif

uninstall:
@@ -0,0 +1,12 @@
--- src/bsd/kernel_routes.c.orig 2019-08-11 08:09:47 UTC
+++ src/bsd/kernel_routes.c
@@ -351,7 +351,9 @@ add_del_route6(const struct rt_entry *rt, int add)
memcpy(walker, &sdl, sizeof(sdl));
walker += sdl_size;
rtm->rtm_addrs |= RTA_GATEWAY;
+#ifdef RTF_CLONING
rtm->rtm_flags |= RTF_CLONING;
+#endif /* RTF_CLONING */
rtm->rtm_flags &= ~RTF_GATEWAY;
}

0 comments on commit a5a8944

Please sign in to comment.
You can’t perform that action at this time.