From dea5d39088aecc290b64f4ab8688b3e6ed9f2875 Mon Sep 17 00:00:00 2001 From: HUMORCE Date: Sat, 23 Dec 2023 07:44:33 +0800 Subject: [PATCH] openssl@3.2.0: Revert scripts introduced in #5336 (Close #5361) - Symlink creataion requires admin right. --- bucket/openssl.json | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/bucket/openssl.json b/bucket/openssl.json index 3e2fb6f9e5..9bafe2badc 100644 --- a/bucket/openssl.json +++ b/bucket/openssl.json @@ -1,4 +1,5 @@ { + "##": "TODO: A script for create symlinks of lib files", "version": "3.2.0", "description": "TLS/SSL toolkit", "homepage": "https://slproweb.com/products/Win32OpenSSL.html", @@ -6,28 +7,25 @@ "architecture": { "64bit": { "url": "https://slproweb.com/download/Win64OpenSSL-3_2_0.exe", - "hash": "dd438a78ce34f6ee99dfb3ebbc4776d88e1029e40cdbbf113a1a42dd6c6a8244", - "pre_install": "$null = Get-ChildItem \"$dir/lib/VC/x64/MT\" | ForEach-Object { New-Item -ItemType SymbolicLink -Path \"$dir/lib/$($_.Name)\" -Target $_ }" + "hash": "dd438a78ce34f6ee99dfb3ebbc4776d88e1029e40cdbbf113a1a42dd6c6a8244" }, "32bit": { "url": "https://slproweb.com/download/Win32OpenSSL-3_2_0.exe", - "hash": "7546f34ab1457da4fe68187d4518ccd350d53d484bcfd6d65defb725deef0957", - "pre_install": "$null = Get-ChildItem \"$dir/lib/VC/x86/MT\" | ForEach-Object { New-Item -ItemType SymbolicLink -Path \"$dir/lib/$($_.Name)\" -Target $_ }" + "hash": "7546f34ab1457da4fe68187d4518ccd350d53d484bcfd6d65defb725deef0957" }, "arm64": { "url": "https://slproweb.com/download/Win64ARMOpenSSL-3_2_0.exe", - "hash": "4550f6d18cc359358436975db5f00f528e14860d6277da584fb7b60febd84a17", - "pre_install": "$null = Get-ChildItem \"$dir/lib/VC/arm64/MT\" | ForEach-Object { New-Item -ItemType SymbolicLink -Path \"$dir/lib/$($_.Name)\" -Target $_ }" + "hash": "4550f6d18cc359358436975db5f00f528e14860d6277da584fb7b60febd84a17" } }, "innosetup": true, "env_add_path": "bin", "env_set": { - "OPENSSL_ROOT_DIR": "$dir", - "OPENSSL_LIB_DIR": "$dir\\lib", + "OPENSSL_CONF": "$dir\\bin\\cnf\\openssl.cnf", "OPENSSL_INCLUDE_DIR": "$dir\\include", + "OPENSSL_LIB_DIR": "$dir\\lib", "OPENSSL_MODULES": "$dir\\bin", - "OPENSSL_CONF": "$dir\\bin\\cnf\\openssl.cnf" + "OPENSSL_ROOT_DIR": "$dir" }, "checkver": { "url": "https://raw.githubusercontent.com/slproweb/opensslhashes/master/win32_openssl_hashes.json",