Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/audio/libsndfile libsndfile: Update to 1.0.29
details: https://anonhg.NetBSD.org/pkgsrc/rev/94c10c8650e7
branches: trunk
changeset: 437069:94c10c8650e7
user: nia <nia%pkgsrc.org@localhost>
date: Sat Aug 15 23:36:38 2020 +0000
description:
libsndfile: Update to 1.0.29
Version 1.0.29 (2020-08-15)
* Add support for Opus files.
* Autotool build system improvements.
* CMake build system improvements.
* Fixes for: CVE-2017-12562, CVE-2017-17456, CVE-2017-17457, CVE-2018-19661,
CVE-2018-19662, CVE-2018-19758 and CVE-2019-3832.
* Add BWF v2 loudness parameters.
* Wave64: Permit and skip arbitrary chunks prior to the data chunk.
* Fix ASAN crash in wavlike_ima_seek().
* Fix IMA-ADPCM encoding for AIFF files.
* sndfile-convert: Handle gsm, vox and opus extensions the same way.
* Add SFC_SET_OGG_PAGE_LATENCY_MS command to get Ogg page latency for Ogg Opus
files.
* Fix parsing of some SD2 files.
* Documentation updates.
* Minor bug fixes and improvements.
diffstat:
audio/libsndfile/Makefile | 18 ++++++---
audio/libsndfile/PLIST | 3 +-
audio/libsndfile/distinfo | 18 ++------
audio/libsndfile/patches/patch-CVE-2017-14634 | 18 ---------
audio/libsndfile/patches/patch-CVE-2018-13139 | 23 -----------
audio/libsndfile/patches/patch-src_alaw.c | 39 --------------------
audio/libsndfile/patches/patch-src_common.h | 15 -------
audio/libsndfile/patches/patch-src_flac.c | 52 ---------------------------
audio/libsndfile/patches/patch-src_sndfile.c | 15 -------
audio/libsndfile/patches/patch-src_ulaw.c | 39 --------------------
audio/libsndfile/patches/patch-src_wav.c | 23 -----------
11 files changed, 19 insertions(+), 244 deletions(-)
diffs (truncated from 339 to 300 lines):
diff -r eb20422e51c2 -r 94c10c8650e7 audio/libsndfile/Makefile
--- a/audio/libsndfile/Makefile Sat Aug 15 21:48:34 2020 +0000
+++ b/audio/libsndfile/Makefile Sat Aug 15 23:36:38 2020 +0000
@@ -1,18 +1,21 @@
-# $NetBSD: Makefile,v 1.76 2019/07/14 15:39:32 nia Exp $
+# $NetBSD: Makefile,v 1.77 2020/08/15 23:36:38 nia Exp $
-DISTNAME= libsndfile-1.0.28
-PKGREVISION= 3
+DISTNAME= libsndfile-1.0.29
CATEGORIES= audio
-MASTER_SITES= http://www.mega-nerd.com/libsndfile/files/
+MASTER_SITES= ${MASTER_SITE_GITHUB:=erikd/}
+GITHUB_PROJECT= libsndfile
+GITHUB_TAG= v${PKGVERSION_NOREV}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://www.mega-nerd.com/libsndfile/
COMMENT= Library for reading and writing audio files
LICENSE= gnu-lgpl-v2.1
+TOOL_DEPENDS+= autogen-[0-9]*:../../devel/autogen
+
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
-USE_TOOLS+= pkg-config
+USE_TOOLS+= autogen autoconf autoreconf automake pkg-config
PKGCONFIG_OVERRIDE= sndfile.pc.in
GNU_CONFIGURE= yes
@@ -28,8 +31,11 @@
CXXFLAGS+= -features=extensions
.endif
+pre-configure:
+ cd ${WRKSRC} && autoreconf -fi
+
.include "../../audio/flac/buildlink3.mk"
-#BUILDLINK_API_DEPENDS.libvorbis+= libvorbis>=1.2.1
+.include "../../audio/libopus/buildlink3.mk"
.include "../../audio/libvorbis/buildlink3.mk"
BUILDLINK_API_DEPENDS.libogg+= libogg>=1.1.3
.include "../../multimedia/libogg/buildlink3.mk"
diff -r eb20422e51c2 -r 94c10c8650e7 audio/libsndfile/PLIST
--- a/audio/libsndfile/PLIST Sat Aug 15 21:48:34 2020 +0000
+++ b/audio/libsndfile/PLIST Sat Aug 15 23:36:38 2020 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2017/04/19 13:32:12 wiz Exp $
+@comment $NetBSD: PLIST,v 1.21 2020/08/15 23:36:38 nia Exp $
bin/sndfile-cmp
bin/sndfile-concat
bin/sndfile-convert
@@ -34,6 +34,7 @@
share/doc/libsndfile/lists.html
share/doc/libsndfile/new_file_type.HOWTO
share/doc/libsndfile/octave.html
+share/doc/libsndfile/print.css
share/doc/libsndfile/sndfile_info.html
share/doc/libsndfile/tutorial.html
share/doc/libsndfile/win32.html
diff -r eb20422e51c2 -r 94c10c8650e7 audio/libsndfile/distinfo
--- a/audio/libsndfile/distinfo Sat Aug 15 21:48:34 2020 +0000
+++ b/audio/libsndfile/distinfo Sat Aug 15 23:36:38 2020 +0000
@@ -1,14 +1,6 @@
-$NetBSD: distinfo,v 1.43 2019/07/14 15:39:32 nia Exp $
+$NetBSD: distinfo,v 1.44 2020/08/15 23:36:38 nia Exp $
-SHA1 (libsndfile-1.0.28.tar.gz) = 85aa967e19f6b9bf975601d79669025e5f8bc77d
-RMD160 (libsndfile-1.0.28.tar.gz) = f8803966802afe2b5a35cda28c2f764d91c48f37
-SHA512 (libsndfile-1.0.28.tar.gz) = 890731a6b8173f714155ce05eaf6d991b31632c8ab207fbae860968861a107552df26fcf85602df2e7f65502c7256c1b41735e1122485a3a07ddb580aa83b57f
-Size (libsndfile-1.0.28.tar.gz) = 1202833 bytes
-SHA1 (patch-CVE-2017-14634) = 9b64abe6a8950e8d79ebb913903a644ba7081f34
-SHA1 (patch-CVE-2018-13139) = d11afed645e096d6c836f7214b24832708ff9c5f
-SHA1 (patch-src_alaw.c) = 7e9e0d1c6d30391c24b21afca1b568a3af643ab4
-SHA1 (patch-src_common.h) = ed366417009008f816d688cd33809f680cf2f674
-SHA1 (patch-src_flac.c) = 27f58cd77c1a1828d069e5e4178d2477724100cd
-SHA1 (patch-src_sndfile.c) = 34b27502839b8ef271ced8ba562b7281c68ff4da
-SHA1 (patch-src_ulaw.c) = 5cfb7fa6af394f2cc8e76bcc48da0f93d115a137
-SHA1 (patch-src_wav.c) = 67e0dff27079d14bf6d1480db5fcb2ed1861718d
+SHA1 (libsndfile-1.0.29.tar.gz) = 6201f422991f9e754e19309ec512781b7679ce28
+RMD160 (libsndfile-1.0.29.tar.gz) = 0e6ace08ed4f55ee7b2a9445ca46d4c8bd6fdeb0
+SHA512 (libsndfile-1.0.29.tar.gz) = ff19e8cea629af9dea51c79f3446f7a63520525c8578c56b8b4b7a6f0ce07d2458ca488f0be9daeaf9ea3a1124b1fa7cac9a3b313b1ae1f43c76de852a10eed5
+Size (libsndfile-1.0.29.tar.gz) = 643575 bytes
diff -r eb20422e51c2 -r 94c10c8650e7 audio/libsndfile/patches/patch-CVE-2017-14634
--- a/audio/libsndfile/patches/patch-CVE-2017-14634 Sat Aug 15 21:48:34 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-$NetBSD: patch-CVE-2017-14634,v 1.1 2019/07/14 15:39:32 nia Exp $
-
-Fixes: CVE-2017-14634
-
-Upstream commit:
-https://github.com/erikd/libsndfile/commit/85c877d5072866aadbe8ed0c3e0590fbb5e16788.patch
-
---- src/double64.c.orig 2016-04-01 21:08:53.000000000 +0000
-+++ src/double64.c
-@@ -91,7 +91,7 @@ int
- double64_init (SF_PRIVATE *psf)
- { static int double64_caps ;
-
-- if (psf->sf.channels < 1)
-+ if (psf->sf.channels < 1 || psf->sf.channels > SF_MAX_CHANNELS)
- { psf_log_printf (psf, "double64_init : internal error : channels = %d\n", psf->sf.channels) ;
- return SFE_INTERNAL ;
- } ;
diff -r eb20422e51c2 -r 94c10c8650e7 audio/libsndfile/patches/patch-CVE-2018-13139
--- a/audio/libsndfile/patches/patch-CVE-2018-13139 Sat Aug 15 21:48:34 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-$NetBSD: patch-CVE-2018-13139,v 1.1 2019/07/14 15:39:32 nia Exp $
-
-Fixes: CVE-2018-13139, CVE-2018-19432
-
-Upstream commit:
-https://github.com/erikd/libsndfile/commit/df18323c622b54221ee7ace74b177cdcccc152d7.patch
-
---- programs/sndfile-deinterleave.c.orig 2016-04-01 21:08:52.000000000 +0000
-+++ programs/sndfile-deinterleave.c
-@@ -89,6 +89,13 @@ main (int argc, char **argv)
- exit (1) ;
- } ;
-
-+ if (sfinfo.channels > MAX_CHANNELS)
-+ { printf ("\nError : Input file '%s' has too many (%d) channels. Limit is %d.\n",
-+ argv [1], sfinfo.channels, MAX_CHANNELS) ;
-+ exit (1) ;
-+ } ;
-+
-+
- state.channels = sfinfo.channels ;
- sfinfo.channels = 1 ;
-
diff -r eb20422e51c2 -r 94c10c8650e7 audio/libsndfile/patches/patch-src_alaw.c
--- a/audio/libsndfile/patches/patch-src_alaw.c Sat Aug 15 21:48:34 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-$NetBSD: patch-src_alaw.c,v 1.1 2019/07/14 15:39:32 nia Exp $
-
-Fix: CVE-2018-19662, CVE-2017-17456
-
-Upstream commit:
-https://github.com/erikd/libsndfile/commit/8ddc442d539ca775d80cdbc7af17a718634a743f.patch
-
---- src/alaw.c.orig 2016-04-01 21:08:52.000000000 +0000
-+++ src/alaw.c
-@@ -19,6 +19,7 @@
- #include "sfconfig.h"
-
- #include <math.h>
-+#include <limits.h>
-
- #include "sndfile.h"
- #include "common.h"
-@@ -326,7 +327,9 @@ s2alaw_array (const short *ptr, int coun
- static inline void
- i2alaw_array (const int *ptr, int count, unsigned char *buffer)
- { while (--count >= 0)
-- { if (ptr [count] >= 0)
-+ { if (ptr [count] == INT_MIN)
-+ buffer [count] = alaw_encode [INT_MAX >> (16 + 4)] ;
-+ else if (ptr [count] >= 0)
- buffer [count] = alaw_encode [ptr [count] >> (16 + 4)] ;
- else
- buffer [count] = 0x7F & alaw_encode [- ptr [count] >> (16 + 4)] ;
-@@ -346,7 +349,9 @@ f2alaw_array (const float *ptr, int coun
- static inline void
- d2alaw_array (const double *ptr, int count, unsigned char *buffer, double normfact)
- { while (--count >= 0)
-- { if (ptr [count] >= 0)
-+ { if (!isfinite (ptr [count]))
-+ buffer [count] = 0 ;
-+ else if (ptr [count] >= 0)
- buffer [count] = alaw_encode [lrint (normfact * ptr [count])] ;
- else
- buffer [count] = 0x7F & alaw_encode [- lrint (normfact * ptr [count])] ;
diff -r eb20422e51c2 -r 94c10c8650e7 audio/libsndfile/patches/patch-src_common.h
--- a/audio/libsndfile/patches/patch-src_common.h Sat Aug 15 21:48:34 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_common.h,v 1.1 2017/05/17 21:51:46 he Exp $
-
-Fix for CVE-2017-8365, ref.
-https://github.com/erikd/libsndfile/commit/fd0484aba8e51d16af1e3a880f9b8b857b385eb3
-
---- src/common.h.orig 2017-04-01 09:40:45.000000000 +0000
-+++ src/common.h
-@@ -725,6 +725,7 @@ enum
- SFE_FLAC_INIT_DECODER,
- SFE_FLAC_LOST_SYNC,
- SFE_FLAC_BAD_SAMPLE_RATE,
-+ SFE_FLAC_CHANNEL_COUNT_CHANGED,
- SFE_FLAC_UNKOWN_ERROR,
-
- SFE_WVE_NOT_WVE,
diff -r eb20422e51c2 -r 94c10c8650e7 audio/libsndfile/patches/patch-src_flac.c
--- a/audio/libsndfile/patches/patch-src_flac.c Sat Aug 15 21:48:34 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-$NetBSD: patch-src_flac.c,v 1.2 2017/05/17 21:58:05 he Exp $
-
-Fix for CVE-2017-8365, ref.
-https://github.com/erikd/libsndfile/commit/fd0484aba8e51d16af1e3a880f9b8b857b385eb3
-Fix for CVE-2017-8362, ref.
-https://github.com/erikd/libsndfile/commit/ef1dbb2df1c0e741486646de40bd638a9c4cd808
-
---- src/flac.c.orig 2017-04-02 08:13:30.000000000 +0000
-+++ src/flac.c
-@@ -169,6 +169,14 @@ flac_buffer_copy (SF_PRIVATE *psf)
- const int32_t* const *buffer = pflac->wbuffer ;
- unsigned i = 0, j, offset, channels, len ;
-
-+ if (psf->sf.channels != (int) frame->header.channels)
-+ { psf_log_printf (psf, "Error: FLAC frame changed from %d to %d channels\n"
-+ "Nothing to do but to error out.\n" ,
-+ psf->sf.channels, frame->header.channels) ;
-+ psf->error = SFE_FLAC_CHANNEL_COUNT_CHANGED ;
-+ return 0 ;
-+ } ;
-+
- /*
- ** frame->header.blocksize is variable and we're using a constant blocksize
- ** of FLAC__MAX_BLOCK_SIZE.
-@@ -202,7 +210,6 @@ flac_buffer_copy (SF_PRIVATE *psf)
- return 0 ;
- } ;
-
--
- len = SF_MIN (pflac->len, frame->header.blocksize) ;
-
- if (pflac->remain % channels != 0)
-@@ -435,6 +442,19 @@ sf_flac_meta_callback (const FLAC__Strea
-
- switch (metadata->type)
- { case FLAC__METADATA_TYPE_STREAMINFO :
-+ if (psf->sf.channels > 0 && psf->sf.channels != (int) metadata->data.stream_info.channels)
-+ { psf_log_printf (psf, "Error: FLAC stream changed from %d to %d channels\n"
-+ "Nothing to do but to error out.\n" ,
-+ psf->sf.channels, metadata->data.stream_info.channels) ;
-+ psf->error = SFE_FLAC_CHANNEL_COUNT_CHANGED ;
-+ return ;
-+ } ;
-+
-+ if (psf->sf.channels > 0 && psf->sf.samplerate != (int) metadata->data.stream_info.sample_rate)
-+ { psf_log_printf (psf, "Warning: FLAC stream changed sample rates from %d to %d.\n"
-+ "Carrying on as if nothing happened.",
-+ psf->sf.samplerate, metadata->data.stream_info.sample_rate) ;
-+ } ;
- psf->sf.channels = metadata->data.stream_info.channels ;
- psf->sf.samplerate = metadata->data.stream_info.sample_rate ;
- psf->sf.frames = metadata->data.stream_info.total_samples ;
diff -r eb20422e51c2 -r 94c10c8650e7 audio/libsndfile/patches/patch-src_sndfile.c
--- a/audio/libsndfile/patches/patch-src_sndfile.c Sat Aug 15 21:48:34 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_sndfile.c,v 1.1 2017/05/17 21:51:46 he Exp $
-
-Fix for CVE-2017-8365, ref.
-https://github.com/erikd/libsndfile/commit/fd0484aba8e51d16af1e3a880f9b8b857b385eb3
-
---- src/sndfile.c.orig 2017-04-02 06:33:16.000000000 +0000
-+++ src/sndfile.c
-@@ -245,6 +245,7 @@ ErrorStruct SndfileErrors [] =
- { SFE_FLAC_INIT_DECODER , "Error : problem with initialization of the flac decoder." },
- { SFE_FLAC_LOST_SYNC , "Error : flac decoder lost sync." },
- { SFE_FLAC_BAD_SAMPLE_RATE, "Error : flac does not support this sample rate." },
-+ { SFE_FLAC_CHANNEL_COUNT_CHANGED, "Error : flac channel changed mid stream." },
- { SFE_FLAC_UNKOWN_ERROR , "Error : unknown error in flac decoder." },
-
- { SFE_WVE_NOT_WVE , "Error : not a WVE file." },
diff -r eb20422e51c2 -r 94c10c8650e7 audio/libsndfile/patches/patch-src_ulaw.c
--- a/audio/libsndfile/patches/patch-src_ulaw.c Sat Aug 15 21:48:34 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-$NetBSD: patch-src_ulaw.c,v 1.1 2019/07/14 15:39:32 nia Exp $
-
-Fix: CVE-2018-19661, CVE-2017-17457
-
-Upstream commit:
-https://github.com/erikd/libsndfile/commit/8ddc442d539ca775d80cdbc7af17a718634a743f.patch
-
---- src/ulaw.c.orig 2016-04-01 21:08:53.000000000 +0000
-+++ src/ulaw.c
-@@ -19,6 +19,7 @@
- #include "sfconfig.h"
-
- #include <math.h>
-+#include <limits.h>
-
- #include "sndfile.h"
- #include "common.h"
-@@ -827,7 +828,9 @@ s2ulaw_array (const short *ptr, int coun
- static inline void
- i2ulaw_array (const int *ptr, int count, unsigned char *buffer)
- { while (--count >= 0)
-- { if (ptr [count] >= 0)
-+ { if (ptr [count] == INT_MIN)
-+ buffer [count] = ulaw_encode [INT_MAX >> (16 + 2)] ;
-+ else if (ptr [count] >= 0)
- buffer [count] = ulaw_encode [ptr [count] >> (16 + 2)] ;
- else
Home |
Main Index |
Thread Index |
Old Index