diff --git a/0001-Revert-uinput-fix-small-leak-of-screen_info.patch b/0001-Revert-uinput-fix-small-leak-of-screen_info.patch deleted file mode 100644 index 8f20843..0000000 --- a/0001-Revert-uinput-fix-small-leak-of-screen_info.patch +++ /dev/null @@ -1,30 +0,0 @@ -From f97751faf0f5c66ec5ccbf5547ca7982d360cbf9 Mon Sep 17 00:00:00 2001 -From: Victor Toso -Date: Tue, 15 Sep 2015 10:23:06 +0200 -Subject: [vdagent-linux] Revert "uinput: fix small leak of screen_info" - -This reverts commit 4835df0b642dfc963e7cbaabfe93da86482f0b93. - -uinput only holds reference to screen_info and should not free it. -The leak should be fixed somewhere else. - -Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1262635 ---- - src/vdagentd-uinput.c | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/src/vdagentd-uinput.c b/src/vdagentd-uinput.c -index 1ce9918..47e1b45 100644 ---- a/src/vdagentd-uinput.c -+++ b/src/vdagentd-uinput.c -@@ -76,10 +76,6 @@ void vdagentd_uinput_destroy(struct vdagentd_uinput **uinputp) - - if (uinput->fd != -1) - close(uinput->fd); -- -- if (uinput->screen_info != NULL) -- free(uinput->screen_info); -- - free(uinput); - *uinputp = NULL; - } diff --git a/0002-vdagent-Return-1-when-virtio-device-cannot-be-opened.patch b/0002-vdagent-Return-1-when-virtio-device-cannot-be-opened.patch deleted file mode 100644 index 51ea5e4..0000000 --- a/0002-vdagent-Return-1-when-virtio-device-cannot-be-opened.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 0159111b22b449cf6a0225723c25f3a0938bce3f Mon Sep 17 00:00:00 2001 -From: Christophe Fergeau -Date: Mon, 7 Sep 2015 16:38:10 +0200 -Subject: [vdagent-linux] vdagent: Return '1' when virtio device cannot be - opened - -The vdagent process currently exits with an error code set to 0 whenn -the virtio device cannot be opened (for example because it's missing). -This is not consistent with the other failures to startup which set the -exit code to 1. This commit ensures 1 is returned in this situation too. - -Resolves: rhbz#1256704 ---- - src/vdagent.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/vdagent.c b/src/vdagent.c -index 348dfbd..d3ca0c3 100644 ---- a/src/vdagent.c -+++ b/src/vdagent.c -@@ -291,7 +291,8 @@ int main(int argc, char *argv[]) - LOG_USER); - - if (file_test(portdev) != 0) { -- return 0; -+ syslog(LOG_ERR, "Cannot access vdagent virtio channel %s", portdev); -+ return 1; - } - - if (do_daemonize) diff --git a/sources b/sources index fc8d633..700ab76 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e1d8e79456045054843db14b9635a4ce spice-vdagent-0.16.0.tar.bz2 +b184791c49968a54c653de9a630df1dd spice-vdagent-0.17.0.tar.bz2 diff --git a/spice-vdagent.spec b/spice-vdagent.spec index d638764..029759a 100644 --- a/spice-vdagent.spec +++ b/spice-vdagent.spec @@ -1,14 +1,11 @@ Name: spice-vdagent -Version: 0.16.0 -Release: 3%{?dist} +Version: 0.17.0 +Release: 1%{?dist} Summary: Agent for Spice guests Group: Applications/System License: GPLv3+ -URL: http://spice-space.org/ -Source0: http://spice-space.org/download/releases/%{name}-%{version}.tar.bz2 -# Fixes from upstream git -Patch1: 0001-Revert-uinput-fix-small-leak-of-screen_info.patch -Patch2: 0002-vdagent-Return-1-when-virtio-device-cannot-be-opened.patch +URL: https://spice-space.org/ +Source0: https://spice-space.org/download/releases/%{name}-%{version}.tar.bz2 BuildRequires: systemd-devel glib2-devel spice-protocol >= 0.12.6 BuildRequires: libpciaccess-devel libXrandr-devel libXinerama-devel BuildRequires: libXfixes-devel systemd-units desktop-file-utils libtool @@ -32,8 +29,6 @@ Features: %prep %setup -q -%patch1 -p1 -%patch2 -p1 #autoreconf -fi @@ -73,6 +68,9 @@ make install DESTDIR=$RPM_BUILD_ROOT V=2 %changelog +* Tue Nov 22 2016 Christophe Fergeau 0.17.0-1 +- Update to spice-vdagent 0.17.0 + * Fri Feb 05 2016 Fedora Release Engineering - 0.16.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild