diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-03-18 01:09:25 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-03-18 01:09:25 +0100 |
| commit | 7ace97395feedc4b3ec23be65f2ed63f29aac9a9 (patch) | |
| tree | 768956fa30fc7b21e4e4715eafbb10dab32b2847 /gnu/packages/xiph.scm | |
| parent | a248a9ac6a67213b177ab5ba9ec270638c9dd002 (diff) | |
| parent | be5ed142135e939cd23fcfe88c553fd28b32ac53 (diff) | |
| download | guix-7ace97395feedc4b3ec23be65f2ed63f29aac9a9.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/xiph.scm')
| -rw-r--r-- | gnu/packages/xiph.scm | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm index f9caea4192..d3a590bc58 100644 --- a/gnu/packages/xiph.scm +++ b/gnu/packages/xiph.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org> ;;; Copyright © 2015, 2016, 2017 Efraim Flashner <efraim@flashner.co.il> -;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> +;;; Copyright © 2017, 2018 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. @@ -81,6 +81,7 @@ periodic timestamps for seeking.") (package (name "libvorbis") (version "1.3.5") + (replacement libvorbis-1.3.6) (source (origin (method url-fetch) (uri (string-append "http://downloads.xiph.org/releases/vorbis/" @@ -105,6 +106,18 @@ polyphonic) audio and music at fixed and variable bitrates from 16 to "See COPYING in the distribution.")) (home-page "https://xiph.org/vorbis/"))) +;; For CVE-2018-5146. +(define-public libvorbis-1.3.6 + (package/inherit libvorbis + (version "1.3.6") + (source (origin + (method url-fetch) + (uri (string-append "http://downloads.xiph.org/releases/vorbis/" + "libvorbis-" version ".tar.xz")) + (sha256 + (base32 + "05dlzjkdpv46zb837wysxqyn8l636x3dw8v8ymlrwz2fg1dbn05g")))))) + (define libtheora (package (name "libtheora") |