aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpsykose <alice@ayaya.dev>2022-08-24 12:59:08 +0000
committeralice <alice@ayaya.dev>2022-08-24 13:08:09 +0000
commitaaed9995acc1511d54d5d93e1ea3776caf4aa488 (patch)
treed5abd4b2c1f27f4f1e9a0b86611f13b1389d9fda
parent8acda0c96fb9a526677df9f2f563ac1090b981ad (diff)
downloadaports-aaed9995acc1511d54d5d93e1ea3776caf4aa488.tar.gz
aports-aaed9995acc1511d54d5d93e1ea3776caf4aa488.tar.bz2
aports-aaed9995acc1511d54d5d93e1ea3776caf4aa488.tar.xz
main/libtasn1: upgrade to 4.19.0
-rw-r--r--main/libtasn1/APKBUILD22
-rw-r--r--main/libtasn1/failed-test.patch13
2 files changed, 23 insertions, 12 deletions
diff --git a/main/libtasn1/APKBUILD b/main/libtasn1/APKBUILD
index 114f53107e..06339e277a 100644
--- a/main/libtasn1/APKBUILD
+++ b/main/libtasn1/APKBUILD
@@ -1,16 +1,19 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libtasn1
-pkgver=4.18.0
+pkgver=4.19.0
pkgrel=0
pkgdesc="The ASN.1 library used in GNUTLS"
url="https://www.gnu.org/software/gnutls/"
arch="all"
license="LGPL-2.1-or-later"
+depends_dev="$pkgname-progs=$pkgver-r$pkgrel"
makedepends="texinfo"
checkdepends="diffutils"
subpackages="$pkgname-dev $pkgname-doc $pkgname-progs"
-source="https://ftp.gnu.org/gnu/libtasn1/libtasn1-$pkgver.tar.gz"
+source="https://ftp.gnu.org/gnu/libtasn1/libtasn1-$pkgver.tar.gz
+ failed-test.patch
+ "
# secfixes:
# 4.14-r0:
@@ -21,7 +24,7 @@ source="https://ftp.gnu.org/gnu/libtasn1/libtasn1-$pkgver.tar.gz"
# - CVE-2017-10790
build() {
- CFLAGS="$CFLAGS -Wno-error=inline" ./configure \
+ ./configure \
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
@@ -29,7 +32,7 @@ build() {
--mandir=/usr/share/man \
--localstatedir=/var \
--disable-static
- make -j1
+ make
}
check() {
@@ -40,19 +43,14 @@ package() {
make DESTDIR="$pkgdir" install
}
-dev() {
- depends_dev="$pkgname-progs=$pkgver-r$pkgrel"
- default_dev
-}
-
progs() {
license="GPL-3.0-only"
pkgdesc="$pkgdesc (utilities)"
- mkdir -p "$subpkgdir"/usr
- mv "$pkgdir"/usr/bin "$subpkgdir"/usr/bin
+ amove usr/bin
}
sha512sums="
-4f2f4afc7561fda7a1f1c6c525c3c3b08228a1a4aa8c3d3d5e02e993d8f83ccee1dd0f1b201cec0fbfc97043d4b1d7a95ffd34d65422a38b85b931ac7a015831 libtasn1-4.18.0.tar.gz
+287f5eddfb5e21762d9f14d11997e56b953b980b2b03a97ed4cd6d37909bda1ed7d2cdff9da5d270a21d863ab7e54be6b85c05f1075ac5d8f0198997cf335ef4 libtasn1-4.19.0.tar.gz
+460f6a4e83450ca248f16d1c20cb994a601824c595219d71b079bcdc56da30b10ae5171bed9769968991a39e679d69599bd3c8dad527b76c85466593b84848e4 failed-test.patch
"
diff --git a/main/libtasn1/failed-test.patch b/main/libtasn1/failed-test.patch
new file mode 100644
index 0000000000..2d10191799
--- /dev/null
+++ b/main/libtasn1/failed-test.patch
@@ -0,0 +1,13 @@
+diff --git a/tests/version.c b/tests/version.c
+index 15c4919..7fa47ff 100644
+--- a/tests/version.c
++++ b/tests/version.c
+@@ -112,7 +112,7 @@ main (int argc, char *argv[])
+ exit_code = EXIT_FAILURE;
+ }
+
+- if (asn1_check_version ("UNKNOWN"))
++ if (!asn1_check_version ("UNKNOWN"))
+ {
+ printf ("FAIL: asn1_check_version (UNKNOWN)\n");
+ exit_code = EXIT_FAILURE;