Accepting request 674878 from multimedia:libs

OBS-URL: https://build.opensuse.org/request/show/674878
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/aubio?expand=0&rev=26
This commit is contained in:
Dominique Leuenberger 2019-02-27 14:05:27 +00:00 committed by Git OBS Bridge
commit 92e147b87f
14 changed files with 106 additions and 256 deletions

View File

@ -1,25 +0,0 @@
From 25f280f347868fc0f4ecdcb0b45d5a9400f8f772 Mon Sep 17 00:00:00 2001
From: Paul Brossier <piem@piem.org>
Date: Mon, 6 Aug 2018 14:03:48 +0200
Subject: [PATCH] src/notes/notes.c: bail out if pitch creation failed (see
#188)
---
src/notes/notes.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/notes/notes.c b/src/notes/notes.c
index f6b7d5673cff..343e5a00bc2f 100644
--- a/src/notes/notes.c
+++ b/src/notes/notes.c
@@ -83,6 +83,7 @@ aubio_notes_t * new_aubio_notes (const char_t * method,
o->onset_output = new_fvec (1);
o->pitch = new_aubio_pitch (pitch_method, o->pitch_buf_size, o->hop_size, o->samplerate);
+ if (o->pitch == NULL) goto fail;
if (o->pitch_tolerance != 0.) aubio_pitch_set_tolerance (o->pitch, o->pitch_tolerance);
aubio_pitch_set_unit (o->pitch, "midi");
o->pitch_output = new_fvec (1);
--
2.18.0

View File

@ -1,36 +0,0 @@
From af4f9e6a93b629fb6defa2a229ec828885b9d187 Mon Sep 17 00:00:00 2001
From: Paul Brossier <piem@piem.org>
Date: Mon, 6 Aug 2018 13:41:52 +0200
Subject: [PATCH] src/pitch/pitchyinfft.c: fix out of bound read when
samplerate > 50kHz (closes: #189)
---
src/pitch/pitchyinfft.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/pitch/pitchyinfft.c b/src/pitch/pitchyinfft.c
index f213ef2406cf..493ca08d40e0 100644
--- a/src/pitch/pitchyinfft.c
+++ b/src/pitch/pitchyinfft.c
@@ -44,7 +44,7 @@ static const smpl_t freqs[] = {
0., 20., 25., 31.5, 40., 50., 63., 80., 100., 125.,
160., 200., 250., 315., 400., 500., 630., 800., 1000., 1250.,
1600., 2000., 2500., 3150., 4000., 5000., 6300., 8000., 9000., 10000.,
- 12500., 15000., 20000., 25100
+ 12500., 15000., 20000., 25100., -1.
};
static const smpl_t weight[] = {
@@ -72,7 +72,8 @@ new_aubio_pitchyinfft (uint_t samplerate, uint_t bufsize)
p->weight = new_fvec (bufsize / 2 + 1);
for (i = 0; i < p->weight->length; i++) {
freq = (smpl_t) i / (smpl_t) bufsize *(smpl_t) samplerate;
- while (freq > freqs[j]) {
+ while (freq > freqs[j] && freqs[j] > 0) {
+ AUBIO_DBG("freq %3.5f > %3.5f \tsamplerate %d (Hz) \t(weight length %d, bufsize %d) %d %d\n", freq, freqs[j], samplerate, p->weight->length, bufsize, i, j);
j += 1;
}
a0 = weight[j - 1];
--
2.18.0

View File

@ -1,28 +0,0 @@
From 99c7aa2e3efec988a5f81018b48d9388ff24bba1 Mon Sep 17 00:00:00 2001
From: Paul Brossier <piem@piem.org>
Date: Mon, 6 Aug 2018 14:04:48 +0200
Subject: [PATCH] src/io/source_wavread.c: also exit if samplerate is negative
(closes #188)
---
src/io/source_wavread.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/io/source_wavread.c b/src/io/source_wavread.c
index b91eb5cd0f07..90638af88eae 100644
--- a/src/io/source_wavread.c
+++ b/src/io/source_wavread.c
@@ -195,8 +195,8 @@ aubio_source_wavread_t * new_aubio_source_wavread(const char_t * path, uint_t sa
goto beach;
}
- if ( sr == 0 ) {
- AUBIO_ERR("source_wavread: Failed opening %s (samplerate can not be 0)\n", s->path);
+ if ( (sint_t)sr <= 0 ) {
+ AUBIO_ERR("source_wavread: Failed opening %s (samplerate can not be <= 0)\n", s->path);
goto beach;
}
--
2.18.0

View File

@ -1,27 +0,0 @@
From 802e8abf5ce7152952bcf8c767b7a5433177c421 Mon Sep 17 00:00:00 2001
From: Paul Brossier <piem@piem.org>
Date: Mon, 6 Aug 2018 16:09:48 +0200
Subject: [PATCH] src/pitch/pitchyinfft.c: comment out debug output
---
src/pitch/pitchyinfft.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/pitch/pitchyinfft.c b/src/pitch/pitchyinfft.c
index 493ca08d40e0..b613f60e45be 100644
--- a/src/pitch/pitchyinfft.c
+++ b/src/pitch/pitchyinfft.c
@@ -73,7 +73,9 @@ new_aubio_pitchyinfft (uint_t samplerate, uint_t bufsize)
for (i = 0; i < p->weight->length; i++) {
freq = (smpl_t) i / (smpl_t) bufsize *(smpl_t) samplerate;
while (freq > freqs[j] && freqs[j] > 0) {
- AUBIO_DBG("freq %3.5f > %3.5f \tsamplerate %d (Hz) \t(weight length %d, bufsize %d) %d %d\n", freq, freqs[j], samplerate, p->weight->length, bufsize, i, j);
+ //AUBIO_DBG("freq %3.5f > %3.5f \tsamplerate %d (Hz) \t"
+ // "(weight length %d, bufsize %d) %d %d\n", freq, freqs[j],
+ // samplerate, p->weight->length, bufsize, i, j);
j += 1;
}
a0 = weight[j - 1];
--
2.18.0

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bdc73be1f007218d3ea6d2a503b38a217815a0e2ccc4ed441f6e850ed5d47cfb
size 363016

View File

@ -1,18 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQKTBAABCgB9FiEEuIpQctSRWuz4GiQ0akmxlyir3ZIFAlnT1ClfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEI4
OEE1MDcyRDQ5MTVBRUNGODFBMjQzNDZBNDlCMTk3MjhBQkREOTIACgkQakmxlyir
3ZID+w/6A7TFqfAthc8Q1A/Wf4BWR9uxNKczwQOASphmh3yKVppDMGDYamgt9WZp
qXmz/AqZqZIF9r+/+WJF6mBEWr1D3D1QS5Z2s+/YEk0KVy3q3n+8IrjWGpCDD9XV
TqfQXOI4rxu5hQDa0ewc3tah3T4r47gHoilOyDJEemaeazdDzvF4B7WGgBwkcQ2d
BdeBtWXPzmG4AR+hNjcDLrru+SCisgUyxO3msdm27z631t1nP506c66jSFW+UHog
mFE8g+fw5UTggTwGpDj9j5ajyZzDSE2OVKc1UDACtudw4Tj000bHHIkTuGslYnsY
ghYjBrhQ+mAf3qdat+JwaTJpppiJ26O8WohpCfy/ezqq4DKy4lXRLVR9jkFjpMPF
K4CKISUm3vERkQjqSWmyLnsMhWYjBnTP4rV/LZlgbjB3uScPfkV3uZT7YPo8Xobr
l+ad8Af4eB56T3T0jFzW4AXKcZbOwcCRa30yFGretSBlkuqp6jzUSMaC+g0RH7va
H/Whb0p0YDy/T2p4GRajr9sSfq6gMpSaM16AHc9AVJ6nj0FZQTe8eI5jjd1tcNhw
4iWq3aVTPzUpI5SRl2Zt5syEmKWARPZKE2sZyX0qL5R8WL0B0Og1V/s97ElDdlNz
w9jhySBPiYgvdGI29o2aW30heO8iJrKenCR5TVfWISkb519MGak=
=lnPa
-----END PGP SIGNATURE-----

3
aubio-0.4.9.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d48282ae4dab83b3dc94c16cf011bcb63835c1c02b515490e1883049c3d1f3da
size 397604

18
aubio-0.4.9.tar.bz2.asc Normal file
View File

@ -0,0 +1,18 @@
-----BEGIN PGP SIGNATURE-----
iQKTBAABCgB9FiEEuIpQctSRWuz4GiQ0akmxlyir3ZIFAlxcVlBfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEI4
OEE1MDcyRDQ5MTVBRUNGODFBMjQzNDZBNDlCMTk3MjhBQkREOTIACgkQakmxlyir
3ZIKvQ/9HYZ6XgZ+JkRfy40otid7qU4RZ4AXOQiLZYoyCKYtNjzhLHGYNm7RjzJ5
J1QxzAWLI6yfw2kB4pKxhtGeF+QAeeZEGC7l1TC3KlOmp/HzNyWTY+yd9RkqXF7M
3F0SJiil9O/t/PsETcy3Hy/3ASK+nCa4laQsPrHNAJDiU5SDo/28hV/H0w5r5QLC
X4YXG9qg1LQ3IEzve3xfEkWLHaHky4zhorkDuNUjK0EqnyO7QaPPJpWhbj40rJnY
zHgr8I/SAjQGSdcaXvFWIW16BdyxsHuzx/palYDOjWqSR+ZKpukqr+e6Rp2GStQV
Vx1Oi3WUjw8kwl9dkfYD1odhZMIrZprFkTbfsvSQNUAWjAXge6gT2OMQ+0FpZVNu
l0gQmE29bgEoauwOjpKOcPY4UtTxYqARgATyvYINVXYan4kAaFwnfLoxrp7rCI6V
T7ZBUGl04MR+uiP/bt7xRsWQ6/F00NztzwAleRuT+5KoMqz6UBl7iUNlJUbz8N8x
JiuvuGEo1HA2BE8OzI6Z1kFNDe17JZizKTVwLa2rwGkYqCWu96r4/S+opBCJ0/xH
qRl79VjgeEFi00Nl3umKl4tHALhtKSZ5/CcBLViHF4duGHx7X40UcpiQ6NyVcX4b
d1UpyTL5lBa9OhzBNjgCla00eRnRfpjM8iuGCMqErvjVhS2/6a8=
=UAt5
-----END PGP SIGNATURE-----

View File

@ -1,26 +0,0 @@
From a81b12a3b4174953b3bc7ef4c37103f4d5636740 Mon Sep 17 00:00:00 2001
From: Paul Brossier <piem@piem.org>
Date: Mon, 6 Aug 2018 14:58:27 +0200
Subject: [PATCH] src/io/source_avcodec.c: give up if resampling context failed
opening (see #137, closes #187)
---
src/io/source_avcodec.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/io/source_avcodec.c b/src/io/source_avcodec.c
index 8197445c0165..6d8efa79f685 100644
--- a/src/io/source_avcodec.c
+++ b/src/io/source_avcodec.c
@@ -275,6 +275,8 @@ aubio_source_avcodec_t * new_aubio_source_avcodec(const char_t * path, uint_t sa
// default to mono output
aubio_source_avcodec_reset_resampler(s, 0);
+ if (s->avr == NULL) goto beach;
+
s->eof = 0;
s->multi = 0;
--
2.18.0

View File

@ -1,44 +0,0 @@
From 25ecb7338cebc5b8c79092347839c78349ec33f1 Mon Sep 17 00:00:00 2001
From: Paul Brossier <piem@piem.org>
Date: Tue, 6 Feb 2018 22:32:59 +0100
Subject: [PATCH] src/io/source_wavread.c: add some input validation (closes:
#158)
---
src/io/source_wavread.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/src/io/source_wavread.c b/src/io/source_wavread.c
index 640201bbbb19..b91eb5cd0f07 100644
--- a/src/io/source_wavread.c
+++ b/src/io/source_wavread.c
@@ -189,6 +189,26 @@ aubio_source_wavread_t * new_aubio_source_wavread(const char_t * path, uint_t sa
// BitsPerSample
bytes_read += fread(buf, 1, 2, s->fid);
bitspersample = read_little_endian(buf, 2);
+
+ if ( channels == 0 ) {
+ AUBIO_ERR("source_wavread: Failed opening %s (number of channels can not be 0)\n", s->path);
+ goto beach;
+ }
+
+ if ( sr == 0 ) {
+ AUBIO_ERR("source_wavread: Failed opening %s (samplerate can not be 0)\n", s->path);
+ goto beach;
+ }
+
+ if ( byterate == 0 ) {
+ AUBIO_ERR("source_wavread: Failed opening %s (byterate can not be 0)\n", s->path);
+ goto beach;
+ }
+
+ if ( bitspersample == 0 ) {
+ AUBIO_ERR("source_wavread: Failed opening %s (bitspersample can not be 0)\n", s->path);
+ goto beach;
+ }
#if 0
if ( bitspersample != 16 ) {
AUBIO_ERR("source_wavread: can not process %dbit file %s\n",
--
2.18.0

View File

@ -1,3 +1,37 @@
-------------------------------------------------------------------
Tue Feb 12 15:55:52 UTC 2019 - bjorn.lie@gmail.com
- Update to version 0.4.9:
* No upstream changes provided, please see
https://git.aubio.org/?p=aubio.git;a=shortlog
- Changes from version 0.4.8:
* src/notes: new option release_drop.
* src/spectral: new parameters added to filterbank and mfcc.
* python/lib: start documenting module, improve build for
win-amd64.
* src fixes: prevent crash when using fft sizes unsupported by
vDSP, prevent saturation when down-mixing a multi-channel
source (avcodec/ffmpeg).
- Changes from version 0.4.7:
* src/io/, src/notes/, src/pitch: prevent crashes on corrupted
files.
* src/spectral/dct.h: add dct type II object with optimised
versions.
* examples/: fix jack midi output, improve messages when jack
disabled.
* python/: add dct support, minor bug fixes tests and demos.
* wscript: improve support for BLAS/ATLAS.
- Drop upstream fixed patches:
* aubio-wavread-input-validation.patch
* aubio-resampler-NULL-deref-fix.patch
* 0001-src-notes-notes.c-bail-out-if-pitch-creation-failed-.patch
* 0001-src-pitch-pitchyinfft.c-fix-out-of-bound-read-when-s.patch
* 0002-src-io-source_wavread.c-also-exit-if-samplerate-is-n.patch
* 0002-src-pitch-pitchyinfft.c-comment-out-debug-output.patch
- Run spec-cleaner, modernize spec.
- Replace ffmpeg3-devel with pkgconfig(libavdevice) BuildRequires:
Allow to build with ffmpeg v4 and newer.
-------------------------------------------------------------------
Tue Aug 7 15:00:16 CEST 2018 - tiwai@suse.de

View File

@ -1,7 +1,7 @@
#
# spec file for package aubio
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -12,49 +12,38 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: aubio
%define libpkgname libaubio5
%define debug_package_requires %{libpkgname} = %{version}-%{release}
Name: aubio
Version: 0.4.9
Release: 0
Summary: Library for real-time audio labelling
License: GPL-3.0-or-later
Group: Development/Libraries/C and C++
URL: http://aubio.org
Source: http://aubio.org/pub/%{name}-%{version}.tar.bz2
Source1: http://aubio.org/pub/%{name}-%{version}.tar.bz2.asc
Source99: baselibs.conf
BuildRequires: alsa-devel
BuildRequires: doxygen
%if 0%{?suse_version} > 1320 || (0%{?suse_version} == 1315 && 0%{?is_opensuse})
BuildRequires: ffmpeg3-devel
BuildRequires: txt2man
BuildRequires: pkgconfig(libavcodec)
BuildRequires: pkgconfig(libavformat)
BuildRequires: pkgconfig(libavresample)
BuildRequires: pkgconfig(libavutil)
%endif
BuildRequires: fftw3-devel
BuildRequires: libjack-devel
BuildRequires: libsamplerate-devel
BuildRequires: libsndfile-devel
BuildRequires: pkg-config
BuildRequires: python-devel
Version: 0.4.6
Release: 0
Source: http://aubio.org/pub/%{name}-%{version}.tar.bz2
Source1: http://aubio.org/pub/%{name}-%{version}.tar.bz2.asc
Source99: baselibs.conf
# PATCH-FIX-UPSTREAM CVE-2017-17054 bsc#1070399
Patch1: aubio-wavread-input-validation.patch
# PATCH-FIX-UPSTREAM CVE-2017-17554 bsc#1072317
Patch2: aubio-resampler-NULL-deref-fix.patch
# PATCH-FIX-UPSTREAM CVE-2018-14523 bsc#1102364
Patch3: 0001-src-pitch-pitchyinfft.c-fix-out-of-bound-read-when-s.patch
Patch4: 0002-src-pitch-pitchyinfft.c-comment-out-debug-output.patch
# PATCH-FIX-UPSTREAM CVE-2018-14522 bsc#1102359
Patch5: 0001-src-notes-notes.c-bail-out-if-pitch-creation-failed-.patch
Patch6: 0002-src-io-source_wavread.c-also-exit-if-samplerate-is-n.patch
Url: http://aubio.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define debug_package_requires %{libpkgname} = %{version}-%{release}
%if 0%{?suse_version} > 1320 || (0%{?suse_version} == 1315 && 0%{?is_opensuse})
BuildRequires: txt2man
BuildRequires: pkgconfig(libavcodec)
BuildRequires: pkgconfig(libavdevice)
BuildRequires: pkgconfig(libavformat)
BuildRequires: pkgconfig(libavresample)
BuildRequires: pkgconfig(libavutil)
%endif
%description
Aubio is a library for real time audio labelling. Its features include
@ -93,13 +82,7 @@ This package includes the example programs for aubio library.
%prep
%setup -q
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
sed -e "s,/lib,/%_lib," src/wscript_build > src/wscript_build.new
sed -e "s,/lib,/%{_lib}," src/wscript_build > src/wscript_build.new
diff -u src/wscript_build src/wscript_build.new || :
mv src/wscript_build.new src/wscript_build
@ -110,20 +93,17 @@ mv src/wscript_build.new src/wscript_build
%install
./waf install --destdir=%{buildroot}
mkdir -p %{buildroot}%{_docdir}/%{name}
cp -pR %{buildroot}%{_datadir}/doc/libaubio-doc/html %{buildroot}%{_docdir}/%{name}
cp -pR %{buildroot}%{_datadir}/doc/libaubio-doc/api %{buildroot}%{_docdir}/%{name}
rm -rf %{buildroot}%{_datadir}/doc/libaubio-doc
rm -f %{buildroot}%{_libdir}/libaubio.a
%post -n %{libpkgname} -p /sbin/ldconfig
%postun -n %{libpkgname} -p /sbin/ldconfig
%files -n %{libpkgname}
%defattr(-, root, root)
%{_libdir}/lib*.so.*
%files -n libaubio-devel
%defattr(-, root, root)
%doc AUTHORS ChangeLog README.md
%license COPYING
%{_libdir}/lib*.so
@ -131,7 +111,6 @@ rm -f %{buildroot}%{_libdir}/libaubio.a
%{_includedir}/aubio
%files tools
%defattr(-, root, root)
%doc %{_docdir}/%{name}
%if 0%{?suse_version} > 1320 || (0%{?suse_version} == 1315 && 0%{?is_opensuse})
%{_mandir}/man1/*

View File

@ -1,3 +1,28 @@
-------------------------------------------------------------------
Tue Feb 12 15:55:52 UTC 2019 - bjorn.lie@gmail.com
- Update to version 0.4.9:
* No upstream changes provided, please see
https://git.aubio.org/?p=aubio.git;a=shortlog
- Changes from version 0.4.8:
* src/notes: new option release_drop.
* src/spectral: new parameters added to filterbank and mfcc.
* python/lib: start documenting module, improve build for
win-amd64.
* src fixes: prevent crash when using fft sizes unsupported by
vDSP, prevent saturation when down-mixing a multi-channel
source (avcodec/ffmpeg).
- Changes from version 0.4.7:
* src/io/, src/notes/, src/pitch: prevent crashes on corrupted
files.
* src/spectral/dct.h: add dct type II object with optimised
versions.
* examples/: fix jack midi output, improve messages when jack
disabled.
* python/: add dct support, minor bug fixes tests and demos.
* wscript: improve support for BLAS/ATLAS.
- Run spec-cleaner, modernize spec.
-------------------------------------------------------------------
Mon Jan 1 17:38:57 UTC 2018 - coolo@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package python-aubio
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -12,18 +12,18 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-aubio
Version: 0.4.6
Version: 0.4.9
Release: 0
Summary: A collection of tools for music analysis
License: GPL-3.0-or-later
Group: Development/Languages/Python
Url: http://aubio.org/
URL: http://aubio.org/
Source: http://aubio.org/pub/aubio-%{version}.tar.bz2
Source1: http://aubio.org/pub/aubio-%{version}.tar.bz2.asc
BuildRequires: %{python_module devel}
@ -34,8 +34,6 @@ BuildRequires: python-rpm-macros
Requires: python-numpy
Requires(post): update-alternatives
Requires(postun): update-alternatives
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%python_subpackages
%description
@ -69,8 +67,8 @@ export PYTHONPATH=%{buildroot}/%{python_sitearch}
%python_uninstall_alternative aubio
%files %{python_files}
%defattr(-,root,root,-)
%doc README.md ChangeLog COPYING AUTHORS
%license COPYING
%doc README.md ChangeLog AUTHORS
%python_alternative %{_bindir}/aubio
%python_alternative %{_bindir}/aubiocut
%{python_sitearch}/*