From 37a6632069e635b590be5db8c9b7302050510536 Mon Sep 17 00:00:00 2001 From: Ørjan Malde Date: May 24 2020 09:36:31 +0000 Subject: groups/{native,host}: update libarchive to v3.4.3 Signed-off-by: Lucio Andrés Illanes Albornoz --- diff --git a/groups/020.host_deps_rpm.group b/groups/020.host_deps_rpm.group index 23ffd54..0881d94 100644 --- a/groups/020.host_deps_rpm.group +++ b/groups/020.host_deps_rpm.group @@ -12,8 +12,8 @@ HOST_DEPS_RPM_PACKAGES=" libarchive_host popt_host rpm_host"; HOST_DEPS_RPM_PKG_CONFIG="${PREFIX}/bin/pkgconf"; HOST_DEPS_RPM_PREFIX="${PREFIX}"; -: ${PKG_LIBARCHIVE_HOST_SHA256SUM:=b60d58d12632ecf1e8fad7316dc82c6b9738a35625746b47ecdcaf4aed176176}; -: ${PKG_LIBARCHIVE_HOST_VERSION:=3.4.2}; +: ${PKG_LIBARCHIVE_HOST_SHA256SUM:=ee1e749213c108cb60d53147f18c31a73d6717d7e3d2481c157e1b34c881ea39}; +: ${PKG_LIBARCHIVE_HOST_VERSION:=3.4.3}; : ${PKG_LIBARCHIVE_HOST_URL:=http://www.libarchive.org/downloads/libarchive-${PKG_LIBARCHIVE_HOST_VERSION}.tar.gz}; : ${PKG_LIBARCHIVE_HOST_CFLAGS_CONFIGURE:="-I${PREFIX}/include"}; : ${PKG_LIBARCHIVE_HOST_LDFLAGS_CONFIGURE:="-L${PREFIX}/lib"}; diff --git a/groups/251.native_packages_lib.group b/groups/251.native_packages_lib.group index f9ee52c..4ba5271 100644 --- a/groups/251.native_packages_lib.group +++ b/groups/251.native_packages_lib.group @@ -14,8 +14,8 @@ libxslt libz libzip")"; : ${PKG_GLIB_VERSION:=2.54.0}; : ${PKG_GLIB_URL:=http://ftp.gnome.org/pub/GNOME/sources/glib/${PKG_GLIB_VERSION%.[0-9]}/glib-${PKG_GLIB_VERSION}.tar.xz}; : ${PKG_GLIB_CONFIGURE_ARGS_EXTRA:="--disable-dtrace --disable-libelf --disable-libmount --with-python=${PREFIX}/bin/python3"}; -: ${PKG_LIBARCHIVE_SHA256SUM:=b60d58d12632ecf1e8fad7316dc82c6b9738a35625746b47ecdcaf4aed176176}; -: ${PKG_LIBARCHIVE_VERSION:=3.4.2}; +: ${PKG_LIBARCHIVE_SHA256SUM:=ee1e749213c108cb60d53147f18c31a73d6717d7e3d2481c157e1b34c881ea39}; +: ${PKG_LIBARCHIVE_VERSION:=3.4.3}; : ${PKG_LIBARCHIVE_URL:=http://www.libarchive.org/downloads/libarchive-${PKG_LIBARCHIVE_VERSION}.tar.gz}; : ${PKG_LIBARCHIVE_LDFLAGS_CONFIGURE_EXTRA:=-L${PREFIX_NATIVE}/lib}; : ${PKG_LIBARCHIVE_LIBTOOL:=rdlibtool}; diff --git a/patches/libarchive-3.4.2_pre.local.patch b/patches/libarchive-3.4.2_pre.local.patch deleted file mode 100644 index 00141a2..0000000 --- a/patches/libarchive-3.4.2_pre.local.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -ru libarchive-3.4.2.orig/configure libarchive-3.4.2/configure ---- libarchive-3.4.2.orig/configure 2020-02-11 23:58:01.000000000 +0100 -+++ libarchive-3.4.2/configure 2020-04-11 15:58:45.493648584 +0200 -@@ -12062,6 +12062,16 @@ - dynamic_linker='NetBSD ld.elf_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 -+ ;; -+ - netbsd*) - version_type=sunos - need_lib_prefix=no diff --git a/patches/libarchive-3.4.3_pre.local.patch b/patches/libarchive-3.4.3_pre.local.patch new file mode 100644 index 0000000..00141a2 --- /dev/null +++ b/patches/libarchive-3.4.3_pre.local.patch @@ -0,0 +1,20 @@ +diff -ru libarchive-3.4.2.orig/configure libarchive-3.4.2/configure +--- libarchive-3.4.2.orig/configure 2020-02-11 23:58:01.000000000 +0100 ++++ libarchive-3.4.2/configure 2020-04-11 15:58:45.493648584 +0200 +@@ -12062,6 +12062,16 @@ + dynamic_linker='NetBSD ld.elf_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 ++ ;; ++ + netbsd*) + version_type=sunos + need_lib_prefix=no