From 6c004eb0a2707166399af0465fe2f58797d6199f Mon Sep 17 00:00:00 2001 From: Martin Johansson Date: Thu, 21 May 2015 20:56:29 +0200 Subject: [PATCH] umurmur: Update to 0.2.16. Also fix build breakage since PolarSSL/MbedTLS's version module was disabled. Signed-off-by: Martin Johansson --- net/umurmur/Makefile | 8 ++++---- ...me-check-for-POLARSSL_VERSION_FEATURES.patch | 17 +++++++++++++++++ 2 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 net/umurmur/patches/10-Add-compile-time-check-for-POLARSSL_VERSION_FEATURES.patch diff --git a/net/umurmur/Makefile b/net/umurmur/Makefile index c7ada87be..27254233e 100644 --- a/net/umurmur/Makefile +++ b/net/umurmur/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2009-2014 OpenWrt.org +# Copyright (C) 2009-2015 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -7,14 +7,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=umurmur -PKG_VERSION:=0.2.15 +PKG_VERSION:=0.2.16 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_URL:=git://github.com/fatbob313/umurmur.git +PKG_SOURCE_URL:=git://github.com/umurmur/umurmur.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=f66c0c3d630aaff1c4d589bc4d884067f00b6529 +PKG_SOURCE_VERSION:=0.2.16 PKG_INSTALL:=1 PKG_FIXUP:=autoreconf diff --git a/net/umurmur/patches/10-Add-compile-time-check-for-POLARSSL_VERSION_FEATURES.patch b/net/umurmur/patches/10-Add-compile-time-check-for-POLARSSL_VERSION_FEATURES.patch new file mode 100644 index 000000000..c8fcdc88a --- /dev/null +++ b/net/umurmur/patches/10-Add-compile-time-check-for-POLARSSL_VERSION_FEATURES.patch @@ -0,0 +1,17 @@ +diff --git a/src/ssli_polarssl.c b/src/ssli_polarssl.c +index a36ccb6..167637b 100644 +--- a/src/ssli_polarssl.c ++++ b/src/ssli_polarssl.c +@@ -225,8 +225,12 @@ void SSLi_init(void) + Log_fatal("Cannot open /dev/urandom"); + #endif + ++#ifdef POLARSSL_VERSION_FEATURES + version_get_string(verstring); + Log_info("PolarSSL library version %s initialized", verstring); ++#else ++ Log_info("PolarSSL library initialized"); ++#endif + } + + void SSLi_deinit(void)