<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4819ac8e9bb3ded0058f87186b3685a898364a97">https://github.com/macports/macports-ports/commit/4819ac8e9bb3ded0058f87186b3685a898364a97</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new 4819ac8  bulk_extractor: Fix build with latest libewf
</span>4819ac8 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 4819ac8e9bb3ded0058f87186b3685a898364a97
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri May 31 10:36:48 2019 -0500

<span style='display:block; white-space:pre;color:#404040;'>    bulk_extractor: Fix build with latest libewf
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/58488
</span>---
 security/bulk_extractor/Portfile           |  6 ++--
 security/bulk_extractor/files/libewf.patch | 49 ++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 2 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/bulk_extractor/Portfile b/security/bulk_extractor/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4e2b231..696078a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/bulk_extractor/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/bulk_extractor/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,7 +19,8 @@ long_description    Extracts small pieces of useful information, such as \
</span> master_sites        http://digitalcorpora.org/downloads/bulk_extractor/
 
 checksums           rmd160  311a19129303fc0dd478e3870d59e18b1b7887e7 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  297a57808c12b81b8e0d82222cf57245ad988804ab467eb0a70cf8669594e8ed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  297a57808c12b81b8e0d82222cf57245ad988804ab467eb0a70cf8669594e8ed \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    4473107
</span> 
 depends_build       port:flex
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,7 +39,8 @@ universal_variant   no
</span> 
 patchfiles          patch-configure.ac.diff \
                     patch-m4-slg_gcc_all_warnings.m4.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    patch-m4-slg_searchdirs.m4.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-m4-slg_searchdirs.m4.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    libewf.patch
</span> 
 use_autoreconf      yes
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/bulk_extractor/files/libewf.patch b/security/bulk_extractor/files/libewf.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..5d008b0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/bulk_extractor/files/libewf.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,49 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix build with new libewf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/simsong/bulk_extractor/commit/cba75d87b7091ffb344afbc4dad83cce52331ac3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -366,7 +366,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           [libewf=no])],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   [AC_MSG_WARN([libewf.h not found; no E01 support])]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   [libewf=no])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  AC_CHECK_FUNCS([libewf_handle_get_utf8_header_value_notes libewf_error_backtrace_fprint])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  AC_CHECK_FUNCS([libewf_handle_get_utf8_header_value_notes libewf_error_backtrace_fprint libewf_handle_close libewf_handle_free libewf_handle_read_buffer_at_offset libewf_handle_read_random])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_NOTICE([libewf is now $libewf])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/image_process.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/image_process.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -322,7 +322,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ process_ewf::~process_ewf()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef LIBEWFNG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef HAVE_LIBEWF_HANDLE_CLOSE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     if(handle){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   libewf_handle_close(handle,NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   libewf_handle_free(&handle,NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -340,7 +340,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     char **libewf_filenames = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     int amount_of_filenames = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef LIBEWFNG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef HAVE_LIBEWF_HANDLE_CLOSE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     libewf_error_t *error=0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     if(libewf_glob(fname,strlen(fname),LIBEWF_FORMAT_UNKNOWN,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+              &libewf_filenames,&amount_of_filenames,&error)<0){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -416,9 +416,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //int process_ewf::debug = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int process_ewf::pread(unsigned char *buf,size_t bytes,int64_t offset) const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef LIBEWFNG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef HAVE_LIBEWF_HANDLE_CLOSE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     libewf_error_t *error=0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(HAVE_LIBEWF_HANDLE_READ_RANDOM)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     int ret = libewf_handle_read_random(handle,buf,bytes,offset,&error);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(HAVE_LIBEWF_HANDLE_READ_BUFFER_AT_OFFSET) && !defined(HAVE_LIBEWF_HANDLE_READ_RANDOM)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    int ret = libewf_handle_read_buffer_at_offset(handle,buf,bytes,offset,&error);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     if(ret<0){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   if (report_read_errors) libewf_error_fprint(error,stderr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   libewf_error_free(&error);
</span></pre><pre style='margin:0'>

</pre>