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

py310-311: Re-include openssl 1.x until all py-spk migrated over #5818

Merged
merged 2 commits into from
Jul 22, 2023
Merged

py310-311: Re-include openssl 1.x until all py-spk migrated over #5818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d751a1a
py310-311: Re-include openssl 1.x until all py-spk migrated over
th0ma7 Jul 22, 2023
902eb14
py310-311: Fix typo in comment (thnx @Safihre)
th0ma7 Jul 22, 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
4 changes: 3 additions & 1 deletion cross/python310/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@ CONFIGURE_ARGS += ac_cv_file__dev_ptmx=no
CONFIGURE_ARGS += ac_cv_file__dev_ptc=no
CONFIGURE_ARGS += ac_cv_have_long_long_format=yes

DEPENDS += cross/openssl3
# keep both openssl until all python packages
# have been republished using openssl3
DEPENDS += cross/openssl cross/openssl3
CONFIGURE_ARGS += --with-ssl-default-suites=openssl

DEPENDS += cross/gdbm
Expand Down
4 changes: 3 additions & 1 deletion cross/python311/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,9 @@ CONFIGURE_ARGS += ac_cv_file__dev_ptmx=no
CONFIGURE_ARGS += ac_cv_file__dev_ptc=no
CONFIGURE_ARGS += ac_cv_have_long_long_format=yes

DEPENDS += cross/openssl3
# keep both openssl until all python packages
# have been republished using openssl3
DEPENDS += cross/openssl cross/openssl3
CONFIGURE_ARGS += --with-ssl-default-suites=openssl

DEPENDS += cross/gdbm
Expand Down
4 changes: 2 additions & 2 deletions spk/python310/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
SPK_NAME = python310
SPK_VERS = 3.10.12
SPK_VERS_MAJOR_MINOR = $(word 1,$(subst ., ,$(SPK_VERS))).$(word 2,$(subst ., ,$(SPK_VERS)))
SPK_REV = 16
SPK_REV = 17
SPK_ICON = src/python3.png

DEPENDS = cross/$(SPK_NAME)
Expand All @@ -13,7 +13,7 @@ DESCRIPTION_FRE = Language de programmation Python.
DESCRIPTION_SPN = Lenguaje de programación Python.
STARTABLE = no
DISPLAY_NAME = Python 3.10
CHANGELOG = "1. Update to Python 3.10.12<br/>2. Update to OpenSSL 3.1.1"
CHANGELOG = "1. Update to Python 3.10.12<br/>2. Update to OpenSSL 3.1.1<br/>3. Re-include openssl 1.1 until all packages are migrated"

HOMEPAGE = https://www.python.org
LICENSE = PSF
Expand Down
4 changes: 2 additions & 2 deletions spk/python311/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
SPK_NAME = python311
SPK_VERS = 3.11.4
SPK_VERS_MAJOR_MINOR = $(word 1,$(subst ., ,$(SPK_VERS))).$(word 2,$(subst ., ,$(SPK_VERS)))
SPK_REV = 5
SPK_REV = 6
SPK_ICON = src/python3.png

DEPENDS = cross/$(SPK_NAME)
Expand All @@ -13,7 +13,7 @@ DESCRIPTION_FRE = Language de programmation Python.
DESCRIPTION_SPN = Lenguaje de programación Python.
STARTABLE = no
DISPLAY_NAME = Python 3.11
CHANGELOG = "1. Update to Python 3.11.4<br/>2. Update to OpenSSL 3.1.1"
CHANGELOG = "1. Update to Python 3.11.4<br/>2. Update to OpenSSL 3.1.1<br/>3. Re-include openssl 1.1 until all packages are migrated"

HOMEPAGE = https://www.python.org
LICENSE = PSF
Expand Down