diff options
-rw-r--r-- | .SRCINFO | 4 | ||||
-rw-r--r-- | 910f69119b491c6d7abcc85cf8911d2fa012a135.patch | 27 | ||||
-rw-r--r-- | PKGBUILD | 14 |
3 files changed, 41 insertions, 4 deletions
@@ -1,7 +1,7 @@ pkgbase = libreswan pkgdesc = IPsec implementation with IKEv1 and IKEv2 keying protocols pkgver = 3.26 - pkgrel = 1 + pkgrel = 2 url = https://libreswan.org/ arch = i686 arch = x86_64 @@ -25,8 +25,10 @@ pkgbase = libreswan backup = etc/pam.d/pluto source = https://download.libreswan.org/libreswan-3.26.tar.gz source = tmpfiles.conf + source = 910f69119b491c6d7abcc85cf8911d2fa012a135.patch md5sums = 941cdac614cd6450f9e20820fe22c5fc md5sums = 77399a739ee99f8bc54837684d7c39d5 + md5sums = 8b65ded605b3a3839437c65a6302f31a pkgname = libreswan diff --git a/910f69119b491c6d7abcc85cf8911d2fa012a135.patch b/910f69119b491c6d7abcc85cf8911d2fa012a135.patch new file mode 100644 index 000000000000..89a6436a2a26 --- /dev/null +++ b/910f69119b491c6d7abcc85cf8911d2fa012a135.patch @@ -0,0 +1,27 @@ +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" @@ -4,7 +4,7 @@ pkgname=libreswan pkgver=3.26 -pkgrel=1 +pkgrel=2 pkgdesc="IPsec implementation with IKEv1 and IKEv2 keying protocols" arch=('i686' 'x86_64') url="https://libreswan.org/" @@ -14,9 +14,17 @@ 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) + tmpfiles.conf + 910f69119b491c6d7abcc85cf8911d2fa012a135.patch) md5sums=('941cdac614cd6450f9e20820fe22c5fc' - '77399a739ee99f8bc54837684d7c39d5') + '77399a739ee99f8bc54837684d7c39d5' + '8b65ded605b3a3839437c65a6302f31a') + +prepare() { + cd $pkgname-$pkgver + + patch -p1 < $srcdir/910f69119b491c6d7abcc85cf8911d2fa012a135.patch +} build() { cd $pkgname-$pkgver |