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