diff options
| author | Leo Famulari <leo@famulari.name> | 2017-07-10 14:37:53 -0400 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2017-07-10 14:37:53 -0400 |
| commit | c8eb2b8c60d954b4522555a5c75b7bb4be5a1a4d (patch) | |
| tree | 3a2e569e333ccd9265237868d3f46b2d1e04e3a9 /gnu/packages/xorg.scm | |
| parent | ad22c7185395a52bd90ea5890a2ac79f44d00352 (diff) | |
| parent | 61adfb00b11cc16a70e60f19fd8e0a838a3ef608 (diff) | |
| download | patches-c8eb2b8c60d954b4522555a5c75b7bb4be5a1a4d.tar patches-c8eb2b8c60d954b4522555a5c75b7bb4be5a1a4d.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/xorg.scm')
| -rw-r--r-- | gnu/packages/xorg.scm | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 555f12fbeb..846b5cb013 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5022,7 +5022,10 @@ over Xlib, including: name "-" version ".tar.bz2")) (sha256 (base32 - "162s1v901djr57gxmmk4airk8hiwcz79dqyz72972x1lw1k82yk7")))) + "162s1v901djr57gxmmk4airk8hiwcz79dqyz72972x1lw1k82yk7")) + (patches + (search-patches "xorg-server-CVE-2017-10971.patch" + "xorg-server-CVE-2017-10972.patch")))) (build-system gnu-build-system) (propagated-inputs `(("dri2proto" ,dri2proto) @@ -5822,7 +5825,7 @@ basic eye-candy effects.") (define-public xpra (package (name "xpra") - (version "2.0.2") + (version "2.0.3") (source (origin (method url-fetch) @@ -5830,7 +5833,7 @@ basic eye-candy effects.") version ".tar.xz")) (sha256 (base32 - "09hzgbsj9v5qyh41rbz968ipi7016jk66b60vm6piryna9kbnha3")))) + "1f2mkbgjslfivh5xq5xbab1cn6jjyc1d104f692f3s0dnhq7dafa")))) (build-system python-build-system) (inputs `(("ffmpeg", ffmpeg) ("flac", flac) |