From 6c0130011f7573dc2b3c66763f4023f4355dc2546888c1653c6c4508d467132d Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 23 Oct 2022 12:20:46 +0000 Subject: [PATCH] - Update to release 20221023 OBS-URL: https://build.opensuse.org/package/show/security:forensics/libmodi?expand=0&rev=13 --- libmodi-experimental-20210807.tar.gz | 3 -- libmodi-experimental-20210807.tar.gz.asc | 11 ------ libmodi-experimental-20221023.tar.gz | 3 ++ libmodi-experimental-20221023.tar.gz.asc | 11 ++++++ libmodi.changes | 8 +++++ libmodi.spec | 37 +++++++++---------- system-libs.patch | 46 +++++------------------- 7 files changed, 50 insertions(+), 69 deletions(-) delete mode 100644 libmodi-experimental-20210807.tar.gz delete mode 100644 libmodi-experimental-20210807.tar.gz.asc create mode 100644 libmodi-experimental-20221023.tar.gz create mode 100644 libmodi-experimental-20221023.tar.gz.asc diff --git a/libmodi-experimental-20210807.tar.gz b/libmodi-experimental-20210807.tar.gz deleted file mode 100644 index 8c919af..0000000 --- a/libmodi-experimental-20210807.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:334207fe74d6efe9da85573871f3badda81d383d5f15d68d63ea924c1db1be03 -size 2011745 diff --git a/libmodi-experimental-20210807.tar.gz.asc b/libmodi-experimental-20210807.tar.gz.asc deleted file mode 100644 index 89e9a02..0000000 --- a/libmodi-experimental-20210807.tar.gz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCAAdFiEEDtkCDakNP25wvTlF2WJeXXrQF34FAmEWQvYACgkQ2WJeXXrQ -F36eewf8CVcrtE6Dmwn2O/oMuV5zGbaErqo2U3uuxom+nYScoRtJRaqIclaAsggL -bp7RrmKBNWpUCWKnGJKbaISicFGnqMqBeBD6x6zkHQoYNdNBAtrqtNMN9uDbOhR9 -+sQ5C+YHUEx5nls0YgwBN+kdnL58MxdtwgEYI5hlezw7nZI546HnDREGcVSPx/A/ -FlKgQpQmP1DBctMNBtusB5XA3DxKOd3m3W07WzInWw8rrn9acEtj4MW8IfDMPtuZ -WZKUbwIzMoDI3z1WjeqVCtj5+PWoDdkV5c0zm0KSGFqtjokaL8SA5yStjPOYllem -dA+NBRaRbTNCwdhafnadtokjQn6txw== -=5/WM ------END PGP SIGNATURE----- diff --git a/libmodi-experimental-20221023.tar.gz b/libmodi-experimental-20221023.tar.gz new file mode 100644 index 0000000..c576854 --- /dev/null +++ b/libmodi-experimental-20221023.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bc8104439f656a377c869dad49a1bb5ba9c0abd36f5902a3ad8ff8cbd757ccc4 +size 2103807 diff --git a/libmodi-experimental-20221023.tar.gz.asc b/libmodi-experimental-20221023.tar.gz.asc new file mode 100644 index 0000000..cef5254 --- /dev/null +++ b/libmodi-experimental-20221023.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCAAdFiEEDtkCDakNP25wvTlF2WJeXXrQF34FAmNVF9MACgkQ2WJeXXrQ +F37KXQf/ZmtalVt53bqjXDCafgOsCj/WFRRLCkzBQ+rWEy7jbA1qQP5IElK7DKiV +5r+z+CAyx0iFuMZA5p+M95WHbV3xcYhVb8+Gv2oJS7hhY0f2HioBVzWwyMoRxE0W +VAIQoAKfmjZKB4zP2aBH6HplgHk2oxUOLQGo0c9MRW1l4VlNJUW06BsdZyoctLbx ++hextvNC5KP/dqKzNz8eTWKBBufa4y6/Tpzwv0LmQQXOZQIRZ5kpRG9Sad2gP3mH +Mq44uApVCY7R/1KFSMhORCqVJ6ojljgF7ZxGOWxo7bVDHSSkfykBRxgrinHUOQmm +8Mk3j764Co5ZdWrdRoaHo9egD4Bxuw== +=jLrl +-----END PGP SIGNATURE----- diff --git a/libmodi.changes b/libmodi.changes index 0184bfd..b8d1419 100644 --- a/libmodi.changes +++ b/libmodi.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Oct 23 12:16:45 UTC 2022 - Jan Engelhardt + +- Update to release 20221023 + * Unspecified updates to LZFSE/LZVN support, fallback deflate + and fallback bzip2 support + * Moved ADC, LZFSE and LZVN compression to libfmos + ------------------------------------------------------------------- Mon Aug 29 09:26:05 UTC 2022 - Jan Engelhardt diff --git a/libmodi.spec b/libmodi.spec index f08237e..6f70e25 100644 --- a/libmodi.spec +++ b/libmodi.spec @@ -18,7 +18,7 @@ Name: libmodi %define lname libmodi1 -Version: 20210807 +Version: 20221023 Release: 0 Summary: Library and tools to access the Mac OS disk image formats License: LGPL-3.0-or-later @@ -30,31 +30,32 @@ Source3: %name.keyring Patch1: system-libs.patch BuildRequires: %{python_module devel} BuildRequires: c_compiler -BuildRequires: gettext-tools >= 0.18.1 +BuildRequires: gettext-tools >= 0.21 BuildRequires: libtool BuildRequires: pkg-config BuildRequires: python-rpm-macros BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(fuse) -BuildRequires: pkgconfig(libbfio) >= 20201229 -BuildRequires: pkgconfig(libcaes) >= 20201012 -BuildRequires: pkgconfig(libcdata) >= 20200509 +BuildRequires: pkgconfig(libbfio) >= 20220120 +BuildRequires: pkgconfig(libcaes) >= 20220529 +BuildRequires: pkgconfig(libcdata) >= 20220115 BuildRequires: pkgconfig(libcdirectory) >= 20220105 -BuildRequires: pkgconfig(libcerror) >= 20201121 +BuildRequires: pkgconfig(libcerror) >= 20220101 BuildRequires: pkgconfig(libcfile) >= 20220106 -BuildRequires: pkgconfig(libclocale) >= 20200913 -BuildRequires: pkgconfig(libcnotify) >= 20200913 -BuildRequires: pkgconfig(libcpath) >= 20200623 -BuildRequires: pkgconfig(libcsplit) >= 20200703 -BuildRequires: pkgconfig(libcthreads) >= 20200508 -BuildRequires: pkgconfig(libfcache) >= 20200708 -BuildRequires: pkgconfig(libfdata) >= 20201129 -BuildRequires: pkgconfig(libfguid) >= 20180724 -BuildRequires: pkgconfig(libfplist) >= 20210404 -BuildRequires: pkgconfig(libfvalue) >= 20210510 -BuildRequires: pkgconfig(libhmac) >= 20200104 +BuildRequires: pkgconfig(libclocale) >= 20220107 +BuildRequires: pkgconfig(libcnotify) >= 20220108 +BuildRequires: pkgconfig(libcpath) >= 20220108 +BuildRequires: pkgconfig(libcsplit) >= 20220109 +BuildRequires: pkgconfig(libcthreads) >= 20220102 +BuildRequires: pkgconfig(libfcache) >= 20220110 +BuildRequires: pkgconfig(libfdata) >= 20220111 +BuildRequires: pkgconfig(libfguid) >= 20220113 +BuildRequires: pkgconfig(libfmos) >= 20220811 +BuildRequires: pkgconfig(libfplist) >= 20220116 +BuildRequires: pkgconfig(libfvalue) >= 20220120 +BuildRequires: pkgconfig(libhmac) >= 20220425 BuildRequires: pkgconfig(liblzma) -BuildRequires: pkgconfig(libuna) >= 20210801 +BuildRequires: pkgconfig(libuna) >= 20220611 %python_subpackages %description diff --git a/system-libs.patch b/system-libs.patch index 7e06f3a..07c80b4 100644 --- a/system-libs.patch +++ b/system-libs.patch @@ -5,15 +5,14 @@ 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 | 36 ------------------------------------ - configure.ac | 18 ------------------ - 2 files changed, 54 deletions(-) + Makefile.am | 38 -------------------------------------- + 1 file changed, 38 deletions(-) -Index: libmodi/Makefile.am +Index: libmodi-20221023/Makefile.am =================================================================== ---- libmodi.orig/Makefile.am -+++ libmodi/Makefile.am -@@ -3,24 +3,6 @@ ACLOCAL_AMFLAGS = -I m4 +--- libmodi-20221023.orig/Makefile.am ++++ libmodi-20221023/Makefile.am +@@ -3,25 +3,6 @@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = \ include \ common \ @@ -32,13 +31,14 @@ Index: libmodi/Makefile.am - libfdata \ - libfguid \ - libfvalue \ +- libfmos \ - libfplist \ - libhmac \ - libcaes \ libmodi \ moditools \ pymodi \ -@@ -83,24 +65,6 @@ lib: library +@@ -83,25 +64,6 @@ lib: library library: (cd $(srcdir)/common && $(MAKE) $(AM_MAKEFLAGS)) @@ -57,38 +57,10 @@ Index: libmodi/Makefile.am - (cd $(srcdir)/libfdata && $(MAKE) $(AM_MAKEFLAGS)) - (cd $(srcdir)/libfguid && $(MAKE) $(AM_MAKEFLAGS)) - (cd $(srcdir)/libfvalue && $(MAKE) $(AM_MAKEFLAGS)) +- (cd $(srcdir)/libfmos && $(MAKE) $(AM_MAKEFLAGS)) - (cd $(srcdir)/libfplist && $(MAKE) $(AM_MAKEFLAGS)) - (cd $(srcdir)/libhmac && $(MAKE) $(AM_MAKEFLAGS)) - (cd $(srcdir)/libcaes && $(MAKE) $(AM_MAKEFLAGS)) (cd $(srcdir)/libmodi && $(MAKE) $(AM_MAKEFLAGS)) (cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS)) -Index: libmodi/configure.ac -=================================================================== ---- libmodi.orig/configure.ac -+++ libmodi/configure.ac -@@ -196,24 +196,6 @@ dnl Generate Makefiles - AC_CONFIG_FILES([Makefile]) - AC_CONFIG_FILES([include/Makefile]) - AC_CONFIG_FILES([common/Makefile]) --AC_CONFIG_FILES([libcerror/Makefile]) --AC_CONFIG_FILES([libcthreads/Makefile]) --AC_CONFIG_FILES([libcdata/Makefile]) --AC_CONFIG_FILES([libclocale/Makefile]) --AC_CONFIG_FILES([libcnotify/Makefile]) --AC_CONFIG_FILES([libcsplit/Makefile]) --AC_CONFIG_FILES([libuna/Makefile]) --AC_CONFIG_FILES([libcdirectory/Makefile]) --AC_CONFIG_FILES([libcfile/Makefile]) --AC_CONFIG_FILES([libcpath/Makefile]) --AC_CONFIG_FILES([libbfio/Makefile]) --AC_CONFIG_FILES([libfcache/Makefile]) --AC_CONFIG_FILES([libfdata/Makefile]) --AC_CONFIG_FILES([libfguid/Makefile]) --AC_CONFIG_FILES([libfvalue/Makefile]) --AC_CONFIG_FILES([libfplist/Makefile]) --AC_CONFIG_FILES([libhmac/Makefile]) --AC_CONFIG_FILES([libcaes/Makefile]) - AC_CONFIG_FILES([libmodi/Makefile]) - AC_CONFIG_FILES([pymodi/Makefile]) - AC_CONFIG_FILES([pymodi-python2/Makefile])