Merge pull request #482 from VincentBlondeau/fixSSL1.1

Update OpenSSL download to v1.1.1f as v1.0.2q EOLed 1 Jan 2020

build.win32x86/third-party/Makefile.openssl

@@ -21,7 +21,6 @@ $(OPENSSLARCHIVE):
 
 $(THIRDPARTYLIBDIR)/$(OPENSSLLIBNAME): $(OPENSSLARCHIVE)
 	tar x -f $(OPENSSLARCHIVE) -C $(THIRDPARTYDIR)
-	sed -i 's/symlink/copy/g'  $(OPENSSLDIR)/util/mklink.pl
 	cd $(OPENSSLDIR) \
 		&&  CC='$(CC)' \
 			LD='$(LD)' \
@@ -31,7 +30,7 @@ $(THIRDPARTYLIBDIR)/$(OPENSSLLIBNAME): $(OPENSSLARCHIVE)
 			DLLWRAP='$(DLLWRAP)' \
 			./Configure mingw --prefix='$(THIRDPARTYOUTDIR)' shared $(THIRDPARTY_CFLAGS) \
 		&& make \
-		&& make install
+		&& make install_sw
 
 # Assuming building ssleay32.dll will also build libeay32.dll
 $(OPENSSLLIB): $(THIRDPARTYLIBDIR)/$(OPENSSLLIBNAME)

build.win64x64/pharo.stack.spur/Makefile

@@ -17,7 +17,7 @@ include ../common/Makefile
 #
 include ../third-party/Makefile.pkgconfig
 include ../third-party/Makefile.freetype2
-include ../third-party/Makefile.openssl
+include ../third-party/Makefile.openssl.win64
 include ../third-party/Makefile.libssh2
 include ../third-party/Makefile.libgit2
 include ../third-party/Makefile.libsdl2

build.win64x64/third-party/Makefile.openssl

@@ -1,7 +1,7 @@
 ifndef THIRDPARTYDIR
 	include ../common/Makefile.lib.extra
 endif
-include ../../third-party/openssl.spec
+include ../../third-party/openssl.spec.win64
 
 # plugin definitions
 OPENSSLURL:=$(openssl_spec_download_url)
@@ -20,10 +20,7 @@ $(OPENSSLARCHIVE):
 	$(WGET) -O $(OPENSSLARCHIVE) $(OPENSSLURL) 
 
 $(THIRDPARTYLIBDIR)/$(OPENSSLLIBNAME): $(OPENSSLARCHIVE)
-	@echo "ESTEBAN: ENTER"
 	tar x -f $(OPENSSLARCHIVE) -C $(THIRDPARTYDIR)
-	sed -i 's/symlink/copy/g'  $(OPENSSLDIR)/util/mklink.pl
-	sed -i 's/ln -s/cp/g'  $(OPENSSLDIR)/util/point.sh
 	cd $(OPENSSLDIR) \
 		&&  CC=x86_64-w64-mingw32-gcc \
 			AR=x86_64-w64-mingw32-ar \
@@ -33,7 +30,7 @@ $(THIRDPARTYLIBDIR)/$(OPENSSLLIBNAME): $(OPENSSLARCHIVE)
 			DLLTOOL='$(DLLTOOL)' \
 			DLLWRAP='$(DLLWRAP)' \
 			./Configure mingw64 --prefix='$(THIRDPARTYOUTDIR)' shared $(THIRDPARTY_CFLAGS) \
-		&& make build_libs build_apps build_tools \
+		&& make \
 		&& make install_sw
 
 # Assuming building ssleay32.dll will also build libeay32.dll

third-party/openssl.spec

@@ -1,11 +1,11 @@
-openssl_spec_download_url:=https://www.openssl.org/source/openssl-1.0.2q.tar.gz
-openssl_spec_archive_name:=openssl-1.0.2q.tar.gz
-openssl_spec_unpack_dir_name:=openssl-1.0.2q
-openssl_spec_product1_name_macOS:=libssl.1.0.0.dylib
-openssl_spec_product2_name_macOS:=libcrypto.1.0.0.dylib
-openssl_spec_product1_name_linux:=libssl.so.1.0.0
-openssl_spec_product2_name_linux:=libcrypto.so.1.0.0
-openssl_spec_product1_name_windows:=ssleay32.dll
-openssl_spec_product2_name_windows:=libeay32.dll
+openssl_spec_download_url:=https://www.openssl.org/source/openssl-1.1.1f.tar.gz
+openssl_spec_archive_name:=openssl-1.1.1f.tar.gz
+openssl_spec_unpack_dir_name:=openssl-1.1.1f
+openssl_spec_product1_name_macOS:=libssl.1.1.dylib
+openssl_spec_product2_name_macOS:=libcrypto.1.1.dylib
+openssl_spec_product1_name_linux:=libssl.so.1.1
+openssl_spec_product2_name_linux:=libcrypto.so.1.1
+openssl_spec_product1_name_windows:=libssl-1_1.dll
+openssl_spec_product2_name_windows:=libcrypto-1_1.dll
 openssl_spec_symlinks_macOS:=libssl*.dylib libcrypto*.dylib
 openssl_spec_symlinks_linux:=libssl.so* libcrypto.so*

third-party/openssl.spec.win64

@@ -0,0 +1,11 @@
+openssl_spec_download_url:=https://www.openssl.org/source/openssl-1.1.1f.tar.gz
+openssl_spec_archive_name:=openssl-1.1.1f.tar.gz
+openssl_spec_unpack_dir_name:=openssl-1.1.1f
+openssl_spec_product1_name_macOS:=libssl.1.1.dylib
+openssl_spec_product2_name_macOS:=libcrypto.1.1.dylib
+openssl_spec_product1_name_linux:=libssl.so.1.1
+openssl_spec_product2_name_linux:=libcrypto.so.1.1
+openssl_spec_product1_name_windows:=libssl-1_1-x64.dll
+openssl_spec_product2_name_windows:=libcrypto-1_1-x64.dll
+openssl_spec_symlinks_macOS:=libssl*.dylib libcrypto*.dylib
+openssl_spec_symlinks_linux:=libssl.so* libcrypto.so*