From e6ebc7b13225f0eddc404b7d8e136120b962181e Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 11 Jan 2018 14:16:56 -0800 Subject: 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 e9ab06de42..a0cdd0de87 100644 --- a/gnu/packages/xiph.scm +++ b/gnu/packages/xiph.scm @@ -79,12 +79,13 @@ (define libogg (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 @@ (define libvorbis "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") -- cgit v1.2.3