commit 73a13fa3317e0acaa9a630bb407f5bfe8c940812
Author: Jakub Bogusz <[email protected]>
Date: Sun Jan 25 09:58:11 2015 +0100
- new URLs, updated to 20150107 (untagged; note: new soname, license is
LGPL v3+ now)
- added system-libs patch (use system libraries from libyal project)
- added includes patch (resolve some issues with libcsystem)
libewf-includes.patch | 114 +++++++++++++++++++++++++++++++++++
libewf-system-libs.patch | 114 +++++++++++++++++++++++++++++++++++
libewf.spec | 152 +++++++++++++++++++++++++++++++++++++++++------
3 files changed, 361 insertions(+), 19 deletions(-)
---
diff --git a/libewf.spec b/libewf.spec
index 00ff86a..e823e71 100644
--- a/libewf.spec
+++ b/libewf.spec
@@ -1,19 +1,53 @@
-Summary: Library and tools to support the Expert Witness Compression
Format
-Summary(pl.UTF-8): Biblioteka i narzędzia obsługujące format Expert
Witness Compression Format
+#
+# Conditional build:
+%bcond_without python # Python bindings
+#
+Summary: Library to support the Expert Witness Compression Format
+Summary(pl.UTF-8): Biblioteka obsługująca format Expert Witness
Compression Format
Name: libewf
-Version: 20100226
-Release: 2
-License: BSD
+# see AC_INIT in configure.ac
+Version: 20150107
+%define gitrev f5aa33eaa9f93c60a9005c46c6afe88d8a46645e
+Release: 1
+License: LGPL v3+
Group: Libraries
-Source0:
http://downloads.sourceforge.net/project/libewf/libewf/%{name}-%{version}/libewf-%{version}.tar.gz
-# Source0-md5: a697d629bb74df1fa68f22658634fdb9
-URL: http://sourceforge.net/projects/libewf/
+Source0:
https://github.com/libyal/libewf/archive/%{gitrev}/%{name}-%{version}.tar.gz
+# Source0-md5: 24ede215847822fe86a88a6ce77fac4a
+Patch0: %{name}-system-libs.patch
+Patch1: %{name}-includes.patch
+URL: https://github.com/libyal/libewf/
BuildRequires: autoconf >= 2.59
-BuildRequires: automake
+BuildRequires: automake >= 1.6
+BuildRequires: bzip2-devel >= 1.0
+BuildRequires: gettext-tools >= 0.18.1
+BuildRequires: libbfio-devel >= 20120426
+BuildRequires: libcaes-devel >= 20130716
+BuildRequires: libcdata-devel >= 20150102
+BuildRequires: libcdatetime-devel >= 20141018
+BuildRequires: libcerror-devel >= 20120425
+BuildRequires: libcfile-devel >= 20140503
+BuildRequires: libclocale-devel >= 20120425
+BuildRequires: libcnotify-devel >= 20120425
+BuildRequires: libcpath-devel >= 20120701
+BuildRequires: libcsplit-devel >= 20120701
+BuildRequires: libcstring-devel >= 20120425
+BuildRequires: libcsystem-devel >= 20141018
+BuildRequires: libcthreads-devel >= 20130509
+BuildRequires: libfcache-devel >= 20140601
+BuildRequires: libfdata-devel >= 20140915
+BuildRequires: libfuse-devel >= 2.6
+BuildRequires: libfvalue-devel >= 20130415
+BuildRequires: libhmac-devel >= 20130714
+BuildRequires: libodraw-devel >= 20120630
+BuildRequires: libsmdev-devel >= 20140406
+BuildRequires: libsmraw-devel >= 20120630
+BuildRequires: libuna-devel >= 20120425
BuildRequires: libtool
-BuildRequires: libuuid-devel
-BuildRequires: openssl-devel
-BuildRequires: zlib-devel
+BuildRequires: libuuid-devel >= 2.20
+BuildRequires: openssl-devel >= 1.0
+%{?with_python:BuildRequires: python-devel >= 1:2.5}
+BuildRequires: sed >= 4.0
+BuildRequires: zlib-devel >= 1.2.5
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -33,7 +67,24 @@ Summary: Header files for libewf library
Summary(pl.UTF-8): Pliki nagłówkowe biblioteki libewf
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: zlib-devel
+Requires: bzip2-devel >= 1.0
+Requires: libbfio-devel >= 20120426
+Requires: libcaes-devel >= 20130716
+Requires: libcdata-devel >= 20150102
+Requires: libcerror-devel >= 20120425
+Requires: libcfile-devel >= 20140503
+Requires: libclocale-devel >= 20120425
+Requires: libcnotify-devel >= 20120425
+Requires: libcpath-devel >= 20120701
+Requires: libcsplit-devel >= 20120701
+Requires: libcstring-devel >= 20120425
+Requires: libcthreads-devel >= 20130509
+Requires: libfcache-devel >= 20140601
+Requires: libfvalue-devel >= 20130415
+Requires: libhmac-devel >= 20130714
+Requires: libuna-devel >= 20120425
+Requires: openssl-devel >= 1.0
+Requires: zlib-devel >= 1.2.5
%description devel
Header files for libewf library.
@@ -53,16 +104,51 @@ Static libewf library.
%description static -l pl.UTF-8
Statyczna biblioteka libewf.
+%package tools
+Summary: Tools to support the Expert Witness Compression Format
+Summary(pl.UTF-8): Narzędzia obsługujące format Expert Witness Compression
Format
+Group: Applications/File
+Requires: %{name} = %{version}-%{release}
+Requires: libcdatetime-devel >= 20141018
+Requires: libcsystem >= 20141018
+Requires: libfuse >= 2.6
+Requires: libodraw >= 20120630
+Requires: libsmdev >= 20140406
+Requires: libsmraw >= 20120630
+
+%description tools
+Tools to support the Expert Witness Compression Format.
+
+%description tools -l pl.UTF-8
+Narzędzia obsługujące format Expert Witness Compression Format.
+
+%package -n python-pyewf
+Summary: Python bindings for libewf library
+Summary(pl.UTF-8): Wiązania Pythona do biblioteki libewf
+Group: Libraries/Python
+Requires: %{name} = %{version}-%{release}
+
+%description -n python-pyewf
+Python bindings for libewf library.
+
+%description -n python-pyewf -l pl.UTF-8
+Wiązania Pythona do biblioteki libewf.
+
%prep
-%setup -q
+%setup -q -n %{name}-%{gitrev}
+%patch0 -p1
+%patch1 -p1
%build
+%{__gettextize}
+%{__sed} -i -e 's/ po\/Makefile.in//' configure.ac
%{__libtoolize}
%{__aclocal}
%{__autoconf}
%{__autoheader}
%{__automake}
-%configure
+%configure \
+ %{?with_python:--enable-python}
%{__make}
%install
@@ -71,6 +157,13 @@ rm -rf $RPM_BUILD_ROOT
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libewf.la
+
+%if %{with python}
+%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/pyewf.{la,a}
+%endif
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -80,16 +173,13 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
%doc AUTHORS COPYING ChangeLog NEWS
-%attr(755,root,root) %{_bindir}/ewf*
%attr(755,root,root) %{_libdir}/libewf.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libewf.so.1
-%{_mandir}/man1/ewf*.1*
+%attr(755,root,root) %ghost %{_libdir}/libewf.so.2
%files devel
%defattr(644,root,root,755)
%doc documents/header*.txt
%attr(755,root,root) %{_libdir}/libewf.so
-%{_libdir}/libewf.la
%{_includedir}/libewf
%{_includedir}/libewf.h
%{_pkgconfigdir}/libewf.pc
@@ -98,3 +188,27 @@ rm -rf $RPM_BUILD_ROOT
%files static
%defattr(644,root,root,755)
%{_libdir}/libewf.a
+
+%files tools
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/ewfacquire
+%attr(755,root,root) %{_bindir}/ewfacquirestream
+%attr(755,root,root) %{_bindir}/ewfdebug
+%attr(755,root,root) %{_bindir}/ewfexport
+%attr(755,root,root) %{_bindir}/ewfinfo
+%attr(755,root,root) %{_bindir}/ewfmount
+%attr(755,root,root) %{_bindir}/ewfrecover
+%attr(755,root,root) %{_bindir}/ewfverify
+%{_mandir}/man1/ewfacquire.1*
+%{_mandir}/man1/ewfacquirestream.1*
+%{_mandir}/man1/ewfexport.1*
+%{_mandir}/man1/ewfinfo.1*
+%{_mandir}/man1/ewfmount.1*
+%{_mandir}/man1/ewfrecover.1*
+%{_mandir}/man1/ewfverify.1*
+
+%if %{with python}
+%files -n python-pyewf
+%defattr(644,root,root,755)
+%attr(755,root,root) %{py_sitedir}/pyewf.so
+%endif
diff --git a/libewf-includes.patch b/libewf-includes.patch
new file mode 100644
index 0000000..8a14eb2
--- /dev/null
+++ b/libewf-includes.patch
@@ -0,0 +1,114 @@
+--- libewf-f5aa33eaa9f93c60a9005c46c6afe88d8a46645e/ewftools/ewfacquire.c.orig
2015-01-14 08:44:40.000000000 +0100
++++ libewf-f5aa33eaa9f93c60a9005c46c6afe88d8a46645e/ewftools/ewfacquire.c
2015-01-25 08:42:59.093079450 +0100
+@@ -26,6 +26,9 @@
+ #if defined( HAVE_STDLIB_H ) || defined( WINAPI )
+ #include <stdlib.h>
+ #endif
++#if defined( HAVE_UNISTD_H )
++#include <unistd.h>
++#endif
+
+ #include "byte_size_string.h"
+ #include "device_handle.h"
+---
libewf-f5aa33eaa9f93c60a9005c46c6afe88d8a46645e/ewftools/ewfacquirestream.c.orig
2015-01-14 08:44:40.000000000 +0100
++++
libewf-f5aa33eaa9f93c60a9005c46c6afe88d8a46645e/ewftools/ewfacquirestream.c
2015-01-25 09:39:58.312935929 +0100
+@@ -30,6 +30,9 @@
+ #if defined( HAVE_STDLIB_H ) || defined( WINAPI )
+ #include <stdlib.h>
+ #endif
++#if defined( HAVE_UNISTD_H )
++#include <unistd.h>
++#endif
+
+ #include "byte_size_string.h"
+ #include "ewfcommon.h"
+@@ -323,7 +326,7 @@ ssize_t ewfacquirestream_read_chunk(
+
+ while( read_number_of_errors <= read_error_retries )
+ {
+- read_count = libcsystem_file_io_read(
++ read_count = read(
+ input_file_descriptor,
+ &( buffer[ buffer_offset +
read_error_offset ] ),
+ bytes_to_read );
+--- libewf-f5aa33eaa9f93c60a9005c46c6afe88d8a46645e/ewftools/ewfdebug.c.orig
2015-01-14 08:44:40.000000000 +0100
++++ libewf-f5aa33eaa9f93c60a9005c46c6afe88d8a46645e/ewftools/ewfdebug.c
2015-01-25 09:40:21.596268288 +0100
+@@ -26,6 +26,9 @@
+ #if defined( HAVE_STDLIB_H ) || defined( WINAPI )
+ #include <stdlib.h>
+ #endif
++#if defined( HAVE_UNISTD_H )
++#include <unistd.h>
++#endif
+
+ #if defined( HAVE_GLOB_H )
+ #include <glob.h>
+--- libewf-f5aa33eaa9f93c60a9005c46c6afe88d8a46645e/ewftools/ewfexport.c.orig
2015-01-14 08:44:40.000000000 +0100
++++ libewf-f5aa33eaa9f93c60a9005c46c6afe88d8a46645e/ewftools/ewfexport.c
2015-01-25 09:40:45.122933951 +0100
+@@ -26,6 +26,9 @@
+ #if defined( HAVE_STDLIB_H ) || defined( WINAPI )
+ #include <stdlib.h>
+ #endif
++#if defined( HAVE_UNISTD_H )
++#include <unistd.h>
++#endif
+
+ #if defined( HAVE_SYS_RESOURCE_H )
+ #include <sys/resource.h>
+--- libewf-f5aa33eaa9f93c60a9005c46c6afe88d8a46645e/ewftools/ewfinfo.c.orig
2015-01-14 08:44:40.000000000 +0100
++++ libewf-f5aa33eaa9f93c60a9005c46c6afe88d8a46645e/ewftools/ewfinfo.c
2015-01-25 09:41:47.342931361 +0100
+@@ -26,6 +26,9 @@
+ #if defined( HAVE_STDLIB_H ) || defined( WINAPI )
+ #include <stdlib.h>
+ #endif
++#if defined( HAVE_UNISTD_H )
++#include <unistd.h>
++#endif
+
+ #if defined( HAVE_SYS_RESOURCE_H )
+ #include <sys/resource.h>
+--- libewf-f5aa33eaa9f93c60a9005c46c6afe88d8a46645e/ewftools/ewfrecover.c.orig
2015-01-14 08:44:40.000000000 +0100
++++ libewf-f5aa33eaa9f93c60a9005c46c6afe88d8a46645e/ewftools/ewfrecover.c
2015-01-25 09:42:07.626263849 +0100
+@@ -26,6 +26,9 @@
+ #if defined( HAVE_STDLIB_H ) || defined( WINAPI )
+ #include <stdlib.h>
+ #endif
++#if defined( HAVE_UNISTD_H )
++#include <unistd.h>
++#endif
+
+ #if defined( HAVE_SYS_RESOURCE_H )
+ #include <sys/resource.h>
+--- libewf-f5aa33eaa9f93c60a9005c46c6afe88d8a46645e/ewftools/ewfverify.c.orig
2015-01-14 08:44:40.000000000 +0100
++++ libewf-f5aa33eaa9f93c60a9005c46c6afe88d8a46645e/ewftools/ewfverify.c
2015-01-25 09:42:24.279596329 +0100
+@@ -26,6 +26,9 @@
+ #if defined( HAVE_STDLIB_H ) || defined( WINAPI )
+ #include <stdlib.h>
+ #endif
++#if defined( HAVE_UNISTD_H )
++#include <unistd.h>
++#endif
+
+ #if defined( HAVE_SYS_RESOURCE_H )
+ #include <sys/resource.h>
+---
libewf-f5aa33eaa9f93c60a9005c46c6afe88d8a46645e/ewftools/export_handle.c.orig
2015-01-14 08:44:40.000000000 +0100
++++ libewf-f5aa33eaa9f93c60a9005c46c6afe88d8a46645e/ewftools/export_handle.c
2015-01-25 09:41:23.036265740 +0100
+@@ -1311,7 +1311,7 @@ ssize_t export_handle_write_buffer(
+ {
+ if( export_handle->use_stdout != 0 )
+ {
+- write_count = libcsystem_file_io_write(
++ write_count = write(
+ 1,
+ storage_media_buffer->raw_buffer,
+ write_size );
+---
libewf-f5aa33eaa9f93c60a9005c46c6afe88d8a46645e/libewf/libewf_case_data.c.orig
2015-01-14 08:44:40.000000000 +0100
++++ libewf-f5aa33eaa9f93c60a9005c46c6afe88d8a46645e/libewf/libewf_case_data.c
2015-01-25 08:47:09.853068905 +0100
+@@ -28,6 +28,7 @@
+ #include "libewf_header_values.h"
+ #include "libewf_libcerror.h"
+ #include "libewf_libcnotify.h"
++#include "libewf_libcstring.h"
+ #include "libewf_libfvalue.h"
+ #include "libewf_libuna.h"
+ #include "libewf_media_values.h"
diff --git a/libewf-system-libs.patch b/libewf-system-libs.patch
new file mode 100644
index 0000000..edd707a
--- /dev/null
+++ b/libewf-system-libs.patch
@@ -0,0 +1,114 @@
+--- libewf-f5aa33eaa9f93c60a9005c46c6afe88d8a46645e/configure.ac.orig
2015-01-14 08:44:40.000000000 +0100
++++ libewf-f5aa33eaa9f93c60a9005c46c6afe88d8a46645e/configure.ac
2015-01-25 07:52:56.099872114 +0100
+@@ -218,28 +218,7 @@ dnl Have configure make the Makefiles
+ AC_CONFIG_FILES([Makefile])
+ AC_CONFIG_FILES([include/Makefile])
+ AC_CONFIG_FILES([common/Makefile])
+-AC_CONFIG_FILES([libcstring/Makefile])
+-AC_CONFIG_FILES([libcerror/Makefile])
+-AC_CONFIG_FILES([libcthreads/Makefile])
+-AC_CONFIG_FILES([libcdata/Makefile])
+-AC_CONFIG_FILES([libclocale/Makefile])
+-AC_CONFIG_FILES([libcdatetime/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([libhmac/Makefile])
+-AC_CONFIG_FILES([libcaes/Makefile])
+ AC_CONFIG_FILES([libewf/Makefile])
+-AC_CONFIG_FILES([libodraw/Makefile])
+-AC_CONFIG_FILES([libsmdev/Makefile])
+-AC_CONFIG_FILES([libsmraw/Makefile])
+-AC_CONFIG_FILES([libcsystem/Makefile])
+ AC_CONFIG_FILES([ewftools/Makefile])
+ AC_CONFIG_FILES([ewf.net/Makefile])
+ AC_CONFIG_FILES([pyewf/Makefile])
+--- libewf-f5aa33eaa9f93c60a9005c46c6afe88d8a46645e/Makefile.am.orig
2015-01-14 08:44:40.000000000 +0100
++++ libewf-f5aa33eaa9f93c60a9005c46c6afe88d8a46645e/Makefile.am
2015-01-25 07:53:22.973204319 +0100
+@@ -3,28 +3,7 @@ ACLOCAL_AMFLAGS = -I m4
+ SUBDIRS = \
+ include \
+ common \
+- libcstring \
+- libcerror \
+- libcthreads \
+- libcdata \
+- libcdatetime \
+- libclocale \
+- libcnotify \
+- libcsplit \
+- libuna \
+- libcfile \
+- libcpath \
+- libbfio \
+- libfcache \
+- libfdata \
+- libfvalue \
+- libhmac \
+- libcaes \
+ libewf \
+- libodraw \
+- libsmdev \
+- libsmraw \
+- libcsystem \
+ ewftools \
+ ewf.net \
+ pyewf \
+@@ -79,22 +58,6 @@ lib: library
+
+ library:
+ (cd $(srcdir)/common && $(MAKE) $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libcstring && $(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)/libfvalue && $(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))
+
+@@ -113,28 +76,7 @@ distclean: clean
+ done && test -z "$$fail"
+
+ splint:
+- (cd $(srcdir)/libcstring && $(MAKE) splint $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libcerror && $(MAKE) splint $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libcthreads && $(MAKE) splint $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libcdata && $(MAKE) splint $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libcdatetime && $(MAKE) splint $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libclocale && $(MAKE) splint $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libcnotify && $(MAKE) splint $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libcsplit && $(MAKE) splint $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libuna && $(MAKE) splint $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libcfile && $(MAKE) splint $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libcpath && $(MAKE) splint $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libbfio && $(MAKE) splint $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libfcache && $(MAKE) splint $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libfdata && $(MAKE) splint $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libfvalue && $(MAKE) splint $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libhmac && $(MAKE) splint $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libcaes && $(MAKE) splint $(AM_MAKEFLAGS))
+ (cd $(srcdir)/libewf && $(MAKE) splint $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libodraw && $(MAKE) splint $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libsmdev && $(MAKE) splint $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libsmraw && $(MAKE) splint $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libcsystem && $(MAKE) splint $(AM_MAKEFLAGS))
+ (cd $(srcdir)/ewftools && $(MAKE) splint $(AM_MAKEFLAGS))
+ (cd $(srcdir)/pyewf && $(MAKE) splint $(AM_MAKEFLAGS))
+ (cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS))
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libewf.git/commitdiff/73a13fa3317e0acaa9a630bb407f5bfe8c940812
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
