From 1fff6cdf45ba9e660d84e02610de46a945e1ac77 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Oct 05 2021 22:34:56 +0000 Subject: import corosync-3.1.5-1.el8 --- diff --git a/.corosync.metadata b/.corosync.metadata index 123abd6..9fa0ff5 100644 --- a/.corosync.metadata +++ b/.corosync.metadata @@ -1,2 +1,2 @@ -761fe353b2cbead7a8572bfb6b84fe5d2fc8d9d6 SOURCES/corosync-3.1.0.tar.gz +5ae73ce01b451531b92eb6084d51bc69846f1375 SOURCES/corosync-3.1.5.tar.gz 63e882d0bebed3f75436da0606fe7acbeabf1b25 SOURCES/spausedd-20201112.tar.gz diff --git a/.gitignore b/.gitignore index a64a5a1..420f480 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/corosync-3.1.0.tar.gz +SOURCES/corosync-3.1.5.tar.gz SOURCES/spausedd-20201112.tar.gz diff --git a/SOURCES/bz1896493-1-totemknet-Check-both-cipher-and-hash-for-crypto.patch b/SOURCES/bz1896493-1-totemknet-Check-both-cipher-and-hash-for-crypto.patch deleted file mode 100644 index 99da8ff..0000000 --- a/SOURCES/bz1896493-1-totemknet-Check-both-cipher-and-hash-for-crypto.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 4a2f48b17b06638d3d3adcae683aff1639351434 Mon Sep 17 00:00:00 2001 -From: Jan Friesse -Date: Tue, 10 Nov 2020 18:10:17 +0100 -Subject: [PATCH] totemknet: Check both cipher and hash for crypto - -Previously only crypto cipher was used as a way to find out if crypto is -enabled or disabled. - -This usually works ok until cipher is set to none and hash to some other -value (like sha1). Such config is perfectly valid and it was not -supported correctly. - -As a solution, check both cipher and hash. - -Signed-off-by: Jan Friesse -Reviewed-by: Fabio M. Di Nitto -Reviewed-by: Christine Caulfield ---- - exec/totemknet.c | 18 +++++++++++++----- - 1 file changed, 13 insertions(+), 5 deletions(-) - -diff --git a/exec/totemknet.c b/exec/totemknet.c -index c6a1649d..0834e8e4 100644 ---- a/exec/totemknet.c -+++ b/exec/totemknet.c -@@ -905,6 +905,14 @@ static void totemknet_add_config_notifications(struct totemknet_instance *instan - LEAVE(); - } - -+static int totemknet_is_crypto_enabled(const struct totemknet_instance *instance) -+{ -+ -+ return (!(strcmp(instance->totem_config->crypto_cipher_type, "none") == 0 && -+ strcmp(instance->totem_config->crypto_hash_type, "none") == 0)); -+ -+} -+ - static int totemknet_set_knet_crypto(struct totemknet_instance *instance) - { - struct knet_handle_crypto_cfg crypto_cfg; -@@ -927,7 +935,7 @@ static int totemknet_set_knet_crypto(struct totemknet_instance *instance) - ); - - /* If crypto is being disabled we need to explicitly allow cleartext traffic in knet */ -- if (strcmp(instance->totem_config->crypto_cipher_type, "none") == 0) { -+ if (!totemknet_is_crypto_enabled(instance)) { - res = knet_handle_crypto_rx_clear_traffic(instance->knet_handle, KNET_CRYPTO_RX_ALLOW_CLEAR_TRAFFIC); - if (res) { - knet_log_printf(LOGSYS_LEVEL_ERROR, "knet_handle_crypto_rx_clear_traffic(ALLOW) failed %s", strerror(errno)); -@@ -1108,7 +1116,7 @@ int totemknet_initialize ( - - /* Enable crypto if requested */ - #ifdef HAVE_KNET_CRYPTO_RECONF -- if (strcmp(instance->totem_config->crypto_cipher_type, "none") != 0) { -+ if (totemknet_is_crypto_enabled(instance)) { - res = totemknet_set_knet_crypto(instance); - if (res == 0) { - res = knet_handle_crypto_use_config(instance->knet_handle, totem_config->crypto_index); -@@ -1134,7 +1142,7 @@ int totemknet_initialize ( - } - } - #else -- if (strcmp(instance->totem_config->crypto_cipher_type, "none") != 0) { -+ if (totemknet_is_crypto_enabled(instance)) { - res = totemknet_set_knet_crypto(instance); - if (res) { - knet_log_printf(LOG_DEBUG, "Failed to set up knet crypto"); -@@ -1616,7 +1624,7 @@ int totemknet_crypto_reconfigure_phase ( - switch (phase) { - case CRYPTO_RECONFIG_PHASE_ACTIVATE: - config_to_use = totem_config->crypto_index; -- if (strcmp(instance->totem_config->crypto_cipher_type, "none") == 0) { -+ if (!totemknet_is_crypto_enabled(instance)) { - config_to_use = 0; /* we are clearing it */ - } - -@@ -1647,7 +1655,7 @@ int totemknet_crypto_reconfigure_phase ( - } - - /* If crypto is enabled then disable all cleartext reception */ -- if (strcmp(instance->totem_config->crypto_cipher_type, "none") != 0) { -+ if (totemknet_is_crypto_enabled(instance)) { - res = knet_handle_crypto_rx_clear_traffic(instance->knet_handle, KNET_CRYPTO_RX_DISALLOW_CLEAR_TRAFFIC); - if (res) { - knet_log_printf(LOGSYS_LEVEL_ERROR, "knet_handle_crypto_rx_clear_traffic(DISALLOW) failed %s", strerror(errno)); --- -2.18.2 - diff --git a/SPECS/corosync.spec b/SPECS/corosync.spec index 46115ea..eb525b0 100644 --- a/SPECS/corosync.spec +++ b/SPECS/corosync.spec @@ -22,14 +22,12 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces -Version: 3.1.0 -Release: 3%{?gitver}%{?dist} +Version: 3.1.5 +Release: 1%{?gitver}%{?dist} License: BSD URL: http://corosync.github.io/corosync/ Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?gittarver}.tar.gz -Patch0: bz1896493-1-totemknet-Check-both-cipher-and-hash-for-crypto.patch - %if %{with spausedd} Source1: https://github.com/jfriesse/spausedd/releases/download/%{spausedd_version}/spausedd-%{spausedd_version}.tar.gz # VMGuestLib exists only for x86_64 architecture @@ -93,8 +91,6 @@ BuildRequires: pkgconfig(vmguestlib) %setup -q -n %{name}-%{version}%{?gittarver} %endif -%patch0 -p1 -b .bz1896493-1 - %build %if %{with runautogen} ./autogen.sh @@ -393,6 +389,31 @@ fi %endif %changelog +* Wed Aug 04 2021 Jan Friesse 3.1.5-1 +- Related: rhbz#1948973 + +- New upstream release (rhbz#1948973) + +* Thu Jun 03 2021 Jan Friesse 3.1.4-1 +- Related: rhbz#1948973 +- Resolves: rhbz#1962139 + +- New upstream release (rhbz#1948973) +- stats: fix crash when iterating over deleted keys (rhbz#1962139) + +* Fri May 21 2021 Jan Friesse 3.1.3-1 +- Resolves: rhbz#1948973 + +- New upstream release (rhbz#1948973) + +* Fri Apr 30 2021 Jan Friesse 3.1.0-5 +- Resolves: rhbz#1954432 + +* Tue Apr 06 2021 Jan Friesse 3.1.0-4 +- Resolves: rhbz#1946623 + +- knet: pass correct handle to knet_handle_compress (rhbz#1946623) + * Thu Nov 12 2020 Jan Friesse 3.1.0-3 - Resolves: rhbz#1897085 - Resolves: rhbz#1896493