From: dstolfa <dstolfa@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] strongswan: bump to 5.9.2, fix tests, fix eap-mschapv2.
Date: Fri, 14 May 2021 20:41:48 +0200 [thread overview]
Message-ID: <20210514184148.1P_vflCSiS4-LPRErPBg-3juPmWHzsSFrvoPr0hqieY@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-30869@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 2004 bytes --]
There is an updated pull request by dstolfa against master on the void-packages repository
https://github.com/dstolfa/void-packages master
https://github.com/void-linux/void-packages/pull/30869
strongswan: bump to 5.9.2, fix tests, fix eap-mschapv2.
The test failure in void was due to tzdata being a runtime dependency
of one test indirectly, so we simply add it in makedepends.
For eap-mschapv2 to be loaded at runtime, we need to have
--enable-openssl as a configuration flag. While strongswan will build
and install eap-mschapv2 without it, it will never actually load it as a
plugin and it simply won't work.
<!-- Mark items with [x] where applicable -->
<!--
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
-->
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/30869.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-30869.patch --]
[-- Type: text/x-diff, Size: 3271 bytes --]
From b71d235d93eb34de50c65b611563f71f9bd2dc59 Mon Sep 17 00:00:00 2001
From: Domagoj Stolfa <ds815@gmx.com>
Date: Fri, 14 May 2021 15:53:06 +0100
Subject: [PATCH] strongswan: update to 5.9.2, fix tests, fix eap-mschapv2.
The test failure in void was due to tzdata being a runtime dependency
of one test indirectly, so we simply add it in makedepends.
All tests now run *locally*, however there are still some failures in CI
that need to be addressed in the future. For now, add
`make_check=ci-skip` to the template.
For eap-mschapv2 to be loaded at runtime, we need to have
--enable-openssl as a configuration flag. While strongswan will build
and install eap-mschapv2 without it, it will never actually load it as a
plugin and it simply won't work.
---
srcpkgs/strongswan/template | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/strongswan/template b/srcpkgs/strongswan/template
index e0e416ad5469..16100d0298d2 100644
--- a/srcpkgs/strongswan/template
+++ b/srcpkgs/strongswan/template
@@ -1,16 +1,21 @@
# Template file for 'strongswan'
+# CI checks are currently disabled due to a number of tests failing either as a
+# result of GitHub Actions having a networking setup that is incompatible with
+# them, or some other issue that is difficult to reproduce locally.
pkgname=strongswan
-version=5.8.4
-revision=2
+version=5.9.2
+revision=1
build_style=gnu-configure
# tpm support waits on libtss2
configure_args="--disable-static --enable-blowfish --enable-curl --enable-md4
- --enable-eap-radius --enable-eap-mschapv2 --enable-eap-md5 --enable-eap-identity --enable-eap-dynamic
- --enable-led --enable-ha --enable-dhcp --enable-mediation --enable-soup --disable-des
- --enable-chapoly --enable-nm"
+ --enable-openssl --enable-eap-radius --enable-eap-mschapv2 --enable-eap-md5
+ --enable-eap-identity --enable-eap-dynamic --enable-led --enable-ha --enable-dhcp
+ --enable-mediation --enable-soup --disable-des --enable-chapoly --enable-nm"
hostmakedepends="pkg-config flex bison python"
-makedepends="gmp-devel libsoup-devel libldns-devel unbound-devel libcurl-devel NetworkManager-devel"
+makedepends="gmp-devel libsoup-devel libldns-devel unbound-devel libcurl-devel
+ NetworkManager-devel openssl-devel"
depends="iproute2 sqlite"
+checkdepends="tzdata"
conf_files="/etc/*.conf /etc/strongswan.d/*.conf /etc/strongswan.d/charon/*.conf /etc/ipsec.secrets"
short_desc="IPsec-based VPN solution, supporting IKEv1/IKEv2 and MOBIKE"
maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
@@ -18,7 +23,7 @@ license="GPL-2.0-or-later"
homepage="https://www.strongswan.org/"
changelog="https://wiki.strongswan.org/projects/strongswan/wiki/Changelog"
distfiles="https://download.strongswan.org/${pkgname}-${version}.tar.bz2"
-checksum=2d9a57e33813b62d58cba07531c4d5a35c6b823dfe9b8ff7c623b6571f02553c
+checksum=61c72f741edb2c1295a7b7ccce0317a104b3f9d39efd04c52cd05b01b55ab063
make_dirs="/etc/ipsec.d/ 0755 root root
/etc/ipsec.d/aacerts 0755 root root
/etc/ipsec.d/acerts 0755 root root
@@ -28,6 +33,7 @@ make_dirs="/etc/ipsec.d/ 0755 root root
/etc/ipsec.d/crls 0755 root root
/etc/ipsec.d/reqs 0755 root root
/etc/ipsec.d/private 0750 root root"
+make_check=ci-skip
post_install() {
vsv strongswan
next prev parent reply other threads:[~2021-05-14 18:41 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-14 15:00 [PR PATCH] " dstolfa
2021-05-14 15:13 ` dstolfa
2021-05-14 16:45 ` [PR PATCH] [Updated] " dstolfa
2021-05-14 16:46 ` dstolfa
2021-05-14 18:32 ` [PR REVIEW] " ericonr
2021-05-14 18:32 ` ericonr
2021-05-14 18:39 ` [PR PATCH] [Updated] " dstolfa
2021-05-14 18:41 ` dstolfa [this message]
2021-05-14 18:49 ` dstolfa
2021-05-14 18:50 ` [PR PATCH] [Merged]: " ericonr
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=20210514184148.1P_vflCSiS4-LPRErPBg-3juPmWHzsSFrvoPr0hqieY@z \
--to=dstolfa@users.noreply.github.com \
--cc=ml@inbox.vuxu.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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).