From fb6550058e167c25bbcbe0ebcf51590f83506f23 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 22 Feb 2018 15:41:24 +0100 Subject: gnu: libsndfile: Incorporate grafted changes. * gnu/packages/pulseaudio.scm (libsndfile)[replacement]: Remove field. [source](patches): Add "libsndfile-CVE-2017-12562.patch". (libsndfile/fixed): Remove variable. --- gnu/packages/pulseaudio.scm | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index 249afd3f68..9cfbe54b46 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -47,7 +47,6 @@ (define-public libsndfile (package (name "libsndfile") - (replacement libsndfile/fixed) (version "1.0.28") (source (origin (method url-fetch) @@ -55,7 +54,8 @@ version ".tar.gz")) (patches (search-patches "libsndfile-armhf-type-checks.patch" "libsndfile-CVE-2017-8361-8363-8365.patch" - "libsndfile-CVE-2017-8362.patch")) + "libsndfile-CVE-2017-8362.patch" + "libsndfile-CVE-2017-12562.patch")) (sha256 (base32 "1afzm7jx34jhqn32clc5xghyjglccam2728yxlx37yj2y0lkkwqz")))) @@ -81,15 +81,6 @@ SPARC. Hopefully the design of the library will also make it easy to extend for reading and writing new sound file formats.") (license l:gpl2+))) -(define libsndfile/fixed - (package - (inherit libsndfile) - (source (origin - (inherit (package-source libsndfile)) - (patches (append - (origin-patches (package-source libsndfile)) - (search-patches "libsndfile-CVE-2017-12562.patch"))))))) - (define-public libsamplerate (package (name "libsamplerate") ; aka. Secret Rabbit Code (SRC) -- cgit v1.2.3