libtasn1: bump version.

This commit is contained in:
Jerome Duval
2019-11-24 19:16:59 +01:00
parent be8d7443c7
commit 82a0ffcd57
2 changed files with 31 additions and 7 deletions

View File

@@ -8,14 +8,14 @@ COPYRIGHT="2002-2019 Free Software Foundation, Inc."
LICENSE="GNU LGPL v2.1
GNU GPL v3"
REVISION="1"
SOURCE_URI="https://ftpmirror.gnu.org/libtasn1/libtasn1-$portVersion.tar.gz"
CHECKSUM_SHA256="9e604ba5c5c8ea403487695c2e407405820d98540d9de884d6e844f9a9c5ba08"
SOURCE_URI="https://ftp.gnu.org/gnu/libtasn1/libtasn1-$portVersion.tar.gz"
CHECKSUM_SHA256="dd77509fe8f5304deafbca654dc7f0ea57f5841f41ba530cff9a5bf71382739e"
PATCHES="libtasn1-$portVersion.patchset"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
libVersion="6.5.6"
libVersion="6.5.7"
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
portVersionCompat="$portVersion compat >= 4"
@@ -25,6 +25,7 @@ PROVIDES="
cmd:asn1Coding$secondaryArchSuffix
cmd:asn1Decoding$secondaryArchSuffix
cmd:asn1Parser$secondaryArchSuffix
cmd:corpus2array$secondaryArchSuffix
"
REQUIRES="
haiku$secondaryArchSuffix

View File

@@ -1,14 +1,14 @@
From 159e8275261b1793668d2cc3ae5307146701f8e8 Mon Sep 17 00:00:00 2001
From 86ae11a6cbc6b4f9b6d087fc4ecec755524c2521 Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@localhost>
Date: Wed, 17 Jan 2018 22:03:45 +0000
Subject: Do not use __GNUC_PATCHLEVEL__ if it's not defined.
diff --git a/lib/includes/libtasn1.h b/lib/includes/libtasn1.h
index ce4eb90..6eb5238 100644
index d6f02fa..fbddf53 100644
--- a/lib/includes/libtasn1.h
+++ b/lib/includes/libtasn1.h
@@ -96,7 +96,11 @@ extern "C"
@@ -104,7 +104,11 @@ extern "C"
#if defined __GNUC__ && !defined ASN1_INTERNAL_BUILD
@@ -24,12 +24,35 @@ index ce4eb90..6eb5238 100644
2.23.0
From df3dd932f281d9cbbff5efc64ee418650a86f2c8 Mon Sep 17 00:00:00 2001
From 8b3f55d9053e7bee89f8242a0e17bf76277ab48a Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 10 Sep 2019 21:17:44 +0200
Subject: gcc2 build fix
diff --git a/fuzz/corpus2array.c b/fuzz/corpus2array.c
index fc30524..572ab67 100644
--- a/fuzz/corpus2array.c
+++ b/fuzz/corpus2array.c
@@ -119,14 +119,15 @@ int main(void)
printf(", ASN1_ETYPE_TIME");
add = 1;
}
-
- for (int i = 8; i < 32 ; i++) {
+{
+ int i;
+ for (i = 8; i < 32 ; i++) {
if ((e.type & (1U << i)) && typename[i - 8]) {
printf(add ? "|%s" : ", %s", typename[i - 8]);
add = 1;
}
}
-
+}
if (!add)
printf(", %u", e.type);
} else
diff --git a/lib/gl/strverscmp.c b/lib/gl/strverscmp.c
index 83922ea..2b25729 100644
--- a/lib/gl/strverscmp.c