Skip to content
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

Jump to bottom

Updated the version Python to 3.9.18 as needed for OpenSSL Windows update #20058

Merged
merged 3 commits into from
Oct 11, 2023
Merged

Updated the version Python to 3.9.18 as needed for OpenSSL Windows update #20058

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
48cc782
Updated the version Python to 3.9.18 as needed for OpenSSL Windows up…
carlosroman Oct 11, 2023
12031ef
Update releasenotes/notes/update-python-openssl-on-windows-to-1.1.1w-…
carlosroman Oct 11, 2023
005abfb
Update releasenotes/notes/update-python-openssl-on-windows-to-1.1.1w-…
carlosroman Oct 11, 2023
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
10 changes: 5 additions & 5 deletions omnibus/config/software/python3.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name "python3"

if ohai["platform"] != "windows"
default_version "3.9.17"
default_version "3.9.18"

dependency "libxcrypt"
dependency "libffi"
Expand All @@ -15,7 +15,7 @@
dependency "libyaml"

source :url => "https://python.org/ftp/python/#{version}/Python-#{version}.tgz",
:sha256 => "8ead58f669f7e19d777c3556b62fae29a81d7f06a7122ff9bc57f7dd82d7e014"
:sha256 => "504ce8cfd59addc04c22f590377c6be454ae7406cb1ebf6f5a350149225a9354"

relative_path "Python-#{version}"

Expand Down Expand Up @@ -58,19 +58,19 @@
end

else
default_version "3.9.17-26e6052"
default_version "3.9.18-38f3b72"
dependency "vc_redist_14"

if windows_arch_i386?
dependency "vc_ucrt_redist"

source :url => "https://dd-agent-omnibus.s3.amazonaws.com/python-windows-#{version}-x86.zip",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm curious as to how this bucket is provided with the artifact 🤔

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is done via this gitlab pipeline defined here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When we move to Python 3.11 we will no longer be using that fork of Python.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah right I forgot we are using a fork. Thanks for the clarification!

:sha256 => "007FC4DB517599FB4DFF4D68FFA7C6B3BE9674F584AA513600A2539AF7CDD07B".downcase
:sha256 => "DC7069727454BC8FEED064FBD797076B7EAD93CAC1A482CE794BAB08214C42F3".downcase
else

# note that startring with 3.7.3 on Windows, the zip should be created without the built-in pip
source :url => "https://dd-agent-omnibus.s3.amazonaws.com/python-windows-#{version}-x64.zip",
:sha256 => "E6E38E5A6B768E9EF6E2F3F31448873657251B32B6CEB99B99D76BF47279A36D".downcase
:sha256 => "6DA7EDD4D42D5A223D14BF80ABBBEA80F4F6D6939CD0AA769CF1BCD24CB54A1F".downcase

end
vcrt140_root = "#{Omnibus::Config.source_dir()}/vc_redist_140/expanded"
Expand Down
15 changes: 15 additions & 0 deletions releasenotes/notes/update-python-openssl-on-windows-to-1.1.1w-0a00d9c8a0cfde12.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Each section from every release note are combined when the
# CHANGELOG.rst is rendered. So the text needs to be worded so that
# it does not depend on any information only available in another
# section. This may mean repeating some details, but each section
# must be readable independently of the other.
#
# Each section note must be formatted as reStructuredText.
---
upgrade:
- |
Upgrade Python 3.9 to Python 3.9.18
carlosroman marked this conversation as resolved.
Show resolved Hide resolved

security:
- |
Updated the version of OpenSSL used by Python on Windows to `1.1.1w`; addressed CVE-2023-4807, CVE-2023-3817 and CVE-2023-3446.
carlosroman marked this conversation as resolved.
Show resolved Hide resolved