- Fix windows dependency on libssp.dll because of default stack

  protector in mingw.

diff --git a/configure.ac b/configure.ac
index 0b37bfc30fd929bbfde47bef506bc64a1fa03fb1..9f3455c0ffbef64c37dfde31aa1480ece2b003ab 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1442,6 +1442,7 @@ if test x_$enable_static_exe = x_yes; then
                        LIBS="$LIBS -lgdi32"
                fi
                LIBS="$LIBS -lz"
+               staticexe="$staticexe -l:libssp.a"
        fi
 fi
 
@@ -1458,6 +1459,7 @@ if test x_$enable_fully_static = x_yes; then
                        LIBS="$LIBS -lgdi32"
                fi
                LIBS="$LIBS -lz"
+               staticexe="$staticexe -l:libssp.a"
        fi
 fi
 

diff --git a/doc/Changelog b/doc/Changelog
index fcf84deb5c66eab051cc1cbfb962f6d4cb07572e..328b8466302c40393d648647b75e0eff507d86db 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,8 @@
 2 February 2021: Wouter
        - branch-1.13.1 is created, with release-1.13.1rc1 tag.
        - Fix dynlibmod link on rhel8 for -ldl inclusion.
+       - Fix windows dependency on libssp.dll because of default stack
+         protector in mingw.
 
 1 February 2021: George
        - Attempt to fix NULL keys in the reuse_tcp tree; relates to #411.

diff --git a/makedist.sh b/makedist.sh
index c3bfcaad388303ac5218a16e6ff314872a5f31a2..25cabe1368d620ce072d6509e5416d8cd5fdbd52 100755 (executable)
--- a/makedist.sh
+++ b/makedist.sh
@@ -412,6 +412,11 @@ if [ "$DOWIN" = "yes" ]; then
     cp ../unbound.exe ../unbound-anchor.exe ../unbound-host.exe ../unbound-control.exe ../unbound-checkconf.exe ../unbound-service-install.exe ../unbound-service-remove.exe ../LICENSE ../winrc/unbound-control-setup.cmd ../winrc/unbound-website.url ../winrc/service.conf ../winrc/README.txt ../contrib/create_unbound_ad_servers.cmd ../contrib/warmup.cmd ../contrib/unbound_cache.cmd .
     mkdir libunbound
     cp ../../unbound_shared/unbound.h ../../unbound_shared/.libs/libunbound*.dll ../../unbound_shared/.libs/libunbound.dll.a ../../unbound_shared/.libs/libunbound.a ../../unbound_shared/.libs/libunbound*.def ../../sslsharedinstall/lib/libcrypto.dll.a ../../sslsharedinstall/lib/libssl.dll.a ../../sslsharedinstall/bin/libcrypto*.dll ../../sslsharedinstall/bin/libssl*.dll ../../wxpinstall/bin/libexpat*.dll ../../wxpinstall/lib/libexpat.dll.a libunbound/.
+    if test "$W64" = "no"; then
+           cp /usr/i686-w64-mingw32/sys-root/mingw/bin/libssp-0.dll libunbound/.
+    else
+           cp /usr/x86_64-w64-mingw32/sys-root/mingw/bin/libssp-0.dll libunbound/.
+    fi
     # zipfile
     zip -r ../$file LICENSE README.txt unbound.exe unbound-anchor.exe unbound-host.exe unbound-control.exe unbound-checkconf.exe unbound-service-install.exe unbound-service-remove.exe unbound-control-setup.cmd example.conf service.conf root.key unbound-website.url create_unbound_ad_servers.cmd warmup.cmd unbound_cache.cmd Changelog libunbound
     info "Testing $file"