Commit 3d6400da authored by prspkt's avatar prspkt Committed by Natanael Copa

main/libcdio: upgrade to 2.1.0

* Clarify license, remove unused patch
parent d8ef92f8
# Contributor: Carlo Landmeter
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libcdio
pkgver=2.0.0
pkgver=2.1.0
pkgrel=0
pkgdesc="GNU Compact Disc Input and Control Library"
url="https://www.gnu.org/software/libcdio/"
arch="all"
license="GPL-3.0"
license="GPL-3.0-or-later"
checkdepends="bash"
makedepends="libcddb-dev ncurses-dev linux-headers"
subpackages="$pkgname-dev $pkgname-doc $pkgname-tools ${pkgname}++:_cpp"
source="https://ftp.gnu.org/gnu/libcdio/${pkgname}-${pkgver}.tar.gz
source="https://ftp.gnu.org/gnu/libcdio/$pkgname-$pkgver.tar.bz2
disable-broken-test.patch"
build() {
......@@ -51,5 +51,5 @@ _cpp() {
mv "$pkgdir"/usr/lib/*++.* "$subpkgdir"/usr/lib/
}
sha512sums="8f48cc71d28b427b16f48e50bcaf0aea171055c72a9aeee383ac4374eee1d3d288323814c3a3f308a9ba097aa815319429c1931072897985a3b02b814766fd4f libcdio-2.0.0.tar.gz
sha512sums="c290821da55fd9ae366670a58857aa6efcebc9f25b7caea063cf12f9cbda84fe770c5f59f972227fda50517ca58c5f39c0137daa0f93179e3daa45303d8b610f libcdio-2.1.0.tar.bz2
be0149128bb2fa131f514bcff848279d826340a99a05b958e104f4640bda1a89d6146b0ec348783f4bbd8a3c313c41297152f75ee04f492f08b337bd79dd9c3e disable-broken-test.patch"
From f6f9c48fb40b8a1e8218799724b0b61a7161eb1d Mon Sep 17 00:00:00 2001
From: "R. Bernstein" <rocky@gnu.org>
Date: Fri, 22 Dec 2017 16:06:57 -0500
Subject: Fix double free courtesy of Chris Clayton
---
lib/driver/_cdio_generic.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/lib/driver/_cdio_generic.c b/lib/driver/_cdio_generic.c
index d40ac0d..ae820d2 100644
--- a/lib/driver/_cdio_generic.c
+++ b/lib/driver/_cdio_generic.c
@@ -296,7 +296,6 @@ get_cdtext_generic (void *p_user_data)
if(len <= 0 || 0 != cdtext_data_init (p_env->cdtext, &p_cdtext_data[4], len)) {
p_env->b_cdtext_error = true;
- cdtext_destroy (p_env->cdtext);
free(p_env->cdtext);
p_env->cdtext = NULL;
}
--
cgit v1.0-41-gc330
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment