nettle: Update to 3.1

2 files changed, 12 insertions, 12 deletions

diff --git a/recipes/nettle/0001-ios-fix-build-using-.word-for-assembly-constants.patch b/recipes/nettle/0001-ios-fix-build-using-.word-for-assembly-constants.patch
index e5c2bd0c..d58ce410 100644
--- a/recipes/nettle/0001-ios-fix-build-using-.word-for-assembly-constants.patch
+++ b/recipes/nettle/0001-ios-fix-build-using-.word-for-assembly-constants.patch
@@ -1,18 +1,18 @@
-From 0bfeb3d7bec127ccd76e6fad937702f5aef12500 Mon Sep 17 00:00:00 2001
+From 9c2bd4a5fd64aa63558ea54bcd13d52eb50a9de9 Mon Sep 17 00:00:00 2001
 From: Andoni Morales Alastruey <ylatuya@gmail.com>
 Date: Tue, 29 Oct 2013 17:59:29 +0100
 Subject: [PATCH] ios: fix build using .word for assembly constants
 
 ---
- arm/ecc-521-modp.asm |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
+ arm/ecc-521-modp.asm | 4 ++++
+ 1 file changed, 4 insertions(+)
 
 diff --git a/arm/ecc-521-modp.asm b/arm/ecc-521-modp.asm
-index fe30580..287cac4 100644
+index c311a89..8cb5264 100644
 --- a/arm/ecc-521-modp.asm
 +++ b/arm/ecc-521-modp.asm
-@@ -35,7 +35,11 @@ define(<N>, <lr>)
- 	C ecc_521_modp (const struct ecc_curve *ecc, mp_limb_t *rp)
+@@ -48,7 +48,11 @@ define(<N>, <lr>)
+ 	C ecc_521_modp (const struct ecc_modulo *m, mp_limb_t *rp)
  	.text
  .Lc511:
 +#ifdef __APPLE__
@@ -24,5 +24,5 @@ index fe30580..287cac4 100644
  	.align 2
  
 -- 
-1.7.4.4
+2.6.1
 
diff --git a/recipes/nettle/nettle.recipe b/recipes/nettle/nettle.recipe
index 2ef2f969..9c448f97 100644
--- a/recipes/nettle/nettle.recipe
+++ b/recipes/nettle/nettle.recipe
@@ -10,9 +10,9 @@ from cerbero.tools.libtool import LibtoolLibrary
 
 class Recipe(recipe.Recipe):
     name = 'nettle'
-    version = '2.7.1'
+    version = '3.1'
     stype = SourceType.TARBALL
-    url = 'http://www.lysator.liu.se/~nisse/archive/nettle-2.7.1.tar.gz'
+    url = 'http://www.lysator.liu.se/~nisse/archive/nettle-{0}.tar.gz'.format(version)
 
     licenses = [License.LGPLv2_1Plus]
     configure_options = '--enable-shared --enable-public-key'
@@ -20,7 +20,7 @@ class Recipe(recipe.Recipe):
     patches = ['0001-ios-fix-build-using-.word-for-assembly-constants.patch']
     allow_parallel_build = False
 
-    files_bins = ['nettle-hash', 'nettle-lfib-stream']
+    files_bins = ['nettle-hash', 'nettle-lfib-stream', 'nettle-pbkdf2']
     files_libs = ['libnettle', 'libhogweed']
     files_devel = ['include/nettle', 'lib/pkgconfig/nettle.pc', 'lib/pkgconfig/hogweed.pc']
 
@@ -32,7 +32,7 @@ class Recipe(recipe.Recipe):
 
     def post_install(self):
         # Create libtool libraries (.la)
-        libtool_la = LibtoolLibrary('nettle', 4, 4, 0, self.config.libdir,
+        libtool_la = LibtoolLibrary('nettle', 6, 0, 0, self.config.libdir,
                 self.config.target_platform)
         libtool_la.save()
         deps = ['nettle', 'gmp']
@@ -43,7 +43,7 @@ class Recipe(recipe.Recipe):
         if self.config.target_platform != Platform.WINDOWS:
             deps += ['-lc']
 
-        libtool_la = LibtoolLibrary('hogweed', 2, 2, 0, self.config.libdir,
+        libtool_la = LibtoolLibrary('hogweed', 4, 0, 0, self.config.libdir,
                 self.config.target_platform, deps)
         libtool_la.save()