aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWill Sinatra <wpsinatra@gmail.com>2020-09-23 15:55:14 -0400
committerLeo <thinkabit.ukim@gmail.com>2020-09-23 21:41:06 +0000
commit232dbdf0f580b47060e06a6aba844d956faa2144 (patch)
treede4de606e7c24e5fc3cbc6977a90065e879dbcf1
parent0f47d481916ac47b0d1f243e96975d3e48822514 (diff)
downloadaports-232dbdf0f580b47060e06a6aba844d956faa2144.tar.gz
aports-232dbdf0f580b47060e06a6aba844d956faa2144.tar.bz2
aports-232dbdf0f580b47060e06a6aba844d956faa2144.tar.xz
community/libreswan: fix assertion failure
Fix assertion failure in nss IKE encryption handling; fixes issue #11656
-rw-r--r--community/libreswan/APKBUILD8
-rw-r--r--community/libreswan/fix-includes.patch1
-rw-r--r--community/libreswan/nss_compat.patch13
3 files changed, 19 insertions, 3 deletions
diff --git a/community/libreswan/APKBUILD b/community/libreswan/APKBUILD
index f257515039..60b7a8ed4e 100644
--- a/community/libreswan/APKBUILD
+++ b/community/libreswan/APKBUILD
@@ -1,7 +1,8 @@
+# Contributor: Will Sinatra <wpsinatra@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libreswan
pkgver=3.32
-pkgrel=0
+pkgrel=1
pkgdesc="IPsec implementation for Linux"
url="https://libreswan.org"
arch="all"
@@ -15,7 +16,7 @@ makedepends="bison flex coreutils bash xmlto
subpackages="$pkgname-doc $pkgname-openrc"
source="https://download.libreswan.org/libreswan-$pkgver.tar.gz
fix-includes.patch
-
+ nss_compat.patch
Makefile.inc.local"
# secfixes:
@@ -47,5 +48,6 @@ package() {
install
}
sha512sums="bb65512351059e2fac6f1c3ed1e291eabd6835faacf6d9c58649dd71dab1bb4fe6d6074178dea6dea01f24d39f3fbefd84c6060e4d8436b5d057fa55ae4467f3 libreswan-3.32.tar.gz
-ad1d79c4f728c3e2508190b71bd36fba43c4307e06ecee231d7d8899d7c8de6b2a988311cc96b7689725b06dc2130a637662eb1c8c5f3fdb325727d50c752211 fix-includes.patch
+3805667f086034b2a66c11b5c43a4aeae2e428c8df6bb07921a8ff585fa4f69396d74a71374b705a57bc8da51429db3bf70f849efd17857b1d87d86e3517ab89 fix-includes.patch
+4729de7d7c4157104574b2d6a86ae399ca92898269e4a6e0363a8ce464351b0e1011137895f5e17df23a60049bad564644cd94216e10fe426897f3fdea347328 nss_compat.patch
36415fae9b6674d66b7728fbc1df4bb3c4fcb16f0bbe88ead1f23e553bb51a9deb288a8659a0050a3fb1e14c3dbb8fb8524e9ef48fb6842dc94b11b758349c58 Makefile.inc.local"
diff --git a/community/libreswan/fix-includes.patch b/community/libreswan/fix-includes.patch
index a3a72fa1ea..e47e0761c1 100644
--- a/community/libreswan/fix-includes.patch
+++ b/community/libreswan/fix-includes.patch
@@ -1,3 +1,4 @@
+#Description: include limits.h in pluto
diff -ru libreswan-3.27.orig/programs/pluto/connections.c libreswan-3.27/programs/pluto/connections.c
--- libreswan-3.27.orig/programs/pluto/connections.c 2018-10-08 05:52:09.000000000 +0300
+++ libreswan-3.27/programs/pluto/connections.c 2018-11-12 09:38:40.643062668 +0200
diff --git a/community/libreswan/nss_compat.patch b/community/libreswan/nss_compat.patch
new file mode 100644
index 0000000000..6741ffada8
--- /dev/null
+++ b/community/libreswan/nss_compat.patch
@@ -0,0 +1,13 @@
+#2020/9/23 Patch is upstream, but not officially released. Should be released in libreswan 3.33+
+#Description: Force NSS compatibility to allow libreswan to properly autonegotiate IKE encryption
+--- a/lib/libswan/ike_alg_encrypt_nss_gcm_ops.c
++++ b/lib/libswan/ike_alg_encrypt_nss_gcm_ops.c
+@@ -16,6 +16,8 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+
++#define NSS_PKCS11_2_0_COMPAT 1
++
+ #include "lswlog.h"
+ #include "lswnss.h"
+ #include "prmem.h"