From unknown Sat Aug 16 14:50:45 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#28973 <28973@debbugs.gnu.org> To: bug#28973 <28973@debbugs.gnu.org> Subject: Status: [PATCH 1/1] gnu: Add strongswan. Reply-To: bug#28973 <28973@debbugs.gnu.org> Date: Sat, 16 Aug 2025 21:50:45 +0000 retitle 28973 [PATCH 1/1] gnu: Add strongswan. reassign 28973 guix-patches submitter 28973 Adam Van Ymeren severity 28973 normal tag 28973 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 24 14:59:17 2017 Received: (at submit) by debbugs.gnu.org; 24 Oct 2017 18:59:17 +0000 Received: from localhost ([127.0.0.1]:60177 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e74Q1-0000AT-33 for submit@debbugs.gnu.org; Tue, 24 Oct 2017 14:59:17 -0400 Received: from eggs.gnu.org ([208.118.235.92]:38105) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e74Pz-0000AD-4Y for submit@debbugs.gnu.org; Tue, 24 Oct 2017 14:59:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e74Ps-0006gg-Ry for submit@debbugs.gnu.org; Tue, 24 Oct 2017 14:59:10 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:49538) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e74Ps-0006gc-ON for submit@debbugs.gnu.org; Tue, 24 Oct 2017 14:59:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57306) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e74Pr-0001jn-DS for guix-patches@gnu.org; Tue, 24 Oct 2017 14:59:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e74Pm-0006eL-JY for guix-patches@gnu.org; Tue, 24 Oct 2017 14:59:07 -0400 Received: from mail2.vany.ca ([142.54.190.254]:47289) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e74Pm-0006cu-EQ for guix-patches@gnu.org; Tue, 24 Oct 2017 14:59:02 -0400 Received: from adamvy-laptop (unknown [192.159.178.248]) by mail2.vany.ca (Postfix) with ESMTPSA id AC03AAC05CE for ; Tue, 24 Oct 2017 13:58:53 -0500 (CDT) From: Adam Van Ymeren To: guix-patches@gnu.org Subject: [PATCH 1/1] gnu: Add strongswan. Date: Tue, 24 Oct 2017 14:58:52 -0400 Message-ID: <87r2tsbcer.fsf@vany.ca> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.4 (----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.4 (----) Their website is not very precise about the licensing. It just says GPL2, but all the files I checked were GPL2+, except one which says "MIT" but is really the text of the Expat license as listen on the FSF directory. I believe the licensing info is correct now but I didn't do an exhaustive search of all files. --- gnu/packages/networking.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 633b8ca43..6d639f716 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -78,6 +78,8 @@ #:use-module (gnu packages valgrind) #:use-module (gnu packages wm) #:use-module (gnu packages xml) + #:use-module (gnu packages multiprecision) + #:use-module (gnu packages gnuzilla) #:use-module (ice-9 match)) (define-public macchanger @@ -1494,3 +1496,34 @@ interface and a programmable text output for scripting.") ;; Update the license field when upstream responds. (license (list license:bsd-2 license:expat)))) + +(define-public strongswan + (package + (name "strongswan") + (version "5.6.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://download.strongswan.org/strongswan-" version ".tar.bz2")) + (sha256 + (base32 "04vvha2zgsg1cq05cnn6sf7a4hq9ndnsfxpw1drm5v9l4vcw0kd1")) + (patches + (search-patches "strongswan-test_process-disable-all.patch" + "strongswan-test_time_printf_hook-pass-in-utc.patch")))) + (build-system gnu-build-system) + (inputs + `(("gmp" ,gmp) + ("openssl" ,openssl) + ("libgcrypt" ,libgcrypt) + ("curl" ,curl))) + (synopsis "IKEv1/v2 keying daemon") + (description "strongswan is an open source IPSec implementation") + (home-page "https://strongswan.org/") + (license + ;; Everything seems to be gpl2+ except + ;; src/libcharon/plugins/vici/libvici.h which is MIT/expat. The actual + ;; source file "libvici.h" claims it's MIT, but the actual text of the + ;; license is identical to expat as listed here: + ;; https://directory.fsf.org/wiki/License:Expat + (list license:gpl2+ + license:expat)))) -- 2.14.2 From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 24 16:05:14 2017 Received: (at 28973) by debbugs.gnu.org; 24 Oct 2017 20:05:14 +0000 Received: from localhost ([127.0.0.1]:60224 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e75Rq-000207-58 for submit@debbugs.gnu.org; Tue, 24 Oct 2017 16:05:14 -0400 Received: from mail2.vany.ca ([142.54.190.254]:40270) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e75Ro-0001zz-Bu for 28973@debbugs.gnu.org; Tue, 24 Oct 2017 16:05:12 -0400 Received: from adamvy-laptop (unknown [192.159.178.248]) by mail2.vany.ca (Postfix) with ESMTPSA id 71AD9AC05CE for <28973@debbugs.gnu.org>; Tue, 24 Oct 2017 15:05:09 -0500 (CDT) From: Adam Van Ymeren To: 28973@debbugs.gnu.org Subject: [PATCH] Add the patches necessary to build strongswan Date: Tue, 24 Oct 2017 16:05:08 -0400 Message-ID: <87inf4b9cb.fsf@vany.ca> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 28973 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) Forgot to include the patches, basically just disabling a few testcases that fail in the build environment. --- diff --git a/gnu/packages/patches/strongswan-test_process-disable-all.patch b/gnu/packages/patches/strongswan-test_process-disable-all.patch new file mode 100644 index 000000000..df3d1f3be --- /dev/null +++ b/gnu/packages/patches/strongswan-test_process-disable-all.patch @@ -0,0 +1,48 @@ + +diff -Naur strongswan-5.6.0-original/src/libstrongswan/tests/suites/test_process.c strongswan-5.6.0/src/libstrongswan/tests/suites/test_process.c +--- strongswan-5.6.0-original/src/libstrongswan/tests/suites/test_process.c 2016-04-22 16:01:35.000000000 -0400 ++++ strongswan-5.6.0/src/libstrongswan/tests/suites/test_process.c 2017-10-23 15:10:12.753837342 -0400 +@@ -201,27 +201,27 @@ + + s = suite_create("process"); + +- tc = tcase_create("return values"); +- tcase_add_test(tc, test_retval_true); +- tcase_add_test(tc, test_retval_false); +- suite_add_tcase(s, tc); ++ /* tc = tcase_create("return values"); */ ++ /* tcase_add_test(tc, test_retval_true); */ ++ /* tcase_add_test(tc, test_retval_false); */ ++ /* suite_add_tcase(s, tc); */ + + tc = tcase_create("not found"); + tcase_add_test(tc, test_not_found); + suite_add_tcase(s, tc); + +- tc = tcase_create("echo"); +- tcase_add_test(tc, test_echo); +- tcase_add_test(tc, test_echo_err); +- suite_add_tcase(s, tc); +- +- tc = tcase_create("env"); +- tcase_add_test(tc, test_env); +- suite_add_tcase(s, tc); +- +- tc = tcase_create("shell"); +- tcase_add_test(tc, test_shell); +- suite_add_tcase(s, tc); ++ /* tc = tcase_create("echo"); */ ++ /* tcase_add_test(tc, test_echo); */ ++ /* tcase_add_test(tc, test_echo_err); */ ++ /* suite_add_tcase(s, tc); */ ++ ++ /* tc = tcase_create("env"); */ ++ /* tcase_add_test(tc, test_env); */ ++ /* suite_add_tcase(s, tc); */ ++ ++ /* tc = tcase_create("shell"); */ ++ /* tcase_add_test(tc, test_shell); */ ++ /* suite_add_tcase(s, tc); */ + + return s; + } diff --git a/gnu/packages/patches/strongswan-test_time_printf_hook-pass-in-utc.patch b/gnu/packages/patches/strongswan-test_time_printf_hook-pass-in-utc.patch new file mode 100644 index 000000000..a1d80cb3a --- /dev/null +++ b/gnu/packages/patches/strongswan-test_time_printf_hook-pass-in-utc.patch @@ -0,0 +1,14 @@ +diff -Naur strongswan-5.6.0-original/src/libstrongswan/tests/suites/test_utils.c strongswan-5.6.0/src/libstrongswan/tests/suites/test_utils.c +--- strongswan-5.6.0-original/src/libstrongswan/tests/suites/test_utils.c 2017-10-23 14:50:49.744343308 -0400 ++++ strongswan-5.6.0/src/libstrongswan/tests/suites/test_utils.c 2017-10-23 14:51:07.911880335 -0400 +@@ -750,9 +750,9 @@ + } time_data[] = { + {UNDEFINED_TIME, FALSE, "--- -- --:--:-- ----"}, + {UNDEFINED_TIME, TRUE , "--- -- --:--:-- UTC ----"}, +- {1, FALSE, "Jan 01 01:00:01 1970"}, ++ {1, FALSE, "Jan 01 00:00:01 1970"}, + {1, TRUE , "Jan 01 00:00:01 UTC 1970"}, +- {1341150196, FALSE, "Jul 01 15:43:16 2012"}, ++ {1341150196, FALSE, "Jul 01 13:43:16 2012"}, + {1341150196, TRUE , "Jul 01 13:43:16 UTC 2012"}, + }; -- 2.14.2 From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 24 16:09:02 2017 Received: (at 28973) by debbugs.gnu.org; 24 Oct 2017 20:09:02 +0000 Received: from localhost ([127.0.0.1]:60230 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e75VV-00026d-Mj for submit@debbugs.gnu.org; Tue, 24 Oct 2017 16:09:02 -0400 Received: from tobias.gr ([51.15.135.5]:54384) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e75VR-000269-Ak for 28973@debbugs.gnu.org; Tue, 24 Oct 2017 16:08:58 -0400 Received: by tobias.gr (OpenSMTPD) with ESMTP id 1d589ed6; Tue, 24 Oct 2017 20:08:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=tobias.gr; h=subject:to :references:from:message-id:date:mime-version:in-reply-to :content-type:content-transfer-encoding; s=201706; bh=ILTByXJEkk sqjtvMofI14HJSeU5sPxK8CtXZcn1/gIg=; b=unDRloHTJBCaklKX7X4+S/qknG SlRK1Grkda/jN37GDLq+JJFf6MLZDku2JiL61Smx1CImJfTNqyLZ52JF1wsS7VGA /S2DTl46ZiNVZFIbyD3YctNV56ao6JCDRABSQkM7bMp3lZ0soNG8gsRSdCzHeCxM 5Dkq7POwt973Lrg2qTeHmeumdwgg4Waq0b8RQ9rPrYD6H61DckxEdEXRlFDBlnYS /IcFiPu/KVUerWehT9/vkUMbCRg1dmfe/5OWWEKHfWssJAHfi+yHzjXe9CjZg6oj ndi1+yOsMNvuQol1wT2n631D++2Srhi2fzjcJbcFqndqO3ZvYt+MbaXchpvQ== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id 4f2538b8 (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128:NO); Tue, 24 Oct 2017 20:08:50 +0000 (UTC) Subject: Re: [bug#28973] [PATCH 1/1] gnu: Add strongswan. To: adam@vany.ca, 28973@debbugs.gnu.org References: <87r2tsbcer.fsf@vany.ca> From: Tobias Geerinckx-Rice Message-ID: <555ac710-dd1f-4c74-036a-ad14683e1e5e@tobias.gr> Date: Tue, 24 Oct 2017 22:11:11 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <87r2tsbcer.fsf@vany.ca> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 28973 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Adam, Adam Van Ymeren wrote on 24/10/17 at 20:58: > Their website is not very precise about the licensing. It just says > GPL2, but all the files I checked were GPL2+, except one which says > "MIT" but is really the text of the Expat license as listen on the FSF > directory. That's because what some call ‘MIT’ is almost always what the FSF (and others) call ‘Expat’. The name ‘MIT’ is ambiguous and best avoided. So you've made the right call :-) > I believe the licensing info is correct now but I didn't do an > exhaustive search of all files. Unfortunately, that's the only way to be sure. Most files are indeed GPL2+, or what I presume to be dual-licenced GPL2+/Expat (e.g. src/swanctl/commands/list_sas.c). A cursory inspection reveals additional BSD-4 headers in src/libstrongswan/plugins/{blowfish,des}, BSD-3 in src/include/sys/queue.h and src/libtncif/tncif*, and something vague in src/libstrongswan/plugins/curve25519/ref10. More eyeballs welcome. > --- > gnu/packages/networking.scm | 33 +++++++++++++++++++++++++++++++++ > 1 file changed, 33 insertions(+) > > diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm > index 633b8ca43..6d639f716 100644 > --- a/gnu/packages/networking.scm > +++ b/gnu/packages/networking.scm > @@ -78,6 +78,8 @@ > #:use-module (gnu packages valgrind) > #:use-module (gnu packages wm) > #:use-module (gnu packages xml) > + #:use-module (gnu packages multiprecision) > + #:use-module (gnu packages gnuzilla) > #:use-module (ice-9 match)) Please try to keep these alphabetical. Aesthetic nit-picking aside, it makes it harder to miss duplication, which does happen. > (define-public macchanger > @@ -1494,3 +1496,34 @@ interface and a programmable text output for scripting.") > ;; Update the license field when upstream responds. > (license (list license:bsd-2 > license:expat)))) > + > +(define-public strongswan > + (package > + (name "strongswan") > + (version "5.6.0") > + (source > + (origin > + (method url-fetch) > + (uri (string-append "https://download.strongswan.org/strongswan-" version ".tar.bz2")) > + (sha256 > + (base32 "04vvha2zgsg1cq05cnn6sf7a4hq9ndnsfxpw1drm5v9l4vcw0kd1")) > + (patches > + (search-patches "strongswan-test_process-disable-all.patch" > + "strongswan-test_time_printf_hook-pass-in-utc.patch")))) These patches are missing from the series, so I can't build the package. > + (build-system gnu-build-system) > + (inputs > + `(("gmp" ,gmp) > + ("openssl" ,openssl) > + ("libgcrypt" ,libgcrypt) > + ("curl" ,curl))) Please keep these alphabetically as well (or add explicit header comments if the ordering is significant). > + (synopsis "IKEv1/v2 keying daemon") > + (description "strongswan is an open source IPSec implementation") Newspeak aside[0], all software in Guix is Free. Removing ‘open source’ leaves us with a very short description indeed... Is there a README, web, or man page who's opening paragraphs we could shamelessly plunder? > + (home-page "https://strongswan.org/") > + (license > + ;; Everything seems to be gpl2+ except > + ;; src/libcharon/plugins/vici/libvici.h which is MIT/expat. The actual > + ;; source file "libvici.h" claims it's MIT, but the actual text of the > + ;; license is identical to expat as listed here: > + ;; https://directory.fsf.org/wiki/License:Expat The MIT/expat confusion is unfortunate but not unique to this package, and doesn't need to be explained here. > + (list license:gpl2+ > + license:expat)))) When possible, I prefer the more compact style of (list license:foo ; src/frob.[ch], doc/frob.texi license:bar)))) ; everything else but that's partly a matter of taste and line length. Oh, and: thanks for packaging StrongSwan! Kind regards, T G-R [0]: https://www.gnu.org/philosophy/open-source-misses-the-point.en.html From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 24 16:10:58 2017 Received: (at 28973) by debbugs.gnu.org; 24 Oct 2017 20:10:59 +0000 Received: from localhost ([127.0.0.1]:60238 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e75XO-0002A7-LS for submit@debbugs.gnu.org; Tue, 24 Oct 2017 16:10:58 -0400 Received: from tobias.gr ([51.15.135.5]:54394) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e75XM-00029y-Lz for 28973@debbugs.gnu.org; Tue, 24 Oct 2017 16:10:57 -0400 Received: by tobias.gr (OpenSMTPD) with ESMTP id 0b6db1be; Tue, 24 Oct 2017 20:10:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=tobias.gr; h=subject:to :references:from:message-id:date:mime-version:in-reply-to :content-type:content-transfer-encoding; s=201706; bh=LbMaBq3G11 6YrMouLepuc6BgpT+dhCxGAhIKNOwRCWo=; b=OtgSrJ74OABM64wqSuabnKnVUB WJpYT8arcGDNUB8+ZkkjBqQj5lB7LtHPzHIR9wF9/kFig4iUbpJ/R3LabsUt/vlo gU/Z9kFeo2OxNcZYzeg9Ex+zq3a9RwrhN8euigP+b6bAbiIEcW+G0TJiBp/5EGRz Ngcf7X1Z0lJHtN/V/y/abiJYQVUQxZmiag66182C7r8YM73Nm8FtY3wtMwDT9h70 8SIPIMn7GdbkaehYCmY85kqrkA7+bDGylwFBNhZ7of/a5kJRN8mLQnnQr3J9PtHU /oOavQqiTZmAmsHtTYGRBtI3iYWWDSWwtYecZOsERkc3/PdA+tHL5i9ewSbg== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id dce89bc7 (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128:NO); Tue, 24 Oct 2017 20:10:53 +0000 (UTC) Subject: Re: [bug#28973] [PATCH 1/1] gnu: Add strongswan. To: adam@vany.ca, 28973@debbugs.gnu.org References: <87r2tsbcer.fsf@vany.ca> From: Tobias Geerinckx-Rice Message-ID: Date: Tue, 24 Oct 2017 22:13:15 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <87r2tsbcer.fsf@vany.ca> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 28973 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) I missed one: Adam Van Ymeren wrote on 24/10/17 at 20:58: > + (uri (string-append "https://download.strongswan.org/strongswan-" version ".tar.bz2")) should be split over 2 lines to silence the linter. Kind regards, T G-R From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 24 19:08:37 2017 Received: (at 28973) by debbugs.gnu.org; 24 Oct 2017 23:08:37 +0000 Received: from localhost ([127.0.0.1]:60391 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e78JH-00071O-3l for submit@debbugs.gnu.org; Tue, 24 Oct 2017 19:08:35 -0400 Received: from mail2.vany.ca ([142.54.190.254]:40274) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e78JE-00071F-AB for 28973@debbugs.gnu.org; Tue, 24 Oct 2017 19:08:33 -0400 Received: from adamvy-laptop (unknown [192.159.178.248]) by mail2.vany.ca (Postfix) with ESMTPSA id 169B3AC0096; Tue, 24 Oct 2017 18:08:29 -0500 (CDT) From: Adam Van Ymeren To: Tobias Geerinckx-Rice Subject: Re: [bug#28973] [PATCH 1/1] gnu: Add strongswan. References: <87r2tsbcer.fsf@vany.ca> <555ac710-dd1f-4c74-036a-ad14683e1e5e@tobias.gr> Date: Tue, 24 Oct 2017 19:08:27 -0400 In-Reply-To: <555ac710-dd1f-4c74-036a-ad14683e1e5e@tobias.gr> (Tobias Geerinckx-Rice's message of "Tue, 24 Oct 2017 22:11:11 +0200") Message-ID: <87a80gb0us.fsf@vany.ca> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 28973 Cc: 28973@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) Thanks for the repsonse and feedback! I've appended a new patch at the bottom of this message as well as replied to some of your comment inline. Tobias Geerinckx-Rice writes: >> I believe the licensing info is correct now but I didn't do an >> exhaustive search of all files. > > Unfortunately, that's the only way to be sure. Yeah, I was hoping somebody had a tool to make this faster :) I wrote a little script in guile and started working through it but its slow work. I'm going on vacation next week so I might not be able to finish this before then. However it looks like Debian has a much more exhaustive listing of the licenses here: http://metadata.ftp-master.debian.org/changelogs/main/s/strongswan/strongsw= an_5.5.1-4+deb9u1_copyright The 4 clause BSD licenses are troubling. Apparently Debian doesn't compile those files in their build. Will have to investiate further. For reference here's my shoddy guile script. (use-modules (ice-9 ftw) (ice-9 textual-ports)) (define GPL " * This program is free software; you can redistribute it and/= or modify it * under the terms of the GNU General Public License as published by the * Free Software Foundation; either version 2 of the License, or (at your * option) any later version. See . ") (define GPL2 "-- This program is free software; you can redistribute it an= d/or modify it -- under the terms of the GNU General Public License as published by the -- Free Software Foundation; either version 2 of the License, or (at your -- option) any later version. See . ") (define (check-licenses preamble) (and (string? preamble) (not (string-contains preamble GPL)) (not (string-contains preamble GPL2)))) (ftw "strongswan-5.6.0" (lambda (filename stat flag) (when (and (eq? flag 'regular) (not (member (substring (basename filename) (or (string-rindex (b= asename filename) #\.) 0)) '(".opt" ".conf" ".pem" ".in" ".am" ".mk" ".sql" "ho= stname" ".der" ".old" ".xml")))) (call-with-input-file filename (lambda (port) (let ((preamble (get-string-n port 5000))) (when (check-licenses preamble) (format #t "~A~%" filename)))))) #t)) >> + (synopsis "IKEv1/v2 keying daemon") >> + (description "strongswan is an open source IPSec implementation") > > Newspeak aside[0], all software in Guix is Free. Removing =E2=80=98open s= ource=E2=80=99 > leaves us with a very short description indeed... > > Is there a README, web, or man page who's opening paragraphs we could > shamelessly plunder? I agree I don't like the usage of "open source" but that's how they brand themselves, not sure if it's right for me to change it to read Free Software. I took this sentence from their README file. How about this? I wrote this based upon the top features they list on their homepage. "StrongSwan is an IPsec implementation originally based upon the FreeS/WAN project. It contains support for IKEv1, IKEv2, MOBIKE, IPv6, NAT-T and more." > Oh, and: thanks for packaging StrongSwan! NP :). Updated patch below. diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 633b8ca43..552690556 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -64,6 +64,7 @@ #:use-module (gnu packages libidn) #:use-module (gnu packages linux) #:use-module (gnu packages lua) + #:use-module (gnu packages multiprecision) #:use-module (gnu packages kerberos) #:use-module (gnu packages ncurses) #:use-module (gnu packages pcre) @@ -1494,3 +1495,35 @@ interface and a programmable text output for scripti= ng.") ;; Update the license field when upstream responds. (license (list license:bsd-2 license:expat)))) + +(define-public strongswan + (package + (name "strongswan") + (version "5.6.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://download.strongswan.org/strongswan-" v= ersion ".tar.bz2")) + (sha256 + (base32 "04vvha2zgsg1cq05cnn6sf7a4hq9ndnsfxpw1drm5v9l4vcw0kd1")) + (patches + (search-patches "strongswan-test_process-disable-all.patch" + "strongswan-test_time_printf_hook-pass-in-utc.patc= h")))) + (build-system gnu-build-system) + (inputs + `(("curl" ,curl) + ("gmp" ,gmp) + ("libgcrypt" ,libgcrypt) + ("openssl" ,openssl))) + (synopsis "IKEv1/v2 keying daemon") + (description "StrongSwan is an IPsec implementation originally based u= pon +the FreeS/WAN project. It contains support for IKEv1, IKEv2, MOBIKE, IPv6, +NAT-T and more.") + (home-page "https://strongswan.org/") + (license + (list license:expat + license:bsd-3 + license:bsd-4 + license:gpl2+ + license:public-domain ;src/libstrongswan/plugins/sha3/sha3_kecc= ak.c + )))) diff --git a/gnu/packages/patches/strongswan-test_process-disable-all.patch= b/gnu/packages/patches/strongswan-test_process-disable-all.patch new file mode 100644 index 000000000..df3d1f3be --- /dev/null +++ b/gnu/packages/patches/strongswan-test_process-disable-all.patch @@ -0,0 +1,48 @@ + +diff -Naur strongswan-5.6.0-original/src/libstrongswan/tests/suites/test_p= rocess.c strongswan-5.6.0/src/libstrongswan/tests/suites/test_process.c +--- strongswan-5.6.0-original/src/libstrongswan/tests/suites/test_process.= c 2016-04-22 16:01:35.000000000 -0400 ++++ strongswan-5.6.0/src/libstrongswan/tests/suites/test_process.c 2017-10= -23 15:10:12.753837342 -0400 +@@ -201,27 +201,27 @@ + + s =3D suite_create("process"); + +- tc =3D tcase_create("return values"); +- tcase_add_test(tc, test_retval_true); +- tcase_add_test(tc, test_retval_false); +- suite_add_tcase(s, tc); ++ /* tc =3D tcase_create("return values"); */ ++ /* tcase_add_test(tc, test_retval_true); */ ++ /* tcase_add_test(tc, test_retval_false); */ ++ /* suite_add_tcase(s, tc); */ + + tc =3D tcase_create("not found"); + tcase_add_test(tc, test_not_found); + suite_add_tcase(s, tc); + +- tc =3D tcase_create("echo"); +- tcase_add_test(tc, test_echo); +- tcase_add_test(tc, test_echo_err); +- suite_add_tcase(s, tc); +- +- tc =3D tcase_create("env"); +- tcase_add_test(tc, test_env); +- suite_add_tcase(s, tc); +- +- tc =3D tcase_create("shell"); +- tcase_add_test(tc, test_shell); +- suite_add_tcase(s, tc); ++ /* tc =3D tcase_create("echo"); */ ++ /* tcase_add_test(tc, test_echo); */ ++ /* tcase_add_test(tc, test_echo_err); */ ++ /* suite_add_tcase(s, tc); */ ++ ++ /* tc =3D tcase_create("env"); */ ++ /* tcase_add_test(tc, test_env); */ ++ /* suite_add_tcase(s, tc); */ ++ ++ /* tc =3D tcase_create("shell"); */ ++ /* tcase_add_test(tc, test_shell); */ ++ /* suite_add_tcase(s, tc); */ + + return s; + } diff --git a/gnu/packages/patches/strongswan-test_time_printf_hook-pass-in-= utc.patch b/gnu/packages/patches/strongswan-test_time_printf_hook-pass-in-u= tc.patch new file mode 100644 index 000000000..a1d80cb3a --- /dev/null +++ b/gnu/packages/patches/strongswan-test_time_printf_hook-pass-in-utc.pat= ch @@ -0,0 +1,14 @@ +diff -Naur strongswan-5.6.0-original/src/libstrongswan/tests/suites/test_u= tils.c strongswan-5.6.0/src/libstrongswan/tests/suites/test_utils.c +--- strongswan-5.6.0-original/src/libstrongswan/tests/suites/test_utils.c = 2017-10-23 14:50:49.744343308 -0400 ++++ strongswan-5.6.0/src/libstrongswan/tests/suites/test_utils.c 2017-10-2= 3 14:51:07.911880335 -0400 +@@ -750,9 +750,9 @@ + } time_data[] =3D { + {UNDEFINED_TIME, FALSE, "--- -- --:--:-- ----"}, + {UNDEFINED_TIME, TRUE , "--- -- --:--:-- UTC ----"}, +- {1, FALSE, "Jan 01 01:00:01 1970"}, ++ {1, FALSE, "Jan 01 00:00:01 1970"}, + {1, TRUE , "Jan 01 00:00:01 UTC 1970"}, +- {1341150196, FALSE, "Jul 01 15:43:16 2012"}, ++ {1341150196, FALSE, "Jul 01 13:43:16 2012"}, + {1341150196, TRUE , "Jul 01 13:43:16 UTC 2012"}, + }; From debbugs-submit-bounces@debbugs.gnu.org Sun Nov 19 17:43:55 2017 Received: (at 28973) by debbugs.gnu.org; 19 Nov 2017 22:43:55 +0000 Received: from localhost ([127.0.0.1]:48015 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eGYJf-0004Hs-3b for submit@debbugs.gnu.org; Sun, 19 Nov 2017 17:43:55 -0500 Received: from hera.aquilenet.fr ([141.255.128.1]:53765) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eGYJc-0004Hj-7W for 28973@debbugs.gnu.org; Sun, 19 Nov 2017 17:43:53 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id EB12EF3EF; Sun, 19 Nov 2017 23:43:53 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8JJcJZtCO5e3; Sun, 19 Nov 2017 23:43:52 +0100 (CET) Received: from ribbon (unknown [IPv6:2a01:e0a:1d:7270:af76:b9b:ca24:c465]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 3820CDA3F; Sun, 19 Nov 2017 23:43:52 +0100 (CET) From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Adam Van Ymeren Subject: Re: [bug#28973] [PATCH 1/1] gnu: Add strongswan. References: <87r2tsbcer.fsf@vany.ca> <555ac710-dd1f-4c74-036a-ad14683e1e5e@tobias.gr> <87a80gb0us.fsf@vany.ca> Date: Sun, 19 Nov 2017 23:43:49 +0100 In-Reply-To: <87a80gb0us.fsf@vany.ca> (Adam Van Ymeren's message of "Tue, 24 Oct 2017 19:08:27 -0400") Message-ID: <87k1ylzy6y.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 28973 Cc: Tobias Geerinckx-Rice , 28973@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) Hello! Adam Van Ymeren skribis: > Updated patch below. Tobias, should we go ahead and applied this updated patch? Feel free to do so if it looks good to you. :-) Thanks, Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Sun Nov 19 18:20:22 2017 Received: (at 28973) by debbugs.gnu.org; 19 Nov 2017 23:20:22 +0000 Received: from localhost ([127.0.0.1]:48036 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eGYsv-00057G-Ne for submit@debbugs.gnu.org; Sun, 19 Nov 2017 18:20:21 -0500 Received: from mail2.vany.ca ([142.54.190.254]:38397) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eGYst-000577-RD for 28973@debbugs.gnu.org; Sun, 19 Nov 2017 18:20:20 -0500 Received: from android-58128026096a41f9 (unknown [192.159.178.248]) by mail2.vany.ca (Postfix) with ESMTPSA id D3FFCAC0672; Sun, 19 Nov 2017 17:20:15 -0600 (CST) Date: Sun, 19 Nov 2017 18:20:13 -0500 In-Reply-To: <87k1ylzy6y.fsf@gnu.org> References: <87r2tsbcer.fsf@vany.ca> <555ac710-dd1f-4c74-036a-ad14683e1e5e@tobias.gr> <87a80gb0us.fsf@vany.ca> <87k1ylzy6y.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [bug#28973] [PATCH 1/1] gnu: Add strongswan. To: ludo@gnu.org From: Adam Van Ymeren Message-ID: X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 28973 Cc: Tobias Geerinckx-Rice , 28973@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) On November 19, 2017 5:43:49 PM EST, ludo@gnu=2Eorg wrote: >Hello! > >Adam Van Ymeren skribis: > >> Updated patch below=2E > >Tobias, should we go ahead and applied this updated patch? Feel free >to >do so if it looks good to you=2E :-) > >Thanks, >Ludo=E2=80=99=2E Hey Ludo, I'm still not sure we've gotten all the licensing info correct=2E I parti= cular if I recall correctly there is some 4 clause BSD code in the source p= ackage that the debian package apparently avoids compiling=2E I've been hoping to make a detailed pass of this package so I can say with= confidence that the code licenses are correct, but I've been short on time= =2E From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 11 16:48:55 2018 Received: (at 28973) by debbugs.gnu.org; 11 Jan 2018 21:48:55 +0000 Received: from localhost ([127.0.0.1]:52588 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eZkiV-0004v7-2L for submit@debbugs.gnu.org; Thu, 11 Jan 2018 16:48:55 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:35558) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eZkiT-0004uz-OS for 28973@debbugs.gnu.org; Thu, 11 Jan 2018 16:48:54 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 411E810959; Thu, 11 Jan 2018 22:48:53 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9rLv3gwk7u8a; Thu, 11 Jan 2018 22:48:52 +0100 (CET) Received: from ribbon (unknown [IPv6:2a01:e0a:1d:7270:af76:b9b:ca24:c465]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 2E014101B9; Thu, 11 Jan 2018 22:48:52 +0100 (CET) From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Adam Van Ymeren Subject: Re: [bug#28973] [PATCH 1/1] gnu: Add strongswan. References: <87r2tsbcer.fsf@vany.ca> <555ac710-dd1f-4c74-036a-ad14683e1e5e@tobias.gr> <87a80gb0us.fsf@vany.ca> <87k1ylzy6y.fsf@gnu.org> Date: Thu, 11 Jan 2018 22:48:51 +0100 In-Reply-To: (Adam Van Ymeren's message of "Sun, 19 Nov 2017 18:20:13 -0500") Message-ID: <87fu7cm5h8.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 28973 Cc: Tobias Geerinckx-Rice , 28973@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) Hi Adam, Adam Van Ymeren skribis: > I'm still not sure we've gotten all the licensing info correct. I partic= ular if I recall correctly there is some 4 clause BSD code in the source pa= ckage that the debian package apparently avoids compiling. > > I've been hoping to make a detailed pass of this package so I can say wit= h confidence that the code licenses are correct, but I've been short on tim= e. Any update on this? https://bugs.gnu.org/28973 TIA, Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 12 12:15:20 2018 Received: (at 28973) by debbugs.gnu.org; 12 Jan 2018 17:15:20 +0000 Received: from localhost ([127.0.0.1]:54056 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ea2vI-0003QJ-Hq for submit@debbugs.gnu.org; Fri, 12 Jan 2018 12:15:20 -0500 Received: from mail2.vany.ca ([142.54.190.254]:33127) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ea2vG-0003Q9-Cl for 28973@debbugs.gnu.org; Fri, 12 Jan 2018 12:15:18 -0500 Received: from adamvy-laptop (unknown [205.210.143.50]) by mail2.vany.ca (Postfix) with ESMTPSA id E8FE9AC00F8; Fri, 12 Jan 2018 11:15:15 -0600 (CST) From: Adam Van Ymeren To: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) Subject: Re: [bug#28973] [PATCH 1/1] gnu: Add strongswan. References: <87r2tsbcer.fsf@vany.ca> <555ac710-dd1f-4c74-036a-ad14683e1e5e@tobias.gr> <87a80gb0us.fsf@vany.ca> <87k1ylzy6y.fsf@gnu.org> <87fu7cm5h8.fsf@gnu.org> Date: Fri, 12 Jan 2018 12:15:13 -0500 In-Reply-To: <87fu7cm5h8.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Thu, 11 Jan 2018 22:48:51 +0100") Message-ID: <87wp0nf17i.fsf@vany.ca> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 28973 Cc: Tobias Geerinckx-Rice , 28973@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) ludo@gnu.org (Ludovic Court=C3=A8s) writes: > Hi Adam, Hey Ludo, > > Adam Van Ymeren skribis: > >> I'm still not sure we've gotten all the licensing info correct. I parti= cular if I recall correctly there is some 4 clause BSD code in the source p= ackage that the debian package apparently avoids compiling. >> >> I've been hoping to make a detailed pass of this package so I can say wi= th confidence that the code licenses are correct, but I've been short on ti= me. > > Any update on this? Some progress but not ready yet sorry. Been busy :). The debian package appears to have an exhaustive list of licensing information for all files in this package here[1]. There are a few files under the 4-clause BSD which appear to only be related to DES encryption. Debian's solution to this is to just disable DES to avoid compiling and including the binaries from those 4-clause BSD files. Would that be an acceptable solution for Guix as well? I can write a tool to convert the information from debian/copyright into a format suitable for the Guix package. [1] - https://anonscm.debian.org/cgit/pkg-swan/strongswan.git/tree/debian/c= opyright From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 13 08:53:00 2018 Received: (at 28973) by debbugs.gnu.org; 13 Jan 2018 13:53:00 +0000 Received: from localhost ([127.0.0.1]:54490 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eaMF2-0005Wn-AN for submit@debbugs.gnu.org; Sat, 13 Jan 2018 08:53:00 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:49362) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eaMF0-0005Wf-Bu for 28973@debbugs.gnu.org; Sat, 13 Jan 2018 08:52:58 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id B8CDD109CF; Sat, 13 Jan 2018 14:52:57 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KOvm-4HLPoi2; Sat, 13 Jan 2018 14:52:56 +0100 (CET) Received: from ribbon (unknown [IPv6:2a01:e0a:1d:7270:af76:b9b:ca24:c465]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 6AD3D109C5; Sat, 13 Jan 2018 14:52:56 +0100 (CET) From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Adam Van Ymeren Subject: Re: [bug#28973] [PATCH 1/1] gnu: Add strongswan. References: <87r2tsbcer.fsf@vany.ca> <555ac710-dd1f-4c74-036a-ad14683e1e5e@tobias.gr> <87a80gb0us.fsf@vany.ca> <87k1ylzy6y.fsf@gnu.org> <87fu7cm5h8.fsf@gnu.org> <87wp0nf17i.fsf@vany.ca> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 24 =?utf-8?Q?Niv=C3=B4se?= an 226 de la =?utf-8?Q?R?= =?utf-8?Q?=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Sat, 13 Jan 2018 14:52:54 +0100 In-Reply-To: <87wp0nf17i.fsf@vany.ca> (Adam Van Ymeren's message of "Fri, 12 Jan 2018 12:15:13 -0500") Message-ID: <87mv1hq30p.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 28973 Cc: Tobias Geerinckx-Rice , 28973@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) Hello, Adam Van Ymeren skribis: >> Adam Van Ymeren skribis: >> >>> I'm still not sure we've gotten all the licensing info correct. I part= icular if I recall correctly there is some 4 clause BSD code in the source = package that the debian package apparently avoids compiling. >>> >>> I've been hoping to make a detailed pass of this package so I can say w= ith confidence that the code licenses are correct, but I've been short on t= ime. >> >> Any update on this? > > > Some progress but not ready yet sorry. Been busy :). > > The debian package appears to have an exhaustive list of licensing > information for all files in this package here[1]. > > There are a few files under the 4-clause BSD which appear to only be > related to DES encryption. Debian's solution to this is to just disable > DES to avoid compiling and including the binaries from those 4-clause > BSD files. > > Would that be an acceptable solution for Guix as well? I think so. > I can write a tool to convert the information from debian/copyright > into a format suitable for the Guix package. That would be handy, though debian/copyright is much more detailed than a =E2=80=98license=E2=80=99 field (I didn=E2=80=99t know it=E2=80=99s becom= e machine-readable, nice!). Thanks, Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 13 08:58:04 2018 Received: (at 28973) by debbugs.gnu.org; 13 Jan 2018 13:58:04 +0000 Received: from localhost ([127.0.0.1]:54495 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eaMJt-0005e3-UK for submit@debbugs.gnu.org; Sat, 13 Jan 2018 08:58:04 -0500 Received: from tobias.gr ([51.15.135.5]:41874) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eaMJr-0005dc-P4 for 28973@debbugs.gnu.org; Sat, 13 Jan 2018 08:58:00 -0500 Received: by tobias.gr (OpenSMTPD) with ESMTP id c79e6330; Sat, 13 Jan 2018 13:57:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=tobias.gr; h=subject:to :cc:references:from:message-id:date:mime-version:in-reply-to :content-type:content-transfer-encoding; s=2018; bh=YOHRVG7cZPoN 0zmD4GO/RowVmsLeQfOIZji908h/mUI=; b=Ce/+UmPQbnLMwBjxfMPD0MzdTjT3 PZ4ClfQGwh0p5gYr7DXIiLoyYVJAOHZsyJoOXwyPqVyEyqmxekz7uxbB0T5bQAKM 0UxngEg0Pf3Wv3MlpFRmgL7I36Jt1nTv5xXTWVP1u3dYnDWrw3F9KEtqltcGoif5 KSTMti4Lr7OMfao12cmLBVdNe0lyAFR6eqFkzpKOpUcK6bJbmnlFrU070pia5x5e IpkCV32WeBrVpLy+wWsVfm4fGOtxxXBRyvxVztacfA+/d2ZhRLXdWyZtZYdjQ8vj r+T5fPwoutCG1k68WZZUUAVULW2Xn1s1+0Tkfc3M38+fSXQyqtJ44xh0JQ== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id ad034d62 (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128:NO); Sat, 13 Jan 2018 13:57:52 +0000 (UTC) Subject: Re: [bug#28973] [PATCH 1/1] gnu: Add strongswan. To: adam@vany.ca, ludo@gnu.org References: <87r2tsbcer.fsf@vany.ca> <555ac710-dd1f-4c74-036a-ad14683e1e5e@tobias.gr> <87a80gb0us.fsf@vany.ca> <87k1ylzy6y.fsf@gnu.org> <87fu7cm5h8.fsf@gnu.org> <87wp0nf17i.fsf@vany.ca> From: Tobias Geerinckx-Rice Message-ID: <2cee2d58-f645-487f-eda6-9714eaad5e9f@tobias.gr> Date: Sat, 13 Jan 2018 15:00:51 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 In-Reply-To: <87wp0nf17i.fsf@vany.ca> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 28973 Cc: 28973@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Adam, I was writing basically a copy of Ludo's message when that arrived... All good! Kind regards, T G-R From debbugs-submit-bounces@debbugs.gnu.org Mon Jan 15 15:36:11 2018 Received: (at 28973) by debbugs.gnu.org; 15 Jan 2018 20:36:11 +0000 Received: from localhost ([127.0.0.1]:57804 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ebBUI-0007sg-Q1 for submit@debbugs.gnu.org; Mon, 15 Jan 2018 15:36:11 -0500 Received: from mail2.vany.ca ([142.54.190.254]:33291) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ebBUH-0007sY-9E for 28973@debbugs.gnu.org; Mon, 15 Jan 2018 15:36:09 -0500 Received: from adamvy-laptop (unknown [192.159.178.248]) by mail2.vany.ca (Postfix) with ESMTPSA id 7E219AC00AF; Mon, 15 Jan 2018 14:36:06 -0600 (CST) From: Adam Van Ymeren To: 28973@debbugs.gnu.org Subject: Re: [bug#28973] [PATCH 1/1] gnu: Add strongswan. References: <87r2tsbcer.fsf@vany.ca> <555ac710-dd1f-4c74-036a-ad14683e1e5e@tobias.gr> <87a80gb0us.fsf@vany.ca> <87k1ylzy6y.fsf@gnu.org> <87fu7cm5h8.fsf@gnu.org> <87wp0nf17i.fsf@vany.ca> <2cee2d58-f645-487f-eda6-9714eaad5e9f@tobias.gr> Date: Mon, 15 Jan 2018 15:36:05 -0500 In-Reply-To: <2cee2d58-f645-487f-eda6-9714eaad5e9f@tobias.gr> (Tobias Geerinckx-Rice's message of "Sat, 13 Jan 2018 15:00:51 +0100") Message-ID: <87mv1eeu6i.fsf@vany.ca> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 28973 Cc: ludo@gnu.org, Tobias Geerinckx-Rice X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) Okay updated patch below. I pulled all the copyright information from the debian package. Added configure arguments to avoid compiling source files which are 4-clause BSD licensed. There is one file who's license I am not sure what to name. src/libstrongswan/plugins/pkcs11.h The text of the license is: "This file is free software; as a special exception the author gives unlimited permission to copy and/or distribute it, with or without modifications, as long as this notice is preserved." Debian listed this as "MIT" but I don't believe that is correct. I can't find text of any "MIT" license like this, and it doesn't match the expat license either. So, not really sure what to do there. diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 2c55d6793..c0f66cfcc 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -66,6 +66,7 @@ #:use-module (gnu packages libidn) #:use-module (gnu packages linux) #:use-module (gnu packages lua) + #:use-module (gnu packages multiprecision) #:use-module (gnu packages kerberos) #:use-module (gnu packages ncurses) #:use-module (gnu packages pcre) @@ -1498,6 +1499,60 @@ interface and a programmable text output for scripting.") (license (list license:bsd-2 license:expat)))) +(define-public strongswan + (package + (name "strongswan") + (version "5.6.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://download.strongswan.org/strongswan-" version ".tar.bz2")) + (sha256 + (base32 "0lxbyiary8iapx3ysw40czrmxf983fhfzs5mvz2hk1j1mpc85hp0")) + (patches + (search-patches "strongswan-test_process-disable-all.patch" + "strongswan-test_time_printf_hook-pass-in-utc.patch")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list + ;; Disable bsd-4 licensed plugins + "--disable-des" + "--disable-blowfish"))) + (inputs + `(("curl" ,curl) + ("gmp" ,gmp) + ("libgcrypt" ,libgcrypt) + ("openssl" ,openssl))) + (synopsis "IKEv1/v2 keying daemon") + (description "StrongSwan is an IPsec implementation originally based upon +the FreeS/WAN project. It contains support for IKEv1, IKEv2, MOBIKE, IPv6, +NAT-T and more.") + (home-page "https://strongswan.org/") + (license + (list license:gpl2+ + ;; src/aikgen/* + ;; src/libcharon/plugins/dnscert/* + ;; src/libcharon/plugins/ext_auth/* + ;; src/libcharon/plugins/vici/ruby/* + ;; src/libcharon/plugins/xauth_pam/xauth_pam_listener.[ch] + license:expat + ;; src/inclue/sys/* + license:bsd-3 + ;; src/libstrongswan/plugins/sha3/sha3_keccak.c + license:public-domain + ;; These files are not included in the + ;; build, they are disabled through + ;; options to ./configure + ;; + ;; src/libstrongswan/plugins/blowfish/bf_enc.c + ;; src/libstrongswan/plugins/blowfish/bf_locl.h + ;; src/libstrongswan/plugins/blowfish/bf_pi.h + ;; src/libstrongswan/plugins/blowfish/bf_skey.c + ;; src/libstrongswan/plugins/blowfish/blowfish_crypter.c + ;; src/libstrongswan/plugins/des/des_crypter.c + license:bsd-4)))) + (define-public libnet (package (name "libnet") diff --git a/gnu/packages/patches/strongswan-test_process-disable-all.patch b/gnu/packages/patches/strongswan-test_process-disable-all.patch new file mode 100644 index 000000000..df3d1f3be --- /dev/null +++ b/gnu/packages/patches/strongswan-test_process-disable-all.patch @@ -0,0 +1,48 @@ + +diff -Naur strongswan-5.6.0-original/src/libstrongswan/tests/suites/test_process.c strongswan-5.6.0/src/libstrongswan/tests/suites/test_process.c +--- strongswan-5.6.0-original/src/libstrongswan/tests/suites/test_process.c 2016-04-22 16:01:35.000000000 -0400 ++++ strongswan-5.6.0/src/libstrongswan/tests/suites/test_process.c 2017-10-23 15:10:12.753837342 -0400 +@@ -201,27 +201,27 @@ + + s = suite_create("process"); + +- tc = tcase_create("return values"); +- tcase_add_test(tc, test_retval_true); +- tcase_add_test(tc, test_retval_false); +- suite_add_tcase(s, tc); ++ /* tc = tcase_create("return values"); */ ++ /* tcase_add_test(tc, test_retval_true); */ ++ /* tcase_add_test(tc, test_retval_false); */ ++ /* suite_add_tcase(s, tc); */ + + tc = tcase_create("not found"); + tcase_add_test(tc, test_not_found); + suite_add_tcase(s, tc); + +- tc = tcase_create("echo"); +- tcase_add_test(tc, test_echo); +- tcase_add_test(tc, test_echo_err); +- suite_add_tcase(s, tc); +- +- tc = tcase_create("env"); +- tcase_add_test(tc, test_env); +- suite_add_tcase(s, tc); +- +- tc = tcase_create("shell"); +- tcase_add_test(tc, test_shell); +- suite_add_tcase(s, tc); ++ /* tc = tcase_create("echo"); */ ++ /* tcase_add_test(tc, test_echo); */ ++ /* tcase_add_test(tc, test_echo_err); */ ++ /* suite_add_tcase(s, tc); */ ++ ++ /* tc = tcase_create("env"); */ ++ /* tcase_add_test(tc, test_env); */ ++ /* suite_add_tcase(s, tc); */ ++ ++ /* tc = tcase_create("shell"); */ ++ /* tcase_add_test(tc, test_shell); */ ++ /* suite_add_tcase(s, tc); */ + + return s; + } diff --git a/gnu/packages/patches/strongswan-test_time_printf_hook-pass-in-utc.patch b/gnu/packages/patches/strongswan-test_time_printf_hook-pass-in-utc.patch new file mode 100644 index 000000000..a1d80cb3a --- /dev/null +++ b/gnu/packages/patches/strongswan-test_time_printf_hook-pass-in-utc.patch @@ -0,0 +1,14 @@ +diff -Naur strongswan-5.6.0-original/src/libstrongswan/tests/suites/test_utils.c strongswan-5.6.0/src/libstrongswan/tests/suites/test_utils.c +--- strongswan-5.6.0-original/src/libstrongswan/tests/suites/test_utils.c 2017-10-23 14:50:49.744343308 -0400 ++++ strongswan-5.6.0/src/libstrongswan/tests/suites/test_utils.c 2017-10-23 14:51:07.911880335 -0400 +@@ -750,9 +750,9 @@ + } time_data[] = { + {UNDEFINED_TIME, FALSE, "--- -- --:--:-- ----"}, + {UNDEFINED_TIME, TRUE , "--- -- --:--:-- UTC ----"}, +- {1, FALSE, "Jan 01 01:00:01 1970"}, ++ {1, FALSE, "Jan 01 00:00:01 1970"}, + {1, TRUE , "Jan 01 00:00:01 UTC 1970"}, +- {1341150196, FALSE, "Jul 01 15:43:16 2012"}, ++ {1341150196, FALSE, "Jul 01 13:43:16 2012"}, + {1341150196, TRUE , "Jul 01 13:43:16 UTC 2012"}, + }; From debbugs-submit-bounces@debbugs.gnu.org Mon Jan 15 16:47:16 2018 Received: (at 28973) by debbugs.gnu.org; 15 Jan 2018 21:47:16 +0000 Received: from localhost ([127.0.0.1]:57827 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ebCb6-00037y-0a for submit@debbugs.gnu.org; Mon, 15 Jan 2018 16:47:16 -0500 Received: from tobias.gr ([51.15.135.5]:45448) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ebCb2-00037X-R1 for 28973@debbugs.gnu.org; Mon, 15 Jan 2018 16:47:13 -0500 Received: by tobias.gr (OpenSMTPD) with ESMTP id dad0bcc5; Mon, 15 Jan 2018 21:47:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=tobias.gr; h=subject:to :cc:references:from:message-id:date:mime-version:in-reply-to :content-type:content-transfer-encoding; s=2018; bh=TXmeRN8ZQgao Ny/9NNGNp2yQ6TK3ihwJO/JB2FaoKAk=; b=j5s4sZ/OpKoMLkPrJAPCaEvkfmPf kb7UZAhX7OvVB65e1O5lv3N2vVEKt3l0dEJKMyC9hnQhut5lsPofDXqjex/74S5k 6Trz+f4EWCE0dWwUEio156Wb91z0FxIrKEg1cTc/L2cOfsFYbuzyEUTt8EmCq5Ft iEuwnPWim/LCIsS8lwP/5Bj3uGDTOy3OMirw4D6uZFJIeUJuia/6uyKizWIWwt66 JzyZlOtOmwqnZoZrsvwyqq/v/NqBdQRkIbBb1P7dNHB1lhS8ky2mJIw3WUmMcoAr OYe5QNOGz7fARCziA6RpwRjlLVAjTVuWhwbEYphLzb5yB+RepEH6Mo3VSQ== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id d02df8ef (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128:NO); Mon, 15 Jan 2018 21:47:06 +0000 (UTC) Subject: Re: [bug#28973] [PATCH 1/1] gnu: Add strongswan. To: adam@vany.ca, 28973@debbugs.gnu.org References: <87r2tsbcer.fsf@vany.ca> <555ac710-dd1f-4c74-036a-ad14683e1e5e@tobias.gr> <87a80gb0us.fsf@vany.ca> <87k1ylzy6y.fsf@gnu.org> <87fu7cm5h8.fsf@gnu.org> <87wp0nf17i.fsf@vany.ca> <2cee2d58-f645-487f-eda6-9714eaad5e9f@tobias.gr> <87mv1eeu6i.fsf@vany.ca> From: Tobias Geerinckx-Rice Message-ID: <9b85d987-e691-a89e-f4ee-1ce663b5c928@tobias.gr> Date: Mon, 15 Jan 2018 22:50:08 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 In-Reply-To: <87mv1eeu6i.fsf@vany.ca> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 28973 Cc: ludo@gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Adam Van Ymeren wrote on 15/01/18 at 21:36: > There is one file who's license I am not sure what to name. > > src/libstrongswan/plugins/pkcs11.h > > The text of the license is: > > "This file is free software; as a special exception the author gives > unlimited permission to copy and/or distribute it, with or without > modifications, as long as this notice is preserved." > > Debian listed this as "MIT" but I don't believe that is correct. I > can't find text of any "MIT" license like this, and it doesn't match the > expat license either. There's always the non-copyleft procedure for uncommon (but free) licences that don't have their own entry. Is that the entire licence text? It sounds strange to me (exception to what?). I'm obviously not clever enough to be a lawyer. Yay, T G-R From debbugs-submit-bounces@debbugs.gnu.org Mon Jan 15 17:32:53 2018 Received: (at 28973) by debbugs.gnu.org; 15 Jan 2018 22:32:53 +0000 Received: from localhost ([127.0.0.1]:57866 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ebDJF-0006De-M5 for submit@debbugs.gnu.org; Mon, 15 Jan 2018 17:32:53 -0500 Received: from mail2.vany.ca ([142.54.190.254]:33299) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ebDJC-0006DV-Oz for 28973@debbugs.gnu.org; Mon, 15 Jan 2018 17:32:52 -0500 Received: from android-f1556844515373de (unknown [192.159.178.248]) by mail2.vany.ca (Postfix) with ESMTPSA id 611BFAC00DE; Mon, 15 Jan 2018 16:32:48 -0600 (CST) Date: Mon, 15 Jan 2018 17:32:45 -0500 In-Reply-To: <9b85d987-e691-a89e-f4ee-1ce663b5c928@tobias.gr> References: <87r2tsbcer.fsf@vany.ca> <555ac710-dd1f-4c74-036a-ad14683e1e5e@tobias.gr> <87a80gb0us.fsf@vany.ca> <87k1ylzy6y.fsf@gnu.org> <87fu7cm5h8.fsf@gnu.org> <87wp0nf17i.fsf@vany.ca> <2cee2d58-f645-487f-eda6-9714eaad5e9f@tobias.gr> <87mv1eeu6i.fsf@vany.ca> <9b85d987-e691-a89e-f4ee-1ce663b5c928@tobias.gr> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [bug#28973] [PATCH 1/1] gnu: Add strongswan. To: Tobias Geerinckx-Rice ,28973@debbugs.gnu.org From: Adam Van Ymeren Message-ID: <9A48E196-BC5C-425B-8EB0-D944D464BD3D@vany.ca> X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 28973 Cc: ludo@gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) On January 15, 2018 4:50:08 PM EST, Tobias Geerinckx-Rice = wrote: >There's always the non-copyleft procedure for uncommon (but free) >licences that don't have their own entry=2E Didn't know about that=2E That's probably the right thing to use here? > >Is that the entire licence text? It sounds strange to me (exception to >what?)=2E I'm obviously not clever enough to be a lawyer=2E Yeah thats the entire licence text, it is strange=2E It's similar to what= appears in the top of '"configure" scripts as generated by autoconf=2E > >Yay, > >T G-R From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 23 15:43:32 2018 Received: (at 28973) by debbugs.gnu.org; 23 Jan 2018 20:43:32 +0000 Received: from localhost ([127.0.0.1]:40036 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ee5Po-0008NM-4D for submit@debbugs.gnu.org; Tue, 23 Jan 2018 15:43:32 -0500 Received: from mail2.vany.ca ([142.54.190.254]:33647) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ee5Pn-0008NF-5U for 28973@debbugs.gnu.org; Tue, 23 Jan 2018 15:43:31 -0500 Received: from adamvy-laptop (unknown [192.159.178.248]) by mail2.vany.ca (Postfix) with ESMTPSA id 0D48EAC0255 for <28973@debbugs.gnu.org>; Tue, 23 Jan 2018 14:43:29 -0600 (CST) From: Adam Van Ymeren To: 28973@debbugs.gnu.org Subject: Updated: [PATCH 1/1] gnu: Add strongswan. Date: Tue, 23 Jan 2018 15:43:26 -0500 Message-ID: <87mv141f2p.fsf@vany.ca> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 28973 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) I think this is good to commit now. I've put in all the licensing info, disabled compilation of BSD-4 licensed files, and documented one file with a unknown but permissive license. --- diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 2c55d6793..343708c1e 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -66,6 +66,7 @@ #:use-module (gnu packages libidn) #:use-module (gnu packages linux) #:use-module (gnu packages lua) + #:use-module (gnu packages multiprecision) #:use-module (gnu packages kerberos) #:use-module (gnu packages ncurses) #:use-module (gnu packages pcre) @@ -1498,6 +1499,65 @@ interface and a programmable text output for scripting.") (license (list license:bsd-2 license:expat)))) +(define-public strongswan + (package + (name "strongswan") + (version "5.6.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://download.strongswan.org/strongswan-" version ".tar.bz2")) + (sha256 + (base32 "0lxbyiary8iapx3ysw40czrmxf983fhfzs5mvz2hk1j1mpc85hp0")) + (patches + (search-patches "strongswan-test_process-disable-all.patch" + "strongswan-test_time_printf_hook-pass-in-utc.patch")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list + ;; Disable bsd-4 licensed plugins + "--disable-des" + "--disable-blowfish"))) + (inputs + `(("curl" ,curl) + ("gmp" ,gmp) + ("libgcrypt" ,libgcrypt) + ("openssl" ,openssl))) + (synopsis "IKEv1/v2 keying daemon") + (description "StrongSwan is an IPsec implementation originally based upon +the FreeS/WAN project. It contains support for IKEv1, IKEv2, MOBIKE, IPv6, +NAT-T and more.") + (home-page "https://strongswan.org/") + (license + (list license:gpl2+ + ;; src/aikgen/* + ;; src/libcharon/plugins/dnscert/* + ;; src/libcharon/plugins/ext_auth/* + ;; src/libcharon/plugins/vici/ruby/* + ;; src/libcharon/plugins/xauth_pam/xauth_pam_listener.[ch] + license:expat + ;; src/inclue/sys/* + license:bsd-3 + ;; src/libstrongswan/plugins/sha3/sha3_keccak.c + license:public-domain + ;; src/libstrongswan/plugins/pkcs11/pkcs11.h + (license:non-copyleft + "file://src/libstrongswan/plugins/pkcs11/pkcs11.h" + "pkcs11 contains a unknown permissive license. View the specific +file for more details.") + ;; These files are not included in the + ;; build, they are disabled through + ;; options to ./configure + ;; + ;; src/libstrongswan/plugins/blowfish/bf_enc.c + ;; src/libstrongswan/plugins/blowfish/bf_locl.h + ;; src/libstrongswan/plugins/blowfish/bf_pi.h + ;; src/libstrongswan/plugins/blowfish/bf_skey.c + ;; src/libstrongswan/plugins/blowfish/blowfish_crypter.c + ;; src/libstrongswan/plugins/des/des_crypter.c + license:bsd-4)))) + diff --git a/gnu/packages/patches/strongswan-test_process-disable-all.patch b/gnu/packages/patches/strongswan-test_process-disable-all.patch new file mode 100644 index 000000000..df3d1f3be --- /dev/null +++ b/gnu/packages/patches/strongswan-test_process-disable-all.patch @@ -0,0 +1,48 @@ + +diff -Naur strongswan-5.6.0-original/src/libstrongswan/tests/suites/test_process.c strongswan-5.6.0/src/libstrongswan/tests/suites/test_process.c +--- strongswan-5.6.0-original/src/libstrongswan/tests/suites/test_process.c 2016-04-22 16:01:35.000000000 -0400 ++++ strongswan-5.6.0/src/libstrongswan/tests/suites/test_process.c 2017-10-23 15:10:12.753837342 -0400 +@@ -201,27 +201,27 @@ + + s = suite_create("process"); + +- tc = tcase_create("return values"); +- tcase_add_test(tc, test_retval_true); +- tcase_add_test(tc, test_retval_false); +- suite_add_tcase(s, tc); ++ /* tc = tcase_create("return values"); */ ++ /* tcase_add_test(tc, test_retval_true); */ ++ /* tcase_add_test(tc, test_retval_false); */ ++ /* suite_add_tcase(s, tc); */ + + tc = tcase_create("not found"); + tcase_add_test(tc, test_not_found); + suite_add_tcase(s, tc); + +- tc = tcase_create("echo"); +- tcase_add_test(tc, test_echo); +- tcase_add_test(tc, test_echo_err); +- suite_add_tcase(s, tc); +- +- tc = tcase_create("env"); +- tcase_add_test(tc, test_env); +- suite_add_tcase(s, tc); +- +- tc = tcase_create("shell"); +- tcase_add_test(tc, test_shell); +- suite_add_tcase(s, tc); ++ /* tc = tcase_create("echo"); */ ++ /* tcase_add_test(tc, test_echo); */ ++ /* tcase_add_test(tc, test_echo_err); */ ++ /* suite_add_tcase(s, tc); */ ++ ++ /* tc = tcase_create("env"); */ ++ /* tcase_add_test(tc, test_env); */ ++ /* suite_add_tcase(s, tc); */ ++ ++ /* tc = tcase_create("shell"); */ ++ /* tcase_add_test(tc, test_shell); */ ++ /* suite_add_tcase(s, tc); */ + + return s; + } diff --git a/gnu/packages/patches/strongswan-test_time_printf_hook-pass-in-utc.patch b/gnu/packages/patches/strongswan-test_time_printf_hook-pass-in-utc.patch new file mode 100644 index 000000000..a1d80cb3a --- /dev/null +++ b/gnu/packages/patches/strongswan-test_time_printf_hook-pass-in-utc.patch @@ -0,0 +1,14 @@ +diff -Naur strongswan-5.6.0-original/src/libstrongswan/tests/suites/test_utils.c strongswan-5.6.0/src/libstrongswan/tests/suites/test_utils.c +--- strongswan-5.6.0-original/src/libstrongswan/tests/suites/test_utils.c 2017-10-23 14:50:49.744343308 -0400 ++++ strongswan-5.6.0/src/libstrongswan/tests/suites/test_utils.c 2017-10-23 14:51:07.911880335 -0400 +@@ -750,9 +750,9 @@ + } time_data[] = { + {UNDEFINED_TIME, FALSE, "--- -- --:--:-- ----"}, + {UNDEFINED_TIME, TRUE , "--- -- --:--:-- UTC ----"}, +- {1, FALSE, "Jan 01 01:00:01 1970"}, ++ {1, FALSE, "Jan 01 00:00:01 1970"}, + {1, TRUE , "Jan 01 00:00:01 UTC 1970"}, +- {1341150196, FALSE, "Jul 01 15:43:16 2012"}, ++ {1341150196, FALSE, "Jul 01 13:43:16 2012"}, + {1341150196, TRUE , "Jul 01 13:43:16 UTC 2012"}, + }; From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 30 16:23:05 2018 Received: (at 28973) by debbugs.gnu.org; 30 Jan 2018 21:23:05 +0000 Received: from localhost ([127.0.0.1]:49890 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1egdMu-0006BF-VA for submit@debbugs.gnu.org; Tue, 30 Jan 2018 16:23:05 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:57820) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1egdMq-0006AS-Oo for 28973@debbugs.gnu.org; Tue, 30 Jan 2018 16:23:01 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 38DF711900; Tue, 30 Jan 2018 22:23:00 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Zec0ilLGiEbS; Tue, 30 Jan 2018 22:22:59 +0100 (CET) Received: from ribbon (unknown [IPv6:2a01:e0a:1d:7270:af76:b9b:ca24:c465]) by hera.aquilenet.fr (Postfix) with ESMTPSA id F2619118FE; Tue, 30 Jan 2018 22:22:58 +0100 (CET) From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Adam Van Ymeren Subject: Re: [bug#28973] [PATCH 1/1] gnu: Add strongswan. References: <87r2tsbcer.fsf@vany.ca> <555ac710-dd1f-4c74-036a-ad14683e1e5e@tobias.gr> <87a80gb0us.fsf@vany.ca> <87k1ylzy6y.fsf@gnu.org> <87fu7cm5h8.fsf@gnu.org> <87wp0nf17i.fsf@vany.ca> <2cee2d58-f645-487f-eda6-9714eaad5e9f@tobias.gr> <87mv1eeu6i.fsf@vany.ca> Date: Tue, 30 Jan 2018 22:22:57 +0100 In-Reply-To: <87mv1eeu6i.fsf@vany.ca> (Adam Van Ymeren's message of "Mon, 15 Jan 2018 15:36:05 -0500") Message-ID: <871si7vy6m.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 28973 Cc: Tobias Geerinckx-Rice , 28973@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) Hi, Adam Van Ymeren skribis: > Okay updated patch below. I pulled all the copyright information from > the debian package. Added configure arguments to avoid compiling source > files which are 4-clause BSD licensed. > > There is one file who's license I am not sure what to name. > > src/libstrongswan/plugins/pkcs11.h > > The text of the license is: > > "This file is free software; as a special exception the author gives > unlimited permission to copy and/or distribute it, with or without > modifications, as long as this notice is preserved." > > Debian listed this as "MIT" but I don't believe that is correct. I > can't find text of any "MIT" license like this, and it doesn't match the > expat license either. Like you wrote it=E2=80=99s like what short GNU helper files have, so you c= ould use =E2=80=98non-copyleft=E2=80=99 like Tobias mentions. To me the only remaining issue is: > --- /dev/null > +++ b/gnu/packages/patches/strongswan-test_process-disable-all.patch > @@ -0,0 +1,48 @@ > + For both patches please add two or three lines explaining what the patch does and why. The first one can probably be called =E2=80=98strongswan-skip-tests.patch= =E2=80=99. > +diff -Naur strongswan-5.6.0-original/src/libstrongswan/tests/suites/test= _process.c strongswan-5.6.0/src/libstrongswan/tests/suites/test_process.c > +--- strongswan-5.6.0-original/src/libstrongswan/tests/suites/test_proces= s.c 2016-04-22 16:01:35.000000000 -0400 > ++++ strongswan-5.6.0/src/libstrongswan/tests/suites/test_process.c 2017-= 10-23 15:10:12.753837342 -0400 > +@@ -201,27 +201,27 @@ > + > + s =3D suite_create("process"); > + > +- tc =3D tcase_create("return values"); > +- tcase_add_test(tc, test_retval_true); > +- tcase_add_test(tc, test_retval_false); > +- suite_add_tcase(s, tc); > ++ /* tc =3D tcase_create("return values"); */ > ++ /* tcase_add_test(tc, test_retval_true); */ > ++ /* tcase_add_test(tc, test_retval_false); */ > ++ /* suite_add_tcase(s, tc); */ As a bonus, it=E2=80=99s better if you remove the lines instead of commenti= ng them out: it makes the patch shorter and easier to read. Could you send an updated patch? We=E2=80=99re pretty much done. :-) Thank you! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 31 14:46:08 2018 Received: (at 28973) by debbugs.gnu.org; 31 Jan 2018 19:46:08 +0000 Received: from localhost ([127.0.0.1]:51520 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1egyKd-0004FM-Oh for submit@debbugs.gnu.org; Wed, 31 Jan 2018 14:46:08 -0500 Received: from mail2.vany.ca ([142.54.190.254]:33994) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1egyKc-0004FE-8T for 28973@debbugs.gnu.org; Wed, 31 Jan 2018 14:46:06 -0500 Received: from adamvy-laptop (unknown [192.159.178.248]) by mail2.vany.ca (Postfix) with ESMTPSA id B13BDAC0698; Wed, 31 Jan 2018 13:46:03 -0600 (CST) From: Adam Van Ymeren To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [bug#28973] [PATCH 1/1] gnu: Add strongswan. In-Reply-To: <871si7vy6m.fsf@gnu.org> References: <87r2tsbcer.fsf@vany.ca> <555ac710-dd1f-4c74-036a-ad14683e1e5e@tobias.gr> <87a80gb0us.fsf@vany.ca> <87k1ylzy6y.fsf@gnu.org> <87fu7cm5h8.fsf@gnu.org> <87wp0nf17i.fsf@vany.ca> <2cee2d58-f645-487f-eda6-9714eaad5e9f@tobias.gr> <87mv1eeu6i.fsf@vany.ca> <871si7vy6m.fsf@gnu.org> Date: Wed, 31 Jan 2018 14:46:02 -0500 Message-ID: <87tvv1dd6t.fsf@vany.ca> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 28973 Cc: Tobias Geerinckx-Rice , 28973@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) Okay I think I've done all your comments. I figured out how to get some of the tests that were failing to pass so I dropped one of the patches and cleaned up the other one. I also added non-copyleft license for that one file. I spent some time trying to debug the remaining failing tests. They make some assumptions about paths which are not true in the build container, I managed to get some to pass when I run manually in a container from guix environment -C, but they still fail when $ guix build runs, so I've left in the patch to disable them. They're really not essential tests. Updated patch below. --- gnu/packages/networking.scm | 71 ++++++++++++++++++++++++ gnu/packages/patches/strongswan-skip-tests.patch | 33 +++++++++++ 2 files changed, 104 insertions(+) create mode 100644 gnu/packages/patches/strongswan-skip-tests.patch diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 2c55d6793..0138e59e3 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -49,6 +49,7 @@ #:use-module (gnu packages algebra) #:use-module (gnu packages audio) #:use-module (gnu packages autotools) + #:use-module (gnu packages base) #:use-module (gnu packages bison) #:use-module (gnu packages check) #:use-module (gnu packages code) @@ -66,6 +67,7 @@ #:use-module (gnu packages libidn) #:use-module (gnu packages linux) #:use-module (gnu packages lua) + #:use-module (gnu packages multiprecision) #:use-module (gnu packages kerberos) #:use-module (gnu packages ncurses) #:use-module (gnu packages pcre) @@ -1567,3 +1569,72 @@ routers (or @dfn{hops}) between the local host and a user-specified destination. It then continually measures the response time and packet loss at each hop, and displays the results in real time.") (license license:gpl2+))) + +(define-public strongswan + (package + (name "strongswan") + (version "5.6.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://download.strongswan.org/strongswan-" version ".tar.bz2")) + (sha256 + (base32 "0lxbyiary8iapx3ysw40czrmxf983fhfzs5mvz2hk1j1mpc85hp0")) + (patches + (search-patches "strongswan-skip-tests.patch")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; This is needed for tests + (add-after 'unpack 'set-TZDIR + (lambda* (#:key inputs #:allow-other-keys) + (setenv "TZDIR" (string-append (assoc-ref inputs "tzdata") + "/share/zoneinfo")) + #t))) + #:configure-flags + (list + ;; Disable bsd-4 licensed plugins + "--disable-des" + "--disable-blowfish"))) + (inputs + `(("curl" ,curl) + ("gmp" ,gmp) + ("libgcrypt" ,libgcrypt) + ("openssl" ,openssl))) + (native-inputs + `(("coreutils" ,coreutils) + ("tzdata" ,tzdata-2017a))) + (synopsis "IKEv1/v2 keying daemon") + (description "StrongSwan is an IPsec implementation originally based upon +the FreeS/WAN project. It contains support for IKEv1, IKEv2, MOBIKE, IPv6, +NAT-T and more.") + (home-page "https://strongswan.org/") + (license + (list license:gpl2+ + ;; src/aikgen/* + ;; src/libcharon/plugins/dnscert/* + ;; src/libcharon/plugins/ext_auth/* + ;; src/libcharon/plugins/vici/ruby/* + ;; src/libcharon/plugins/xauth_pam/xauth_pam_listener.[ch] + license:expat + ;; src/inclue/sys/* + license:bsd-3 + ;; src/libstrongswan/plugins/sha3/sha3_keccak.c + license:public-domain + ;; src/libstrongswan/plugins/pkcs11/pkcs11.h + (license:non-copyleft + "file://src/libstrongswan/plugins/pkcs11/pkcs11.h" + "pkcs11 contains a unknown permissive license. View the specific +file for more details.") + ;; These files are not included in the + ;; build, they are disabled through + ;; options to ./configure + ;; + ;; src/libstrongswan/plugins/blowfish/bf_enc.c + ;; src/libstrongswan/plugins/blowfish/bf_locl.h + ;; src/libstrongswan/plugins/blowfish/bf_pi.h + ;; src/libstrongswan/plugins/blowfish/bf_skey.c + ;; src/libstrongswan/plugins/blowfish/blowfish_crypter.c + ;; src/libstrongswan/plugins/des/des_crypter.c + license:bsd-4)))) diff --git a/gnu/packages/patches/strongswan-skip-tests.patch b/gnu/packages/patches/strongswan-skip-tests.patch new file mode 100644 index 000000000..b2a93ea99 --- /dev/null +++ b/gnu/packages/patches/strongswan-skip-tests.patch @@ -0,0 +1,33 @@ +Delete some tests that fail to run in the build container. + +diff -ur strongswan-5.6.1-original/src/libstrongswan/tests/suites/test_process.c strongswan-5.6.1/src/libstrongswan/tests/suites/test_process.c +--- strongswan-5.6.1-original/src/libstrongswan/tests/suites/test_process.c 2016-04-22 16:01:35.000000000 -0400 ++++ strongswan-5.6.1/src/libstrongswan/tests/suites/test_process.c 2018-01-31 14:31:39.644634648 -0500 +@@ -201,27 +201,9 @@ + + s = suite_create("process"); + +- tc = tcase_create("return values"); +- tcase_add_test(tc, test_retval_true); +- tcase_add_test(tc, test_retval_false); +- suite_add_tcase(s, tc); +- + tc = tcase_create("not found"); + tcase_add_test(tc, test_not_found); + suite_add_tcase(s, tc); + +- tc = tcase_create("echo"); +- tcase_add_test(tc, test_echo); +- tcase_add_test(tc, test_echo_err); +- suite_add_tcase(s, tc); +- +- tc = tcase_create("env"); +- tcase_add_test(tc, test_env); +- suite_add_tcase(s, tc); +- +- tc = tcase_create("shell"); +- tcase_add_test(tc, test_shell); +- suite_add_tcase(s, tc); +- + return s; + } -- 2.15.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 31 17:34:00 2018 Received: (at 28973-done) by debbugs.gnu.org; 31 Jan 2018 22:34:00 +0000 Received: from localhost ([127.0.0.1]:51589 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eh0x5-0001ZS-VA for submit@debbugs.gnu.org; Wed, 31 Jan 2018 17:34:00 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:43138) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eh0x4-0001ZJ-0h for 28973-done@debbugs.gnu.org; Wed, 31 Jan 2018 17:33:58 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id E751211C2A; Wed, 31 Jan 2018 23:33:56 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id OEb2tbuYvATq; Wed, 31 Jan 2018 23:33:55 +0100 (CET) Received: from ribbon (unknown [IPv6:2a01:e0a:1d:7270:af76:b9b:ca24:c465]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 5E57C11C08; Wed, 31 Jan 2018 23:33:55 +0100 (CET) From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Adam Van Ymeren Subject: Re: [bug#28973] [PATCH 1/1] gnu: Add strongswan. References: <87r2tsbcer.fsf@vany.ca> <555ac710-dd1f-4c74-036a-ad14683e1e5e@tobias.gr> <87a80gb0us.fsf@vany.ca> <87k1ylzy6y.fsf@gnu.org> <87fu7cm5h8.fsf@gnu.org> <87wp0nf17i.fsf@vany.ca> <2cee2d58-f645-487f-eda6-9714eaad5e9f@tobias.gr> <87mv1eeu6i.fsf@vany.ca> <871si7vy6m.fsf@gnu.org> <87tvv1dd6t.fsf@vany.ca> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 12 =?utf-8?Q?Pluvi=C3=B4se?= an 226 de la =?utf-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Wed, 31 Jan 2018 23:33:54 +0100 In-Reply-To: <87tvv1dd6t.fsf@vany.ca> (Adam Van Ymeren's message of "Wed, 31 Jan 2018 14:46:02 -0500") Message-ID: <87vafhr73h.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 28973-done Cc: Tobias Geerinckx-Rice , 28973-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) Adam Van Ymeren skribis: > Okay I think I've done all your comments. I figured out how to get some > of the tests that were failing to pass so I dropped one of the patches > and cleaned up the other one. > > I also added non-copyleft license for that one file. > > I spent some time trying to debug the remaining failing tests. They > make some assumptions about paths which are not true in the build > container, I managed to get some to pass when I run manually in a > container from guix environment -C, but they still fail when $ guix > build runs, so I've left in the patch to disable them. They're really > not essential tests. I=E2=80=99ve adjusted said file names in test_process.c and in the library, removed the patch (tests pass!), adjusted the commit log, and pushed as 5f645557a475696c17d936024018103811e1a525. Thanks! Ludo=E2=80=99. From unknown Sat Aug 16 14:50:45 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 01 Mar 2018 12:24:06 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator