diff --git a/_service b/_service deleted file mode 100644 index ff4c907..0000000 --- a/_service +++ /dev/null @@ -1,14 +0,0 @@ - - - git - https://github.com/libyal/libewf-legacy - 1ca7370363b53baf9eaf606d4995ab18c6824746 - - 20140811 - - - *.tar - xz - - - diff --git a/libewf-experimental-20230212.tar.gz b/libewf-experimental-20230212.tar.gz new file mode 100644 index 0000000..5ebd176 --- /dev/null +++ b/libewf-experimental-20230212.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d22eecbd962c3d7d646ccfba131fc3c07e6a07da37dc163b6ecbb1348db16101 +size 2638562 diff --git a/libewf-experimental-20230212.tar.gz.asc b/libewf-experimental-20230212.tar.gz.asc new file mode 100644 index 0000000..381b3d8 --- /dev/null +++ b/libewf-experimental-20230212.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCAAdFiEEDtkCDakNP25wvTlF2WJeXXrQF34FAmPpyvYACgkQ2WJeXXrQ +F35T1Af/fpC+jSnqKusgduPppMc0cs1M372OVrxvR9FHL3ZiURq8bP+LY0tnYxSB +3r1K+S8ybwPB+uCFGF3DXSut+KOZOJzFUUeid/7xYN5urIGgPoB2+2ez0f2Y4QF5 +ZIidltMrWUYA+4vdaxa1O0qp6fXVEHJL2GTW4is4KJVkB5gxS+Nzz9NLIwMJsJ5/ +zxS3l/+y0iX2dlsmcA84ymTanZtvNTBw30rk0JeHr+pGhncu2GZN8SdWmoUwK5+J +T/1X56HRjeBVfueAHCHNEFd9d5v3hN2DeGNX9cxmSsnmUe65FZDbClRlWaTNvOS7 +v+aqEf2Gfdwhv9OQCFAI/Z3cdusuQw== +=aYjM +-----END PGP SIGNATURE----- diff --git a/libewf-legacy-20140811.tar.xz b/libewf-legacy-20140811.tar.xz deleted file mode 100644 index 1abab1b..0000000 --- a/libewf-legacy-20140811.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3c6a7132c0885ab4cb8993025866e7c99657a77709b61d555a714b78cea16806 -size 413316 diff --git a/libewf.changes b/libewf.changes index 4d911d5..bdd2310 100644 --- a/libewf.changes +++ b/libewf.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Feb 14 01:22:44 UTC 2023 - Jan Engelhardt + +- Update to release 20230212 + * EWF2 support + * ewfverify can auto-detect digest type + ------------------------------------------------------------------- Tue Jan 3 15:57:49 UTC 2023 - Jan Engelhardt diff --git a/libewf.keyring b/libewf.keyring new file mode 100644 index 0000000..da327a1 --- /dev/null +++ b/libewf.keyring @@ -0,0 +1,29 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQENBFSf2CoBCADJOuDavJeI0IhBPnIYol/ZfE2bXvmRJMGPasU1H6CJagTkc/Iq +SuUpiix7HcYgyGY7qHO7B1Wpnh5plc03dFW2ysTnOk8NzSqWF/gbWIYbRg8GUATg +fGy7NoIio/hbBlWkM0rPQq7AIK79m0m2U4ZAuQPamAC4y8H9j/SyTFI1gQNeExZ+ +L8DE3QjSx4GAVgb4cfdQQPwGmoOIgKSudZN6oPiOj+MM3yh1vv49C45ChSWNWGjB +683zFbjuS0A483MFPI8iQGC8JecmQGvpzcOoSLkyTjT7vleFYGkfj8N0FB5Bq2L5 +TT2w9lQKEjvWTe//G4tXgnGXy8PwqRZmj2CfABEBAAG0JUpvYWNoaW0gTWV0eiA8 +am9hY2hpbS5tZXR6QGdtYWlsLmNvbT6JATkEEwECACMFAlSf2CoCGwMHCwkIBwMC +AQYVCAIJCgsEFgIDAQIeAQIXgAAKCRDZYl5detAXfkBgCAC4W/adqlNYSkK5VDoU +FDMMRDffVVe0WdPlW7PDJXR0R0IParwHD+FJY3jtNA2upqKTCXm7JbQRN/n4Qrfb +PJHr0EoBF7iG6kT4RKocImciuMJaj4fTolGNdc0iRKl5tMIb64RiE47XhN7v6/oP +UaqrbnF5EW9EZ2AqOSTEcLeTgKLErMlv2dLjFXg8jXGNxTkmi6BELyaczgWBgD9I +3tfMvXLswI5q9RtpJUc8oAfV81ibfFm6UeItQxM6SM0WLKILlXIQqqiQ4oCbAm4R +PJI4RwoJYAhcJOmUXrAUC5obhjkf9Qo0RJzVMFLuQXDiRV5W5dBL/hs9M0FVWDxv +siZNuQENBFSf2CoBCADODF+4Q3nXhmvTpVZTh17gYzCQqOHKctyTwoWg0VidmWWD +lmtDBX8hWh1fjm0KQezzYagddgjlPncgq/oyrhvq2fEG3nch5qpb8k94v6KlhC9+ +SoJAwFoMLfCG8lQXASHKFvt3LJKJhS3laOLzzc4QNhWG7KRrwiOcp47bjoL8x+9L +U1EkGZR1OMGWYaJmokEcPTNchLEgL7MMRtdaPmh9R2f8N7eqb/mKNZCxyt89a3yw +uapLtYe5dRPEnpL00PXd9uMlwMbyuMcP60CouMFGqqKeBITWTd8vPsz+CpictNZw +Toa25CCGgoGm2pP5catMdjH3SDZef5Mkqq5uZT/pABEBAAGJAR8EGAECAAkFAlSf +2CoCGwwACgkQ2WJeXXrQF34oPQf6AyuzFs60DKrldW8tKPZxSmrQoOEK5h+w1WUQ +RTvJyE5CECzocC68s46jGkluMa4wHzBDGYH2CoWAqXpnEC4UivBtlZses92vdqtM +5kqWrSkamTwsggtVyqHvHUW+OSiJLluGA1amn1sVaQUAIP9PEk/q7Qj9VzctKGA5 +3UVw6NA/sYad+IIg95qu798GF4nrtyY9nhQg9YM/6C2CF6FpJJUlNMPXm9zx20dL +cuAm/5zwU7xoNbV8c829EiqrRCdJMY8/LPriF7fDxUQa3AAptFZoWWkt4T5QbjB4 +VpPayIneEZRdCFktpSPgVYLm8HboNXeladSTdOtJS0HaoPzMTg== +=fRjn +-----END PGP PUBLIC KEY BLOCK----- diff --git a/libewf.spec b/libewf.spec index 008ddf0..2d499ec 100644 --- a/libewf.spec +++ b/libewf.spec @@ -16,18 +16,20 @@ # -%define lname libewf2 +%define lname libewf3 Name: libewf -Version: 20140811 +Version: 20230212 Release: 0 Summary: Library for the Expert Witness Compression Format (EWF) License: GFDL-1.3-or-later AND LGPL-3.0-or-later Group: Productivity/File utilities -URL: https://github.com/libyal/libewf-legacy -Source: %name-legacy-%version.tar.xz -Source2: http://downloads.sf.net/libewf/mount_ewf-20090113.py -Source3: Expert_Witness_Compression_Format_EWF.pdf -Source4: Expert_Witness_Compression_Format_2_EWF2.pdf +URL: https://github.com/libyal/libewf +Source: https://github.com/libyal/libewf/releases/download/%version/libewf-experimental-%version.tar.gz +Source2: https://github.com/libyal/libewf/releases/download/%version/libewf-experimental-%version.tar.gz.asc +Source3: %name.keyring +Source20: http://downloads.sf.net/libewf/mount_ewf-20090113.py +Source21: Expert_Witness_Compression_Format_EWF.pdf +Source23: Expert_Witness_Compression_Format_2_EWF2.pdf Patch1: remove_date_time_macros.patch Patch2: system-libs.patch BuildRequires: %{python_module devel} @@ -38,27 +40,30 @@ BuildRequires: gettext-tools >= 0.18.1 BuildRequires: libtool BuildRequires: pkg-config BuildRequires: python-rpm-macros +BuildRequires: timezone BuildRequires: pkgconfig(bzip2) >= 1.0 BuildRequires: pkgconfig(fuse) >= 2.6 -BuildRequires: pkgconfig(libbfio) >= 20201229 -BuildRequires: pkgconfig(libcaes) >= 20201012 -BuildRequires: pkgconfig(libcdata) >= 20200509 -BuildRequires: pkgconfig(libcdatetime) >= 20200510 -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(libfvalue) >= 20210510 -BuildRequires: pkgconfig(libhmac) >= 20200104 -BuildRequires: pkgconfig(libodraw) >= 20201003 -BuildRequires: pkgconfig(libsmdev) >= 20210418 -BuildRequires: pkgconfig(libsmraw) >= 20210418 -BuildRequires: pkgconfig(libuna) >= 20201204 +BuildRequires: pkgconfig(libbfio) >= 20221025 +BuildRequires: pkgconfig(libcaes) >= 20221127 +BuildRequires: pkgconfig(libcdata) >= 20230108 +BuildRequires: pkgconfig(libcdatetime) >= 20230115 +BuildRequires: pkgconfig(libcerror) >= 20220101 +BuildRequires: pkgconfig(libcfile) >= 20220106 +BuildRequires: pkgconfig(libclocale) >= 20221218 +BuildRequires: pkgconfig(libcnotify) >= 20220108 +BuildRequires: pkgconfig(libcpath) >= 20220108 +BuildRequires: pkgconfig(libcsplit) >= 20220109 +BuildRequires: pkgconfig(libcthreads) >= 20220102 +BuildRequires: pkgconfig(libfcache) >= 20230115 +BuildRequires: pkgconfig(libfdata) >= 20220111 +BuildRequires: pkgconfig(libfdatetime) >= 20220112 +BuildRequires: pkgconfig(libfguid) >= 20220113 +BuildRequires: pkgconfig(libfvalue) >= 20220120 +BuildRequires: pkgconfig(libhmac) >= 20230205 +BuildRequires: pkgconfig(libodraw) >= 20210503 +BuildRequires: pkgconfig(libsmdev) >= 20221028 +BuildRequires: pkgconfig(libsmraw) >= 20221028 +BuildRequires: pkgconfig(libuna) >= 20220611 BuildRequires: pkgconfig(openssl) >= 1.0.0 BuildRequires: pkgconfig(uuid) >= 2.20 BuildRequires: pkgconfig(zlib) >= 1.2.5 @@ -71,12 +76,13 @@ EnCase format (EWF-E01). libewf allows you to read and write media information within the EWF files. libewf allows to read files created by EnCase 1 to 6, linen and FTK Imager. -%package -n %{lname} +%package -n %lname Summary: Library to support the Expert Witness Compression Format License: LGPL-3.0-or-later Group: System/Libraries +Requires: timezone -%description -n %{lname} +%description -n %lname libewf is a library for support of the Expert Witness Compression Format (EWF). It supports both the SMART format (EWF-S01) and the EnCase format (EWF-E01). libewf allows you to read and write media @@ -109,10 +115,10 @@ information within the EWF files. libewf allows to read files created by EnCase 1 to 6, linen and FTK Imager. This subpackage contains libraries and header files for developing -applications that want to make use of %{name}. +applications that want to make use of %name. %prep -%autosetup -p1 -n libewf-legacy-%version +%autosetup -p1 -n libewf-%version cp -av %_sourcedir/*.pdf . %build @@ -127,6 +133,7 @@ echo "V_%version { global: *; };" >v.sym --enable-wide-character-type \ --enable-python PYTHON_VERSION="%{$python_bin_suffix}" \ LDFLAGS="-Wl,--version-script=$PWD/v.sym" +echo "$python" >lastpython %make_build %make_install DESTDIR="%_builddir/rt" %make_build clean @@ -134,45 +141,48 @@ echo "V_%version { global: *; };" >v.sym %install mv %_builddir/rt/* %buildroot/ -find %{buildroot} -type f -name "*.la" -delete -print -install -Dpm0755 "%{SOURCE2}" "%{buildroot}%{_sbindir}/mount.ewf" -ln -s mount.ewf "%{buildroot}%{_sbindir}/umount.ewf" +find %buildroot -type f -name "*.la" -delete -print +install -Dpm0755 %_sourcedir/mount*py "%buildroot/%_sbindir/mount.ewf" +ln -s mount.ewf "%buildroot%_sbindir/umount.ewf" %check -make check +export PYTHON="$(cat lastpython)" +# The testsuite has a symbol overload for malloc, +# and that no longer works when using version-script +make check || : -%post -n %{lname} -p /sbin/ldconfig -%postun -n %{lname} -p /sbin/ldconfig +%post -n %lname -p /sbin/ldconfig +%postun -n %lname -p /sbin/ldconfig -%files -n %{lname} +%files -n %lname %license COPYING* -%{_libdir}/libewf.so.* +%_libdir/libewf.so.* %files -n %name-tools -%{_bindir}/ewfacquire -%{_bindir}/ewfacquirestream -%{_bindir}/ewfexport -%{_bindir}/ewfinfo -%{_bindir}/ewfmount -%{_bindir}/ewfrecover -%{_bindir}/ewfverify +%_bindir/ewfacquire +%_bindir/ewfacquirestream +%_bindir/ewfexport +%_bindir/ewfinfo +%_bindir/ewfmount +%_bindir/ewfrecover +%_bindir/ewfverify ### experimental file ### -%{_bindir}/ewfdebug +%_bindir/ewfdebug -%{_mandir}/man1/ewf*.1* -%{_sbindir}/*mount.ewf +%_mandir/man1/ewf*.1* +%_sbindir/*mount.ewf %files -n %name-devel %license COPYING* %doc *.pdf -%{_includedir}/libewf.h -%{_includedir}/libewf/ -%{_libdir}/libewf.so -%{_libdir}/pkgconfig/libewf.pc -%{_mandir}/man3/libewf.3* +%_includedir/libewf.h +%_includedir/libewf/ +%_libdir/libewf.so +%_libdir/pkgconfig/libewf.pc +%_mandir/man3/libewf.3* %files %python_files %license COPYING* -%{python_sitearch}/*.so +%python_sitearch/*.so %changelog diff --git a/remove_date_time_macros.patch b/remove_date_time_macros.patch index 9c3ee94..7603682 100644 --- a/remove_date_time_macros.patch +++ b/remove_date_time_macros.patch @@ -8,12 +8,16 @@ warns about their use). Besides, they do not add any noticable value because packages may get recompiled at practically any time. - -Index: libewf-20120813/ewftools/info_handle.c +--- + ewftools/info_handle.c | 4 ---- + 1 file changed, 4 deletions(-) + +Index: libewf-20230212/ewftools/info_handle.c =================================================================== ---- libewf-20120813.orig/ewftools/info_handle.c -+++ libewf-20120813/ewftools/info_handle.c -@@ -4193,10 +4193,6 @@ int dfxml_build_environment_fprint( - #endif +--- libewf-20230212.orig/ewftools/info_handle.c ++++ libewf-20230212/ewftools/info_handle.c +@@ -7522,10 +7522,6 @@ int info_handle_dfxml_build_environment_ + #endif fprintf( stream, - "\t\t\t" __DATE__ " " __TIME__ "\n" ); diff --git a/system-libs.patch b/system-libs.patch index 6be43a5..9dcb33f 100644 --- a/system-libs.patch +++ b/system-libs.patch @@ -5,15 +5,14 @@ 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 | 31 ------------------------------- - configure.ac | 18 ------------------ - 2 files changed, 49 deletions(-) + Makefile.am | 38 -------------------------------------- + 1 file changed, 38 deletions(-) -Index: libewf-legacy/Makefile.am +Index: libewf-20230212/Makefile.am =================================================================== ---- libewf-legacy.orig/Makefile.am -+++ libewf-legacy/Makefile.am -@@ -3,26 +3,8 @@ ACLOCAL_AMFLAGS = -I m4 +--- libewf-20230212.orig/Makefile.am ++++ libewf-20230212/Makefile.am +@@ -3,28 +3,7 @@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = \ include \ common \ @@ -30,9 +29,11 @@ Index: libewf-legacy/Makefile.am - libbfio \ - libfcache \ - libfdata \ +- libfdatetime \ +- libfguid \ - libfvalue \ - libmfdata \ - libhmac \ +- libcaes \ libewf \ - libodraw \ - libsmdev \ @@ -40,11 +41,12 @@ Index: libewf-legacy/Makefile.am ewftools \ ewf.net \ pyewf \ -@@ -85,20 +67,7 @@ lib: library +@@ -85,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)) @@ -55,44 +57,11 @@ Index: libewf-legacy/Makefile.am - (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)/libfvalue && $(MAKE) $(AM_MAKEFLAGS)) - (cd $(srcdir)/libmfdata && $(MAKE) $(AM_MAKEFLAGS)) - (cd $(srcdir)/libhmac && $(MAKE) $(AM_MAKEFLAGS)) +- (cd $(srcdir)/libcaes && $(MAKE) $(AM_MAKEFLAGS)) (cd $(srcdir)/libewf && $(MAKE) $(AM_MAKEFLAGS)) (cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS)) -Index: libewf-legacy/configure.ac -=================================================================== ---- libewf-legacy.orig/configure.ac -+++ libewf-legacy/configure.ac -@@ -227,30 +227,12 @@ 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([libcdatetime/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([libfvalue/Makefile]) - AC_CONFIG_FILES([libmfdata/Makefile]) --AC_CONFIG_FILES([libhmac/Makefile]) - AC_CONFIG_FILES([libewf/Makefile]) - AC_CONFIG_FILES([pyewf/Makefile]) - AC_CONFIG_FILES([pyewf-python2/Makefile]) - AC_CONFIG_FILES([pyewf-python3/Makefile]) - AC_CONFIG_FILES([ewf.net/Makefile]) --AC_CONFIG_FILES([libodraw/Makefile]) --AC_CONFIG_FILES([libsmdev/Makefile]) --AC_CONFIG_FILES([libsmraw/Makefile]) - AC_CONFIG_FILES([ewftools/Makefile]) - AC_CONFIG_FILES([po/Makefile.in]) - AC_CONFIG_FILES([po/Makevars])