From 713b519eaad39f5fd29cc5ad6e3cad0f089f9bbb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 26 Feb 2018 22:44:24 +0100 Subject: gnu: fluidsynth: Update to 1.1.10. * gnu/packages/audio.scm (fluidsynth): Update to 1.1.10. --- gnu/packages/audio.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages/audio.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index b1a15ed34d..d4d2636614 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1030,7 +1030,7 @@ (define-public g2reverb (define-public fluidsynth (package (name "fluidsynth") - (version "1.1.9") + (version "1.1.10") (source (origin (method git-fetch) (uri (git-reference @@ -1039,14 +1039,15 @@ (define-public fluidsynth (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0krvmb1idnf95l2ydzfcb08ayyx3n4m71hf9fgwv3srzaikvpf3q")))) + "04jlgq1d1hd8r9cnmkl3lgf1fgm7kgy4hh9nfddap41fm1wp121p")))) (build-system cmake-build-system) (arguments - '(#:tests? #f ; no check phase + '(#:tests? #f ; no check target #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-libdir (lambda _ + ;; Install libraries to /lib, not /lib64. (substitute* "CMakeLists.txt" (("LIB_SUFFIX \\$\\{_init_lib_suffix\\}") "LIB_SUFFIX \"\"")) -- cgit v1.2.3 From 9e9a211f9d2b24cdbda5ddcddc3df5f8e725277e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 26 Feb 2018 22:25:32 +0100 Subject: gnu: soxr: Update to 0.1.3. * gnu/packages/audio.scm (soxr): Update to 0.1.3. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/audio.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index d4d2636614..369af141fa 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2537,7 +2537,7 @@ (define-public sox (define-public soxr (package (name "soxr") - (version "0.1.2") + (version "0.1.3") (source (origin (method url-fetch) @@ -2545,7 +2545,7 @@ (define-public soxr (string-append "mirror://sourceforge/soxr/soxr-" version "-Source.tar.xz")) (sha256 - (base32 "0xf2w3piwz9gfr1xqyrj4k685q5dy53kq3igv663i4f4y4sg9rjl")))) + (base32 "12aql6svkplxq5fjycar18863hcq84c5kx8g6f4rj0lcvigw24di")))) (build-system cmake-build-system) (arguments '(#:tests? #f)) ;no 'check' target (home-page "https://sourceforge.net/p/soxr/wiki/Home/") -- cgit v1.2.3 From 53453d7acc516fb806f81589e0fa3daf4a6349bf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 28 Feb 2018 20:29:46 +0100 Subject: gnu: wavpack: Fix CVE-2018-6767. * gnu/packages/patches/wavpack-CVE-2018-6767.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/audio.scm (wavpack)[source](patches): Add it. --- gnu/local.mk | 1 + gnu/packages/audio.scm | 3 +- gnu/packages/patches/wavpack-CVE-2018-6767.patch | 119 +++++++++++++++++++++++ 3 files changed, 122 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/wavpack-CVE-2018-6767.patch (limited to 'gnu/packages/audio.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 24368727f2..9cc00b844c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1142,6 +1142,7 @@ dist_patch_DATA = \ %D%/packages/patches/vsearch-unbundle-cityhash.patch \ %D%/packages/patches/vte-CVE-2012-2738-pt1.patch \ %D%/packages/patches/vte-CVE-2012-2738-pt2.patch \ + %D%/packages/patches/wavpack-CVE-2018-6767.patch \ %D%/packages/patches/wavpack-CVE-2018-7253.patch \ %D%/packages/patches/wavpack-CVE-2018-7254.patch \ %D%/packages/patches/weechat-python.patch \ diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 369af141fa..1cf6441df0 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2378,7 +2378,8 @@ (define-public wavpack (method url-fetch) (uri (string-append "http://www.wavpack.com/" name "-" version ".tar.bz2")) - (patches (search-patches "wavpack-CVE-2018-7253.patch" + (patches (search-patches "wavpack-CVE-2018-6767.patch" + "wavpack-CVE-2018-7253.patch" "wavpack-CVE-2018-7254.patch")) (sha256 (base32 diff --git a/gnu/packages/patches/wavpack-CVE-2018-6767.patch b/gnu/packages/patches/wavpack-CVE-2018-6767.patch new file mode 100644 index 0000000000..f49a8f0fd6 --- /dev/null +++ b/gnu/packages/patches/wavpack-CVE-2018-6767.patch @@ -0,0 +1,119 @@ +Fix CVE-2018-6767: +https://nvd.nist.gov/vuln/detail/CVE-2018-6767 +https://security-tracker.debian.org/tracker/CVE-2018-6767 + +Patch copied from upstream source repository: +https://github.com/dbry/WavPack/commit/d5bf76b5a88d044a1be1d5656698e3ba737167e5 + +From d5bf76b5a88d044a1be1d5656698e3ba737167e5 Mon Sep 17 00:00:00 2001 +From: David Bryant +Date: Sun, 4 Feb 2018 11:28:15 -0800 +Subject: [PATCH] issue #27, do not overwrite stack on corrupt RF64 file + +--- + cli/riff.c | 39 ++++++++++++++++++++++++++++++++------- + 1 file changed, 32 insertions(+), 7 deletions(-) + +diff --git a/cli/riff.c b/cli/riff.c +index 8b1af45..de98c1e 100644 +--- a/cli/riff.c ++++ b/cli/riff.c +@@ -42,6 +42,7 @@ typedef struct { + + #pragma pack(pop) + ++#define CS64ChunkFormat "4D" + #define DS64ChunkFormat "DDDL" + + #define WAVPACK_NO_ERROR 0 +@@ -101,13 +102,13 @@ int ParseRiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpack + + if (!strncmp (chunk_header.ckID, "ds64", 4)) { + if (chunk_header.ckSize < sizeof (DS64Chunk) || +- !DoReadFile (infile, &ds64_chunk, chunk_header.ckSize, &bcount) || +- bcount != chunk_header.ckSize) { ++ !DoReadFile (infile, &ds64_chunk, sizeof (DS64Chunk), &bcount) || ++ bcount != sizeof (DS64Chunk)) { + error_line ("%s is not a valid .WAV file!", infilename); + return WAVPACK_SOFT_ERROR; + } + else if (!(config->qmode & QMODE_NO_STORE_WRAPPER) && +- !WavpackAddWrapper (wpc, &ds64_chunk, chunk_header.ckSize)) { ++ !WavpackAddWrapper (wpc, &ds64_chunk, sizeof (DS64Chunk))) { + error_line ("%s", WavpackGetErrorMessage (wpc)); + return WAVPACK_SOFT_ERROR; + } +@@ -315,10 +316,11 @@ int ParseRiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpack + + int WriteRiffHeader (FILE *outfile, WavpackContext *wpc, int64_t total_samples, int qmode) + { +- int do_rf64 = 0, write_junk = 1; ++ int do_rf64 = 0, write_junk = 1, table_length = 0; + ChunkHeader ds64hdr, datahdr, fmthdr; + RiffChunkHeader riffhdr; + DS64Chunk ds64_chunk; ++ CS64Chunk cs64_chunk; + JunkChunk junkchunk; + WaveHeader wavhdr; + uint32_t bcount; +@@ -380,6 +382,7 @@ int WriteRiffHeader (FILE *outfile, WavpackContext *wpc, int64_t total_samples, + strncpy (riffhdr.formType, "WAVE", sizeof (riffhdr.formType)); + total_riff_bytes = sizeof (riffhdr) + wavhdrsize + sizeof (datahdr) + ((total_data_bytes + 1) & ~(int64_t)1); + if (do_rf64) total_riff_bytes += sizeof (ds64hdr) + sizeof (ds64_chunk); ++ total_riff_bytes += table_length * sizeof (CS64Chunk); + if (write_junk) total_riff_bytes += sizeof (junkchunk); + strncpy (fmthdr.ckID, "fmt ", sizeof (fmthdr.ckID)); + strncpy (datahdr.ckID, "data", sizeof (datahdr.ckID)); +@@ -394,11 +397,12 @@ int WriteRiffHeader (FILE *outfile, WavpackContext *wpc, int64_t total_samples, + + if (do_rf64) { + strncpy (ds64hdr.ckID, "ds64", sizeof (ds64hdr.ckID)); +- ds64hdr.ckSize = sizeof (ds64_chunk); ++ ds64hdr.ckSize = sizeof (ds64_chunk) + (table_length * sizeof (CS64Chunk)); + CLEAR (ds64_chunk); + ds64_chunk.riffSize64 = total_riff_bytes; + ds64_chunk.dataSize64 = total_data_bytes; + ds64_chunk.sampleCount64 = total_samples; ++ ds64_chunk.tableLength = table_length; + riffhdr.ckSize = (uint32_t) -1; + datahdr.ckSize = (uint32_t) -1; + WavpackNativeToLittleEndian (&ds64hdr, ChunkHeaderFormat); +@@ -409,6 +413,14 @@ int WriteRiffHeader (FILE *outfile, WavpackContext *wpc, int64_t total_samples, + datahdr.ckSize = (uint32_t) total_data_bytes; + } + ++ // this "table" is just a dummy placeholder for testing (normally not written) ++ ++ if (table_length) { ++ strncpy (cs64_chunk.ckID, "dmmy", sizeof (cs64_chunk.ckID)); ++ cs64_chunk.chunkSize64 = 12345678; ++ WavpackNativeToLittleEndian (&cs64_chunk, CS64ChunkFormat); ++ } ++ + // write the RIFF chunks up to just before the data starts + + WavpackNativeToLittleEndian (&riffhdr, ChunkHeaderFormat); +@@ -418,8 +430,21 @@ int WriteRiffHeader (FILE *outfile, WavpackContext *wpc, int64_t total_samples, + + if (!DoWriteFile (outfile, &riffhdr, sizeof (riffhdr), &bcount) || bcount != sizeof (riffhdr) || + (do_rf64 && (!DoWriteFile (outfile, &ds64hdr, sizeof (ds64hdr), &bcount) || bcount != sizeof (ds64hdr))) || +- (do_rf64 && (!DoWriteFile (outfile, &ds64_chunk, sizeof (ds64_chunk), &bcount) || bcount != sizeof (ds64_chunk))) || +- (write_junk && (!DoWriteFile (outfile, &junkchunk, sizeof (junkchunk), &bcount) || bcount != sizeof (junkchunk))) || ++ (do_rf64 && (!DoWriteFile (outfile, &ds64_chunk, sizeof (ds64_chunk), &bcount) || bcount != sizeof (ds64_chunk)))) { ++ error_line ("can't write .WAV data, disk probably full!"); ++ return FALSE; ++ } ++ ++ // again, this is normally not written except for testing ++ ++ while (table_length--) ++ if (!DoWriteFile (outfile, &cs64_chunk, sizeof (cs64_chunk), &bcount) || bcount != sizeof (cs64_chunk)) { ++ error_line ("can't write .WAV data, disk probably full!"); ++ return FALSE; ++ } ++ ++ ++ if ((write_junk && (!DoWriteFile (outfile, &junkchunk, sizeof (junkchunk), &bcount) || bcount != sizeof (junkchunk))) || + !DoWriteFile (outfile, &fmthdr, sizeof (fmthdr), &bcount) || bcount != sizeof (fmthdr) || + !DoWriteFile (outfile, &wavhdr, wavhdrsize, &bcount) || bcount != wavhdrsize || + !DoWriteFile (outfile, &datahdr, sizeof (datahdr), &bcount) || bcount != sizeof (datahdr)) { -- cgit v1.2.3 From 57c734a628091f45cea205acfceba34d2dda3ef9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 1 Mar 2018 06:50:39 +0100 Subject: gnu: liblo: Update to 0.29. * gnu/packages/audio.scm (liblo): Update to 0.29. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/audio.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 1cf6441df0..a9d29345a6 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1628,14 +1628,14 @@ (define-public libbs2b (define-public liblo (package (name "liblo") - (version "0.28") + (version "0.29") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/liblo/liblo/" version "/liblo-" version ".tar.gz")) (sha256 (base32 - "02drgnpirvl2ihvzgsmn02agr5sj3vipzzw9vma56qlkgfvak56s")))) + "0sn0ckc1d0845mhsaa62wf7f9v0c0ykiq796a30ja5096kib9qdc")))) (build-system gnu-build-system) (arguments `(;; liblo test FAILED -- cgit v1.2.3 From 35a01e67c8fd5a9d06085e56a69465881999c11c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 4 Mar 2018 09:53:55 +0200 Subject: gnu: lv2-mda-piano: Declare a source file-name. * gnu/packages/audio.scm (lv2-mda-piano)[source]: Declare a source file-name. --- gnu/packages/audio.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/audio.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index a9d29345a6..e3d3819427 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1796,6 +1796,7 @@ (define-public lv2-mda-piano (uri (git-reference (url "http://git.elephly.net/software/lv2-mdametapiano.git") (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 "07lywf6lpfpndg3i9w752mmlg2hgn1bwp23h8b0mdj6awh67abqd")))) -- cgit v1.2.3 From 6677c99a8b9d334e55e23efe9e864b90b9b9f015 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 4 Mar 2018 09:54:51 +0200 Subject: gnu: lv2-devel: Declare a source file-name. * gnu/packages/audio.scm (lv2-devel)[source]: Declare a source file-name. --- gnu/packages/audio.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/audio.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index e3d3819427..f00ac246c1 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1783,6 +1783,7 @@ (define-public lv2-devel (uri (git-reference (url "http://lv2plug.in/git/lv2.git") (commit commit))) + (file-name (git-file-name name version)) (sha256 (base32 "1gp2rd99dfmpibvpixrqn115mrhybzf3if3h8bssf6siyi13f29r"))))))) -- cgit v1.2.3 From 70aa07d296f28063313d48ebcfbc6c69fec2ac82 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 4 Mar 2018 09:55:46 +0200 Subject: gnu: qjackrcd: Declare a source file-name. * gnu/packages/audio.scm (qjackrcd)[source]: Declare a source file-name. --- gnu/packages/audio.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/audio.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index f00ac246c1..8c48e2a0ff 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2026,6 +2026,7 @@ (define-public qjackrcd (uri (git-reference (url "https://github.com/orouits/qjackrcd.git") (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 "1l5iq2mkqd4gn9yr8xbh9qlpp1clcflazychl4vhdbz0bzq4c6al")))) -- cgit v1.2.3 From fdf359f82bb414754f299bc55fd314a5f107a332 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 4 Mar 2018 09:57:24 +0200 Subject: gnu: rubberband: Declare a source file-name. * gnu/packages/audio.scm (rubberband)[source]: Declare a source file-name. --- gnu/packages/audio.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/audio.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 8c48e2a0ff..54bf6c1982 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2106,6 +2106,7 @@ (define-public rubberband (string-append "https://bitbucket.org/breakfastquay/rubberband/get/v" version ".tar.bz2")) + (file-name (string-append name "-" version ".tar.bz2")) (sha256 (base32 "05amrbrxx0da3w7m237q51799r8xgs4ffqabi2qv06hq8dpcj386")))) -- cgit v1.2.3 From a1eb506cf3ba5fd0ea832ae564f9c8dae5f386e7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 4 Mar 2018 09:58:23 +0200 Subject: gnu: faust@2: Declare a source file-name. * gnu/packages/audio.scm (faust@2)[source]: Declare a source file-name. --- gnu/packages/audio.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/audio.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 54bf6c1982..3ae2b1ba47 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1155,6 +1155,7 @@ (define-public faust-2 (string-map (lambda (c) (if (char=? c #\.) #\- c)) version))))) + (file-name (string-append "faust-" version "-checkout")) (sha256 (base32 "06km0ygwxxwgw1lqldccqidxhmjfz8ck0wnbd95qk5sg8sbpc068")))) -- cgit v1.2.3 From 03b71957947c219a74b77b0831d9abc8d4bbfd24 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 3 Mar 2018 23:17:04 +0100 Subject: gnu: liblo: Mark up description. * gnu/packages/audio.scm (liblo)[description]: Use @dfn. --- gnu/packages/audio.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/audio.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 3ae2b1ba47..d8569096ab 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1646,7 +1646,7 @@ (define-public liblo (synopsis "Implementation of the Open Sound Control protocol") (description "liblo is a lightweight library that provides an easy to use -implementation of the Open Sound Control (OSC) protocol.") +implementation of the Open Sound Control (@dfn{OSC}) protocol.") (license license:lgpl2.1+))) (define-public python-pyaudio -- cgit v1.2.3