From 1cb31dc2bc834de0983944f0a5e00fbbf811ddaf4b009020bc2706d6af67334c Mon Sep 17 00:00:00 2001 From: Greg Freemyer Date: Wed, 9 Jun 2021 10:02:13 +0000 Subject: [PATCH] Accepting request 898684 from home:jengelh:forensics - Update to snapshot 20210510 (e42a0869) OBS-URL: https://build.opensuse.org/request/show/898684 OBS-URL: https://build.opensuse.org/package/show/security:forensics/libfshfs?expand=0&rev=4 --- _service | 14 +++++ libfshfs-20210510.tar.xz | 3 + libfshfs-experimental-20201104.tar.gz | 3 - libfshfs.changes | 7 +++ libfshfs.spec | 78 +++++++++++------------ system-libs.patch | 89 +++++++++++++++++++++++++++ 6 files changed, 148 insertions(+), 46 deletions(-) create mode 100644 _service create mode 100644 libfshfs-20210510.tar.xz delete mode 100644 libfshfs-experimental-20201104.tar.gz create mode 100644 system-libs.patch diff --git a/_service b/_service new file mode 100644 index 0000000..6d9be31 --- /dev/null +++ b/_service @@ -0,0 +1,14 @@ + + + git + https://github.com/libyal/libfshfs + e42a08693894be332e96f22c0f2cba05a93d036f + + 20210510 + + + *.tar + xz + + + diff --git a/libfshfs-20210510.tar.xz b/libfshfs-20210510.tar.xz new file mode 100644 index 0000000..9c54718 --- /dev/null +++ b/libfshfs-20210510.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4d9988ca0e92390622ec73d606d4e0435d71348c3e428320b32b4e7551799bfd +size 272192 diff --git a/libfshfs-experimental-20201104.tar.gz b/libfshfs-experimental-20201104.tar.gz deleted file mode 100644 index 3609b9a..0000000 --- a/libfshfs-experimental-20201104.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b7c566986a8ece99c5427eb13fb2122b640d1b9cf5d8056b54f7139837aa9fa9 -size 1914552 diff --git a/libfshfs.changes b/libfshfs.changes index 1726814..844a10e 100644 --- a/libfshfs.changes +++ b/libfshfs.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri May 14 22:44:53 UTC 2021 - Jan Engelhardt + +- Update to snapshot 20210510 (e42a0869) + * No changelog was provided +- Add system-libs.patch + ------------------------------------------------------------------- Fri Nov 13 03:44:31 UTC 2020 - Greg Freemyer diff --git a/libfshfs.spec b/libfshfs.spec index 4a8687e..9eaad38 100644 --- a/libfshfs.spec +++ b/libfshfs.spec @@ -1,7 +1,7 @@ # # spec file for package libfshfs # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,34 +17,35 @@ %define lname libfshfs1 -%define timestamp 20201104 Name: libfshfs -Version: 0~%{timestamp} +Version: 20210510 Release: 0 Summary: Library and tools to access the Mac OS Hierarchical File System (HFS) -License: LGPL-3.0-or-later AND GFDL-1.3-or-later +License: GFDL-1.3-or-later AND LGPL-3.0-or-later Group: Productivity/File utilities -URL: https://github.com/libyal/libfshfs/wiki -Source: https://github.com/libyal/libfshfs/releases/download/%timestamp/%{name}-experimental-%{timestamp}.tar.gz - +URL: https://github.com/libyal/libfshfs +Source: %name-%version.tar.xz +Patch1: system-libs.patch +BuildRequires: c_compiler +BuildRequires: gettext-tools >= 0.18.1 +BuildRequires: libtool BuildRequires: pkg-config -BuildRequires: pkgconfig(libbfio) >= 20130721 -BuildRequires: pkgconfig(libcdata) >= 20140105 -BuildRequires: pkgconfig(libcerror) >= 20170101 -BuildRequires: pkgconfig(libcfile) >= 20130609 -BuildRequires: pkgconfig(libclocale) >= 20130609 -BuildRequires: pkgconfig(libcnotify) >= 20120425 -BuildRequires: pkgconfig(libcpath) >= 20130609 -BuildRequires: pkgconfig(libcsplit) >= 20130609 -BuildRequires: pkgconfig(libcthreads) >= 20130723 -BuildRequires: pkgconfig(libfcache) >= 20120405 -BuildRequires: pkgconfig(libfdata) >= 20120405 -BuildRequires: pkgconfig(libfguid) >= 20130317 -BuildRequires: pkgconfig(libuna) >= 20120425 -BuildRequires: pkgconfig(libfdatetime) -BuildRequires: pkgconfig(libhmac) +BuildRequires: pkgconfig(libbfio) >= 20201229 +BuildRequires: pkgconfig(libcdata) >= 20200509 +BuildRequires: pkgconfig(libcerror) >= 20201121 +BuildRequires: pkgconfig(libcfile) >= 20201229 +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(libfdatetime) >= 20180910 +BuildRequires: pkgconfig(libfguid) >= 20180724 +BuildRequires: pkgconfig(libhmac) >= 20200104 +BuildRequires: pkgconfig(libuna) >= 20201204 BuildRequires: pkgconfig(python3) -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Read-only supported HFS formats: @@ -105,9 +106,8 @@ Planned: * Complete resource fork support * Complete named fork (extended attributes) support - %package tools -Summary: Tools to access the Mac OS Hierarchical File System (HFS) +Summary: Tools to access the Mac OS Hierarchical File System (HFS) License: LGPL-3.0-or-later Group: Productivity/File utilities Requires: %{lname} = %{version} @@ -116,8 +116,8 @@ Requires: %{lname} = %{version} 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 -License: LGPL-3.0-or-later AND GFDL-1.3-or-later +Summary: Development files for libfshfs, Mac OS Hierarchical File System (HFS) library +License: GFDL-1.3-or-later AND LGPL-3.0-or-later Group: Development/Libraries/C and C++ Requires: %{lname} = %{version} @@ -141,37 +141,31 @@ libfshfs is a library to access Mac OS Hierarchical File System (HFS) format. Se This package contains Python 3 bindings for libfshfs. %prep -%setup -q -n libfshfs-%{timestamp} +%autosetup -p1 %build +if [ ! -e configure ]; then ./autogen.sh; fi %configure --disable-static --enable-wide-character-type --enable-python3 -make %{?_smp_mflags} +%make_build %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} +%make_install find %{buildroot} -type f -name "*.la" -delete -print %post -n %{lname} -p /sbin/ldconfig - %postun -n %{lname} -p /sbin/ldconfig %files -n %{lname} -%defattr(-,root,root) -%doc AUTHORS ChangeLog -%license COPYING +%license COPYING* %{_libdir}/libfshfs.so.* %files tools -%defattr(-,root,root) -%doc AUTHORS ChangeLog -%license COPYING +%license COPYING* %{_bindir}/fshfs* %{_mandir}/man1/fshfs*.1* %files devel -%defattr(-,root,root) -%doc AUTHORS README ChangeLog -%license COPYING +%license COPYING* %{_includedir}/libfshfs.h %{_includedir}/libfshfs/ %{_libdir}/libfshfs.so @@ -179,9 +173,7 @@ find %{buildroot} -type f -name "*.la" -delete -print %{_mandir}/man3/libfshfs.3* %files -n python3-%{name} -%defattr(-,root,root) -%doc AUTHORS README ChangeLog -%license COPYING +%license COPYING* %{python3_sitearch}/pyfshfs.so %changelog diff --git a/system-libs.patch b/system-libs.patch new file mode 100644 index 0000000..2f5f0a7 --- /dev/null +++ b/system-libs.patch @@ -0,0 +1,89 @@ +From: Jan Engelhardt +Date: 2021-05-12 17:36:02.536572543 +0200 + +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 ----------------------------- + configure.ac | 15 --------------- + 2 files changed, 44 deletions(-) + +Index: libfshfs/Makefile.am +=================================================================== +--- libfshfs.orig/Makefile.am ++++ libfshfs/Makefile.am +@@ -3,22 +3,7 @@ ACLOCAL_AMFLAGS = -I m4 + SUBDIRS = \ + include \ + common \ +- libcerror \ +- libcthreads \ +- libcdata \ +- libclocale \ +- libcnotify \ +- libcsplit \ +- libuna \ +- libcfile \ +- libcpath \ +- libbfio \ +- libfcache \ +- libfdata \ +- libfdatetime \ +- libfguid \ + libfshfs \ +- libhmac \ + fshfstools \ + pyfshfs \ + pyfshfs-python2 \ +@@ -79,20 +64,6 @@ lib: library + + library: + (cd $(srcdir)/common && $(MAKE) $(AM_MAKEFLAGS)) +- (cd $(srcdir)/libcerror && $(MAKE) $(AM_MAKEFLAGS)) +- (cd $(srcdir)/libcthreads && $(MAKE) $(AM_MAKEFLAGS)) +- (cd $(srcdir)/libcdata && $(MAKE) $(AM_MAKEFLAGS)) +- (cd $(srcdir)/libclocale && $(MAKE) $(AM_MAKEFLAGS)) +- (cd $(srcdir)/libcnotify && $(MAKE) $(AM_MAKEFLAGS)) +- (cd $(srcdir)/libcsplit && $(MAKE) $(AM_MAKEFLAGS)) +- (cd $(srcdir)/libuna && $(MAKE) $(AM_MAKEFLAGS)) +- (cd $(srcdir)/libcfile && $(MAKE) $(AM_MAKEFLAGS)) +- (cd $(srcdir)/libcpath && $(MAKE) $(AM_MAKEFLAGS)) +- (cd $(srcdir)/libbfio && $(MAKE) $(AM_MAKEFLAGS)) +- (cd $(srcdir)/libfcache && $(MAKE) $(AM_MAKEFLAGS)) +- (cd $(srcdir)/libfdata && $(MAKE) $(AM_MAKEFLAGS)) +- (cd $(srcdir)/libfdatetime && $(MAKE) $(AM_MAKEFLAGS)) +- (cd $(srcdir)/libfguid && $(MAKE) $(AM_MAKEFLAGS)) + (cd $(srcdir)/libfshfs && $(MAKE) $(AM_MAKEFLAGS)) + (cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS)) + +Index: libfshfs/configure.ac +=================================================================== +--- libfshfs.orig/configure.ac ++++ libfshfs/configure.ac +@@ -177,25 +177,10 @@ 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([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([libfdatetime/Makefile]) +-AC_CONFIG_FILES([libfguid/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])