From ed718cec554577506d02b2e66f8dcedfe6948b04 Mon Sep 17 00:00:00 2001
From: Alexey Pavlov <alexpux@gmail.com>
Date: Wed, 12 Oct 2016 12:22:43 +0300
Subject: [PATCH] nettle: Update to 3.3

---
 nettle/2.6-soname.patch       | 19 -------------------
 nettle/PKGBUILD               |  9 +++------
 nettle/nettle-2.6-msys2.patch | 20 ++++++++++----------
 3 files changed, 13 insertions(+), 35 deletions(-)
 delete mode 100644 nettle/2.6-soname.patch

diff --git a/nettle/2.6-soname.patch b/nettle/2.6-soname.patch
deleted file mode 100644
index 38b9448f..00000000
--- a/nettle/2.6-soname.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- origsrc/nettle-2.6/configure.ac	2013-01-14 15:44:12.000000000 -0600
-+++ src/nettle-2.6/configure.ac	2013-05-10 14:27:13.707192500 -0500
-@@ -278,12 +278,12 @@ case "$host_os" in
-     # linking to the DLL, is installed into the lib dir.
-     case "$host_os" in
-       mingw32*)
--        LIBNETTLE_FORLINK='libnettle-$(LIBNETTLE_MAJOR)-$(LIBNETTLE_MINOR).dll'
--        LIBHOGWEED_FORLINK='libhogweed-$(LIBHOGWEED_MAJOR)-$(LIBHOGWEED_MINOR).dll'
-+        LIBNETTLE_FORLINK='libnettle-$(LIBNETTLE_MAJOR).dll'
-+        LIBHOGWEED_FORLINK='libhogweed-$(LIBHOGWEED_MAJOR).dll'
-         ;;
-       cygwin*)
--        LIBNETTLE_FORLINK='cygnettle-$(LIBNETTLE_MAJOR)-$(LIBNETTLE_MINOR).dll'
--        LIBHOGWEED_FORLINK='cyghogweed-$(LIBHOGWEED_MAJOR)-$(LIBHOGWEED_MINOR).dll'
-+        LIBNETTLE_FORLINK='cygnettle-$(LIBNETTLE_MAJOR).dll'
-+        LIBHOGWEED_FORLINK='cyghogweed-$(LIBHOGWEED_MAJOR).dll'
-         ;;
-     esac
-     if test "x$cross_compiling" = xyes ; then
diff --git a/nettle/PKGBUILD b/nettle/PKGBUILD
index 0399c5c0..9f9769e3 100644
--- a/nettle/PKGBUILD
+++ b/nettle/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Alexey Pavlov <Alexpux@gmail.com>
 
 pkgname=('nettle' 'libnettle' 'libhogweed' 'libnettle-devel')
-pkgver=3.2
+pkgver=3.3
 pkgrel=1
 pkgdesc="A low-level cryptographic library"
 arch=('i686' 'x86_64')
@@ -11,20 +11,17 @@ groups=('net-utils')
 depends=('gmp')
 makedepends=('gmp-devel')
 source=(https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig}
-        2.6-soname.patch
         nettle-2.6-msys2.patch
         3.2-dlopen-test-msys-test.patch)
 validpgpkeys=('343C2FF0FBEE5EC2EDBEF399F3599FF828C67298')
-sha256sums=('ea4283def236413edab5a4cf9cf32adf540c8df1b9b67641cfc2302fca849d97'
+sha256sums=('46942627d5d0ca11720fec18d81fc38f7ef837ea4197c1f630e71ce0d470b11e'
             'SKIP'
-            '489c8de40d074a8555e40ff4a82069cee260481c5ecace64d4b2acf9d7a64409'
-            'fa52086b5a246a1536293c9a53fbc053ac06c028e3cd501295660c044b436a9f'
+            '3c83eeb093ae056ba0a583d38ed171891509ab70e39057594ee8f30885db0d99'
             'b682165983572d89c491e6d2d8307d7a04662b2de332cebd0f6766459519151c')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  patch -p2 -i ${srcdir}/2.6-soname.patch
   patch -p1 -i ${srcdir}/nettle-2.6-msys2.patch
   patch -p1 -i ${srcdir}/3.2-dlopen-test-msys-test.patch
   autoreconf -fi
diff --git a/nettle/nettle-2.6-msys2.patch b/nettle/nettle-2.6-msys2.patch
index 48675ad9..4c26139b 100644
--- a/nettle/nettle-2.6-msys2.patch
+++ b/nettle/nettle-2.6-msys2.patch
@@ -1,6 +1,6 @@
-diff -Naur nettle-2.6-orig/aclocal.m4 nettle-2.6/aclocal.m4
---- nettle-2.6-orig/aclocal.m4	2013-01-14 21:44:12.000000000 +0000
-+++ nettle-2.6/aclocal.m4	2013-04-24 18:30:00.456054700 +0000
+diff -Naur nettle-3.3-orig/aclocal.m4 nettle-3.3/aclocal.m4
+--- nettle-3.3-orig/aclocal.m4	2013-01-14 21:44:12.000000000 +0000
++++ nettle-3.3/aclocal.m4	2013-04-24 18:30:00.456054700 +0000
 @@ -35,6 +35,7 @@
  	# Could also use -fpic, depending on the number of symbol references
  	solaris*)	CCPIC="-fPIC" ;;
@@ -9,10 +9,10 @@ diff -Naur nettle-2.6-orig/aclocal.m4 nettle-2.6/aclocal.m4
  	mingw32*)	CCPIC="" ;;
  	*)		CCPIC="-fpic" ;;
        esac
-diff -Naur nettle-2.6-orig/configure.ac nettle-2.6/configure.ac
---- nettle-2.6-orig/configure.ac	2013-01-14 21:44:12.000000000 +0000
-+++ nettle-2.6/configure.ac	2013-04-24 18:33:10.252929700 +0000
-@@ -271,7 +271,7 @@
+diff -Naur nettle-3.3-orig/configure.ac nettle-3.3/configure.ac
+--- nettle-3.3-orig/configure.ac	2013-01-14 21:44:12.000000000 +0000
++++ nettle-3.3/configure.ac	2013-04-24 18:33:10.252929700 +0000
+@@ -569,7 +569,7 @@
  W64_ABI=no
  
  case "$host_os" in
@@ -21,9 +21,9 @@ diff -Naur nettle-2.6-orig/configure.ac nettle-2.6/configure.ac
      # The actual DLLs, e.g. libnettle-$major-$minor.dll, are normally
      # installed into the bin dir (or more exactly $libdir/../bin, for
      # automake), while libnettle.dll.a, which is a stub file for
-@@ -285,6 +285,10 @@
-         LIBNETTLE_FORLINK='cygnettle-$(LIBNETTLE_MAJOR)-$(LIBNETTLE_MINOR).dll'
-         LIBHOGWEED_FORLINK='cyghogweed-$(LIBHOGWEED_MAJOR)-$(LIBHOGWEED_MINOR).dll'
+@@ -583,6 +583,10 @@
+         LIBNETTLE_FORLINK='cygnettle-$(LIBNETTLE_MAJOR).dll'
+         LIBHOGWEED_FORLINK='cyghogweed-$(LIBHOGWEED_MAJOR).dll'
          ;;
 +      msys*)
 +        LIBNETTLE_FORLINK='msys-nettle-$(LIBNETTLE_MAJOR).dll'