From e080a7437b06f17c6404b7fbeffb32f75e02eb71869eebbdcaffb773506f9843 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 21 Jan 2022 07:51:45 +0000 Subject: [PATCH 1/3] - Update to release 20220115 OBS-URL: https://build.opensuse.org/package/show/security:forensics/libfshfs?expand=0&rev=10 --- libfshfs-experimental-20210722.tar.gz | 3 -- libfshfs-experimental-20210722.tar.gz.asc | 11 ----- libfshfs-experimental-20220115.tar.gz | 3 ++ libfshfs-experimental-20220115.tar.gz.asc | 11 +++++ libfshfs.changes | 7 +++ libfshfs.spec | 58 ++++++++++------------- 6 files changed, 45 insertions(+), 48 deletions(-) delete mode 100644 libfshfs-experimental-20210722.tar.gz delete mode 100644 libfshfs-experimental-20210722.tar.gz.asc create mode 100644 libfshfs-experimental-20220115.tar.gz create mode 100644 libfshfs-experimental-20220115.tar.gz.asc diff --git a/libfshfs-experimental-20210722.tar.gz b/libfshfs-experimental-20210722.tar.gz deleted file mode 100644 index 899947d..0000000 --- a/libfshfs-experimental-20210722.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fbf4e1d94973af6a8f27288248e03995276649407f0d1d6a0732dc49c0a395fe -size 1929214 diff --git a/libfshfs-experimental-20210722.tar.gz.asc b/libfshfs-experimental-20210722.tar.gz.asc deleted file mode 100644 index 2f25257..0000000 --- a/libfshfs-experimental-20210722.tar.gz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCAAdFiEEDtkCDakNP25wvTlF2WJeXXrQF34FAmD6U4kACgkQ2WJeXXrQ -F37ZDQf9GFjF7OLQ98LrJdje1/NfSSRbSEF/0FA9WOjPPcMDez26D7aHy9gF8AkG -8Wmg9AJ3P6MRJ8rdbTm3M5oceUG1ka9gmWHFy7oKWfJmf2Erdn/K1J2qimVevPSz -n4VXi8d8O/4k1IF1V1xg0L2JjE+VU/lfhNSnM4u4PtE5q7/LD1n1+6jtJ1cr+8iX -i9gDfJo9rEKycvDEfwqKyH1GnU4eUqjGSunRSwOKNNA3X1jO6T8lrzXDNlImS7mu -l6Nqk1p4o65X9Ox9XaC7RkrFSlSF/3/Va7O94u9zNjoRBD7ORFYIctac6vnDA4SJ -bo/pT1vWDWGnCH8kI4ynoctyECYbSw== -=446e ------END PGP SIGNATURE----- diff --git a/libfshfs-experimental-20220115.tar.gz b/libfshfs-experimental-20220115.tar.gz new file mode 100644 index 0000000..4d76f43 --- /dev/null +++ b/libfshfs-experimental-20220115.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8b333d2950048c88f75ea93413bb864d2b33cfefe64c892fa50b04eaa9dae362 +size 1995841 diff --git a/libfshfs-experimental-20220115.tar.gz.asc b/libfshfs-experimental-20220115.tar.gz.asc new file mode 100644 index 0000000..c3a9b32 --- /dev/null +++ b/libfshfs-experimental-20220115.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCAAdFiEEDtkCDakNP25wvTlF2WJeXXrQF34FAmHinXoACgkQ2WJeXXrQ +F37G6ggAp8xCDY7QSGV08Bra5kIJtbvQrafYLk963ehdAEsUdvdsN54er1InoKJK +KTqUdNSJE02NOssghkzWhbr23fM9FWNwmSarV5FR6lB+CLhBskeInNE0IIDjsrYB +J8cGhgRBjJvDLLAFzaaxYTZKyumDZ+W+rYf34XNKwsixyRWo6tMpY3NbbQeXB8tT +xIsg7SYFE84w057HaoU2RzMMyBM5GHlOjYbecVe7N6OjP7p6z3TDrNBYwDO0AdgX +nCFrcIA46TBosW/d2jniUOsPE/1Eyy6H7JgYgtu7JA1BWHZ0pcvWAjkxkEaWQPPu +wXFzhE2aoFSoOCt2C74VX+6bNQGzUA== +=6ARN +-----END PGP SIGNATURE----- diff --git a/libfshfs.changes b/libfshfs.changes index b3e9068..9e578fd 100644 --- a/libfshfs.changes +++ b/libfshfs.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Jan 13 11:22:05 UTC 2022 - Jan Engelhardt + +- Update to release 20220115 + * More extended attribute support + * FUSE driver + ------------------------------------------------------------------- Sun Nov 14 12:42:15 UTC 2021 - Jan Engelhardt diff --git a/libfshfs.spec b/libfshfs.spec index 3a1d86b..efe88d5 100644 --- a/libfshfs.spec +++ b/libfshfs.spec @@ -1,7 +1,7 @@ # # spec file for package libfshfs # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %define lname libfshfs1 Name: libfshfs -Version: 20210722 +Version: 20220115 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 @@ -28,10 +28,13 @@ Source: https://github.com/libyal/libfshfs/releases/download/%version/li Source2: https://github.com/libyal/libfshfs/releases/download/%version/libfshfs-experimental-%version.tar.gz.asc Source3: %name.keyring Patch1: system-libs.patch +BuildRequires: %{python_module devel} BuildRequires: c_compiler BuildRequires: gettext-tools >= 0.18.1 BuildRequires: libtool BuildRequires: pkg-config +BuildRequires: python-rpm-macros +BuildRequires: pkgconfig(fuse) BuildRequires: pkgconfig(libbfio) >= 20201229 BuildRequires: pkgconfig(libcdata) >= 20200509 BuildRequires: pkgconfig(libcerror) >= 20201121 @@ -47,7 +50,7 @@ BuildRequires: pkgconfig(libfdatetime) >= 20180910 BuildRequires: pkgconfig(libfguid) >= 20180724 BuildRequires: pkgconfig(libhmac) >= 20200104 BuildRequires: pkgconfig(libuna) >= 20201204 -BuildRequires: pkgconfig(python3) +%python_subpackages %description Read-only supported HFS formats: @@ -65,17 +68,13 @@ Supported HFS format features: * ZLIB (DEFLATE) compression * LZVN compression +* extended attributes Unsupported HFS format features: * LZFSE compression, compression methods 11 and 12 * "uncompressed", compression methods 1, 9 and 10 -Planned: - -* Complete resource fork support -* Complete named fork (extended attributes) support - %package -n %{lname} Summary: Library and tools to access the Mac OS Hierarchical File System (HFS) License: LGPL-3.0-or-later @@ -97,17 +96,13 @@ Supported HFS format features: * ZLIB (DEFLATE) compression * LZVN compression +* extended attributes Unsupported HFS format features: * LZFSE compression, compression methods 11 and 12 * "uncompressed", compression methods 1, 9 and 10 -Planned: - -* Complete resource fork support -* Complete named fork (extended attributes) support - %package tools Summary: Tools to access the Mac OS Hierarchical File System (HFS) License: LGPL-3.0-or-later @@ -115,7 +110,8 @@ Group: Productivity/File utilities Requires: %{lname} = %{version} %description tools -Tools to access the Mac OS Hierarchical File System (HFS). See libfshfs for additional details. +Tools to access the Mac OS Hierarchical File System (HFS). See +libfshfs for additional details. %package devel Summary: Development files for libfshfs, Mac OS Hierarchical File System (HFS) library @@ -124,34 +120,28 @@ Group: Development/Libraries/C and C++ Requires: %{lname} = %{version} %description devel -libfshfs is a library to access the Mac OS Hierarchical File System (HFS) format. see libfshfs for details. +libfshfs is a library to access the Mac OS Hierarchical File System +(HFS) format. see libfshfs for details. This subpackage contains libraries and header files for developing applications that want to make use of libfshfs. -%package -n python3-%{name} -Summary: Python 3 bindings for libfshfs, a Mac OS Hierarchical FIle System (HFS) parser -License: LGPL-3.0-or-later -Group: Development/Languages/Python -Requires: %{lname} = %{version} -Requires: python3 -Provides: pyfshfs - -%description -n python3-%{name} -libfshfs is a library to access Mac OS Hierarchical File System (HFS) format. See libfshfs for details. - -This package contains Python 3 bindings for libfshfs. - %prep %autosetup -p1 %build autoreconf -fi -%configure --disable-static --enable-wide-character-type --enable-python3 +# OOT builds are presently broken, so we have to install +# within each python iteration now, not in %%install. +%{python_expand # +%configure --disable-static --enable-wide-character-type --enable-python PYTHON_VERSION="%{$python_bin_suffix}" %make_build +%make_install DESTDIR="%_builddir/rt" +%make_build clean +} %install -%make_install +mv %_builddir/rt/* %buildroot/ find %{buildroot} -type f -name "*.la" -delete -print %post -n %{lname} -p /sbin/ldconfig @@ -161,12 +151,12 @@ find %{buildroot} -type f -name "*.la" -delete -print %license COPYING* %{_libdir}/libfshfs.so.* -%files tools +%files -n %name-tools %license COPYING* %{_bindir}/fshfs* %{_mandir}/man1/fshfs*.1* -%files devel +%files -n %name-devel %license COPYING* %{_includedir}/libfshfs.h %{_includedir}/libfshfs/ @@ -174,8 +164,8 @@ find %{buildroot} -type f -name "*.la" -delete -print %{_libdir}/pkgconfig/libfshfs.pc %{_mandir}/man3/libfshfs.3* -%files -n python3-%{name} +%files %python_files %license COPYING* -%{python3_sitearch}/pyfshfs.so +%{python_sitearch}/pyfshfs.so %changelog From 2f404c16b511b61a9cc9cd2d160f4b0ac9657359e3c631d0f1daa1ee5a45ab8b Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 21 Jan 2022 07:51:55 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/security:forensics/libfshfs?expand=0&rev=11 --- libfshfs.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libfshfs.changes b/libfshfs.changes index 9e578fd..19cf91d 100644 --- a/libfshfs.changes +++ b/libfshfs.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Thu Jan 13 11:22:05 UTC 2022 - Jan Engelhardt +Fri Jan 21 07:51:50 UTC 2022 - Jan Engelhardt - Update to release 20220115 * More extended attribute support From 96df89b39624c3f60add812f5cb8a0a8b2122ec812187217613151a349ece74c Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 21 Jan 2022 07:57:35 +0000 Subject: [PATCH 3/3] dependency updates OBS-URL: https://build.opensuse.org/package/show/security:forensics/libfshfs?expand=0&rev=12 --- libfshfs.spec | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/libfshfs.spec b/libfshfs.spec index efe88d5..cc61e99 100644 --- a/libfshfs.spec +++ b/libfshfs.spec @@ -35,21 +35,21 @@ BuildRequires: libtool BuildRequires: pkg-config BuildRequires: python-rpm-macros BuildRequires: pkgconfig(fuse) -BuildRequires: pkgconfig(libbfio) >= 20201229 -BuildRequires: pkgconfig(libcdata) >= 20200509 -BuildRequires: pkgconfig(libcerror) >= 20201121 +BuildRequires: pkgconfig(libbfio) >= 20220111 +BuildRequires: pkgconfig(libcdata) >= 20220115 +BuildRequires: pkgconfig(libcerror) >= 20220101 BuildRequires: pkgconfig(libcfile) >= 20201229 -BuildRequires: pkgconfig(libclocale) >= 20210526 -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(libfdatetime) >= 20180910 -BuildRequires: pkgconfig(libfguid) >= 20180724 +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) >= 20211023 +BuildRequires: pkgconfig(libfdatetime) >= 20220112 +BuildRequires: pkgconfig(libfguid) >= 20220113 BuildRequires: pkgconfig(libhmac) >= 20200104 -BuildRequires: pkgconfig(libuna) >= 20201204 +BuildRequires: pkgconfig(libuna) >= 20220102 %python_subpackages %description