From mboxrd@z Thu Jan 1 00:00:00 1970 From: git@ipfire.org To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 2bfd31a26187d65236ee6e0a0d22def30e25b0e5 Date: Sun, 05 Mar 2017 18:15:14 +0000 Message-ID: <20170305181514.B381B10853C3@git01.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1580079441339442248==" List-Id: --===============1580079441339442248== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 2bfd31a26187d65236ee6e0a0d22def30e25b0e5 (commit) via 6006aa84d7770857cbee4d7b9aa65f69ec5b715d (commit) via f07f9c8ed3b543f804670baac900c630f491e2ac (commit) from 198b6f65d43905a4586aa7cf37f142264a8e4f5b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 2bfd31a26187d65236ee6e0a0d22def30e25b0e5 Author: Michael Tremer Date: Sun Mar 5 18:14:50 2017 +0000 core110: Ship updated conntrack-tools =20 Signed-off-by: Michael Tremer commit 6006aa84d7770857cbee4d7b9aa65f69ec5b715d Author: Michael Tremer Date: Sun Mar 5 18:14:33 2017 +0000 core110: Ship updated nettle =20 Signed-off-by: Michael Tremer commit f07f9c8ed3b543f804670baac900c630f491e2ac Author: Matthias Fischer Date: Sun Mar 5 18:19:18 2017 +0100 nettle: Update to 3.3 =20 Added '--disable-documentation' because we don't need this. =20 Best, Matthias =20 Signed-off-by: Matthias Fischer Signed-off-by: Michael Tremer ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/nettle | 7 +++---- .../{oldcore/66 =3D> core/110}/filelists/conntrack-tools | 0 config/rootfiles/{oldcore/101 =3D> core/110}/filelists/nettle | 0 lfs/nettle | 12 +++++++---= -- 4 files changed, 10 insertions(+), 9 deletions(-) copy config/rootfiles/{oldcore/66 =3D> core/110}/filelists/conntrack-tools (= 100%) copy config/rootfiles/{oldcore/101 =3D> core/110}/filelists/nettle (100%) Difference in files: diff --git a/config/rootfiles/common/nettle b/config/rootfiles/common/nettle index 5d5777b..3f23cb7 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/config/rootfiles/core/110/filelists/conntrack-tools b/config/roo= tfiles/core/110/filelists/conntrack-tools new file mode 120000 index 0000000..88fbe06 --- /dev/null +++ b/config/rootfiles/core/110/filelists/conntrack-tools @@ -0,0 +1 @@ +../../../common/conntrack-tools \ No newline at end of file diff --git a/config/rootfiles/core/110/filelists/nettle b/config/rootfiles/co= re/110/filelists/nettle new file mode 120000 index 0000000..f0dba7a --- /dev/null +++ b/config/rootfiles/core/110/filelists/nettle @@ -0,0 +1 @@ +../../../common/nettle \ No newline at end of file diff --git a/lfs/nettle b/lfs/nettle index d0a3e5a..96f0e32 100644 --- a/lfs/nettle +++ b/lfs/nettle @@ -1,7 +1,7 @@ ############################################################################= ### # = # # IPFire.org - A linux based firewall = # -# Copyright (C) 2015 IPFire Team = # +# Copyright (C) 2017 IPFire Team = # # = # # 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 @@ =20 include Config =20 -VER =3D 3.2 +VER =3D 3.3 =20 THISAPP =3D nettle-$(VER) DL_FILE =3D $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects =3D $(DL_FILE) =20 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) =20 -$(DL_FILE)_MD5 =3D afb15b4764ebf1b4e6d06c62bd4d29e4 +$(DL_FILE)_MD5 =3D 10f969f78a463704ae73529978148dbe =20 install : $(TARGET) =20 @@ -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=3D/usr --disable-static=20 + cd $(DIR_APP) && ./configure \ + --prefix=3D/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) hooks/post-receive -- IPFire 2.x development tree --===============1580079441339442248==--