From 8e3c3bac797ec42a56437d94bbd2d966cbc53cb2 Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Wed, 25 Apr 2012 08:48:55 +0200 Subject: [PATCH 1/4] New upstream release Signed-off-by: Jan Friesse --- .gitignore | 1 + corosync.spec | 6 ++++-- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ea43b1d..01aed71 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ corosync-1.2.7.tar.gz /corosync-1.4.0.tar.gz /corosync-1.4.1.tar.gz /corosync-1.4.2.tar.gz +/corosync-1.4.3.tar.gz diff --git a/corosync.spec b/corosync.spec index 7345fd8..8195a1e 100644 --- a/corosync.spec +++ b/corosync.spec @@ -13,7 +13,7 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces -Version: 1.4.2 +Version: 1.4.3 Release: 1%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} License: BSD Group: System Environment/Base @@ -159,7 +159,6 @@ fi %{_libexecdir}/lcrso/vsf_quorum.lcrso %{_libexecdir}/lcrso/vsf_ykd.lcrso %dir %{_localstatedir}/lib/corosync -%attr(700, root, root) %{_localstatedir}/log/cluster %dir %{_localstatedir}/log/cluster %{_mandir}/man8/corosync_overview.8* %{_mandir}/man8/corosync.8* @@ -277,6 +276,9 @@ The Corosync Cluster Engine APIs. %{_mandir}/man8/sam_overview.8* %changelog +* Wed Apr 25 2012 Jan Friesse - 1.4.3-1 +- New upstream release + * Wed Oct 06 2011 Jan Friesse - 1.4.2-1 - New upstream release diff --git a/sources b/sources index bd01b5d..d9644ae 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -061ee5522097fee69475b38a66bf1d6a corosync-1.4.2.tar.gz +9e9943a7d9eb90fabd52d12b215c699c corosync-1.4.3.tar.gz From b2edb7c6f383729b74696381a812adc812e2c493 Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Tue, 14 Aug 2012 12:18:24 +0200 Subject: [PATCH 2/4] New upstream release Signed-off-by: Jan Friesse --- .gitignore | 1 + corosync.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 01aed71..c33d021 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ corosync-1.2.7.tar.gz /corosync-1.4.1.tar.gz /corosync-1.4.2.tar.gz /corosync-1.4.3.tar.gz +/corosync-1.4.4.tar.gz diff --git a/corosync.spec b/corosync.spec index 8195a1e..d5ce580 100644 --- a/corosync.spec +++ b/corosync.spec @@ -13,7 +13,7 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces -Version: 1.4.3 +Version: 1.4.4 Release: 1%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} License: BSD Group: System Environment/Base @@ -172,6 +172,7 @@ fi %{_mandir}/man8/corosync-notifyd.8* %{_mandir}/man8/corosync-quorumtool.8* %{_mandir}/man5/corosync.conf.5* +%{_mandir}/man8/confdb_keys.8* %package -n corosynclib Summary: The Corosync Cluster Engine Libraries @@ -276,6 +277,9 @@ The Corosync Cluster Engine APIs. %{_mandir}/man8/sam_overview.8* %changelog +* Tue Aug 14 2012 Jan Friesse - 1.4.4-1 +- New upstream release + * Wed Apr 25 2012 Jan Friesse - 1.4.3-1 - New upstream release diff --git a/sources b/sources index d9644ae..1a5832c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9e9943a7d9eb90fabd52d12b215c699c corosync-1.4.3.tar.gz +e04e26e70332a736929b1d3e63375afb corosync-1.4.4.tar.gz From 5f12dfc0b400dcd392ff3aa448c76c6a1e0e2654 Mon Sep 17 00:00:00 2001 From: "Fabio M. Di Nitto" Date: Wed, 10 Oct 2012 09:39:21 +0200 Subject: [PATCH 3/4] Add fix for crash on i686 Signed-off-by: Fabio M. Di Nitto --- corosync.spec | 7 +++- fix_crash_due_to_incorrect_malloc_size.patch | 35 ++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 fix_crash_due_to_incorrect_malloc_size.patch diff --git a/corosync.spec b/corosync.spec index d5ce580..e366085 100644 --- a/corosync.spec +++ b/corosync.spec @@ -14,11 +14,12 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces Version: 1.4.4 -Release: 1%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} +Release: 2%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} License: BSD Group: System Environment/Base URL: http://ftp.corosync.org Source0: ftp://ftp:user@ftp.corosync.org/downloads/%{name}-%{version}/%{name}-%{version}%{?numcomm:.%{numcomm}}%{?alphatag:-%{alphatag}}%{?dirty:-%{dirty}}.tar.gz +Patch0: fix_crash_due_to_incorrect_malloc_size.patch # Runtime bits Requires: corosynclib = %{version}-%{release} @@ -50,6 +51,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) %prep %setup -q -n %{name}-%{version}%{?numcomm:.%{numcomm}}%{?alphatag:-%{alphatag}}%{?dirty:-%{dirty}} +%patch0 -p1 %build %if %{buildtrunk} @@ -277,6 +279,9 @@ The Corosync Cluster Engine APIs. %{_mandir}/man8/sam_overview.8* %changelog +* Wed Oct 10 2012 Fabio M. Di Nitto - 1.4.4-2 +- Add fix for crash on i686 + * Tue Aug 14 2012 Jan Friesse - 1.4.4-1 - New upstream release diff --git a/fix_crash_due_to_incorrect_malloc_size.patch b/fix_crash_due_to_incorrect_malloc_size.patch new file mode 100644 index 0000000..a8a5350 --- /dev/null +++ b/fix_crash_due_to_incorrect_malloc_size.patch @@ -0,0 +1,35 @@ +commit 0a85b888b0384e83fa4a80c3751a23f4de8a9310 +Author: Fabio M. Di Nitto +Date: Tue Aug 21 10:49:20 2012 +0000 + + sa-confdb: fix crash due to incorrect malloc size + + with recent changes, confdb and saconfdb were allocating two different + sizes for the same results. While on x86_64 this was masked nicely, + on i686 it causes crashes. + + Signed-off-by: Fabio M. Di Nitto + Reviewed-by: Jan Friesse + +diff --git a/lib/sa-confdb.c b/lib/sa-confdb.c +index 9a11418..7a8fabf 100644 +--- a/lib/sa-confdb.c ++++ b/lib/sa-confdb.c +@@ -263,7 +263,7 @@ int confdb_sa_key_get_typed ( + &kvalue, value_len, (objdb_value_types_t*)type); + if (!res) { + if (!*value) { +- *value = malloc(*value_len); ++ *value = malloc(*value_len + 1); + if (!*value) { + res = CS_ERR_NO_MEMORY; + } +@@ -443,7 +443,7 @@ int confdb_sa_key_iter_typed ( + memcpy(key_name, kname, key_name_len); + key_name[key_name_len] = '\0'; + if (!*value) { +- *value = malloc(*value_len); ++ *value = malloc(*value_len + 1); + if (!*value) { + res = CS_ERR_NO_MEMORY; + } From 29bff4895480190e112b54df11ca491684091ee2 Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Wed, 12 Dec 2012 12:10:01 +0100 Subject: [PATCH 4/4] New upstream release Signed-off-by: Jan Friesse --- .gitignore | 1 + corosync.spec | 9 ++--- fix_crash_due_to_incorrect_malloc_size.patch | 35 -------------------- sources | 2 +- 4 files changed, 7 insertions(+), 40 deletions(-) delete mode 100644 fix_crash_due_to_incorrect_malloc_size.patch diff --git a/.gitignore b/.gitignore index c33d021..a8464ab 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ corosync-1.2.7.tar.gz /corosync-1.4.2.tar.gz /corosync-1.4.3.tar.gz /corosync-1.4.4.tar.gz +/corosync-1.4.5.tar.gz diff --git a/corosync.spec b/corosync.spec index e366085..050c9d9 100644 --- a/corosync.spec +++ b/corosync.spec @@ -13,13 +13,12 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces -Version: 1.4.4 -Release: 2%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} +Version: 1.4.5 +Release: 1%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} License: BSD Group: System Environment/Base URL: http://ftp.corosync.org Source0: ftp://ftp:user@ftp.corosync.org/downloads/%{name}-%{version}/%{name}-%{version}%{?numcomm:.%{numcomm}}%{?alphatag:-%{alphatag}}%{?dirty:-%{dirty}}.tar.gz -Patch0: fix_crash_due_to_incorrect_malloc_size.patch # Runtime bits Requires: corosynclib = %{version}-%{release} @@ -51,7 +50,6 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) %prep %setup -q -n %{name}-%{version}%{?numcomm:.%{numcomm}}%{?alphatag:-%{alphatag}}%{?dirty:-%{dirty}} -%patch0 -p1 %build %if %{buildtrunk} @@ -279,6 +277,9 @@ The Corosync Cluster Engine APIs. %{_mandir}/man8/sam_overview.8* %changelog +* Wed Dec 12 2012 Jan Friesse - 1.4.5-1 +- New upstream release + * Wed Oct 10 2012 Fabio M. Di Nitto - 1.4.4-2 - Add fix for crash on i686 diff --git a/fix_crash_due_to_incorrect_malloc_size.patch b/fix_crash_due_to_incorrect_malloc_size.patch deleted file mode 100644 index a8a5350..0000000 --- a/fix_crash_due_to_incorrect_malloc_size.patch +++ /dev/null @@ -1,35 +0,0 @@ -commit 0a85b888b0384e83fa4a80c3751a23f4de8a9310 -Author: Fabio M. Di Nitto -Date: Tue Aug 21 10:49:20 2012 +0000 - - sa-confdb: fix crash due to incorrect malloc size - - with recent changes, confdb and saconfdb were allocating two different - sizes for the same results. While on x86_64 this was masked nicely, - on i686 it causes crashes. - - Signed-off-by: Fabio M. Di Nitto - Reviewed-by: Jan Friesse - -diff --git a/lib/sa-confdb.c b/lib/sa-confdb.c -index 9a11418..7a8fabf 100644 ---- a/lib/sa-confdb.c -+++ b/lib/sa-confdb.c -@@ -263,7 +263,7 @@ int confdb_sa_key_get_typed ( - &kvalue, value_len, (objdb_value_types_t*)type); - if (!res) { - if (!*value) { -- *value = malloc(*value_len); -+ *value = malloc(*value_len + 1); - if (!*value) { - res = CS_ERR_NO_MEMORY; - } -@@ -443,7 +443,7 @@ int confdb_sa_key_iter_typed ( - memcpy(key_name, kname, key_name_len); - key_name[key_name_len] = '\0'; - if (!*value) { -- *value = malloc(*value_len); -+ *value = malloc(*value_len + 1); - if (!*value) { - res = CS_ERR_NO_MEMORY; - } diff --git a/sources b/sources index 1a5832c..4c83324 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e04e26e70332a736929b1d3e63375afb corosync-1.4.4.tar.gz +307135a7d089b7565decdd3e9a343c49 corosync-1.4.5.tar.gz