2
1
Эх сурвалжийг харах

package/libtasn1: bump to version 4.19.0

Drop patch (already in version) and so autoreconf

https://gitlab.com/gnutls/libtasn1/-/blob/v4.19.0/NEWS

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Fabrice Fontaine 2 жил өмнө
parent
commit
308678e528

+ 0 - 35
package/libtasn1/0001-fuzz-Makefile.am-do-not-force-static.patch

@@ -1,35 +0,0 @@
-From cf1b20f3d881a1cfbf8cae1f615f45a5a4fbb3b4 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Wed, 22 Apr 2020 18:35:55 +0200
-Subject: [PATCH] fuzz/Makefile.am: do not force static
-
-Don't force static when linking corpus2arry to libtasn1 otherwise the
-build will fail if libtasn1 has been built only as a shared library:
-
-  CCLD     corpus2array
-/home/fabrice/buildroot/output/host/lib/gcc/arm-buildroot-linux-musleabihf/8.4.0/../../../../arm-buildroot-linux-musleabihf/bin/ld: attempted static link of dynamic object `../lib/.libs/libtasn1.so'
-collect2: error: ld returned 1 exit status
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Upstream status:
-https://gitlab.com/gnutls/libtasn1/-/merge_requests/61]
----
- fuzz/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/fuzz/Makefile.am b/fuzz/Makefile.am
-index c6310d1..1fb7152 100644
---- a/fuzz/Makefile.am
-+++ b/fuzz/Makefile.am
-@@ -26,7 +26,7 @@ AM_CFLAGS = $(WERROR_CFLAGS) $(WARN_CFLAGS) $(CODE_COVERAGE_CFLAGS)
- AM_CPPFLAGS = -I$(top_builddir)/lib/includes -I$(top_srcdir)/lib/includes -I$(srcdir) \
-  -I$(top_builddir)/lib/gl -I$(top_srcdir)/lib/gl -DSRCDIR=\"$(abs_srcdir)\" \
-  $(CODE_COVERAGE_CPPFLAGS)
--AM_LDFLAGS = -no-install -static
-+AM_LDFLAGS = -no-install
- 
- LDADD = ../lib/gl/libgnu.la ../lib/libtasn1.la $(FUZZ_LIBS) $(CODE_COVERAGE_LIBS)
- 
--- 
-2.25.1
-

+ 2 - 2
package/libtasn1/libtasn1.hash

@@ -1,6 +1,6 @@
 # Locally calculated after checking pgp signature
-# https://ftp.gnu.org/gnu/libtasn1/libtasn1-4.18.0.tar.gz.sig
-sha256  4365c154953563d64c67a024b607d1ee75c6db76e0d0f65709ea80a334cd1898  libtasn1-4.18.0.tar.gz
+# https://ftp.gnu.org/gnu/libtasn1/libtasn1-4.19.0.tar.gz.sig
+sha256  1613f0ac1cf484d6ec0ce3b8c06d56263cc7242f1c23b30d82d23de345a63f7a  libtasn1-4.19.0.tar.gz
 # Locally calculated
 sha256  7446831f659f7ebfd8d497acc7f05dfa8e31c6cb6ba1b45df33d4895ab80f5a6  COPYING
 sha256  8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  doc/COPYING

+ 1 - 4
package/libtasn1/libtasn1.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBTASN1_VERSION = 4.18.0
+LIBTASN1_VERSION = 4.19.0
 LIBTASN1_SITE = $(BR2_GNU_MIRROR)/libtasn1
 LIBTASN1_DEPENDENCIES = host-bison host-pkgconf
 LIBTASN1_LICENSE = GPL-3.0+ (tests, tools), LGPL-2.1+ (library)
@@ -12,9 +12,6 @@ LIBTASN1_LICENSE_FILES = COPYING doc/COPYING doc/COPYING.LESSER
 LIBTASN1_CPE_ID_VENDOR = gnu
 LIBTASN1_INSTALL_STAGING = YES
 
-# We're patching fuzz/Makefile.am
-LIBTASN1_AUTORECONF = YES
-
 # 'missing' fallback logic botched so disable it completely
 LIBTASN1_CONF_ENV = MAKEINFO="true"