diff --git a/_service b/_service new file mode 100644 index 0000000..ba504fc --- /dev/null +++ b/_service @@ -0,0 +1,14 @@ + + + git + https://github.com/libyal/libluksde + 7b40e4b77cf02541dea5a327bbd98a9f08868e8d + + 20210419 + + + *.tar + xz + + + diff --git a/libluksde-20210419.tar.xz b/libluksde-20210419.tar.xz new file mode 100644 index 0000000..3f6a483 --- /dev/null +++ b/libluksde-20210419.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb191cc148d1f9ab49f38a3ed4f6423b298e5d12aadfaa089c9059dc3f03a23e +size 154244 diff --git a/libluksde-experimental-20200205.tar.gz b/libluksde-experimental-20200205.tar.gz deleted file mode 100644 index 9951b5f..0000000 --- a/libluksde-experimental-20200205.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:09102caad26d2ca8a0d3cdbd5a356f4d22ac43dc9ba67724d512b89be74864ff -size 1585131 diff --git a/libluksde.changes b/libluksde.changes index 5ad195e..5f147cd 100644 --- a/libluksde.changes +++ b/libluksde.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu May 13 23:47:24 UTC 2021 - Jan Engelhardt + +- Update to snapshot 20210419 (7b40e4b7) + * No changelog was provided +- Add system-libs.patch + ------------------------------------------------------------------- Thu Apr 30 02:20:26 UTC 2020 - Greg Freemyer diff --git a/libluksde.spec b/libluksde.spec index ef2efda..7cdea19 100644 --- a/libluksde.spec +++ b/libluksde.spec @@ -1,7 +1,7 @@ # # spec file for package libluksde # -# 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 libluksde1 -%define timestamp 20200205 Name: libluksde -Version: 0~%{timestamp} +Version: 20210419 Release: 0 Summary: Library and tools to access LUKS Disk Encryption encrypted files -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/libluksde/wiki -Source: https://github.com/libyal/libluksde/releases/download/%{timestamp}/%{name}-experimental-%{timestamp}.tar.gz +URL: https://github.com/libyal/libluksde +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(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(libfcrypto) >= 20200104 +BuildRequires: pkgconfig(libfdata) >= 20201129 +BuildRequires: pkgconfig(libfdatetime) >= 20180910 +BuildRequires: pkgconfig(libfguid) >= 20180724 +BuildRequires: pkgconfig(libhmac) >= 20200104 +BuildRequires: pkgconfig(libuna) >= 20201204 +BuildRequires: pkgconfig(python3) %description Library and tools to access the New Technology File System (NTFS). @@ -73,7 +73,7 @@ libluksde-tools is a project to access LUKS Disk Encrypted volumes. %package devel Summary: Development files for libluksde -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} @@ -87,41 +87,35 @@ applications that want to make use of %{name}. Summary: Python 3 bindings for libluksde 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 libluksde, which can access the NTFS filesystem. %prep -%setup -q -n libluksde-%{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 COPYING ChangeLog +%license COPYING* %{_libdir}/libluksde.so.* %files tools -%defattr(-,root,root) %{_bindir}/luksde* %{_mandir}/man1/luksdeinfo.1* %{_mandir}/man1/luksdemount.1* %files devel -%defattr(-,root,root) %{_includedir}/libluksde.h %{_includedir}/libluksde/ %{_libdir}/libluksde.so @@ -129,9 +123,7 @@ find %{buildroot} -type f -name "*.la" -delete -print %{_mandir}/man3/libluksde.3* %files -n python3-%{name} -%defattr(-,root,root) -%doc AUTHORS -%license COPYING +%license COPYING* %{python3_sitearch}/pyluksde.so %changelog diff --git a/system-libs.patch b/system-libs.patch new file mode 100644 index 0000000..53234ac --- /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 | 33 --------------------------------- + configure.ac | 16 ---------------- + 2 files changed, 49 deletions(-) + +Index: libluksde/Makefile.am +=================================================================== +--- libluksde.orig/Makefile.am ++++ libluksde/Makefile.am +@@ -3,22 +3,6 @@ ACLOCAL_AMFLAGS = -I m4 + SUBDIRS = \ + include \ + common \ +- libcerror \ +- libcthreads \ +- libcdata \ +- libclocale \ +- libcnotify \ +- libcsplit \ +- libuna \ +- libcfile \ +- libcpath \ +- libbfio \ +- libfcache \ +- libfdata \ +- libfguid \ +- libhmac \ +- libcaes \ +- libfcrypto \ + libluksde \ + luksdetools \ + pyluksde \ +@@ -80,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)/libhmac && $(MAKE) $(AM_MAKEFLAGS)) +- (cd $(srcdir)/libcaes && $(MAKE) $(AM_MAKEFLAGS)) +- (cd $(srcdir)/libfcrypto && $(MAKE) $(AM_MAKEFLAGS)) + (cd $(srcdir)/libluksde && $(MAKE) $(AM_MAKEFLAGS)) + (cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS)) + +Index: libluksde/configure.ac +=================================================================== +--- libluksde.orig/configure.ac ++++ libluksde/configure.ac +@@ -179,22 +179,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([libhmac/Makefile]) +-AC_CONFIG_FILES([libcaes/Makefile]) +-AC_CONFIG_FILES([libfcrypto/Makefile]) + AC_CONFIG_FILES([libluksde/Makefile]) + AC_CONFIG_FILES([pyluksde/Makefile]) + AC_CONFIG_FILES([pyluksde-python2/Makefile])