From 79c72dadd1b84e6faa38783ed8ae2edcc0c04b1a53ffcd9fb337fea7c72d1d73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian.schroeter@suse.com>
Date: Mon, 24 Jul 2023 11:39:13 +0000
Subject: [PATCH] Accepting request 1100254 from
 home:bmwiedemann:branches:Archiving

update to 3.7.0
  * bsdunzip port from FreeBSD
  * fix 2 year 2038 issues

OBS-URL: https://build.opensuse.org/request/show/1100254
OBS-URL: https://build.opensuse.org/package/show/Archiving/libarchive?expand=0&rev=116
---
 lib-suffix.patch            | 25 ++++++++++++++++---------
 libarchive-3.6.2.tar.xz     |  3 ---
 libarchive-3.6.2.tar.xz.asc | 14 --------------
 libarchive-3.7.0.tar.xz     |  3 +++
 libarchive-3.7.0.tar.xz.asc | 14 ++++++++++++++
 libarchive.changes          |  7 +++++++
 libarchive.spec             |  3 ++-
 7 files changed, 42 insertions(+), 27 deletions(-)
 delete mode 100644 libarchive-3.6.2.tar.xz
 delete mode 100644 libarchive-3.6.2.tar.xz.asc
 create mode 100644 libarchive-3.7.0.tar.xz
 create mode 100644 libarchive-3.7.0.tar.xz.asc

diff --git a/lib-suffix.patch b/lib-suffix.patch
index a3eecc5..aed7e43 100644
--- a/lib-suffix.patch
+++ b/lib-suffix.patch
@@ -1,10 +1,17 @@
-Index: libarchive-3.4.3/libarchive/CMakeLists.txt
+Index: libarchive-3.7.0/libarchive/CMakeLists.txt
 ===================================================================
---- libarchive-3.4.3.orig/libarchive/CMakeLists.txt
-+++ libarchive-3.4.3/libarchive/CMakeLists.txt
-@@ -255,8 +255,8 @@ IF(ENABLE_INSTALL)
-   # How to install the libraries
-   INSTALL(TARGETS archive archive_static
+--- libarchive-3.7.0.orig/libarchive/CMakeLists.txt
++++ libarchive-3.7.0/libarchive/CMakeLists.txt
+@@ -265,13 +265,13 @@ IF(ENABLE_INSTALL)
+   IF(BUILD_SHARED_LIBS)
+     INSTALL(TARGETS archive
+             RUNTIME DESTINATION bin
+-            LIBRARY DESTINATION lib
+-            ARCHIVE DESTINATION lib)
++            LIBRARY DESTINATION lib${LIB_SUFFIX}
++            ARCHIVE DESTINATION lib${LIB_SUFFIX})
+   ENDIF(BUILD_SHARED_LIBS)
+   INSTALL(TARGETS archive_static
            RUNTIME DESTINATION bin
 -          LIBRARY DESTINATION lib
 -          ARCHIVE DESTINATION lib)
@@ -13,10 +20,10 @@ Index: libarchive-3.4.3/libarchive/CMakeLists.txt
    INSTALL_MAN(${libarchive_MANS})
    INSTALL(FILES ${include_HEADERS} DESTINATION include)
  ENDIF()
-Index: libarchive-3.4.3/build/cmake/CreatePkgConfigFile.cmake
+Index: libarchive-3.7.0/build/cmake/CreatePkgConfigFile.cmake
 ===================================================================
---- libarchive-3.4.3.orig/build/cmake/CreatePkgConfigFile.cmake
-+++ libarchive-3.4.3/build/cmake/CreatePkgConfigFile.cmake
+--- libarchive-3.7.0.orig/build/cmake/CreatePkgConfigFile.cmake
++++ libarchive-3.7.0/build/cmake/CreatePkgConfigFile.cmake
 @@ -29,5 +29,5 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DI
  # And install it, of course ;).
  IF(ENABLE_INSTALL)
diff --git a/libarchive-3.6.2.tar.xz b/libarchive-3.6.2.tar.xz
deleted file mode 100644
index 608063a..0000000
--- a/libarchive-3.6.2.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9e2c1b80d5fbe59b61308fdfab6c79b5021d7ff4ff2489fb12daf0a96a83551d
-size 5213196
diff --git a/libarchive-3.6.2.tar.xz.asc b/libarchive-3.6.2.tar.xz.asc
deleted file mode 100644
index b0b9865..0000000
--- a/libarchive-3.6.2.tar.xz.asc
+++ /dev/null
@@ -1,14 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQGzBAABCgAdFiEE2yx88bTCZfrvVuP8WEihi48UGEsFAmOTTgMACgkQWEihi48U
-GEsIrgv6ApeOuR8LQt9p2PUBHxcQbyXXtjJSP6VpKCE5PfwonjpVt3+vlFKenFko
-BjXvDARtlAX2SU17UYIGlpHfGF7dofke3JykRPKwjQfT8bxu/+QdwaJjjyEyHCGI
-3sdPkrK7TGDc9/R5imsBAq30hDX3Cwpmdv8IBT5G/sjdXmXPGog1E7GjUFHO0ADE
-GqpOhvyxUzjPln1RRpT0KVTgHBN/GJosM/Wwt615s8MqmRgxgi/EwZAc1p2QuIwS
-KjCHIQ6GdONNMPWxxJY0kI8ifXmhGiBseIyECIFah7eUhqmQfWnwgL7p3bb0A2r8
-UMX8IvW79n5Er6U3r0SbS+kIhirq8YH8jUvCgkH5cYjU9vTcCYYnhY3/nz+lFW06
-2CZzKwwTUARPjhPJnqPLmf6IQPLJ25g92zauQE1tQ7s1OWnSMdjE4F+nBeNRlAEr
-wXwOuINhaH/d0ujxb7fgEtzmj9iETGnNfa6MAVw8+u6fIbjBZO/8atp1askbAPPl
-SYPNnQ/2
-=9Ggs
------END PGP SIGNATURE-----
diff --git a/libarchive-3.7.0.tar.xz b/libarchive-3.7.0.tar.xz
new file mode 100644
index 0000000..7023df0
--- /dev/null
+++ b/libarchive-3.7.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:44729a0cc3b0b0be6742a9873d25e85e240c9318f5f5ebf2cca6bc84d7b91b07
+size 5243356
diff --git a/libarchive-3.7.0.tar.xz.asc b/libarchive-3.7.0.tar.xz.asc
new file mode 100644
index 0000000..a040078
--- /dev/null
+++ b/libarchive-3.7.0.tar.xz.asc
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQGzBAABCgAdFiEE2yx88bTCZfrvVuP8WEihi48UGEsFAmS2Pm8ACgkQWEihi48U
+GEtM+Av/a42UPkVL5hw6TpXr6h5mct7aoltKoP/XrJp74SdXRnTZuDtz4RCPqbkg
+vduB9L0udtwYHT6LVeZg2wv81cI3Vq+zcq5W3GJhE99aVa9ZL44JmKvdlBsWjPHc
+38Q+juvQ1W+hShpUQb0Y1WvYHMaYM8U7GW33Cq9YgzpgCjl9hsAAQgowWouhR0iY
+MEdgU7E1rcNSrSDr9oVWdJ3DfOmqZQHHKM3P+W9XSdl/OWGc4u2HFfSq8YZE5I94
+9wlVWnWoUN4oGxKDeCxeqEdOfTNqcwfOB4v+nroVrOHfHG5TA3+JvCBXElRMTkAY
+9lTHkBoDlcOoxdT1yKqf6b09SRNV1YdFaIb4H5sGPX4mjzQ01tQOYwqPn+PgZEJT
+CdLF52IvLtf3E550KZqQvA4JyC/4GcYrHEnFidRsrOTgEPMTXcDzxztNljtTLQVy
+WCcGDdlqFFBhhedtichRLPB7nRDoPPFS3R2gPEhkjOILWD3z0sloAF+dDOush5Kc
+icEahCNV
+=W7Hb
+-----END PGP SIGNATURE-----
diff --git a/libarchive.changes b/libarchive.changes
index 736b6ea..adc6ca1 100644
--- a/libarchive.changes
+++ b/libarchive.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jul 24 06:36:59 UTC 2023 - Bernhard Wiedemann <bwiedemann@suse.com>
+
+- update to 3.7.0
+  * bsdunzip port from FreeBSD
+  * fix 2 year 2038 issues
+
 -------------------------------------------------------------------
 Fri Dec 23 07:57:09 UTC 2022 - Dirk Müller <dmueller@suse.com>
 
diff --git a/libarchive.spec b/libarchive.spec
index 6fcf434..09e4fac 100644
--- a/libarchive.spec
+++ b/libarchive.spec
@@ -30,7 +30,7 @@
 %bcond_without	ext2fs
 %endif
 Name:           libarchive
-Version:        3.6.2
+Version:        3.7.0
 Release:        0
 Summary:        Utility and C library to create and read several different streaming archive formats
 License:        BSD-2-Clause
@@ -188,6 +188,7 @@ sed -i -e '/Libs.private/d' %{buildroot}%{_libdir}/pkgconfig/libarchive.pc
 %{_bindir}/bsdcat
 %{_bindir}/bsdcpio
 %{_bindir}/bsdtar
+%{_bindir}/bsdunzip
 %{_mandir}/man1/*
 %{_mandir}/man5/*