diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-06-11 23:52:15 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-06-11 23:52:15 +0200 |
| commit | a032b4454b3fc67e11e9fc2d8c2345288065fa29 (patch) | |
| tree | c208124b79dbd2224b68c52106aa72ff2ebfa7ab /gnu/packages/xiph.scm | |
| parent | b5724230fed2d043206df20d12a45bb962b7ee77 (diff) | |
| parent | 6321ce42ab4d9ab788d858cb19bde4aa7a0e3ecc (diff) | |
| download | guix-patches-a032b4454b3fc67e11e9fc2d8c2345288065fa29.tar guix-patches-a032b4454b3fc67e11e9fc2d8c2345288065fa29.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/xiph.scm')
| -rw-r--r-- | gnu/packages/xiph.scm | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm index d3a590bc58..a9f4a2ab87 100644 --- a/gnu/packages/xiph.scm +++ b/gnu/packages/xiph.scm @@ -80,17 +80,14 @@ periodic timestamps for seeking.") (define libvorbis (package (name "libvorbis") - (version "1.3.5") - (replacement libvorbis-1.3.6) + (version "1.3.6") (source (origin (method url-fetch) (uri (string-append "http://downloads.xiph.org/releases/vorbis/" "libvorbis-" version ".tar.xz")) - (patches (search-patches "libvorbis-CVE-2017-14633.patch" - "libvorbis-CVE-2017-14632.patch")) (sha256 (base32 - "1lg1n3a6r41492r7in0fpvzc7909mc5ir9z0gd3qh2pz4yalmyal")))) + "05dlzjkdpv46zb837wysxqyn8l636x3dw8v8ymlrwz2fg1dbn05g")))) (build-system gnu-build-system) (propagated-inputs `(("libogg" ,libogg))) (arguments `(#:configure-flags '("LDFLAGS=-lm") @@ -106,18 +103,6 @@ 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") |