Browse Source

umurmur: Update to lastest version. Replace PolarSSL with mbed TLS

Signed-off-by: Ted Hess <thess@kitschensync.net>
lilik-openwrt-22.03
Ted Hess 8 years ago
parent
commit
85881594e1
3 changed files with 29 additions and 36 deletions
  1. +18
    -19
      net/umurmur/Makefile
  2. +11
    -0
      net/umurmur/patches/010-mbedtls_fix_includes.patch
  3. +0
    -17
      net/umurmur/patches/10-Add-compile-time-check-for-POLARSSL_VERSION_FEATURES.patch

+ 18
- 19
net/umurmur/Makefile View File

@ -1,20 +1,20 @@
# #
# Copyright (C) 2009-2015 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
# #
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=umurmur PKG_NAME:=umurmur
PKG_VERSION:=0.2.16
PKG_VERSION:=0.2.16-20161126
PKG_RELEASE:=1 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_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_PROTO:=git
PKG_SOURCE_VERSION:=0.2.16
PKG_SOURCE_VERSION:=fac630135664fda26338d403041b6b6e558a2d6b
PKG_MIRROR_MD5SUM:=0e031baa5cebcdb4eb39a0cde572014f
PKG_MIRROR_HASH:=6773aebea9aea355a41425e946291bb47bc399f85483bd6532cf26dfc7c801e5
PKG_INSTALL:=1 PKG_INSTALL:=1
PKG_FIXUP:=autoreconf PKG_FIXUP:=autoreconf
@ -32,8 +32,7 @@ define Package/umurmur/Default
SUBMENU:=Instant Messaging SUBMENU:=Instant Messaging
TITLE:=uMurmur TITLE:=uMurmur
DEPENDS:=+libconfig +libprotobuf-c DEPENDS:=+libconfig +libprotobuf-c
URL:=http://code.google.com/p/umurmur
MAINTAINER:=Martin Johansson <martin@fatbob.nu>
URL:=http://umurmur.net
endef endef
define Package/umurmur/Default/description define Package/umurmur/Default/description
@ -52,16 +51,16 @@ define Package/umurmur-openssl/description
Uses OpenSSL library for SSL and crypto. Uses OpenSSL library for SSL and crypto.
endef endef
define Package/umurmur-polarssl
define Package/umurmur-mbedtls
$(call Package/umurmur/Default) $(call Package/umurmur/Default)
TITLE+= (with PolarSSL support)
DEPENDS+= +libpolarssl
VARIANT:=polarssl
TITLE+= (with mbed TLS support)
DEPENDS+= +libmbedtls
VARIANT:=mbedtls
endef endef
define Package/umurmur-polarssl/description
define Package/umurmur-mbedtls/description
$(call Package/umurmur/Default/description) $(call Package/umurmur/Default/description)
Uses the PolarSSL library for SSL and crypto.
Uses the mbed TLS library for SSL and crypto.
endef endef
define Build/Compile define Build/Compile
@ -75,7 +74,7 @@ define Package/umurmur-openssl/conffiles
/etc/umurmur.conf /etc/umurmur.conf
endef endef
Package/umurmur-polarssl/conffiles = $(Package/umurmur-openssl/conffiles)
Package/umurmur-mbedtls/conffiles = $(Package/umurmur-openssl/conffiles)
define Package/umurmur-openssl/install define Package/umurmur-openssl/install
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin
@ -87,17 +86,17 @@ define Package/umurmur-openssl/install
$(INSTALL_DIR) $(1)/etc/umurmur $(INSTALL_DIR) $(1)/etc/umurmur
endef endef
Package/umurmur-polarssl/install = $(Package/umurmur-openssl/install)
Package/umurmur-mbedtls/install = $(Package/umurmur-openssl/install)
ifeq ($(BUILD_VARIANT),openssl) ifeq ($(BUILD_VARIANT),openssl)
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
--with-ssl=openssl --with-ssl=openssl
endif endif
ifeq ($(BUILD_VARIANT),polarssl)
ifeq ($(BUILD_VARIANT),mbedtls)
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
--with-ssl=polarssl
--with-ssl=mbedtls
endif endif
$(eval $(call BuildPackage,umurmur-openssl)) $(eval $(call BuildPackage,umurmur-openssl))
$(eval $(call BuildPackage,umurmur-polarssl))
$(eval $(call BuildPackage,umurmur-mbedtls))

+ 11
- 0
net/umurmur/patches/010-mbedtls_fix_includes.patch View File

@ -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)

+ 0
- 17
net/umurmur/patches/10-Add-compile-time-check-for-POLARSSL_VERSION_FEATURES.patch View File

@ -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)

Loading…
Cancel
Save