From 9b876a523a5e100646e97017dfd0672536b0dbcfc0f46dd98e6d71bd55a3fcaa Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Thu, 7 Sep 2017 20:10:51 +0000
Subject: [PATCH] Accepting request 520649 from devel:libraries:c_c++

- Add patch to fix build of fat-arm:
  * nettle-3.3-fix-fat-arm.patch

- Build nettle with AES-NI support (bsc#1056980)

OBS-URL: https://build.opensuse.org/request/show/520649
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libnettle?expand=0&rev=27
---
 libnettle.changes            | 11 +++++++++++
 libnettle.spec               | 19 ++++++++++---------
 nettle-3.3-fix-fat-arm.patch | 29 +++++++++++++++++++++++++++++
 3 files changed, 50 insertions(+), 9 deletions(-)
 create mode 100644 nettle-3.3-fix-fat-arm.patch

diff --git a/libnettle.changes b/libnettle.changes
index 037a14e..6f806b1 100644
--- a/libnettle.changes
+++ b/libnettle.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Sep  4 08:10:25 UTC 2017 - asn@cryptomilk.org
+
+- Add patch to fix build of fat-arm:
+  * nettle-3.3-fix-fat-arm.patch
+
+-------------------------------------------------------------------
+Sun Sep  3 19:27:39 UTC 2017 - asn@cryptomilk.org
+
+- Build nettle with AES-NI support (bsc#1056980)
+
 -------------------------------------------------------------------
 Thu Feb  9 14:05:03 UTC 2017 - dimstar@opensuse.org
 
diff --git a/libnettle.spec b/libnettle.spec
index adb1455..1bb04cb 100644
--- a/libnettle.spec
+++ b/libnettle.spec
@@ -22,7 +22,7 @@ Name:           libnettle
 Version:        3.3
 Release:        0
 Summary:        Cryptographic Library
-License:        LGPL-2.1+ and GPL-2.0+
+License:        LGPL-2.1+ AND GPL-2.0+
 Group:          System/Libraries
 Url:            http://www.lysator.liu.se/~nisse/nettle/
 Source0:        https://ftp.gnu.org/gnu/nettle/nettle-%{version}.tar.gz
@@ -31,12 +31,13 @@ Source2:        %{name}.keyring
 Source3:        baselibs.conf
 # PATCH-FIX-UPSTREAM respect cflags while building
 Patch0:         nettle-respect-cflags.patch
+# PATCH-FIX-UPSTREAM Fix define to access secure_getenv() prototype
+Patch1:         nettle-3.3-fix-fat-arm.patch
 BuildRequires:  gmp-devel
 BuildRequires:  m4
 BuildRequires:  makeinfo
 BuildRequires:  pkgconfig
 Requires(post): %{install_info_prereq}
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 Nettle is a cryptographic library that is designed to fit easily in more or
@@ -81,7 +82,7 @@ Python, Pike, ...), in applications like LSH or GNUPG, or even in kernel space.
 
 %package -n nettle
 Summary:        Cryptographic Tools
-License:        LGPL-2.1+ and GPL-2.0+
+License:        LGPL-2.1+ AND GPL-2.0+
 Group:          Productivity/Security
 
 %description -n nettle
@@ -95,19 +96,23 @@ operations using the nettle library.
 %prep
 %setup -q -n nettle-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure \
-	--disable-static
+    --disable-static \
+    --enable-shared \
+    --enable-fat
 make %{?_smp_mflags}
 
 %install
-make %{?_smp_mflags} DESTDIR=%{buildroot} install
+%make_install
 
 %post   -n libnettle%{soname} -p /sbin/ldconfig
 %postun -n libnettle%{soname} -p /sbin/ldconfig
 %post   -n libhogweed%{hogweed_soname} -p /sbin/ldconfig
 %postun -n libhogweed%{hogweed_soname} -p /sbin/ldconfig
+
 %post -n libnettle-devel
 %install_info --info-dir="%{_infodir}" "%{_infodir}"/nettle.info%{ext_info}
 
@@ -118,18 +123,15 @@ make %{?_smp_mflags} DESTDIR=%{buildroot} install
 make check %{?_smp_mflags}
 
 %files -n libnettle%{soname}
-%defattr(-,root,root)
 %doc AUTHORS ChangeLog COPYING* NEWS README TODO
 %{_libdir}/libnettle.so.%{soname}
 %{_libdir}/libnettle.so.%{soname}.*
 
 %files -n libhogweed%{hogweed_soname}
-%defattr(-,root,root)
 %{_libdir}/libhogweed.so.%{hogweed_soname}
 %{_libdir}/libhogweed.so.%{hogweed_soname}.*
 
 %files -n libnettle-devel
-%defattr(-,root,root)
 %{_includedir}/nettle
 %{_libdir}/libnettle.so
 %{_libdir}/libhogweed.so
@@ -138,7 +140,6 @@ make check %{?_smp_mflags}
 %{_libdir}/pkgconfig/nettle.pc
 
 %files -n nettle
-%defattr(-,root,root)
 %doc AUTHORS ChangeLog COPYING* NEWS README TODO
 %{_bindir}/nettle-lfib-stream
 %{_bindir}/nettle-pbkdf2
diff --git a/nettle-3.3-fix-fat-arm.patch b/nettle-3.3-fix-fat-arm.patch
new file mode 100644
index 0000000..a8195b1
--- /dev/null
+++ b/nettle-3.3-fix-fat-arm.patch
@@ -0,0 +1,29 @@
+From ed25c358bab4cb57554a619e61e34b04a085d434 Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <asn@samba.org>
+Date: Mon, 4 Sep 2017 10:01:19 +0200
+Subject: [PATCH] fat-arm: Add missing define for _GNU_SOURCE
+
+If configure finds secure_getenv it wants to use it. However it fails to
+find the prototype because it is a GNU extension.
+
+Signed-off-by: Andreas Schneider <asn@samba.org>
+---
+ fat-arm.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/fat-arm.c b/fat-arm.c
+index 1156499d..d52b1439 100644
+--- a/fat-arm.c
++++ b/fat-arm.c
+@@ -29,6 +29,8 @@
+    not, see http://www.gnu.org/licenses/.
+ */
+ 
++#define _GNU_SOURCE
++
+ #if HAVE_CONFIG_H
+ # include "config.h"
+ #endif
+-- 
+2.14.1
+