From d8b16151ff9b72d3944112dd1cd65436887f8231 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98rjan=20Malde?= Date: Thu, 23 Dec 2021 08:38:44 +0100 Subject: groups/251.native_packages_lib.group: libtasn1: bump to v4.18.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ørjan Malde --- groups/251.native_packages_lib.group | 4 ++-- patches/libtasn1-4.17.0_pre.local.patch | 32 -------------------------------- patches/libtasn1-4.18.0_pre.local.patch | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 34 deletions(-) delete mode 100644 patches/libtasn1-4.17.0_pre.local.patch create mode 100644 patches/libtasn1-4.18.0_pre.local.patch diff --git a/groups/251.native_packages_lib.group b/groups/251.native_packages_lib.group index c170ec79..abc5d2e7 100644 --- a/groups/251.native_packages_lib.group +++ b/groups/251.native_packages_lib.group @@ -240,8 +240,8 @@ ksba_cv_visibility_attribute=yes"}; : ${PKG_LIBSTROPHE_SHA256SUM:=cf1a363ae6df88ccd97292d4e859b7680d8bac79347b53a9dc8f095456b7a02d}; : ${PKG_LIBSTROPHE_VERSION=0.10.1}; : ${PKG_LIBSTROPHE_URL:=https://github.com/strophe/libstrophe/releases/download/${PKG_LIBSTROPHE_VERSION}/libstrophe-${PKG_LIBSTROPHE_VERSION}.tar.xz}; -: ${PKG_LIBTASN1_SHA256SUM:=ece7551cea7922b8e10d7ebc70bc2248d1fdd73351646a2d6a8d68a9421c45a5}; -: ${PKG_LIBTASN1_VERSION:=4.17.0}; +: ${PKG_LIBTASN1_SHA256SUM:=4365c154953563d64c67a024b607d1ee75c6db76e0d0f65709ea80a334cd1898}; +: ${PKG_LIBTASN1_VERSION:=4.18.0}; : ${PKG_LIBTASN1_URL:=https://ftp.gnu.org/gnu/libtasn1/libtasn1-${PKG_LIBTASN1_VERSION}.tar.gz}; : ${PKG_LIBTASN1_CONFIGURE_ARGS_EXTRA:="--disable-static"}; : ${PKG_LIBTASN1_CFLAGS_CONFIGURE_EXTRA:=-std=c99}; diff --git a/patches/libtasn1-4.17.0_pre.local.patch b/patches/libtasn1-4.17.0_pre.local.patch deleted file mode 100644 index 9f7f4eda..00000000 --- a/patches/libtasn1-4.17.0_pre.local.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -ru libtasn1-4.17.0.orig/configure libtasn1-4.17.0/configure ---- libtasn1-4.17.0.orig/configure 2021-05-13 19:09:31.000000000 +0200 -+++ libtasn1-4.17.0/configure 2021-12-07 16:59:10.538374562 +0100 -@@ -12844,6 +12844,16 @@ - dynamic_linker='GNU/Linux ld.so' - ;; - -+midipix*) -+ version_type=linux # correct to gnu/linux during the next big refactor -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' -+ soname_spec='$libname$release$shared_ext$major' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ ;; -+ - netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no -diff -ru libtasn1-4.17.0.orig/Makefile.in libtasn1-4.17.0/Makefile.in ---- libtasn1-4.17.0.orig/Makefile.in 2021-05-13 19:09:33.000000000 +0200 -+++ libtasn1-4.17.0/Makefile.in 2021-12-07 17:00:22.742376855 +0100 -@@ -564,7 +564,7 @@ - windows/test-tree/test-tree.vcproj windows/libtasn14win.mk \ - cfg.mk maint.mk CONTRIBUTING.md README.md \ - $(top_srcdir)/.version --SUBDIRS = lib src fuzz tests $(am__append_1) -+SUBDIRS = lib src fuzz $(am__append_1) - @CODE_COVERAGE_ENABLED_TRUE@GITIGNOREFILES := $(GITIGNOREFILES) $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_DIRECTORY) - @CODE_COVERAGE_ENABLED_TRUE@code_coverage_v_lcov_cap = $(code_coverage_v_lcov_cap_$(V)) - @CODE_COVERAGE_ENABLED_TRUE@code_coverage_v_lcov_cap_ = $(code_coverage_v_lcov_cap_$(AM_DEFAULT_VERBOSITY)) diff --git a/patches/libtasn1-4.18.0_pre.local.patch b/patches/libtasn1-4.18.0_pre.local.patch new file mode 100644 index 00000000..9f7f4eda --- /dev/null +++ b/patches/libtasn1-4.18.0_pre.local.patch @@ -0,0 +1,32 @@ +diff -ru libtasn1-4.17.0.orig/configure libtasn1-4.17.0/configure +--- libtasn1-4.17.0.orig/configure 2021-05-13 19:09:31.000000000 +0200 ++++ libtasn1-4.17.0/configure 2021-12-07 16:59:10.538374562 +0100 +@@ -12844,6 +12844,16 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + ++midipix*) ++ version_type=linux # correct to gnu/linux during the next big refactor ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ ;; ++ + netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no +diff -ru libtasn1-4.17.0.orig/Makefile.in libtasn1-4.17.0/Makefile.in +--- libtasn1-4.17.0.orig/Makefile.in 2021-05-13 19:09:33.000000000 +0200 ++++ libtasn1-4.17.0/Makefile.in 2021-12-07 17:00:22.742376855 +0100 +@@ -564,7 +564,7 @@ + windows/test-tree/test-tree.vcproj windows/libtasn14win.mk \ + cfg.mk maint.mk CONTRIBUTING.md README.md \ + $(top_srcdir)/.version +-SUBDIRS = lib src fuzz tests $(am__append_1) ++SUBDIRS = lib src fuzz $(am__append_1) + @CODE_COVERAGE_ENABLED_TRUE@GITIGNOREFILES := $(GITIGNOREFILES) $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_DIRECTORY) + @CODE_COVERAGE_ENABLED_TRUE@code_coverage_v_lcov_cap = $(code_coverage_v_lcov_cap_$(V)) + @CODE_COVERAGE_ENABLED_TRUE@code_coverage_v_lcov_cap_ = $(code_coverage_v_lcov_cap_$(AM_DEFAULT_VERBOSITY)) -- cgit v1.2.3