created tag 3.48.8

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.7.
+# Generated by GNU Autoconf 2.69 for httrack 3.48.8.
 #
 # Report bugs to <roche+packaging@httrack.com>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='httrack'
 PACKAGE_TARNAME='httrack'
-PACKAGE_VERSION='3.48.7'
-PACKAGE_STRING='httrack 3.48.7'
+PACKAGE_VERSION='3.48.8'
+PACKAGE_STRING='httrack 3.48.8'
 PACKAGE_BUGREPORT='roche+packaging@httrack.com'
 PACKAGE_URL='http://www.httrack.com/'
 
@@ -1337,7 +1337,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.7 to adapt to many kinds of systems.
+\`configure' configures httrack 3.48.8 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1407,7 +1407,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of httrack 3.48.7:";;
+     short | recursive ) echo "Configuration of httrack 3.48.8:";;
    esac
   cat <<\_ACEOF
 
@@ -1521,7 +1521,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-httrack configure 3.48.7
+httrack configure 3.48.8
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2248,7 +2248,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.7, which was
+It was created by httrack $as_me 3.48.8, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3067,7 +3067,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='httrack'
- VERSION='3.48.7'
+ VERSION='3.48.8'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -16892,7 +16892,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.7, which was
+This file was extended by httrack $as_me 3.48.8, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16959,7 +16959,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.7
+httrack config.status 3.48.8
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([httrack], [3.48.7], [roche+packaging@httrack.com], [httrack], [http://www.httrack.com/])
+AC_INIT([httrack], [3.48.8], [roche+packaging@httrack.com], [httrack], [http://www.httrack.com/])
 AC_CONFIG_SRCDIR(src/httrack.c)
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS(config.h)

debian/changelog

@@ -1,3 +1,9 @@
+httrack (3.48.8-1) unstable; urgency=low
+
+  * Updated to 3.48.8 (3.48-8)
+
+ -- Xavier Roche <xavier@debian.org>  Thu, 15 May 2014 19:21:21 +0200
+
 httrack (3.48.7-1) unstable; urgency=low
 
   * Updated to 3.48.7 (3.48-7)

history.txt

@@ -4,7 +4,9 @@ HTTrack Website Copier release history:
 
 This file lists all changes and fixes that have been made for HTTrack.
 
-3.48-7
+3.48-8
++ Fixed: new zlib version fixing CVE-2004-0797 and CVE-2005-2096
++ Fixed: more reliable crash reporting
 + Fixed: fixed infamous "hashtable internal error: cuckoo/stash collision" errors
 + Fixed: safety cleanup in many strings operations
 + Fixed: buggy option pannels

man/httrack.1

@@ -1,7 +1,7 @@
 .\" Process this file with
 .\" groff -man -Tascii httrack.1
 .\"
-.TH httrack 1 "13 May 2014" "httrack website copier"
+.TH httrack 1 "14 May 2014" "httrack website copier"
 .SH NAME
 httrack \- offline browser : copy websites to a local directory
 .SH SYNOPSIS

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-7"
-#define HTTRACK_VERSIONID    "3.48.7"
+#define HTTRACK_VERSION      "3.48-8"
+#define HTTRACK_VERSIONID    "3.48.8"
 #define HTTRACK_AFF_VERSION  "3.x"
 #define HTTRACK_LIB_VERSION  "2.0"
 

src/htsinthash.c

@@ -907,7 +907,8 @@ static int inthash_add_item_(inthash hashtable, inthash_item item) {
         inthash_item *const item = &hashtable->stash.items[i];
         const size_t pos1 = inthash_hash_to_pos(hashtable, item->hashes.hash1);
         const size_t pos2 = inthash_hash_to_pos(hashtable, item->hashes.hash2);
-        inthash_crit(hashtable, "stash[%u]: key='%s' value='%s' pos1=%d pos2=%d hash1=%04x hash2=%04x",
+        inthash_crit(hashtable, 
+          "stash[%u]: key='%s' value='%s' pos1=%d pos2=%d hash1=%04x hash2=%04x",
           (int) i,
           hashtable->custom.print.key(hashtable->custom.print.arg, item->name),
           hashtable->custom.print.value(hashtable->custom.print.arg, item->value.ptr),
@@ -917,7 +918,8 @@ static int inthash_add_item_(inthash hashtable, inthash_item item) {
           inthash_item *const item = &hashtable->items[pos1];
           const size_t pos1 = inthash_hash_to_pos(hashtable, item->hashes.hash1);
           const size_t pos2 = inthash_hash_to_pos(hashtable, item->hashes.hash2);
-          inthash_crit(hashtable, "\t.. collisionning with key='%s' value='%s' pos1=%d pos2=%d hash1=%04x hash2=%04x",
+          inthash_crit(hashtable, 
+            "\t.. collisionning with key='%s' value='%s' pos1=%d pos2=%d hash1=%04x hash2=%04x",
             hashtable->custom.print.key(hashtable->custom.print.arg, item->name),
             hashtable->custom.print.value(hashtable->custom.print.arg, item->value.ptr),
             (int) pos1, (int) pos2,
@@ -929,7 +931,8 @@ static int inthash_add_item_(inthash hashtable, inthash_item item) {
           inthash_item *const item = &hashtable->items[pos2];
           const size_t pos1 = inthash_hash_to_pos(hashtable, item->hashes.hash1);
           const size_t pos2 = inthash_hash_to_pos(hashtable, item->hashes.hash2);
-          inthash_crit(hashtable, "\t.. collisionning with key='%s' value='%s' pos1=%d pos2=%d hash1=%04x hash2=%04x",
+          inthash_crit(hashtable, 
+            "\t.. collisionning with key='%s' value='%s' pos1=%d pos2=%d hash1=%04x hash2=%04x",
             hashtable->custom.print.key(hashtable->custom.print.arg, item->name),
             hashtable->custom.print.value(hashtable->custom.print.arg, item->value.ptr),
             (int) pos1, (int) pos2,

src/htslib.c

@@ -5113,6 +5113,17 @@ static int ssl_vulnerable(const char *version) {
   return 0;
 }
 
+/* user abort callback */
+htsErrorCallback htsCallbackErr = NULL;
+
+HTSEXT_API void hts_set_error_callback(htsErrorCallback handler) {
+  htsCallbackErr = handler;
+}
+
+HTSEXT_API htsErrorCallback hts_get_error_callback() {
+  return htsCallbackErr;
+}
+
 static void default_inthash_asserthandler(void *arg, const char* exp, const char* file, int line) {
   abortf_(exp, file, line);
 }

src/htssafe.h

@@ -35,17 +35,26 @@ Please visit our Website: http://www.httrack.com
 
 #include "htsglobal.h"
 
-/**
- * Optional user-defined callback upon fatal error.
- */
-typedef void (*htsErrorCallback) (const char *msg, const char *file, int line);
-
 /**
  * Emergency logging.
+ * Default is to use libhttrack one.
  */
 #ifndef HTSSAFE_ABORT_FUNCTION
-HTSEXT_API htsErrorCallback htsCallbackErr;
-#define HTSSAFE_ABORT_FUNCTION(A,B,C) do { if (htsCallbackErr != NULL) { htsCallbackErr(A,B,C); } } while(0)
+
+/** Assert error callback. **/
+#ifndef HTS_DEF_FWSTRUCT_htsErrorCallback
+#define HTS_DEF_FWSTRUCT_htsErrorCallback
+typedef void (*htsErrorCallback) (const char *msg, const char *file, int line);
+HTSEXT_API htsErrorCallback hts_get_error_callback(void);
+#endif
+
+#define HTSSAFE_ABORT_FUNCTION(A,B,C) do { \
+  htsErrorCallback callback = hts_get_error_callback(); \
+  if (callback != NULL) { \
+    callback(A,B,C); \
+  } \
+} while(0)
+
 #endif
 
 /**
@@ -61,7 +70,7 @@ HTSEXT_API htsErrorCallback htsCallbackErr;
 /**
  * Fatal assertion check.
  */
-#define assertf_(exp, file, line) assertf__(exp, #exp, __FILE__, __LINE__)
+#define assertf_(exp, file, line) assertf__(exp, #exp, file, line)
 
 /**
  * Fatal assertion check.

src/httrack-library.h

@@ -66,6 +66,12 @@ typedef enum hts_log_type {
 typedef struct hts_stat_struct hts_stat_struct;
 #endif
 
+/** Assert error callback. **/
+#ifndef HTS_DEF_FWSTRUCT_htsErrorCallback
+#define HTS_DEF_FWSTRUCT_htsErrorCallback
+typedef void (*htsErrorCallback) (const char *msg, const char *file, int line);
+#endif
+
 /* Helpers for plugging callbacks
 requires: htsdefines.h */
 
@@ -112,6 +118,8 @@ HTSEXT_API const hts_stat_struct* hts_get_stats(httrackp * opt);
 HTSEXT_API void set_wrappers(httrackp * opt);   /* LEGACY */
 HTSEXT_API int plug_wrapper(httrackp * opt, const char *moduleName,
                             const char *argv);
+HTSEXT_API void hts_set_error_callback(htsErrorCallback handler);
+HTSEXT_API htsErrorCallback hts_get_error_callback(void);
 
 /* Logging */
 HTSEXT_API int hts_log(httrackp * opt, const char *prefix, const char *msg);

src/httrack.vcproj

@@ -53,7 +53,7 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories=""C:\Dev\zlib-1.2.3\";"C:\Dev\openssl-1.0.1e\include";C:\Dev\Winhttrack"
+				AdditionalIncludeDirectories=""C:\Dev\zlib-1.2.8\";"C:\Dev\openssl-1.0.1e\include";C:\Dev\Winhttrack"
 				PreprocessorDefinitions="WIN32;_CONSOLE;HTS_ANALYSTE_CONSOLE;_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -152,7 +152,7 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories=""C:\Dev\zlib-1.2.3\";"C:\Dev\openssl-1.0.1e\include";C:\Dev\Winhttrack"
+				AdditionalIncludeDirectories=""C:\Dev\zlib-1.2.8\";"C:\Dev\openssl-1.0.1e\include";C:\Dev\Winhttrack"
 				PreprocessorDefinitions="WIN32;_CONSOLE;HTS_ANALYSTE_CONSOLE"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -246,7 +246,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm200 "
 				Optimization="0"
-				AdditionalIncludeDirectories=""C:\Dev\zlib-1.2.3\";"C:\Dev\openssl-1.0.1e\include";C:\Dev\Winhttrack"
+				AdditionalIncludeDirectories=""C:\Dev\zlib-1.2.8\";"C:\Dev\openssl-1.0.1e\include";C:\Dev\Winhttrack"
 				PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;HTS_ANALYSTE_CONSOLE;_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
@@ -343,7 +343,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm200 "
 				Optimization="0"
-				AdditionalIncludeDirectories=""C:\Dev\zlib-1.2.3\";"C:\Dev\openssl-1.0.1e\include";C:\Dev\Winhttrack"
+				AdditionalIncludeDirectories=""C:\Dev\zlib-1.2.8\";"C:\Dev\openssl-1.0.1e\include";C:\Dev\Winhttrack"
 				PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;HTS_ANALYSTE_CONSOLE;_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
@@ -440,7 +440,7 @@
 				AdditionalOptions="/Zm200 "
 				Optimization="3"
 				InlineFunctionExpansion="2"
-				AdditionalIncludeDirectories=""C:\Dev\zlib-1.2.3\";"C:\Dev\openssl-1.0.1e\include";C:\Dev\Winhttrack"
+				AdditionalIncludeDirectories=""C:\Dev\zlib-1.2.8\";"C:\Dev\openssl-1.0.1e\include";C:\Dev\Winhttrack"
 				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;HTS_ANALYSTE_CONSOLE;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -535,7 +535,7 @@
 				AdditionalOptions="/Zm200 "
 				Optimization="3"
 				InlineFunctionExpansion="2"
-				AdditionalIncludeDirectories=""C:\Dev\zlib-1.2.3\";"C:\Dev\openssl-1.0.1e\include";C:\Dev\Winhttrack"
+				AdditionalIncludeDirectories=""C:\Dev\zlib-1.2.8\";"C:\Dev\openssl-1.0.1e\include";C:\Dev\Winhttrack"
 				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;HTS_ANALYSTE_CONSOLE;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				RuntimeLibrary="2"