From de67e30e5561f8f8ba090ead9d20f8b437f5532d8206e70ea8c4220032ac68fa Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 3 Nov 2022 09:37:27 +0000 Subject: [PATCH] - Update to release 20221102 OBS-URL: https://build.opensuse.org/package/show/security:forensics/libfsapfs?expand=0&rev=20 --- libfsapfs-experimental-20220709.tar.gz | 3 --- libfsapfs-experimental-20220709.tar.gz.asc | 11 --------- libfsapfs-experimental-20221102.tar.gz | 3 +++ libfsapfs-experimental-20221102.tar.gz.asc | 11 +++++++++ libfsapfs.changes | 7 ++++++ libfsapfs.spec | 11 +++++---- system-libs.patch | 27 ++++++++++++---------- 7 files changed, 42 insertions(+), 31 deletions(-) delete mode 100644 libfsapfs-experimental-20220709.tar.gz delete mode 100644 libfsapfs-experimental-20220709.tar.gz.asc create mode 100644 libfsapfs-experimental-20221102.tar.gz create mode 100644 libfsapfs-experimental-20221102.tar.gz.asc diff --git a/libfsapfs-experimental-20220709.tar.gz b/libfsapfs-experimental-20220709.tar.gz deleted file mode 100644 index 3fddc4d..0000000 --- a/libfsapfs-experimental-20220709.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b38e9c2bdd8f5e9f7a9821369c419ccd2f8145ae1dfbecd2adce2c7b78268511 -size 2138692 diff --git a/libfsapfs-experimental-20220709.tar.gz.asc b/libfsapfs-experimental-20220709.tar.gz.asc deleted file mode 100644 index db3bafa..0000000 --- a/libfsapfs-experimental-20220709.tar.gz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCAAdFiEEDtkCDakNP25wvTlF2WJeXXrQF34FAmLJODcACgkQ2WJeXXrQ -F34VBQf/eDRLDuF/hHraj3OiaX3Wp8VhsdiZaacC/9DMS/ewWC7C/lEQTjgQcxYi -+UiI+uAODM5yHaCOzcRyHWV4DecMTSI0utQeNQrCNu9J1WP9DNRzf+gW8j5aPBL0 -W2kAdvbdw6S7hPcABlq8eg3EdrED3c62B+IDGv2TKuRE+0pR/hIadMCZSwnXPtW1 -bAnWGH/fLRi30nbSgw7cv3ayxiqpY4iQxcQKzfESSQNlmFFlc5uR35XsYLv5U9UU -Wee+8QxUq5oTf5Q+L+VUYKse9Yz9QhoflntdA+WalzvrJvU1udR2EUjmXMJASV6T -MyvIcnSaOX/O7bJI1fl6cs9PtZ4ACw== -=F+vQ ------END PGP SIGNATURE----- diff --git a/libfsapfs-experimental-20221102.tar.gz b/libfsapfs-experimental-20221102.tar.gz new file mode 100644 index 0000000..36a23c7 --- /dev/null +++ b/libfsapfs-experimental-20221102.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:692b9ffa180de68e6d1a1fd1c091d9bba979375833a88cff8b2cf9c6ccad63b9 +size 2175695 diff --git a/libfsapfs-experimental-20221102.tar.gz.asc b/libfsapfs-experimental-20221102.tar.gz.asc new file mode 100644 index 0000000..06e3634 --- /dev/null +++ b/libfsapfs-experimental-20221102.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCAAdFiEEDtkCDakNP25wvTlF2WJeXXrQF34FAmNjdi8ACgkQ2WJeXXrQ +F35Fbgf/eTOkBhD+J+jGCBNaLG+l+j3EsI2SbxvqAgZIKyIvUOoVNBZU5ra2xC3v +2TgRi38KO4BE+GdrUY3TNuvnW+GtYAuA2tuo3Je5wUWn0iXhXZfjakup132ad8fy +p3UeqnpZcdukB2rhldJLLyqki2K5uDiMIkwLgHGUgkmB4zau0a1mAOgZVHw3+awV +h1nHvZB8LMlRvnqaMv4jPeSWFN8g3Sxw7ZadHo2CnV+TXaUKqV568HiZT/7jVdOP +WqH5CGIHuwplIdWjfnDMZstnN81AfNOGaXWaVA/0rHcY68r6dY3EB204rowhWO85 +htuPCco1s/DOpkhu6XacFtwEfz3CBA== +=LhDm +-----END PGP SIGNATURE----- diff --git a/libfsapfs.changes b/libfsapfs.changes index bdec65f..f865c24 100644 --- a/libfsapfs.changes +++ b/libfsapfs.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Nov 3 09:36:57 UTC 2022 - Jan Engelhardt + +- Update to release 20221102 + * Moved LZVN compression to libfmos + * More unspecified updates + ------------------------------------------------------------------- Mon Aug 29 09:30:38 UTC 2022 - Jan Engelhardt diff --git a/libfsapfs.spec b/libfsapfs.spec index 6a4d9e0..2c1a556 100644 --- a/libfsapfs.spec +++ b/libfsapfs.spec @@ -17,7 +17,7 @@ Name: libfsapfs -Version: 20220709 +Version: 20221102 Release: 0 Summary: Library and tools to access the Apple File System (APFS) License: LGPL-3.0-only @@ -33,7 +33,7 @@ BuildRequires: libtool BuildRequires: pkg-config BuildRequires: python-rpm-macros BuildRequires: pkgconfig(fuse) >= 2.6 -BuildRequires: pkgconfig(libbfio) >= 20220120 +BuildRequires: pkgconfig(libbfio) >= 20221025 BuildRequires: pkgconfig(libcaes) >= 20220529 BuildRequires: pkgconfig(libcdata) >= 20220115 BuildRequires: pkgconfig(libcerror) >= 20220101 @@ -44,9 +44,10 @@ BuildRequires: pkgconfig(libcpath) >= 20220108 BuildRequires: pkgconfig(libcsplit) >= 20220109 BuildRequires: pkgconfig(libcthreads) >= 20220102 BuildRequires: pkgconfig(libfcache) >= 20220110 -BuildRequires: pkgconfig(libfdata) >= 20211023 +BuildRequires: pkgconfig(libfdata) >= 20220111 BuildRequires: pkgconfig(libfdatetime) >= 20220112 BuildRequires: pkgconfig(libfguid) >= 20220113 +BuildRequires: pkgconfig(libfmos) >= 20220811 BuildRequires: pkgconfig(libhmac) >= 20220425 BuildRequires: pkgconfig(libuna) >= 20220611 BuildRequires: pkgconfig(openssl) @@ -116,8 +117,8 @@ echo "V_%version { global: *; };" >v.sym } %install -mv %_builddir/rt/* %buildroot/ -rm -fv %{buildroot}%{_libdir}/*.la +mv "%_builddir/rt"/* "%buildroot/" +rm -fv "%buildroot/%_libdir"/*.la %check make check || /bin/true diff --git a/system-libs.patch b/system-libs.patch index 39f07b3..af17a60 100644 --- a/system-libs.patch +++ b/system-libs.patch @@ -5,15 +5,15 @@ Some dirs are not present in snapshots directly generated from git (nor are they marked as a submodule). Patch it out, since we have them as system libs. --- - Makefile.am | 32 -------------------------------- - configure.ac | 16 ---------------- - 2 files changed, 48 deletions(-) + Makefile.am | 34 ---------------------------------- + configure.ac | 17 ----------------- + 2 files changed, 51 deletions(-) -Index: libfsapfs/Makefile.am +Index: libfsapfs-20221102/Makefile.am =================================================================== ---- libfsapfs.orig/Makefile.am -+++ libfsapfs/Makefile.am -@@ -3,22 +3,6 @@ ACLOCAL_AMFLAGS = -I m4 +--- libfsapfs-20221102.orig/Makefile.am ++++ libfsapfs-20221102/Makefile.am +@@ -3,23 +3,6 @@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = \ include \ common \ @@ -31,12 +31,13 @@ Index: libfsapfs/Makefile.am - libfdata \ - libfdatetime \ - libfguid \ +- libfmos \ - libhmac \ - libcaes \ libfsapfs \ pyfsapfs \ pyfsapfs-python2 \ -@@ -80,22 +64,6 @@ lib: library +@@ -80,23 +63,6 @@ lib: library library: (cd $(srcdir)/common && $(MAKE) $(AM_MAKEFLAGS)) @@ -54,16 +55,17 @@ Index: libfsapfs/Makefile.am - (cd $(srcdir)/libfdata && $(MAKE) $(AM_MAKEFLAGS)) - (cd $(srcdir)/libfdatetime && $(MAKE) $(AM_MAKEFLAGS)) - (cd $(srcdir)/libfguid && $(MAKE) $(AM_MAKEFLAGS)) +- (cd $(srcdir)/libfmos && $(MAKE) $(AM_MAKEFLAGS)) - (cd $(srcdir)/libhmac && $(MAKE) $(AM_MAKEFLAGS)) - (cd $(srcdir)/libcaes && $(MAKE) $(AM_MAKEFLAGS)) (cd $(srcdir)/libfsapfs && $(MAKE) $(AM_MAKEFLAGS)) (cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS)) -Index: libfsapfs/configure.ac +Index: libfsapfs-20221102/configure.ac =================================================================== ---- libfsapfs.orig/configure.ac -+++ libfsapfs/configure.ac -@@ -183,22 +183,6 @@ dnl Generate Makefiles +--- libfsapfs-20221102.orig/configure.ac ++++ libfsapfs-20221102/configure.ac +@@ -185,23 +185,6 @@ dnl Generate Makefiles AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([include/Makefile]) AC_CONFIG_FILES([common/Makefile]) @@ -81,6 +83,7 @@ Index: libfsapfs/configure.ac -AC_CONFIG_FILES([libfdata/Makefile]) -AC_CONFIG_FILES([libfdatetime/Makefile]) -AC_CONFIG_FILES([libfguid/Makefile]) +-AC_CONFIG_FILES([libfmos/Makefile]) -AC_CONFIG_FILES([libhmac/Makefile]) -AC_CONFIG_FILES([libcaes/Makefile]) AC_CONFIG_FILES([libfsapfs/Makefile])