stunnel-5.62

2022-01-17 21:02:30 +01:00 · 2022-01-17 21:02:30 +01:00 · 178822afde
--- a/COPYING.md
+++ b/COPYING.md
@ -1,7 +1,7 @@
 # stunnel license (see COPYRIGHT.md for detailed GPL conditions)


-_Copyright (C) 1998-2021 Michal Trojnara_
+_Copyright (C) 1998-2022 Michal Trojnara_

 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
--- a/Makefile.am
+++ b/Makefile.am
@ -1,5 +1,7 @@
 ## Process this file with automake to produce Makefile.in
-# by Michal Trojnara 1998-2021
+# by Michal Trojnara 1998-2022
+
+AM_DISTCHECK_CONFIGURE_FLAGS = --with-bashcompdir='$$(datarootdir)/bash-completion/completions'

 ACLOCAL_AMFLAGS = -I m4

--- a/Makefile.in
+++ b/Makefile.in
@ -14,7 +14,7 @@

@SET_MAKE@

-# by Michal Trojnara 1998-2021
+# by Michal Trojnara 1998-2022

 VPATH = @srcdir@
 am__is_gnu_make = { \
@ -299,6 +299,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
 PTHREAD_LIBS = @PTHREAD_LIBS@
@ -323,6 +326,7 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 ax_pthread_config = @ax_pthread_config@
+bashcompdir = @bashcompdir@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@ -364,6 +368,8 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+with_bashcompdir = @with_bashcompdir@
+AM_DISTCHECK_CONFIGURE_FLAGS = --with-bashcompdir='$$(datarootdir)/bash-completion/completions'
 ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = src doc tools tests
 doc_DATA = README.md TODO.md COPYING.md AUTHORS.md NEWS.md PORTS.md \
--- a/NEWS.md
+++ b/NEWS.md
@ -1,6 +1,12 @@
 # stunnel change log


+### Version 5.62, 2022.01.17, urgency: MEDIUM
+* New features
+  - Added a bash completion script.
+* Bugfixes
+  - Fixed a transfer() loop bug.
+
 ### Version 5.61, 2021.12.22, urgency: LOW
 * New features sponsored by the University of Maryland
  - Added new "protocol = capwin" and "protocol = capwinctrl"
--- a/README.md
+++ b/README.md
@ -14,13 +14,13 @@

 ### License

-     See <COPYING.md> file.
+     See [COPYING](COPYING.md) file.

 ### Other files you should read

-     <NEWS.md> What I did
-     <TODO.md> What I'm going to do
+     [NEWS](NEWS.md) What I did
+     [TODO](TODO.md) What I'm going to do

 ### Reporting problems and other contacts

-     See <https://www.stunnel.org/faq.html>.
+     See the [FAQ](https://www.stunnel.org/faq.html).
--- a/aclocal.m4
+++ b/aclocal.m4
@ -795,6 +795,282 @@ AC_DEFUN([AX_REQUIRE_DEFINED], [dnl
  m4_ifndef([$1], [m4_fatal([macro ]$1[ is not defined; is a m4 file missing?])])
 ])dnl AX_REQUIRE_DEFINED

+# pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
+# serial 12 (pkg-config-0.29.2)
+
+dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+dnl 02111-1307, USA.
+dnl
+dnl As a special exception to the GNU General Public License, if you
+dnl distribute this file as part of a program that contains a
+dnl configuration script generated by Autoconf, you may include it under
+dnl the same distribution terms that you use for the rest of that
+dnl program.
+
+dnl PKG_PREREQ(MIN-VERSION)
+dnl -----------------------
+dnl Since: 0.29
+dnl
+dnl Verify that the version of the pkg-config macros are at least
+dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
+dnl installed version of pkg-config, this checks the developer's version
+dnl of pkg.m4 when generating configure.
+dnl
+dnl To ensure that this macro is defined, also add:
+dnl m4_ifndef([PKG_PREREQ],
+dnl     [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])])
+dnl
+dnl See the "Since" comment for each macro you use to see what version
+dnl of the macros you require.
+m4_defun([PKG_PREREQ],
+[m4_define([PKG_MACROS_VERSION], [0.29.2])
+m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
+    [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
+])dnl PKG_PREREQ
+
+dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
+dnl ----------------------------------
+dnl Since: 0.16
+dnl
+dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
+dnl first found in the path. Checks that the version of pkg-config found
+dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
+dnl used since that's the first version where most current features of
+dnl pkg-config existed.
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=m4_default([$1], [0.9.0])
+	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		AC_MSG_RESULT([yes])
+	else
+		AC_MSG_RESULT([no])
+		PKG_CONFIG=""
+	fi
+fi[]dnl
+])dnl PKG_PROG_PKG_CONFIG
+
+dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------------------------------
+dnl Since: 0.18
+dnl
+dnl Check to see whether a particular set of modules exists. Similar to
+dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
+dnl
+dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+dnl only at the first occurence in configure.ac, so if the first place
+dnl it's called might be skipped (such as if it is within an "if", you
+dnl have to call PKG_CHECK_EXISTS manually
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+  m4_default([$2], [:])
+m4_ifvaln([$3], [else
+  $3])dnl
+fi])
+
+dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+dnl ---------------------------------------------
+dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting
+dnl pkg_failed based on the result.
+m4_define([_PKG_CONFIG],
+[if test -n "$$1"; then
+    pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+    PKG_CHECK_EXISTS([$3],
+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes ],
+		     [pkg_failed=yes])
+ else
+    pkg_failed=untried
+fi[]dnl
+])dnl _PKG_CONFIG
+
+dnl _PKG_SHORT_ERRORS_SUPPORTED
+dnl ---------------------------
+dnl Internal check to see if pkg-config supports short errors.
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi[]dnl
+])dnl _PKG_SHORT_ERRORS_SUPPORTED
+
+
+dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl   [ACTION-IF-NOT-FOUND])
+dnl --------------------------------------------------------------
+dnl Since: 0.4.0
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES might not happen, you should be sure to include an
+dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $2])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+if test $pkg_failed = yes; then
+        AC_MSG_RESULT([no])
+        _PKG_SHORT_ERRORS_SUPPORTED
+        if test $_pkg_short_errors_supported = yes; then
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
+        else
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+	m4_default([$4], [AC_MSG_ERROR(
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT])[]dnl
+        ])
+elif test $pkg_failed = untried; then
+        AC_MSG_RESULT([no])
+	m4_default([$4], [AC_MSG_FAILURE(
+[The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+_PKG_TEXT
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
+        ])
+else
+	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+        AC_MSG_RESULT([yes])
+	$3
+fi[]dnl
+])dnl PKG_CHECK_MODULES
+
+
+dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl   [ACTION-IF-NOT-FOUND])
+dnl ---------------------------------------------------------------------
+dnl Since: 0.29
+dnl
+dnl Checks for existence of MODULES and gathers its build flags with
+dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags
+dnl and VARIABLE-PREFIX_LIBS from --libs.
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to
+dnl include an explicit call to PKG_PROG_PKG_CONFIG in your
+dnl configure.ac.
+AC_DEFUN([PKG_CHECK_MODULES_STATIC],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+_save_PKG_CONFIG=$PKG_CONFIG
+PKG_CONFIG="$PKG_CONFIG --static"
+PKG_CHECK_MODULES($@)
+PKG_CONFIG=$_save_PKG_CONFIG[]dnl
+])dnl PKG_CHECK_MODULES_STATIC
+
+
+dnl PKG_INSTALLDIR([DIRECTORY])
+dnl -------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable pkgconfigdir as the location where a module
+dnl should install pkg-config .pc files. By default the directory is
+dnl $libdir/pkgconfig, but the default can be changed by passing
+dnl DIRECTORY. The user can override through the --with-pkgconfigdir
+dnl parameter.
+AC_DEFUN([PKG_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+    [pkg-config installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([pkgconfigdir],
+    [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
+    [with_pkgconfigdir=]pkg_default)
+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+])dnl PKG_INSTALLDIR
+
+
+dnl PKG_NOARCH_INSTALLDIR([DIRECTORY])
+dnl --------------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable noarch_pkgconfigdir as the location where a
+dnl module should install arch-independent pkg-config .pc files. By
+dnl default the directory is $datadir/pkgconfig, but the default can be
+dnl changed by passing DIRECTORY. The user can override through the
+dnl --with-noarch-pkgconfigdir parameter.
+AC_DEFUN([PKG_NOARCH_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+    [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([noarch-pkgconfigdir],
+    [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
+    [with_noarch_pkgconfigdir=]pkg_default)
+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+])dnl PKG_NOARCH_INSTALLDIR
+
+
+dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------
+dnl Since: 0.28
+dnl
+dnl Retrieves the value of the pkg-config variable for the given module.
+AC_DEFUN([PKG_CHECK_VAR],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
+
+_PKG_CONFIG([$1], [variable="][$3]["], [$2])
+AS_VAR_COPY([$1], [pkg_cv_][$1])
+
+AS_VAR_IF([$1], [""], [$5], [$4])dnl
+])dnl PKG_CHECK_VAR
+
 # Copyright (C) 2002-2020 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
--- a/198
+++ b/198
@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for stunnel 5.61.
+# Generated by GNU Autoconf 2.69 for stunnel 5.62.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@ -587,8 +587,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='stunnel'
 PACKAGE_TARNAME='stunnel'
-PACKAGE_VERSION='5.61'
-PACKAGE_STRING='stunnel 5.61'
+PACKAGE_VERSION='5.62'
+PACKAGE_STRING='stunnel 5.62'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''

@ -664,6 +664,11 @@ EGREP
 GREP
 CPP
 SED
+bashcompdir
+with_bashcompdir
+PKG_CONFIG_LIBDIR
+PKG_CONFIG_PATH
+PKG_CONFIG
 am__fastdepCC_FALSE
 am__fastdepCC_TRUE
 CCDEPMODE
@ -760,6 +765,7 @@ ac_user_opts='
 enable_option_checking
 enable_silent_rules
 enable_dependency_tracking
+with_bashcompdir
 with_threads
 enable_static
 enable_shared
@ -786,6 +792,10 @@ CFLAGS
 LDFLAGS
 LIBS
 CPPFLAGS
+PKG_CONFIG
+PKG_CONFIG_PATH
+PKG_CONFIG_LIBDIR
+with_bashcompdir
 CPP
 LT_SYS_LIBRARY_PATH'

@ -1338,7 +1348,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 stunnel 5.61 to adapt to many kinds of systems.
+\`configure' configures stunnel 5.62 to adapt to many kinds of systems.

 Usage: $0 [OPTION]... [VAR=VALUE]...

@ -1409,7 +1419,7 @@ fi

 if test -n "$ac_init_help"; then
  case $ac_init_help in
-     short | recursive ) echo "Configuration of stunnel 5.61:";;
+     short | recursive ) echo "Configuration of stunnel 5.62:";;
   esac
  cat <<\_ACEOF

@ -1437,6 +1447,7 @@ Optional Features:
 Optional Packages:
  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-bashcompdir=DIR  directory for bash completions
  --with-threads=model    select threading model (ucontext/pthread/fork)
  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
                          both]
@ -1458,6 +1469,14 @@ Some influential environment variables:
  LIBS        libraries to pass to the linker, e.g. -l<library>
  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
              you have headers in a nonstandard directory <include dir>
+  PKG_CONFIG  path to pkg-config utility
+  PKG_CONFIG_PATH
+              directories to add to pkg-config's search path
+  PKG_CONFIG_LIBDIR
+              path overriding pkg-config's built-in search path
+  with_bashcompdir
+              value of completionsdir for bash-completion, overriding
+              pkg-config
  CPP         C preprocessor
  LT_SYS_LIBRARY_PATH
              User-defined run-time library search path.
@ -1528,7 +1547,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
  cat <<\_ACEOF
-stunnel configure 5.61
+stunnel configure 5.62
 generated by GNU Autoconf 2.69

 Copyright (C) 2012 Free Software Foundation, Inc.
@ -2134,7 +2153,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 stunnel $as_me 5.61, which was
+It was created by stunnel $as_me 5.62, which was
 generated by GNU Autoconf 2.69.  Invocation command line was

  $ $0 $@
@ -2998,7 +3017,7 @@ fi

 # Define the identity of the package.
 PACKAGE='stunnel'
- VERSION='5.61'
+ VERSION='5.62'


 cat >>confdefs.h <<_ACEOF
@ -4122,6 +4141,165 @@ fi
 AM_BACKSLASH='\'


+{ $as_echo "$as_me:${as_lineno-$LINENO}: **************************************** bash completion" >&5
+$as_echo "$as_me: **************************************** bash completion" >&6;}
+
+
+
+
+
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+  ac_pt_PKG_CONFIG=$PKG_CONFIG
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    PKG_CONFIG=$ac_pt_PKG_CONFIG
+  fi
+else
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=0.9.0
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	else
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+		PKG_CONFIG=""
+	fi
+fi
+
+# Check whether --with-bashcompdir was given.
+if test "${with_bashcompdir+set}" = set; then :
+  withval=$with_bashcompdir;
+else
+
+if test -n "$with_bashcompdir"; then
+    pkg_cv_with_bashcompdir="$with_bashcompdir"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"bash-completion\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "bash-completion") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_with_bashcompdir=`$PKG_CONFIG --variable="completionsdir" "bash-completion" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+with_bashcompdir=$pkg_cv_with_bashcompdir
+
+if test "x$with_bashcompdir" = x""; then :
+  with_bashcompdir="${datarootdir}/bash-completion/completions"
+fi
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bashcompdir" >&5
+$as_echo_n "checking for bashcompdir... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_bashcompdir" >&5
+$as_echo "$with_bashcompdir" >&6; }
+bashcompdir=$with_bashcompdir
+
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: **************************************** thread model" >&5
 $as_echo "$as_me: **************************************** thread model" >&6;}
 # thread detection should be done first, as it may change the CC variable
@ -16711,7 +16889,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 stunnel $as_me 5.61, which was
+This file was extended by stunnel $as_me 5.62, which was
 generated by GNU Autoconf 2.69.  Invocation command line was

  CONFIG_FILES    = $CONFIG_FILES
@ -16777,7 +16955,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="\\
-stunnel config.status 5.61
+stunnel config.status 5.62
 configured by $0, generated by GNU Autoconf 2.69,
  with options \\"\$ac_cs_config\\"

--- a/configure.ac
+++ b/configure.ac
@ -1,6 +1,6 @@
 # Process this file with autoconf to produce a configure script.

-AC_INIT([stunnel],[5.61])
+AC_INIT([stunnel],[5.62])
 AC_MSG_NOTICE([**************************************** initialization])
 AC_CONFIG_AUX_DIR(auto)
 AC_CONFIG_MACRO_DIR([m4])
@ -35,6 +35,15 @@ AC_PROG_MAKE_SET
 # silent build by default
 ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])

+AC_MSG_NOTICE([**************************************** bash completion])
+AC_ARG_WITH([bashcompdir],
+    AS_HELP_STRING([--with-bashcompdir=DIR], [directory for bash completions]), ,
+    [PKG_CHECK_VAR([with_bashcompdir], [bash-completion], [completionsdir], ,
+        [with_bashcompdir="${datarootdir}/bash-completion/completions"])])
+AC_MSG_CHECKING([for bashcompdir])
+AC_MSG_RESULT([$with_bashcompdir])
+AC_SUBST([bashcompdir], [$with_bashcompdir])
+
 AC_MSG_NOTICE([**************************************** thread model])
 # thread detection should be done first, as it may change the CC variable

--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# by Michal Trojnara 1998-2021
+# by Michal Trojnara 1998-2022

 EXTRA_DIST = stunnel.pod.in stunnel.8.in stunnel.html.in en
 EXTRA_DIST += stunnel.pl.pod.in stunnel.pl.8.in stunnel.pl.html.in pl
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@ -14,7 +14,7 @@

@SET_MAKE@

-# by Michal Trojnara 1998-2021
+# by Michal Trojnara 1998-2022

 VPATH = @srcdir@
 am__is_gnu_make = { \
@ -216,6 +216,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
 PTHREAD_LIBS = @PTHREAD_LIBS@
@ -240,6 +243,7 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 ax_pthread_config = @ax_pthread_config@
+bashcompdir = @bashcompdir@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@ -281,6 +285,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+with_bashcompdir = @with_bashcompdir@
 EXTRA_DIST = stunnel.pod.in stunnel.8.in stunnel.html.in en \
 	stunnel.pl.pod.in stunnel.pl.8.in stunnel.pl.html.in pl
 man_MANS = stunnel.8 stunnel.pl.8
--- a/doc/stunnel.8.in
+++ b/doc/stunnel.8.in
@ -71,7 +71,7 @@
 .\" ========================================================================
 .\"
 .IX Title "stunnel 8"
-.TH stunnel 8 "2021.12.22" "5.61" "stunnel TLS Proxy"
+.TH stunnel 8 "2022.01.07" "5.62" "stunnel TLS Proxy"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
--- a/doc/stunnel.pl.8.in
+++ b/doc/stunnel.pl.8.in
@ -71,7 +71,7 @@
 .\" ========================================================================
 .\"
 .IX Title "stunnel 8"
-.TH stunnel 8 "2021.12.22" "5.61" "stunnel TLS Proxy"
+.TH stunnel 8 "2022.01.07" "5.62" "stunnel TLS Proxy"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
--- a/src/Makefile.am
+++ b/src/Makefile.am
@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# by Michal Trojnara 1998-2021
+# by Michal Trojnara 1998-2022

 ###############################################################################
 # File lists                                                                  #
--- a/src/Makefile.in
+++ b/src/Makefile.in
@ -14,7 +14,7 @@

@SET_MAKE@

-# by Michal Trojnara 1998-2021
+# by Michal Trojnara 1998-2022

 ###############################################################################
 # File lists                                                                  #
@ -306,6 +306,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
 PTHREAD_LIBS = @PTHREAD_LIBS@
@ -330,6 +333,7 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 ax_pthread_config = @ax_pthread_config@
+bashcompdir = @bashcompdir@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@ -371,6 +375,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+with_bashcompdir = @with_bashcompdir@
 common_headers = common.h prototypes.h version.h
 common_sources = tls.c str.c file.c client.c log.c options.c \
 	protocol.c network.c resolver.c ssl.c ctx.c verify.c \
--- a/src/client.c
+++ b/src/client.c
@ -1,6 +1,6 @@
 /*
 *   stunnel       TLS offloading and load-balancing proxy
- *   Copyright (C) 1998-2021 Michal Trojnara <Michal.Trojnara@stunnel.org>
+ *   Copyright (C) 1998-2022 Michal Trojnara <Michal.Trojnara@stunnel.org>
 *
 *   This program is free software; you can redistribute it and/or modify it
 *   under the terms of the GNU General Public License as published by the
@ -782,22 +782,16 @@ NOEXPORT void transfer(CLI *c) {
        s_poll_init(c->fds, 0); /* initialize the structure */
        /* for plain socket open data strem = open file descriptor */
        /* make sure to add each open socket to receive exceptions! */
-        if(c->sock_rfd->fd==c->sock_wfd->fd) {
-            if(sock_open_rd || sock_open_wr)
-                s_poll_add(c->fds, c->sock_rfd->fd,
-                    sock_open_rd && c->sock_ptr<BUFFSIZE,
-                    sock_open_wr && c->ssl_ptr>0);
-        } else {
-            if(sock_open_rd) /* only poll if the read file descriptor is open */
-                s_poll_add(c->fds, c->sock_rfd->fd, c->sock_ptr<BUFFSIZE, 0);
-            if(sock_open_wr) /* only poll if the write file descriptor is open */
-                s_poll_add(c->fds, c->sock_wfd->fd, 0, c->ssl_ptr>0);
-        }
+        if(sock_open_rd) /* only poll if the read file descriptor is open */
+            s_poll_add(c->fds, c->sock_rfd->fd, c->sock_ptr<BUFFSIZE, 0);
+        if(sock_open_wr) /* only poll if the write file descriptor is open */
+            s_poll_add(c->fds, c->sock_wfd->fd, 0, c->ssl_ptr>0);
        /* poll TLS file descriptors unless TLS shutdown was completed */
        if(SSL_get_shutdown(c->ssl)!=
                (SSL_SENT_SHUTDOWN|SSL_RECEIVED_SHUTDOWN)) {
            s_poll_add(c->fds, c->ssl_rfd->fd,
-                read_wants_read || write_wants_read || shutdown_wants_read,
+                read_wants_read || write_wants_read || shutdown_wants_read, 0);
+            s_poll_add(c->fds, c->ssl_wfd->fd, 0,
                read_wants_write || write_wants_write || shutdown_wants_write);
        }

--- a/src/common.h
+++ b/src/common.h
@ -1,6 +1,6 @@
 /*
 *   stunnel       TLS offloading and load-balancing proxy
- *   Copyright (C) 1998-2021 Michal Trojnara <Michal.Trojnara@stunnel.org>
+ *   Copyright (C) 1998-2022 Michal Trojnara <Michal.Trojnara@stunnel.org>
 *
 *   This program is free software; you can redistribute it and/or modify it
 *   under the terms of the GNU General Public License as published by the
--- a/src/cron.c
+++ b/src/cron.c
@ -1,6 +1,6 @@
 /*
 *   stunnel       TLS offloading and load-balancing proxy
- *   Copyright (C) 1998-2021 Michal Trojnara <Michal.Trojnara@stunnel.org>
+ *   Copyright (C) 1998-2022 Michal Trojnara <Michal.Trojnara@stunnel.org>
 *
 *   This program is free software; you can redistribute it and/or modify it
 *   under the terms of the GNU General Public License as published by the
--- a/src/ctx.c
+++ b/src/ctx.c
@ -1,6 +1,6 @@
 /*
 *   stunnel       TLS offloading and load-balancing proxy
- *   Copyright (C) 1998-2021 Michal Trojnara <Michal.Trojnara@stunnel.org>
+ *   Copyright (C) 1998-2022 Michal Trojnara <Michal.Trojnara@stunnel.org>
 *
 *   This program is free software; you can redistribute it and/or modify it
 *   under the terms of the GNU General Public License as published by the
--- a/src/dhparam.c
+++ b/src/dhparam.c
@ -5,32 +5,32 @@
 DH *get_dh2048(void)
 {
    static unsigned char dhp_2048[] = {
-        0xEA, 0xAB, 0xD1, 0x12, 0x96, 0x57, 0xE6, 0x1C, 0xCB, 0x63,
-        0xF1, 0xE1, 0x48, 0x10, 0xB7, 0x95, 0x7E, 0xC8, 0x45, 0x7A,
-        0xCC, 0x4D, 0xDC, 0xA0, 0xEC, 0x46, 0xB3, 0xFF, 0xAE, 0x60,
-        0x0C, 0xE9, 0xA8, 0x43, 0xA0, 0x1C, 0x9F, 0x96, 0x09, 0x14,
-        0x4C, 0x63, 0x65, 0x7D, 0x9A, 0x0D, 0x69, 0x42, 0x62, 0xFA,
-        0x4C, 0x3C, 0x0C, 0xD2, 0xC2, 0xF6, 0xA3, 0x57, 0x99, 0x8C,
-        0x4A, 0x24, 0x57, 0x97, 0x21, 0x05, 0x6A, 0x7C, 0xF2, 0xE7,
-        0x69, 0xF2, 0x0A, 0x5F, 0xDF, 0xBD, 0x83, 0x43, 0x1F, 0x6C,
-        0xDA, 0x21, 0xF5, 0x02, 0x9D, 0x9F, 0x03, 0xA4, 0x6C, 0x6F,
-        0x8E, 0x5F, 0xE7, 0xD6, 0xBC, 0x93, 0x0E, 0x5A, 0x55, 0x88,
-        0xED, 0x96, 0x5D, 0x3B, 0x39, 0x80, 0xB0, 0xDA, 0xDF, 0x24,
-        0xFC, 0xAC, 0xB9, 0xE1, 0xEE, 0xB6, 0xA6, 0x28, 0x84, 0x79,
-        0x34, 0xDC, 0xBC, 0x8F, 0x39, 0x52, 0x20, 0x6F, 0xAC, 0x57,
-        0x76, 0xA3, 0x3A, 0x05, 0x28, 0xAD, 0x7F, 0x1C, 0xC1, 0x93,
-        0x54, 0x75, 0x58, 0x4F, 0x59, 0x79, 0x0D, 0x6F, 0xFE, 0x91,
-        0x38, 0x7E, 0x6D, 0xEF, 0xB4, 0xCC, 0x10, 0x79, 0x73, 0x04,
-        0x07, 0x1E, 0xB2, 0x4E, 0x87, 0xA6, 0xA1, 0x7B, 0xCA, 0xFB,
-        0x5B, 0xF8, 0xFD, 0xC6, 0xDF, 0x32, 0x1F, 0x35, 0x44, 0xB8,
-        0x70, 0x98, 0xE0, 0x5B, 0xFD, 0x80, 0x76, 0x29, 0x78, 0xFB,
-        0xEE, 0xB4, 0xAC, 0xFB, 0x6C, 0x44, 0xCF, 0x94, 0x58, 0x13,
-        0xA6, 0xD3, 0xBD, 0x26, 0x91, 0xA6, 0x4B, 0xFC, 0x5A, 0x04,
-        0x6C, 0x1C, 0xB8, 0x2E, 0x17, 0x22, 0x9D, 0xD4, 0xA3, 0x79,
-        0x9A, 0xCB, 0x93, 0x7F, 0x0F, 0x55, 0x0A, 0x4D, 0xFC, 0x48,
-        0x23, 0xA2, 0xCE, 0x9C, 0xE9, 0x1C, 0x62, 0x36, 0x89, 0x7E,
-        0xB4, 0xAC, 0xEB, 0xBA, 0xF1, 0xB5, 0x04, 0x80, 0x9B, 0xEE,
-        0xE3, 0x47, 0x29, 0x49, 0xB9, 0x1B
+        0x9E, 0x60, 0xD9, 0xD9, 0x9A, 0x36, 0x72, 0x2B, 0x93, 0xC0,
+        0x0C, 0x20, 0x0E, 0x8F, 0x83, 0xE0, 0xCE, 0x24, 0x3C, 0xE8,
+        0x22, 0x6D, 0x4A, 0xE6, 0x2C, 0x37, 0x28, 0x19, 0xFE, 0x4A,
+        0x2A, 0x70, 0x3D, 0x40, 0xCA, 0x4A, 0x23, 0xFC, 0x48, 0x65,
+        0x45, 0x14, 0x9F, 0x41, 0x51, 0xDD, 0x94, 0x37, 0xA0, 0x13,
+        0x92, 0x6E, 0x54, 0x8D, 0x81, 0xB5, 0xAC, 0x3C, 0x93, 0xCB,
+        0x9A, 0x4A, 0x7E, 0x96, 0xB2, 0xB6, 0xFA, 0x31, 0x62, 0x55,
+        0x54, 0x69, 0x1D, 0x5F, 0xEF, 0x34, 0xFD, 0xEA, 0x2E, 0x30,
+        0x92, 0x5D, 0x59, 0x10, 0x04, 0x6B, 0x77, 0xB9, 0xE6, 0x41,
+        0xCE, 0x0A, 0xAC, 0x79, 0x5C, 0x44, 0x4C, 0x04, 0x96, 0x53,
+        0xE7, 0xC9, 0x07, 0x70, 0x09, 0xDD, 0xD1, 0x0D, 0x54, 0xC7,
+        0x52, 0x18, 0x41, 0x64, 0xF1, 0xC3, 0x2F, 0x64, 0x71, 0x45,
+        0xA2, 0x23, 0x2C, 0xDC, 0xCA, 0x9B, 0x76, 0x59, 0xA8, 0xAA,
+        0xA3, 0x5E, 0x1D, 0xD7, 0x5B, 0x61, 0x50, 0x7D, 0x91, 0x80,
+        0x2A, 0xC7, 0xD5, 0x86, 0xC3, 0x57, 0x4A, 0x66, 0x7B, 0x3A,
+        0xB8, 0xC7, 0xFD, 0xDF, 0x23, 0x4A, 0x2E, 0x49, 0x57, 0xF6,
+        0x9C, 0x7D, 0xC6, 0xFD, 0x7A, 0x37, 0x50, 0x38, 0x58, 0x80,
+        0xDE, 0x98, 0xFA, 0x57, 0x1D, 0xF8, 0x22, 0x8D, 0x6C, 0x6A,
+        0x34, 0x0F, 0x42, 0x96, 0x80, 0x48, 0x70, 0x64, 0x12, 0x1C,
+        0x66, 0xB7, 0x69, 0x35, 0x80, 0x93, 0x2D, 0xE3, 0xAF, 0x57,
+        0xA9, 0xBF, 0x99, 0x95, 0x73, 0x3B, 0x09, 0x74, 0xF6, 0x85,
+        0x09, 0x5D, 0x3A, 0x4F, 0x3D, 0xB0, 0xFC, 0xF1, 0x09, 0xC2,
+        0xE9, 0x24, 0x5E, 0x60, 0xDD, 0x7E, 0xF5, 0xB2, 0x9C, 0x96,
+        0x92, 0x29, 0x0E, 0xC1, 0x69, 0x6D, 0x68, 0x32, 0x96, 0xDE,
+        0x2D, 0xB1, 0x8B, 0xBE, 0x56, 0xE8, 0xFB, 0x5C, 0x78, 0xBB,
+        0x7C, 0xFB, 0x29, 0x86, 0x36, 0x6B
    };
    static unsigned char dhg_2048[] = {
        0x02
@ -52,4 +52,4 @@ DH *get_dh2048(void)
    return dh;
 }
 #endif /* OPENSSL_NO_DH */
-/* built for stunnel 5.61 */
+/* built for stunnel 5.62 */
--- a/src/env.c
+++ b/src/env.c
@ -1,6 +1,6 @@
 /*
 *   stunnel       TLS offloading and load-balancing proxy
- *   Copyright (C) 1998-2021 Michal Trojnara <Michal.Trojnara@stunnel.org>
+ *   Copyright (C) 1998-2022 Michal Trojnara <Michal.Trojnara@stunnel.org>
 *
 *   This program is free software; you can redistribute it and/or modify it
 *   under the terms of the GNU General Public License as published by the
--- a/src/evc.mak
+++ b/src/evc.mak
@ -1,4 +1,4 @@
-# wce.mak for stunnel.exe by Michal Trojnara 1998-2021
+# wce.mak for stunnel.exe by Michal Trojnara 1998-2022
 # with help of Pierre Delaage <delaage.pierre@free.fr>
 # pdelaage 20140610 : added UNICODE optional FLAG, always ACTIVE on WCE because of poor ANSI support
 # pdelaage 20140610 : added _WIN32_WCE flag for RC compilation, to preprocess out "HELP" unsupported menu flag on WCE
--- a/src/fd.c
+++ b/src/fd.c
@ -1,6 +1,6 @@
 /*
 *   stunnel       TLS offloading and load-balancing proxy
- *   Copyright (C) 1998-2021 Michal Trojnara <Michal.Trojnara@stunnel.org>
+ *   Copyright (C) 1998-2022 Michal Trojnara <Michal.Trojnara@stunnel.org>
 *
 *   This program is free software; you can redistribute it and/or modify it
 *   under the terms of the GNU General Public License as published by the
--- a/src/file.c
+++ b/src/file.c
@ -1,6 +1,6 @@
 /*
 *   stunnel       TLS offloading and load-balancing proxy
- *   Copyright (C) 1998-2021 Michal Trojnara <Michal.Trojnara@stunnel.org>
+ *   Copyright (C) 1998-2022 Michal Trojnara <Michal.Trojnara@stunnel.org>
 *
 *   This program is free software; you can redistribute it and/or modify it
 *   under the terms of the GNU General Public License as published by the
--- a/src/libwrap.c
+++ b/src/libwrap.c
@ -1,6 +1,6 @@
 /*
 *   stunnel       TLS offloading and load-balancing proxy
- *   Copyright (C) 1998-2021 Michal Trojnara <Michal.Trojnara@stunnel.org>
+ *   Copyright (C) 1998-2022 Michal Trojnara <Michal.Trojnara@stunnel.org>
 *
 *   This program is free software; you can redistribute it and/or modify it
 *   under the terms of the GNU General Public License as published by the
--- a/src/log.c
+++ b/src/log.c
@ -1,6 +1,6 @@
 /*
 *   stunnel       TLS offloading and load-balancing proxy
- *   Copyright (C) 1998-2021 Michal Trojnara <Michal.Trojnara@stunnel.org>
+ *   Copyright (C) 1998-2022 Michal Trojnara <Michal.Trojnara@stunnel.org>
 *
 *   This program is free software; you can redistribute it and/or modify it
 *   under the terms of the GNU General Public License as published by the
--- a/src/mingw.mak
+++ b/src/mingw.mak
@ -1,4 +1,4 @@
-# Simple Makefile.w32 for stunnel.exe by Michal Trojnara 1998-2021
+# Simple Makefile.w32 for stunnel.exe by Michal Trojnara 1998-2022
 #
 # Modified by Brian Hatch  (bri@stunnel.org)
 # 20101030 pdelaage:
--- a/src/mingw.mk
+++ b/src/mingw.mk
@ -1,5 +1,5 @@
 ## mingw/mingw64 Makefile
-# by Michal Trojnara 1998-2021
+# by Michal Trojnara 1998-2022

 # 32-bit Windows
 #win32_arch=win32
--- a/src/network.c
+++ b/src/network.c
@ -1,6 +1,6 @@
 /*
 *   stunnel       TLS offloading and load-balancing proxy
- *   Copyright (C) 1998-2021 Michal Trojnara <Michal.Trojnara@stunnel.org>
+ *   Copyright (C) 1998-2022 Michal Trojnara <Michal.Trojnara@stunnel.org>
 *
 *   This program is free software; you can redistribute it and/or modify it
 *   under the terms of the GNU General Public License as published by the
--- a/src/options.c
+++ b/src/options.c
@ -1,6 +1,6 @@
 /*
 *   stunnel       TLS offloading and load-balancing proxy
- *   Copyright (C) 1998-2021 Michal Trojnara <Michal.Trojnara@stunnel.org>
+ *   Copyright (C) 1998-2022 Michal Trojnara <Michal.Trojnara@stunnel.org>
 *
 *   This program is free software; you can redistribute it and/or modify it
 *   under the terms of the GNU General Public License as published by the
--- a/src/os2.mak
+++ b/src/os2.mak
@ -1,11 +1,11 @@
 prefix=.
 DEFS = -DPACKAGE_NAME=\"stunnel\" \
 	-DPACKAGE_TARNAME=\"stunnel\" \
-	-DPACKAGE_VERSION=\"5.61\" \
-	-DPACKAGE_STRING=\"stunnel\ 5.61\" \
+	-DPACKAGE_VERSION=\"5.62\" \
+	-DPACKAGE_STRING=\"stunnel\ 5.62\" \
 	-DPACKAGE_BUGREPORT=\"\" \
 	-DPACKAGE=\"stunnel\" \
-	-DVERSION=\"5.61\" \
+	-DVERSION=\"5.62\" \
 	-DSTDC_HEADERS=1 \
 	-DHAVE_SYS_TYPES_H=1 \
 	-DHAVE_SYS_STAT_H=1 \
--- a/src/protocol.c
+++ b/src/protocol.c
@ -1,6 +1,6 @@
 /*
 *   stunnel       TLS offloading and load-balancing proxy
- *   Copyright (C) 1998-2021 Michal Trojnara <Michal.Trojnara@stunnel.org>
+ *   Copyright (C) 1998-2022 Michal Trojnara <Michal.Trojnara@stunnel.org>
 *
 *   This program is free software; you can redistribute it and/or modify it
 *   under the terms of the GNU General Public License as published by the
--- a/src/prototypes.h
+++ b/src/prototypes.h
@ -1,6 +1,6 @@
 /*
 *   stunnel       TLS offloading and load-balancing proxy
- *   Copyright (C) 1998-2021 Michal Trojnara <Michal.Trojnara@stunnel.org>
+ *   Copyright (C) 1998-2022 Michal Trojnara <Michal.Trojnara@stunnel.org>
 *
 *   This program is free software; you can redistribute it and/or modify it
 *   under the terms of the GNU General Public License as published by the
--- a/src/pty.c
+++ b/src/pty.c
@ -1,6 +1,6 @@
 /*
 *   stunnel       TLS offloading and load-balancing proxy
- *   Copyright (C) 1998-2021 Michal Trojnara <Michal.Trojnara@stunnel.org>
+ *   Copyright (C) 1998-2022 Michal Trojnara <Michal.Trojnara@stunnel.org>
 *
 *   This program is free software; you can redistribute it and/or modify it
 *   under the terms of the GNU General Public License as published by the
--- a/src/resolver.c
+++ b/src/resolver.c
@ -1,6 +1,6 @@
 /*
 *   stunnel       TLS offloading and load-balancing proxy
- *   Copyright (C) 1998-2021 Michal Trojnara <Michal.Trojnara@stunnel.org>
+ *   Copyright (C) 1998-2022 Michal Trojnara <Michal.Trojnara@stunnel.org>
 *
 *   This program is free software; you can redistribute it and/or modify it
 *   under the terms of the GNU General Public License as published by the
--- a/src/resources.rc
+++ b/src/resources.rc
@ -19,7 +19,7 @@ BEGIN
            VALUE "FileDescription",    "stunnel - TLS offloading and load-balancing proxy"
            VALUE "FileVersion",        STUNNEL_VERSION
            VALUE "InternalName",       "stunnel"
-            VALUE "LegalCopyright",     "© by Michal Trojnara, 1998-2021"
+            VALUE "LegalCopyright",     "© by Michal Trojnara, 1998-2022"
            VALUE "OriginalFilename",   "stunnel.exe"
            VALUE "ProductName",        STUNNEL_PRODUCTNAME
            VALUE "ProductVersion",     STUNNEL_VERSION
@ -107,7 +107,7 @@ BEGIN
    ICON            IDI_STUNNEL_MAIN, -1,                        6,  6,  20, 20
    LTEXT           "stunnel version", -1,                      30,  4,  49,  8
    LTEXT           STUNNEL_VERSION, -1,                        79,  4,  57,  8
-    LTEXT           "© by Michal Trojnara, 1998-2021", -1,      30, 12, 106,  8
+    LTEXT           "© by Michal Trojnara, 1998-2022", -1,      30, 12, 106,  8
    LTEXT           "All Rights Reserved", -1,                  30, 20, 106,  8
    LTEXT           "Licensed under the GNU GPL version 2", -1,  4, 28, 132,  8
    LTEXT           "with a special exception for OpenSSL", -1,  4, 36, 132,  8
--- a/src/ssl.c
+++ b/src/ssl.c
@ -1,6 +1,6 @@
 /*
 *   stunnel       TLS offloading and load-balancing proxy
- *   Copyright (C) 1998-2021 Michal Trojnara <Michal.Trojnara@stunnel.org>
+ *   Copyright (C) 1998-2022 Michal Trojnara <Michal.Trojnara@stunnel.org>
 *
 *   This program is free software; you can redistribute it and/or modify it
 *   under the terms of the GNU General Public License as published by the
--- a/src/sthreads.c
+++ b/src/sthreads.c
@ -1,6 +1,6 @@
 /*
 *   stunnel       TLS offloading and load-balancing proxy
- *   Copyright (C) 1998-2021 Michal Trojnara <Michal.Trojnara@stunnel.org>
+ *   Copyright (C) 1998-2022 Michal Trojnara <Michal.Trojnara@stunnel.org>
 *
 *   This program is free software; you can redistribute it and/or modify it
 *   under the terms of the GNU General Public License as published by the
--- a/src/str.c
+++ b/src/str.c
@ -1,6 +1,6 @@
 /*
 *   stunnel       TLS offloading and load-balancing proxy
- *   Copyright (C) 1998-2021 Michal Trojnara <Michal.Trojnara@stunnel.org>
+ *   Copyright (C) 1998-2022 Michal Trojnara <Michal.Trojnara@stunnel.org>
 *
 *   This program is free software; you can redistribute it and/or modify it
 *   under the terms of the GNU General Public License as published by the
--- a/src/stunnel.c
+++ b/src/stunnel.c
@ -1,6 +1,6 @@
 /*
 *   stunnel       TLS offloading and load-balancing proxy
- *   Copyright (C) 1998-2021 Michal Trojnara <Michal.Trojnara@stunnel.org>
+ *   Copyright (C) 1998-2022 Michal Trojnara <Michal.Trojnara@stunnel.org>
 *
 *   This program is free software; you can redistribute it and/or modify it
 *   under the terms of the GNU General Public License as published by the
--- a/src/tls.c
+++ b/src/tls.c
@ -1,6 +1,6 @@
 /*
 *   stunnel       TLS offloading and load-balancing proxy
- *   Copyright (C) 1998-2021 Michal Trojnara <Michal.Trojnara@stunnel.org>
+ *   Copyright (C) 1998-2022 Michal Trojnara <Michal.Trojnara@stunnel.org>
 *
 *   This program is free software; you can redistribute it and/or modify it
 *   under the terms of the GNU General Public License as published by the
--- a/src/ui_unix.c
+++ b/src/ui_unix.c
@ -1,6 +1,6 @@
 /*
 *   stunnel       TLS offloading and load-balancing proxy
- *   Copyright (C) 1998-2021 Michal Trojnara <Michal.Trojnara@stunnel.org>
+ *   Copyright (C) 1998-2022 Michal Trojnara <Michal.Trojnara@stunnel.org>
 *
 *   This program is free software; you can redistribute it and/or modify it
 *   under the terms of the GNU General Public License as published by the
--- a/src/ui_win_cli.c
+++ b/src/ui_win_cli.c
@ -1,6 +1,6 @@
 /*
 *   stunnel       TLS offloading and load-balancing proxy
- *   Copyright (C) 1998-2021 Michal Trojnara <Michal.Trojnara@stunnel.org>
+ *   Copyright (C) 1998-2022 Michal Trojnara <Michal.Trojnara@stunnel.org>
 *
 *   This program is free software; you can redistribute it and/or modify it
 *   under the terms of the GNU General Public License as published by the
--- a/src/ui_win_gui.c
+++ b/src/ui_win_gui.c
@ -1,6 +1,6 @@
 /*
 *   stunnel       TLS offloading and load-balancing proxy
- *   Copyright (C) 1998-2021 Michal Trojnara <Michal.Trojnara@stunnel.org>
+ *   Copyright (C) 1998-2022 Michal Trojnara <Michal.Trojnara@stunnel.org>
 *
 *   This program is free software; you can redistribute it and/or modify it
 *   under the terms of the GNU General Public License as published by the
--- a/src/vc.mak
+++ b/src/vc.mak
@ -1,4 +1,4 @@
-# vc.mak by Michal Trojnara 1998-2021
+# vc.mak by Michal Trojnara 1998-2022
 # with help of David Gillingham <dgillingham@gmail.com>
 # with help of Pierre Delaage <delaage.pierre@free.fr>

--- a/src/verify.c
+++ b/src/verify.c
@ -1,6 +1,6 @@
 /*
 *   stunnel       TLS offloading and load-balancing proxy
- *   Copyright (C) 1998-2021 Michal Trojnara <Michal.Trojnara@stunnel.org>
+ *   Copyright (C) 1998-2022 Michal Trojnara <Michal.Trojnara@stunnel.org>
 *
 *   This program is free software; you can redistribute it and/or modify it
 *   under the terms of the GNU General Public License as published by the
--- a/src/version.h
+++ b/src/version.h
@ -1,6 +1,6 @@
 /*
 *   stunnel       TLS offloading and load-balancing proxy
- *   Copyright (C) 1998-2021 Michal Trojnara <Michal.Trojnara@stunnel.org>
+ *   Copyright (C) 1998-2022 Michal Trojnara <Michal.Trojnara@stunnel.org>
 *
 *   This program is free software; you can redistribute it and/or modify it
 *   under the terms of the GNU General Public License as published by the
@ -65,7 +65,7 @@

 /* START CUSTOMIZE */
 #define VERSION_MAJOR 5
-#define VERSION_MINOR 61
+#define VERSION_MINOR 62
 /* END CUSTOMIZE */

 /* all the following macros are ABSOLUTELY NECESSARY to have proper string
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# by Michal Trojnara 1998-2021
+# by Michal Trojnara 1998-2022

 SUBDIRS = certs

@ -10,6 +10,9 @@ check-local:
 	for v in $$(seq 20 -1 7); do command -v python3.$$v && break; done || ( echo "Python 3.7 or later not found" && false )
 	for v in $$(seq 20 -1 7); do command -v python3.$$v && python3.$$v $(srcdir)/maketest.py --debug=10 && break; done

+dist-hook:
+	rm -rf __pycache__ plugins/__pycache__
+
 distclean-local:
 	rm -f logs/*.log
 	rm -f certs/*.pem
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@ -14,7 +14,7 @@

@SET_MAKE@

-# by Michal Trojnara 1998-2021
+# by Michal Trojnara 1998-2022
 VPATH = @srcdir@
 am__is_gnu_make = { \
  if test -z '$(MAKELEVEL)'; then \
@ -243,6 +243,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
 PTHREAD_LIBS = @PTHREAD_LIBS@
@ -267,6 +270,7 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 ax_pthread_config = @ax_pthread_config@
+bashcompdir = @bashcompdir@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@ -308,6 +312,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+with_bashcompdir = @with_bashcompdir@
 SUBDIRS = certs
 EXTRA_DIST = maketest.py plugin_collection.py reader.py error.py plugins
 all: all-recursive
@ -506,6 +511,9 @@ distdir-am: $(DISTFILES)
 	      || exit 1; \
 	  fi; \
 	done
+	$(MAKE) $(AM_MAKEFLAGS) \
+	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
+	  dist-hook
 check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) check-local
 check: check-recursive
@ -613,17 +621,17 @@ uninstall-am:

 .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
 	check-am check-local clean clean-generic clean-libtool \
-	cscopelist-am ctags ctags-am distclean distclean-generic \
-	distclean-libtool distclean-local distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-am uninstall uninstall-am
+	cscopelist-am ctags ctags-am dist-hook distclean \
+	distclean-generic distclean-libtool distclean-local \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags tags-am uninstall uninstall-am

 .PRECIOUS: Makefile

@ -633,6 +641,9 @@ check-local:
 	for v in $$(seq 20 -1 7); do command -v python3.$$v && break; done || ( echo "Python 3.7 or later not found" && false )
 	for v in $$(seq 20 -1 7); do command -v python3.$$v && python3.$$v $(srcdir)/maketest.py --debug=10 && break; done

+dist-hook:
+	rm -rf __pycache__ plugins/__pycache__
+
 distclean-local:
 	rm -f logs/*.log
 	rm -f certs/*.pem
--- a/tests/certs/Makefile.am
+++ b/tests/certs/Makefile.am
@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# by Michal Trojnara 1998-2021
+# by Michal Trojnara 1998-2022

 EXTRA_DIST = maketestcert.sh openssltest.cnf

--- a/tests/certs/Makefile.in
+++ b/tests/certs/Makefile.in
@ -14,7 +14,7 @@

@SET_MAKE@

-# by Michal Trojnara 1998-2021
+# by Michal Trojnara 1998-2022
 VPATH = @srcdir@
 am__is_gnu_make = { \
  if test -z '$(MAKELEVEL)'; then \
@ -183,6 +183,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
 PTHREAD_LIBS = @PTHREAD_LIBS@
@ -207,6 +210,7 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 ax_pthread_config = @ax_pthread_config@
+bashcompdir = @bashcompdir@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@ -248,6 +252,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+with_bashcompdir = @with_bashcompdir@
 EXTRA_DIST = maketestcert.sh openssltest.cnf
 all: all-am

--- a/tests/plugins/pycache/p01_client_cert.cpython-39.pyc
+++ b/tests/plugins/pycache/p01_client_cert.cpython-39.pyc
--- a/tests/plugins/pycache/p02_require_cert.cpython-39.pyc
+++ b/tests/plugins/pycache/p02_require_cert.cpython-39.pyc
--- a/tests/plugins/pycache/p03_verify_peer.cpython-39.pyc
+++ b/tests/plugins/pycache/p03_verify_peer.cpython-39.pyc
--- a/tests/plugins/pycache/p04_verify_chain.cpython-39.pyc
+++ b/tests/plugins/pycache/p04_verify_chain.cpython-39.pyc
--- a/tests/plugins/pycache/p05_verify_crl.cpython-39.pyc
+++ b/tests/plugins/pycache/p05_verify_crl.cpython-39.pyc
--- a/tests/plugins/pycache/p06_psk_secrets.cpython-39.pyc
+++ b/tests/plugins/pycache/p06_psk_secrets.cpython-39.pyc
--- a/tests/plugins/pycache/p07_p12cert.cpython-39.pyc
+++ b/tests/plugins/pycache/p07_p12cert.cpython-39.pyc
--- a/tests/plugins/pycache/p08_ipv6.cpython-39.pyc
+++ b/tests/plugins/pycache/p08_ipv6.cpython-39.pyc
--- a/tests/plugins/pycache/p09_bind.cpython-39.pyc
+++ b/tests/plugins/pycache/p09_bind.cpython-39.pyc
--- a/tests/plugins/pycache/p10_fips.cpython-39.pyc
+++ b/tests/plugins/pycache/p10_fips.cpython-39.pyc
--- a/tests/plugins/pycache/p11_fips_cipher.cpython-39.pyc
+++ b/tests/plugins/pycache/p11_fips_cipher.cpython-39.pyc
--- a/tests/plugins/pycache/p12_sni.cpython-39.pyc
+++ b/tests/plugins/pycache/p12_sni.cpython-39.pyc
--- a/tests/plugins/pycache/p13_resume.cpython-39.pyc
+++ b/tests/plugins/pycache/p13_resume.cpython-39.pyc
--- a/tests/plugins/pycache/p14_resume_ticket.cpython-39.pyc
+++ b/tests/plugins/pycache/p14_resume_ticket.cpython-39.pyc
--- a/tests/plugins/pycache/p15_resume_secret.cpython-39.pyc
+++ b/tests/plugins/pycache/p15_resume_secret.cpython-39.pyc
--- a/tests/plugins/pycache/p16_redirect.cpython-39.pyc
+++ b/tests/plugins/pycache/p16_redirect.cpython-39.pyc
--- a/tests/plugins/pycache/p17_redirect_proxy.cpython-39.pyc
+++ b/tests/plugins/pycache/p17_redirect_proxy.cpython-39.pyc
--- a/tests/plugins/pycache/p18_redirect_resume.cpython-39.pyc
+++ b/tests/plugins/pycache/p18_redirect_resume.cpython-39.pyc
--- a/tests/plugins/pycache/p19_reload.cpython-39.pyc
+++ b/tests/plugins/pycache/p19_reload.cpython-39.pyc
--- a/tests/plugins/pycache/p20_failover.cpython-39.pyc
+++ b/tests/plugins/pycache/p20_failover.cpython-39.pyc
--- a/tests/plugins/pycache/p21_include.cpython-39.pyc
+++ b/tests/plugins/pycache/p21_include.cpython-39.pyc
--- a/tests/plugins/pycache/p22_inetd.cpython-39.pyc
+++ b/tests/plugins/pycache/p22_inetd.cpython-39.pyc
--- a/tests/plugins/pycache/p23_exec_conn.cpython-39.pyc
+++ b/tests/plugins/pycache/p23_exec_conn.cpython-39.pyc
--- a/tests/plugins/pycache/p24_delay.cpython-39.pyc
+++ b/tests/plugins/pycache/p24_delay.cpython-39.pyc
--- a/tests/plugins/pycache/p25_wrong_client.cpython-39.pyc
+++ b/tests/plugins/pycache/p25_wrong_client.cpython-39.pyc
--- a/tests/plugins/pycache/p26_wrong_server.cpython-39.pyc
+++ b/tests/plugins/pycache/p26_wrong_server.cpython-39.pyc
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# by Michal Trojnara 1998-2021
+# by Michal Trojnara 1998-2022

 EXTRA_DIST = ca.html ca.pl importCA.html importCA.sh script.sh makecert.sh
 EXTRA_DIST += openssl.cnf stunnel.nsi stunnel.license stunnel.conf
@ -16,6 +16,10 @@ examples_DATA = stunnel.init stunnel.service
 examples_DATA += stunnel.logrotate stunnel.rh.init stunnel.spec
 examples_DATA += ca.html ca.pl importCA.html importCA.sh script.sh

+# bash completion script
+bashcompdir = @bashcompdir@
+dist_bashcomp_DATA = stunnel.bash
+
 CLEANFILES = stunnel.conf-sample stunnel.init stunnel.service

 install-data-local:
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@ -14,7 +14,7 @@

@SET_MAKE@

-# by Michal Trojnara 1998-2021
+# by Michal Trojnara 1998-2022

 VPATH = @srcdir@
 am__is_gnu_make = { \
@ -98,7 +98,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+DIST_COMMON = $(srcdir)/Makefile.am $(dist_bashcomp_DATA) \
+	$(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h
 CONFIG_CLEAN_FILES =
@ -149,8 +150,9 @@ am__uninstall_files_from_dir = { \
    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
         $(am__cd) "$$dir" && rm -f $$files; }; \
  }
-am__installdirs = "$(DESTDIR)$(confdir)" "$(DESTDIR)$(examplesdir)"
-DATA = $(conf_DATA) $(examples_DATA)
+am__installdirs = "$(DESTDIR)$(confdir)" "$(DESTDIR)$(bashcompdir)" \
+	"$(DESTDIR)$(examplesdir)"
+DATA = $(conf_DATA) $(dist_bashcomp_DATA) $(examples_DATA)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@ -213,6 +215,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
 PTHREAD_LIBS = @PTHREAD_LIBS@
@ -237,6 +242,9 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 ax_pthread_config = @ax_pthread_config@
+
+# bash completion script
+bashcompdir = @bashcompdir@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@ -278,6 +286,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+with_bashcompdir = @with_bashcompdir@
 EXTRA_DIST = ca.html ca.pl importCA.html importCA.sh script.sh \
 	makecert.sh openssl.cnf stunnel.nsi stunnel.license \
 	stunnel.conf stunnel.conf-sample.in stunnel.init.in \
@ -289,6 +298,7 @@ examplesdir = $(docdir)/examples
 examples_DATA = stunnel.init stunnel.service stunnel.logrotate \
 	stunnel.rh.init stunnel.spec ca.html ca.pl importCA.html \
 	importCA.sh script.sh
+dist_bashcomp_DATA = stunnel.bash
 CLEANFILES = stunnel.conf-sample stunnel.init stunnel.service
 edit = sed \
 	-e 's|@prefix[@]|$(prefix)|g' \
@ -356,6 +366,27 @@ uninstall-confDATA:
 	@list='$(conf_DATA)'; test -n "$(confdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(confdir)'; $(am__uninstall_files_from_dir)
+install-dist_bashcompDATA: $(dist_bashcomp_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(dist_bashcomp_DATA)'; test -n "$(bashcompdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bashcompdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bashcompdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(bashcompdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(bashcompdir)" || exit $$?; \
+	done
+
+uninstall-dist_bashcompDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_bashcomp_DATA)'; test -n "$(bashcompdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(bashcompdir)'; $(am__uninstall_files_from_dir)
 install-examplesDATA: $(examples_DATA)
 	@$(NORMAL_INSTALL)
 	@list='$(examples_DATA)'; test -n "$(examplesdir)" || list=; \
@ -421,7 +452,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(confdir)" "$(DESTDIR)$(examplesdir)"; do \
+	for dir in "$(DESTDIR)$(confdir)" "$(DESTDIR)$(bashcompdir)" "$(DESTDIR)$(examplesdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@ -476,7 +507,7 @@ info: info-am
 info-am:

 install-data-am: install-confDATA install-data-local \
-	install-examplesDATA
+	install-dist_bashcompDATA install-examplesDATA

 install-dvi: install-dvi-am

@ -520,7 +551,8 @@ ps: ps-am

 ps-am:

-uninstall-am: uninstall-confDATA uninstall-examplesDATA
+uninstall-am: uninstall-confDATA uninstall-dist_bashcompDATA \
+	uninstall-examplesDATA

 .MAKE: install-am install-strip

@ -528,14 +560,15 @@ uninstall-am: uninstall-confDATA uninstall-examplesDATA
 	cscopelist-am ctags-am distclean distclean-generic \
 	distclean-libtool distdir dvi dvi-am html html-am info info-am \
 	install install-am install-confDATA install-data \
-	install-data-am install-data-local install-dvi install-dvi-am \
-	install-examplesDATA install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags-am uninstall uninstall-am uninstall-confDATA \
+	install-data-am install-data-local install-dist_bashcompDATA \
+	install-dvi install-dvi-am install-examplesDATA install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-am uninstall-confDATA uninstall-dist_bashcompDATA \
 	uninstall-examplesDATA

 .PRECIOUS: Makefile
--- a/tools/ca-certs.pem
+++ b/tools/ca-certs.pem
@ -113,6 +113,39 @@ MjxNBiLOFeXdntiP2t7SxDnlF4HPOEfrf4htWRvfn0IUrn7PqLBmZdo3r5+qPeoo
 tt7VMVgWglvquxl1AnMaykgaIZOQCo6ThKd9OyMYkomgjaw=
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
+MIIFszCCA5ugAwIBAgIUEwLV4kBMkkaGFmddtLu7sms+/BMwDQYJKoZIhvcNAQEL
+BQAwYTELMAkGA1UEBhMCVE4xNzA1BgNVBAoMLkFnZW5jZSBOYXRpb25hbGUgZGUg
+Q2VydGlmaWNhdGlvbiBFbGVjdHJvbmlxdWUxGTAXBgNVBAMMEFR1blRydXN0IFJv
+b3QgQ0EwHhcNMTkwNDI2MDg1NzU2WhcNNDQwNDI2MDg1NzU2WjBhMQswCQYDVQQG
+EwJUTjE3MDUGA1UECgwuQWdlbmNlIE5hdGlvbmFsZSBkZSBDZXJ0aWZpY2F0aW9u
+IEVsZWN0cm9uaXF1ZTEZMBcGA1UEAwwQVHVuVHJ1c3QgUm9vdCBDQTCCAiIwDQYJ
+KoZIhvcNAQEBBQADggIPADCCAgoCggIBAMPN0/y9BFPdDCA61YguBUtB9YOCfvdZ
+n56eY+hz2vYGqU8ftPkLHzmMmiDQfgbU7DTZhrx1W4eI8NLZ1KMKsmwb60ksPqxd
+2JQDoOw05TDENX37Jk0bbjBU2PWARZw5rZzJJQRNmpA+TkBuimvNKWfGzC3gdOgF
+VwpIUPp6Q9p+7FuaDmJ2/uqdHYVy7BG7NegfJ7/Boce7SBbdVtfMTqDhuazb1YMZ
+GoXRlJfXyqNlC/M4+QKu3fZnz8k/9YosRxqZbwUN/dAdgjH8KcwAWJeRTIAAHDOF
+li/LQcKLEITDCSSJH7UP2dl3RxiSlGBcx5kDPP73lad9UKGAwqmDrViWVSHbhlnU
+r8a83YFuB9tgYv7sEG7aaAH0gxupPqJbI9dkxt/con3YS7qC0lH4Zr8GRuR5KiY2
+eY8fTpkdso8MDhz/yV3A/ZAQprE38806JG60hZC/gLkMjNWb1sjxVj8agIl6qeIb
+MlEsPvLfe/ZdeikZjuXIvTZxi11Mwh0/rViizz1wTaZQmCXcI/m4WEEIcb9PuISg
+jwBUFfyRbVinljvrS5YnzWuioYasDXxU5mZMZl+QviGaAkYt5IPCgLnPSz7ofzwB
+7I9ezX/SKEIBlYrilz0QIX32nRzFNKHsLA4KUiwSVXAkPcvCFDVDXSdOvsC9qnyW
+5/yeYa1E0wCXAgMBAAGjYzBhMB0GA1UdDgQWBBQGmpsfU33x9aTI04Y+oXNZtPdE
+ITAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFAaamx9TffH1pMjThj6hc1m0
+90QhMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAgEAqgVutt0Vyb+z
+xiD2BkewhpMl0425yAA/l/VSJ4hxyXT968pk21vvHl26v9Hr7lxpuhbI87mP0zYu
+QEkHDVneixCwSQXi/5E/S7fdAo74gShczNxtr18UnH1YeA32gAm56Q6XKRm4t+v4
+FstVEuTGfbvE7Pi1HE4+Z7/FXxttbUcoqgRYYdZ2vyJ/0Adqp2RT8JeNnYA/u8EH
+22Wv5psymsNUk8QcCMNE+3tjEUPRahphanltkE8pjkcFwRJpadbGNjHh/PqAulxP
+xOu3Mqz4dWEX1xAZufHSCe96Qp1bWgvUxpVOKs7/B9dPfhgGiPEZtdmYu65xxBzn
+dFlY7wyJz4sfdZMaBBSSSFCp61cpABbjNhzI+L/wM9VBD8TMPN3pM0MBkRArHtG5
+Xc0yGYuPjCB31yLEQtyEFpslbei0VXF/sHyz03FJuc9SpAQ/3D2gu68zngowYI7b
+nV2UqL1g52KAdoGDDIzMMEZJ4gzSqK/rYXHv5yJiqfdcZGyfFoxnNidF9Ql7v/YQ
+CvGwjVRDjAS6oz/v4jXH+XTgbzRB0L9zZVcg+ZtnemZoJE6AZb0QmQZZ8mWvuMZH
+u/2QeItBcy6vVR/cO5JyboTT0GFMDcx2V+IthSIVNg3rAZ3r2OvEhJn7wAzMMujj
+d9qDRIueVSjAi1jTkD5OGwDxFa2DK5o=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
 MIICZTCCAeugAwIBAgIQeI8nXIESUiClBNAt3bpz9DAKBggqhkjOPQQDAzB0MQsw
 CQYDVQQGEwJQTDEhMB8GA1UEChMYQXNzZWNvIERhdGEgU3lzdGVtcyBTLkEuMScw
 JQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxGTAXBgNVBAMT
@ -161,6 +194,54 @@ qJZ9ZPskWkoDbGs4xugDQ5r3V7mzKWmTOPQD8rv7gmsHINFSH5pkAnuYZttcTVoP
 E2Efv4WstK2tBZQIgx51F9NxO5NQI1mg7TyRVJ12AMXDuDjb
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
+MIIFpDCCA4ygAwIBAgIQOcqTHO9D88aOk8f0ZIk4fjANBgkqhkiG9w0BAQsFADBs
+MQswCQYDVQQGEwJHUjE3MDUGA1UECgwuSGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJl
+c2VhcmNoIEluc3RpdHV0aW9ucyBDQTEkMCIGA1UEAwwbSEFSSUNBIFRMUyBSU0Eg
+Um9vdCBDQSAyMDIxMB4XDTIxMDIxOTEwNTUzOFoXDTQ1MDIxMzEwNTUzN1owbDEL
+MAkGA1UEBhMCR1IxNzA1BgNVBAoMLkhlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNl
+YXJjaCBJbnN0aXR1dGlvbnMgQ0ExJDAiBgNVBAMMG0hBUklDQSBUTFMgUlNBIFJv
+b3QgQ0EgMjAyMTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAIvC569l
+mwVnlskNJLnQDmT8zuIkGCyEf3dRywQRNrhe7Wlxp57kJQmXZ8FHws+RFjZiPTgE
+4VGC/6zStGndLuwRo0Xua2s7TL+MjaQenRG56Tj5eg4MmOIjHdFOY9TnuEFE+2uv
+a9of08WRiFukiZLRgeaMOVig1mlDqa2YUlhu2wr7a89o+uOkXjpFc5gH6l8Cct4M
+pbOfrqkdtx2z/IpZ525yZa31MJQjB/OCFks1mJxTuy/K5FrZx40d/JiZ+yykgmvw
+Kh+OC19xXFyuQnspiYHLA6OZyoieC0AJQTPb5lh6/a6ZcMBaD9YThnEvdmn8kN3b
+LW7R8pv1GmuebxWMevBLKKAiOIAkbDakO/IwkfN4E8/BPzWr8R0RI7VDIp4BkrcY
+AuUR0YLbFQDMYTfBKnya4dC6s1BG7oKsnTH4+yPiAwBIcKMJJnkVU2DzOFytOOqB
+AGMUuTNe3QvboEUHGjMJ+E20pwKmafTCWQWIZYVWrkvL4N48fS0ayOn7H6NhStYq
+E613TBoYm5EPWNgGVMWX+Ko/IIqmhaZ39qb8HOLubpQzKoNQhArlT4b4UEV4AIHr
+W2jjJo3Me1xR9BQsQL4aYB16cmEdH2MtiKrOokWQCPxrvrNQKlr9qEgYRtaQQJKQ
+CoReaDH46+0N0x3GfZkYVVYnZS6NRcUk7M7jAgMBAAGjQjBAMA8GA1UdEwEB/wQF
+MAMBAf8wHQYDVR0OBBYEFApII6ZgpJIKM+qTW8VX6iVNvRLuMA4GA1UdDwEB/wQE
+AwIBhjANBgkqhkiG9w0BAQsFAAOCAgEAPpBIqm5iFSVmewzVjIuJndftTgfvnNAU
+X15QvWiWkKQUEapobQk1OUAJ2vQJLDSle1mESSmXdMgHHkdt8s4cUCbjnj1AUz/3
+f5Z2EMVGpdAgS1D0NTsY9FVqQRtHBmg8uwkIYtlfVUKqrFOFrJVWNlar5AWMxaja
+H6NpvVMPxP/cyuN+8kyIhkdGGvMA9YCRotxDQpSbIPDRzbLrLFPCU3hKTwSUQZqP
+JzLB5UkZv/HywouoCjkxKLR9YjYsTewfM7Z+d21+UPCfDtcRj88YxeMn/ibvBZ3P
+zzfF0HvaO7AWhAw6k9a+F9sPPg4ZeAnHqQJyIkv3N3a6dcSFA1pj1bF1BcK5vZSt
+jBWZp5N99sXzqnTPBIWUmAD04vnKJGW/4GKvyMX6ssmeVkjaef2WdhW+o45WxLM0
+/L5H9MG0qPzVMIho7suuyWPEdr6sOBjhXlzPrjoiUevRi7PzKzMHVIf6tLITe7pT
+BGIBnfHAT+7hOtSLIBD6Alfm78ELt5BGnBkpjNxvoEppaZS3JGWg/6w/zgH7IS79
+aPib8qXPMThcFarmlwDB31qlpzmq6YR/PFGoOtmUW4y/Twhx5duoXNTSpv4Ao8YW
+xw/ogM4cKGR0GQjTQuPOAF1/sdwTsOEFy9EgqoZ0njnnkf3/W9b3raYvAwtt41dU
+63ZTGI0RmLo=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIICVDCCAdugAwIBAgIQZ3SdjXfYO2rbIvT/WeK/zjAKBggqhkjOPQQDAzBsMQsw
+CQYDVQQGEwJHUjE3MDUGA1UECgwuSGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2Vh
+cmNoIEluc3RpdHV0aW9ucyBDQTEkMCIGA1UEAwwbSEFSSUNBIFRMUyBFQ0MgUm9v
+dCBDQSAyMDIxMB4XDTIxMDIxOTExMDExMFoXDTQ1MDIxMzExMDEwOVowbDELMAkG
+A1UEBhMCR1IxNzA1BgNVBAoMLkhlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJj
+aCBJbnN0aXR1dGlvbnMgQ0ExJDAiBgNVBAMMG0hBUklDQSBUTFMgRUNDIFJvb3Qg
+Q0EgMjAyMTB2MBAGByqGSM49AgEGBSuBBAAiA2IABDgI/rGgltJ6rK9JOtDA4MM7
+KKrxcm1lAEeIhPyaJmuqS7psBAqIXhfyVYf8MLA04jRYVxqEU+kw2anylnTDUR9Y
+STHMmE5gEYd103KUkE+bECUqqHgtvpBBWJAVcqeht6NCMEAwDwYDVR0TAQH/BAUw
+AwEB/zAdBgNVHQ4EFgQUyRtTgRL+BNUW0aq8mm+3oJUZbsowDgYDVR0PAQH/BAQD
+AgGGMAoGCCqGSM49BAMDA2cAMGQCMBHervjcToiwqfAircJRQO9gcS3ujwLEXQNw
+SaSS6sUUiHCm0w2wqsosQJz76YJumgIwK0eaB8bRwoF8yguWGEEbo/QwCZ61IygN
+nxS2PFOiTAZpffpskcYqSUXm7LcT4Tps
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
 MIIFzzCCA7egAwIBAgIUCBZfikyl7ADJk0DfxMauI7gcWqQwDQYJKoZIhvcNAQEL
 BQAwbzELMAkGA1UEBhMCSEsxEjAQBgNVBAgTCUhvbmcgS29uZzESMBAGA1UEBxMJ
 SG9uZyBLb25nMRYwFAYDVQQKEw1Ib25na29uZyBQb3N0MSAwHgYDVQQDExdIb25n
--- a/tools/openssl.cnf
+++ b/tools/openssl.cnf
@ -1,5 +1,5 @@
 # OpenSSL configuration file to create a server certificate
-# by Michal Trojnara 1998-2021
+# by Michal Trojnara 1998-2022

 # Use this in order to automatically load providers.
 openssl_conf = openssl_init
--- a/tools/stunnel.bash
+++ b/tools/stunnel.bash
@ -0,0 +1,26 @@
+# bash completion for stunnel                              -*- shell-script -*-
+# by Michal Trojnara 1998-2022
+
+_comp_cmd_stunnel()
+{
+    local cur prev words cword
+    _init_completion || return
+
+    local opt="-fd -help -version -sockets -options"
+
+    case $prev in
+        -fd | -help | -version | -sockets | -options)
+            return
+            ;;
+    esac
+
+    if [[ ${cur} == -* ]] ; then
+        COMPREPLY=($(compgen -W "${opt}" -- ${cur}))
+        return
+    fi
+
+    _filedir '@(cnf|conf)'
+} &&
+    complete -F _comp_cmd_stunnel stunnel
+
+# ex: filetype=sh
--- a/tools/stunnel.conf
+++ b/tools/stunnel.conf
@ -1,4 +1,4 @@
-; Sample stunnel configuration file for Win64 by Michal Trojnara 2002-2020
+; Sample stunnel configuration file for Win64 by Michal Trojnara 2002-2022
 ; Some options used here may be inadequate for your particular configuration
 ; This sample file does *not* represent stunnel.conf defaults
 ; Please consult the manual for detailed description of available options
--- a/tools/stunnel.conf-sample.in
+++ b/tools/stunnel.conf-sample.in
@ -1,4 +1,4 @@
-; Sample stunnel configuration file for Unix by Michal Trojnara 1998-2021
+; Sample stunnel configuration file for Unix by Michal Trojnara 1998-2022
 ; Some options used here may be inadequate for your particular configuration
 ; This sample file does *not* represent stunnel.conf defaults
 ; Please consult the manual for detailed description of available options
--- a/tools/stunnel.license
+++ b/tools/stunnel.license
@ -1,4 +1,4 @@
-Copyright (C) 1998-2021 Michal Trojnara
+Copyright (C) 1998-2022 Michal Trojnara

 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.

--- a/tools/stunnel.nsi
+++ b/tools/stunnel.nsi
@ -1,4 +1,4 @@
-# NSIS stunnel installer by Michal Trojnara 1998-2021
+# NSIS stunnel installer by Michal Trojnara 1998-2022

 !define /ifndef VERSION testing
 !define /ifndef ARCH win32
--- a/tools/stunnel.spec
+++ b/tools/stunnel.spec
@ -1,5 +1,5 @@
 Name:           stunnel
-Version:        5.61
+Version:        5.62
 Release:        1%{?dist}
 Summary:        An TLS-encrypting socket wrapper
 Group:          Applications/Internet