From f2b27cdef25ec82ff70188ed9e8c542b7e44bc87 Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos Date: Mon, 4 Aug 2014 23:05:17 +0200 Subject: [PATCH] gnutls: updated to gnutls 3.2.16 Signed-off-by: Nikos Mavrogiannopoulos --- libs/gnutls/Makefile | 4 ++-- libs/gnutls/patches/0001-nn-hash.patch | 28 -------------------------- 2 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 libs/gnutls/patches/0001-nn-hash.patch diff --git a/libs/gnutls/Makefile b/libs/gnutls/Makefile index a94a4af6b..3764b4408 100644 --- a/libs/gnutls/Makefile +++ b/libs/gnutls/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gnutls -PKG_VERSION:=3.2.15 +PKG_VERSION:=3.2.16 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2 -PKG_MD5SUM:=ec3b06f80e312137386c5d322183ca5a +PKG_MD5SUM:=d9a3fb49121b49bc332bfe9c3f49b005 PKG_MAINTAINER:=Nikos Mavrogiannopoulos PKG_INSTALL:=1 diff --git a/libs/gnutls/patches/0001-nn-hash.patch b/libs/gnutls/patches/0001-nn-hash.patch deleted file mode 100644 index 948c1f292..000000000 --- a/libs/gnutls/patches/0001-nn-hash.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/lib/accelerated/x86/x86-common.h b/lib/accelerated/x86/x86-common.h -index 03fc8de..647c7d6 100644 ---- a/lib/accelerated/x86/x86-common.h -+++ b/lib/accelerated/x86/x86-common.h -@@ -29,11 +29,13 @@ extern unsigned int _gnutls_x86_cpuid_s[4]; - void gnutls_cpuid(unsigned int func, unsigned int *ax, unsigned int *bx, - unsigned int *cx, unsigned int *dx); - --#ifdef ASM_X86_32 -+# ifdef ASM_X86_32 - unsigned int gnutls_have_cpuid(void); --#else --#define gnutls_have_cpuid() 1 --#endif /* ASM_X86_32 */ -+# else -+# define gnutls_have_cpuid() 1 -+# endif /* ASM_X86_32 */ -+ -+#endif - - #define NN_HASH(name, update_func, digest_func, NAME) { \ - #name, \ -@@ -44,5 +46,3 @@ unsigned int gnutls_have_cpuid(void); - (nettle_hash_update_func *) update_func, \ - (nettle_hash_digest_func *) digest_func \ - } -- --#endif