diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2019-01-08 11:48:30 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-01-08 11:49:26 +0000 |
| commit | 82ada1b9263113ba7750d9a16ce9bc69053a4eb7 (patch) | |
| tree | 61bd487b193a5c22ef7c85ebd8aff3c99b9a5467 | |
| parent | 206b2181f5ba08c121aa9559e00c99bcdb2e1ac5 (diff) | |
| download | aports-82ada1b9263113ba7750d9a16ce9bc69053a4eb7.tar.bz2 aports-82ada1b9263113ba7750d9a16ce9bc69053a4eb7.tar.xz | |
testing/alsa-plugins: import patch to avoid checksum errors
| -rw-r--r-- | testing/alsa-plugins/APKBUILD | 6 | ||||
| -rw-r--r-- | testing/alsa-plugins/alsa-plugins-1.1.7-double_free_fix.patch | 31 |
2 files changed, 34 insertions, 3 deletions
diff --git a/testing/alsa-plugins/APKBUILD b/testing/alsa-plugins/APKBUILD index 3942ab342d..17e734cc88 100644 --- a/testing/alsa-plugins/APKBUILD +++ b/testing/alsa-plugins/APKBUILD @@ -9,7 +9,7 @@ license="GPL-2.0-or-later LGPL-2.1-or-later" makedepends="linux-headers alsa-lib-dev speex-dev ffmpeg-dev libsamplerate-dev pulseaudio-dev jack-dev" subpackages="$pkgname-pulse $pkgname-doc $pkgname-lavrate $pkgname-a52 $pkgname-jack" source="ftp://ftp.alsa-project.org/pub/plugins/$pkgname-$pkgver.tar.bz2 - $pkgname-$pkgver-double_free_fix.patch::http://git.alsa-project.org/?p=alsa-plugins.git;a=commitdiff_plain;h=a4e7e1282c57a2f4e83afe9a4008042d8b4c5bb9" + $pkgname-$pkgver-double_free_fix.patch" prepare() { default_prepare @@ -38,7 +38,7 @@ doc() { mkdir -p "$subpkgdir"/usr/share/doc/$pkgname cat > "$subpkgdir"/usr/share/doc/$pkgname/README.alpine <<EOF ==> please note that alsa-plugins-lavcrate has been renamed to lavrate. - ==> So you need to run: apk add alsa-plugins-lavrate + ==> So you need to run: apk add alsa-plugins-lavrate EOF } @@ -74,4 +74,4 @@ package() { } sha512sums="c3bb22ec3c5a167fb246cfc94131d53800e321b486ab743c3395a9d91dee0ff9703f6e4a2feaea5a4ee42a7e486d835d48ab880c784c5c34bb4eb5e9ded06d8e alsa-plugins-1.1.7.tar.bz2 -f1e595667b16108f1b8b979a73dce65a07a3e2a44ed1d24bcdaff130d8a3796045a0b3ff62be45237b95c5912c3a9cacdba7d9dc6f01c9e5f7426ed8464ab11d alsa-plugins-1.1.7-double_free_fix.patch" +a57d1fe16ac51bd3010ba9ee705bd4d32e339f5f35ff7388910ecf0b8024d491d38a573a730f0a5a640cb688d7fadac05ca1e0162a08beb397e7fc0883c15a25 alsa-plugins-1.1.7-double_free_fix.patch" diff --git a/testing/alsa-plugins/alsa-plugins-1.1.7-double_free_fix.patch b/testing/alsa-plugins/alsa-plugins-1.1.7-double_free_fix.patch new file mode 100644 index 0000000000..f62ede8be2 --- /dev/null +++ b/testing/alsa-plugins/alsa-plugins-1.1.7-double_free_fix.patch @@ -0,0 +1,31 @@ +From: Jaroslav Kysela <perex@perex.cz> +Date: Tue, 23 Oct 2018 07:32:46 +0000 (+0200) +Subject: a52_close: set slave to NULL to avoid double pcm free in open fcn +X-Git-Tag: v1.1.8~19 +X-Git-Url: http://git.alsa-project.org/?p=alsa-plugins.git;a=commitdiff_plain;h=a4e7e1282c57a2f4e83afe9a4008042d8b4c5bb9 + +a52_close: set slave to NULL to avoid double pcm free in open fcn + +Signed-off-by: Jaroslav Kysela <perex@perex.cz> +--- + +diff --git a/a52/pcm_a52.c b/a52/pcm_a52.c +index e431fd0..b005bc2 100644 +--- a/a52/pcm_a52.c ++++ b/a52/pcm_a52.c +@@ -654,10 +654,13 @@ static int a52_poll_revents(snd_pcm_ioplug_t *io, struct pollfd *pfd, + static int a52_close(snd_pcm_ioplug_t *io) + { + struct a52_ctx *rec = io->private_data; ++ snd_pcm_t *slave = rec->slave; + + a52_free(rec); +- if (rec->slave) +- return snd_pcm_close(rec->slave); ++ if (slave) { ++ rec->slave = NULL; ++ return snd_pcm_close(slave); ++ } + return 0; + } + |