From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 13128138334 for ; Sun, 22 Jul 2018 19:38:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E3165E0849; Sun, 22 Jul 2018 19:38:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AFBE7E0849 for ; Sun, 22 Jul 2018 19:38:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4070C335D78 for ; Sun, 22 Jul 2018 19:38:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B3DB637E for ; Sun, 22 Jul 2018 19:38:42 +0000 (UTC) From: "Hans de Graaff" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Hans de Graaff" Message-ID: <1532288314.2d707becfb19a25cabc2c1af3e08a464b5c1345e.graaff@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-vpn/libreswan/files/, net-vpn/libreswan/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-vpn/libreswan/files/libreswan-3.25-no-curl.patch net-vpn/libreswan/libreswan-3.25.ebuild X-VCS-Directories: net-vpn/libreswan/files/ net-vpn/libreswan/ X-VCS-Committer: graaff X-VCS-Committer-Name: Hans de Graaff X-VCS-Revision: 2d707becfb19a25cabc2c1af3e08a464b5c1345e X-VCS-Branch: master Date: Sun, 22 Jul 2018 19:38:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e1d08904-10ab-456c-9823-38cd49f237f2 X-Archives-Hash: b0df50162569fa4017224d1dbc6bcbd8 commit: 2d707becfb19a25cabc2c1af3e08a464b5c1345e Author: Hans de Graaff gentoo org> AuthorDate: Sun Jul 22 19:38:16 2018 +0000 Commit: Hans de Graaff gentoo org> CommitDate: Sun Jul 22 19:38:34 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d707bec 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 .../libreswan/files/libreswan-3.25-no-curl.patch | 25 ++++++++++++++++++++++ net-vpn/libreswan/libreswan-3.25.ebuild | 2 ++ 2 files changed, 27 insertions(+) diff --git a/net-vpn/libreswan/files/libreswan-3.25-no-curl.patch b/net-vpn/libreswan/files/libreswan-3.25-no-curl.patch new file mode 100644 index 00000000000..f23e2f7f227 --- /dev/null +++ b/net-vpn/libreswan/files/libreswan-3.25-no-curl.patch @@ -0,0 +1,25 @@ +From 903f953b271c35f33790bb7ba98b17acfdecede6 Mon Sep 17 00:00:00 2001 +From: Paul Wouters +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: diff --git a/net-vpn/libreswan/libreswan-3.25.ebuild b/net-vpn/libreswan/libreswan-3.25.ebuild index b71d536ae10..ef9392525b5 100644 --- a/net-vpn/libreswan/libreswan-3.25.ebuild +++ b/net-vpn/libreswan/libreswan-3.25.ebuild @@ -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