From: Steven Barth Date: Wed, 13 Dec 2017 18:46:44 +0000 (+0100) Subject: Merge pull request #330 from lynxis/rb_mrd6 X-Git-Url: http://git.openwrt.org/?p=feed%2Frouting.git;a=commitdiff_plain;h=381e082757b41ac475b7eef87bf120b35f91a3db;hp=73601c9895cf8f67e608375be724f092f048f244 Merge pull request #330 from lynxis/rb_mrd6 mrd6: remove build timestamp --- diff --git a/olsrd/Makefile b/olsrd/Makefile index 9091efb..4aaccb2 100644 --- a/olsrd/Makefile +++ b/olsrd/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=olsrd -PKG_VERSION:=0.9.6.1 +PKG_VERSION:=0.9.6.2 PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/OLSR/olsrd.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=v0.9.6.1 +PKG_SOURCE_VERSION:=v0.9.6.2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_MIRROR_MD5SUM:= @@ -119,7 +119,7 @@ endef define Package/olsrd-mod-pud $(call Package/olsrd/template) - DEPENDS:=olsrd +libgps +ncurses + DEPENDS:=olsrd +libgps TITLE:=Position Update Distribution plugin endef diff --git a/oonf-dlep-proxy/Makefile b/oonf-dlep-proxy/Makefile index 2f36eaa..28e16fd 100644 --- a/oonf-dlep-proxy/Makefile +++ b/oonf-dlep-proxy/Makefile @@ -1,8 +1,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=oonf-dlep-proxy -PKG_VERSION:=0.13.0 -PKG_REV:=9f941b25e1ac806db9d41e9892a5cf361bfe98f5 +PKG_VERSION:=0.14.1-1 +PKG_REV:=d86825c0bdf144db706da444be7b0a2e8722b54d PKG_RELEASE:=$(PKG_REV) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 diff --git a/oonf-dlep-radio/Makefile b/oonf-dlep-radio/Makefile index ac1f19c..4357e5b 100644 --- a/oonf-dlep-radio/Makefile +++ b/oonf-dlep-radio/Makefile @@ -1,8 +1,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=oonf-dlep-radio -PKG_VERSION:=0.13.0 -PKG_REV:=9f941b25e1ac806db9d41e9892a5cf361bfe98f5 +PKG_VERSION:=0.14.1-1 +PKG_REV:=d86825c0bdf144db706da444be7b0a2e8722b54d PKG_RELEASE:=$(PKG_REV) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 diff --git a/oonf-olsrd2/Config.in b/oonf-olsrd2/Config.in index 7cda518..1cc037a 100644 --- a/oonf-olsrd2/Config.in +++ b/oonf-olsrd2/Config.in @@ -32,4 +32,16 @@ The remotecontrol plugin allows you to control configuration and logging over the telnet plugin. Be careful not to open this functionality over the network without securing it. default n + config OONF_GENERIC_HTTP + bool "http plugin enabled" + help + The HTTP plugin allows HTTP access to all telnet commands. + default n + + config OONF_OLSRV2_MPR + bool "MPR plugin enabled" + help + The MPR plugin reduce the routing graph to limit the overhead of the OLSRv2 protocol + default n + endmenu diff --git a/oonf-olsrd2/Makefile b/oonf-olsrd2/Makefile index 9b8e988..727bd16 100644 --- a/oonf-olsrd2/Makefile +++ b/oonf-olsrd2/Makefile @@ -1,8 +1,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=oonf-olsrd2 -PKG_VERSION:=0.13.0 -PKG_REV:=9f941b25e1ac806db9d41e9892a5cf361bfe98f5 +PKG_VERSION:=0.14.1-1 +PKG_REV:=d86825c0bdf144db706da444be7b0a2e8722b54d PKG_RELEASE:=$(PKG_REV) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 @@ -24,9 +24,14 @@ CMAKE_OPTIONAL_PLUGINS:= $(subst $(SPACE),;,$(strip \ $(if $(filter y,$(CONFIG_OONF_OLSRV2_ROUTE_MODIFIER)),route_modifier,) \ $(if $(filter y,$(CONFIG_OONF_GENERIC_DLEP_ROUTER)),dlep_router,) \ $(if $(filter y,$(CONFIG_OONF_GENERIC_REMOTECONTROL)),remotecontrol,) \ + $(if $(filter y,$(CONFIG_OONF_OLSRV2_MPR)),mpr,) \ + $(if $(filter y,$(CONFIG_OONF_GENERIC_HTTP)),http,) \ )) -CMAKE_OPTIONS=-D OONF_NO_WERROR:Bool=true \ +BUILD_TYPE:= $(if $(filter y,$(CONFIG_DEBUG)),Debug,Release) + +CMAKE_OPTIONS=-D CMAKE_BUILD_TYPE:String=$(BUILD_TYPE) \ + -D OONF_NO_WERROR:Bool=true \ -D OONF_LOGGING_LEVEL:String=debug \ -D OONF_NO_TESTING:Bool=true \ -D UCI:Bool=true \ diff --git a/smcroute/Makefile b/smcroute/Makefile index 1a5a202..a11bfd9 100644 --- a/smcroute/Makefile +++ b/smcroute/Makefile @@ -8,13 +8,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=smcroute PKG_VERSION:=2.0.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_LICENSE:=GPL-2.0+ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=ftp://troglobit.com/smcroute/ PKG_MD5SUM:=cbf478e52ab9ae411adca41b9d22f68a +PKG_FIXUP:=autoreconf + include $(INCLUDE_DIR)/package.mk define Package/smcroute diff --git a/smcroute/patches/001-Make-output-of-build-id-optional.patch b/smcroute/patches/001-Make-output-of-build-id-optional.patch new file mode 100644 index 0000000..bffecc9 --- /dev/null +++ b/smcroute/patches/001-Make-output-of-build-id-optional.patch @@ -0,0 +1,65 @@ +Author: Micha Lenk +Date: Thu, 7 May 2015 21:54:31 +0200 +Description: Make output of build id optional + With free software, anyone can inspect the source code for malicious flaws. + But the software is often provided as binary packages to its users. The idea + of “deterministic” or “reproducible” builds is to empower anyone to verify + that no flaws have been introduced during the build process by reproducing + byte-for-byte identical binary packages from a given source. See also: + https://wiki.debian.org/ReproducibleBuilds + . + Prior to this change a timestamp generated at build time is included in the + output of 'smcroute -v'. As a result the binary is unreproducible. + . + With this change, users that still want 'smcroute -v' to include a build id + can run './configure --enable-build-id' to get the build id back (or even + specify a custom build id). +Origin: upstream, https://github.com/troglobit/smcroute/commit/73f6f14907f709e40689216291621ad26cd22ecd +Bug-Debian: https://bugs.debian.org/784694 +Last-Update: 2017-08-08 + +--- + configure.ac | 9 ++++++++- + smcroute.c | 6 +++++- + 2 files changed, 13 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 556d958..eb4a291 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -181,7 +181,14 @@ AC_COMPILE_IFELSE( + [AC_MSG_RESULT(no)]) + + # Add build number to config.h.in +-AC_DEFINE_UNQUOTED([BUILD], "`date +%y%m%d`", [Build number, abbreviated date.]) ++AC_ARG_ENABLE([build-id], ++ [AS_HELP_STRING([--enable-build-id@<:@=ID@:>@], ++ [show build id in output of 'smcroute -v'])], ++ [AS_IF([test "x$enableval" = "xyes" ], ++ [build_id=`date +%y%m%d`], ++ [build_id=$enableval]) ++ AC_DEFINE_UNQUOTED([BUILD], "$build_id", [Build number, abbreviated date.])]) ++ + + # Checks for library functions. + AC_FUNC_FORK +diff --git a/smcroute.c b/smcroute.c +index 7bd3c72..0287458 100644 +--- a/smcroute.c ++++ b/smcroute.c +@@ -46,7 +46,11 @@ static const char *conf_file = SMCROUTE_SYSTEM_CONF; + + extern char *__progname; + static const char version_info[] = +- "SMCRoute version " PACKAGE_VERSION " build " BUILD "\n"; ++ "SMCRoute version " PACKAGE_VERSION ++#ifdef BUILD ++ " build " BUILD ++#endif ++ "\n"; + + static const char usage_info[] = + "Usage: smcroute [OPTIONS]... [ARGS]...\n" +-- +2.11.0 +