diff --git a/mrd6/Makefile b/mrd6/Makefile index a20ea26..c4863ed 100644 --- a/mrd6/Makefile +++ b/mrd6/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mrd6 PKG_SOURCE_VERSION:=c805eb33255dbc0b6647d463c6c67d1c9d3105a0 PKG_VERSION:=2013-11-30-$(PKG_SOURCE_VERSION) -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=git://github.com/hugosantos/mrd6.git diff --git a/mrd6/patches/002-missing_netlink_defs.patch b/mrd6/patches/002-missing_netlink_defs.patch index 28ab711..678dd35 100644 --- a/mrd6/patches/002-missing_netlink_defs.patch +++ b/mrd6/patches/002-missing_netlink_defs.patch @@ -1,7 +1,5 @@ -Index: mrd6-0.9.5/include/mrdpriv/linux/netlink_missing_defs.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ mrd6-0.9.5/include/mrdpriv/linux/netlink_missing_defs.h 2007-09-21 13:19:06.000000000 +0200 +--- /dev/null ++++ b/include/mrdpriv/linux/netlink_missing_defs.h @@ -0,0 +1,41 @@ +#include + @@ -44,10 +42,8 @@ Index: mrd6-0.9.5/include/mrdpriv/linux/netlink_missing_defs.h +#endif + +#endif -Index: mrd6-0.9.5/src/linux/linux_unicast_route.cpp -=================================================================== ---- mrd6-0.9.5.orig/src/linux/linux_unicast_route.cpp 2007-09-21 13:19:05.000000000 +0200 -+++ mrd6-0.9.5/src/linux/linux_unicast_route.cpp 2007-09-21 13:19:06.000000000 +0200 +--- a/src/linux/linux_unicast_route.cpp ++++ b/src/linux/linux_unicast_route.cpp @@ -23,6 +23,7 @@ */ diff --git a/mrd6/patches/101-Accept-default-routes-without-RTA_DST.patch b/mrd6/patches/101-Accept-default-routes-without-RTA_DST.patch index 660e707..780a9b1 100644 --- a/mrd6/patches/101-Accept-default-routes-without-RTA_DST.patch +++ b/mrd6/patches/101-Accept-default-routes-without-RTA_DST.patch @@ -7,11 +7,9 @@ Subject: [PATCH 1/2] Accept default routes without RTA_DST src/linux/linux_unicast_route.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/src/linux/linux_unicast_route.cpp b/src/linux/linux_unicast_route.cpp -index 331a7a0..7919cc2 100644 --- a/src/linux/linux_unicast_route.cpp +++ b/src/linux/linux_unicast_route.cpp -@@ -334,7 +334,7 @@ void linux_unicast_router::handle_route_event(bool isnew, nlmsghdr *hdr) { +@@ -335,7 +335,7 @@ void linux_unicast_router::handle_route_ netlink_msg::parse_rtatable(tb, RTA_MAX, RTM_RTA(NLMSG_DATA(hdr)), hdr->nlmsg_len - NLMSG_LENGTH(sizeof(rtmsg))); @@ -20,7 +18,7 @@ index 331a7a0..7919cc2 100644 lookup_result res; parse_prefix_rec(tb, msg->r.rtm_dst_len, -@@ -360,7 +360,7 @@ void linux_unicast_router::handle_route_event(bool isnew, nlmsghdr *hdr) { +@@ -361,7 +361,7 @@ void linux_unicast_router::handle_route_ } prefix_changed(isnew, res); @@ -29,6 +27,3 @@ index 331a7a0..7919cc2 100644 } void linux_unicast_router::handle_intf_event(bool isnew, nlmsghdr *hdr) { --- -1.9.0 - diff --git a/mrd6/patches/102-Metric-should-be-more-important-than-distance.patch b/mrd6/patches/102-Metric-should-be-more-important-than-distance.patch index 359f671..ebf843d 100644 --- a/mrd6/patches/102-Metric-should-be-more-important-than-distance.patch +++ b/mrd6/patches/102-Metric-should-be-more-important-than-distance.patch @@ -7,11 +7,9 @@ Subject: [PATCH 2/2] Metric should be more important than distance at lookup src/mrib.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -diff --git a/src/mrib.cpp b/src/mrib.cpp -index e51fed7..707d601 100644 --- a/src/mrib.cpp +++ b/src/mrib.cpp -@@ -327,16 +327,16 @@ mrib_def::mrib_node *mrib_def::prefix_lookup_y(const inet6_addr &source) const { +@@ -327,16 +327,16 @@ mrib_def::mrib_node *mrib_def::prefix_lo void mrib_def::insert_prefix_in_node(mrib_node *n, prefix *p) { prefix *curr = n->head, *prev = 0; @@ -33,6 +31,3 @@ index e51fed7..707d601 100644 prev = curr; curr = curr->next; } --- -1.9.0 - diff --git a/mrd6/patches/103-Make-build-reproducible.patch b/mrd6/patches/103-Make-build-reproducible.patch new file mode 100644 index 0000000..e0a32e6 --- /dev/null +++ b/mrd6/patches/103-Make-build-reproducible.patch @@ -0,0 +1,45 @@ +From deb013d93c3ce78891386637d6b3300289130df6 Mon Sep 17 00:00:00 2001 +From: Thomas Preud'homme +Date: Sun, 7 Aug 2016 22:28:50 +0100 +Subject: Make build reproducible + +Remove build date from the binary so that two builds on different dates +are binary identical. + +Origin: upstream, https://github.com/hugosantos/mrd6/commit/14f27d5528a3e4c8e5369bdee0e35961a2491661 +Forwarded: https://github.com/hugosantos/mrd6/pull/30 +Last-Update: 2016-08-09 +Applied-Upstream: commit: 14f27d5528a3e4c8e5369bdee0e35961a2491661 +--- + src/Makefile | 1 - + src/mrd.cpp | 2 -- + 2 files changed, 3 deletions(-) + +--- a/src/Makefile ++++ b/src/Makefile +@@ -185,7 +185,6 @@ endif + $(MRD_VERSION_CPP): $(SOURCES) Makefile Makefile.options + @set -e; mkdir -p $(dir $@); \ + echo '/* This file is automatically generated */' > $(MRD_VERSION_CPP); \ +- echo 'const char *BuildDate = "$(NOW)";' >> $(MRD_VERSION_CPP) + + $(MODULES_CPP): Makefile Makefile.options + @set -e; mkdir -p $(dir $@); \ +--- a/src/mrd.cpp ++++ b/src/mrd.cpp +@@ -75,7 +75,6 @@ + + mrd *g_mrd = 0; + +-extern const char *BuildDate; + static const char *VersionInfo = "mrd6 0.10.0"; + + static const char *defaultconffiles[] = { +@@ -2335,7 +2334,6 @@ bool mrd::socket_regs(base_stream &out, + + void mrd::show_base_info(base_stream &out) const { + out.xprintf("Version: %s\n", VersionInfo); +- out.xprintf("Build date: %s\n", BuildDate); + } + + bool mrd::show_info(base_stream &out, const std::vector &ctx) {