cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 07:28:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

libreswan: update to 4.1

Browse Source 
Signed-off-by: Lucian Cristian <lucian.cristian@gmail.com>
This commit is contained in:
Lucian Cristian
2020-10-25 15:05:58 +02:00
committed by Hannu Nyman
parent e07a33a917
commit 80ac8dac11
6 changed files with 27 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/libreswan/patches/010-nanosleep.patch
+1 -1
View File
@@ -9,7 +9,7 @@
#include <errno.h>
#include "defs.h"
@@ -172,7 +172,8 @@
@@ -180,7 +180,8 @@
/* Send a duplicate packet when this impair is enabled - used for testing */
if (IMPAIR(JACOB_TWO_TWO)) {
/* sleep for half a second, and second another packet */
net/libreswan/patches/030-fix_musl_build.patch
+10
View File
@@ -0,0 +1,10 @@
--- a/include/fd.h 2020-10-25 12:29:43.527467613 +0200
+++ b/include/fd.h 2020-10-25 12:27:41.043595114 +0200
@@ -26,6 +26,7 @@
#include <stdbool.h>
#include <stdlib.h> /* for ssize_t */
+#include <sys/types.h>
#include "where.h"
net/libreswan/patches/030-fix_nss_3.52.patch
-30
View File
@@ -1,30 +0,0 @@
From db7715407efa43cd2a66caed67c02d8f7bb90b35 Mon Sep 17 00:00:00 2001
From: Paul Wouters <pwouters@redhat.com>
Date: Tue, 12 May 2020 12:56:38 -0400
Subject: [PATCH] nss: move NSS_PKCS11_2_0_COMPAT define to
ike_alg_encrypt_nss_gcm_ops.c
It needs to go before any nss includes are done, and those includes are
all over the place. But CK_GCM_PARAMS is only used in one file, so
just define it there instead before the nss includes.
---
lib/libswan/ike_alg_encrypt_nss_gcm_ops.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/lib/libswan/ike_alg_encrypt_nss_gcm_ops.c b/lib/libswan/ike_alg_encrypt_nss_gcm_ops.c
index 93a027089a..571913cc1e 100644
--- a/lib/libswan/ike_alg_encrypt_nss_gcm_ops.c
+++ b/lib/libswan/ike_alg_encrypt_nss_gcm_ops.c
@@ -16,6 +16,12 @@
#include <stdio.h>
#include <stdlib.h>
+/*
+ * Special advise from Bob Relyea - needs to go before any nss include
+ *
+ */
+#define NSS_PKCS11_2_0_COMPAT 1
+
#include "lswlog.h"
#include "lswnss.h"
#include "prmem.h"
net/libreswan/patches/040-disable_man.patch
+11
View File
@@ -0,0 +1,11 @@
--- a/mk/targets.mk 2020-10-25 12:47:38.504784276 +0200
+++ b/mk/targets.mk 2020-10-25 12:48:16.242123361 +0200
@@ -64,7 +64,7 @@
#
# For each define: TARGET clean-TARGET install-TARGET
-TARGETS = base manpages
+TARGETS = base
$(foreach target,$(TARGETS),$(eval $(call recursive-target,$(target))))
net/libreswan/patches/099-continue_on_missing_ipv6.patch
-12
View File
@@ -1,12 +0,0 @@
--- a/programs/pluto/kernel_xfrm.c 2020-05-16 19:12:30.107226478 +0300
+++ b/programs/pluto/kernel_xfrm.c 2020-05-16 19:20:25.735522574 +0300
@@ -2759,7 +2759,8 @@
LOG_ERRNO(errno, "\"%s\"", proc_f);
}
} else {
- LOG_ERRNO(errno, "could not stat \"%s\"", proc_f);
+ DBG(DBG_KERNEL, DBG_log("starting without ipv6 support!"));
+ disable_ipv6 = 1;
}
if (disable_ipv6 == 1) {