From 0128ba0a4e1ea56c37b3ded90359f06742a27856 Mon Sep 17 00:00:00 2001 From: Gautham Banasandra Date: Sat, 8 Mar 2025 18:46:21 +0530 Subject: [PATCH] HADOOP-19487. Upgrade libopenssl to 3.1.1 for rsync on Windows * We're currently using libopenssl 3.1.0 which is needed for rsync 3.2.7 on Windows for the Yetus build validation. * However, libopenssl 3.1.0 is no longer available for download on the msys2 site. * This PR upgrades libopenssl to the next available version - 3.1.1 to mitigate this issue. --- dev-support/docker/Dockerfile_windows_10 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dev-support/docker/Dockerfile_windows_10 b/dev-support/docker/Dockerfile_windows_10 index 99eb54c7a3645..d2731caf9dd5c 100644 --- a/dev-support/docker/Dockerfile_windows_10 +++ b/dev-support/docker/Dockerfile_windows_10 @@ -81,11 +81,11 @@ RUN powershell Invoke-WebRequest -Uri https://github.com/facebook/zstd/releases/ RUN powershell Expand-Archive -Path $Env:TEMP\zstd-v1.5.4-win64.zip -DestinationPath "C:\ZStd" RUN setx PATH "%PATH%;C:\ZStd" -# Install libopenssl 3.1.0 needed for rsync 3.2.7. -RUN powershell Invoke-WebRequest -Uri https://repo.msys2.org/msys/x86_64/libopenssl-3.1.0-2-x86_64.pkg.tar.zst -OutFile $Env:TEMP\libopenssl-3.1.0-2-x86_64.pkg.tar.zst -RUN powershell zstd -d $Env:TEMP\libopenssl-3.1.0-2-x86_64.pkg.tar.zst -o $Env:TEMP\libopenssl-3.1.0-2-x86_64.pkg.tar +# Install libopenssl 3.1.1 needed for rsync 3.2.7. +RUN powershell Invoke-WebRequest -Uri https://repo.msys2.org/msys/x86_64/libopenssl-3.1.1-1-x86_64.pkg.tar.zst -OutFile $Env:TEMP\libopenssl-3.1.1-1-x86_64.pkg.tar.zst +RUN powershell zstd -d $Env:TEMP\libopenssl-3.1.1-1-x86_64.pkg.tar.zst -o $Env:TEMP\libopenssl-3.1.1-1-x86_64.pkg.tar RUN powershell mkdir "C:\LibOpenSSL" -RUN powershell tar -xvf $Env:TEMP\libopenssl-3.1.0-2-x86_64.pkg.tar -C "C:\LibOpenSSL" +RUN powershell tar -xvf $Env:TEMP\libopenssl-3.1.1-1-x86_64.pkg.tar -C "C:\LibOpenSSL" # Install libxxhash 0.8.1 needed for rsync 3.2.7. RUN powershell Invoke-WebRequest -Uri https://repo.msys2.org/msys/x86_64/libxxhash-0.8.1-1-x86_64.pkg.tar.zst -OutFile $Env:TEMP\libxxhash-0.8.1-1-x86_64.pkg.tar.zst