Skip to content

Commit e00d99a

Browse files
Edward-Knightgeofft
authored andcommitted
Remove OpenSSL 3.0
Now we're building with OpenSSL 3.5 instead of 3.0, we no longer need the build configuration around.
1 parent 87563b4 commit e00d99a

File tree

4 files changed

+0
-65
lines changed

4 files changed

+0
-65
lines changed

cpython-unix/Makefile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,9 +174,6 @@ $(OUTDIR)/ncurses-$(NCURSES_VERSION)-$(PACKAGE_SUFFIX).tar: $(PYTHON_DEP_DEPENDS
174174
$(OUTDIR)/openssl-1.1-$(OPENSSL_1.1_VERSION)-$(PACKAGE_SUFFIX).tar: $(PYTHON_DEP_DEPENDS) $(HERE)/build-openssl-1.1.sh
175175
$(RUN_BUILD) --docker-image $(DOCKER_IMAGE_BUILD) openssl-1.1
176176

177-
$(OUTDIR)/openssl-3.0-$(OPENSSL_3.0_VERSION)-$(PACKAGE_SUFFIX).tar: $(PYTHON_DEP_DEPENDS) $(HERE)/build-openssl-3.0.sh
178-
$(RUN_BUILD) --docker-image $(DOCKER_IMAGE_BUILD) openssl-3.0
179-
180177
$(OUTDIR)/openssl-3.5-$(OPENSSL_3.5_VERSION)-$(PACKAGE_SUFFIX).tar: $(PYTHON_DEP_DEPENDS) $(HERE)/build-openssl-3.5.sh
181178
$(RUN_BUILD) --docker-image $(DOCKER_IMAGE_BUILD) openssl-3.5
182179

@@ -265,7 +262,6 @@ PYTHON_DEPENDS_$(1) := \
265262
$$(if $$(NEED_MPDECIMAL),$$(OUTDIR)/mpdecimal-$$(MPDECIMAL_VERSION)-$$(PACKAGE_SUFFIX).tar) \
266263
$$(if $$(NEED_NCURSES),$$(OUTDIR)/ncurses-$$(NCURSES_VERSION)-$$(PACKAGE_SUFFIX).tar) \
267264
$$(if $$(NEED_OPENSSL_1_1),$$(OUTDIR)/openssl-1.1-$$(OPENSSL_1.1_VERSION)-$$(PACKAGE_SUFFIX).tar) \
268-
$$(if $$(NEED_OPENSSL_3_0),$$(OUTDIR)/openssl-3.0-$$(OPENSSL_3.0_VERSION)-$$(PACKAGE_SUFFIX).tar) \
269265
$$(if $$(NEED_OPENSSL_3_5),$$(OUTDIR)/openssl-3.5-$$(OPENSSL_3.5_VERSION)-$$(PACKAGE_SUFFIX).tar) \
270266
$$(if $$(NEED_PATCHELF),$$(OUTDIR)/patchelf-$$(PATCHELF_VERSION)-$$(PACKAGE_SUFFIX).tar) \
271267
$$(if $$(NEED_SQLITE),$$(OUTDIR)/sqlite-$$(SQLITE_VERSION)-$$(PACKAGE_SUFFIX).tar) \

cpython-unix/build-openssl-3.0.sh

Lines changed: 0 additions & 50 deletions
This file was deleted.

cpython-unix/build.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1117,7 +1117,6 @@ def main():
11171117
"mpdecimal",
11181118
"ncurses",
11191119
"openssl-1.1",
1120-
"openssl-3.0",
11211120
"openssl-3.5",
11221121
"patchelf",
11231122
"sqlite",

pythonbuild/downloads.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -248,16 +248,6 @@
248248
"license_file": "LICENSE.openssl-1.1.txt",
249249
},
250250
# Remember to update OPENSSL_VERSION_INFO in verify_distribution.py whenever upgrading.
251-
"openssl-3.0": {
252-
"url": "https://www.openssl.org/source/openssl-3.0.16.tar.gz",
253-
"size": 15334967,
254-
"sha256": "57e03c50feab5d31b152af2b764f10379aecd8ee92f16c985983ce4a99f7ef86",
255-
"version": "3.0.16",
256-
"library_names": ["crypto", "ssl"],
257-
"licenses": ["Apache-2.0"],
258-
"license_file": "LICENSE.openssl-3.txt",
259-
},
260-
# Remember to update OPENSSL_VERSION_INFO in verify_distribution.py whenever upgrading.
261251
"openssl-3.5": {
262252
"url": "https://github.com/openssl/openssl/releases/download/openssl-3.5.2/openssl-3.5.2.tar.gz",
263253
"size": 53180161,

0 commit comments

Comments
 (0)