Gentoo Archives: gentoo-commits

From: "Miroslav Šulc" <fordfrog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/wavpack/files/, media-sound/wavpack/
Date: Thu, 29 Apr 2021 06:45:31
Message-Id: 1619678723.d089c8ab350c044944bb61dcafea23699f66a1f8.fordfrog@gentoo
1 commit: d089c8ab350c044944bb61dcafea23699f66a1f8
2 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3 AuthorDate: Thu Apr 29 05:02:54 2021 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 29 06:45:23 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d089c8ab
7
8 media-sound/wavpack: removed obsolete 5.3.2-r1
9
10 Package-Manager: Portage-3.0.18, Repoman-3.0.3
11 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
12
13 media-sound/wavpack/Manifest | 1 -
14 .../files/wavpack-5.3.2-fix-overflows.patch | 52 ----------------------
15 media-sound/wavpack/wavpack-5.3.2-r1.ebuild | 49 --------------------
16 3 files changed, 102 deletions(-)
17
18 diff --git a/media-sound/wavpack/Manifest b/media-sound/wavpack/Manifest
19 index 1d072a23457..8b255329468 100644
20 --- a/media-sound/wavpack/Manifest
21 +++ b/media-sound/wavpack/Manifest
22 @@ -1,2 +1 @@
23 -DIST wavpack-5.3.2.tar.gz 2047344 BLAKE2B 621414f580ef0c6f71ec411cafba5e9d3f971c9ed3fa901d92083b803fb337ad5455c8f488cc985d2203fde56572adcd2899e5a5d6e07365248ef6bfd59b591b SHA512 cff46e000c2edf0124e2f4c9577611d029f124c235bf7811a58dbd5d87a02827d25f7bd0e28d2f05fd413ee9997ba48390acfc2a91ebb53885eb2a0423994a7b
24 DIST wavpack-5.4.0.tar.xz 769764 BLAKE2B d35eefccf3402388d88d370daae41dc0e4f21808474e668f92a9dcee978ae71b96ae167de098a0924fcbaaa75f9b07270280e7c3b16cc8699ffaa7d2eddd0de5 SHA512 de4e75539c9b949d22f39ab73721c8a4ee7c38ff08835aa28b1d56bea08c332bcb601a54998efe520f3653a2e29c73dcfd716ad19707bb2815403786d9ed9c11
25
26 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
27 deleted file mode 100644
28 index fbbd40ba8bd..00000000000
29 --- a/media-sound/wavpack/files/wavpack-5.3.2-fix-overflows.patch
30 +++ /dev/null
31 @@ -1,52 +0,0 @@
32 -From 89df160596132e3bd666322e1c20b2ebd4b92cd0 Mon Sep 17 00:00:00 2001
33 -From: David Bryant <david@×××××××.com>
34 -Date: Tue, 29 Dec 2020 20:47:19 -0800
35 -Subject: [PATCH] issue #91: fix integer overflows resulting in buffer overruns
36 - and sanitize a few more encoding parameters for clarity
37 -
38 ----
39 - src/pack_utils.c | 15 ++++++++++-----
40 - 1 file changed, 10 insertions(+), 5 deletions(-)
41 -
42 -diff --git a/src/pack_utils.c b/src/pack_utils.c
43 -index 17d9381..480ab90 100644
44 ---- a/src/pack_utils.c
45 -+++ b/src/pack_utils.c
46 -@@ -200,8 +200,13 @@ int WavpackSetConfiguration64 (WavpackContext *wpc, WavpackConfig *config, int64
47 - return FALSE;
48 - }
49 -
50 -- if (!num_chans) {
51 -- strcpy (wpc->error_message, "channel count cannot be zero!");
52 -+ if (num_chans <= 0 || num_chans > NEW_MAX_STREAMS * 2) {
53 -+ strcpy (wpc->error_message, "invalid channel count!");
54 -+ return FALSE;
55 -+ }
56 -+
57 -+ if (config->block_samples && (config->block_samples < 16 || config->block_samples > 131072)) {
58 -+ strcpy (wpc->error_message, "invalid custom block samples!");
59 - return FALSE;
60 - }
61 -
62 -@@ -523,7 +528,7 @@ int WavpackPackInit (WavpackContext *wpc)
63 - if (wpc->config.num_channels == 1)
64 - wpc->block_samples *= 2;
65 -
66 -- while (wpc->block_samples > 12000 && wpc->block_samples * wpc->config.num_channels > 300000)
67 -+ while (wpc->block_samples > 12000 && (int64_t) wpc->block_samples * wpc->config.num_channels > 300000)
68 - wpc->block_samples /= 2;
69 - }
70 - else {
71 -@@ -534,10 +539,10 @@ int WavpackPackInit (WavpackContext *wpc)
72 -
73 - wpc->block_samples = wpc->config.sample_rate / divisor;
74 -
75 -- while (wpc->block_samples > 12000 && wpc->block_samples * wpc->config.num_channels > 75000)
76 -+ while (wpc->block_samples > 12000 && (int64_t) wpc->block_samples * wpc->config.num_channels > 75000)
77 - wpc->block_samples /= 2;
78 -
79 -- while (wpc->block_samples * wpc->config.num_channels < 20000)
80 -+ while ((int64_t) wpc->block_samples * wpc->config.num_channels < 20000)
81 - wpc->block_samples *= 2;
82 - }
83 -
84
85 diff --git a/media-sound/wavpack/wavpack-5.3.2-r1.ebuild b/media-sound/wavpack/wavpack-5.3.2-r1.ebuild
86 deleted file mode 100644
87 index c34faa9eee4..00000000000
88 --- a/media-sound/wavpack/wavpack-5.3.2-r1.ebuild
89 +++ /dev/null
90 @@ -1,49 +0,0 @@
91 -# Copyright 1999-2021 Gentoo Authors
92 -# Distributed under the terms of the GNU General Public License v2
93 -
94 -EAPI=7
95 -
96 -inherit autotools multilib-minimal
97 -
98 -# Need to fetch a commit because upstream didn't tag the minor release
99 -COMMIT="e4e8d191e8dd74cbdbeaef3232c16a7ef517e68d"
100 -
101 -DESCRIPTION="Hybrid lossless audio compression tools"
102 -HOMEPAGE="https://www.wavpack.com/"
103 -SRC_URI="https://github.com/dbry/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
104 -
105 -LICENSE="BSD"
106 -SLOT="0"
107 -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
108 -IUSE="test"
109 -RESTRICT="!test? ( test )"
110 -
111 -RDEPEND=">=virtual/libiconv-0-r1"
112 -DEPEND="${RDEPEND}"
113 -
114 -S="${WORKDIR}/WavPack-${COMMIT}"
115 -
116 -PATCHES=(
117 - "${FILESDIR}/${P}-fix-overflows.patch"
118 -)
119 -
120 -src_prepare() {
121 - default
122 - eautoreconf
123 -}
124 -
125 -multilib_src_configure() {
126 - ECONF_SOURCE=${S} econf \
127 - --disable-static \
128 - $(use_enable test tests) \
129 - $(multilib_native_enable apps)
130 -}
131 -
132 -multilib_src_test() {
133 - cli/wvtest --default
134 -}
135 -
136 -multilib_src_install_all() {
137 - einstalldocs
138 - find "${D}" -name '*.la' -delete || die
139 -}