* [gentoo-commits] repo/gentoo:master commit in: media-sound/wavpack/files/, media-sound/wavpack/
@ 2021-04-29 6:45 Miroslav Šulc
0 siblings, 0 replies; 2+ messages in thread
From: Miroslav Šulc @ 2021-04-29 6:45 UTC (permalink / raw
To: gentoo-commits
commit: d089c8ab350c044944bb61dcafea23699f66a1f8
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 29 05:02:54 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Apr 29 06:45:23 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d089c8ab
media-sound/wavpack: removed obsolete 5.3.2-r1
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-sound/wavpack/Manifest | 1 -
.../files/wavpack-5.3.2-fix-overflows.patch | 52 ----------------------
media-sound/wavpack/wavpack-5.3.2-r1.ebuild | 49 --------------------
3 files changed, 102 deletions(-)
diff --git a/media-sound/wavpack/Manifest b/media-sound/wavpack/Manifest
index 1d072a23457..8b255329468 100644
--- a/media-sound/wavpack/Manifest
+++ b/media-sound/wavpack/Manifest
@@ -1,2 +1 @@
-DIST wavpack-5.3.2.tar.gz 2047344 BLAKE2B 621414f580ef0c6f71ec411cafba5e9d3f971c9ed3fa901d92083b803fb337ad5455c8f488cc985d2203fde56572adcd2899e5a5d6e07365248ef6bfd59b591b SHA512 cff46e000c2edf0124e2f4c9577611d029f124c235bf7811a58dbd5d87a02827d25f7bd0e28d2f05fd413ee9997ba48390acfc2a91ebb53885eb2a0423994a7b
DIST wavpack-5.4.0.tar.xz 769764 BLAKE2B d35eefccf3402388d88d370daae41dc0e4f21808474e668f92a9dcee978ae71b96ae167de098a0924fcbaaa75f9b07270280e7c3b16cc8699ffaa7d2eddd0de5 SHA512 de4e75539c9b949d22f39ab73721c8a4ee7c38ff08835aa28b1d56bea08c332bcb601a54998efe520f3653a2e29c73dcfd716ad19707bb2815403786d9ed9c11
diff --git a/media-sound/wavpack/files/wavpack-5.3.2-fix-overflows.patch b/media-sound/wavpack/files/wavpack-5.3.2-fix-overflows.patch
deleted file mode 100644
index fbbd40ba8bd..00000000000
--- a/media-sound/wavpack/files/wavpack-5.3.2-fix-overflows.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 89df160596132e3bd666322e1c20b2ebd4b92cd0 Mon Sep 17 00:00:00 2001
-From: David Bryant <david@wavpack.com>
-Date: Tue, 29 Dec 2020 20:47:19 -0800
-Subject: [PATCH] issue #91: fix integer overflows resulting in buffer overruns
- and sanitize a few more encoding parameters for clarity
-
----
- src/pack_utils.c | 15 ++++++++++-----
- 1 file changed, 10 insertions(+), 5 deletions(-)
-
-diff --git a/src/pack_utils.c b/src/pack_utils.c
-index 17d9381..480ab90 100644
---- a/src/pack_utils.c
-+++ b/src/pack_utils.c
-@@ -200,8 +200,13 @@ int WavpackSetConfiguration64 (WavpackContext *wpc, WavpackConfig *config, int64
- return FALSE;
- }
-
-- if (!num_chans) {
-- strcpy (wpc->error_message, "channel count cannot be zero!");
-+ if (num_chans <= 0 || num_chans > NEW_MAX_STREAMS * 2) {
-+ strcpy (wpc->error_message, "invalid channel count!");
-+ return FALSE;
-+ }
-+
-+ if (config->block_samples && (config->block_samples < 16 || config->block_samples > 131072)) {
-+ strcpy (wpc->error_message, "invalid custom block samples!");
- return FALSE;
- }
-
-@@ -523,7 +528,7 @@ int WavpackPackInit (WavpackContext *wpc)
- if (wpc->config.num_channels == 1)
- wpc->block_samples *= 2;
-
-- while (wpc->block_samples > 12000 && wpc->block_samples * wpc->config.num_channels > 300000)
-+ while (wpc->block_samples > 12000 && (int64_t) wpc->block_samples * wpc->config.num_channels > 300000)
- wpc->block_samples /= 2;
- }
- else {
-@@ -534,10 +539,10 @@ int WavpackPackInit (WavpackContext *wpc)
-
- wpc->block_samples = wpc->config.sample_rate / divisor;
-
-- while (wpc->block_samples > 12000 && wpc->block_samples * wpc->config.num_channels > 75000)
-+ while (wpc->block_samples > 12000 && (int64_t) wpc->block_samples * wpc->config.num_channels > 75000)
- wpc->block_samples /= 2;
-
-- while (wpc->block_samples * wpc->config.num_channels < 20000)
-+ while ((int64_t) wpc->block_samples * wpc->config.num_channels < 20000)
- wpc->block_samples *= 2;
- }
-
diff --git a/media-sound/wavpack/wavpack-5.3.2-r1.ebuild b/media-sound/wavpack/wavpack-5.3.2-r1.ebuild
deleted file mode 100644
index c34faa9eee4..00000000000
--- a/media-sound/wavpack/wavpack-5.3.2-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-# Need to fetch a commit because upstream didn't tag the minor release
-COMMIT="e4e8d191e8dd74cbdbeaef3232c16a7ef517e68d"
-
-DESCRIPTION="Hybrid lossless audio compression tools"
-HOMEPAGE="https://www.wavpack.com/"
-SRC_URI="https://github.com/dbry/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=virtual/libiconv-0-r1"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/WavPack-${COMMIT}"
-
-PATCHES=(
- "${FILESDIR}/${P}-fix-overflows.patch"
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-multilib_src_configure() {
- ECONF_SOURCE=${S} econf \
- --disable-static \
- $(use_enable test tests) \
- $(multilib_native_enable apps)
-}
-
-multilib_src_test() {
- cli/wvtest --default
-}
-
-multilib_src_install_all() {
- einstalldocs
- find "${D}" -name '*.la' -delete || die
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-sound/wavpack/files/, media-sound/wavpack/
@ 2021-01-02 11:53 Miroslav Šulc
0 siblings, 0 replies; 2+ messages in thread
From: Miroslav Šulc @ 2021-01-02 11:53 UTC (permalink / raw
To: gentoo-commits
commit: 22ab7121945950659d4325be712f786164699a6c
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 2 11:53:18 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Jan 2 11:53:24 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22ab7121
media-sound/wavpack: fixed out of bound write
Bug: https://bugs.gentoo.org/762154
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../files/wavpack-5.3.2-fix-overflows.patch | 52 ++++++++++++++++++++++
...avpack-5.3.2.ebuild => wavpack-5.3.2-r1.ebuild} | 6 ++-
2 files changed, 57 insertions(+), 1 deletion(-)
diff --git a/media-sound/wavpack/files/wavpack-5.3.2-fix-overflows.patch b/media-sound/wavpack/files/wavpack-5.3.2-fix-overflows.patch
new file mode 100644
index 00000000000..fbbd40ba8bd
--- /dev/null
+++ b/media-sound/wavpack/files/wavpack-5.3.2-fix-overflows.patch
@@ -0,0 +1,52 @@
+From 89df160596132e3bd666322e1c20b2ebd4b92cd0 Mon Sep 17 00:00:00 2001
+From: David Bryant <david@wavpack.com>
+Date: Tue, 29 Dec 2020 20:47:19 -0800
+Subject: [PATCH] issue #91: fix integer overflows resulting in buffer overruns
+ and sanitize a few more encoding parameters for clarity
+
+---
+ src/pack_utils.c | 15 ++++++++++-----
+ 1 file changed, 10 insertions(+), 5 deletions(-)
+
+diff --git a/src/pack_utils.c b/src/pack_utils.c
+index 17d9381..480ab90 100644
+--- a/src/pack_utils.c
++++ b/src/pack_utils.c
+@@ -200,8 +200,13 @@ int WavpackSetConfiguration64 (WavpackContext *wpc, WavpackConfig *config, int64
+ return FALSE;
+ }
+
+- if (!num_chans) {
+- strcpy (wpc->error_message, "channel count cannot be zero!");
++ if (num_chans <= 0 || num_chans > NEW_MAX_STREAMS * 2) {
++ strcpy (wpc->error_message, "invalid channel count!");
++ return FALSE;
++ }
++
++ if (config->block_samples && (config->block_samples < 16 || config->block_samples > 131072)) {
++ strcpy (wpc->error_message, "invalid custom block samples!");
+ return FALSE;
+ }
+
+@@ -523,7 +528,7 @@ int WavpackPackInit (WavpackContext *wpc)
+ if (wpc->config.num_channels == 1)
+ wpc->block_samples *= 2;
+
+- while (wpc->block_samples > 12000 && wpc->block_samples * wpc->config.num_channels > 300000)
++ while (wpc->block_samples > 12000 && (int64_t) wpc->block_samples * wpc->config.num_channels > 300000)
+ wpc->block_samples /= 2;
+ }
+ else {
+@@ -534,10 +539,10 @@ int WavpackPackInit (WavpackContext *wpc)
+
+ wpc->block_samples = wpc->config.sample_rate / divisor;
+
+- while (wpc->block_samples > 12000 && wpc->block_samples * wpc->config.num_channels > 75000)
++ while (wpc->block_samples > 12000 && (int64_t) wpc->block_samples * wpc->config.num_channels > 75000)
+ wpc->block_samples /= 2;
+
+- while (wpc->block_samples * wpc->config.num_channels < 20000)
++ while ((int64_t) wpc->block_samples * wpc->config.num_channels < 20000)
+ wpc->block_samples *= 2;
+ }
+
diff --git a/media-sound/wavpack/wavpack-5.3.2.ebuild b/media-sound/wavpack/wavpack-5.3.2-r1.ebuild
similarity index 91%
rename from media-sound/wavpack/wavpack-5.3.2.ebuild
rename to media-sound/wavpack/wavpack-5.3.2-r1.ebuild
index 33880cc9703..c34faa9eee4 100644
--- a/media-sound/wavpack/wavpack-5.3.2.ebuild
+++ b/media-sound/wavpack/wavpack-5.3.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -23,6 +23,10 @@ DEPEND="${RDEPEND}"
S="${WORKDIR}/WavPack-${COMMIT}"
+PATCHES=(
+ "${FILESDIR}/${P}-fix-overflows.patch"
+)
+
src_prepare() {
default
eautoreconf
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-04-29 6:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-29 6:45 [gentoo-commits] repo/gentoo:master commit in: media-sound/wavpack/files/, media-sound/wavpack/ Miroslav Šulc
-- strict thread matches above, loose matches on Subject: below --
2021-01-02 11:53 Miroslav Šulc
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox