From: Matthias Fischer <matthias.fischer@ipfire.org>
Date: Sun, 5 Mar 2017 17:19:18 +0000 (+0100)
Subject: nettle: Update to 3.3
X-Git-Tag: v2.19-core110^2~33
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f07f9c8ed3b543f804670baac900c630f491e2ac;p=ipfire-2.x.git

nettle: Update to 3.3

Added '--disable-documentation' because we don't need this.

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/rootfiles/common/nettle b/config/rootfiles/common/nettle
index 5d5777b18a..3f23cb70ab 100644
--- a/config/rootfiles/common/nettle
+++ b/config/rootfiles/common/nettle
@@ -39,6 +39,7 @@
 #usr/include/nettle/md4.h
 #usr/include/nettle/md5-compat.h
 #usr/include/nettle/md5.h
+#usr/include/nettle/memops.h
 #usr/include/nettle/memxor.h
 #usr/include/nettle/nettle-meta.h
 #usr/include/nettle/nettle-stdint.h
@@ -63,11 +64,9 @@
 #usr/include/nettle/yarrow.h
 usr/lib/libhogweed.so
 usr/lib/libhogweed.so.4
-usr/lib/libhogweed.so.4.2
+usr/lib/libhogweed.so.4.3
 #usr/lib/libnettle.so
 usr/lib/libnettle.so.6
-usr/lib/libnettle.so.6.2
+usr/lib/libnettle.so.6.3
 #usr/lib/pkgconfig/hogweed.pc
 #usr/lib/pkgconfig/nettle.pc
-usr/share/doc/nettle-3.2
-#usr/share/info/nettle.info
diff --git a/lfs/nettle b/lfs/nettle
index d0a3e5a2b6..96f0e32ab3 100644
--- a/lfs/nettle
+++ b/lfs/nettle
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2015  IPFire Team  <info@ipfire.org>                          #
+# Copyright (C) 2017  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.2
+VER        = 3.3
 
 THISAPP    = nettle-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = afb15b4764ebf1b4e6d06c62bd4d29e4
+$(DL_FILE)_MD5 = 10f969f78a463704ae73529978148dbe
 
 install : $(TARGET)
 
@@ -70,10 +70,12 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --disable-static 
+	cd $(DIR_APP) && ./configure \
+	--prefix=/usr \
+	--disable-documentation \
+	--disable-static
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	chmod -v 755 /usr/lib/lib{hogweed,nettle}.so
-	install -v -m755 -d /usr/share/doc/nettle-3.2
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)