mirror of
https://github.com/xroche/httrack.git
synced 2026-06-10 04:13:38 +03:00
Compare commits
2 Commits
ci/github-
...
fix/multia
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b5121a33a2 | ||
|
|
32f267583a |
20
configure
vendored
20
configure
vendored
@@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.71 for httrack 3.49.6.
|
||||
# Generated by GNU Autoconf 2.71 for httrack 3.49.7.
|
||||
#
|
||||
# Report bugs to <roche+packaging@httrack.com>.
|
||||
#
|
||||
@@ -647,8 +647,8 @@ MAKEFLAGS=
|
||||
# Identity of this package.
|
||||
PACKAGE_NAME='httrack'
|
||||
PACKAGE_TARNAME='httrack'
|
||||
PACKAGE_VERSION='3.49.6'
|
||||
PACKAGE_STRING='httrack 3.49.6'
|
||||
PACKAGE_VERSION='3.49.7'
|
||||
PACKAGE_STRING='httrack 3.49.7'
|
||||
PACKAGE_BUGREPORT='roche+packaging@httrack.com'
|
||||
PACKAGE_URL='http://www.httrack.com/'
|
||||
|
||||
@@ -1404,7 +1404,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.49.6 to adapt to many kinds of systems.
|
||||
\`configure' configures httrack 3.49.7 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
@@ -1475,7 +1475,7 @@ fi
|
||||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of httrack 3.49.6:";;
|
||||
short | recursive ) echo "Configuration of httrack 3.49.7:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
@@ -1596,7 +1596,7 @@ fi
|
||||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
httrack configure 3.49.6
|
||||
httrack configure 3.49.7
|
||||
generated by GNU Autoconf 2.71
|
||||
|
||||
Copyright (C) 2021 Free Software Foundation, Inc.
|
||||
@@ -2129,7 +2129,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.49.6, which was
|
||||
It was created by httrack $as_me 3.49.7, which was
|
||||
generated by GNU Autoconf 2.71. Invocation command line was
|
||||
|
||||
$ $0$ac_configure_args_raw
|
||||
@@ -3406,7 +3406,7 @@ fi
|
||||
|
||||
# Define the identity of the package.
|
||||
PACKAGE='httrack'
|
||||
VERSION='3.49.6'
|
||||
VERSION='3.49.7'
|
||||
|
||||
|
||||
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
|
||||
@@ -16687,7 +16687,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.49.6, which was
|
||||
This file was extended by httrack $as_me 3.49.7, which was
|
||||
generated by GNU Autoconf 2.71. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
@@ -16756,7 +16756,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
|
||||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||
ac_cs_config='$ac_cs_config_escaped'
|
||||
ac_cs_version="\\
|
||||
httrack config.status 3.49.6
|
||||
httrack config.status 3.49.7
|
||||
configured by $0, generated by GNU Autoconf 2.71,
|
||||
with options \\"\$ac_cs_config\\"
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
AC_PREREQ([2.71])
|
||||
|
||||
AC_INIT([httrack], [3.49.6], [roche+packaging@httrack.com], [httrack], [http://www.httrack.com/])
|
||||
AC_INIT([httrack], [3.49.7], [roche+packaging@httrack.com], [httrack], [http://www.httrack.com/])
|
||||
AC_COPYRIGHT([
|
||||
HTTrack Website Copier, Offline Browser for Windows and Unix
|
||||
Copyright (C) 1998-2015 Xavier Roche and other contributors
|
||||
|
||||
8
debian/changelog
vendored
8
debian/changelog
vendored
@@ -1,3 +1,11 @@
|
||||
httrack (3.49.7-1) unstable; urgency=medium
|
||||
|
||||
* New upstream release.
|
||||
* Make config.h architecture-independent for Multi-Arch: same. closes:#1133728
|
||||
* Fix man page rendering of the -%! security warning. closes:#1061053
|
||||
|
||||
-- Xavier Roche <xavier@debian.org> Sat, 06 Jun 2026 21:03:05 +0200
|
||||
|
||||
httrack (3.49.6-1) unstable; urgency=medium
|
||||
|
||||
* Updated to 3.49.6 (3.49-6)
|
||||
|
||||
@@ -4,6 +4,11 @@ HTTrack Website Copier release history:
|
||||
|
||||
This file lists all changes and fixes that have been made for HTTrack
|
||||
|
||||
3.49-7
|
||||
+ Fixed: keep generated config.h architecture-independent (Debian #1133728)
|
||||
+ Fixed: man page rendered the -%! warning as bogus options (Debian #1061053)
|
||||
+ Changed: modernize TLS init for OpenSSL 4.x (drop SSLv23/SSLeay calls)
|
||||
|
||||
3.49-6
|
||||
+ Fixed: puny_decode CVE-2017-14062
|
||||
|
||||
|
||||
@@ -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.49-6"
|
||||
#define HTTRACK_VERSIONID "3.49.6"
|
||||
#define HTTRACK_VERSION "3.49-7"
|
||||
#define HTTRACK_VERSIONID "3.49.7"
|
||||
#define HTTRACK_AFF_VERSION "3.x"
|
||||
#define HTTRACK_LIB_VERSION "2.0"
|
||||
|
||||
|
||||
23
src/htslib.c
23
src/htslib.c
@@ -5177,25 +5177,34 @@ HTSEXT_API int hts_init(void) {
|
||||
*/
|
||||
if (!openssl_ctx) {
|
||||
const char *version;
|
||||
const SSL_METHOD *method;
|
||||
|
||||
/* OpenSSL >= 1.1.0 / LibreSSL >= 2.7.0 auto-init and provide the generic
|
||||
methods. The legacy init and SSLv23/SSLeay calls (deprecated since 1.1.0,
|
||||
likely gone in 4.0) are kept only for older OpenSSL. */
|
||||
#if OPENSSL_VERSION_NUMBER < 0x10100000L \
|
||||
|| (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
|
||||
SSL_load_error_strings();
|
||||
SSL_library_init();
|
||||
version = SSLeay_version(SSLEAY_VERSION);
|
||||
method = SSLv23_client_method();
|
||||
#else
|
||||
version = OpenSSL_version(OPENSSL_VERSION);
|
||||
method = TLS_client_method();
|
||||
#endif
|
||||
|
||||
// Check CVE-2014-0160.
|
||||
version = SSLeay_version(SSLEAY_VERSION);
|
||||
if (ssl_vulnerable(version)) {
|
||||
fprintf(stderr,
|
||||
"SSLeay_version(SSLEAY_VERSION) == '%s'\n", version);
|
||||
fprintf(stderr, "OpenSSL version == '%s'\n", version);
|
||||
abortLog("unable to initialize TLS: OpenSSL version seems vulnerable to heartbleed bug (CVE-2014-0160)");
|
||||
assertf("OpenSSL version seems vulnerable to heartbleed bug (CVE-2014-0160)" == NULL);
|
||||
}
|
||||
|
||||
// OpenSSL_add_all_algorithms();
|
||||
openssl_ctx = SSL_CTX_new(SSLv23_client_method());
|
||||
openssl_ctx = SSL_CTX_new(method);
|
||||
if (!openssl_ctx) {
|
||||
fprintf(stderr,
|
||||
"fatal: unable to initialize TLS: SSL_CTX_new(SSLv23_client_method)\n");
|
||||
abortLog("unable to initialize TLS: SSL_CTX_new(SSLv23_client_method)");
|
||||
fprintf(stderr, "fatal: unable to initialize TLS: SSL_CTX_new()\n");
|
||||
abortLog("unable to initialize TLS: SSL_CTX_new()");
|
||||
assertf("unable to initialize TLS" == NULL);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user