From 39e047a2934aaedd81b69b2d0eecab9614519331ace67d41daffb4f6d2c02790 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 1 Sep 2022 08:40:22 +0000 Subject: [PATCH] - Update to release 20220831 OBS-URL: https://build.opensuse.org/package/show/security:forensics/libfshfs?expand=0&rev=22 --- libfshfs-experimental-20220709.tar.gz | 3 --- libfshfs-experimental-20220709.tar.gz.asc | 11 --------- libfshfs-experimental-20220831.tar.gz | 3 +++ libfshfs-experimental-20220831.tar.gz.asc | 11 +++++++++ libfshfs.changes | 6 +++++ libfshfs.spec | 8 +++--- system-libs.patch | 30 +++++++++++------------ 7 files changed, 39 insertions(+), 33 deletions(-) delete mode 100644 libfshfs-experimental-20220709.tar.gz delete mode 100644 libfshfs-experimental-20220709.tar.gz.asc create mode 100644 libfshfs-experimental-20220831.tar.gz create mode 100644 libfshfs-experimental-20220831.tar.gz.asc diff --git a/libfshfs-experimental-20220709.tar.gz b/libfshfs-experimental-20220709.tar.gz deleted file mode 100644 index acf208f..0000000 --- a/libfshfs-experimental-20220709.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2612e6ad0b41b925f43a9798ad87c274ef998d14735dc586baa782c1c01d7e16 -size 2018052 diff --git a/libfshfs-experimental-20220709.tar.gz.asc b/libfshfs-experimental-20220709.tar.gz.asc deleted file mode 100644 index 042f5cf..0000000 --- a/libfshfs-experimental-20220709.tar.gz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCAAdFiEEDtkCDakNP25wvTlF2WJeXXrQF34FAmLJN9IACgkQ2WJeXXrQ -F34x8gf/W9hHkOTnxEe+wfSEM2yw+fv0fQp6BOsZCmGi1sFZTSMEili1LO6N4iPO -BSoCND+9HOy/NXZWBUHv/554hR1/oCiX/erjl1G69Pgc3KJyEMuGLHH1jI2AWfD2 -hW0o83dGduS2hXFp/uQKBS1hh1t3YPMADJeT5j2h53vYV0V5tMsSSFMgZi6ktDcy -cl1PcF08kBTkkNDWz3iFU190VZ59NSYdZctDn5a3p7fKLnsZE7qasHN2lexwyQr1 -VLtbS9lwb5qMcwZ1dkwObR1SNiKOjLXJ+MSZKHOQRv/XTLROzs+vOqe++W4/WCt3 -E1/y4dmH1VUIhBwMntNxRXk/zU3SOA== -=RbTn ------END PGP SIGNATURE----- diff --git a/libfshfs-experimental-20220831.tar.gz b/libfshfs-experimental-20220831.tar.gz new file mode 100644 index 0000000..aa705c8 --- /dev/null +++ b/libfshfs-experimental-20220831.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cb9acabea0f0db3cb811b1bcac959e36d78d29ff9296471b042eb5b7ef083dd9 +size 2059019 diff --git a/libfshfs-experimental-20220831.tar.gz.asc b/libfshfs-experimental-20220831.tar.gz.asc new file mode 100644 index 0000000..99a3841 --- /dev/null +++ b/libfshfs-experimental-20220831.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCAAdFiEEDtkCDakNP25wvTlF2WJeXXrQF34FAmMPeNsACgkQ2WJeXXrQ +F378TQgAvT5EArqiY7dhbJkTmT5dQ4K2wAnX15WQv98sI2RdiluGohnqoBavI9Dw +YzKRknt4fFVc3koKVyQoqy8hMVRxeX3jEWl2oUFW/T8JpiGorP52utWO3L0CYZsB +GWuA7AO/Y148pxaxGgkV3dI7883324j63R1wi6zuaK4HzPn6/P2ywgfp1K2Cdl0z +gxzJJJuosbkjzjcRJavKf9rpkn2RhQoROxR8Qs79OwmIdyZBLZUKdA80Aue1LusD +VRDODRa4p377r59HzkRZxpFa7NJTYclZTRyGX1QuoWmeVxSOI4iZBQZEH2tjO5AP +P9PpuQ+SqexbxLoP4ODEutfIjMrKZw== +=Aizu +-----END PGP SIGNATURE----- diff --git a/libfshfs.changes b/libfshfs.changes index 5184803..758ad90 100644 --- a/libfshfs.changes +++ b/libfshfs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Sep 1 08:12:48 UTC 2022 - Jan Engelhardt + +- Update to release 20220831 + * Unspecified updates to API and fallback DEFLATE support + ------------------------------------------------------------------- Mon Aug 29 09:30:38 UTC 2022 - Jan Engelhardt diff --git a/libfshfs.spec b/libfshfs.spec index 88a4d00..adc739b 100644 --- a/libfshfs.spec +++ b/libfshfs.spec @@ -18,7 +18,7 @@ %define lname libfshfs1 Name: libfshfs -Version: 20220709 +Version: 20220831 Release: 0 Summary: Library and tools to access the Mac OS Hierarchical File System (HFS) License: GFDL-1.3-or-later AND LGPL-3.0-or-later @@ -30,7 +30,7 @@ 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 @@ -45,11 +45,13 @@ 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) >= 20220601 +BuildRequires: pkgconfig(zlib) %python_subpackages %description diff --git a/system-libs.patch b/system-libs.patch index 2f5f0a7..a4efbff 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 | 29 ----------------------------- + Makefile.am | 31 ------------------------------- configure.ac | 15 --------------- - 2 files changed, 44 deletions(-) + 2 files changed, 46 deletions(-) -Index: libfshfs/Makefile.am +Index: libfshfs-20220831/Makefile.am =================================================================== ---- libfshfs.orig/Makefile.am -+++ libfshfs/Makefile.am -@@ -3,22 +3,7 @@ ACLOCAL_AMFLAGS = -I m4 +--- libfshfs-20220831.orig/Makefile.am ++++ libfshfs-20220831/Makefile.am +@@ -3,23 +3,7 @@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = \ include \ common \ @@ -31,12 +31,13 @@ Index: libfshfs/Makefile.am - libfdata \ - libfdatetime \ - libfguid \ +- libfmos \ libfshfs \ - libhmac \ fshfstools \ pyfshfs \ pyfshfs-python2 \ -@@ -79,20 +64,6 @@ lib: library +@@ -79,21 +63,6 @@ lib: library library: (cd $(srcdir)/common && $(MAKE) $(AM_MAKEFLAGS)) @@ -54,14 +55,15 @@ Index: libfshfs/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)/libfshfs && $(MAKE) $(AM_MAKEFLAGS)) (cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS)) -Index: libfshfs/configure.ac +Index: libfshfs-20220831/configure.ac =================================================================== ---- libfshfs.orig/configure.ac -+++ libfshfs/configure.ac -@@ -177,25 +177,10 @@ dnl Generate Makefiles +--- libfshfs-20220831.orig/configure.ac ++++ libfshfs-20220831/configure.ac +@@ -182,21 +182,6 @@ dnl Generate Makefiles AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([include/Makefile]) AC_CONFIG_FILES([common/Makefile]) @@ -79,11 +81,7 @@ Index: libfshfs/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([libfshfs/Makefile]) AC_CONFIG_FILES([pyfshfs/Makefile]) AC_CONFIG_FILES([pyfshfs-python2/Makefile]) - AC_CONFIG_FILES([pyfshfs-python3/Makefile]) --AC_CONFIG_FILES([libhmac/Makefile]) - AC_CONFIG_FILES([fshfstools/Makefile]) - AC_CONFIG_FILES([po/Makefile.in]) - AC_CONFIG_FILES([po/Makevars])