nettle: Update to version 3.1

This build enables FAT binaries for ARM and adds a compat package
for programs that are linked against older versions of nettle.

Fixes #10794

diff --git a/compat-nettle/compat-nettle.nm b/compat-nettle/compat-nettle.nm
new file mode 100644 (file)
index 0000000..5e17e3d
--- /dev/null
+++ b/compat-nettle/compat-nettle.nm
@@ -0,0 +1,64 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
+###############################################################################
+
+name       = compat-nettle
+version    = 2.7.1
+release    = 1
+thisapp    = nettle-%{version}
+
+groups     = System/Libraries
+url        = http://www.lysator.liu.se/~nisse/nettle/
+license    = LGPL
+summary    = A low-level cryptographic library.
+
+description
+       Nettle is a cryptographic library that is designed to fit easily in
+       more or less any context: In crypto toolkits for object-oriented
+       languages (C++, Python, Pike, ...), in applications like LSH or GNUPG,
+       or even in kernel space.
+end
+
+source_dl  = http://www.lysator.liu.se/~nisse/archive/
+
+build
+       requires
+               gmp-devel
+               m4
+       end
+
+       configure_options += \
+               --enable-shared
+
+       test
+               make check
+       end
+
+       install
+               # Install just the library and no headers.
+               mkdir -pv %{BUILDROOT}%{libdir}
+
+               install -m 755 libhogweed.so %{BUILDROOT}%{libdir}/libhogweed.so.2.5
+               ln -svf libhogweed.so.2.5 %{BUILDROOT}%{libdir}/libhogweed.so.2
+
+               install -m 755 libnettle.so %{BUILDROOT}%{libdir}/libnettle.so.4.7
+               ln -svf libnettle.so.4.7 %{BUILDROOT}%{libdir}/libnettle.so.4
+       end
+end
+
+packages
+       package %{name}
+               provides
+                       nettle = %{thisver}
+               end
+
+               obsoletes
+                       nettle <= %{thisver}
+               end
+       end
+
+       package %{name}-debuginfo
+               template DEBUGINFO
+       end
+end

diff --git a/nettle/nettle.nm b/nettle/nettle.nm
index 75becbef0f4ef29233a375a010e94a7fe867ede8..efbffe2b4962ed853938574714b260b39ad3dc99 100644 (file)
--- a/nettle/nettle.nm
+++ b/nettle/nettle.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = nettle
-version    = 2.7.1
+version    = 3.1
 release    = 1
 
 groups     = System/Libraries
@@ -30,6 +30,22 @@ build
        configure_options += \
                --enable-shared
 
+       enable_fat = 0
+
+       # Does not work. Binaries are immediately crashing
+       #if "%{DISTRO_ARCH}" == "x86_64"
+       #       enable_fat = 1
+       #end
+
+       if "%{DISTRO_PLATFORM}" == "arm"
+               enable_fat = 1
+       end
+
+       if "%{enable_fat}" == "1"
+               configure_options += \
+                       --enable-fat
+       end
+
        test
                make check
        end