Control: tag -1 + patch I did a fast package for 0.12.6 including a fix for build from source and lz4 support (see the patch in attachment). This should make easier and faster update spice having major of thing already done and tested.
>From ca9a48b7fff74577b2ee83252502f260050cc5c0 Mon Sep 17 00:00:00 2001 From: Fabio Fantoni <fantonifa...@tiscali.it> Date: Thu, 8 Oct 2015 15:24:59 +0200 Subject: [PATCH] Update to 0.12.6 * new upstream release. (Closes: #749331) * debian/control: added needed build-deps and removed the unused. * debian/rules: Enable lz4 support. * Added autoreconf. * Updated debian/libspice-server1.symbols. --- debian/changelog | 27 ++++++++ debian/control | 28 ++------- debian/libspice-server1.symbols | 7 ++- debian/patches/fix-tests-warnings.patch | 49 --------------- debian/patches/series | 1 - debian/rules | 6 +- debian/spice-client.install | 1 - debian/spice-client.manpages | 1 - debian/spicec.1 | 105 -------------------------------- 9 files changed, 42 insertions(+), 183 deletions(-) delete mode 100644 debian/patches/fix-tests-warnings.patch delete mode 100644 debian/patches/series mode change 100755 => 100644 debian/rules delete mode 100644 debian/spice-client.install delete mode 100644 debian/spice-client.manpages delete mode 100644 debian/spicec.1 diff --git a/debian/changelog b/debian/changelog index 420d504..1801090 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,30 @@ +spice (0.12.6~) UNRELEASED; urgency=medium + + * new upstream release. (Closes: #749331) + * debian/control: added needed build-deps and removed the unused. + * debian/rules: Enable lz4 support. + * Added autoreconf. + * Updated debian/libspice-server1.symbols. + + -- Fabio Fantoni <fantonifa...@tiscali.it> Thu, 08 Oct 2015 14:25:12 +0200 + +spice (0.12.5-1.2) unstable; urgency=high + + * Non-maintainer upload. + * Add CVE-2015-3247.patch patch. + CVE-2015-3247: Memory corruption in worker_update_monitors_config(). + (Closes: #797976) + + -- Salvatore Bonaccorso <car...@debian.org> Sat, 05 Sep 2015 05:51:01 +0200 + +spice (0.12.5-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Enable smartcard support now that libcacard is in the archive (Closes: + #786833) + + -- Laurent Bigonville <bi...@debian.org> Fri, 14 Aug 2015 09:29:41 +0200 + spice (0.12.5-1) unstable; urgency=medium * new upstream release. Can now build without celt! diff --git a/debian/control b/debian/control index df1ecc8..d970970 100644 --- a/debian/control +++ b/debian/control @@ -4,41 +4,25 @@ Priority: optional Maintainer: Liang Guo <guoli...@debian.org> Uploaders: Michael Tokarev <m...@tls.msk.ru> Build-Depends: debhelper (>= 9), pkg-config, + dh-autoreconf, python, -# libspice-protocol is actually not needed for build, -# 0.12 always uses included definitions -# libspice-protocol-dev (>= 0.10.1~), + libspice-protocol-dev (>= 0.12.10~), libopus-dev (>= 0.9.14), libpixman-1-dev (>= 0.17.7~), - libxrandr-dev (>= 1.2~), libasound2-dev, libssl-dev, - libxfixes-dev, -# these might be required for opengl support -# which has to be enabled explicitly and is not recommended -# libglu1-mesa-dev, libgl1-mesa-dev, libsasl2-dev, libjpeg-dev, - libxinerama-dev, python-pyparsing, + python-six, libglib2.0-dev (>= 2.22~), + libcacard-dev (>= 0.1.2), + liblz4-dev, Standards-Version: 3.9.4 Homepage: http://spice-space.org/ Vcs-Git: git://anonscm.debian.org/collab-maint/spice.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/spice.git -Package: spice-client -Architecture: i386 amd64 -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Implements the client side of the SPICE protocol - The Simple Protocol for Independent Computing Environments (SPICE) is - a remote display system built for virtual environments which allows - you to view a computing 'desktop' environment not only on the machine - where it is running, but from anywhere on the Internet and from a wide - variety of machine architectures. - . - This package contains the SPICE client application. - Package: libspice-server1 Section: libs Architecture: i386 amd64 @@ -78,7 +62,7 @@ Description: Debugging symbols for libspice-server1 Package: libspice-server-dev Section: libdevel Architecture: i386 amd64 -Depends: libspice-server1 (= ${binary:Version}), ${misc:Depends}, libglib2.0-dev (>= 2.22~), libpixman-1-dev (>= 0.17.7~), libssl-dev, libxinerama-dev, libspice-protocol-dev (>= 0.12.0~) +Depends: libspice-server1 (= ${binary:Version}), ${misc:Depends}, libglib2.0-dev (>= 2.22~), libpixman-1-dev (>= 0.17.7~), libssl-dev, libspice-protocol-dev (>= 0.12.10~), libcacard-dev (>= 0.1.2) Suggests: pkg-config Description: Header files and development documentation for spice-server The Simple Protocol for Independent Computing Environments (SPICE) is diff --git a/debian/libspice-server1.symbols b/debian/libspice-server1.symbols index d7a6521..08d03e4 100644 --- a/debian/libspice-server1.symbols +++ b/debian/libspice-server1.symbols @@ -10,6 +10,7 @@ libspice-server.so.1 libspice-server1 #MINVER# SPICE_SERVER_0.12.3@SPICE_SERVER_0.12.3 0.12.3 SPICE_SERVER_0.12.4@SPICE_SERVER_0.12.4 0.12.4 SPICE_SERVER_0.12.5@SPICE_SERVER_0.12.5 0.12.5 + SPICE_SERVER_0.12.6@SPICE_SERVER_0.12.6 0.12.6 SPICE_SERVER_0.6.0@SPICE_SERVER_0.6.0 0.8.2 SPICE_SERVER_0.6.1@SPICE_SERVER_0.6.1 0.8.2 SPICE_SERVER_0.8.0@SPICE_SERVER_0.8.0 0.8.2 @@ -36,11 +37,16 @@ libspice-server.so.1 libspice-server1 #MINVER# spice_qxl_reset_cursor@SPICE_SERVER_0.8.2 0.8.2 spice_qxl_reset_image_cache@SPICE_SERVER_0.8.2 0.8.2 spice_qxl_reset_memslots@SPICE_SERVER_0.8.2 0.8.2 + spice_qxl_set_max_monitors@SPICE_SERVER_0.12.6 0.12.6 spice_qxl_start@SPICE_SERVER_0.8.2 0.8.2 spice_qxl_stop@SPICE_SERVER_0.8.2 0.8.2 spice_qxl_update_area@SPICE_SERVER_0.8.2 0.8.2 spice_qxl_update_area_async@SPICE_SERVER_0.8.2 0.8.2 spice_qxl_wakeup@SPICE_SERVER_0.8.2 0.8.2 + spice_replay_free@SPICE_SERVER_0.12.6 0.12.6 + spice_replay_free_cmd@SPICE_SERVER_0.12.6 0.12.6 + spice_replay_new@SPICE_SERVER_0.12.6 0.12.6 + spice_replay_next_cmd@SPICE_SERVER_0.12.6 0.12.6 spice_server_add_client@SPICE_SERVER_0.10.1 0.10.1 spice_server_add_interface@SPICE_SERVER_0.6.0 0.8.2 spice_server_add_renderer@SPICE_SERVER_0.6.0 0.8.2 @@ -57,7 +63,6 @@ libspice-server.so.1 libspice-server1 #MINVER# spice_server_init@SPICE_SERVER_0.6.0 0.8.2 spice_server_is_server_mouse@SPICE_SERVER_0.10.3 0.11.0 spice_server_kbd_leds@SPICE_SERVER_0.6.0 0.8.2 - spice_server_migrate_client_state@SPICE_SERVER_0.6.0 0.8.2 spice_server_migrate_connect@SPICE_SERVER_0.8.3 0.8.3 spice_server_migrate_end@SPICE_SERVER_0.6.0 0.8.2 spice_server_migrate_info@SPICE_SERVER_0.6.0 0.8.2 diff --git a/debian/patches/fix-tests-warnings.patch b/debian/patches/fix-tests-warnings.patch deleted file mode 100644 index aa0d297..0000000 --- a/debian/patches/fix-tests-warnings.patch +++ /dev/null @@ -1,49 +0,0 @@ -Date: Mon, 11 Feb 2013 08:49:58 -0600 -From: Serge Hallyn <serge.hal...@ubuntu.com> -Subject: [PATCH (v2)] Small cleanups to address compiler warnings -Message-ID: <20130211144958.GA6481@sergelap> -Forwarded: yes - -Changelog: Feb 11: Address feedback by Marc-André: - -Signed-off-by: Serge Hallyn <serge.hal...@ubuntu.com> ---- - server/tests/basic_event_loop.c | 4 ++-- - server/tests/test_display_base.c | 8 +++++--- - 2 files changed, 7 insertions(+), 5 deletions(-) - ---- a/server/tests/basic_event_loop.c -+++ b/server/tests/basic_event_loop.c -@@ -115,7 +115,7 @@ - - static void channel_event(int event, SpiceChannelEventInfo *info) - { -- DPRINTF(0, "channel event con, type, id, event: %ld, %d, %d, %d", -+ DPRINTF(0, "channel event con, type, id, event: %d, %d, %d, %d", - info->connection_id, info->type, info->id, event); - } - -@@ -215,7 +215,7 @@ - if ((next_timer = get_next_timer()) != NULL) { - calc_next_timeout(next_timer, &next_timer_timeout); - timeout = &next_timer_timeout; -- DPRINTF(2, "timeout of %zd.%06zd", -+ DPRINTF(2, "timeout of %ld.%06ld", - timeout->tv_sec, timeout->tv_usec); - } else { - timeout = NULL; ---- a/server/tests/test_display_base.c -+++ b/server/tests/test_display_base.c -@@ -88,10 +88,11 @@ - pid = fork(); - if (pid == 0) { - char buf[PATH_MAX]; -+ char *argp[] = {NULL}; - char *envp[] = {buf, NULL}; - - snprintf(buf, sizeof(buf), "PATH=%s", getenv("PATH")); -- execve("regression_test.py", NULL, envp); -+ execve("regression_test.py", argp, envp); - } else if (pid > 0) { - return; - } diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index ff3dbf8..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -fix-tests-warnings.patch diff --git a/debian/rules b/debian/rules old mode 100755 new mode 100644 index 154ab11..0fedd4d --- a/debian/rules +++ b/debian/rules @@ -1,11 +1,11 @@ #!/usr/bin/make -f %: - dh $@ + dh $@ --with autoreconf override_dh_auto_configure: - dh_auto_configure -- --disable-celt051 --disable-silent-rules \ - --disable-smartcard --enable-client + dh_auto_configure -- --disable-celt051 --disable-silent-rules \ + --enable-smartcard --enable-lz4 override_dh_strip: dh_strip -plibspice-server1 --dbg-package=libspice-server1-dbg diff --git a/debian/spice-client.install b/debian/spice-client.install deleted file mode 100644 index dc0393f..0000000 --- a/debian/spice-client.install +++ /dev/null @@ -1 +0,0 @@ -usr/bin/spicec diff --git a/debian/spice-client.manpages b/debian/spice-client.manpages deleted file mode 100644 index b764b4b..0000000 --- a/debian/spice-client.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/spicec.1 diff --git a/debian/spicec.1 b/debian/spicec.1 deleted file mode 100644 index 17fcba6..0000000 --- a/debian/spicec.1 +++ /dev/null @@ -1,105 +0,0 @@ -.\" Hey, EMACS: -*- nroff -*- -.\" First parameter, NAME, should be all caps -.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection -.\" other parameters are allowed: see man(7), man(1) -.TH SPICEC 1 "November 29, 2010" -.\" Please adjust this date whenever revising the manpage. -.\" -.\" Some roff macros, for reference: -.\" .nh disable hyphenation -.\" .hy enable hyphenation -.\" .ad l left justify -.\" .ad b justify to both left and right margins -.\" .nf disable filling -.\" .fi enable filling -.\" .br insert line break -.\" .sp <n> insert n+1 empty lines -.\" for manpage-specific macros, see man(7) -.SH NAME -spicec \- Spice client -.SH SYNOPSIS -.B spicec -.RI [ \-h,\ \-\-host\ <host> ] -.RI [\-p,\ \-\-port\ <port> ] -.RI [ \-s,\ \-\-secure\-port\ <port> ] -.RI [ \-\-secure\-channels\ <ch0,\ ch1...> ] -.RI [ \-\-unsecure\-channels\ <ch0,\ ch1...> ] -.RI [ \-w,\ \-\-password\ <password> ] -.RI [ \-f,\ \-\-full\-screen[\=auto\-conf] ] -.RI [ \-\-canvas\-type\ <type1,\ type2...> ] -.RI [ \-\-enable\-channels\ <ch0,\ ch1...> ] -.RI [ \-\-disable\-channels\ <ch0,\ ch1...> ] -.RI [ \-\-help ] -.SH DESCRIPTION -spicec is a Spice client, it can be used to connect to Spice server, such as spice compatible QEMU -.SH OPTIONS -.TP -.B \-h,\ \-\-host\ <host> -Spice server address. -.TP -.B \-p,\ \-\-port\ <port> -Spice server port -.TP -.B \-s,\ \-\-secure\-port\ <port> -Spice server secure port -.TP -.B \-\-secure\-channels\ <ch0,\ ch1...> -Force secure connection on the specified channels -Channels are: main, display, inputs, cursor, playback and record -By default, any channel can be secured, depending on the \-\-secure-port availability. -.TP -.B \-\-unsecure\-channels\ <ch0,\ ch1...> -Force unsecure connection on the specified channels -Channels are: main, display, inputs, cursor, playback and record. -By default, any channel can be unsecured, depending on the \-\-port availability. -.TP -.B \-w,\ \-\-password\ <password> -Set a ticketing password (default is none) -.TP -.B \-s,\ \-\-secure\-port\ <port> -Spice server secure port -.TP -.B \-f,\ \-\-full\-screen[\=auto\-conf] -Open in a full screen mode. Optional automatic configuration of the remote display settings -according to the client display settings. A guest agent must be installed and started for this -option. -.TP -.B \-\-canvas\-type\ <type1,\ type2...> -Select the available renderer. The order determines precedence -For Linux client : only âcairoâ canvas type is available. -For Windows client : available types are âgdiâ and âcairoâ. The default is âgdiâ. -.TP -.B \-\-enable\-channels\ <ch0,\ ch1...> -Enable the specified channels. Use âallâ for enabling all possible channels. Use the -following names for enabling only the selected channels: âdisplayâ, âinputsâ, âcursorâ, -âplaybackâ and ârecordâ. By default all channels are enabled. -.TP -.B \-\-disable\-channels\ <ch0,\ ch1...> -Disable the specified channels. Use âallâ for disabling all possible channels. Use the -following names for enabling only the selected channels: âdisplayâ, âinputsâ, âcursorâ, -âplaybackâ and ârecord.â By default all channels are enabled. -.TP -.B \-\-help -Show command help. -.SH CONTROL HOT KEYS -.B Shift \+ F11 -Toggle full-screen / window mode -.TP -.B Shift \+ F12 -Release the cursor if captured in window -.TP -On debug mode, these are available as well: -.TP -.B Shift \+ F5 -Connect to the server -.TP -.B Shift \+ F6 -Disconnect from the server - -.SH SEE ALSO -Spice related documents can be found at http://www.spice-space.org/documentation.html -.SH AUTHOR -Spice project -.PP -This manual page was written by Liang Guo <bluestonech...@gmail.com>, for the Debian project (and may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the Creative Commons Attribution-Share Alike 3.0 United States License. (See http://creativecommons.org/licenses/by-sa/3.0/us/legalcode) -. -- 1.9.1
