diff --git a/.gitignore b/.gitignore index bc47176..0396cda 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /libgovirt-0.0.3.tar.xz /libgovirt-0.1.0.tar.xz /libgovirt-0.3.0.tar.xz +/libgovirt-0.3.1.tar.xz diff --git a/0001-Fix-memory-corruption-when-RestProxy-ssl-ca-file-doe.patch b/0001-Fix-memory-corruption-when-RestProxy-ssl-ca-file-doe.patch deleted file mode 100644 index 4c376de..0000000 --- a/0001-Fix-memory-corruption-when-RestProxy-ssl-ca-file-doe.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 546d37a44d88fd90d2f3f3ba4ee84042fcf8168c Mon Sep 17 00:00:00 2001 -From: Christophe Fergeau -Date: Tue, 26 Nov 2013 18:17:10 +0100 -Subject: [PATCH] Fix memory corruption when RestProxy::ssl-ca-file does not - exist - -Older librest releases don't have the RestProxy::ssl-ca-file property. -Without this property, we are not going to be able to set the CA -certificate to use to validate the oVirt instance TLS certificate, but we -should at least be able to report a connection error. -However, g_object_get() will not set its parameter to NULL when the -property does not exist, so we need to set it to NULL ourselves before -calling g_object_get() if we want to rely on that. - -If we don't do that, 'ca_file' will be uninitialized when -RestProxy::ssl-ca-file does not exist, and get_ca_cert_data() will call -g_free() on that variable, causing memory corruption. ---- - govirt/ovirt-proxy.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/govirt/ovirt-proxy.c b/govirt/ovirt-proxy.c -index 43124d6..b4ee32f 100644 ---- a/govirt/ovirt-proxy.c -+++ b/govirt/ovirt-proxy.c -@@ -405,7 +405,7 @@ error: - - static GByteArray *get_ca_cert_data(OvirtProxy *proxy) - { -- char *ca_file; -+ char *ca_file = NULL; - char *content; - gsize length; - GError *error = NULL; --- -1.8.4.2 - diff --git a/libgovirt.spec b/libgovirt.spec index 30269bd..b416ef8 100644 --- a/libgovirt.spec +++ b/libgovirt.spec @@ -8,15 +8,14 @@ Summary: A GObject library for interacting with oVirt REST API Name: libgovirt -Version: 0.3.0 -Release: 7%{?dist}%{?extra_release} +Version: 0.3.1 +Release: 1%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries -Source: http://people.freedesktop.org/~teuf/govirt/%{name}-%{version}.tar.xz -Patch0: 0001-Fix-memory-corruption-when-RestProxy-ssl-ca-file-doe.patch +Source: http://ftp.gnome.org/pub/GNOME/sources/libgovirt/0.3/%{name}-%{version}.tar.xz URL: http://people.freedesktop.org/~teuf/govirt/ BuildRequires: glib2-devel -BuildRequires: rest-devel >= 0.7.90 +BuildRequires: rest-devel >= 0.7.92 %if %{with_gir} BuildRequires: gobject-introspection-devel %endif @@ -42,7 +41,6 @@ Libraries, includes, etc. to compile with the libgovirt library %prep %setup -q -%patch0 -p1 %build %if %{with_gir} @@ -84,6 +82,9 @@ make check %endif %changelog +* Wed Sep 03 2014 Christophe Fergeau 0.3.1-1 +- Update to upstream release 0.3.1 + * Sun Aug 17 2014 Fedora Release Engineering - 0.3.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index 0286719..e627ae3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2f8a9ba3826a1d259abc3e16fbf6a2ab libgovirt-0.3.0.tar.xz +0cd330ef0acc0572d26427a07e2d7637 libgovirt-0.3.1.tar.xz