[Forensics-changes] [guymager] 02/03: Add patch to support new libewf version 20140608

[Michael Prokop]

This is an automated email from the git hooks/post-receive script.

mika pushed a commit to branch debian
in repository guymager.

commit f9299b4e0902b8501e0b33572e5ede64338a4c31
Author: Michael Prokop <mika at debian.org>
Date:   Sat Aug 30 12:42:35 2014 -0700

    Add patch to support new libewf version 20140608
    
    Closes: #759839
---
 debian/patches/series                   |  1 +
 debian/patches/support_new_libewf.patch | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/debian/patches/series b/debian/patches/series
index 69fec61..0943423 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01_do-not-statically-compile-against-libs.diff
 reenable_libguytools_and_libewf.diff
 adjust_compileinfo
+support_new_libewf.patch
diff --git a/debian/patches/support_new_libewf.patch b/debian/patches/support_new_libewf.patch
new file mode 100644
index 0000000..4c012ae
--- /dev/null
+++ b/debian/patches/support_new_libewf.patch
@@ -0,0 +1,33 @@
+--- a/fifo.h
++++ b/fifo.h
+@@ -38,7 +38,7 @@
+ #ifndef _LIBEWF_H
+    #include <libewf.h>
+ 
+-   #if ((LIBEWF_VERSION != 20100226) && (LIBEWF_VERSION != 20080501) && (LIBEWF_VERSION != 20111015) && (LIBEWF_VERSION != 20130416))
++   #if ((LIBEWF_VERSION != 20100226) && (LIBEWF_VERSION != 20080501) && (LIBEWF_VERSION != 20111015) && (LIBEWF_VERSION != 20130416) && (LIBEWF_VERSION != 20140608))
+       #error "Please check EWF documentation for newer Encase formats and adjust following code"
+    #endif
+ 
+--- a/dlgacquire.cpp
++++ b/dlgacquire.cpp
+@@ -1245,7 +1245,7 @@
+             return;
+          }
+          SplitSize = NumValue * UnitIndexToMultiplier (DlgAcquireGetField(CFG_DLGACQUIRE_SPLITFILEUNIT)->pComboBox->currentIndex());
+-         #if ((LIBEWF_VERSION != 20100226) && (LIBEWF_VERSION != 20080501) && (LIBEWF_VERSION != 20111015) && (LIBEWF_VERSION != 20130416))
++         #if ((LIBEWF_VERSION != 20100226) && (LIBEWF_VERSION != 20080501) && (LIBEWF_VERSION != 20111015) && (LIBEWF_VERSION != 20130416) && (LIBEWF_VERSION != 20140608))
+             #error "Please check EWF documentation for newer Encase formats and adjust following code"
+          #endif
+          if (pOwn->pRadioButtonFormatEWF->isChecked())
+--- a/main.cpp
++++ b/main.cpp
+@@ -508,7 +508,7 @@
+ 
+    // Initialise libewf
+    // -----------------
+-   #if ((LIBEWF_VERSION != 20100226) && (LIBEWF_VERSION != 20080501) && (LIBEWF_VERSION != 20111015) && (LIBEWF_VERSION != 20130416))
++   #if ((LIBEWF_VERSION != 20100226) && (LIBEWF_VERSION != 20080501) && (LIBEWF_VERSION != 20111015) && (LIBEWF_VERSION != 20130416) && (LIBEWF_VERSION != 20140608))
+       #error "Please check EWF documentation for newer Encase formats and adjust following code"
+    #endif
+ 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/guymager.git