From 85881594e193d5b7f7390166687062373d3431e5 Mon Sep 17 00:00:00 2001
From: Ted Hess <thess@kitschensync.net>
Date: Mon, 9 Jan 2017 17:29:00 -0500
Subject: [PATCH] umurmur: Update to lastest version. Replace PolarSSL with
 mbed TLS

Signed-off-by: Ted Hess <thess@kitschensync.net>
---
 net/umurmur/Makefile                          | 37 +++++++++----------
 .../patches/010-mbedtls_fix_includes.patch    | 11 ++++++
 ...-check-for-POLARSSL_VERSION_FEATURES.patch | 17 ---------
 3 files changed, 29 insertions(+), 36 deletions(-)
 create mode 100644 net/umurmur/patches/010-mbedtls_fix_includes.patch
 delete 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 27254233ed..1dc5dc2af9 100644
--- a/net/umurmur/Makefile
+++ b/net/umurmur/Makefile
@@ -1,20 +1,20 @@
 #
-# Copyright (C) 2009-2015 OpenWrt.org
-#
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=umurmur
-PKG_VERSION:=0.2.16
+PKG_VERSION:=0.2.16-20161126
 PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_URL:=git://github.com/umurmur/umurmur.git
+PKG_SOURCE_URL:=https://github.com/umurmur/umurmur.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=0.2.16
+PKG_SOURCE_VERSION:=fac630135664fda26338d403041b6b6e558a2d6b
+PKG_MIRROR_MD5SUM:=0e031baa5cebcdb4eb39a0cde572014f
+PKG_MIRROR_HASH:=6773aebea9aea355a41425e946291bb47bc399f85483bd6532cf26dfc7c801e5
 
 PKG_INSTALL:=1
 PKG_FIXUP:=autoreconf
@@ -32,8 +32,7 @@ define Package/umurmur/Default
   SUBMENU:=Instant Messaging
   TITLE:=uMurmur
   DEPENDS:=+libconfig +libprotobuf-c
-  URL:=http://code.google.com/p/umurmur
-  MAINTAINER:=Martin Johansson <martin@fatbob.nu>
+  URL:=http://umurmur.net
 endef
 
 define Package/umurmur/Default/description
@@ -52,16 +51,16 @@ define Package/umurmur-openssl/description
   Uses OpenSSL library for SSL and crypto.
 endef
 
-define Package/umurmur-polarssl
+define Package/umurmur-mbedtls
   $(call Package/umurmur/Default)
-  TITLE+= (with PolarSSL support)
-  DEPENDS+= +libpolarssl
-  VARIANT:=polarssl
+  TITLE+= (with mbed TLS support)
+  DEPENDS+= +libmbedtls
+  VARIANT:=mbedtls
 endef
 
-define Package/umurmur-polarssl/description
+define Package/umurmur-mbedtls/description
   $(call Package/umurmur/Default/description)
-  Uses the PolarSSL library for SSL and crypto.
+  Uses the mbed TLS library for SSL and crypto.
 endef
 
 define Build/Compile
@@ -75,7 +74,7 @@ define Package/umurmur-openssl/conffiles
 /etc/umurmur.conf
 endef
 
-Package/umurmur-polarssl/conffiles = $(Package/umurmur-openssl/conffiles)
+Package/umurmur-mbedtls/conffiles = $(Package/umurmur-openssl/conffiles)
 
 define Package/umurmur-openssl/install
 	$(INSTALL_DIR) $(1)/usr/bin
@@ -87,17 +86,17 @@ define Package/umurmur-openssl/install
 	$(INSTALL_DIR) $(1)/etc/umurmur
 endef
 
-Package/umurmur-polarssl/install = $(Package/umurmur-openssl/install)
+Package/umurmur-mbedtls/install = $(Package/umurmur-openssl/install)
 
 ifeq ($(BUILD_VARIANT),openssl)
   CONFIGURE_ARGS += \
 	--with-ssl=openssl
 endif
 
-ifeq ($(BUILD_VARIANT),polarssl)
+ifeq ($(BUILD_VARIANT),mbedtls)
   CONFIGURE_ARGS += \
-	--with-ssl=polarssl
+	--with-ssl=mbedtls
 endif
 
 $(eval $(call BuildPackage,umurmur-openssl))
-$(eval $(call BuildPackage,umurmur-polarssl))
+$(eval $(call BuildPackage,umurmur-mbedtls))
diff --git a/net/umurmur/patches/010-mbedtls_fix_includes.patch b/net/umurmur/patches/010-mbedtls_fix_includes.patch
new file mode 100644
index 0000000000..619517f3df
--- /dev/null
+++ b/net/umurmur/patches/010-mbedtls_fix_includes.patch
@@ -0,0 +1,11 @@
+--- a/src/ssl.h
++++ b/src/ssl.h
+@@ -90,7 +90,7 @@ typedef	ssl_context SSL_handle_t;
+ 
+ #elif defined(USE_MBEDTLS)
+ #include <mbedtls/ssl.h>
+-#include <mbedtls/net.h>
++#include <mbedtls/net_sockets.h>
+ #include <mbedtls/version.h>
+ 
+ #if defined(MBEDTLS_VERSION_MAJOR)
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
deleted file mode 100644
index c8fcdc88a4..0000000000
--- a/net/umurmur/patches/10-Add-compile-time-check-for-POLARSSL_VERSION_FEATURES.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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)