[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#28973] [PATCH] Add the patches necessary to build strongswan
|
From: |
Adam Van Ymeren |
|
Subject: |
[bug#28973] [PATCH] Add the patches necessary to build strongswan |
|
Date: |
Tue, 24 Oct 2017 16:05:08 -0400 |
|
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) |
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