From 64e6c4d4e8d50f7c5229f12c0d1508bb8d1103b590c4b4c3b334c2222cc5fe42 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 25 Aug 2014 09:03:20 +0000 Subject: [PATCH] Accepting request 245505 from security 1 OBS-URL: https://build.opensuse.org/request/show/245505 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libewf?expand=0&rev=10 --- libewf-20140201.tar.gz | 3 - libewf-20140608.tar.gz | 3 + libewf.changes | 21 +++++++ libewf.spec | 122 +++++++++++++++++++++-------------------- 4 files changed, 87 insertions(+), 62 deletions(-) delete mode 100644 libewf-20140201.tar.gz create mode 100644 libewf-20140608.tar.gz diff --git a/libewf-20140201.tar.gz b/libewf-20140201.tar.gz deleted file mode 100644 index c2b8892..0000000 --- a/libewf-20140201.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4cf6d8fc91d03060380bb619fb6e1e007f47ab479af2183856ab4743f6c59281 -size 2079418 diff --git a/libewf-20140608.tar.gz b/libewf-20140608.tar.gz new file mode 100644 index 0000000..9006e47 --- /dev/null +++ b/libewf-20140608.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d14030ce6122727935fbd676d0876808da1e112721f3cb108564a4d9bf73da71 +size 2129518 diff --git a/libewf.changes b/libewf.changes index 580c41c..e9b595b 100644 --- a/libewf.changes +++ b/libewf.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Wed Aug 20 19:19:32 UTC 2014 - Greg.Freemyer@gmail.com + +- update to libewf-20140608 + * worked on integrating multi threaded ewfacquire changes + * bug fix for utf16 header functions + * bug fix in ewfmount regarding logical files date and time values + * make pyewf_handle_open more strict to catch non-string objects + without the check the code will segfault on non-string objects + * bug fixes in empty block compression + * bug fix in libewf_read_io_handle_read_chunk_data error tolerance + code path + * bug fix in recent process status changes + * changed behavior of empty-block check +- review BuildRequires for new external packages +- use external packages where possible +- added to python sub-package section + - Requires: %{lname} = %{version" + - Provides: pyewf +- ran spec-cleaner + ------------------------------------------------------------------- Mon Feb 3 11:36:48 UTC 2014 - varadgautam@gmail.com diff --git a/libewf.spec b/libewf.spec index f7cfe9c..6b2b4d7 100644 --- a/libewf.spec +++ b/libewf.spec @@ -16,22 +16,20 @@ # -Name: libewf %define lname libewf2 -%define timestamp 20140201 -Version: 0~%timestamp +%define timestamp 20140608 +Name: libewf +Version: 0~%{timestamp} Release: 0 Summary: Library for the Expert Witness Compression Format (EWF) License: LGPL-3.0+ and GFDL-1.3+ Group: Productivity/File utilities Url: http://code.google.com/p/libewf/ - -#DL-URL: https://googledrive.com/host/0B3fBvzttpiiSMTdoaVExWWNsRjg/libewf-%{timestamp}.tar.gz -Source: %name-%timestamp.tar.gz +#DL-URL: https://googledrive.com/host/0B3fBvzttpiiSMTdoaVExWWNsRjg/libewf-20140608.tar.gz +Source: %{name}-%{timestamp}.tar.gz 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 - Patch1: remove_date_time_macros.patch BuildRequires: bison BuildRequires: flex @@ -39,39 +37,43 @@ BuildRequires: flex BuildRequires: gettext BuildRequires: pkg-config BuildRequires: python-devel -BuildRequires: xz BuildRequires: pkgconfig(bzip2) >= 1.0 BuildRequires: pkgconfig(fuse) >= 2.6 -BuildRequires: pkgconfig(libcaes) >= 20120425 -#use the factory versions of these if building for factory -%if 0%{?suse_version} > 1230 -BuildRequires: pkgconfig(libcnotify) >= 20120425 -BuildRequires: pkgconfig(libcpath) >= 20120701 -BuildRequires: pkgconfig(libcsplit) >= 20120701 -# these are in filesystems, but not yet in factory so use the internal version -#BuildRequires: pkgconfig(libodraw) >= 20120630 -#BuildRequires: pkgconfig(libsmdev) >= 20120630 -%endif BuildRequires: pkgconfig(openssl) >= 1.0.0 BuildRequires: pkgconfig(uuid) >= 2.20 BuildRequires: pkgconfig(zlib) >= 1.2.5 # build fails if libyal factory package is used -# verified 7/31/2013 -#BuildRequires: pkgconfig(libsmraw) >= 20120630 -#BuildRequires: pkgconfig(libhmac) >= 20120425 -#BuildRequires: pkgconfig(libclocale) >= 20120425 -#BuildRequires: pkgconfig(libcerror) >= 20120425 +# verified 8/20/2014 +#BuildRequires: pkgconfig(libodraw) >= 20120630 #BuildRequires: pkgconfig(libbfio) >= 20120426 #BuildRequires: pkgconfig(libcdata) >= 20120425 -#BuildRequires: pkgconfig(libcfile) >= 20120526 -#BuildRequires: pkgconfig(libuna) >= 20120425 +#BuildRequires: pkgconfig(libcerror) >= 20120425 +#not yet in factory, but released by upstream +#BuildRequires: pkgconfig(libcdatetime) # these packages not yet released by upstream #BuildRequires: pkgconfig(libcstring) >= 20120425 #BuildRequires: pkgconfig(libcsystem) >= 20120425 #BuildRequires: pkgconfig(libfcache) >= 20120405 #BuildRequires: pkgconfig(libfvalue) >= 20120428 #BuildRequires: pkgconfig(libmfdata) >= 20120425 +#BuildRequires: pkgconfig(libfdata) BuildRoot: %{_tmppath}/%{name}-%{version}-build +#use the factory versions of these if building for factory +%if 0%{?suse_version} > 1230 +BuildRequires: pkgconfig(libcaes) >= 20120425 +BuildRequires: pkgconfig(libcfile) >= 20120526 +BuildRequires: pkgconfig(libclocale) >= 20120425 +BuildRequires: pkgconfig(libcnotify) >= 20120425 +BuildRequires: pkgconfig(libcpath) >= 20120701 +BuildRequires: pkgconfig(libcsplit) >= 20120701 +BuildRequires: pkgconfig(libhmac) >= 20120425 +BuildRequires: pkgconfig(libsmdev) >= 20120630 +BuildRequires: pkgconfig(libsmraw) >= 20120630 +BuildRequires: pkgconfig(libuna) >= 20120425 +%endif +%if 0%{?suse_version} > 1310 +BuildRequires: pkgconfig(libcthreads) >= 20130723 +%endif %description libewf is a library for support of the Expert Witness Compression @@ -80,12 +82,12 @@ 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+ Group: System/Libraries -%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 @@ -111,7 +113,7 @@ It contains tools to acquire, verify and export EWF files. Summary: Development files for libewf, an Expert Witness Compression Format library License: LGPL-3.0+ and GFDL-1.3+ Group: Development/Libraries/C and C++ -Requires: %lname = %version +Requires: %{lname} = %{version} %description devel libewf is a library for support of the Expert Witness Compression @@ -121,26 +123,27 @@ 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}. -%package -n python-%name +%package -n python-%{name} Summary: Python bindings for libewf, an Expert Witness Compression format library License: LGPL-3.0+ Group: Development/Libraries/Python +Requires: %{lname} = %{version} Requires: python +Provides: pyewf -%description -n python-%name +%description -n python-%{name} Python binding for libewf, which can create and read EnCase forensic images. %prep -%setup -qn libewf-%timestamp -%patch -P 1 -p1 -cp "%SOURCE3" "%SOURCE4" . +%setup -q -n libewf-%{timestamp} +%patch1 -p1 +cp "%{SOURCE3}" "%{SOURCE4}" . %build #export CFLAGS="%optflags -fno-strict-aliasing" -#export CXXFLAGS="%optflags" %configure --disable-static \ --enable-wide-character-type \ --enable-python @@ -155,48 +158,49 @@ cp "%SOURCE3" "%SOURCE4" . make %{?_smp_mflags} %install -make install DESTDIR="%buildroot" -find "%buildroot" -name "*.la" -delete +make DESTDIR=%{buildroot} install %{?_smp_mflags} +find %{buildroot} -type f -name "*.la" -delete -print -install -Dpm0755 "%SOURCE2" "%buildroot/sbin/mount.ewf" -ln -s mount.ewf "%buildroot/sbin/umount.ewf" +install -Dpm0755 "%{SOURCE2}" "%{buildroot}/sbin/mount.ewf" +ln -s mount.ewf "%{buildroot}/sbin/umount.ewf" -%post -n %lname -p /sbin/ldconfig -%postun -n %lname -p /sbin/ldconfig +%post -n %{lname} -p /sbin/ldconfig -%files -n %lname +%postun -n %{lname} -p /sbin/ldconfig + +%files -n %{lname} %defattr(-,root,root) %doc AUTHORS COPYING NEWS ChangeLog -%_libdir/libewf.so.* +%{_libdir}/libewf.so.* %files tools %defattr(-,root,root) -%_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* +%{_mandir}/man1/ewf*.1* /sbin/*mount.ewf %files devel %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING NEWS README %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 -n python-%name +%files -n python-%{name} %defattr(-,root,root) %doc AUTHORS COPYING NEWS README -%python_sitearch/pyewf.so +%{python_sitearch}/pyewf.so %changelog