[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: gnu: libvorbis: Integrate grafted patches.
From: |
Leo Famulari |
Subject: |
02/02: gnu: libvorbis: Integrate grafted patches. |
Date: |
Thu, 11 Jan 2018 17:32:42 -0500 (EST) |
lfam pushed a commit to branch core-updates
in repository guix.
commit e6ebc7b13225f0eddc404b7d8e136120b962181e
Author: Leo Famulari <address@hidden>
Date: Thu Jan 11 14:16:56 2018 -0800
gnu: libvorbis: Integrate grafted patches.
* gnu/packages/xiph.scm (libvorbis)[replacement]: Remove field.
[source]: Add patches from libvorbis/fixed.
(libvorbis/fixed): Remove variable.
---
gnu/packages/xiph.scm | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm
index e9ab06d..a0cdd0d 100644
--- a/gnu/packages/xiph.scm
+++ b/gnu/packages/xiph.scm
@@ -79,12 +79,13 @@ periodic timestamps for seeking.")
(define libvorbis
(package
(name "libvorbis")
- (replacement libvorbis/fixed)
(version "1.3.5")
(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"))))
@@ -103,14 +104,6 @@ polyphonic) audio and music at fixed and variable bitrates
from 16 to
"See COPYING in the distribution."))
(home-page "http://xiph.org/vorbis/")))
-(define libvorbis/fixed
- (package
- (inherit libvorbis)
- (source (origin
- (inherit (package-source libvorbis))
- (patches (search-patches "libvorbis-CVE-2017-14633.patch"
- "libvorbis-CVE-2017-14632.patch"))))))
-
(define libtheora
(package
(name "libtheora")