rdd: fix with newer libewf support

app-forensics/rdd/Manifest

@@ -0,0 +1 @@
+DIST rdd-3.0.4.tar.gz 5896942 SHA256 13e20e91dbc029a4a4f0713c1a049c94378083a1f3469ef0006e301484040685 SHA512 8f4536cfd8d1f4bb841a40d163b922698e27f02b8aa9f525c265e4c2ebf94bf5e61f8ea8452fca00d5a5ab7977bc24b64288b6442c8076692b045ed9936ba86f WHIRLPOOL 25a5b8032aa6c317d55f83ad745e1c0436aac12655726ce4a1938900bcd34c7cb92d6410159b490800bf8b850658573f3999a15b261539597820aa5360e4ecb3

app-forensics/rdd/files/a

@@ -0,0 +1,27 @@
+diff -aur dff-pristine/dff/modules/connector/ewf/ewf.cpp dff/dff/modules/connector/ewf/ewf.cpp
+--- dff-pristine/dff/modules/connector/ewf/ewf.cpp	2017-01-12 15:43:14.783144000 +0800
++++ dff/dff/modules/connector/ewf/ewf.cpp	2017-01-12 15:45:36.262211614 +0800
+@@ -248,7 +248,7 @@
+   int res = 0;
+   mutex_lock(&this->__io_mutex);
+   libewf_error_t* error = NULL;
+-  res = libewf_handle_read_random(this->ewf_ghandle, buff, size, fi->offset, &error);
++  res = libewf_handle_read_buffer_at_offset(this->ewf_ghandle, buff, size, fi->offset, &error);
+   if (res > 0)
+     fi->offset += res;
+   mutex_unlock(&this->__io_mutex);
+
+
+-libewf_handle_set_segment_file_size
++libewf_handle_set_maximum_segment_size
+
+
+-libewf_get_flags_write
++libewf_get_access_flags_write
+
+
+-libewf_get_flags_read
++libewf_get_access_flags_read
+
+-libewf_handle_get_segment_file_size
++libewf_handle_get_maximum_segment_size

app-forensics/rdd/files/libewf_handle.h

@@ -0,0 +1,502 @@
+/*
+ * Handle functions
+ *
+ * Copyright (C) 2006-2017, Joachim Metz <joachim.metz@gmail.com>
+ *
+ * Refer to AUTHORS for acknowledgements.
+ *
+ * This software is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this software.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#if !defined( _LIBEWF_INTERNAL_HANDLE_H )
+#define _LIBEWF_INTERNAL_HANDLE_H
+
+#include <common.h>
+#include <types.h>
+
+#include "libewf_chunk_data.h"
+#include "libewf_chunk_group.h"
+#include "libewf_chunk_table.h"
+#include "libewf_data_chunk.h"
+#include "libewf_extern.h"
+#include "libewf_hash_sections.h"
+#include "libewf_libbfio.h"
+#include "libewf_libcdata.h"
+#include "libewf_libcerror.h"
+#include "libewf_libcthreads.h"
+#include "libewf_libfcache.h"
+#include "libewf_libfdata.h"
+#include "libewf_libfvalue.h"
+#include "libewf_io_handle.h"
+#include "libewf_media_values.h"
+#include "libewf_read_io_handle.h"
+#include "libewf_segment_table.h"
+#include "libewf_single_files.h"
+#include "libewf_types.h"
+#include "libewf_write_io_handle.h"
+
+#if defined( __cplusplus )
+extern "C" {
+#endif
+
+typedef struct libewf_internal_handle libewf_internal_handle_t;
+
+struct libewf_internal_handle
+{
+	/* The IO handle
+	 */
+	libewf_io_handle_t *io_handle;
+
+	/* The media values
+	 */
+	libewf_media_values_t *media_values;
+
+	/* The stored sessions information
+	 */
+	libcdata_array_t *sessions;
+
+	/* The stored tracks information
+	 */
+	libcdata_array_t *tracks;
+
+	/* The sectors with acquiry read errors
+	 */
+	libcdata_range_list_t *acquiry_errors;
+
+	/* The file IO pool
+	 */
+	libbfio_pool_t *file_io_pool;
+
+	/* Value to indicate if the pool was created inside the library
+	 */
+	uint8_t file_io_pool_created_in_library;
+
+	/* The read IO handle
+	 */
+	libewf_read_io_handle_t *read_io_handle;
+
+	/* The write IO handle
+	 */
+	libewf_write_io_handle_t *write_io_handle;
+
+	/* The maximum number of open handles in the pool
+	 */
+	int maximum_number_of_open_handles;
+
+	/* The current (storage media) offset
+	 */
+	off64_t current_offset;
+
+	/* The current (storage media) chunk index
+	 */
+	uint64_t current_chunk_index;
+
+	/* The segment file table
+	 */
+	libewf_segment_table_t *segment_table;
+
+	/* The chunk table
+	 */
+	libewf_chunk_table_t *chunk_table;
+
+	/* The chunk groups cache
+	 */
+	libfcache_cache_t *chunk_groups_cache;
+
+	/* The chunks cache
+	 */
+	libfcache_cache_t *chunks_cache;
+
+	/* The current chunk data
+	 */
+	libewf_chunk_data_t *chunk_data;
+
+	/* The date format for certain header values
+	 */
+	int date_format;
+
+	/* The hash sections
+	 */
+	libewf_hash_sections_t *hash_sections;
+
+	/* The header values
+	 */
+	libfvalue_table_t *header_values;
+
+	/* Value to indicate the header values were parsed
+	 */
+	uint8_t header_values_parsed;
+
+	/* The hash values
+	 */
+	libfvalue_table_t *hash_values;
+
+	/* Value to indicate the hash values were parsed
+	 */
+	uint8_t hash_values_parsed;
+
+	/* The single files
+	 */
+	libewf_single_files_t *single_files;
+
+#if defined( HAVE_LIBEWF_MULTI_THREAD_SUPPORT )
+	/* The read/write lock
+	 */
+	libcthreads_read_write_lock_t *read_write_lock;
+#endif
+};
+
+LIBEWF_EXTERN \
+int libewf_handle_initialize(
+     libewf_handle_t **handle,
+     libcerror_error_t **error );
+
+LIBEWF_EXTERN \
+int libewf_handle_free(
+     libewf_handle_t **handle,
+     libcerror_error_t **error );
+
+LIBEWF_EXTERN \
+int libewf_handle_clone(
+     libewf_handle_t **destination_handle,
+     libewf_handle_t *source_handle,
+     libcerror_error_t **error );
+
+LIBEWF_EXTERN \
+int libewf_handle_signal_abort(
+     libewf_handle_t *handle,
+     libcerror_error_t **error );
+
+LIBEWF_EXTERN \
+int libewf_handle_open(
+     libewf_handle_t *handle,
+     char * const filenames[],
+     int number_of_filenames,
+     int access_flags,
+     libcerror_error_t **error );
+
+#if defined( HAVE_WIDE_CHARACTER_TYPE )
+
+LIBEWF_EXTERN \
+int libewf_handle_open_wide(
+     libewf_handle_t *handle,
+     wchar_t * const filenames[],
+     int number_of_filenames,
+     int access_flags,
+     libcerror_error_t **error );
+
+#endif /* defined( HAVE_WIDE_CHARACTER_TYPE ) */
+
+int libewf_internal_handle_open_read_segment_file_section_data(
+     libewf_internal_handle_t *internal_handle,
+     libewf_segment_file_t *segment_file,
+     libbfio_pool_t *file_io_pool,
+     int file_io_pool_entry,
+     libcerror_error_t **error );
+
+int libewf_internal_handle_open_read_segment_files(
+     libewf_internal_handle_t *internal_handle,
+     libbfio_pool_t *file_io_pool,
+     libewf_segment_table_t *segment_table,
+     libcerror_error_t **error );
+
+int libewf_internal_handle_open_file_io_pool(
+     libewf_internal_handle_t *internal_handle,
+     libbfio_pool_t *file_io_pool,
+     int access_flags,
+     libewf_segment_table_t *segment_table,
+     libcerror_error_t **error );
+
+LIBEWF_EXTERN \
+int libewf_handle_open_file_io_pool(
+     libewf_handle_t *handle,
+     libbfio_pool_t *file_io_pool,
+     int access_flags,
+     libcerror_error_t **error );
+
+LIBEWF_EXTERN \
+int libewf_handle_close(
+     libewf_handle_t *handle,
+     libcerror_error_t **error );
+
+ssize_t libewf_internal_handle_read_buffer_from_file_io_pool(
+         libewf_internal_handle_t *internal_handle,
+         libbfio_pool_t *file_io_pool,
+         void *buffer,
+         size_t buffer_size,
+         libcerror_error_t **error );
+
+LIBEWF_EXTERN \
+ssize_t libewf_handle_read_buffer(
+         libewf_handle_t *handle,
+         void *buffer,
+         size_t buffer_size,
+         libcerror_error_t **error );
+
+LIBEWF_EXTERN \
+ssize_t libewf_handle_read_buffer_at_offset(
+         libewf_handle_t *handle,
+         void *buffer,
+         size_t buffer_size,
+         off64_t offset,
+         libcerror_error_t **error );
+
+ssize_t libewf_internal_handle_write_buffer_to_file_io_pool(
+         libewf_internal_handle_t *internal_handle,
+         libbfio_pool_t *file_io_pool,
+         const void *buffer,
+         size_t buffer_size,
+         libcerror_error_t **error );
+
+LIBEWF_EXTERN \
+ssize_t libewf_handle_write_buffer(
+         libewf_handle_t *handle,
+         const void *buffer,
+         size_t buffer_size,
+         libcerror_error_t **error );
+
+LIBEWF_EXTERN \
+ssize_t libewf_handle_write_buffer_at_offset(
+         libewf_handle_t *handle,
+         const void *buffer,
+         size_t buffer_size,
+         off64_t offset,
+         libcerror_error_t **error );
+
+LIBEWF_EXTERN \
+int libewf_handle_get_data_chunk(
+     libewf_handle_t *handle,
+     libewf_data_chunk_t **data_chunk,
+     libcerror_error_t **error );
+
+ssize_t libewf_internal_handle_read_data_chunk_from_file_io_pool(
+         libewf_internal_handle_t *internal_handle,
+         libbfio_pool_t *file_io_pool,
+         libewf_internal_data_chunk_t *internal_data_chunk,
+         libcerror_error_t **error );
+
+LIBEWF_EXTERN \
+ssize_t libewf_handle_read_data_chunk(
+         libewf_handle_t *handle,
+         libewf_data_chunk_t *data_chunk,
+         libcerror_error_t **error );
+
+ssize_t libewf_internal_handle_write_data_chunk_to_file_io_pool(
+         libewf_internal_handle_t *internal_handle,
+         libbfio_pool_t *file_io_pool,
+         libewf_internal_data_chunk_t *internal_data_chunk,
+         libcerror_error_t **error );
+
+LIBEWF_EXTERN \
+ssize_t libewf_handle_write_data_chunk(
+         libewf_handle_t *handle,
+         libewf_data_chunk_t *data_chunk,
+         libcerror_error_t **error );
+
+ssize_t libewf_internal_handle_write_finalize_file_io_pool(
+         libewf_internal_handle_t *internal_handle,
+         libbfio_pool_t *file_io_pool,
+         libcerror_error_t **error );
+
+LIBEWF_EXTERN \
+ssize_t libewf_handle_write_finalize(
+         libewf_handle_t *handle,
+         libcerror_error_t **error );
+
+off64_t libewf_internal_handle_seek_offset(
+         libewf_internal_handle_t *internal_handle,
+         off64_t offset,
+         int whence,
+         libcerror_error_t **error );
+
+LIBEWF_EXTERN \
+off64_t libewf_handle_seek_offset(
+         libewf_handle_t *handle,
+         off64_t offset,
+         int whence,
+         libcerror_error_t **error );
+
+LIBEWF_EXTERN \
+int libewf_handle_get_offset(
+     libewf_handle_t *handle,
+     off64_t *offset,
+     libcerror_error_t **error );
+
+LIBEWF_EXTERN \
+int libewf_handle_set_maximum_number_of_open_handles(
+     libewf_handle_t *handle,
+     int maximum_number_of_open_handles,
+     libcerror_error_t **error );
+
+LIBEWF_EXTERN \
+int libewf_handle_segment_files_corrupted(
+     libewf_handle_t *handle,
+     libcerror_error_t **error );
+
+LIBEWF_EXTERN \
+int libewf_handle_segment_files_encrypted(
+     libewf_handle_t *handle,
+     libcerror_error_t **error );
+
+LIBEWF_EXTERN \
+int libewf_handle_get_segment_filename_size(
+     libewf_handle_t *handle,
+     size_t *filename_size,
+     libcerror_error_t **error );
+
+LIBEWF_EXTERN \
+int libewf_handle_get_segment_filename(
+     libewf_handle_t *handle,
+     char *filename,
+     size_t filename_size,
+     libcerror_error_t **error );
+
+LIBEWF_EXTERN \
+int libewf_handle_set_segment_filename(
+     libewf_handle_t *handle,
+     const char *filename,
+     size_t filename_length,
+     libcerror_error_t **error );
+
+#if defined( HAVE_WIDE_CHARACTER_TYPE )
+
+LIBEWF_EXTERN \
+int libewf_handle_get_segment_filename_size_wide(
+     libewf_handle_t *handle,
+     size_t *filename_size,
+     libcerror_error_t **error );
+
+LIBEWF_EXTERN \
+int libewf_handle_get_segment_filename_wide(
+     libewf_handle_t *handle,
+     wchar_t *filename,
+     size_t filename_size,
+     libcerror_error_t **error );
+
+LIBEWF_EXTERN \
+int libewf_handle_set_segment_filename_wide(
+     libewf_handle_t *handle,
+     const wchar_t *filename,
+     size_t filename_length,
+     libcerror_error_t **error );
+
+#endif /* defined( HAVE_WIDE_CHARACTER_TYPE ) */
+
+LIBEWF_EXTERN \
+int libewf_handle_get_maximum_segment_size(
+     libewf_handle_t *handle,
+     size64_t *maximum_segment_size,
+     libcerror_error_t **error );
+
+LIBEWF_EXTERN \
+int libewf_handle_set_maximum_segment_size(
+     libewf_handle_t *handle,
+     size64_t maximum_segment_size,
+     libcerror_error_t **error );
+
+LIBEWF_EXTERN \
+int libewf_handle_get_filename_size(
+     libewf_handle_t *handle,
+     size_t *filename_size,
+     libcerror_error_t **error );
+
+LIBEWF_EXTERN \
+int libewf_handle_get_filename(
+     libewf_handle_t *handle,
+     char *filename,
+     size_t filename_size,
+     libcerror_error_t **error );
+
+#if defined( HAVE_WIDE_CHARACTER_TYPE )
+
+LIBEWF_EXTERN \
+int libewf_handle_get_filename_size_wide(
+     libewf_handle_t *handle,
+     size_t *filename_size,
+     libcerror_error_t **error );
+
+LIBEWF_EXTERN \
+int libewf_handle_get_filename_wide(
+     libewf_handle_t *handle,
+     wchar_t *filename,
+     size_t filename_size,
+     libcerror_error_t **error );
+
+#endif /* defined( HAVE_WIDE_CHARACTER_TYPE ) */
+
+int libewf_internal_handle_get_file_io_handle(
+     libewf_internal_handle_t *internal_handle,
+     libbfio_handle_t **file_io_handle,
+     libcerror_error_t **error );
+
+LIBEWF_EXTERN \
+int libewf_handle_get_file_io_handle(
+     libewf_handle_t *handle,
+     libbfio_handle_t **file_io_handle,
+     libcerror_error_t **error );
+
+int libewf_internal_handle_get_media_values(
+     libewf_internal_handle_t *internal_handle,
+     size64_t *media_size,
+     libcerror_error_t **error );
+
+int libewf_internal_handle_set_media_values(
+     libewf_internal_handle_t *internal_handle,
+     uint32_t sectors_per_chunk,
+     uint32_t bytes_per_sector,
+     size64_t media_size,
+     libcerror_error_t **error );
+
+LIBEWF_EXTERN \
+int libewf_handle_get_root_file_entry(
+     libewf_handle_t *handle,
+     libewf_file_entry_t **root_file_entry,
+     libcerror_error_t **error );
+
+int libewf_internal_handle_get_file_entry_by_utf8_path(
+     libewf_internal_handle_t *internal_handle,
+     const uint8_t *utf8_string,
+     size_t utf8_string_length,
+     libewf_file_entry_t **file_entry,
+     libcerror_error_t **error );
+
+LIBEWF_EXTERN \
+int libewf_handle_get_file_entry_by_utf8_path(
+     libewf_handle_t *handle,
+     const uint8_t *utf8_string,
+     size_t utf8_string_length,
+     libewf_file_entry_t **file_entry,
+     libcerror_error_t **error );
+
+int libewf_internal_handle_get_file_entry_by_utf16_path(
+     libewf_internal_handle_t *internal_handle,
+     const uint16_t *utf16_string,
+     size_t utf16_string_length,
+     libewf_file_entry_t **file_entry,
+     libcerror_error_t **error );
+
+LIBEWF_EXTERN \
+int libewf_handle_get_file_entry_by_utf16_path(
+     libewf_handle_t *handle,
+     const uint16_t *utf16_string,
+     size_t utf16_string_length,
+     libewf_file_entry_t **file_entry,
+     libcerror_error_t **error );
+
+#if defined( __cplusplus )
+}
+#endif
+
+#endif /* !defined( _LIBEWF_INTERNAL_HANDLE_H ) */
+

app-forensics/rdd/files/rdd-3.0.4-sandbox-fix.patch

@@ -0,0 +1,25 @@
+diff -Naur rdd-3.0.4-orig/src/Makefile.am rdd-3.0.4/src/Makefile.am
+--- rdd-3.0.4-orig/src/Makefile.am	2013-07-26 11:27:50.288696066 -0400
++++ rdd-3.0.4/src/Makefile.am	2013-07-26 12:14:51.601771619 -0400
+@@ -83,14 +83,15 @@
+ 			rdd-verify.1
+ 
+ install-exec-local:
+-			$(INSTALL) $(srcdir)/rddi.py $(bindir)/rddi
+-			$(INSTALL) $(srcdir)/plot-entropy.py $(bindir)/plot-entropy
+-			$(INSTALL) $(srcdir)/plot-md5.py $(bindir)/plot-md5
++			$(INSTALL) -d $(DESTDIR)$(bindir)
++			$(INSTALL) $(srcdir)/rddi.py $(DESTDIR)$(bindir)/rddi
++			$(INSTALL) $(srcdir)/plot-entropy.py $(DESTDIR)$(bindir)/plot-entropy
++			$(INSTALL) $(srcdir)/plot-md5.py $(DESTDIR)$(bindir)/plot-md5
+ 
+ uninstall-local:
+-			rm -f $(bindir)/rddi
+-			rm -f $(bindir)/plot-entropy
+-			rm -f $(bindir)/plot-md5
++			rm -f $(DESTDIR)$(bindir)/rddi
++			rm -f $(DESTDIR)$(bindir)/plot-entropy
++			rm -f $(DESTDIR)$(bindir)/plot-md5
+ 
+ DISTCLEANFILES=		Makefile.in
+ 

app-forensics/rdd/rdd-3.0.4-r2.ebuild

@@ -0,0 +1,59 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit autotools eutils
+
+# no worky
+RESTRICT="test"
+
+DESCRIPTION="Rdd is a forensic copy program"
+HOMEPAGE="http://www.sf.net/projects/rdd"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+KEYWORDS="~x86 ~amd64"
+IUSE="debug doc"
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND=">=app-forensics/libewf-20170701
+	x11-libs/gtk+:2
+	gnome-base/libglade:2.0"
+
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+src_prepare() {
+	epatch "${FILESDIR}/rdd-3.0.4-sandbox-fix.patch"
+	sed -i 's/AM_PATH_GTK_2_0//' configure.ac || die
+
+	#libewf 2017 api fix
+	sed -i 's/libewf_get_flags_write/libewf_get_access_flags_write/' src/ewfwriter.c || die
+	sed -i 's/libewf_get_flags_read/libewf_get_access_flags_read/' src/ewfwriter.c || die
+	sed -i 's/libewf_handle_set_segment_file_size/libewf_handle_set_maximum_segment_size/' src/ewfwriter.c || die
+	sed -i 's/libewf_handle_get_segment_file_size/libewf_handle_get_maximum_segment_size/' src/ewfwriter.c || die
+	sed -i 's/libewf_get_flags_read/libewf_get_access_flags_read/' test/tewfwriter.c || die
+	sed -i 's/libewf_handle_get_segment_file_size/libewf_handle_get_maximum_segment_size/' test/tewfwriter.c || die
+
+	AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+	#doxygen-html fails but the docs are prebuilt so we don't need to enable them
+	econf --disable-doxygen-html \
+		$(use_enable debug tracing) \
+		$(use_enable doc doxygen-doc)
+}
+
+src_compile() {
+	emake -j1
+}
+
+src_install() {
+	emake install DESTDIR="${D}"
+	dobin src/rddi.py
+	dosym rdd-copy /usr/bin/rdd
+	#this causes a warning about not being recursive, no clue why
+	dohtml -r doxygen-doc/html/*
+}