diff --git a/_service b/_service new file mode 100644 index 0000000..5a5e2ff --- /dev/null +++ b/_service @@ -0,0 +1,14 @@ + + + git + https://github.com/libyal/libfsntfs + 8803365cac2ae6a2a8fc61550930882a9fcac959 + + 20210503 + + + *.tar + xz + + + diff --git a/libfsntfs-20210503.tar.xz b/libfsntfs-20210503.tar.xz new file mode 100644 index 0000000..8571906 --- /dev/null +++ b/libfsntfs-20210503.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d05a8e5779eff3c1a1cc000d93808af820e3ff08f14e1fc858ef78726805c5af +size 352196 diff --git a/libfsntfs-experimental-20201027.tar.gz b/libfsntfs-experimental-20201027.tar.gz deleted file mode 100644 index 6f1c99f..0000000 --- a/libfsntfs-experimental-20201027.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f8f73061ed19decce9d907e7be610b3ff3522755ece049ed44114a6aab1d4cba -size 2017550 diff --git a/libfsntfs.changes b/libfsntfs.changes index 035e53b..97fa637 100644 --- a/libfsntfs.changes +++ b/libfsntfs.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu May 13 23:42:48 UTC 2021 - Jan Engelhardt + +- Update to snapshot 20210503 (8803365c) + * No changelog was provided +- Add system-libs.patch +- Enable FUSE integration + ------------------------------------------------------------------- Fri Nov 13 03:00:50 UTC 2020 - Greg Freemyer diff --git a/libfsntfs.spec b/libfsntfs.spec index 3b98348..1e621d9 100644 --- a/libfsntfs.spec +++ b/libfsntfs.spec @@ -1,7 +1,7 @@ # # spec file for package libfsntfs # -# 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,38 +17,38 @@ %define lname libfsntfs1 -%define timestamp 20201027 Name: libfsntfs -Version: 0~%{timestamp} +Version: 20210503 Release: 0 Summary: Library and tools to access the NTFS filesystem -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/libfsntfs/wiki -Source: https://github.com/libyal/libfsntfs/releases/download/%{timestamp}/%{name}-experimental-%{timestamp}.tar.gz +URL: https://github.com/libyal/libfsntfs +Source: %name-%version.tar.xz +Patch1: system-libs.patch +BuildRequires: c_compiler +BuildRequires: gettext-tools >= 0.18.1 +BuildRequires: libtool BuildRequires: pkg-config -BuildRequires: python-devel -BuildRequires: pkgconfig(libbfio) >= 20130721 -BuildRequires: pkgconfig(libcdata) >= 20130904 -BuildRequires: pkgconfig(libcfile) >= 20130609 -BuildRequires: pkgconfig(libclocale) >= 20130609 -BuildRequires: pkgconfig(libcnotify) >= 20130609 -BuildRequires: pkgconfig(libcpath) >= 20130609 -BuildRequires: pkgconfig(libcsplit) >= 20130609 -BuildRequires: pkgconfig(libcstring) >= 20150101 -BuildRequires: pkgconfig(libcsystem) >= 20120425 -BuildRequires: pkgconfig(libcthreads) -BuildRequires: pkgconfig(libfdatetime) >= 20130317 -BuildRequires: pkgconfig(libfguid) >= 20130904 -BuildRequires: pkgconfig(libfwnt) -BuildRequires: pkgconfig(libuna) >= 20120425 -#as of Feb 28, 2017, recent releases of the below all cause compile errors. -#BuildRequires: pkgconfig(libfdata) -#BuildRequires: pkgconfig(libfcache) -#BuildRequires: pkgconfig(libcerror) > 20170101 -#not yet in OBS -#BuildRequires: pkgconfig(libfusn) -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: pkgconfig(fuse) >= 2.6 +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(libfusn) >= 20180726 +BuildRequires: pkgconfig(libfwnt) >= 20210421 +BuildRequires: pkgconfig(libhmac) >= 20200104 +BuildRequires: pkgconfig(libuna) >= 20201204 +BuildRequires: pkgconfig(python3) %description Library and tools to access the New Technology File System (NTFS). @@ -77,7 +77,7 @@ Note that this project currently only focuses on the analysis of the format. %package devel Summary: Development files for libfsntfs -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: Development/Libraries/C and C++ Requires: %{lname} = %{version} @@ -91,41 +91,34 @@ applications that want to make use of %{name}. Summary: Python 3 bindings for libfsntfs License: LGPL-3.0-or-later Group: Development/Languages/Python -Requires: %{lname} = %{version} -Requires: python3 -BuildRequires: pkgconfig(python3) %description -n python3-%{name} Python 3 binding for libfsntfs, which can access the NTFS filesystem. %prep -%setup -q -n libfsntfs-%{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}/libfsntfs.so.* %files tools -%defattr(-,root,root) %{_bindir}/fsntfs* %{_mandir}/man1/fsntfsinfo.1* %files devel -%defattr(-,root,root) %{_includedir}/libfsntfs.h %{_includedir}/libfsntfs/ %{_libdir}/libfsntfs.so @@ -133,9 +126,7 @@ find %{buildroot} -type f -name "*.la" -delete -print %{_mandir}/man3/libfsntfs.3* %files -n python3-%{name} -%defattr(-,root,root) -%doc AUTHORS -%license COPYING +%license COPYING* %{python3_sitearch}/pyfsntfs.so %changelog diff --git a/system-libs.patch b/system-libs.patch new file mode 100644 index 0000000..8a624c7 --- /dev/null +++ b/system-libs.patch @@ -0,0 +1,94 @@ +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 | 32 -------------------------------- + configure.ac | 17 ----------------- + 2 files changed, 49 deletions(-) + +Index: libfsntfs/Makefile.am +=================================================================== +--- libfsntfs.orig/Makefile.am ++++ libfsntfs/Makefile.am +@@ -3,24 +3,7 @@ ACLOCAL_AMFLAGS = -I m4 + SUBDIRS = \ + include \ + common \ +- libcerror \ +- libcthreads \ +- libcdata \ +- libclocale \ +- libcnotify \ +- libcsplit \ +- libuna \ +- libcfile \ +- libcpath \ +- libbfio \ +- libfcache \ +- libfdata \ +- libfdatetime \ +- libfguid \ +- libfwnt \ + libfsntfs \ +- libfusn \ +- libhmac \ + fsntfstools \ + pyfsntfs \ + pyfsntfs-python2 \ +@@ -81,21 +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)/libfwnt && $(MAKE) $(AM_MAKEFLAGS)) + (cd $(srcdir)/libfsntfs && $(MAKE) $(AM_MAKEFLAGS)) + (cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS)) + +Index: libfsntfs/configure.ac +=================================================================== +--- libfsntfs.orig/configure.ac ++++ libfsntfs/configure.ac +@@ -182,27 +182,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([libfwnt/Makefile]) + AC_CONFIG_FILES([libfsntfs/Makefile]) + AC_CONFIG_FILES([pyfsntfs/Makefile]) + AC_CONFIG_FILES([pyfsntfs-python2/Makefile]) + AC_CONFIG_FILES([pyfsntfs-python3/Makefile]) +-AC_CONFIG_FILES([libfusn/Makefile]) +-AC_CONFIG_FILES([libhmac/Makefile]) + AC_CONFIG_FILES([fsntfstools/Makefile]) + AC_CONFIG_FILES([po/Makefile.in]) + AC_CONFIG_FILES([po/Makevars])