From: Adam Van Ymeren <adam@vany.ca>
To: "Ludovic Courtès" <ludo@gnu.org>
Cc: 28973@debbugs.gnu.org
Subject: [bug#28973] [PATCH 1/1] gnu: Add strongswan.
Date: Wed, 31 Jan 2018 14:46:02 -0500 [thread overview]
Message-ID: <87tvv1dd6t.fsf@vany.ca> (raw)
In-Reply-To: <871si7vy6m.fsf@gnu.org>
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
next prev parent reply other threads:[~2018-01-31 19:47 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-24 18:58 [bug#28973] [PATCH 1/1] gnu: Add strongswan Adam Van Ymeren
2017-10-24 20:05 ` [bug#28973] [PATCH] Add the patches necessary to build strongswan Adam Van Ymeren
2017-10-24 20:11 ` [bug#28973] [PATCH 1/1] gnu: Add strongswan Tobias Geerinckx-Rice
2017-10-24 23:08 ` Adam Van Ymeren
2017-11-19 22:43 ` Ludovic Courtès
2017-11-19 23:20 ` Adam Van Ymeren
2018-01-11 21:48 ` Ludovic Courtès
2018-01-12 17:15 ` Adam Van Ymeren
2018-01-13 13:52 ` Ludovic Courtès
2018-01-13 14:00 ` Tobias Geerinckx-Rice
2018-01-15 20:36 ` Adam Van Ymeren
2018-01-15 21:50 ` Tobias Geerinckx-Rice
2018-01-15 22:32 ` Adam Van Ymeren
2018-01-30 21:22 ` Ludovic Courtès
2018-01-31 19:46 ` Adam Van Ymeren [this message]
2018-01-31 22:33 ` bug#28973: " Ludovic Courtès
2017-10-24 20:13 ` [bug#28973] " Tobias Geerinckx-Rice
2018-01-23 20:43 ` [bug#28973] Updated: " Adam Van Ymeren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87tvv1dd6t.fsf@vany.ca \
--to=adam@vany.ca \
--cc=28973@debbugs.gnu.org \
--cc=ludo@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.