Bump to 3.2.7

3 files changed, 11 insertions, 49 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 05748b69aee8..ef11a47f1d24 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = libreswan
 	pkgdesc = IPsec implementation with IKEv1 and IKEv2 keying protocols
-	pkgver = 3.26
-	pkgrel = 2
+	pkgver = 3.27
+	pkgrel = 1
 	url = https://libreswan.org/
 	arch = i686
 	arch = x86_64
@@ -23,12 +23,10 @@ pkgbase = libreswan
 	backup = etc/ipsec.conf
 	backup = etc/ipsec.secrets
 	backup = etc/pam.d/pluto
-	source = https://download.libreswan.org/libreswan-3.26.tar.gz
+	source = https://download.libreswan.org/libreswan-3.27.tar.gz
 	source = tmpfiles.conf
-	source = 910f69119b491c6d7abcc85cf8911d2fa012a135.patch
-	md5sums = 941cdac614cd6450f9e20820fe22c5fc
+	md5sums = a53f0545628cf3b5ccfc72a999388eb8
 	md5sums = 77399a739ee99f8bc54837684d7c39d5
-	md5sums = 8b65ded605b3a3839437c65a6302f31a
 
 pkgname = libreswan
 
diff --git a/910f69119b491c6d7abcc85cf8911d2fa012a135.patch b/910f69119b491c6d7abcc85cf8911d2fa012a135.patch
deleted file mode 100644
index 89a6436a2a26..000000000000
--- a/910f69119b491c6d7abcc85cf8911d2fa012a135.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 910f69119b491c6d7abcc85cf8911d2fa012a135 Mon Sep 17 00:00:00 2001
-From: Andrew Cagney <cagney@gnu.org>
-Date: Mon, 17 Sep 2018 11:56:56 -0400
-Subject: [PATCH] ecdsa: don't include NSS's "blapi.h", no longer needed and
- not on debian
-
-(not to be confused with "lbapit.h", which also looks suspect)
-
-Follow-up b3199806cc66de4888917ddc85b511b433e43d63 and
-2d093c9fb83c8104604e4b40defa4e41129577ea.  The latter
-relaced the call to ECDSA_VerifyDigest() with PK11_Verify().
----
- programs/pluto/keys.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/programs/pluto/keys.c b/programs/pluto/keys.c
-index b3df5802cf..bd9d8d8c6c 100644
---- a/programs/pluto/keys.c
-+++ b/programs/pluto/keys.c
-@@ -72,7 +72,6 @@
- #include <secerr.h>
- #include <secport.h>
- #include <time.h>
--#include <blapi.h>
- #include "lswconf.h"
- #include "lswnss.h"
- #include "secrets.h"
diff --git a/PKGBUILD b/PKGBUILD
index fd9e494ccb05..2b10f112ed12 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 # (Co-)Maintainer: Patrick Burroughs (Celti) <celti@celti.name>
 
 pkgname=libreswan
-pkgver=3.26
-pkgrel=2
+pkgver=3.27
+pkgrel=1
 pkgdesc="IPsec implementation with IKEv1 and IKEv2 keying protocols"
 arch=('i686' 'x86_64')
 url="https://libreswan.org/"
@@ -14,18 +14,9 @@ makedepends=('docbook-xsl' 'xmlto' 'flex' 'bison')
 conflicts=('freeswan' 'openswan' 'strongswan' 'ipsec-tools')
 backup=('etc/ipsec.conf' 'etc/ipsec.secrets' 'etc/pam.d/pluto')
 source=(https://download.libreswan.org/${pkgname}-${pkgver}.tar.gz
-        tmpfiles.conf
-        910f69119b491c6d7abcc85cf8911d2fa012a135.patch)
-md5sums=('941cdac614cd6450f9e20820fe22c5fc'
-         '77399a739ee99f8bc54837684d7c39d5'
-         '8b65ded605b3a3839437c65a6302f31a')
-
-prepare() {
-  cd $pkgname-$pkgver
-
-  patch -p1 < $srcdir/910f69119b491c6d7abcc85cf8911d2fa012a135.patch
-  sed -i "s/-lfreebl //" mk/config.mk
-}
+        tmpfiles.conf)
+md5sums=('a53f0545628cf3b5ccfc72a999388eb8'
+         '77399a739ee99f8bc54837684d7c39d5')
 
 build() {
   cd $pkgname-$pkgver
@@ -34,7 +25,7 @@ build() {
   export CFLAGS="$CFLAGS -Wno-error=sign-compare -Wno-error=unused-const-variable -Wno-error=implicit-fallthrough -Wno-error=maybe-uninitialized -Wno-error=pointer-compare -Wno-error=format-truncation"
 
   make \
-    USE_XAUTH=true USE_LIBCAP_NG=true USE_LEAK_DETECTIVE=false USE_LABELED_IPSEC=false USE_DH31=false \
+    USE_XAUTH=true USE_LIBCAP_NG=true USE_LEAK_DETECTIVE=false USE_LABELED_IPSEC=false \
     INC_USRLOCAL=/usr INC_MANDIR=share/man \
     FINALSBINDIR=/usr/bin FINALLIBEXECDIR=/usr/lib/ipsec \
     programs
@@ -44,7 +35,7 @@ package() {
   cd $pkgname-$pkgver
 
   make DESTDIR="$pkgdir/" \
-    USE_XAUTH=true USE_LIBCAP_NG=true USE_LEAK_DETECTIVE=false USE_LABELED_IPSEC=false USE_DH31=false \
+    USE_XAUTH=true USE_LIBCAP_NG=true USE_LEAK_DETECTIVE=false USE_LABELED_IPSEC=false \
     INC_USRLOCAL=/usr INC_MANDIR=share/man \
     FINALSBINDIR=/usr/bin FINALLIBEXECDIR=/usr/lib/ipsec \
     install