From: Lucian Cristian <lucian.cristian@gmail.com>
Date: Sun, 17 May 2020 01:57:48 +0000 (+0300)
Subject: libreswan: various fixes
X-Git-Url: http://git.openwrt.org/?p=feed%2Fpackages.git;a=commitdiff_plain;h=a659c58f2949e4b973464917bec328af6cdaaa72

libreswan: various fixes

start if kernel has missing ipv6 support
add libcap-ng support
fix some errors displayed on syslog

Signed-off-by: Lucian Cristian <lucian.cristian@gmail.com>
---

diff --git a/net/libreswan/Makefile b/net/libreswan/Makefile
index 1b5c696e31..c040039c4a 100644
--- a/net/libreswan/Makefile
+++ b/net/libreswan/Makefile
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libreswan
 PKG_VERSION:=3.32
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://download.libreswan.org/
@@ -45,7 +45,7 @@ $(call Package/libreswan/Default)
 	+kmod-crypto-aead +kmod-crypto-authenc +kmod-crypto-gcm \
 	+kmod-crypto-hash +kmod-crypto-rng +kmod-ip-vti +kmod-ipsec \
 	+kmod-ipsec4 +kmod-ipt-ipsec +libevent2 +libevent2-pthreads \
-	+libldns +librt +libunbound-heavy +nss-utils +nspr
+	+libldns +librt +libunbound-heavy +nss-utils +nspr +libcap-ng
   PROVIDES:=openswan
   CONFLICTS:=strongswan
   TITLE+= IPsec Server
@@ -69,6 +69,7 @@ TARGET_CFLAGS += -flto
 
 MAKE_FLAGS+= \
     WERROR_CFLAGS=" " \
+    NSS_REQ_AVA_COPY=false \
     USE_LINUX_AUDIT=false \
     USE_LABELED_IPSEC=false \
     USE_NM=false \
@@ -77,11 +78,12 @@ MAKE_FLAGS+= \
     USE_LIBCURL=false \
     USE_GLIBC_KERN_FLIP_HEADERS=true \
     USE_XAUTHPAM=false \
-    USE_LIBCAP_NG=false \
+    USE_LIBCAP_NG=true \
     USE_SYSTEMD_WATCHDOG=false \
     USE_SECCOMP=false\
     INC_USRLOCAL="/usr" \
     FINALRUNDIR="/var/run/pluto" \
+    MODPROBEARGS="-q" \
     ARCH="$(LINUX_KARCH)" \
 
 ifdef CONFIG_LINUX_4_14
diff --git a/net/libreswan/files/ipsec.init b/net/libreswan/files/ipsec.init
index 5b0475d30f..f33d412924 100755
--- a/net/libreswan/files/ipsec.init
+++ b/net/libreswan/files/ipsec.init
@@ -11,6 +11,7 @@ IPSEC_BIN=/usr/sbin/ipsec
 
 checkconfig() {
     ${IPSEC_BIN} addconn --checkconfig || return 1
+    mkdir -p /var/run/pluto
 }
 
 start_service() {
diff --git a/net/libreswan/patches/099-continue_on_missing_ipv6.patch b/net/libreswan/patches/099-continue_on_missing_ipv6.patch
new file mode 100644
index 0000000000..10fd572fbf
--- /dev/null
+++ b/net/libreswan/patches/099-continue_on_missing_ipv6.patch
@@ -0,0 +1,12 @@
+--- 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) {