[Forensics-changes] [afflib] 02/03: Import Upstream version 3.7.16

Wed Jul 19 14:58:05 UTC 2017

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

eriberto pushed a commit to branch debian
in repository afflib.

commit c3dc622f64faa204cf36c3ee889786a8aa0089c4
Author: Eriberto Mota <eriberto at octans.dc.eb.mil.br>
Date:   Wed Jul 19 11:56:11 2017 -0300

    Import Upstream version 3.7.16
---
 README              | 2 +-
 configure.ac        | 2 +-
 lib/aftest.cpp      | 2 +-
 lib/crypto.cpp      | 2 +-
 pyaff/Makefile.am   | 2 +-
 tools/aff_bom.cpp   | 2 +-
 tools/affverify.cpp | 2 +-
 tools/hashextent.h  | 2 +-
 win32/affconfig.h   | 2 +-
 win32/afflib.mak    | 4 ++--
 10 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/README b/README
index 4b04af7..a08f940 100644
--- a/README
+++ b/README
@@ -4,7 +4,7 @@
 
 	2005-2006 Basis Technology, Inc.
 	2005-2013 Simson L. Garfinkel <simsong at acm.org>
-	2014-2016 Phillip Hellewell <sshock at gmail.com>
+	2014-2017 Phillip Hellewell <sshock at gmail.com>
 
 The Advanced Forensic Format (AFF) is on-disk format for storing
 computer forensic information. Critical features of AFF include:
diff --git a/configure.ac b/configure.ac
index 6f1783c..25011ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 # See http://autotoolset.sourceforge.net/tutorial.html
 # and http://www.openismus.com/documents/linux/automake/automake.shtml
 
-AC_INIT([AFFLIB],[3.7.15],[https://github.com/sshock/AFFLIBv3])
+AC_INIT([AFFLIB],[3.7.16],[https://github.com/sshock/AFFLIBv3])
 AM_INIT_AUTOMAKE
 AM_MAINTAINER_MODE
 
diff --git a/lib/aftest.cpp b/lib/aftest.cpp
index d8f00bb..2aa0cdd 100644
--- a/lib/aftest.cpp
+++ b/lib/aftest.cpp
@@ -39,7 +39,7 @@ const char *tempdir = "/tmp/";
 #endif
 
 /* Support OpenSSL before 1.1.0 */
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
 #define EVP_MD_CTX_new EVP_MD_CTX_create
 #define EVP_MD_CTX_free EVP_MD_CTX_destroy
 #endif
diff --git a/lib/crypto.cpp b/lib/crypto.cpp
index 2779f0e..83b3e2d 100644
--- a/lib/crypto.cpp
+++ b/lib/crypto.cpp
@@ -26,7 +26,7 @@ using namespace std;
 #endif
 
 /* Support OpenSSL before 1.1.0 */
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
 #define EVP_MD_CTX_new EVP_MD_CTX_create
 #define EVP_MD_CTX_free EVP_MD_CTX_destroy
 #endif
diff --git a/pyaff/Makefile.am b/pyaff/Makefile.am
index 468b0f7..4fa390b 100644
--- a/pyaff/Makefile.am
+++ b/pyaff/Makefile.am
@@ -11,6 +11,6 @@ install-exec-local:
 	cd $(srcdir) && $(PYTHON) setup.py \
 		build --build-base $(abs_builddir)/build \
 		egg_info --egg-base $(abs_builddir) \
-		install --prefix $(prefix) --single-version-externally-managed --record=$(abs_builddir)/installed.txt \
+		install --prefix $(DESTDIR)$(prefix) --single-version-externally-managed --record=$(abs_builddir)/installed.txt \
 		bdist_egg --dist-dir $(abs_builddir)/dist
 endif
diff --git a/tools/aff_bom.cpp b/tools/aff_bom.cpp
index efd00e8..83744c5 100644
--- a/tools/aff_bom.cpp
+++ b/tools/aff_bom.cpp
@@ -36,7 +36,7 @@
 #endif
 
 /* Support OpenSSL before 1.1.0 */
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
 #define EVP_MD_CTX_new EVP_MD_CTX_create
 #define EVP_MD_CTX_free EVP_MD_CTX_destroy
 #endif
diff --git a/tools/affverify.cpp b/tools/affverify.cpp
index 1568ee6..864ba9b 100644
--- a/tools/affverify.cpp
+++ b/tools/affverify.cpp
@@ -28,7 +28,7 @@
 #include <openssl/x509.h>
 
 /* Support OpenSSL before 1.1.0 */
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
 #define EVP_MD_CTX_new EVP_MD_CTX_create
 #define EVP_MD_CTX_free EVP_MD_CTX_destroy
 #endif
diff --git a/tools/hashextent.h b/tools/hashextent.h
index 4fff444..cdffffb 100644
--- a/tools/hashextent.h
+++ b/tools/hashextent.h
@@ -19,7 +19,7 @@
 #include <algorithm>
 
 /* Support OpenSSL before 1.1.0 */
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
 #define EVP_MD_CTX_new EVP_MD_CTX_create
 #define EVP_MD_CTX_free EVP_MD_CTX_destroy
 #endif
diff --git a/win32/affconfig.h b/win32/affconfig.h
index 787c773..a682bcf 100644
--- a/win32/affconfig.h
+++ b/win32/affconfig.h
@@ -1,6 +1,6 @@
 #include <windows.h>
 
-#define PACKAGE_VERSION "3.7.15"
+#define PACKAGE_VERSION "3.7.16"
 
 #undef USE_LIBEWF
 #undef USE_QEMU
diff --git a/win32/afflib.mak b/win32/afflib.mak
index 7a7245c..1159789 100755
--- a/win32/afflib.mak
+++ b/win32/afflib.mak
@@ -25,7 +25,7 @@ all:   $(TARGETS)
 
 INCS =	/I.\
 	/Izlib-1.2.3\ \
-	/I..\lib \
+	/I..\include\afflib \
 	/I..\lzma443\C \
 	/I..\lzma443\C\7zip\Compress\LZMA_Alone \
 	/I$(EXPATDIR) \
@@ -38,7 +38,7 @@ CC=cl
 
 # removed: /Gm - enable minimal rebuild; generated internal compiler error
 
-OTHER_FLAGS = /c /nologo /EHsc /RTC1 /RTCs /W2 $(COMPILER_MODE)
+OTHER_FLAGS = /c /nologo /EHsc /W2 $(COMPILER_MODE)
 
 CPPFLAGS=$(INCS) $(DEFS) $(OTHER_FLAGS) /Fp"afflib.pch" /Fo$*.obj
 CFLAGS=$(INCS) $(DEFS) $(OTHER_FLAGS) /Fp"afflib.pch" /Fo$*.obj

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

