* [PR PATCH] Move Python 2 to Active State cPython
@ 2021-03-08 10:57 leahneukirchen
2021-03-08 11:08 ` [PR PATCH] [Updated] " leahneukirchen
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: leahneukirchen @ 2021-03-08 10:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 532 bytes --]
There is a new pull request by leahneukirchen against master on the void-packages repository
https://github.com/leahneukirchen/void-packages python2
https://github.com/void-linux/void-packages/pull/29308
Move Python 2 to Active State cPython
ActiveState is running a branch of cPython that has a bunch of security fixes, at
https://github.com/ActiveState/cpython/
This is very convenient to use for our python package, so let's do it.
A patch file from https://github.com/void-linux/void-packages/pull/29308.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-python2-29308.patch --]
[-- Type: text/x-diff, Size: 3371 bytes --]
From b511c27c0a93846f196e56e761163bf21032b97e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 8 Mar 2021 11:55:53 +0100
Subject: [PATCH 1/2] python: update to 2.7.18.3.
---
srcpkgs/python/template | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index fc52e87228e..2ad7cbc1d67 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -3,9 +3,9 @@
# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/python-tkinter".
#
pkgname=python
-version=2.7.18
-revision=3
-wrksrc="Python-${version}"
+version=2.7.18.3
+revision=1
+wrksrc="cpython-${version}"
pycompile_dirs="usr/lib/python2.7"
hostmakedepends="pkg-config"
makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
@@ -15,8 +15,8 @@ short_desc="Interpreted, interactive, object-oriented programming language"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Python-2.0"
homepage="https://www.python.org"
-distfiles="https://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"
-checksum=b62c0e7937551d0cc02b8fd5cb0f544f9405bafc9a54d3808ed4594812edef43
+distfiles="https://github.com/ActiveState/cpython/archive/v${version}.tar.gz"
+checksum=89876680a994095681bca9ec6a403a5ef72b89dc617b7dc6fc6cc8e0a105aa25
alternatives="
python:idle:/usr/bin/idle2.7
@@ -85,8 +85,8 @@ post_install() {
rm -r ${DESTDIR}/usr/lib/python2.7/lib2to3/tests
# Remove references to the install(1) wrapper.
vsed -e "s,${XBPS_WRAPPERDIR},/usr/bin,g" -i \
- ${DESTDIR}/usr/lib/python${version%.*}/_sysconfigdata.py \
- ${DESTDIR}/usr/lib/python${version%.*}/config/Makefile
+ ${DESTDIR}/usr/lib/python${version%.*.*}/_sysconfigdata.py \
+ ${DESTDIR}/usr/lib/python${version%.*.*}/config/Makefile
if [ "$CROSS_BUILD" ]; then
# Remove references to cross toolchain.
vsed -i "s/$XBPS_CROSS_TRIPLET-//g" \
From f9f144e2ce99ada91e672d2a5f0e080b62f57f8d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 8 Mar 2021 11:55:56 +0100
Subject: [PATCH 2/2] python-tkinter: update to 2.7.18.3.
---
srcpkgs/python-tkinter/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/python-tkinter/template b/srcpkgs/python-tkinter/template
index 51c2fd76650..0608e01b53c 100644
--- a/srcpkgs/python-tkinter/template
+++ b/srcpkgs/python-tkinter/template
@@ -7,9 +7,9 @@
_desc="Interpreted, interactive, object-oriented programming language"
pkgname=python-tkinter
-version=2.7.18
-revision=3
-wrksrc="Python-${version}"
+version=2.7.18.3
+revision=1
+wrksrc="cpython-${version}"
pycompile_dirs="usr/lib/python2.7/lib-tk"
hostmakedepends="pkg-config"
makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
@@ -18,8 +18,8 @@ short_desc="${_desc} - GUI toolkit for Python2"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Python-2.0"
homepage="https://www.python.org"
-distfiles="https://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"
-checksum=b62c0e7937551d0cc02b8fd5cb0f544f9405bafc9a54d3808ed4594812edef43
+distfiles="https://github.com/ActiveState/cpython/archive/v${version}.tar.gz"
+checksum=89876680a994095681bca9ec6a403a5ef72b89dc617b7dc6fc6cc8e0a105aa25
pre_configure() {
# Ensure that internal copies of expat, libffi and zlib are not used.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] Move Python 2 to Active State cPython
2021-03-08 10:57 [PR PATCH] Move Python 2 to Active State cPython leahneukirchen
@ 2021-03-08 11:08 ` leahneukirchen
2021-07-14 17:50 ` [PR PATCH] [Closed]: " leahneukirchen
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: leahneukirchen @ 2021-03-08 11:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 537 bytes --]
There is an updated pull request by leahneukirchen against master on the void-packages repository
https://github.com/leahneukirchen/void-packages python2
https://github.com/void-linux/void-packages/pull/29308
Move Python 2 to Active State cPython
ActiveState is running a branch of cPython that has a bunch of security fixes, at
https://github.com/ActiveState/cpython/
This is very convenient to use for our python package, so let's do it.
A patch file from https://github.com/void-linux/void-packages/pull/29308.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-python2-29308.patch --]
[-- Type: text/x-diff, Size: 3635 bytes --]
From 43315d5e41020a7dacc56ade458fe61d30fd56e5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 8 Mar 2021 11:55:53 +0100
Subject: [PATCH 1/2] python: update to 2.7.18.3.
---
srcpkgs/python/template | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index fc52e87228e..8f50e121ae0 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -3,9 +3,9 @@
# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/python-tkinter".
#
pkgname=python
-version=2.7.18
-revision=3
-wrksrc="Python-${version}"
+version=2.7.18.3
+revision=1
+wrksrc="cpython-${version}"
pycompile_dirs="usr/lib/python2.7"
hostmakedepends="pkg-config"
makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
@@ -15,8 +15,8 @@ short_desc="Interpreted, interactive, object-oriented programming language"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Python-2.0"
homepage="https://www.python.org"
-distfiles="https://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"
-checksum=b62c0e7937551d0cc02b8fd5cb0f544f9405bafc9a54d3808ed4594812edef43
+distfiles="https://github.com/ActiveState/cpython/archive/v${version}.tar.gz"
+checksum=89876680a994095681bca9ec6a403a5ef72b89dc617b7dc6fc6cc8e0a105aa25
alternatives="
python:idle:/usr/bin/idle2.7
@@ -85,13 +85,13 @@ post_install() {
rm -r ${DESTDIR}/usr/lib/python2.7/lib2to3/tests
# Remove references to the install(1) wrapper.
vsed -e "s,${XBPS_WRAPPERDIR},/usr/bin,g" -i \
- ${DESTDIR}/usr/lib/python${version%.*}/_sysconfigdata.py \
- ${DESTDIR}/usr/lib/python${version%.*}/config/Makefile
+ ${DESTDIR}/usr/lib/python${version%.*.*}/_sysconfigdata.py \
+ ${DESTDIR}/usr/lib/python${version%.*.*}/config/Makefile
if [ "$CROSS_BUILD" ]; then
# Remove references to cross toolchain.
vsed -i "s/$XBPS_CROSS_TRIPLET-//g" \
- ${DESTDIR}/usr/lib/python${version%.*}/_sysconfigdata.py \
- ${DESTDIR}/usr/lib/python${version%.*}/config/Makefile
+ ${DESTDIR}/usr/lib/python${version%.*.*}/_sysconfigdata.py \
+ ${DESTDIR}/usr/lib/python${version%.*.*}/config/Makefile
fi
}
From 17774b97252ccadfb701c154b93840207d5b9456 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 8 Mar 2021 11:55:56 +0100
Subject: [PATCH 2/2] python-tkinter: update to 2.7.18.3.
---
srcpkgs/python-tkinter/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/python-tkinter/template b/srcpkgs/python-tkinter/template
index 51c2fd76650..0608e01b53c 100644
--- a/srcpkgs/python-tkinter/template
+++ b/srcpkgs/python-tkinter/template
@@ -7,9 +7,9 @@
_desc="Interpreted, interactive, object-oriented programming language"
pkgname=python-tkinter
-version=2.7.18
-revision=3
-wrksrc="Python-${version}"
+version=2.7.18.3
+revision=1
+wrksrc="cpython-${version}"
pycompile_dirs="usr/lib/python2.7/lib-tk"
hostmakedepends="pkg-config"
makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
@@ -18,8 +18,8 @@ short_desc="${_desc} - GUI toolkit for Python2"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Python-2.0"
homepage="https://www.python.org"
-distfiles="https://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"
-checksum=b62c0e7937551d0cc02b8fd5cb0f544f9405bafc9a54d3808ed4594812edef43
+distfiles="https://github.com/ActiveState/cpython/archive/v${version}.tar.gz"
+checksum=89876680a994095681bca9ec6a403a5ef72b89dc617b7dc6fc6cc8e0a105aa25
pre_configure() {
# Ensure that internal copies of expat, libffi and zlib are not used.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Closed]: Move Python 2 to Active State cPython
2021-03-08 10:57 [PR PATCH] Move Python 2 to Active State cPython leahneukirchen
2021-03-08 11:08 ` [PR PATCH] [Updated] " leahneukirchen
@ 2021-07-14 17:50 ` leahneukirchen
2021-07-14 17:50 ` [PR PATCH] [Updated] " leahneukirchen
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: leahneukirchen @ 2021-07-14 17:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 367 bytes --]
There's a closed pull request on the void-packages repository
Move Python 2 to Active State cPython
https://github.com/void-linux/void-packages/pull/29308
Description:
ActiveState is running a branch of cPython that has a bunch of security fixes, at
https://github.com/ActiveState/cpython/
This is very convenient to use for our python package, so let's do it.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] Move Python 2 to Active State cPython
2021-03-08 10:57 [PR PATCH] Move Python 2 to Active State cPython leahneukirchen
2021-03-08 11:08 ` [PR PATCH] [Updated] " leahneukirchen
2021-07-14 17:50 ` [PR PATCH] [Closed]: " leahneukirchen
@ 2021-07-14 17:50 ` leahneukirchen
2021-07-14 17:52 ` leahneukirchen
2021-07-16 19:19 ` [PR PATCH] [Merged]: " leahneukirchen
4 siblings, 0 replies; 6+ messages in thread
From: leahneukirchen @ 2021-07-14 17:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 537 bytes --]
There is an updated pull request by leahneukirchen against master on the void-packages repository
https://github.com/leahneukirchen/void-packages python2
https://github.com/void-linux/void-packages/pull/29308
Move Python 2 to Active State cPython
ActiveState is running a branch of cPython that has a bunch of security fixes, at
https://github.com/ActiveState/cpython/
This is very convenient to use for our python package, so let's do it.
A patch file from https://github.com/void-linux/void-packages/pull/29308.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-python2-29308.patch --]
[-- Type: text/x-diff, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] Move Python 2 to Active State cPython
2021-03-08 10:57 [PR PATCH] Move Python 2 to Active State cPython leahneukirchen
` (2 preceding siblings ...)
2021-07-14 17:50 ` [PR PATCH] [Updated] " leahneukirchen
@ 2021-07-14 17:52 ` leahneukirchen
2021-07-16 19:19 ` [PR PATCH] [Merged]: " leahneukirchen
4 siblings, 0 replies; 6+ messages in thread
From: leahneukirchen @ 2021-07-14 17:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 537 bytes --]
There is an updated pull request by leahneukirchen against master on the void-packages repository
https://github.com/leahneukirchen/void-packages python2
https://github.com/void-linux/void-packages/pull/29308
Move Python 2 to Active State cPython
ActiveState is running a branch of cPython that has a bunch of security fixes, at
https://github.com/ActiveState/cpython/
This is very convenient to use for our python package, so let's do it.
A patch file from https://github.com/void-linux/void-packages/pull/29308.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-python2-29308.patch --]
[-- Type: text/x-diff, Size: 4145 bytes --]
From 049df5b6ff6dfd8795e1771c89ce634aa9fa29e8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 8 Mar 2021 11:55:53 +0100
Subject: [PATCH 1/2] python: update to 2.7.18.4.
Adopted.
---
srcpkgs/python/template | 20 ++++++++++----------
srcpkgs/python/update | 3 +--
2 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index fc52e87228ea..3cbe4673172c 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -3,20 +3,20 @@
# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/python-tkinter".
#
pkgname=python
-version=2.7.18
-revision=3
-wrksrc="Python-${version}"
+version=2.7.18.4
+revision=1
+wrksrc="cpython-${version}"
pycompile_dirs="usr/lib/python2.7"
hostmakedepends="pkg-config"
makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
sqlite-devel bzip2-devel zlib-devel"
depends="ca-certificates"
short_desc="Interpreted, interactive, object-oriented programming language"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
license="Python-2.0"
homepage="https://www.python.org"
-distfiles="https://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"
-checksum=b62c0e7937551d0cc02b8fd5cb0f544f9405bafc9a54d3808ed4594812edef43
+distfiles="https://github.com/ActiveState/cpython/archive/v${version}.tar.gz"
+checksum=003a4fbd03fa0dbb3cf88d894c40311ef30dd17b2aa85291c3136393148b1362
alternatives="
python:idle:/usr/bin/idle2.7
@@ -85,13 +85,13 @@ post_install() {
rm -r ${DESTDIR}/usr/lib/python2.7/lib2to3/tests
# Remove references to the install(1) wrapper.
vsed -e "s,${XBPS_WRAPPERDIR},/usr/bin,g" -i \
- ${DESTDIR}/usr/lib/python${version%.*}/_sysconfigdata.py \
- ${DESTDIR}/usr/lib/python${version%.*}/config/Makefile
+ ${DESTDIR}/usr/lib/python${version%.*.*}/_sysconfigdata.py \
+ ${DESTDIR}/usr/lib/python${version%.*.*}/config/Makefile
if [ "$CROSS_BUILD" ]; then
# Remove references to cross toolchain.
vsed -i "s/$XBPS_CROSS_TRIPLET-//g" \
- ${DESTDIR}/usr/lib/python${version%.*}/_sysconfigdata.py \
- ${DESTDIR}/usr/lib/python${version%.*}/config/Makefile
+ ${DESTDIR}/usr/lib/python${version%.*.*}/_sysconfigdata.py \
+ ${DESTDIR}/usr/lib/python${version%.*.*}/config/Makefile
fi
}
diff --git a/srcpkgs/python/update b/srcpkgs/python/update
index d3e3aa88cccd..cfb8828f7e49 100644
--- a/srcpkgs/python/update
+++ b/srcpkgs/python/update
@@ -1,2 +1 @@
-site="https://www.python.org/ftp/python/"
-pattern='"\K2\.[\d.]+(?=/")'
+pattern='v\K2\.7\.[\d.]*\d'
From 0853e00dec8247213bfa57cad080f06ea799ccb2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 8 Mar 2021 11:55:56 +0100
Subject: [PATCH 2/2] python-tkinter: update to 2.7.18.4.
Adopted.
---
srcpkgs/python-tkinter/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/python-tkinter/template b/srcpkgs/python-tkinter/template
index 51c2fd766500..58658eda5272 100644
--- a/srcpkgs/python-tkinter/template
+++ b/srcpkgs/python-tkinter/template
@@ -7,19 +7,19 @@
_desc="Interpreted, interactive, object-oriented programming language"
pkgname=python-tkinter
-version=2.7.18
-revision=3
-wrksrc="Python-${version}"
+version=2.7.18.4
+revision=1
+wrksrc="cpython-${version}"
pycompile_dirs="usr/lib/python2.7/lib-tk"
hostmakedepends="pkg-config"
makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
sqlite-devel bzip2-devel zlib-devel tk-devel"
short_desc="${_desc} - GUI toolkit for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
license="Python-2.0"
homepage="https://www.python.org"
-distfiles="https://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"
-checksum=b62c0e7937551d0cc02b8fd5cb0f544f9405bafc9a54d3808ed4594812edef43
+distfiles="https://github.com/ActiveState/cpython/archive/v${version}.tar.gz"
+checksum=003a4fbd03fa0dbb3cf88d894c40311ef30dd17b2aa85291c3136393148b1362
pre_configure() {
# Ensure that internal copies of expat, libffi and zlib are not used.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Merged]: Move Python 2 to Active State cPython
2021-03-08 10:57 [PR PATCH] Move Python 2 to Active State cPython leahneukirchen
` (3 preceding siblings ...)
2021-07-14 17:52 ` leahneukirchen
@ 2021-07-16 19:19 ` leahneukirchen
4 siblings, 0 replies; 6+ messages in thread
From: leahneukirchen @ 2021-07-16 19:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 367 bytes --]
There's a merged pull request on the void-packages repository
Move Python 2 to Active State cPython
https://github.com/void-linux/void-packages/pull/29308
Description:
ActiveState is running a branch of cPython that has a bunch of security fixes, at
https://github.com/ActiveState/cpython/
This is very convenient to use for our python package, so let's do it.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-07-16 19:19 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-08 10:57 [PR PATCH] Move Python 2 to Active State cPython leahneukirchen
2021-03-08 11:08 ` [PR PATCH] [Updated] " leahneukirchen
2021-07-14 17:50 ` [PR PATCH] [Closed]: " leahneukirchen
2021-07-14 17:50 ` [PR PATCH] [Updated] " leahneukirchen
2021-07-14 17:52 ` leahneukirchen
2021-07-16 19:19 ` [PR PATCH] [Merged]: " leahneukirchen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).