aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2018-12-06 17:25:01 +0200
committerKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2018-12-06 17:25:33 +0200
commit8ba5732d7f4832b862ea1e38642bfcca7028046a (patch)
tree6ae1c6abed7f7ca1fe30db54530873aa1117a862
parent211a6eb9128981e6ba6c9121781ff2fab6d87d1c (diff)
downloadaports-8ba5732d7f4832b862ea1e38642bfcca7028046a.tar.bz2
main/strongswan: eliminate startup race
-rw-r--r--main/strongswan/APKBUILD4
-rw-r--r--main/strongswan/charon.initd4
2 files changed, 5 insertions, 3 deletions
diff --git a/main/strongswan/APKBUILD b/main/strongswan/APKBUILD
index 65e2c13..c1e7e7b 100644
--- a/main/strongswan/APKBUILD
+++ b/main/strongswan/APKBUILD
@@ -3,7 +3,7 @@
pkgname=strongswan
pkgver=5.7.1
_pkgver=${pkgver//_rc/rc}
-pkgrel=1
+pkgrel=2
pkgdesc="IPsec-based VPN solution focused on security and ease of use, supporting IKEv1/IKEv2 and MOBIKE"
url="https://www.strongswan.org/"
arch="all"
@@ -129,4 +129,4 @@ sha512sums="43102814434bee7c27a5956be59099cc4ffb9bb5b0d6382ce4c6a80d1d82ed6639f6
f7d98fb99b4855e8bfbb7369292c170536b1987e717feeda71f64ab71b35538e7d462609a773c6a6ed08c8e6ee7a186df12e1ea7d64b9dac0b17d4c7af17dab3 1002-vici-send-certificates-for-ike-sa-events.patch
a4235cd07e17ad3441dc391ded11ee9f4debdffa1e8218809731e73a545ca6fcdc0bb87239d41b1102b0b6719a4d31d43758972d2193ebe298b275285de2ce54 1003-vici-add-support-for-individual-sa-state-changes.patch
8b61e3ffbb39b837733e602ec329e626dc519bf7308d3d4192b497d18f38176789d23ef5afec51f8463ee1ddaf4d74546b965c03184132e217cbc27017e886c9 strongswan.initd
-81a4a011c933289562ee53b4ff14c5180f2a1198aab517fa0e9e2b66c3deac0d6a26f2cfdbadd070ec518de19b6c56df10122c724d205bca5d4c96478081fa00 charon.initd"
+4ac8dc83f08998fe672d5446dc6071f95a6a437b9df7c19d5f1a41707fb44451ec37aa237d0b86b0a9edf36a9ce7c29ba8959a38b04536c994dd4300daf737e5 charon.initd"
diff --git a/main/strongswan/charon.initd b/main/strongswan/charon.initd
index c7a7ed6..1293266 100644
--- a/main/strongswan/charon.initd
+++ b/main/strongswan/charon.initd
@@ -14,7 +14,9 @@ depend() {
start_post() {
ebegin "Loading ${name:-$RC_SVCNAME} configuration"
- sleep 0.5
+ while [ ! -e $pidfile ]; do
+ sleep 0.1
+ done
swanctl --load-all &>/dev/null
eend $?
}