diff --git a/_service b/_service new file mode 100644 index 0000000..a057b56 --- /dev/null +++ b/_service @@ -0,0 +1,14 @@ + + + git + https://github.com/libyal/libfvde + 19317d6de408a8e125088928ee4f9113cd6f1e1c + + 20210425 + + + *.tar + xz + + + diff --git a/libfvde-20210425.tar.xz b/libfvde-20210425.tar.xz new file mode 100644 index 0000000..7a83975 --- /dev/null +++ b/libfvde-20210425.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ef8493f2520af9824ff228a4f59754ff2bb14c1e72be16a31e9ec347b19cbf81 +size 205228 diff --git a/libfvde-experimental-20191221.tar.gz b/libfvde-experimental-20191221.tar.gz deleted file mode 100644 index 8bf1955..0000000 --- a/libfvde-experimental-20191221.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8a5afac4a285ce2026f470e3cb512dde3f650cd6be41069ad6b66345c1ccd767 -size 1755703 diff --git a/libfvde.changes b/libfvde.changes index a500910..219e3da 100644 --- a/libfvde.changes +++ b/libfvde.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri May 14 22:47:42 UTC 2021 - Jan Engelhardt + +- Update to snapshot 20210425 (19317d6d) + * No changelog was provided +- Add system-libs.patch + ------------------------------------------------------------------- Thu Dec 24 21:03:31 UTC 2020 - Greg Freemyer diff --git a/libfvde.spec b/libfvde.spec index d5a21bd..12b50b4 100644 --- a/libfvde.spec +++ b/libfvde.spec @@ -1,7 +1,7 @@ # # spec file for package libfvde # -# 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 @@ -19,40 +19,40 @@ %define lname libfvde1 %define timestamp 20191221 Name: libfvde -Version: 0~%{timestamp} +Version: 20210425 Release: 0 Summary: Library to access the File Vault Drive Encryption format -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/libfvde/ -Source: https://github.com/libyal/libfvde/releases/download/%{timestamp}/libfvde-experimental-%{timestamp}.tar.gz +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(fuse) +BuildRequires: pkgconfig(libbfio) >= 20201229 +BuildRequires: pkgconfig(libcaes) >= 20201012 +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(libfguid) >= 20180724 +BuildRequires: pkgconfig(libfplist) >= 20210404 +BuildRequires: pkgconfig(libfvalue) >= 20210510 +BuildRequires: pkgconfig(libhmac) >= 20200104 +BuildRequires: pkgconfig(libuna) >= 20201204 BuildRequires: pkgconfig(openssl) +BuildRequires: pkgconfig(python3) BuildRequires: pkgconfig(zlib) -BuildRequires: pkgconfig(libbfio) >= 20130721 -BuildRequires: pkgconfig(libcaes) -BuildRequires: pkgconfig(libcdata) >= 20140105 -BuildRequires: pkgconfig(libcfile) >= 20130609 -BuildRequires: pkgconfig(libclocale) >= 20130609 -BuildRequires: pkgconfig(libcnotify) >= 20120425 -BuildRequires: pkgconfig(libcpath) >= 20130609 -BuildRequires: pkgconfig(libcsplit) >= 20130609 -BuildRequires: pkgconfig(libcsystem) >= 20120425 -BuildRequires: pkgconfig(libcthreads) >= 20150101 -BuildRequires: pkgconfig(libfcache) >= 20120405 -BuildRequires: pkgconfig(libfdata) >= 20120405 -BuildRequires: pkgconfig(libfguid) -BuildRequires: pkgconfig(libfvalue) >= 20150101 -BuildRequires: pkgconfig(libhmac) -BuildRequires: pkgconfig(libuna) >= 20150101 -#BuildRequires: pkgconfig(libtool) -#BuildRequires: pkgconfig(libcerror) >= 20140105 -#BuildRequires: pkgconfig(libcstring) >= 20120425 - -BuildRoot: %{_tmppath}/%{name}-%{version}-build - %description libfvde is a library to access the File Vault Drive Encryption format. @@ -77,7 +77,7 @@ See libfvde for additional details. %package devel Summary: Header files and libraries for developing applications for libfvde -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} @@ -93,47 +93,39 @@ applications that want to make use of libfvde. Summary: Python 3 bindings for libfvde License: LGPL-3.0-or-later Group: Development/Libraries/Python -Requires: %{lname} = %{version} -Requires: python3 -BuildRequires: pkgconfig(python3) %description -n python3-%{name} This packinge provides Python 3 bindings for libfvde %prep -%setup -q -n libfvde-%{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 %check # make check %post -n %{lname} -p /sbin/ldconfig - %postun -n %{lname} -p /sbin/ldconfig %files -n %{lname} -%defattr(-,root,root) -%doc AUTHORS COPYING NEWS README ChangeLog +%license COPYING* %{_libdir}/libfvde.so.* %files tools -%defattr(-,root,root) -%doc AUTHORS -%license COPYING +%license COPYING* %{_bindir}/fvde* %{_mandir}/man1/fvde*.1* %files devel -%defattr(-,root,root) -%doc AUTHORS -%license COPYING +%license COPYING* %{_includedir}/libfvde.h %{_includedir}/libfvde/ %{_libdir}/libfvde.so @@ -141,9 +133,7 @@ find %{buildroot} -type f -name "*.la" -delete -print %{_mandir}/man3/libfvde.3* %files -n python3-%{name} -%defattr(-,root,root) -%doc AUTHORS -%license COPYING +%license COPYING* %{python3_sitearch}/pyfvde.so %changelog diff --git a/system-libs.patch b/system-libs.patch new file mode 100644 index 0000000..ec9385a --- /dev/null +++ b/system-libs.patch @@ -0,0 +1,91 @@ +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 | 34 ---------------------------------- + configure.ac | 17 ----------------- + 2 files changed, 51 deletions(-) + +Index: libfvde/Makefile.am +=================================================================== +--- libfvde.orig/Makefile.am ++++ libfvde/Makefile.am +@@ -3,23 +3,6 @@ ACLOCAL_AMFLAGS = -I m4 + SUBDIRS = \ + include \ + common \ +- libcerror \ +- libcthreads \ +- libcdata \ +- libclocale \ +- libcnotify \ +- libcsplit \ +- libuna \ +- libcfile \ +- libcpath \ +- libbfio \ +- libfcache \ +- libfdata \ +- libfguid \ +- libfplist \ +- libfvalue \ +- libhmac \ +- libcaes \ + libfvde \ + fvdetools \ + pyfvde \ +@@ -81,23 +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)/libfguid && $(MAKE) $(AM_MAKEFLAGS)) +- (cd $(srcdir)/libfvalue && $(MAKE) $(AM_MAKEFLAGS)) +- (cd $(srcdir)/libfplist && $(MAKE) $(AM_MAKEFLAGS)) +- (cd $(srcdir)/libhmac && $(MAKE) $(AM_MAKEFLAGS)) +- (cd $(srcdir)/libcaes && $(MAKE) $(AM_MAKEFLAGS)) + (cd $(srcdir)/libfvde && $(MAKE) $(AM_MAKEFLAGS)) + (cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS)) + +Index: libfvde/configure.ac +=================================================================== +--- libfvde.orig/configure.ac ++++ libfvde/configure.ac +@@ -186,23 +186,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([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([libfplist/Makefile]) +-AC_CONFIG_FILES([libfvalue/Makefile]) +-AC_CONFIG_FILES([libhmac/Makefile]) +-AC_CONFIG_FILES([libcaes/Makefile]) + AC_CONFIG_FILES([libfvde/Makefile]) + AC_CONFIG_FILES([pyfvde/Makefile]) + AC_CONFIG_FILES([pyfvde-python2/Makefile])