From: Erik Kapfer <erik.kapfer@ipfire.org>
Date: Tue, 7 Jul 2015 21:52:43 +0000 (+0200)
Subject: nettle: Update to 3.1.1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=373c622aa65b113e945e5570383c8d8eb2702c19;p=people%2Fms%2Fipfire-2.x.git

nettle: Update to 3.1.1

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/rootfiles/common/nettle b/config/rootfiles/common/nettle
index e6e4552959..7845a34bc4 100644
--- a/config/rootfiles/common/nettle
+++ b/config/rootfiles/common/nettle
@@ -20,6 +20,7 @@
 #usr/include/nettle/chacha-poly1305.h
 #usr/include/nettle/chacha.h
 #usr/include/nettle/ctr.h
+#usr/include/nettle/curve25519.h
 #usr/include/nettle/des-compat.h
 #usr/include/nettle/des.h
 #usr/include/nettle/dsa-compat.h
@@ -28,6 +29,7 @@
 #usr/include/nettle/ecc-curve.h
 #usr/include/nettle/ecc.h
 #usr/include/nettle/ecdsa.h
+#usr/include/nettle/eddsa.h
 #usr/include/nettle/gcm.h
 #usr/include/nettle/gosthash94.h
 #usr/include/nettle/hmac.h
@@ -57,15 +59,15 @@
 #usr/include/nettle/sha3.h
 #usr/include/nettle/twofish.h
 #usr/include/nettle/umac.h
+#usr/include/nettle/version.h
 #usr/include/nettle/yarrow.h
-#usr/lib/libhogweed.a
-#usr/lib/libhogweed.so
-usr/lib/libhogweed.so.3
-usr/lib/libhogweed.so.3.0
-#usr/lib/libnettle.a
+usr/lib/libhogweed.so
+usr/lib/libhogweed.so.4
+usr/lib/libhogweed.so.4.1
 #usr/lib/libnettle.so
-usr/lib/libnettle.so.5
-usr/lib/libnettle.so.5.0
+usr/lib/libnettle.so.6
+usr/lib/libnettle.so.6.1
 #usr/lib/pkgconfig/hogweed.pc
 #usr/lib/pkgconfig/nettle.pc
+#usr/share/doc/nettle-3.1.1
 #usr/share/info/nettle.info
diff --git a/lfs/nettle b/lfs/nettle
index 0ea42f343f..b48b405e37 100644
--- a/lfs/nettle
+++ b/lfs/nettle
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2015  IPFire Team  <info@ipfire.org>                          #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.0
+VER        = 3.1.1
 
 THISAPP    = nettle-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = f64b1bf1e774b7ae6e507318e340250e
+$(DL_FILE)_MD5 = b40fa88dc32f37a182b6b42092ebb144
 
 install : $(TARGET)
 
@@ -73,7 +73,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && ./configure \
 		--prefix=/usr \
 		--enable-shared
+
 	cd $(DIR_APP) && make $(MAKETUNING)
+	cd $(DIR_APP) && sed -i '/^install-here/ s/ install-static//' Makefile
 	cd $(DIR_APP) && make install
+
+	chmod -v 755 /usr/lib/lib{hogweed,nettle}.so
+	install -v -m755 -d /usr/share/doc/nettle-3.1.1
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)