From 26050d2f04b5eb8138cb65b9399d4d4e59577c55 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 4 Jun 2015 11:12:49 +0200
Subject: update gnutls to latest stable version, remove openssl-compat
subpackage
---
package/gnutls/Makefile | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
(limited to 'package/gnutls')
diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile
index 227a77810..88c5a5b29 100644
--- a/package/gnutls/Makefile
+++ b/package/gnutls/Makefile
@@ -4,9 +4,9 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= gnutls
-PKG_VERSION:= 3.4.0
+PKG_VERSION:= 3.4.1
PKG_RELEASE:= 1
-PKG_HASH:= b422544431bfb5c4e24a605b6c793ee34792cc791c1060562ab46eaf77f3472e
+PKG_HASH:= e9b5f58becf34756464216056cd5abbf04315eda80a374d02699dee83f80b12e
PKG_DESCR:= transport layer security library
PKG_SECTION:= libs/crypto
PKG_DEPENDS:= libgcrypt libtasn1 zlib libnettle libgmp
@@ -20,13 +20,12 @@ PKG_OPTS:= dev
PKG_BUILDDEP_UCLIBC:= libiconv-tiny
PKG_BUILDDEP_UCLIBC_NG:=libiconv-tiny
-PKG_SUBPKGS:= LIBGNUTLS GNUTLS_UTILS LIBGNUTLS_EXTRA LIBGNUTLS_OPENSSL
+PKG_SUBPKGS:= LIBGNUTLS GNUTLS_UTILS LIBGNUTLS_EXTRA
PKGSD_GNUTLS_UTILS:= transport layer security utilities
PKGSS_GNUTLS_UTILS:= libgnutls libgnutls-extra
PKGSC_GNUTLS_UTILS:= app/crypto
PKGSC_LIBGNUTLS:= libs/crypto
PKGSC_LIBGNUTLS_EXTRA:= libs/crypto
-PKGSC_LIBGNUTLS_OPENSSL:= libs/crypto
PKG_FLAVOURS_LIBGNUTLS:= WITH_CRYPTODEV
PKGFD_WITH_CRYPTODEV:= enable support for cryptodev-linux
@@ -37,7 +36,6 @@ include $(ADK_TOPDIR)/mk/package.mk
$(eval $(call PKG_template,LIBGNUTLS,libgnutls,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKGSC_LIBGNUTLS),$(PKG_OPTS)))
$(eval $(call PKG_template,GNUTLS_UTILS,gnutls-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_GNUTLS_UTILS),$(PKGSD_GNUTLS_UTILS),$(PKGSC_GNUTLS_UTILS)))
$(eval $(call PKG_template,LIBGNUTLS_EXTRA,libgnutls-extra,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKGSC_LIBGNUTLS_EXTRA)))
-$(eval $(call PKG_template,LIBGNUTLS_OPENSSL,libgnutls-openssl,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKGSC_LIBGNUTLS_OPENSSL)))
ifneq ($(ADK_PACKAGE_LIBGNUTLS_WITH_CRYPTODEV),)
CONFIGURE_ARGS+= --enable-cryptodev
@@ -59,11 +57,6 @@ libgnutls-extra-install:
$(CP) $(WRKINST)/usr/lib/libgnutlsxx.so* \
$(IDIR_LIBGNUTLS_EXTRA)/usr/lib
-libgnutls-openssl-install:
- $(INSTALL_DIR) $(IDIR_LIBGNUTLS_OPENSSL)/usr/lib
- $(CP) $(WRKINST)/usr/lib/libgnutls-openssl.so* \
- $(IDIR_LIBGNUTLS_OPENSSL)/usr/lib
-
gnutls-utils-install:
$(INSTALL_DIR) $(IDIR_GNUTLS_UTILS)/usr/bin
$(CP) $(WRKINST)/usr/bin/{{cert,srp,psk}tool,gnutls-{cli,serv}} \
--
cgit v1.2.3