diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-03-20 14:13:05 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-03-20 14:13:05 +0100 |
| commit | dc7e07c9b9780883a462c5973cd2ecad06fdb4ae (patch) | |
| tree | 14d185abfdd092a470e72ea27a3dad879145fb76 /gnu/packages/pulseaudio.scm | |
| parent | 616446ffbf9af9e8e5df0ef40c4e33dba9e25152 (diff) | |
| parent | dbc75dadb54dd0e6b3a125949c26aadfa3bff4ca (diff) | |
Merge branch 'staging'
Diffstat (limited to 'gnu/packages/pulseaudio.scm')
| -rw-r--r-- | gnu/packages/pulseaudio.scm | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index 8a45137a7f..43816e09f8 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) |