Skip to content

Revert "Update confluent-kafka OpenSSL to 3.4.1 (#19589)" #20078

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Revert "Update confluent-kafka OpenSSL to 3.4.1 (#19589)" #20078

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .builders/images/linux-aarch64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ ENV LDFLAGS="-Wl,-rpath,'\$\$ORIGIN' -Wl,--strip-debug"
RUN yum install -y perl-IPC-Cmd perl-CPANPLUS && \
cpanp -i List::Util 1.66 && \
DOWNLOAD_URL="https://www.openssl.org/source/openssl-{{version}}.tar.gz" \
VERSION="3.4.1" \
SHA256="002a2d6b30b58bf4bea46c43bdd96365aaf8daa6c428782aa4feee06da197df3" \
VERSION="3.4.0" \
SHA256="e15dda82fe2fe8139dc2ac21a36d4ca01d5313c75f99f46c4e8a27709b7294bf" \
RELATIVE_PATH="openssl-{{version}}" \
# https://docs.python.org/3/using/unix.html#custom-openssl
INSTALL_COMMAND="make install_sw" \
Expand Down
4 changes: 2 additions & 2 deletions .builders/images/linux-x86_64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ ENV LDFLAGS="-Wl,-rpath,'\$\$ORIGIN' -Wl,--strip-debug"
RUN yum install -y perl-IPC-Cmd perl-CPANPLUS && \
cpanp -i List::Util 1.66 && \
DOWNLOAD_URL="https://www.openssl.org/source/openssl-{{version}}.tar.gz" \
VERSION="3.4.1" \
SHA256="002a2d6b30b58bf4bea46c43bdd96365aaf8daa6c428782aa4feee06da197df3" \
VERSION="3.4.0" \
SHA256="e15dda82fe2fe8139dc2ac21a36d4ca01d5313c75f99f46c4e8a27709b7294bf" \
RELATIVE_PATH="openssl-{{version}}" \
# https://docs.python.org/3/using/unix.html#custom-openssl
INSTALL_COMMAND="make install_sw" \
Expand Down
4 changes: 2 additions & 2 deletions .builders/images/macos-x86_64/builder_setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ cp -R /opt/mqm "${DD_PREFIX_PATH}"

# openssl
DOWNLOAD_URL="https://www.openssl.org/source/openssl-{{version}}.tar.gz" \
VERSION="3.4.1" \
SHA256="002a2d6b30b58bf4bea46c43bdd96365aaf8daa6c428782aa4feee06da197df3" \
VERSION="3.4.0" \
SHA256="e15dda82fe2fe8139dc2ac21a36d4ca01d5313c75f99f46c4e8a27709b7294bf" \
RELATIVE_PATH="openssl-{{version}}" \
CONFIGURE_SCRIPT="./config" \
install-from-source \
Expand Down
2 changes: 1 addition & 1 deletion .builders/images/windows-x86_64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ RUN Get-RemoteFile `
Add-ToPath -Append "C:\perl\perl\bin" && `
Remove-Item "strawberry-perl-$Env:PERL_VERSION-64bit.zip"

ENV OPENSSL_VERSION="3.4.1"
ENV OPENSSL_VERSION="3.4.0"

ENV CURL_VERSION="8.12.1"

Expand Down
6 changes: 4 additions & 2 deletions .builders/images/windows-x86_64/build_script.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,17 @@ Remove-Item "librdkafka-${kafka_version}.tar.gz"
$triplet = "x64-windows"
$vcpkg_dir = "C:\vcpkg"
$librdkafka_dir = "C:\librdkafka\librdkafka-${kafka_version}"
$desired_commit = "master" # Set the commit to master so we don't have to update manually
# We set the desired tag to the latest release tag to ensure that we are building with the latest stable version.
# The desired tag should be updated periodically or when critical fixes or features are released.
$desired_tag = "2024.12.16"

# Clone and configure vcpkg
if (-Not (Test-Path -Path "$vcpkg_dir\.git")) {
git clone https://github.com/Microsoft/vcpkg.git $vcpkg_dir
}

Set-Location $vcpkg_dir
git checkout $desired_commit
git checkout $desired_tag

Write-Host "Bootstrapping vcpkg..."
.\bootstrap-vcpkg.bat
Expand Down
Loading