[gentoo-commits] repo/gentoo:master commit in: net-misc/strongswan/, net-misc/strongswan/files/
commit: d38a1bac01395d73e8395dda7bb72c1c5d111b0b
Author: Bjarke Istrup Pedersen gentoo org>
AuthorDate: Thu Mar 24 11:43:29 2016 +
Commit: Bjarke Istrup Pedersen gentoo org>
CommitDate: Thu Mar 24 11:44:44 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d38a1bac
net-misc/strongswan: Bumping to 5.4.0
Package-Manager: portage-2.2.28
net-misc/strongswan/Manifest | 1 +
...-may-fail-with-EINTR-if-an-unblocked-sign.patch | 218 -
...wan-5.3.4-r1.ebuild => strongswan-5.4.0.ebuild} | 2 -
3 files changed, 1 insertion(+), 220 deletions(-)
diff --git a/net-misc/strongswan/Manifest b/net-misc/strongswan/Manifest
index 10ef1dc..124796c 100644
--- a/net-misc/strongswan/Manifest
+++ b/net-misc/strongswan/Manifest
@@ -1 +1,2 @@
DIST strongswan-5.3.4.tar.bz2 4418300 SHA256
938ad1f7b612e039f1d32333f4865160be70f9fb3c207a31127d0168116459aa SHA512
2ab1c9a5d285c7f85b130a827b9525dd238a6d2b4c0c0e15a38a5e09dbb58228bfe4a6ab6c57ba6781f5d0d7f565cbb82e0ee2feac758c8033894c969acb8155
WHIRLPOOL
f7ffbefd62cc8eb4325b38392dbf84ea17b5e27b0917f75a31517ee9e864820faf6b30de4beb28ff17fb88fa16d4f042f698e2304542d01cba3e2392f63bb26f
+DIST strongswan-5.4.0.tar.bz2 4424580 SHA256
f8288faaea6a9cd8a7d413c0b76b7922be5da3dfcd01fd05cb30d2c55d3bbe89 SHA512
633d17ac0a55d333b358a538a47c53077bcc462e2a64af6643b2fe4f777184bd81fc7e4c384e8da81326834f571bf4c0a6caff1ec773043f471a82ea06d97459
WHIRLPOOL
2da96356fe9a5337e8177b84b58d53ed11350e08cb99c9d89dfc70098a64f87b04e033e687951c274d9ce54f39fc41bffbf5ba42abb6b67fa1dc4553583adc6e
diff --git
a/net-misc/strongswan/files/0001-sigwaitinfo-may-fail-with-EINTR-if-an-unblocked-sign.patch
b/net-misc/strongswan/files/0001-sigwaitinfo-may-fail-with-EINTR-if-an-unblocked-sign.patch
deleted file mode 100644
index 5e7313b..000
---
a/net-misc/strongswan/files/0001-sigwaitinfo-may-fail-with-EINTR-if-an-unblocked-sign.patch
+++ /dev/null
@@ -1,218 +0,0 @@
-From ea651877c0bb6e129f52eb592cea3b10b2e3347b Mon Sep 17 00:00:00 2001
-From: Tobias Brunner
-Date: Thu, 19 Nov 2015 11:21:48 +0100
-Subject: [PATCH] sigwaitinfo() may fail with EINTR if an unblocked signal not
- in the set is received
-
- #1213.
- src/charon-cmd/charon-cmd.c | 9 -
- src/charon-nm/charon-nm.c | 9 -
- src/charon-systemd/charon-systemd.c | 9 -
- src/charon-tkm/src/charon-tkm.c | 9 -
- src/charon/charon.c | 11 +--
- src/conftest/conftest.c | 2 +-
- src/libfast/fast_dispatcher.c | 6 +-
- src/libstrongswan/utils/utils.c | 5 -
- 9 files changed, 35 insertions(+), 32 deletions(-)
-
-diff --git a/src/charon-cmd/charon-cmd.c b/src/charon-cmd/charon-cmd.c
-index b8f943f..d3b31cc 100644
a/src/charon-cmd/charon-cmd.c
-+++ b/src/charon-cmd/charon-cmd.c
-@@ -115,6 +115,10 @@ static int run()
- sig = sigwaitinfo(&set, NULL);
- if (sig == -1)
- {
-+ if (errno == EINTR)
-+ { /* ignore signals we didn't wait for */
-+ continue;
-+ }
- DBG1(DBG_DMN, "waiting for signal failed: %s",
strerror(errno));
- return 1;
- }
-@@ -152,11 +156,6 @@ static int run()
- charon->bus->alert(charon->bus,
ALERT_SHUTDOWN_SIGNAL, sig);
- return 1;
- }
-- default:
-- {
-- DBG1(DBG_DMN, "unknown signal %d received.
Ignored", sig);
-- break;
-- }
- }
- }
- }
-diff --git a/src/charon-nm/charon-nm.c b/src/charon-nm/charon-nm.c
-index 1773e7c..fb090e5 100644
a/src/charon-nm/charon-nm.c
-+++ b/src/charon-nm/charon-nm.c
-@@ -85,6 +85,10 @@ static void run()
- sig = sigwaitinfo(&set, NULL);
- if (sig == -1)
- {
-+ if (errno == EINTR)
-+ { /* ignore signals we didn't wait for */
-+ continue;
-+ }
- DBG1(DBG_DMN, "waiting for signal failed: %s",
strerror(errno));
- return;
- }
-@@ -102,11 +106,6 @@ static void run()
- charon->bus->alert(charon->bus,
ALERT_SHUTDOWN_SIGNAL, sig);
- return;
- }
-- default:
-- {
-- DBG1(DBG_DMN, "unknown signal %d received.
Ignored", sig);
-- break;
-- }
- }
- }
- }
-diff --git a/src/charon-systemd/charon-systemd.c
b/src/charon-systemd/charon-systemd.c
-index f
[gentoo-commits] repo/gentoo:master commit in: net-misc/strongswan/, net-misc/strongswan/files/
commit: b7aa7e0c1ebf52d21ba8527aa84b6f3ceb183512
Author: Bjarke Istrup Pedersen gentoo org>
AuthorDate: Sun Nov 22 12:36:11 2015 +
Commit: Bjarke Istrup Pedersen gentoo org>
CommitDate: Sun Nov 22 12:36:11 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7aa7e0c
net-misc/strongswan: Fixing bug #566392, causing multiple connections to fail.
Package-Manager: portage-2.2.25
...-may-fail-with-EINTR-if-an-unblocked-sign.patch | 218 +++
net-misc/strongswan/strongswan-5.3.4-r1.ebuild | 304 +
2 files changed, 522 insertions(+)
diff --git
a/net-misc/strongswan/files/0001-sigwaitinfo-may-fail-with-EINTR-if-an-unblocked-sign.patch
b/net-misc/strongswan/files/0001-sigwaitinfo-may-fail-with-EINTR-if-an-unblocked-sign.patch
new file mode 100644
index 000..5e7313b
--- /dev/null
+++
b/net-misc/strongswan/files/0001-sigwaitinfo-may-fail-with-EINTR-if-an-unblocked-sign.patch
@@ -0,0 +1,218 @@
+From ea651877c0bb6e129f52eb592cea3b10b2e3347b Mon Sep 17 00:00:00 2001
+From: Tobias Brunner
+Date: Thu, 19 Nov 2015 11:21:48 +0100
+Subject: [PATCH] sigwaitinfo() may fail with EINTR if an unblocked signal not
+ in the set is received
+
+ #1213.
+---
+ src/charon-cmd/charon-cmd.c | 9 -
+ src/charon-nm/charon-nm.c | 9 -
+ src/charon-systemd/charon-systemd.c | 9 -
+ src/charon-tkm/src/charon-tkm.c | 9 -
+ src/charon/charon.c | 11 +--
+ src/conftest/conftest.c | 2 +-
+ src/libfast/fast_dispatcher.c | 6 +-
+ src/libstrongswan/utils/utils.c | 5 -
+ 9 files changed, 35 insertions(+), 32 deletions(-)
+
+diff --git a/src/charon-cmd/charon-cmd.c b/src/charon-cmd/charon-cmd.c
+index b8f943f..d3b31cc 100644
+--- a/src/charon-cmd/charon-cmd.c
b/src/charon-cmd/charon-cmd.c
+@@ -115,6 +115,10 @@ static int run()
+ sig = sigwaitinfo(&set, NULL);
+ if (sig == -1)
+ {
++ if (errno == EINTR)
++ { /* ignore signals we didn't wait for */
++ continue;
++ }
+ DBG1(DBG_DMN, "waiting for signal failed: %s",
strerror(errno));
+ return 1;
+ }
+@@ -152,11 +156,6 @@ static int run()
+ charon->bus->alert(charon->bus,
ALERT_SHUTDOWN_SIGNAL, sig);
+ return 1;
+ }
+- default:
+- {
+- DBG1(DBG_DMN, "unknown signal %d received.
Ignored", sig);
+- break;
+- }
+ }
+ }
+ }
+diff --git a/src/charon-nm/charon-nm.c b/src/charon-nm/charon-nm.c
+index 1773e7c..fb090e5 100644
+--- a/src/charon-nm/charon-nm.c
b/src/charon-nm/charon-nm.c
+@@ -85,6 +85,10 @@ static void run()
+ sig = sigwaitinfo(&set, NULL);
+ if (sig == -1)
+ {
++ if (errno == EINTR)
++ { /* ignore signals we didn't wait for */
++ continue;
++ }
+ DBG1(DBG_DMN, "waiting for signal failed: %s",
strerror(errno));
+ return;
+ }
+@@ -102,11 +106,6 @@ static void run()
+ charon->bus->alert(charon->bus,
ALERT_SHUTDOWN_SIGNAL, sig);
+ return;
+ }
+- default:
+- {
+- DBG1(DBG_DMN, "unknown signal %d received.
Ignored", sig);
+- break;
+- }
+ }
+ }
+ }
+diff --git a/src/charon-systemd/charon-systemd.c
b/src/charon-systemd/charon-systemd.c
+index f302d45..4286cde 100644
+--- a/src/charon-systemd/charon-systemd.c
b/src/charon-systemd/charon-systemd.c
+@@ -254,6 +254,10 @@ static int run()
+ sig = sigwaitinfo(&set, NULL);
+ if (sig == -1)
+ {
++ if (errno == EINTR)
++ { /* ignore signals we didn't wait for */
++ continue;
++ }
+ DBG1(DBG_DMN, "waiting for signal failed: %s",
strerror(errno));
+ return SS_RC_INITIALIZATION_FAILED;
+ }
+@@ -265,11 +269,6 @@ static int run()
+ charon->bus->alert(charon->bus,
ALERT_SHUTDOWN_SIGNAL, sig);
+ return 0;
+ }
+- default:
+- {
+- DBG1(DBG_DMN, "unknown signal %d received.
Ignored", sig);
+- break;
+-
