Upgraded to 3.1.0

3 files changed, 94 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4a6b82089bf1..ffa2eb326ac9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Mon Nov 21 19:03:09 UTC 2016
+# Sun Sep 24 21:03:19 UTC 2017
 pkgbase = hashdb
 	pkgdesc = Tool for finding previously identified blocks of data in media such as disk images
-	pkgver = 3.0.0
+	pkgver = 3.1.0
 	pkgrel = 1
 	url = https://github.com/NPS-DEEP/hashdb/wiki
 	arch = i686
@@ -11,8 +11,10 @@ pkgbase = hashdb
 	depends = openssl
 	depends = bzip2
 	depends = libewf
-	source = http://digitalcorpora.org/downloads/hashdb/hashdb-3.0.0.tar.gz
-	sha256sums = ad013feabdc437deca2a7a10349f5ebf08ee47d699ad0d4ae141fd8dc7542206
+	source = http://digitalcorpora.org/downloads/hashdb/hashdb-3.1.0.tar.gz
+	source = configure.patch
+	sha256sums = b524018f52248058c11a1efffcca6ab61c60a100102d3dd78cb4081ee793b60c
+	sha256sums = 56fc95bc5e2b318fdc4f92cd4e09c13d0ecdf99b044119aa43a1992df3487ebc
 
 pkgname = hashdb
 
diff --git a/PKGBUILD b/PKGBUILD
index 53fbd35823b2..ae67a475e84e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,21 +1,38 @@
 # Maintainer: dracorp aka Piotr Rogoza <piotr.r.public at gmail.com>
 
 pkgname=hashdb
-pkgver=3.0.0
-_pkgver=3.0.0
+pkgver=3.1.0
+_pkgver=3.1.0
 pkgrel=1
 pkgdesc='Tool for finding previously identified blocks of data in media such as disk images'
 arch=('i686' 'x86_64')
 url='https://github.com/NPS-DEEP/hashdb/wiki'
 license=('GPL')
-depends=(openssl bzip2 libewf) 
+depends=(openssl bzip2 libewf)
 makedepends=()
-source=(http://digitalcorpora.org/downloads/hashdb/hashdb-$_pkgver.tar.gz)
-sha256sums=('ad013feabdc437deca2a7a10349f5ebf08ee47d699ad0d4ae141fd8dc7542206')
+source=(http://digitalcorpora.org/downloads/hashdb/hashdb-$_pkgver.tar.gz
+configure.patch
+)
+sha256sums=('b524018f52248058c11a1efffcca6ab61c60a100102d3dd78cb4081ee793b60c'
+            '56fc95bc5e2b318fdc4f92cd4e09c13d0ecdf99b044119aa43a1992df3487ebc')
 
+prepare(){
+  cd "$srcdir"/$pkgname-$_pkgver
+  patch -p1 -i "$srcdir"/configure.patch
+#   sed -i s/SSL_library_init/OPENSSL_init_ssl/ configure.ac configure
+}
 build(){
   cd "$srcdir"/$pkgname-$_pkgver
-  ./configure --prefix=/usr --enable-dependency-tracking --enable-mcheck --enable-address-sanitizer
+  options=(
+    --prefix=/usr
+    --enable-dependency-tracking
+    --enable-mcheck
+    --enable-address-sanitizer
+  )
+#   PKG_CONFIG_PATH+='/usr/lib/pkgconfig' \
+#   LDFLAGS+=" -L/usr/lib/openssl-1.0 -lssl -lcrypto" \
+#   CFLAGS+=" -I/usr/include/openssl-1.0" \
+    ./configure ${options[*]}
   make
 }
 package(){
diff --git a/configure.patch b/configure.patch
new file mode 100644
index 000000000000..cb22f8d72ce1
--- /dev/null
+++ b/configure.patch
@@ -0,0 +1,65 @@
+diff --git a/configure b/configure
+index c356465..7302ec5 100755
+--- a/configure
++++ b/configure
+@@ -18706,9 +18706,9 @@ else
+   as_fn_error $? "Could not find crypto library" "$LINENO" 5
+ fi
+ 
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_library_init in -lssl" >&5
+-$as_echo_n "checking for SSL_library_init in -lssl... " >&6; }
+-if ${ac_cv_lib_ssl_SSL_library_init+:} false; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OPENSSL_init_ssl in -lssl" >&5
++$as_echo_n "checking for OPENSSL_init_ssl in -lssl... " >&6; }
++if ${ac_cv_lib_ssl_OPENSSL_init_ssl+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -18722,27 +18722,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char SSL_library_init ();
++char OPENSSL_init_ssl ();
+ int
+ main ()
+ {
+-return SSL_library_init ();
++return OPENSSL_init_ssl ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_ssl_SSL_library_init=yes
++  ac_cv_lib_ssl_OPENSSL_init_ssl=yes
+ else
+-  ac_cv_lib_ssl_SSL_library_init=no
++  ac_cv_lib_ssl_OPENSSL_init_ssl=no
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_library_init" >&5
+-$as_echo "$ac_cv_lib_ssl_SSL_library_init" >&6; }
+-if test "x$ac_cv_lib_ssl_SSL_library_init" = xyes; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_OPENSSL_init_ssl" >&5
++$as_echo "$ac_cv_lib_ssl_OPENSSL_init_ssl" >&6; }
++if test "x$ac_cv_lib_ssl_OPENSSL_init_ssl" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBSSL 1
+ _ACEOF
+diff --git a/configure.ac b/configure.ac
+index 0c10fdf..4b09467 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -203,7 +203,7 @@ AC_CHECK_HEADERS([openssl/aes.h openssl/bio.h openssl/evp.h openssl/hmac.h opens
+ # OpenSSL has been installed under at least two different names...
+ # note that crypto requires zlib
+ AC_CHECK_LIB([crypto],[EVP_get_digestbyname],[],[AC_MSG_ERROR([Could not find crypto library])])	
+-AC_CHECK_LIB([ssl],[SSL_library_init],[],[AC_MSG_ERROR([Could not find ssl library])])
++AC_CHECK_LIB([ssl],[OPENSSL_init_ssl],[],[AC_MSG_ERROR([Could not find ssl library])])
+ AC_CHECK_FUNCS([EVP_get_digestbyname],,
+ 	AC_MSG_ERROR([SSL/OpenSSL support required]))
+