winPB: Update OpenSSL to 1.1.1i and streamline updates

Signed-off-by: Stewart X Addison <[email protected]>
adoptium · Dec 9, 2020 · 7b4417b · 7b4417b
1 parent 678781e
commit 7b4417b
Showing 1 changed file with 39 additions and 25 deletions.
diff --git a/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/OpenSSL/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/OpenSSL/tasks/main.yml
@@ -1,50 +1,64 @@
 ---
-###########
-# OpenSSL #
-###########
+#####################################################
+# OpenSSL is required (and redistributed) by OpenJ9 #
+#####################################################
+
+# The version number and associated sha256sum (For the file at
+# https://www.openssl.org/source/openssl-{{ opensslVersion }}.tar.gz
+# should be all you need when upgrading the version of openssl. See
+# the checksum: line later on to set the checksum
+
+- name: Set desired OpenSSL version
+  set_fact: opensslVersion=1.1.1i
+  tags: openssl
+
+#- name: Set OpenSSL SHA256 checksum (This didn't work in the role it's used for some reason - sxa)
+#  set_fact: opensslChecksum=e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242
+#  tags: openssl
+
 - name: Check if OpenSSL 32bit VS2013 installed
   win_stat:
-    path: C:\openjdk\OpenSSL-1.1.1h-x86_32-VS2013
+    path: C:\openjdk\OpenSSL-{{ opensslVersion }}-x86_32-VS2013
   register: openssl32_installed
   tags: openssl
 
 - name: Check if OpenSSL 64bit VS2013 installed
   win_stat:
-    path: C:\openjdk\OpenSSL-1.1.1h-x86_64-VS2013
+    path: C:\openjdk\OpenSSL-{{ opensslVersion }}-x86_64-VS2013
   register: openssl64_vs2013_installed
   tags: openssl
 
 - name: Check if OpenSSL 64bit VS2017 installed
   win_stat:
-    path: C:\openjdk\OpenSSL-1.1.1h-x86_64-VS2017
+    path: C:\openjdk\OpenSSL-{{ opensslVersion }}-x86_64-VS2017
   register: openssl64_vs2017_installed
   tags: openssl
 
 - name: Check if OpenSSL 64bit VS2019 installed
   win_stat:
-    path: C:\openjdk\OpenSSL-1.1.1h-x86_64-VS2019
+    path: C:\openjdk\OpenSSL-{{ opensslVersion }}-x86_64-VS2019
   register: openssl64_vs2019_installed
   tags: openssl
 
-- name: Download OpenSSL-1.1.1h
+- name: Download OpenSSL-{{ opensslVersion }}
   win_get_url:
-    url: https://www.openssl.org/source/openssl-1.1.1h.tar.gz
-    dest: C:\temp\OpenSSL-1.1.1h.tar.gz
-    checksum: 5c9ca8774bd7b03e5784f26ae9e9e6d749c9da2438545077e6b3d755a06595d9
+    url: https://www.openssl.org/source/openssl-{{ opensslVersion }}.tar.gz
+    dest: C:\temp\OpenSSL-{{ opensslVersion }}.tar.gz
+    checksum: e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242
     checksum_algorithm: sha256
   when: (not openssl32_installed.stat.exists) or (not openssl64_vs2013_installed.stat.exists) or (not openssl64_vs2017_installed.stat.exists) or (not openssl64_vs2019_installed.stat.exists)
   tags: openssl
 
-- name: Unpack OpenSSL-1.1.1h for installation
+- name: Unpack OpenSSL-{{ opensslVersion }} for installation
   win_shell: |
     cd C:\temp
-    C:\7-Zip\7z.exe x C:\temp\OpenSSL-1.1.1h.tar.gz
-    C:\7-Zip\7z.exe x C:\temp\OpenSSL-1.1.1h.tar
+    C:\7-Zip\7z.exe x C:\temp\OpenSSL-{{ opensslVersion }}.tar.gz
+    C:\7-Zip\7z.exe x C:\temp\OpenSSL-{{ opensslVersion }}.tar
   when: (not openssl32_installed.stat.exists) or (not openssl64_vs2013_installed.stat.exists) or (not openssl64_vs2017_installed.stat.exists) or (not openssl64_vs2019_installed.stat.exists)
   tags: openssl
 
-- name: Install OpenSSL-1.1.1h 32-bit (VS2013)
-  win_shell: set PATH=C:\Strawberry\perl\bin;C:\openjdk\nasm-2.13.03;%PATH% && .\vsvars32.bat && cd C:\temp\OpenSSL-1.1.1h && perl C:\temp\OpenSSL-1.1.1h\Configure VC-WIN32 --prefix=C:\openjdk\OpenSSL-1.1.1h-x86_32-VS2013 && nmake install > C:\temp\openssl32.log && nmake -f makefile clean
+- name: Install OpenSSL-{{ opensslVersion }} 32-bit (VS2013)
+  win_shell: set PATH=C:\Strawberry\perl\bin;C:\openjdk\nasm-2.13.03;%PATH% && .\vsvars32.bat && cd C:\temp\OpenSSL-{{ opensslVersion }} && perl C:\temp\OpenSSL-{{ opensslVersion }}\Configure VC-WIN32 --prefix=C:\openjdk\OpenSSL-{{ opensslVersion }}-x86_32-VS2013 && nmake install > C:\temp\openssl32.log && nmake -f makefile clean
   args:
     chdir: 'C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\Tools'
     executable: cmd
@@ -53,8 +67,8 @@
     - openssl
     - MSVS_2013
 
-- name: Install OpenSSL-1.1.1h 64-bit (VS2013)
-  win_shell: set PATH=C:\Strawberry\perl\bin;C:\openjdk\nasm-2.13.03;%PATH% && .\vcvarsall.bat AMD64 && cd C:\temp\OpenSSL-1.1.1h && perl C:\temp\OpenSSL-1.1.1h\Configure VC-WIN64A --prefix=C:\openjdk\OpenSSL-1.1.1h-x86_64-VS2013 && nmake install > C:\temp\openssl64-VS2013.log && nmake -f makefile clean
+- name: Install OpenSSL-{{ opensslVersion }} 64-bit (VS2013)
+  win_shell: set PATH=C:\Strawberry\perl\bin;C:\openjdk\nasm-2.13.03;%PATH% && .\vcvarsall.bat AMD64 && cd C:\temp\OpenSSL-{{ opensslVersion }} && perl C:\temp\OpenSSL-{{ opensslVersion }}\Configure VC-WIN64A --prefix=C:\openjdk\OpenSSL-{{ opensslVersion }}-x86_64-VS2013 && nmake install > C:\temp\openssl64-VS2013.log && nmake -f makefile clean
   args:
     chdir: 'C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC'
     executable: cmd
@@ -63,8 +77,8 @@
     - openssl
     - MSVS_2013
 
-- name: Install OpenSSL-1.1.1h 64-bit (VS2017)
-  win_shell: set PATH=C:\Strawberry\perl\bin;C:\openjdk\nasm-2.13.03;%PATH% && .\vcvarsall.bat AMD64 && cd C:\temp\OpenSSL-1.1.1h && perl C:\temp\OpenSSL-1.1.1h\Configure VC-WIN64A --prefix=C:\openjdk\OpenSSL-1.1.1h-x86_64-VS2017 && nmake install > C:\temp\openssl64-VS2017.log && nmake -f makefile clean
+- name: Install OpenSSL-{{ opensslVersion }} 64-bit (VS2017)
+  win_shell: set PATH=C:\Strawberry\perl\bin;C:\openjdk\nasm-2.13.03;%PATH% && .\vcvarsall.bat AMD64 && cd C:\temp\OpenSSL-{{ opensslVersion }} && perl C:\temp\OpenSSL-{{ opensslVersion }}\Configure VC-WIN64A --prefix=C:\openjdk\OpenSSL-{{ opensslVersion }}-x86_64-VS2017 && nmake install > C:\temp\openssl64-VS2017.log && nmake -f makefile clean
   args:
     chdir: 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build'
     executable: cmd
@@ -73,8 +87,8 @@
     - openssl
     - MSVS_2017
 
-- name: Install OpenSSL-1.1.1h 64-bit (VS2019)
-  win_shell: set PATH=C:\Strawberry\perl\bin;C:\openjdk\nasm-2.13.03;%PATH% && .\vcvarsall.bat AMD64 && cd C:\temp\OpenSSL-1.1.1h && perl C:\temp\OpenSSL-1.1.1h\Configure VC-WIN64A --prefix=C:\openjdk\OpenSSL-1.1.1h-x86_64-VS2019 && nmake install > C:\temp\openssl64-VS2019.log && nmake -f makefile clean
+- name: Install OpenSSL-{{ opensslVersion }} 64-bit (VS2019)
+  win_shell: set PATH=C:\Strawberry\perl\bin;C:\openjdk\nasm-2.13.03;%PATH% && .\vcvarsall.bat AMD64 && cd C:\temp\OpenSSL-{{ opensslVersion }} && perl C:\temp\OpenSSL-{{ opensslVersion }}\Configure VC-WIN64A --prefix=C:\openjdk\OpenSSL-{{ opensslVersion }}-x86_64-VS2019 && nmake install > C:\temp\openssl64-VS2019.log && nmake -f makefile clean
   args:
     chdir: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build'
     executable: cmd
@@ -88,8 +102,8 @@
     path: C:\temp\{{ item }}
     state: absent
   with_items:
-    - OpenSSL-1.1.1h.tar.gz
-    - OpenSSL-1.1.1h.tar
-    - OpenSSL-1.1.1h
+    - OpenSSL-{{ opensslVersion }}.tar.gz
+    - OpenSSL-{{ opensslVersion }}.tar
+    - OpenSSL-{{ opensslVersion }}
     - pax_global_header
   tags: openssl