Updated scripts to 3.48.23

4 files changed, 32 insertions, 22 deletions

diff --git a/configure b/configure
index ea943c0..018ce58 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for httrack 3.48.22.
+# Generated by GNU Autoconf 2.69 for httrack 3.48.23.
 #
 # Report bugs to <roche+packaging@httrack.com>.
 #
@@ -616,8 +616,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='httrack'
 PACKAGE_TARNAME='httrack'
-PACKAGE_VERSION='3.48.22'
-PACKAGE_STRING='httrack 3.48.22'
+PACKAGE_VERSION='3.48.23'
+PACKAGE_STRING='httrack 3.48.23'
 PACKAGE_BUGREPORT='roche+packaging@httrack.com'
 PACKAGE_URL='http://www.httrack.com/'
 
@@ -1361,7 +1361,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures httrack 3.48.22 to adapt to many kinds of systems.
+\`configure' configures httrack 3.48.23 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1431,7 +1431,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of httrack 3.48.22:";;
+     short | recursive ) echo "Configuration of httrack 3.48.23:";;
    esac
   cat <<\_ACEOF
 
@@ -1547,7 +1547,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-httrack configure 3.48.22
+httrack configure 3.48.23
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2179,7 +2179,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by httrack $as_me 3.48.22, which was
+It was created by httrack $as_me 3.48.23, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3048,7 +3048,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='httrack'
- VERSION='3.48.22'
+ VERSION='3.48.23'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -13761,9 +13761,9 @@ if test "x$ac_cv_lib_crypto_EVP_get_digestbyname" = xyes; then :
 fi
 
 LIBS="$LIBS $OPENSSL_LIBS"
-{ $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 SSL_CTX_new in -lssl" >&5
+$as_echo_n "checking for SSL_CTX_new in -lssl... " >&6; }
+if ${ac_cv_lib_ssl_SSL_CTX_new+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -13777,27 +13777,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char SSL_library_init ();
+char SSL_CTX_new ();
 int
 main ()
 {
-return SSL_library_init ();
+return SSL_CTX_new ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_ssl_SSL_library_init=yes
+  ac_cv_lib_ssl_SSL_CTX_new=yes
 else
-  ac_cv_lib_ssl_SSL_library_init=no
+  ac_cv_lib_ssl_SSL_CTX_new=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_SSL_CTX_new" >&5
+$as_echo "$ac_cv_lib_ssl_SSL_CTX_new" >&6; }
+if test "x$ac_cv_lib_ssl_SSL_CTX_new" = xyes; then :
 
 	OPENSSL_LIBS="$OPENSSL_LIBS -lssl"
 
@@ -15095,7 +15095,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by httrack $as_me 3.48.22, which was
+This file was extended by httrack $as_me 3.48.23, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15162,7 +15162,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-httrack config.status 3.48.22
+httrack config.status 3.48.23
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/debian/changelog b/debian/changelog
index 944eb15..73bf308 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+httrack (3.48.23-1) unstable; urgency=medium
+
+  * Updated to 3.48.23 (3.48-23)
+    closes:#828344
+
+ -- Xavier Roche <xavier@debian.org>  Sun, 26 Jun 2016 14:15:46 +0200
+
 httrack (3.48.22-1) unstable; urgency=medium
 
   * Updated to 3.48.22 (3.48-22)
diff --git a/history.txt b/history.txt
index aa8d9f1..a5b6cc2 100644
--- a/history.txt
+++ b/history.txt
@@ -4,6 +4,9 @@ HTTrack Website Copier release history:
 
 This file lists all changes and fixes that have been made for HTTrack
 
+3.48-23
++ Fixed: on Linux, FTBFS with openssl 1.1.0
+
 3.48-22
 + Fixed: on Windows, fixed possible DLL local injection (Tunisian Cyber)
 + Fixed: various typos
diff --git a/src/htsglobal.h b/src/htsglobal.h
index 13ee410..b0fff1a 100644
--- a/src/htsglobal.h
+++ b/src/htsglobal.h
@@ -36,8 +36,8 @@ Please visit our Website: http://www.httrack.com
 #define HTTRACK_GLOBAL_DEFH
 
 // Version (also check external version information)
-#define HTTRACK_VERSION      "3.48-22"
-#define HTTRACK_VERSIONID    "3.48.22"
+#define HTTRACK_VERSION      "3.48-23"
+#define HTTRACK_VERSIONID    "3.48.23"
 #define HTTRACK_AFF_VERSION  "3.x"
 #define HTTRACK_LIB_VERSION  "2.0"