From 1dd7102de7a08244800a9974fe168e8f991d2bea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=98rjan=20Malde?= <red@foxi.me>
Date: Sun, 3 Jan 2021 15:42:26 +0100
Subject: groups/251.native_packages_lib.group: libarchive: bump to v3.5.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de>
---
 groups/251.native_packages_lib.group     |  8 ++++----
 patches/libarchive-3.5.0_pre.local.patch | 20 --------------------
 patches/libarchive-3.5.1_pre.local.patch | 20 ++++++++++++++++++++
 3 files changed, 24 insertions(+), 24 deletions(-)
 delete mode 100644 patches/libarchive-3.5.0_pre.local.patch
 create mode 100644 patches/libarchive-3.5.1_pre.local.patch

diff --git a/groups/251.native_packages_lib.group b/groups/251.native_packages_lib.group
index 5e150c0b..6f422bbe 100644
--- a/groups/251.native_packages_lib.group
+++ b/groups/251.native_packages_lib.group
@@ -22,11 +22,11 @@ libxslt libz libzip lzo sdl1 sdl1_net sdl1_image sdl2 sdl2_image sdl2_ttf wolfss
 : ${PKG_LAME_URL:=https://ftp.osuosl.org/pub/blfs/conglomeration/lame/lame-${PKG_LAME_VERSION}.tar.gz};
 : ${PKG_LAME_CONFIGURE_ARGS_EXTRA:="--enable-nasm"};
 : ${PKG_LAME_LDFLAGS_CONFIGURE_EXTRA:="-Wl,--as-needed -ltinfo -Wl,--no-as-needed"};
-: ${PKG_LIBARCHIVE_SHA256SUM:=fc4bc301188376adc18780d35602454cc8df6396e1b040fbcbb0d4c0469faf54};
-: ${PKG_LIBARCHIVE_VERSION:=3.5.0};
-: ${PKG_LIBARCHIVE_URL:=http://www.libarchive.org/downloads/libarchive-${PKG_LIBARCHIVE_VERSION}.tar.gz};
+: ${PKG_LIBARCHIVE_SHA256SUM:=0e17d3a8d0b206018693b27f08029b598f6ef03600c2b5d10c94ce58692e299b};
+: ${PKG_LIBARCHIVE_VERSION:=3.5.1};
+: ${PKG_LIBARCHIVE_URL:=http://www.libarchive.org/downloads/libarchive-${PKG_LIBARCHIVE_VERSION}.tar.xz};
 : ${PKG_LIBARCHIVE_LDFLAGS_CONFIGURE_EXTRA:=-L${PREFIX_NATIVE}/lib};
-: ${PKG_LIBARCHIVE_LIBTOOL:=rdlibtool};
+: ${PKG_LIBARCHIVE_LIBTOOL:=rlibtool};
 : ${PKG_LIBASSUAN_DEPENDS:="libgpg_error"};
 : ${PKG_LIBASSUAN_SHA256SUM:=c080ee96b3bd519edd696cfcebdecf19a3952189178db9887be713ccbcb5fbf0};
 : ${PKG_LIBASSUAN_VERSION:=2.5.4};
diff --git a/patches/libarchive-3.5.0_pre.local.patch b/patches/libarchive-3.5.0_pre.local.patch
deleted file mode 100644
index 00141a21..00000000
--- a/patches/libarchive-3.5.0_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.5.1_pre.local.patch b/patches/libarchive-3.5.1_pre.local.patch
new file mode 100644
index 00000000..00141a21
--- /dev/null
+++ b/patches/libarchive-3.5.1_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
-- 
cgit v1.2.3