From a23e5ecc5f53fa01cc21d03bf076bd2ee2d833c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=98rjan=20Malde?= <red@foxi.me>
Date: Fri, 8 Apr 2022 16:59:53 +0200
Subject: groups/251.native_packages_lib.group: libarchive: bump to v3.6.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Ørjan Malde <red@foxi.me>
---
 groups/251.native_packages_lib.group     |  6 +++---
 patches/libarchive-3.6.0_pre.local.patch | 20 --------------------
 patches/libarchive-3.6.1_pre.local.patch | 20 ++++++++++++++++++++
 3 files changed, 23 insertions(+), 23 deletions(-)
 delete mode 100644 patches/libarchive-3.6.0_pre.local.patch
 create mode 100644 patches/libarchive-3.6.1_pre.local.patch

diff --git a/groups/251.native_packages_lib.group b/groups/251.native_packages_lib.group
index 976b39b..8c5b582 100644
--- a/groups/251.native_packages_lib.group
+++ b/groups/251.native_packages_lib.group
@@ -32,9 +32,9 @@ sdl1_image sdl1_ttf sdl2 sdl2_image sdl2_ttf wolfssl")";
 : ${PKG_LAME_CONFIGURE_ARGS_EXTRA:="--enable-nasm"};
 : ${PKG_LAME_LDFLAGS_CONFIGURE_EXTRA:="-Wl,--as-needed -ltinfo -Wl,--no-as-needed"};
 : ${PKG_LIBARCHIVE_DEPENDS:="libxml2 xz libiconv bzip2"};
-: ${PKG_LIBARCHIVE_SHA256SUM:=df283917799cb88659a5b33c0a598f04352d61936abcd8a48fe7b64e74950de7};
-: ${PKG_LIBARCHIVE_VERSION:=3.6.0};
-: ${PKG_LIBARCHIVE_URL:=http://www.libarchive.org/downloads/libarchive-${PKG_LIBARCHIVE_VERSION}.tar.xz};
+: ${PKG_LIBARCHIVE_SHA256SUM:=5a411aceb978f43e626f0c2d1812ddd8807b645ed892453acabd532376c148e6};
+: ${PKG_LIBARCHIVE_VERSION:=3.6.1};
+: ${PKG_LIBARCHIVE_URL:=https://www.libarchive.de/downloads/libarchive-${PKG_LIBARCHIVE_VERSION}.tar.xz};
 : ${PKG_LIBARCHIVE_CONFIGURE_ARGS_EXTRA:="--without-zstd"};
 : ${PKG_LIBARCHIVE_LDFLAGS_CONFIGURE_EXTRA:=-L${PREFIX_NATIVE}/lib};
 : ${PKG_LIBARCHIVE_LIBTOOL:=rlibtool};
diff --git a/patches/libarchive-3.6.0_pre.local.patch b/patches/libarchive-3.6.0_pre.local.patch
deleted file mode 100644
index 00141a2..0000000
--- a/patches/libarchive-3.6.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.6.1_pre.local.patch b/patches/libarchive-3.6.1_pre.local.patch
new file mode 100644
index 0000000..00141a2
--- /dev/null
+++ b/patches/libarchive-3.6.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