net-vpn/libreswan: fix compilation with -curl

Backports an upstream bug fix.

Closes: https://bugs.gentoo.org/661814
Package-Manager: Portage-2.3.40, Repoman-2.3.9
This commit is contained in:
Hans de Graaff
2018-07-22 21:38:16 +02:00
parent b460641312
commit 2d707becfb
2 changed files with 27 additions and 0 deletions

View File

@@ -0,0 +1,25 @@
From 903f953b271c35f33790bb7ba98b17acfdecede6 Mon Sep 17 00:00:00 2001
From: Paul Wouters <pwouters@redhat.com>
Date: Sun, 22 Jul 2018 11:37:04 -0700
Subject: [PATCH] building: only call check_crls() if LIBCURL support is
compiled in
Noted by Daniel M. Weeks
---
programs/pluto/timer.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/programs/pluto/timer.c b/programs/pluto/timer.c
index b8a465a91b..4e82e634ea 100644
--- a/programs/pluto/timer.c
+++ b/programs/pluto/timer.c
@@ -432,7 +432,9 @@ static void timer_event_cb(evutil_socket_t fd UNUSED, const short event UNUSED,
break;
case EVENT_CHECK_CRLS:
+#ifdef LIBCURL
check_crls();
+#endif
break;
case EVENT_v2_RELEASE_WHACK:

View File

@@ -50,6 +50,8 @@ usetf() {
}
src_prepare() {
eapply "${FILESDIR}/${P}-no-curl.patch"
sed -i -e 's:/sbin/runscript:/sbin/openrc-run:' initsystems/openrc/ipsec.init.in || die
sed -i -e '/^install/ s/postcheck//' -e '/^doinstall/ s/oldinitdcheck//' initsystems/systemd/Makefile || die
default