2 changes: 1 addition & 1 deletion tools/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## Process this file with automake to produce Makefile.in
# by Michal Trojnara 1998-2019
# by Michal Trojnara 1998-2020

EXTRA_DIST = ca.html ca.pl importCA.html importCA.sh script.sh makecert.sh
EXTRA_DIST += openssl.cnf stunnel.nsi stunnel.license stunnel.conf
Expand Down
2 changes: 1 addition & 1 deletion tools/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

@SET_MAKE@

# by Michal Trojnara 1998-2019
# by Michal Trojnara 1998-2020

VPATH = @srcdir@
am__is_gnu_make = { \
Expand Down
2 changes: 1 addition & 1 deletion tools/openssl.cnf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# OpenSSL configuration file to create a server certificate
# by Michal Trojnara 1998-2019
# by Michal Trojnara 1998-2020

[ req ]
# comment out the next line to protect the private key with a passphrase
Expand Down
2 changes: 1 addition & 1 deletion tools/stunnel.conf-sample.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
; Sample stunnel configuration file for Unix by Michal Trojnara 1998-2019
; Sample stunnel configuration file for Unix by Michal Trojnara 1998-2020
; 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
Expand Down
2 changes: 1 addition & 1 deletion tools/stunnel.license
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (C) 1998-2019 Michal Trojnara
Copyright (C) 1998-2020 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.

Expand Down
11 changes: 10 additions & 1 deletion tools/stunnel.nsi
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# NSIS stunnel installer by Michal Trojnara 1998-2019
# NSIS stunnel installer by Michal Trojnara 1998-2020

!define /ifndef VERSION testing
!define /ifndef ARCH win32
Expand Down Expand Up @@ -181,6 +181,7 @@ no_service_restart:
Delete "$INSTDIR\bin\libssl-1_1-x64.dll"
Delete "$INSTDIR\bin\libssl-1_1-x64.pdb"
Delete "$INSTDIR\bin\vcruntime140.dll"
Delete "$INSTDIR\bin\libssp-0.dll"
RMDir "$INSTDIR\bin"

Delete "$INSTDIR\engines\4758cca.dll"
Expand Down Expand Up @@ -338,10 +339,18 @@ Section "Core Files" sectionCORE
!if /FileExists "/usr/x86_64-w64-mingw32/bin/libssp-0.dll"
File "/usr/x86_64-w64-mingw32/bin/libssp-0.dll"
!else
!if /FileExists "/usr/lib/gcc/x86_64-w64-mingw32/10-win32/libssp-0.dll"
File "/usr/lib/gcc/x86_64-w64-mingw32/10-win32/libssp-0.dll"
!else
!if /FileExists "/usr/lib/gcc/x86_64-w64-mingw32/9.3-win32/libssp-0.dll"
File "/usr/lib/gcc/x86_64-w64-mingw32/9.3-win32/libssp-0.dll"
!else
!if /FileExists "/usr/lib/gcc/x86_64-w64-mingw32/8.3-win32/libssp-0.dll"
File "/usr/lib/gcc/x86_64-w64-mingw32/8.3-win32/libssp-0.dll"
!endif
!endif
!endif
!endif
#SetOutPath "$INSTDIR"
#ReadRegStr $0 HKLM "SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x64" "Installed"
#${If} $0 == 1
Expand Down
2 changes: 1 addition & 1 deletion tools/stunnel.service.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[Unit]
Description=TLS tunnel for network daemons
After=syslog.target network.target
After=syslog.target network-online.target

[Service]
ExecStart=@bindir@/stunnel
Expand Down
2 changes: 1 addition & 1 deletion tools/stunnel.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: stunnel
Version: 5.56
Version: 5.57
Release: 1%{?dist}
Summary: An TLS-encrypting socket wrapper
Group: Applications/Internet
Expand Down