dff: libpff 20120513 patch added. Nightmare

This commit is contained in:
Anton Bolshakov 2012-05-19 04:10:45 +00:00
parent 525c6ec7c7
commit 0bdd9fc7f2
3 changed files with 215 additions and 0 deletions

View file

@ -1,8 +1,10 @@
AUX dff-1.1.0-disable-qtassistant.patch 1657 RMD160 06b9679458b97f91c33eb74fa84d7c0d55b816eb SHA1 535d4e60cee04b53d044f273053cd69043472197 SHA256 c4f17f4f3d65987802953683bce3f966d4f149c5deefc465354e63e8a090e5cf
AUX dff-1.1.0-libpff-libbfio.patch 1579 RMD160 78f3c0dde17e362fb2e394a934c6056378d5e8cf SHA1 73ac651c35566a2ed077fada9c3411eacd578aa6 SHA256 c5710ed7c45b14496ce998e464db0aced4f5ed95644bb7c43d90e8c5a0714406
AUX dff-1.2.0-disable-qtassistant.patch 1709 RMD160 ea46b8295c4f629e17927c58d99226242244bc85 SHA1 639a708c5c34be57a045971461487189b6bccf2d SHA256 bbe3cb05c43273d50e7d45cced48f9df8c376b3079eeb963b92fad417f3f97e8
AUX dff-1.2.0-libpff-0.0.20120513.patch 9453 RMD160 965e08fc0e5f2daf3919b957eddb8f7bf3ac9220 SHA1 0880efe8a8869fa6b446eaa9be2bd74112e193a4 SHA256 8f28a4fc1d4ca0904db82492dd0cecd29898aaebab772af3f20011f2a42098ce
DIST dff-src-1.1.0.tar.gz 9751963 RMD160 59c62046e6f06766fdfe27ae4b1c7e8f811f5c13 SHA1 3eb0700b40a4bdc29ab9dbd3ecbae0441303b6b3 SHA256 0dab2e10f9c2cb2d1363b51284e9616725f85e84aea58719848f41626fa894d1
DIST dff-src-1.2.0.tar.gz 9925178 RMD160 6ea77397c1f429921f3b28db254d68bcfb62ae83 SHA1 078869aed2e56cdf5955dac390aef0c4919d690d SHA256 e6342f1b105fa9077d4b859e1dba0214e5e899ce152b9d26342a9f14659c6de6
EBUILD dff-1.1.0-r1.ebuild 1014 RMD160 84e30fddb36a822cc9036e526f981d0da1a77388 SHA1 338902072979dbf3f45f035814ed132f1f66db52 SHA256 eaf5131b821cd23292d5c0158764221f7554d125015fc3dc6ea54040a236a3ad
EBUILD dff-1.2.0-r1.ebuild 1020 RMD160 490a0995737f879817665410e695ec5b8e03e989 SHA1 851312a0280303158af53d29af598f5f30be8ba6 SHA256 099651c5c4567e184277f00d89f3b7d8932f40b06da563cff24b216b90873106
EBUILD dff-1.2.0.ebuild 1008 RMD160 f51d38eb8e598af53127ce1f628f2d3c5ab42e0c SHA1 b5bf5368fb0af69ca3715ee508a785b0872c53aa SHA256 13a78d106e1a4accc0d76c9f9016af25e620cdda98a155cb242d8d3bd1bff3cf
MISC metadata.xml 394 RMD160 df210fb9ce05a23c5baec3b506f7767020600437 SHA1 aaaa68db4a9341176e4a4abf0191ef0eefca5588 SHA256 468d24a01d9970364c6953f3f5cd896ced22cd80c417b3fbd9bd040230c37753

View file

@ -0,0 +1,40 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=4
PYTHON_DEPEND="2:2.6"
inherit cmake-utils python
DESCRIPTION="A digital forensics framework which aims to analyze and recover any
kind of digital artifact."
HOMEPAGE="http://tracker.digital-forensic.org/"
SRC_URI="http://www.digital-forensic.org/${PN}-src-${PV}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~x86 ~amd64"
IUSE="doc ewf +aff +pff"
DEPEND=">=dev-lang/swig-1.3.38
dev-python/sip
doc? ( >=dev-python/PyQt4-4.4.0[webkit,assistant] )
!doc? ( >=dev-python/PyQt4-4.4.0 )
>=sys-apps/file-4.26[python]
"
RDEPEND="${DEPEND}
ewf? ( >=app-forensics/libewf-20100226 )
aff? ( >=app-forensics/afflib-3.6.8 )
pff? ( >=app-forensics/libpff-0.0.20120513_alpha )
"
src_prepare() {
epatch "${FILESDIR}/${P}-disable-qtassistant.patch"
epatch "${FILESDIR}/${P}-libpff-0.0.20120513"
}
src_configure() {
mycmakeargs+=( "-DINSTALL:BOOLEAN=ON" )
cmake-utils_src_configure
}

View file

@ -0,0 +1,173 @@
--- dff-1.2.0/modules/mailbox/pff/pff_export.cpp.orig 2011-10-04 23:38:45.000000000 +0800
+++ dff-1.2.0/modules/mailbox/pff/pff_export.cpp 2012-05-19 09:34:59.792450004 +0800
@@ -186,7 +186,7 @@
size_t folder_name_size = 0;
int result = 0;
- result = libpff_folder_get_name_size(folder, &folder_name_size, &(this->pff_error));
+ result = libpff_folder_get_utf8_name_size(folder, &folder_name_size, &(this->pff_error));
if (result == 0 || result == -1 || folder_name_size == 0)
{
std::ostringstream folderName;
@@ -197,7 +197,7 @@
else
{
folder_name = (uint8_t *) new uint8_t[folder_name_size];
- result = libpff_folder_get_name(folder, folder_name, folder_name_size, NULL);
+ result = libpff_folder_get_utf8_name(folder, folder_name, folder_name_size, NULL);
subFolder = new PffNodeFolder(std::string((char *)folder_name), parent, this);
}
@@ -234,7 +234,7 @@
PffNodeFolder* nodeFolder = new PffNodeFolder(messageName.str(), parent, this);
- if (libpff_message_get_transport_headers_size(email, &transport_headers_size, &(this->pff_error)))
+ if (libpff_message_get_utf8_transport_headers_size(email, &transport_headers_size, &(this->pff_error)))
{
if (transport_headers_size > 0)
new PffNodeEmailTransportHeaders("Transport Headers", nodeFolder, this, email, &(this->pff_error), &(this->pff_file), clone);
@@ -297,7 +297,7 @@
continue;
}
if (attachment_type == LIBPFF_ATTACHMENT_TYPE_DATA)
- libpff_attachment_get_long_filename_size(attachment, &attachment_filename_size,&(this->pff_error));
+ libpff_attachment_get_utf8_long_filename_size(attachment, &attachment_filename_size,&(this->pff_error));
attachment_filename = new uint8_t[attachment_filename_size];
if (attachment_filename == NULL)
@@ -309,7 +309,7 @@
std::ostringstream attachmentName;
if (attachment_type == LIBPFF_ATTACHMENT_TYPE_DATA)
{
- if ( libpff_attachment_get_long_filename(attachment, attachment_filename, attachment_filename_size, NULL ) != 1 )
+ if ( libpff_attachment_get_utf8_long_filename(attachment, attachment_filename, attachment_filename_size, NULL ) != 1 )
attachmentName << std::string("Attachment") << attachment_iterator + 1;
else
attachmentName << std::string((char*)attachment_filename);
--- dff-1.2.0/modules/mailbox/pff/pff_node_email_attributes.cpp.orig 2012-05-19 09:56:29.432450001 +0800
+++ dff-1.2.0/modules/mailbox/pff/pff_node_email_attributes.cpp 2012-05-19 09:59:35.751450002 +0800
@@ -164,7 +164,7 @@
size_t message_transport_headers_size = 0;
uint8_t *entry_string = NULL;
- if (libpff_message_get_transport_headers_size(item, &message_transport_headers_size,
+ if (libpff_message_get_utf8_transport_headers_size(item, &message_transport_headers_size,
this->pff_error) != 1)
return (0);
@@ -173,7 +173,7 @@
entry_string = new uint8_t [message_transport_headers_size];
- if (libpff_message_get_transport_headers(item, entry_string, message_transport_headers_size, this->pff_error ) != 1 )
+ if (libpff_message_get_utf8_transport_headers(item, entry_string, message_transport_headers_size, this->pff_error ) != 1 )
{
delete entry_string;
return (0);
@@ -210,7 +210,7 @@
maximum_entry_value_string_size = entry_value_string_size;
}
}
- if (libpff_recipients_get_display_name_size(recipients, recipient_iterator, &entry_value_string_size, NULL) == 1)
+ if (libpff_recipients_get_utf8_display_name_size(recipients, recipient_iterator, &entry_value_string_size, NULL) == 1)
{
if (entry_value_string_size > maximum_entry_value_string_size)
maximum_entry_value_string_size = entry_value_string_size;
@@ -357,11 +357,11 @@
int result = 0;
maximum_entry_value_string_size = 24;
- check_maximum_size(libpff_item_get_display_name_size)
- check_maximum_size(libpff_message_get_conversation_topic_size)
- check_maximum_size(libpff_message_get_subject_size)
- check_maximum_size(libpff_message_get_sender_name_size)
- check_maximum_size(libpff_message_get_sender_email_address_size)
+ check_maximum_size(libpff_item_get_utf8_display_name_size)
+ check_maximum_size(libpff_message_get_utf8_conversation_topic_size)
+ check_maximum_size(libpff_message_get_utf8_subject_size)
+ check_maximum_size(libpff_message_get_utf8_sender_name_size)
+ check_maximum_size(libpff_message_get_utf8_sender_email_address_size)
if (!(maximum_entry_value_string_size))
return (0);
@@ -392,11 +392,11 @@
(*attr)["Flags"] = new Variant(flags.str());
}
- value_string_to_attribute(libpff_item_get_display_name, "Display name")
- value_string_to_attribute(libpff_message_get_conversation_topic, "Conversation topic")
- value_string_to_attribute(libpff_message_get_subject, "Subject")
- value_string_to_attribute(libpff_message_get_sender_name, "Sender name")
- value_string_to_attribute(libpff_message_get_sender_email_address, "Sender email address")
+ value_string_to_attribute(libpff_item_get_utf8_display_name, "Display name")
+ value_string_to_attribute(libpff_message_get_utf8_conversation_topic, "Conversation topic")
+ value_string_to_attribute(libpff_message_get_utf8_subject, "Subject")
+ value_string_to_attribute(libpff_message_get_utf8_sender_name, "Sender name")
+ value_string_to_attribute(libpff_message_get_utf8_sender_email_address, "Sender email address")
if (libpff_message_get_importance(item, &entry_value_32bit, NULL) == 1)
{
--- dff-1.2.0/modules/mailbox/pff/pff_node_email_attributes.cpp.orig 2012-05-19 10:05:25.315450001 +0800
+++ dff-1.2.0/modules/mailbox/pff/pff_node_email_attributes.cpp 2012-05-19 10:07:50.120450001 +0800
@@ -235,7 +235,7 @@
if (libpff_item_get_entry_value_utf8_string(recipients, recipient_iterator, LIBPFF_ENTRY_TYPE_DISPLAY_NAME, entry_value_string, maximum_entry_value_string_size, 0, NULL) == 1)
attrRecipient["Display Name"] = new Variant(std::string((char *)entry_value_string));
- if (libpff_recipients_get_display_name(recipients, recipient_iterator, entry_value_string, maximum_entry_value_string_size, NULL) == 1)
+ if (libpff_recipients_get_utf8_display_name(recipients, recipient_iterator, entry_value_string, maximum_entry_value_string_size, NULL) == 1)
attrRecipient["Recipient display name"] = new Variant(std::string((char*)entry_value_string));
if (libpff_item_get_entry_value_utf8_string(recipients, recipient_iterator, LIBPFF_ENTRY_TYPE_ADDRESS_TYPE, entry_value_string, maximum_entry_value_string_size, 0, NULL) == 1)
--- dff-1.2.0/modules/mailbox/pff/pff_node_email_transport_headers.cpp.orig 2012-05-19 10:12:24.811450000 +0800
+++ dff-1.2.0/modules/mailbox/pff/pff_node_email_transport_headers.cpp 2012-05-19 10:12:51.297450001 +0800
@@ -20,7 +20,7 @@
{
size_t headers_size = 0;
- if (libpff_message_get_transport_headers_size(mail, &headers_size, this->pff_error) == 1)
+ if (libpff_message_get_utf8_transport_headers_size(mail, &headers_size, this->pff_error) == 1)
{
if (headers_size > 0)
this->setSize(headers_size);
@@ -45,7 +45,7 @@
else
item = *(this->pff_item);
entry_string = new uint8_t [this->size()];
- if (libpff_message_get_transport_headers(item, entry_string, this->size(), this->pff_error ) != 1 )
+ if (libpff_message_get_utf8_transport_headers(item, entry_string, this->size(), this->pff_error ) != 1 )
{
if (this->pff_item == NULL)
libpff_item_free(&item, this->pff_error);
--- dff-1.2.0/modules/mailbox/pff/libbfio_wrapper.cpp.orig 2012-05-19 10:26:07.420450001 +0800
+++ dff-1.2.0/modules/mailbox/pff/libbfio_wrapper.cpp 2012-05-19 11:59:22.003450003 +0800
@@ -44,13 +44,22 @@
io_handle->access_flags = 0;
io_handle->file = NULL;
- io_handle->parent = parent;
- if (libbfio_handle_initialize(handle, (intptr_t*)io_handle,
- dff_libbfio_file_io_handle_free, dff_libbfio_file_io_handle_clone, dff_libbfio_file_open,
- dff_libbfio_file_close, dff_libbfio_file_read, dff_libbfio_file_write,
- dff_libbfio_file_seek_offset, dff_libbfio_file_exists, dff_libbfio_file_is_open,
- dff_libbfio_file_get_size,
- LIBBFIO_FLAG_IO_HANDLE_MANAGED | LIBBFIO_FLAG_IO_HANDLE_CLONE_BY_FUNCTION, error ) != 1 )
+ io_handle->parent = parent;
+ if (libbfio_handle_initialize(
+ handle,
+ (intptr_t*)io_handle,
+ (int (*)(intptr_t **, libbfio_error_t **)) dff_libbfio_file_io_handle_free,
+ (int (*)(intptr_t **, intptr_t *, libbfio_error_t **)) dff_libbfio_file_io_handle_clone,
+ (int (*)(intptr_t *, int, libbfio_error_t **)) dff_libbfio_file_open,
+ (int (*)(intptr_t *, libbfio_error_t **)) dff_libbfio_file_close,
+ (ssize_t (*)(intptr_t *, uint8_t *, size_t, libbfio_error_t **)) dff_libbfio_file_read,
+ (ssize_t (*)(intptr_t *, const uint8_t *, size_t, libbfio_error_t **)) dff_libbfio_file_write,
+ (off64_t (*)(intptr_t *, off64_t, int, libbfio_error_t **)) dff_libbfio_file_seek_offset,
+ (int (*)(intptr_t *, libbfio_error_t **)) dff_libbfio_file_exists,
+ (int (*)(intptr_t *, libbfio_error_t **)) dff_libbfio_file_is_open,
+ (int (*)(intptr_t *, size64_t *, libbfio_error_t **)) dff_libbfio_file_get_size,
+ LIBBFIO_FLAG_IO_HANDLE_MANAGED | LIBBFIO_FLAG_IO_HANDLE_CLONE_BY_FUNCTION,
+ error ) != 1 )
{
dff_libbfio_file_io_handle_free((intptr_t *) io_handle, NULL );
return (-1);