[ptxdist] [PATCH 12/22] libsodium: version bump 1.0.11 -> 1.0.16

[Clemens Gruber]

Signed-off-by: Clemens Gruber <clemens.gru...@pqgruber.com>
---
 rules/libsodium.in   |  1 +
 rules/libsodium.make | 24 ++++++++++++++++++++----
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/rules/libsodium.in b/rules/libsodium.in
index e621a1bb9..cfdd4fc3a 100644
--- a/rules/libsodium.in
+++ b/rules/libsodium.in
@@ -2,6 +2,7 @@
 
 config LIBSODIUM
        bool
+       select LIBC_PTHREAD
        prompt "libsodium"
        help
          Sodium is a new, easy-to-use software library for encryption,
diff --git a/rules/libsodium.make b/rules/libsodium.make
index d8036d743..be91fec90 100644
--- a/rules/libsodium.make
+++ b/rules/libsodium.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LIBSODIUM) += libsodium
 #
 # Paths and names
 #
-LIBSODIUM_VERSION      := 1.0.11
-LIBSODIUM_MD5          := b58928d035064b2a46fb564937b83540
+LIBSODIUM_VERSION      := 1.0.16
+LIBSODIUM_MD5          := 37b18839e57e7a62834231395c8e962b
 LIBSODIUM              := libsodium-$(LIBSODIUM_VERSION)
 LIBSODIUM_SUFFIX       := tar.gz
 LIBSODIUM_URL          := 
https://github.com/jedisct1/libsodium/releases/download/$(LIBSODIUM_VERSION)/$(LIBSODIUM).$(LIBSODIUM_SUFFIX)
@@ -35,7 +35,23 @@ LIBSODIUM_LICENSE    := ISC
 LIBSODIUM_CONF_TOOL    := autoconf
 LIBSODIUM_CONF_OPT     := \
        $(CROSS_AUTOCONF_USR) \
-       --disable-static
+       --enable-ssp \
+       --$(call ptx/endis, PTXCONF_ARCH_X86)-asm \
+       --enable-pie \
+       --disable-blocking-random \
+       --disable-minimal \
+       --disable-debug \
+       --disable-opt \
+       --disable-valgrind \
+       --disable-valgrind-memcheck \
+       --disable-valgrind-helgrind \
+       --disable-valgrind-drd \
+       --disable-valgrind-sgcheck \
+       --enable-soname-versions \
+       --disable-static \
+       --with-pthreads \
+       --without-safecode \
+       --without-ctgrind
 
 # ----------------------------------------------------------------------------
 # Target-Install
@@ -48,7 +64,7 @@ $(STATEDIR)/libsodium.targetinstall:
        @$(call install_fixup, libsodium, PRIORITY, optional)
        @$(call install_fixup, libsodium, SECTION, base)
        @$(call install_fixup, libsodium, AUTHOR, "Clemens Gruber 
<clemens.gru...@pqgruber.com>")
-       @$(call install_fixup, libsodium, DESCRIPTION, missing)
+       @$(call install_fixup, libsodium, DESCRIPTION, "The sodium crypto 
library")
 
        @$(call install_lib, libsodium, 0, 0, 0644, libsodium)
 
-- 
2.15.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de