diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2016-10-31 14:58:34 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2016-10-31 14:58:53 +0000 |
| commit | 17cddfa2011ab1b7ff750cbef1f10ff3e0ed5f0a (patch) | |
| tree | 9bd07b40e74ccac36312613ec1733edc15bf2ad2 /main/strongswan | |
| parent | 3e0594cf909c273e99481a5a1ccbff05bcfd1046 (diff) | |
| download | aports-17cddfa2011ab1b7ff750cbef1f10ff3e0ed5f0a.tar.bz2 aports-17cddfa2011ab1b7ff750cbef1f10ff3e0ed5f0a.tar.xz | |
main/strongswan: upgrade to 5.5.1
Diffstat (limited to 'main/strongswan')
| -rw-r--r-- | main/strongswan/1001-charon-add-optional-source-and-remote-overrides-for-.patch | 14 | ||||
| -rw-r--r-- | main/strongswan/APKBUILD | 16 |
2 files changed, 8 insertions, 22 deletions
diff --git a/main/strongswan/1001-charon-add-optional-source-and-remote-overrides-for-.patch b/main/strongswan/1001-charon-add-optional-source-and-remote-overrides-for-.patch index 6d5fa223b..0dcf00124 100644 --- a/main/strongswan/1001-charon-add-optional-source-and-remote-overrides-for-.patch +++ b/main/strongswan/1001-charon-add-optional-source-and-remote-overrides-for-.patch @@ -20,7 +20,6 @@ Signed-off-by: Timo Teräs <timo.teras@iki.fi> src/charon-nm/nm/nm_service.c | 2 +- src/libcharon/control/controller.c | 43 +++++++++++++++- src/libcharon/control/controller.h | 3 ++ - src/libcharon/plugins/maemo/maemo_service.c | 2 +- src/libcharon/plugins/stroke/stroke_control.c | 5 +- src/libcharon/plugins/vici/vici_config.c | 2 +- src/libcharon/plugins/vici/vici_control.c | 63 ++++++++++++++++++++---- @@ -169,19 +168,6 @@ index 9524f53..7c51ba4 100644 controller_cb_t callback, void *param, u_int timeout, bool limits); -diff --git a/src/libcharon/plugins/maemo/maemo_service.c b/src/libcharon/plugins/maemo/maemo_service.c -index 3e5861b..5a6e03d 100644 ---- a/src/libcharon/plugins/maemo/maemo_service.c -+++ b/src/libcharon/plugins/maemo/maemo_service.c -@@ -364,7 +364,7 @@ static gboolean initiate_connection(private_maemo_service_t *this, - - /* get us an IKE_SA */ - ike_sa = charon->ike_sa_manager->checkout_by_config(charon->ike_sa_manager, -- peer_cfg); -+ peer_cfg, NULL, NULL); - if (!ike_sa) - { - peer_cfg->destroy(peer_cfg); diff --git a/src/libcharon/plugins/stroke/stroke_control.c b/src/libcharon/plugins/stroke/stroke_control.c index fb60d39..83f8ae5 100644 --- a/src/libcharon/plugins/stroke/stroke_control.c diff --git a/main/strongswan/APKBUILD b/main/strongswan/APKBUILD index f358c9dcd..18c07cf5e 100644 --- a/main/strongswan/APKBUILD +++ b/main/strongswan/APKBUILD @@ -1,9 +1,9 @@ # Contributor: Jesse Young <jlyo@jlyo.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=strongswan -pkgver=5.5.0 +pkgver=5.5.1 _pkgver=${pkgver//_rc/rc} -pkgrel=1 +pkgrel=0 pkgdesc="IPsec-based VPN solution focused on security and ease of use, supporting IKEv1/IKEv2 and MOBIKE" url="http://www.strongswan.org/" arch="all" @@ -113,9 +113,9 @@ package() { install -m755 -D "$srcdir/charon.initd" "$pkgdir/etc/init.d/charon" || return 1 } -md5sums="a96fa7eb6c62b40143dadb064b6bd586 strongswan-5.5.0.tar.bz2 +md5sums="4eba9474f7dc6c8c8d7037261358e68d strongswan-5.5.1.tar.bz2 0a82059a9bd45d7a189864843560afe9 0205-ike-Adhere-to-IKE_SA-limit-when-checking-out-by-conf.patch -6e596d747a158bf6760aa85490f368b1 1001-charon-add-optional-source-and-remote-overrides-for-.patch +dc38d5a2e8bf98e3137cc5608d4d1392 1001-charon-add-optional-source-and-remote-overrides-for-.patch 1d174dd2c9fcfdc9e2260a249395ab8d 1002-vici-send-certificates-for-ike-sa-events.patch 167c525d4945d4e9a36fe75aabbbb895 1003-vici-add-support-for-individual-sa-state-changes.patch 97bb0e061ba1576bab0e053afc2a4a72 2001-support-gre-key-in-ikev1.patch @@ -123,9 +123,9 @@ md5sums="a96fa7eb6c62b40143dadb064b6bd586 strongswan-5.5.0.tar.bz2 3e64f8272f98199234b5ea98748090a7 libressl.patch 72a956819c451931d3d31a528a0d1b9c strongswan.initd a7993f28e4eacc61f51722044645587e charon.initd" -sha256sums="58463998ac6725eac3687e8a20c1f69803c3772657076d06c43386a24b4c8454 strongswan-5.5.0.tar.bz2 +sha256sums="720b301991f77bdedd8d551a956f52e2d11686a0ec18e832094f86cf2b842ab7 strongswan-5.5.1.tar.bz2 89934062b4d400019752bb8140a60dacd832e4be7e86e7f573397bc56f87109e 0205-ike-Adhere-to-IKE_SA-limit-when-checking-out-by-conf.patch -b8a7a12582329244bb28b41d52e8f52cdcde84722c9c00d72ed1c799ad575011 1001-charon-add-optional-source-and-remote-overrides-for-.patch +0e4ecbcefc9c8a1c2739bbdf9d05d49581d86dc5c013949aab68f27d0620cd43 1001-charon-add-optional-source-and-remote-overrides-for-.patch e2de070bdb5fd9e19d02d18829ad9684e3a9fa64f0bc45015249c7f1f738f7be 1002-vici-send-certificates-for-ike-sa-events.patch c92a8641093e343f1f652213fb4469622a82f9f3c759e065b2b553ef3cf8cfec 1003-vici-add-support-for-individual-sa-state-changes.patch f038cadddde9f0ea2f36df03f81445b2f6a6d6b09cf4a21bfcdb61c62706a66b 2001-support-gre-key-in-ikev1.patch @@ -133,9 +133,9 @@ fec398ec01dbc3f10693ec128b0f39b90284c89ae65cad6230fd277e6f67e023 2002-vici-add- 0ed364080e84f58915548c2ea9812fe7c354bdcf3c640fabe24e47ae58fa61ba libressl.patch fdb781fa59700ca83b9fd2f2ff0b9c45467448ebd82da96286b3e2aa477ef7f4 strongswan.initd 7bcc57e4a778f87645c6b9d76ba2c04e1c11c326bc9a4968561788711c7fe58a charon.initd" -sha512sums="dbbd26fa21f940e8b959387f174084c811bb6af6950295be724bd8507713918ffda931a65a5db00f2a4611ee4edf893e55ca56cfd5d4efb394eeeb8968c889d4 strongswan-5.5.0.tar.bz2 +sha512sums="051352a941a02ae227f3a7d4ee9d6d5651daa0fb4d01b7086c3bb18815ea94f63b5f94f29e6ef46ef3360666f7c95936cbfde9393d6a0c677de64850056519b9 strongswan-5.5.1.tar.bz2 768a144be4c84395bc28b91e509c8319521d68a9eae0a5d5ff96830bf8cf3154bce046d2128d1aba092bb5d3d2dceb35296c13778294f88a14c2267865766db1 0205-ike-Adhere-to-IKE_SA-limit-when-checking-out-by-conf.patch -66fcaaf19ed17472b52ed178ffdd7454dce80849d4ebaafb8ab3f2d4119bfbc975f7854709c45cec7dfc6f6060834c840da683f45ac1de71688a1ff731564c24 1001-charon-add-optional-source-and-remote-overrides-for-.patch +e97382673d807dc09a64c617af4ec4879386cfab9ebcc843ee517388c5cedca6fc37f3df2649dd5bea366381ee2c1d41adb4c08cf3c1675b633ecb633a951b1d 1001-charon-add-optional-source-and-remote-overrides-for-.patch f1aa4eed2258527dcc787ef41af7fdb9d6eb83e18d1ac2d8eebace47d0f41d5b719f80508691f271e67f2fac2f041b57a02cfea4a289eb38b3619c3ae2e18b9a 1002-vici-send-certificates-for-ike-sa-events.patch 9c94dd2063265581aff60960f795e7e5a7f8992dfb875d2bceff8028ae1c45afd6ec48a0729a0da14e86245b5017c85cdd33b1baa5b7faff4edc1783b5ffedcc 1003-vici-add-support-for-individual-sa-state-changes.patch 1544a409ad08f46a5dffbe3b4e8cf0e973c58140bf225f7c4e9b29be7fe6178f63d73730d1b2f7a755ed0d5dc09ee9fa0a08ac35761b01c5914d9bde1044ce7a 2001-support-gre-key-in-ikev1.patch |