[gentoo-commits] repo/gentoo:master commit in: dev-lang/python/files/

[gentoo-commits] repo/gentoo:master commit in: dev-lang/python/files/

[Mike Gilbert]

commit:     0170c84efe6352034e68061c73985a0be1736cc2
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 21 19:13:51 2015 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Sep 21 19:14:02 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0170c84e

dev-lang/python: Don't patch configure directly

Thanks to Arfrever for the suggestion.

Bug: https://bugs.gentoo.org/560948

Package-Manager: portage-2.2.20_p164

 dev-lang/python/files/python-3.3-libressl.patch | 53 -------------------------
 1 file changed, 53 deletions(-)

diff --git a/dev-lang/python/files/python-3.3-libressl.patch b/dev-lang/python/files/python-3.3-libressl.patch
index 38119c5..72bd63b 100644
--- a/dev-lang/python/files/python-3.3-libressl.patch
+++ b/dev-lang/python/files/python-3.3-libressl.patch
@@ -111,59 +111,6 @@ index 499e8ba..cb151ba 100644
      {"RAND_status",         (PyCFunction)PySSL_RAND_status, METH_NOARGS,
       PySSL_RAND_status_doc},
  #endif
-diff --git a/configure b/configure
-index 6be41f5..5b5a2a0 100755
---- a/configure
-+++ b/configure
-@@ -8823,6 +8823,48 @@ _ACEOF
- 
- fi
- 	# Dynamic linking for HP-UX
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for RAND_egd in -lcrypto" >&5
-+$as_echo_n "checking for RAND_egd in -lcrypto... " >&6; }
-+if ${ac_cv_lib_crypto_RAND_egd+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lcrypto  $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char RAND_egd ();
-+int
-+main ()
-+{
-+return RAND_egd ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_crypto_RAND_egd=yes
-+else
-+  ac_cv_lib_crypto_RAND_egd=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_RAND_egd" >&5
-+$as_echo "$ac_cv_lib_crypto_RAND_egd" >&6; }
-+if test "x$ac_cv_lib_crypto_RAND_egd" = xyes; then :
-+
-+$as_echo "#define HAVE_RAND_EGD 1" >>confdefs.h
-+
-+fi
-+
- 
- # only check for sem_init if thread support is requested
- if test "$with_threads" = "yes" -o -z "$with_threads"; then
 diff --git a/configure.ac b/configure.ac
 index 6a64bff..90f315a 100644
 --- a/configure.ac

[gentoo-commits] repo/gentoo:master commit in: dev-lang/python/files/

[Mike Gilbert]

commit:     311b0dd5075b5f6644129d4de393d2fa08102d47
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 21 19:18:21 2015 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Sep 21 19:18:21 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=311b0dd5

dev-lang/python: Don't patch pyconfig.h.in either

Package-Manager: portage-2.2.20_p164

 dev-lang/python/files/python-3.3-libressl.patch | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/dev-lang/python/files/python-3.3-libressl.patch b/dev-lang/python/files/python-3.3-libressl.patch
index 72bd63b..816704e 100644
--- a/dev-lang/python/files/python-3.3-libressl.patch
+++ b/dev-lang/python/files/python-3.3-libressl.patch
@@ -125,20 +125,3 @@ index 6a64bff..90f315a 100644
  
  # only check for sem_init if thread support is requested
  if test "$with_threads" = "yes" -o -z "$with_threads"; then
-diff --git a/pyconfig.h.in b/pyconfig.h.in
-index 0020300..0d37f67 100644
---- a/pyconfig.h.in
-+++ b/pyconfig.h.in
-@@ -660,6 +660,9 @@
- /* Define to 1 if you have the `pwrite' function. */
- #undef HAVE_PWRITE
- 
-+/* Define if the libcrypto has RAND_egd */
-+#undef HAVE_RAND_EGD
-+
- /* Define to 1 if you have the `readlink' function. */
- #undef HAVE_READLINK
- 
--- 
-2.5.2
-

[gentoo-commits] repo/gentoo:master commit in: dev-lang/python/files/

[Austin English]

commit:     ffcc6e582c844a6d0ad8661fb2f95d5ba44c7aca
Author:     Austin English <wizardedit <AT> gentoo <DOT> org>
AuthorDate: Tue May  3 16:55:30 2016 +0000
Commit:     Austin English <wizardedit <AT> gentoo <DOT> org>
CommitDate: Tue May  3 16:55:58 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffcc6e58

dev-lang/python: use #!/sbin/openrc-run instead of #!/sbin/runscript

Approved by Michał Górny <mgorny <AT> gentoo.org>

Gentoo-Bug: https://bugs.gentoo.org/573846
Gentoo-Bug: https://bugs.gentoo.org/581940

Package-Manager: portage-2.2.26

 dev-lang/python/files/pydoc.init | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-lang/python/files/pydoc.init b/dev-lang/python/files/pydoc.init
index ede0167..6cdfe89 100644
--- a/dev-lang/python/files/pydoc.init
+++ b/dev-lang/python/files/pydoc.init
@@ -1,5 +1,5 @@
-#!/sbin/runscript
-# Copyright 1999-2014 Gentoo Technologies, Inc.
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public Licence v2
 # $Id$
 

[gentoo-commits] repo/gentoo:master commit in: dev-lang/python/files/

[Mike Gilbert]

commit:     8009a89b44a26ba0847e607b2bd61494b21846cb
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 28 14:11:09 2016 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Oct 28 14:11:09 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8009a89b

dev-lang/python: remove old patches

Package-Manager: portage-2.3.2

 .../python/files/python-3.3-CVE-2014-4616.patch    |  52 ---------
 dev-lang/python/files/python-3.3-libressl.patch    | 127 ---------------------
 .../files/python-3.3.5-ncurses-pkg-config.patch    |  40 -------
 3 files changed, 219 deletions(-)

diff --git a/dev-lang/python/files/python-3.3-CVE-2014-4616.patch b/dev-lang/python/files/python-3.3-CVE-2014-4616.patch
deleted file mode 100644
index c67b2e5..00000000
--- a/dev-lang/python/files/python-3.3-CVE-2014-4616.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-# HG changeset patch
-# User Benjamin Peterson <benjamin@python.org>
-# Date 1397441438 14400
-# Node ID 50c07ed1743da9cd4540d83de0c30bd17aeb41b0
-# Parent  218e28a935ab4494d05215c243e2129625a71893
-in scan_once, prevent the reading of arbitrary memory when passed a negative index
-
-Bug reported by Guido Vranken.
-
-Index: Python-3.3.5/Lib/json/tests/test_decode.py
-===================================================================
---- Python-3.3.5.orig/Lib/test/test_json/test_decode.py	2014-06-26 18:40:10.825269130 +0200
-+++ Python-3.3.5/Lib/test/test_json/test_decode.py	2014-06-26 18:40:21.962323035 +0200
-@@ -60,5 +60,10 @@
-         msg = 'escape'
-         self.assertRaisesRegexp(ValueError, msg, self.loads, s)
- 
-+    def test_negative_index(self):
-+        d = self.json.JSONDecoder()
-+        self.assertRaises(ValueError, d.raw_decode, 'a'*42, -50000)
-+        self.assertRaises(ValueError, d.raw_decode, u'a'*42, -50000)
-+
- class TestPyDecode(TestDecode, PyTest): pass
- class TestCDecode(TestDecode, CTest): pass
-Index: Python-3.3.5/Misc/ACKS
-===================================================================
---- Python-3.3.5.orig/Misc/ACKS	2014-06-26 18:40:10.826269135 +0200
-+++ Python-3.3.5/Misc/ACKS	2014-06-26 18:40:21.962323035 +0200
-@@ -1085,6 +1085,7 @@
- Frank Visser
- Johannes Vogel
- Alex Volkov
-+Guido Vranken
- Martijn Vries
- Niki W. Waibel
- Wojtek Walczak
-Index: Python-3.3.5/Modules/_json.c
-===================================================================
---- a/Modules/_json.c
-+++ b/Modules/_json.c
-@@ -975,7 +975,10 @@ scan_once_unicode(PyScannerObject *s, Py
-     kind = PyUnicode_KIND(pystr);
-     length = PyUnicode_GET_LENGTH(pystr);
- 
--    if (idx >= length) {
-+    if (idx < 0)
-+        /* Compatibility with Python version. */
-+        idx += length;
-+    if (idx < 0 || idx >= length) {
-         PyErr_SetNone(PyExc_StopIteration);
-         return NULL;
-     }

diff --git a/dev-lang/python/files/python-3.3-libressl.patch b/dev-lang/python/files/python-3.3-libressl.patch
deleted file mode 100644
index 816704e..00000000
--- a/dev-lang/python/files/python-3.3-libressl.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-From eed8d3b553e00e04c1f97c87ea02723630fb15a4 Mon Sep 17 00:00:00 2001
-From: hasufell <hasufell@gentoo.org>
-Date: Sun, 20 Sep 2015 14:25:43 +0200
-Subject: [PATCH] Backport upstream libressl patches to python-3.3
-
-https://hg.python.org/cpython/raw-rev/7f82f50fdad0
-https://hg.python.org/cpython/raw-rev/4dac45f88d45
----
- Lib/ssl.py           |  7 ++++++-
- Lib/test/test_ssl.py | 21 +++++++++++++--------
- Modules/_ssl.c       |  4 ++++
- configure            | 42 ++++++++++++++++++++++++++++++++++++++++++
- configure.ac         |  3 +++
- pyconfig.h.in        |  3 +++
- 6 files changed, 71 insertions(+), 9 deletions(-)
-
-diff --git a/Lib/ssl.py b/Lib/ssl.py
-index cd8d6b4..445ae87 100644
---- a/Lib/ssl.py
-+++ b/Lib/ssl.py
-@@ -78,7 +78,12 @@ try:
-     from _ssl import OP_SINGLE_ECDH_USE
- except ImportError:
-     pass
--from _ssl import RAND_status, RAND_egd, RAND_add, RAND_bytes, RAND_pseudo_bytes
-+from _ssl import RAND_status, RAND_add, RAND_bytes, RAND_pseudo_bytes
-+try:
-+    from _ssl import RAND_egd
-+except ImportError:
-+    # LibreSSL does not provide RAND_egd
-+    pass
- from _ssl import (
-     SSL_ERROR_ZERO_RETURN,
-     SSL_ERROR_WANT_READ,
-diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
-index 9fc6027..879f791 100644
---- a/Lib/test/test_ssl.py
-+++ b/Lib/test/test_ssl.py
-@@ -130,8 +130,9 @@ class BasicSocketTests(unittest.TestCase):
-         self.assertRaises(ValueError, ssl.RAND_bytes, -5)
-         self.assertRaises(ValueError, ssl.RAND_pseudo_bytes, -5)
- 
--        self.assertRaises(TypeError, ssl.RAND_egd, 1)
--        self.assertRaises(TypeError, ssl.RAND_egd, 'foo', 1)
-+        if hasattr(ssl, 'RAND_egd'):
-+            self.assertRaises(TypeError, ssl.RAND_egd, 1)
-+            self.assertRaises(TypeError, ssl.RAND_egd, 'foo', 1)
-         ssl.RAND_add("this is a random string", 75.0)
- 
-     @unittest.skipUnless(os.name == 'posix', 'requires posix')
-@@ -250,11 +251,11 @@ class BasicSocketTests(unittest.TestCase):
-         # Some sanity checks follow
-         # >= 0.9
-         self.assertGreaterEqual(n, 0x900000)
--        # < 2.0
--        self.assertLess(n, 0x20000000)
-+        # < 3.0
-+        self.assertLess(n, 0x30000000)
-         major, minor, fix, patch, status = t
-         self.assertGreaterEqual(major, 0)
--        self.assertLess(major, 2)
-+        self.assertLess(major, 3)
-         self.assertGreaterEqual(minor, 0)
-         self.assertLess(minor, 256)
-         self.assertGreaterEqual(fix, 0)
-@@ -263,9 +264,13 @@ class BasicSocketTests(unittest.TestCase):
-         self.assertLessEqual(patch, 26)
-         self.assertGreaterEqual(status, 0)
-         self.assertLessEqual(status, 15)
--        # Version string as returned by OpenSSL, the format might change
--        self.assertTrue(s.startswith("OpenSSL {:d}.{:d}.{:d}".format(major, minor, fix)),
--                        (s, t))
-+        # Version string as returned by {Open,Libre}SSL, the format might change
-+        if "LibreSSL" in s:
-+            self.assertTrue(s.startswith("LibreSSL {:d}.{:d}".format(major, minor)),
-+                            (s, t))
-+        else:
-+            self.assertTrue(s.startswith("OpenSSL {:d}.{:d}.{:d}".format(major, minor, fix)),
-+                            (s, t))
- 
-     @support.cpython_only
-     def test_refcycle(self):
-diff --git a/Modules/_ssl.c b/Modules/_ssl.c
-index 499e8ba..cb151ba 100644
---- a/Modules/_ssl.c
-+++ b/Modules/_ssl.c
-@@ -2559,6 +2559,7 @@ Returns 1 if the OpenSSL PRNG has been seeded with enough data and 0 if not.\n\
- It is necessary to seed the PRNG with RAND_add() on some platforms before\n\
- using the ssl() function.");
- 
-+#ifdef HAVE_RAND_EGD
- static PyObject *
- PySSL_RAND_egd(PyObject *self, PyObject *args)
- {
-@@ -2586,6 +2587,7 @@ PyDoc_STRVAR(PySSL_RAND_egd_doc,
- Queries the entropy gather daemon (EGD) on the socket named by 'path'.\n\
- Returns number of bytes read.  Raises SSLError if connection to EGD\n\
- fails or if it does not provide enough data to seed PRNG.");
-+#endif /* HAVE_RAND_EGD */
- 
- #endif /* HAVE_OPENSSL_RAND */
- 
-@@ -2604,8 +2606,10 @@ static PyMethodDef PySSL_methods[] = {
-      PySSL_RAND_bytes_doc},
-     {"RAND_pseudo_bytes",   PySSL_RAND_pseudo_bytes, METH_VARARGS,
-      PySSL_RAND_pseudo_bytes_doc},
-+#ifdef HAVE_RAND_EGD
-     {"RAND_egd",            PySSL_RAND_egd, METH_VARARGS,
-      PySSL_RAND_egd_doc},
-+#endif
-     {"RAND_status",         (PyCFunction)PySSL_RAND_status, METH_NOARGS,
-      PySSL_RAND_status_doc},
- #endif
-diff --git a/configure.ac b/configure.ac
-index 6a64bff..90f315a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2181,6 +2181,9 @@ AC_MSG_RESULT($SHLIBS)
- AC_CHECK_LIB(sendfile, sendfile)
- AC_CHECK_LIB(dl, dlopen)	# Dynamic linking for SunOS/Solaris and SYSV
- AC_CHECK_LIB(dld, shl_load)	# Dynamic linking for HP-UX
-+AC_CHECK_LIB(crypto, RAND_egd,
-+             AC_DEFINE(HAVE_RAND_EGD, 1,
-+             [Define if the libcrypto has RAND_egd]))
- 
- # only check for sem_init if thread support is requested
- if test "$with_threads" = "yes" -o -z "$with_threads"; then

diff --git a/dev-lang/python/files/python-3.3.5-ncurses-pkg-config.patch b/dev-lang/python/files/python-3.3.5-ncurses-pkg-config.patch
deleted file mode 100644
index d963b9e..00000000
--- a/dev-lang/python/files/python-3.3.5-ncurses-pkg-config.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-do not hardcode /usr/include paths
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -668,6 +668,8 @@ AC_ARG_WITH(cxx_main,
- ])
- AC_MSG_RESULT($with_cxx_main)
- 
-+AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-+
- preset_cxx="$CXX"
- if test -z "$CXX"
- then
-@@ -1513,7 +1515,7 @@ dnl AC_MSG_RESULT($cpp_type)
- # checks for header files
- AC_HEADER_STDC
- ac_save_cppflags="$CPPFLAGS"
--CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
-+CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags ncursesw`"
- AC_CHECK_HEADERS(asm/types.h conio.h curses.h direct.h dlfcn.h errno.h \
- fcntl.h grp.h \
- ieeefp.h io.h langinfo.h libintl.h ncurses.h process.h pthread.h \
-@@ -2225,8 +2227,6 @@ LIBS="$withval $LIBS"
- ],
- [AC_MSG_RESULT(no)])
- 
--AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
--
- # Check for use of the system expat library
- AC_MSG_CHECKING(for --with-system-expat)
- AC_ARG_WITH(system_expat,
-@@ -4273,7 +4273,7 @@ then
- fi
- 
- ac_save_cppflags="$CPPFLAGS"
--CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
-+CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags ncursesw`"
- # On HP/UX 11.0, mvwdelch is a block with a return statement
- AC_MSG_CHECKING(whether mvwdelch is an expression)
- AC_CACHE_VAL(ac_cv_mvwdelch_is_expression,

[gentoo-commits] repo/gentoo:master commit in: dev-lang/python/files/

[Patrice Clement]

commit:     f61d0e96e2de7346ec9de95a7876e1bb39582dc0
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Aug 16 08:41:01 2017 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Aug 29 20:18:13 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f61d0e96

dev-lang/python: remove unused patches.

 dev-lang/python/files/3.5-secondary-targets.patch | 19 ------
 dev-lang/python/files/3.5.1-cross-compile.patch   | 75 -----------------------
 dev-lang/python/files/python-3.4-gcc-5.patch      | 37 -----------
 3 files changed, 131 deletions(-)

diff --git a/dev-lang/python/files/3.5-secondary-targets.patch b/dev-lang/python/files/3.5-secondary-targets.patch
deleted file mode 100644
index eb3b0c71e7d..00000000000
--- a/dev-lang/python/files/3.5-secondary-targets.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Mark all targets as "secondary"
-
-This allows make to avoid rebuilding unnecessary intermediate files, which
-is useful when cross-compiling.
-
-See Parser/pgen and Programs/_freeze_importlib in Makefile.pre.in.
-
-diff --git a/Makefile.pre.in b/Makefile.pre.in
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -1672,6 +1672,8 @@
- .PHONY: smelly funny patchcheck touch altmaninstall commoninstall
- .PHONY: gdbhooks
- 
-+.SECONDARY:
-+
- # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
- # Local Variables:
- # mode: makefile

diff --git a/dev-lang/python/files/3.5.1-cross-compile.patch b/dev-lang/python/files/3.5.1-cross-compile.patch
deleted file mode 100644
index 25a518bd1e6..00000000000
--- a/dev-lang/python/files/3.5.1-cross-compile.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-# HG changeset patch
-# User Martin Panter <vadmium+py@gmail.com>
-# Date 1461373124 0
-# Node ID 66e40df31faca467937c7b9d5d2e825471f97822
-# Parent  a246047734b3496a7dc4ebaf1f0232dadf22eab6
-Issue #22359: Disable running cross-compiled _freeze_importlib and pgen
-
-Patch by Xavier de Gaye.
-
-diff --git a/Makefile.pre.in b/Makefile.pre.in
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -221,6 +221,7 @@ LIBOBJS=	@LIBOBJS@
- PYTHON=		python$(EXE)
- BUILDPYTHON=	python$(BUILDEXE)
- 
-+cross_compiling=@cross_compiling@
- PYTHON_FOR_BUILD=@PYTHON_FOR_BUILD@
- _PYTHON_HOST_PLATFORM=@_PYTHON_HOST_PLATFORM@
- BUILD_GNU_TYPE=	@build@
-@@ -718,12 +719,16 @@ Programs/_freeze_importlib: Programs/_fr
- 	$(LINKCC) $(PY_LDFLAGS) -o $@ Programs/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
- 
- Python/importlib_external.h: $(srcdir)/Lib/importlib/_bootstrap_external.py Programs/_freeze_importlib
--	./Programs/_freeze_importlib \
--		$(srcdir)/Lib/importlib/_bootstrap_external.py Python/importlib_external.h
-+	if test "$(cross_compiling)" != "yes"; then \
-+	    ./Programs/_freeze_importlib \
-+	        $(srcdir)/Lib/importlib/_bootstrap_external.py Python/importlib_external.h; \
-+	fi
- 
- Python/importlib.h: $(srcdir)/Lib/importlib/_bootstrap.py Programs/_freeze_importlib
--	./Programs/_freeze_importlib \
--		$(srcdir)/Lib/importlib/_bootstrap.py Python/importlib.h
-+	if test "$(cross_compiling)" != "yes"; then \
-+	    ./Programs/_freeze_importlib \
-+	        $(srcdir)/Lib/importlib/_bootstrap.py Python/importlib.h; \
-+	fi
- 
- 
- ############################################################################
-@@ -784,10 +789,18 @@ Python/sysmodule.o: $(srcdir)/Python/sys
- $(IO_OBJS): $(IO_H)
- 
- $(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGEN)
--		@$(MKDIR_P) Include
--		$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
-+	@$(MKDIR_P) Include
-+	if test "$(cross_compiling)" != "yes"; then \
-+		$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C); \
-+	else \
-+		cp $(srcdir)/Include/graminit.h $(GRAMMAR_H); \
-+	fi
- $(GRAMMAR_C): $(GRAMMAR_H)
--		touch $(GRAMMAR_C)
-+	if test "$(cross_compiling)" != "yes"; then \
-+		touch $(GRAMMAR_C); \
-+	else \
-+		cp $(srcdir)/Python/graminit.c $(GRAMMAR_C); \
-+	fi
- 
- $(PGEN): $(PGENOBJS)
- 		$(CC) $(OPT) $(PY_LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN)
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -49,6 +49,7 @@ fi
- AC_CONFIG_SRCDIR([Include/object.h])
- AC_CONFIG_HEADER(pyconfig.h)
- 
-+AC_SUBST(cross_compiling)
- AC_CANONICAL_HOST
- AC_SUBST(build)
- AC_SUBST(host)
-

diff --git a/dev-lang/python/files/python-3.4-gcc-5.patch b/dev-lang/python/files/python-3.4-gcc-5.patch
deleted file mode 100644
index 80afbd1c47b..00000000000
--- a/dev-lang/python/files/python-3.4-gcc-5.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-changeset:   94583:689092296ad3
-branch:      3.4
-parent:      94579:645f3d750be1
-user:        Victor Stinner <victor.stinner@gmail.com>
-date:        Wed Feb 11 14:23:35 2015 +0100
-summary:     Issue #23433: Fix faulthandler._stack_overflow()
-
-diff -r 645f3d750be1 -r 689092296ad3 Modules/faulthandler.c
---- a/Modules/faulthandler.c	Tue Feb 10 14:49:32 2015 +0100
-+++ b/Modules/faulthandler.c	Wed Feb 11 14:23:35 2015 +0100
-@@ -911,12 +911,12 @@
- }
- 
- #if defined(HAVE_SIGALTSTACK) && defined(HAVE_SIGACTION)
--static void*
--stack_overflow(void *min_sp, void *max_sp, size_t *depth)
-+static Py_uintptr_t
-+stack_overflow(Py_uintptr_t min_sp, Py_uintptr_t max_sp, size_t *depth)
- {
-     /* allocate 4096 bytes on the stack at each call */
-     unsigned char buffer[4096];
--    void *sp = &buffer;
-+    Py_uintptr_t sp = (Py_uintptr_t)&buffer;
-     *depth += 1;
-     if (sp < min_sp || max_sp < sp)
-         return sp;
-@@ -929,7 +929,8 @@
- faulthandler_stack_overflow(PyObject *self)
- {
-     size_t depth, size;
--    char *sp = (char *)&depth, *stop;
-+    Py_uintptr_t sp = (Py_uintptr_t)&depth;
-+    Py_uintptr_t stop;
- 
-     depth = 0;
-     stop = stack_overflow(sp - STACK_OVERFLOW_MAX_SIZE,
-

[gentoo-commits] repo/gentoo:master commit in: dev-lang/python/files/

[Mike Gilbert]

commit:     e0dc893a2306e868f65f5067e46abba8c18e0911
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Dec  3 12:32:52 2017 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Dec  3 21:08:08 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0dc893a

dev-lang/python: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/6418

 dev-lang/python/files/3.6.1-test_socket-AEAD.patch | 75 ----------------------
 1 file changed, 75 deletions(-)

diff --git a/dev-lang/python/files/3.6.1-test_socket-AEAD.patch b/dev-lang/python/files/3.6.1-test_socket-AEAD.patch
deleted file mode 100644
index 426e3371441..00000000000
--- a/dev-lang/python/files/3.6.1-test_socket-AEAD.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 4ac01f0ff3e3c9c02f5cc8c55f2fbe4639808f5e Mon Sep 17 00:00:00 2001
-From: Mariatta <Mariatta@users.noreply.github.com>
-Date: Thu, 16 Mar 2017 20:58:42 -0700
-Subject: [PATCH] update test_socket AEAD test for kernel 4.9 and up (GH-133)
- (GH-548)
-
-(cherry picked from commit 9764c151c51480a7ca6042b1ccd69be2620ff360)
----
- Lib/test/test_socket.py | 15 +++++++--------
- 1 file changed, 7 insertions(+), 8 deletions(-)
-
-diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
-index 5315d475df..1508f20c9f 100644
---- a/Lib/test/test_socket.py
-+++ b/Lib/test/test_socket.py
-@@ -5479,7 +5479,7 @@ class LinuxKernelCryptoAPI(unittest.TestCase):
-             self.assertEqual(len(dec), msglen * multiplier)
-             self.assertEqual(dec, msg * multiplier)
- 
--    @support.requires_linux_version(4, 3)  # see test_aes_cbc
-+    @support.requires_linux_version(4, 9)  # see issue29324
-     def test_aead_aes_gcm(self):
-         key = bytes.fromhex('c939cc13397c1d37de6ae0e1cb7c423c')
-         iv = bytes.fromhex('b3d8cc017cbb89b39e0f67e2')
-@@ -5502,8 +5502,7 @@ class LinuxKernelCryptoAPI(unittest.TestCase):
-                 op.sendmsg_afalg(op=socket.ALG_OP_ENCRYPT, iv=iv,
-                                  assoclen=assoclen, flags=socket.MSG_MORE)
-                 op.sendall(assoc, socket.MSG_MORE)
--                op.sendall(plain, socket.MSG_MORE)
--                op.sendall(b'\x00' * taglen)
-+                op.sendall(plain)
-                 res = op.recv(assoclen + len(plain) + taglen)
-                 self.assertEqual(expected_ct, res[assoclen:-taglen])
-                 self.assertEqual(expected_tag, res[-taglen:])
-@@ -5511,7 +5510,7 @@ class LinuxKernelCryptoAPI(unittest.TestCase):
-             # now with msg
-             op, _ = algo.accept()
-             with op:
--                msg = assoc + plain + b'\x00' * taglen
-+                msg = assoc + plain
-                 op.sendmsg_afalg([msg], op=socket.ALG_OP_ENCRYPT, iv=iv,
-                                  assoclen=assoclen)
-                 res = op.recv(assoclen + len(plain) + taglen)
-@@ -5522,7 +5521,7 @@ class LinuxKernelCryptoAPI(unittest.TestCase):
-             pack_uint32 = struct.Struct('I').pack
-             op, _ = algo.accept()
-             with op:
--                msg = assoc + plain + b'\x00' * taglen
-+                msg = assoc + plain
-                 op.sendmsg(
-                     [msg],
-                     ([socket.SOL_ALG, socket.ALG_SET_OP, pack_uint32(socket.ALG_OP_ENCRYPT)],
-@@ -5530,7 +5529,7 @@ class LinuxKernelCryptoAPI(unittest.TestCase):
-                      [socket.SOL_ALG, socket.ALG_SET_AEAD_ASSOCLEN, pack_uint32(assoclen)],
-                     )
-                 )
--                res = op.recv(len(msg))
-+                res = op.recv(len(msg) + taglen)
-                 self.assertEqual(expected_ct, res[assoclen:-taglen])
-                 self.assertEqual(expected_tag, res[-taglen:])
- 
-@@ -5540,8 +5539,8 @@ class LinuxKernelCryptoAPI(unittest.TestCase):
-                 msg = assoc + expected_ct + expected_tag
-                 op.sendmsg_afalg([msg], op=socket.ALG_OP_DECRYPT, iv=iv,
-                                  assoclen=assoclen)
--                res = op.recv(len(msg))
--                self.assertEqual(plain, res[assoclen:-taglen])
-+                res = op.recv(len(msg) - taglen)
-+                self.assertEqual(plain, res[assoclen:])
- 
-     @support.requires_linux_version(4, 3)  # see test_aes_cbc
-     def test_drbg_pr_sha256(self):
--- 
-2.12.2
-

[gentoo-commits] repo/gentoo:master commit in: dev-lang/python/files/

[Patrice Clement]

commit:     256371d3c2fc03f1c9e746a0c52b4a753dcf09ec
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Jan 19 09:25:27 2019 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Feb  5 22:37:43 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=256371d3

dev-lang/python: remove unused patches.

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/10869
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 dev-lang/python/files/2.7-disable-nis.patch        | 21 -----
 .../files/python-2.7-libressl-compatibility.patch  | 92 ----------------------
 2 files changed, 113 deletions(-)

diff --git a/dev-lang/python/files/2.7-disable-nis.patch b/dev-lang/python/files/2.7-disable-nis.patch
deleted file mode 100644
index 5a6cb3e403f..00000000000
--- a/dev-lang/python/files/2.7-disable-nis.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -1346,17 +1346,7 @@ class PyBuildExt(build_ext):
-             else:
-                 missing.append('resource')
- 
--            # Sun yellow pages. Some systems have the functions in libc.
--            if (host_platform not in ['cygwin', 'atheos', 'qnx6'] and
--                find_file('rpcsvc/yp_prot.h', inc_dirs, []) is not None):
--                if (self.compiler.find_library_file(lib_dirs, 'nsl')):
--                    libs = ['nsl']
--                else:
--                    libs = []
--                exts.append( Extension('nis', ['nismodule.c'],
--                                       libraries = libs) )
--            else:
--                missing.append('nis')
-+            missing.append('nis')
-         else:
-             missing.extend(['nis', 'resource', 'termios'])
- 

diff --git a/dev-lang/python/files/python-2.7-libressl-compatibility.patch b/dev-lang/python/files/python-2.7-libressl-compatibility.patch
deleted file mode 100644
index c9e7a8458e3..00000000000
--- a/dev-lang/python/files/python-2.7-libressl-compatibility.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-# From https://github.com/python/cpython/pull/6215
-
-# LibreSSL 2.7 introduced OpenSSL 1.1.0 API. The ssl module now detects
-# LibreSSL 2.7 and only provides API shims for OpenSSL < 1.1.0 and
-# LibreSSL < 2.7.
-
-# Documentation updates and fixes for failing tests will be provided in
-# another patch set.
-
-# Signed-off-by: Christian Heimes christian@python.org.
-# (cherry picked from commit 4ca0739)
-
-#Co-authored-by: Christian Heimes christian@python.org
-
---- a/Modules/_ssl.c	2017-09-16 17:38:35.000000000 +0000
-+++ b/Modules/_ssl.c	2018-04-13 15:55:10.919424126 +0000
-@@ -97,6 +102,12 @@
- 
- #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
- #  define OPENSSL_VERSION_1_1 1
-+#  define PY_OPENSSL_1_1_API 1
-+#endif
-+
-+/* LibreSSL 2.7.0 provides necessary OpenSSL 1.1.0 APIs */
-+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL
-+#  define PY_OPENSSL_1_1_API 1
- #endif
- 
- /* Openssl comes with TLSv1.1 and TLSv1.2 between 1.0.0h and 1.0.1
-@@ -118,24 +129,44 @@
- #endif
- 
- /* ALPN added in OpenSSL 1.0.2 */
--#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x1000200fL && !defined(OPENSSL_NO_TLSEXT)
--# define HAVE_ALPN
-+#ifdef TLSEXT_TYPE_application_layer_protocol_negotiation
-+# define HAVE_ALPN 1
-+#else
-+# define HAVE_ALPN 0
-+#endif
-+
-+/* We cannot rely on OPENSSL_NO_NEXTPROTONEG because LibreSSL 2.6.1 dropped
-+ * NPN support but did not set OPENSSL_NO_NEXTPROTONEG for compatibility
-+ * reasons. The check for TLSEXT_TYPE_next_proto_neg works with
-+ * OpenSSL 1.0.1+ and LibreSSL.
-+ * OpenSSL 1.1.1-pre1 dropped NPN but still has TLSEXT_TYPE_next_proto_neg.
-+ */
-+#ifdef OPENSSL_NO_NEXTPROTONEG
-+# define HAVE_NPN 0
-+#elif (OPENSSL_VERSION_NUMBER >= 0x10101000L) && !defined(LIBRESSL_VERSION_NUMBER)
-+# define HAVE_NPN 0
-+#elif defined(TLSEXT_TYPE_next_proto_neg)
-+# define HAVE_NPN 1
-+#else
-+# define HAVE_NPN 0
- #endif
- 
- #ifndef INVALID_SOCKET /* MS defines this */
- #define INVALID_SOCKET (-1)
- #endif
- 
--#ifdef OPENSSL_VERSION_1_1
--/* OpenSSL 1.1.0+ */
--#ifndef OPENSSL_NO_SSL2
--#define OPENSSL_NO_SSL2
--#endif
--#else /* OpenSSL < 1.1.0 */
--#if defined(WITH_THREAD)
-+/* OpenSSL 1.0.2 and LibreSSL needs extra code for locking */
-+#if !defined(OPENSSL_VERSION_1_1) && defined(WITH_THREAD)
- #define HAVE_OPENSSL_CRYPTO_LOCK
- #endif
- 
-+#if defined(OPENSSL_VERSION_1_1) && !defined(OPENSSL_NO_SSL2)
-+#define OPENSSL_NO_SSL2
-+#endif
-+
-+#ifndef PY_OPENSSL_1_1_API
-+/* OpenSSL 1.1 API shims for OpenSSL < 1.1.0 and LibreSSL < 2.7.0 */
-+
- #define TLS_method SSLv23_method
- 
- static int X509_NAME_ENTRY_set(const X509_NAME_ENTRY *ne)
-@@ -178,7 +209,7 @@
- {
-     return store->param;
- }
--#endif /* OpenSSL < 1.1.0 or LibreSSL */
-+#endif /* OpenSSL < 1.1.0 or LibreSSL < 2.7.0 */
- 
- 
- enum py_ssl_error {

[gentoo-commits] repo/gentoo:master commit in: dev-lang/python/files/

[Aaron Bauman]

commit:     987d7af5da5446e67f4bd59d915e35fff99628f8
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Mar 26 19:22:01 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Tue Mar 26 19:33:03 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=987d7af5

dev-lang/python: remove unused patch

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11511
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 dev-lang/python/files/3.6-blake2.patch | 37 ----------------------------------
 1 file changed, 37 deletions(-)

diff --git a/dev-lang/python/files/3.6-blake2.patch b/dev-lang/python/files/3.6-blake2.patch
deleted file mode 100644
index 48ee5855952..00000000000
--- a/dev-lang/python/files/3.6-blake2.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 2e7c906c085a01ea8175a19e1e143257abc8f566 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Sun, 30 Jul 2017 11:17:39 -0400
-Subject: [PATCH] blake2: remove commented code
-
-The nested comments cause a build failure.
-
-Bug: https://bugs.gentoo.org/608586
----
- Modules/_blake2/impl/blake2s-load-xop.h | 11 -----------
- 1 file changed, 11 deletions(-)
-
-diff --git a/Modules/_blake2/impl/blake2s-load-xop.h b/Modules/_blake2/impl/blake2s-load-xop.h
-index a3b5d65e2d..7e76c399c6 100644
---- a/Modules/_blake2/impl/blake2s-load-xop.h
-+++ b/Modules/_blake2/impl/blake2s-load-xop.h
-@@ -18,17 +18,6 @@
- 
- #define TOB(x) ((x)*4*0x01010101 + 0x03020100) /* ..or not TOB */
- 
--/* Basic VPPERM emulation, for testing purposes */
--/*static __m128i _mm_perm_epi8(const __m128i src1, const __m128i src2, const __m128i sel)
--{
--   const __m128i sixteen = _mm_set1_epi8(16);
--   const __m128i t0 = _mm_shuffle_epi8(src1, sel);
--   const __m128i s1 = _mm_shuffle_epi8(src2, _mm_sub_epi8(sel, sixteen));
--   const __m128i mask = _mm_or_si128(_mm_cmpeq_epi8(sel, sixteen),
--                                     _mm_cmpgt_epi8(sel, sixteen)); /* (>=16) = 0xff : 00 */
--   return _mm_blendv_epi8(t0, s1, mask);
--}*/
--
- #define LOAD_MSG_0_1(buf) \
- buf = _mm_perm_epi8(m0, m1, _mm_set_epi32(TOB(6),TOB(4),TOB(2),TOB(0)) );
- 
--- 
-2.13.3
-