diff options
| author | Thomas Gerbet <thomas@gerbet.me> | 2021-06-13 12:58:07 +0200 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2021-06-19 07:51:04 +0000 |
| commit | a3d41b4030847793d60a80e9d8480da8864c8ddd (patch) | |
| tree | c793ba9e7d648cb730acd77347835e1ec9d3662b | |
| parent | Merge branch 'staging-20.09' into release-20.09 (diff) | |
| download | nixpkgs-origin/backport-126745-to-release-20.09.tar.gz | |
spice: 0.14.2 -> 0.15.0origin/backport-126745-to-release-20.09
Fixes CVE-2021-20201.
(cherry picked from commit 05c0b157dca604b98d057951715cb01cdfe0e1af)
| -rw-r--r-- | pkgs/development/libraries/spice/correct-meson.patch | 26 | ||||
| -rw-r--r-- | pkgs/development/libraries/spice/default.nix | 11 |
2 files changed, 3 insertions, 34 deletions
diff --git a/pkgs/development/libraries/spice/correct-meson.patch b/pkgs/development/libraries/spice/correct-meson.patch deleted file mode 100644 index d3422cb915b3..000000000000 --- a/pkgs/development/libraries/spice/correct-meson.patch +++ /dev/null @@ -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) diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix index 2e158b98b583..fb9f18208e2d 100644 --- a/pkgs/development/libraries/spice/default.nix +++ b/pkgs/development/libraries/spice/default.nix @@ -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 ''; |