spice: 0.14.2 -> 0.15.0

Fixes CVE-2021-20201.
This commit is contained in:
Thomas Gerbet 2021-06-13 12:58:07 +02:00 committed by Raphael Megzari
parent bb4697102b
commit 9e4803a708
2 changed files with 3 additions and 34 deletions

View file

@ -1,26 +0,0 @@
diff --git a/meson.build b/meson.build
index 8b8ae8bb..e58c436c 100644
--- a/meson.build
+++ b/meson.build
@@ -2,7 +2,7 @@
# project definition
#
project('spice', 'c',
- version : run_command('build-aux/git-version-gen', '${MESON_SOURCE_ROOT}/.tarball-version', check : true).stdout().strip(),
+ version : run_command('build-aux/git-version-gen', meson.source_root() + '/.tarball-version', check : true).stdout().strip(),
license : 'LGPLv2.1',
meson_version : '>= 0.48')
diff --git a/server/meson.build b/server/meson.build
index 34d8eef1..988ccab2 100644
--- a/server/meson.build
+++ b/server/meson.build
@@ -7,7 +7,7 @@ version_info = meson.project_version().split('.')
major = '@0@'.format(version_info[0])
minor = '@0@'.format(version_info[1])
micro = version_info[2].to_int()
-if not version_info[3].contains('git')
+if not version_info.contains('git')
micro += 1
endif
micro = '@0@'.format(micro)

View file

@ -26,18 +26,13 @@
stdenv.mkDerivation rec {
pname = "spice";
version = "0.14.2";
version = "0.15.0";
src = fetchurl {
url = "https://www.spice-space.org/download/releases/${pname}-${version}.tar.bz2";
sha256 = "19r999py9v9c7md2bb8ysj809ag1hh6djl1ik8jcgx065s4b60xj";
url = "https://www.spice-space.org/download/releases/spice-server/${pname}-${version}.tar.bz2";
sha256 = "1xd0xffw0g5vvwbq4ksmm3jjfq45f9dw20xpmi82g1fj9f7wy85k";
};
patches = [
# submitted https://gitlab.freedesktop.org/spice/spice/merge_requests/4
./correct-meson.patch
];
postPatch = ''
patchShebangs build-aux
'';