Accepting request 443023 from Virtualization
1 OBS-URL: https://build.opensuse.org/request/show/443023 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/spice-vdagent?expand=0&rev=9
This commit is contained in:
commit
e938b8f987
@ -1,49 +0,0 @@
|
|||||||
From 8c465007b4baba5dc02adfda1c889ef4c1b595dc Mon Sep 17 00:00:00 2001
|
|
||||||
From: Victor Toso <victortoso@redhat.com>
|
|
||||||
Date: Tue, 15 Sep 2015 10:24:53 +0200
|
|
||||||
Subject: [PATCH] vdagentd: fixes small leak
|
|
||||||
|
|
||||||
This correctly fixes the leak from reverted patch
|
|
||||||
4835df0b642dfc963e7
|
|
||||||
|
|
||||||
==2648== HEAP SUMMARY:
|
|
||||||
==2648== in use at exit: 104,699 bytes in 1,459 blocks
|
|
||||||
==2648== total heap usage: 14,177 allocs, 12,718 frees, 1,190,456 bytes allocated
|
|
||||||
==2648==
|
|
||||||
==2648== 16 bytes in 1 blocks are definitely lost in loss record 16 of 130
|
|
||||||
==2648== at 0x4C29BCF: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
|
|
||||||
==2648== by 0x10B530: agent_read_complete (vdagentd.c:715)
|
|
||||||
==2648== by 0x10E8DC: udscs_read_complete (udscs.c:460)
|
|
||||||
==2648== by 0x10EAFC: udscs_do_read (udscs.c:515)
|
|
||||||
==2648== by 0x10E490: udscs_client_handle_fds (udscs.c:349)
|
|
||||||
==2648== by 0x10E402: udscs_server_handle_fds (udscs.c:337)
|
|
||||||
==2648== by 0x10BAB1: main_loop (vdagentd.c:844)
|
|
||||||
==2648== by 0x10A3E6: main (vdagentd.c:974)
|
|
||||||
==2648==
|
|
||||||
==2648== LEAK SUMMARY:
|
|
||||||
==2648== definitely lost: 16 bytes in 1 blocks
|
|
||||||
==2648== indirectly lost: 0 bytes in 0 blocks
|
|
||||||
==2648== possibly lost: 41,483 bytes in 1,268 blocks
|
|
||||||
==2648== still reachable: 63,200 bytes in 190 blocks
|
|
||||||
==2648== suppressed: 0 bytes in 0 blocks
|
|
||||||
==2648== Reachable blocks (those to which a pointer was found) are not shown.
|
|
||||||
==2648== To see them, rerun with: --leak-check=full --show-leak-kinds=all
|
|
||||||
---
|
|
||||||
src/vdagentd.c | 1 +
|
|
||||||
1 file changed, 1 insertion(+)
|
|
||||||
|
|
||||||
diff --git a/src/vdagentd.c b/src/vdagentd.c
|
|
||||||
index 14c5be1..8f7ab85 100644
|
|
||||||
--- a/src/vdagentd.c
|
|
||||||
+++ b/src/vdagentd.c
|
|
||||||
@@ -687,6 +687,7 @@ void agent_disconnect(struct udscs_connection *conn)
|
|
||||||
agent_data->session = NULL;
|
|
||||||
update_active_session_connection(NULL);
|
|
||||||
|
|
||||||
+ free(agent_data->screen_info);
|
|
||||||
free(agent_data);
|
|
||||||
}
|
|
||||||
|
|
||||||
--
|
|
||||||
2.9.3
|
|
||||||
|
|
@ -1,33 +0,0 @@
|
|||||||
From f97751faf0f5c66ec5ccbf5547ca7982d360cbf9 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Victor Toso <victortoso@redhat.com>
|
|
||||||
Date: Tue, 15 Sep 2015 10:23:06 +0200
|
|
||||||
Subject: [PATCH] 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;
|
|
||||||
}
|
|
||||||
--
|
|
||||||
2.9.3
|
|
||||||
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:5b951646e0bd996afda2d063e706fa2aad2655af5bdd1b6525260ab50be30f7d
|
|
||||||
size 128174
|
|
3
spice-vdagent-0.17.0.tar.bz2
Normal file
3
spice-vdagent-0.17.0.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:f14a8bd8cdee10641aabd9ba32461a5844eab0fddb2a10c1d31386e7a9f7b33d
|
||||||
|
size 130413
|
@ -1,3 +1,28 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Nov 25 18:53:15 UTC 2016 - zaitor@opensuse.org
|
||||||
|
|
||||||
|
- Add pkgconfig(glib-2.0) BuildRequires: Explicit dependency.
|
||||||
|
- Handle spice-vdagentd.target in pre/post/preun/postun.
|
||||||
|
- Handle spice-vdagentd.conf in post via tmpfiles_create macro.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Nov 25 18:53:14 UTC 2016 - seife+obs@b1-systems.com
|
||||||
|
|
||||||
|
- Update to 0.17.0
|
||||||
|
* Denies file-transfer in locked sessions
|
||||||
|
* Denies file-transfer in login screen
|
||||||
|
* Bump glib version to 2.28
|
||||||
|
* Set exit code to 1 instead of 0 when virtio device cannot be
|
||||||
|
opened
|
||||||
|
* Fix double-free on uinput->screen_info (rhbz#1262635)
|
||||||
|
* Code improvement over unix domain client server support (udcs)
|
||||||
|
* Fix build compatiblity with different libsystemd versions
|
||||||
|
(fdo#94209)
|
||||||
|
- obsoleted patches removed:
|
||||||
|
8c465007-vdagentd-fixes-small-leak.patch
|
||||||
|
f97751fa-revert-uinput-fix-small-leak-of-screen_info.patch
|
||||||
|
- package: add explicit buildrequires for pkgconfig(dbus-1)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Sep 6 12:56:15 UTC 2016 - cbosdonnat@suse.com
|
Tue Sep 6 12:56:15 UTC 2016 - cbosdonnat@suse.com
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package spice-vdagent
|
# spec file for package spice-vdagent
|
||||||
#
|
#
|
||||||
# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||||
# Copyright (c) 2014 B1 Systems GmbH, Vohburg, Germany.
|
# Copyright (c) 2014 B1 Systems GmbH, Vohburg, Germany.
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
|
|
||||||
Name: spice-vdagent
|
Name: spice-vdagent
|
||||||
Version: 0.16.0
|
Version: 0.17.0
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Agent for Spice guests
|
Summary: Agent for Spice guests
|
||||||
License: GPL-3.0+
|
License: GPL-3.0+
|
||||||
@ -26,9 +26,7 @@ Group: Applications/System
|
|||||||
Url: http://spice-space.org/
|
Url: http://spice-space.org/
|
||||||
Source0: http://spice-space.org/download/releases/%{name}-%{version}.tar.bz2
|
Source0: http://spice-space.org/download/releases/%{name}-%{version}.tar.bz2
|
||||||
Patch0: spice-vdagent-var_run.patch
|
Patch0: spice-vdagent-var_run.patch
|
||||||
Patch1: 8c465007-vdagentd-fixes-small-leak.patch
|
BuildRequires: alsa-devel >= 1.0.22
|
||||||
Patch2: f97751fa-revert-uinput-fix-small-leak-of-screen_info.patch
|
|
||||||
BuildRequires: alsa-devel
|
|
||||||
BuildRequires: desktop-file-utils
|
BuildRequires: desktop-file-utils
|
||||||
BuildRequires: glib2-devel
|
BuildRequires: glib2-devel
|
||||||
BuildRequires: libXfixes-devel
|
BuildRequires: libXfixes-devel
|
||||||
@ -36,9 +34,11 @@ BuildRequires: libXinerama-devel
|
|||||||
BuildRequires: libXrandr-devel
|
BuildRequires: libXrandr-devel
|
||||||
BuildRequires: libpciaccess-devel
|
BuildRequires: libpciaccess-devel
|
||||||
BuildRequires: libtool
|
BuildRequires: libtool
|
||||||
BuildRequires: spice-protocol-devel >= 0.12.6
|
BuildRequires: spice-protocol-devel >= 0.12.8
|
||||||
BuildRequires: systemd
|
BuildRequires: systemd
|
||||||
BuildRequires: systemd-devel
|
BuildRequires: systemd-devel
|
||||||
|
BuildRequires: pkgconfig(dbus-1)
|
||||||
|
BuildRequires: pkgconfig(glib-2.0) >= 2.28
|
||||||
Supplements: modalias(xorg-x11-server:virtio:d00000003v*)
|
Supplements: modalias(xorg-x11-server:virtio:d00000003v*)
|
||||||
%{?systemd_requires}
|
%{?systemd_requires}
|
||||||
|
|
||||||
@ -57,8 +57,6 @@ Features:
|
|||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
%patch1 -p1
|
|
||||||
%patch2 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure \
|
%configure \
|
||||||
@ -83,18 +81,23 @@ rm -fr %{buildroot}%{_datadir}/gdm/autostart
|
|||||||
|
|
||||||
%pre
|
%pre
|
||||||
%service_add_pre spice-vdagentd.service
|
%service_add_pre spice-vdagentd.service
|
||||||
|
%service_add_pre spice-vdagentd.target
|
||||||
|
|
||||||
%post
|
%post
|
||||||
%service_add_post spice-vdagentd.service
|
%service_add_post spice-vdagentd.service
|
||||||
if [ "$1" -eq 1 ]; then
|
if [ "$1" -eq 1 ]; then
|
||||||
systemctl -q enable spice-vdagentd.service || :
|
systemctl -q enable spice-vdagentd.service || :
|
||||||
fi
|
fi
|
||||||
|
%service_add_post spice-vdagentd.target
|
||||||
|
%tmpfiles_create %_tmpfilesdir/spice-vdagentd.conf
|
||||||
|
|
||||||
%preun
|
%preun
|
||||||
%service_del_preun spice-vdagentd.service
|
%service_del_preun spice-vdagentd.service
|
||||||
|
%service_del_preun spice-vdagentd.target
|
||||||
|
|
||||||
%postun
|
%postun
|
||||||
%service_del_postun spice-vdagentd.service
|
%service_del_postun spice-vdagentd.service
|
||||||
|
%service_del_postun spice-vdagentd.target
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user