[pkgsrc/trunk]: pkgsrc/lang python3[567]: fix #53229

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e6ba05b78d40
branches:  trunk
changeset: 394376:e6ba05b78d40
user:      adam <adam%pkgsrc.org@localhost>
date:      Tue Apr 09 18:47:24 2019 +0000

description:
python3[567]: fix #53229

diffstat:

 lang/python35/distinfo                           |   3 ++-
 lang/python35/patches/patch-Python_pylifecycle.c |  16 ++++++++++++++++
 lang/python36/distinfo                           |   3 ++-
 lang/python36/patches/patch-Python_pylifecycle.c |  16 ++++++++++++++++
 lang/python37/distinfo                           |   3 ++-
 lang/python37/patches/patch-Python_pylifecycle.c |  16 ++++++++++++++++
 6 files changed, 54 insertions(+), 3 deletions(-)

diffs (111 lines):

diff -r 34c23988781c -r e6ba05b78d40 lang/python35/distinfo
--- a/lang/python35/distinfo    Tue Apr 09 16:43:10 2019 +0000
+++ b/lang/python35/distinfo    Tue Apr 09 18:47:24 2019 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2019/03/20 19:27:47 adam Exp $
+$NetBSD: distinfo,v 1.20 2019/04/09 18:47:24 adam Exp $
 
 SHA1 (Python-3.5.7.tar.xz) = 743044e357e96ed8e49d709b502f1a9b815be763
 RMD160 (Python-3.5.7.tar.xz) = 782c63473dc5a4fb181409dcc2af9595d1aab92c
@@ -13,6 +13,7 @@
 SHA1 (patch-Modules_nismodule.c) = bd290417c265846e238660180e60e76c0f5f696a
 SHA1 (patch-Modules_socketmodule.c) = 63d583340b071b07ff3e31cf332fcc2ca9ab50e3
 SHA1 (patch-Modules_socketmodule.h) = 13a3290eb72078067060d3e71b7baa08f3eb591c
+SHA1 (patch-Python_pylifecycle.c) = 04bf34ca27f2e20be3f7bb3fd6598ecbf1d9527a
 SHA1 (patch-Python_thread__pthread.h) = fb81eaa604b4ed7c1b64c3f4731d58a8aee257be
 SHA1 (patch-configure) = 3da9bebda139361ead9dec6c350d0e26454ef58b
 SHA1 (patch-pyconfig.h.in) = e0aa80eb1ed3677da77fcd0a93f72b61ce148d0d
diff -r 34c23988781c -r e6ba05b78d40 lang/python35/patches/patch-Python_pylifecycle.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/python35/patches/patch-Python_pylifecycle.c  Tue Apr 09 18:47:24 2019 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-Python_pylifecycle.c,v 1.1 2019/04/09 18:47:24 adam Exp $
+
+NetBSD is also affected by bpo-30225.
+See bpo-33384: https://bugs.python.org/issue33384
+
+--- Python/pylifecycle.c.orig  2019-03-17 23:47:59.000000000 +0000
++++ Python/pylifecycle.c
+@@ -968,7 +968,7 @@ initsite(void)
+ static int
+ is_valid_fd(int fd)
+ {
+-#ifdef __APPLE__
++#if defined(__APPLE__) || defined(__NetBSD__)
+     /* bpo-30225: On macOS Tiger, when stdout is redirected to a pipe
+        and the other side of the pipe is closed, dup(1) succeed, whereas
+        fstat(1, &st) fails with EBADF. Prefer fstat() over dup() to detect
diff -r 34c23988781c -r e6ba05b78d40 lang/python36/distinfo
--- a/lang/python36/distinfo    Tue Apr 09 16:43:10 2019 +0000
+++ b/lang/python36/distinfo    Tue Apr 09 18:47:24 2019 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.24 2019/03/02 13:23:36 adam Exp $
+$NetBSD: distinfo,v 1.25 2019/04/09 18:47:24 adam Exp $
 
 SHA1 (Python-3.6.8.tar.xz) = ee55acedef049268307633cbc9c7ff0610d1244f
 RMD160 (Python-3.6.8.tar.xz) = 478ffd42f188414cd6c114740f90b147363b9b10
@@ -14,6 +14,7 @@
 SHA1 (patch-Modules_nismodule.c) = 1bafe9b06359586d027a77011b103877590d947d
 SHA1 (patch-Modules_socketmodule.c) = e6bdb8990cd9b8cf0b0ff48e6ae7b664681a9924
 SHA1 (patch-Modules_socketmodule.h) = 13a3290eb72078067060d3e71b7baa08f3eb591c
+SHA1 (patch-Python_pylifecycle.c) = 9d912a683cf74a39bcd4ab73f431bccd3eb4288e
 SHA1 (patch-Python_thread__pthread.h) = fb81eaa604b4ed7c1b64c3f4731d58a8aee257be
 SHA1 (patch-configure) = 2c2f3e4bb0da0232f7c0c7eeae1eee782b06dd01
 SHA1 (patch-pyconfig.h.in) = 58e2c03489f9b6e4d88f144d8c09773f92eacd61
diff -r 34c23988781c -r e6ba05b78d40 lang/python36/patches/patch-Python_pylifecycle.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/python36/patches/patch-Python_pylifecycle.c  Tue Apr 09 18:47:24 2019 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-Python_pylifecycle.c,v 1.1 2019/04/09 18:47:24 adam Exp $
+
+NetBSD is also affected by bpo-30225.
+See bpo-33384: https://bugs.python.org/issue33384
+
+--- Python/pylifecycle.c.orig  2019-04-09 17:51:55.000000000 +0000
++++ Python/pylifecycle.c
+@@ -1043,7 +1043,7 @@ initsite(void)
+ static int
+ is_valid_fd(int fd)
+ {
+-#ifdef __APPLE__
++#if defined(__APPLE__) || defined(__NetBSD__)
+     /* bpo-30225: On macOS Tiger, when stdout is redirected to a pipe
+        and the other side of the pipe is closed, dup(1) succeed, whereas
+        fstat(1, &st) fails with EBADF. Prefer fstat() over dup() to detect
diff -r 34c23988781c -r e6ba05b78d40 lang/python37/distinfo
--- a/lang/python37/distinfo    Tue Apr 09 16:43:10 2019 +0000
+++ b/lang/python37/distinfo    Tue Apr 09 18:47:24 2019 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2019/03/26 20:54:55 adam Exp $
+$NetBSD: distinfo,v 1.8 2019/04/09 18:47:24 adam Exp $
 
 SHA1 (Python-3.7.3.tar.xz) = e3584650a06ae2765da0678176deae9d133f1b3d
 RMD160 (Python-3.7.3.tar.xz) = 0095f3072e17edb789656442290f8abd0ec1bc58
@@ -15,6 +15,7 @@
 SHA1 (patch-Modules_nismodule.c) = 1bafe9b06359586d027a77011b103877590d947d
 SHA1 (patch-Modules_socketmodule.c) = c0bdb256bccc176c2406feec4080cd91fcb693b2
 SHA1 (patch-Modules_socketmodule.h) = 13a3290eb72078067060d3e71b7baa08f3eb591c
+SHA1 (patch-Python_pylifecycle.c) = 99f162ad63cbdcff0829ac3e6ff4a2da0bdbe268
 SHA1 (patch-Python_thread__pthread.h) = fb81eaa604b4ed7c1b64c3f4731d58a8aee257be
 SHA1 (patch-configure) = 7945fe47fe894a33aceea06918c4740197e4135a
 SHA1 (patch-pyconfig.h.in) = 58e2c03489f9b6e4d88f144d8c09773f92eacd61
diff -r 34c23988781c -r e6ba05b78d40 lang/python37/patches/patch-Python_pylifecycle.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/python37/patches/patch-Python_pylifecycle.c  Tue Apr 09 18:47:24 2019 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-Python_pylifecycle.c,v 1.1 2019/04/09 18:47:25 adam Exp $
+
+NetBSD is also affected by bpo-30225.
+See bpo-33384: https://bugs.python.org/issue33384
+
+--- Python/pylifecycle.c.orig  2019-03-25 20:21:05.000000000 +0000
++++ Python/pylifecycle.c
+@@ -1672,7 +1672,7 @@ initsite(void)
+ static int
+ is_valid_fd(int fd)
+ {
+-#ifdef __APPLE__
++#if defined(__APPLE__) || defined(__NetBSD__)
+     /* bpo-30225: On macOS Tiger, when stdout is redirected to a pipe
+        and the other side of the pipe is closed, dup(1) succeed, whereas
+        fstat(1, &st) fails with EBADF. Prefer fstat() over dup() to detect