create bsd12 branch

_oldver/python35/Makefile

@@ -0,0 +1,60 @@
+#
+# $Id: Makefile 2493 2009-09-19 15:10:11Z root $
+# $URL: file:///usr2/svn/ports5/lang/python25/Makefile $
+#
+
+PORTNAME=	python
+PORTVERSION=	3.5.7
+CATEGORIES=	lang python
+MASTER_SITES=	PYTHON
+MASTER_SITE_SUBDIR=	ftp/python/${PORTVERSION}
+DISTNAME=	Python-${PORTVERSION}
+DIST_SUBDIR=	python
+PKGNAMESUFFIX=	35
+
+MAINTAINER=	onborodin@gmail.com
+COMMENT=	An interpreted object-oriented programming language
+
+#LIB_DEPENDS+=	libsqlite3.so:data/sqlite3
+LIB_DEPENDS+=	libexpat.so:text/libexpat
+
+###PREFIX= ${LOCALBASE}/python
+
+GNU_CONFIGURE=	yes
+INSTALLS_SHLIB=	yes
+
+USES+=		autoreconf gmake tar:xz
+
+CONFIGURE_ENV=	OPT="${CFLAGS}" SVNVERSION="echo freebsd"
+MAKE_ENV=	VPATH="${PYTHON_WRKSRC}"
+
+#CONFIGURE_ARGS+= --enable-unicode=ucs4
+CONFIGURE_ARGS+= --enable-ipv6
+#CONFIGURE_ARGS+= --with-system-ffi
+CONFIGURE_ARGS+= --with-system-expat
+
+#CONFIGURE_ARGS+= --with-fpectl
+CONFIGURE_ARGS+= --with-threads
+CONFIGURE_ARGS+= --enable-shared
+CONFIGURE_ARGS+= --mandir=${PREFIX}/man
+CPPFLAGS=	-pthread
+LDFLAGS+=	-pthread
+
+DISABLED_EXTENSIONS=	_sqlite3 _tkinter _gdbm nis
+CONFIGURE_ARGS+=	--without-ensurepip
+CONFIGURE_ENV+=		OPT="" DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS}"
+INSTALL_TARGET=		altinstall
+
+VERSION_SHORT= ${PORTVERSION:R}
+OSVERSION_MAJOR=	${OSVERSION:C/([0-9]?[0-9])([0-9][0-9])[0-9]{3}/\1/}
+
+PLIST_SUB=	VERSION=${PORTVERSION:R}
+PLIST_SUB+= OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/}
+PLIST_SUB+= TARGET=freebsd${OSVERSION_MAJOR}
+
+post-patch:
+	${REINPLACE_CMD} -e 's,SOVERSION=1.0,SOVERSION=1,' ${WRKSRC}/configure.ac
+
+.include <bsd.port.mk>
+#EOF
+

_oldver/python35/distinfo

@@ -0,0 +1,2 @@
+SHA256 (python/Python-3.5.7.tar.xz) = 285892899bf4d5737fd08482aa6171c6b2564a45b9102dfacfb72826aebdc7dc
+SIZE (python/Python-3.5.7.tar.xz) = 15324736

_oldver/python35/files/patch-Lib_distutils_command_install__lib.py

@@ -0,0 +1,41 @@
+From 9934ce31b8447667f71c211e559a8de71e8263db Mon Sep 17 00:00:00 2001
+From: Brendan Molloy <brendan@bbqsrc.net>
+Date: Mon, 4 Jan 2016 23:14:06 +1100
+Subject: [PATCH] Check bytecode file actually exists and tests
+
+Should solve issue 20397, where using the --record argument results
+in files that failed to generate bytecode files are added to the
+record file nonetheless.
+---
+ Lib/distutils/command/install_lib.py    | 17 +++++++++++++----
+ Lib/distutils/tests/test_install_lib.py |  8 ++++++--
+ 2 files changed, 19 insertions(+), 6 deletions(-)
+
+--- Lib/distutils/command/install_lib.py.orig	2015-12-07 01:39:07 UTC
++++ Lib/distutils/command/install_lib.py
+@@ -164,12 +164,21 @@ class install_lib(Command):
+             ext = os.path.splitext(os.path.normcase(py_file))[1]
+             if ext != PYTHON_SOURCE_EXTENSION:
+                 continue
++
+             if self.compile:
+-                bytecode_files.append(importlib.util.cache_from_source(
+-                    py_file, optimization=''))
++                candidate = importlib.util.cache_from_source(
++                    py_file, optimization='')
++
++                if os.path.isfile(candidate):
++                    bytecode_files.append(candidate)
++
+             if self.optimize > 0:
+-                bytecode_files.append(importlib.util.cache_from_source(
+-                    py_file, optimization=self.optimize))
++                candidate = importlib.util.cache_from_source(
++                    py_file, optimization=self.optimize)
++
++                if os.path.isfile(candidate):
++                    bytecode_files.append(candidate)
++
+ 
+         return bytecode_files
+ 

_oldver/python35/files/patch-Lib_distutils_tests_test__install__lib.py

@@ -0,0 +1,33 @@
+From 9934ce31b8447667f71c211e559a8de71e8263db Mon Sep 17 00:00:00 2001
+From: Brendan Molloy <brendan@bbqsrc.net>
+Date: Mon, 4 Jan 2016 23:14:06 +1100
+Subject: [PATCH] Check bytecode file actually exists and tests
+
+Should solve issue 20397, where using the --record argument results
+in files that failed to generate bytecode files are added to the
+record file nonetheless.
+---
+ Lib/distutils/command/install_lib.py    | 17 +++++++++++++----
+ Lib/distutils/tests/test_install_lib.py |  8 ++++++--
+ 2 files changed, 19 insertions(+), 6 deletions(-)
+
+--- Lib/distutils/tests/test_install_lib.py.orig	2015-12-07 01:39:07 UTC
++++ Lib/distutils/tests/test_install_lib.py
+@@ -64,11 +64,15 @@ class InstallLibTestCase(support.Tempdir
+         cmd.distribution.ext_modules = [Extension('foo', ['xxx'])]
+         cmd.distribution.packages = ['spam']
+         cmd.distribution.script_name = 'setup.py'
++        
++        # Create rubbish, uncompilable file
++        f = os.path.join(project_dir, 'spam', 'rubbish.py')
++        self.write_file(f, 'rubbish()')
+ 
+         # get_outputs should return 4 elements: spam/__init__.py and .pyc,
+-        # foo.import-tag-abiflags.so / foo.pyd
++        # foo.import-tag-abiflags.so / foo.pyd and rubbish.py (no .pyc)
+         outputs = cmd.get_outputs()
+-        self.assertEqual(len(outputs), 4, outputs)
++        self.assertEqual(len(outputs), 5, outputs)
+ 
+     def test_get_inputs(self):
+         project_dir, dist = self.create_dist()

_oldver/python35/files/patch-Makefile.pre.in

@@ -0,0 +1,63 @@
+# Description: Remove duplicate CFLAGS, CPPFLAGS, LDFLAGS by stripping CONFIGURE_*
+# Submitted by: koobs (r326729)
+# TODO: Upstream
+
+# Description: Create symlinks for non-ABI-suffixed python*-config and ABI-suffixed python-*.pc
+# Submitted by: antoine@ (r358029)
+# TODO: Upstream
+
+--- Makefile.pre.in.orig	2017-01-21 18:48:21.942822000 +0800
++++ Makefile.pre.in	2017-01-21 18:55:44.342228000 +0800
+@@ -76,23 +76,20 @@
+ OPT=		@OPT@
+ BASECFLAGS=	@BASECFLAGS@
+ BASECPPFLAGS=	@BASECPPFLAGS@
+-CONFIGURE_CFLAGS=	@CFLAGS@
+ # CFLAGS_NODIST is used for building the interpreter and stdlib C extensions.
+ # Use it when a compiler flag should _not_ be part of the distutils CFLAGS
+ # once Python is installed (Issue #21121).
+ CONFIGURE_CFLAGS_NODIST=@CFLAGS_NODIST@
+-CONFIGURE_CPPFLAGS=	@CPPFLAGS@
+-CONFIGURE_LDFLAGS=	@LDFLAGS@
+ # Avoid assigning CFLAGS, LDFLAGS, etc. so users can use them on the
+ # command line to append to these values without stomping the pre-set
+ # values.
+-PY_CFLAGS=	$(BASECFLAGS) $(OPT) $(CONFIGURE_CFLAGS) $(CFLAGS) $(EXTRA_CFLAGS)
++PY_CFLAGS=	$(BASECFLAGS) $(OPT) $(CFLAGS) $(EXTRA_CFLAGS)
+ PY_CFLAGS_NODIST=$(CONFIGURE_CFLAGS_NODIST) $(CFLAGS_NODIST)
+ # Both CPPFLAGS and LDFLAGS need to contain the shell's value for setup.py to
+ # be able to build extension modules using the directories specified in the
+ # environment variables
+-PY_CPPFLAGS=	$(BASECPPFLAGS) -I. -I$(srcdir)/Include $(CONFIGURE_CPPFLAGS) $(CPPFLAGS)
+-PY_LDFLAGS=	$(CONFIGURE_LDFLAGS) $(LDFLAGS)
++PY_CPPFLAGS=	$(BASECPPFLAGS) -I. -I$(srcdir)/Include $(CPPFLAGS)
++PY_LDFLAGS=	$(LDFLAGS)
+ NO_AS_NEEDED=	@NO_AS_NEEDED@
+ LDLAST=		@LDLAST@
+ SGI_ABI=	@SGI_ABI@
+@@ -1130,12 +1127,6 @@
+ 	else true; \
+ 	fi
+ 	(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)$(EXE) python3$(EXE))
+-	-if test "$(VERSION)" != "$(LDVERSION)"; then \
+-		rm -f $(DESTDIR)$(BINDIR)/python$(VERSION)-config; \
+-		(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(LDVERSION)-config python$(VERSION)-config); \
+-		rm -f $(DESTDIR)$(LIBPC)/python-$(LDVERSION).pc; \
+-		(cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python-$(LDVERSION).pc); \
+-	fi
+ 	-rm -f $(DESTDIR)$(BINDIR)/python3-config
+ 	(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python3-config)
+ 	-rm -f $(DESTDIR)$(LIBPC)/python3.pc
+@@ -1412,6 +1403,12 @@
+ 	$(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh
+ 	$(INSTALL_SCRIPT) python-config.py $(DESTDIR)$(LIBPL)/python-config.py
+ 	$(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(LDVERSION)-config
++	-if test "$(VERSION)" != "$(LDVERSION)"; then \
++		rm -f $(DESTDIR)$(BINDIR)/python$(VERSION)-config; \
++		(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(LDVERSION)-config python$(VERSION)-config); \
++		rm -f $(DESTDIR)$(LIBPC)/python-$(LDVERSION).pc; \
++		(cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python-$(LDVERSION).pc); \
++	fi
+ 	@if [ -s Modules/python.exp -a \
+ 		"`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" = "aix" ]; then \
+ 		echo; echo "Installing support files for building shared extension modules on AIX:"; \

_oldver/python35/files/patch-Misc__python-config.sh.in

@@ -0,0 +1,11 @@
+--- Misc/python-config.sh.in.orig	2018-07-13 21:07:16 UTC
++++ Misc/python-config.sh.in
+@@ -15,7 +15,7 @@ fi
+ # Returns the actual prefix where this script was installed to.
+ installed_prefix ()
+ {
+-    RESULT=$(dirname $(cd $(dirname "$1") && pwd -P))
++    RESULT=$(dirname $(cd $(dirname $(realpath "$1")) && pwd -P))
+     if which readlink >/dev/null 2>&1 ; then
+         if readlink -f "$RESULT" >/dev/null 2>&1; then
+           RESULT=$(readlink -f "$RESULT")

_oldver/python35/files/patch-Modules___ctypes__libffi__src__arm__ffi.c

@@ -0,0 +1,36 @@
+# Description: Fix _ctypes abort on import for FreeBSD/ARM. This is an issue
+# for anything !apple that is using the libcompiler_rt provided by clang on arm
+# PR: ports/149167 ports/184517
+# Patch by: cognet@ (to be upstreamed @ LLVM)
+
+--- ./Modules/_ctypes/libffi/src/arm/ffi.c.orig	2013-11-17 18:22:57.000000000 +1100
++++ ./Modules/_ctypes/libffi/src/arm/ffi.c	2013-12-03 19:23:24.521993369 +1100
+@@ -33,6 +33,11 @@
+ 
+ #include <stdlib.h>
+ 
++#if defined(__FreeBSD__) && defined(__arm__)
++#include <sys/types.h>
++#include <machine/sysarch.h>
++#endif
++
+ /* Forward declares. */
+ static int vfp_type_p (ffi_type *);
+ static void layout_vfp_args (ffi_cif *);
+@@ -582,6 +587,16 @@
+ 
+ #else
+ 
++#if defined(__FreeBSD__) && defined(__arm__)
++#define __clear_cache(start, end) do { \
++		struct arm_sync_icache_args ua; 		\
++								\
++		ua.addr = (uintptr_t)(start);			\
++		ua.len = (char *)(end) - (char *)start;		\
++		sysarch(ARM_SYNC_ICACHE, &ua);			\
++	} while (0);
++#endif
++
+ #define FFI_INIT_TRAMPOLINE(TRAMP,FUN,CTX)				\
+ ({ unsigned char *__tramp = (unsigned char*)(TRAMP);			\
+    unsigned int  __fun = (unsigned int)(FUN);				\

_oldver/python35/files/patch-issue20210

@@ -0,0 +1,68 @@
+# Backport patch 0001 from Issue #20210
+# Issue: https://bugs.python.org/issue20210
+# By: Thomas Petazzoni
+
+--- ./Makefile.pre.in.orig	2014-03-24 22:45:17.908886504 +1100
++++ ./Makefile.pre.in	2014-03-24 22:47:55.503779805 +1100
+@@ -172,6 +172,8 @@
+ # configure script arguments
+ CONFIG_ARGS=	@CONFIG_ARGS@
+ 
++# disabled extensions
++DISABLED_EXTENSIONS=	@DISABLED_EXTENSIONS@
+ 
+ # Subdirectories with code
+ SRCDIRS= 	@SRCDIRS@
+@@ -555,6 +557,7 @@
+ 	esac; \
+ 	$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
+ 		_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
++		DISABLED_EXTENSIONS="$(DISABLED_EXTENSIONS)" \
+ 		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
+ 
+ # Build static library
+@@ -1352,7 +1355,8 @@
+ # Install the dynamically loadable modules
+ # This goes into $(exec_prefix)
+ sharedinstall: sharedmods
+-	$(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \
++	$(RUNSHARED) DISABLED_EXTENSIONS="$(DISABLED_EXTENSIONS)" \
++		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \
+ 	   	--prefix=$(prefix) \
+ 		--install-scripts=$(BINDIR) \
+ 		--install-platlib=$(DESTSHARED) \
+--- ./configure.ac.orig	2014-03-24 22:48:10.442551831 +1100
++++ ./configure.ac	2014-03-24 22:48:42.059827384 +1100
+@@ -2331,6 +2331,8 @@
+ 
+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+ 
++AC_SUBST(DISABLED_EXTENSIONS)
++
+ # Check for use of the system expat library
+ AC_MSG_CHECKING(for --with-system-expat)
+ AC_ARG_WITH(system_expat,
+--- configure.orig	2015-03-01 13:57:08.000000000 +0300
++++ configure	2015-03-01 13:57:30.000000000 +0300
+@@ -650,6 +650,7 @@
+ TCLTK_LIBS
+ TCLTK_INCLUDES
+ LIBFFI_INCLUDEDIR
++DISABLED_EXTENSIONS
+ PKG_CONFIG_LIBDIR
+ PKG_CONFIG_PATH
+ PKG_CONFIG
+--- ./setup.py.orig	2014-03-24 22:48:48.495472513 +1100
++++ ./setup.py	2014-03-24 22:49:20.076122201 +1100
+@@ -33,7 +33,10 @@
+ COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS"))
+ 
+ # This global variable is used to hold the list of modules to be disabled.
+-disabled_module_list = []
++try:
++    disabled_module_list = sysconfig.get_config_var("DISABLED_EXTENSIONS").split(" ")
++except KeyError:
++    disabled_module_list = list()
+ 
+ def add_dir_to_list(dirlist, dir):
+     """Add the directory 'dir' to the list 'dirlist' (after any relative

_oldver/python35/files/patch-issue30622

@@ -0,0 +1,145 @@
+From b2d096bd2a5ff86e53c25d00ee5fa097b36bf1d8 Mon Sep 17 00:00:00 2001
+From: Melvyn Sopacua <melvyn-sopacua@users.noreply.github.com>
+Date: Mon, 4 Sep 2017 23:35:15 +0200
+Subject: [PATCH] bpo-30622: Change NPN detection: (#2079)
+
+* Change NPN detection:
+
+Version breakdown, support disabled (pre-patch/post-patch):
+- pre-1.0.1: OPENSSL_NPN_NEGOTIATED will not be defined -> False/False
+- 1.0.1 and 1.0.2: OPENSSL_NPN_NEGOTIATED will not be defined ->
+False/False
+- 1.1.0+: OPENSSL_NPN_NEGOTIATED will be defined and
+OPENSSL_NO_NEXTPROTONEG will be defined -> True/False
+
+Version breakdown support enabled (pre-patch/post-patch):
+- pre-1.0.1: OPENSSL_NPN_NEGOTIATED will not be defined -> False/False
+- 1.0.1 and 1.0.2: OPENSSL_NPN_NEGOTIATED will be defined and
+OPENSSL_NO_NEXTPROTONEG will not be defined -> True/True
+- 1.1.0+: OPENSSL_NPN_NEGOTIATED will be defined and
+OPENSSL_NO_NEXTPROTONEG will not be defined -> True/True
+
+* Refine NPN guard:
+
+- If NPN is disabled, but ALPN is available we need our callback
+- Make clinic's ssl behave the same way
+
+This created a working ssl module for me, with NPN disabled and ALPN
+enabled for OpenSSL 1.1.0f.
+
+Concerns to address:
+The initial commit for NPN support into OpenSSL [1], had the
+OPENSSL_NPN_* variables defined inside the OPENSSL_NO_NEXTPROTONEG
+guard. The question is if that ever made it into a release.
+This would need an ugly hack, something like:
+
+	#if defined(OPENSSL_NO_NEXTPROTONEG) && \
+		!defined(OPENSSL_NPN_NEGOTIATED)
+	#	define OPENSSL_NPN_UNSUPPORTED 0
+	#	define OPENSSL_NPN_NEGOTIATED 1
+	#	define OPENSSL_NPN_NO_OVERLAP 2
+	#endif
+
+[1] https://github.com/openssl/openssl/commit/68b33cc5c7
+
+--- Modules/_ssl.c.orig	2018-02-04 23:40:56 UTC
++++ Modules/_ssl.c
+@@ -260,7 +260,7 @@ static unsigned int _ssl_locks_count = 0
+ typedef struct {
+     PyObject_HEAD
+     SSL_CTX *ctx;
+-#ifdef OPENSSL_NPN_NEGOTIATED
++#if defined(OPENSSL_NPN_NEGOTIATED) && !defined(OPENSSL_NO_NEXTPROTONEG)
+     unsigned char *npn_protocols;
+     int npn_protocols_len;
+ #endif
+@@ -1605,7 +1605,7 @@ _ssl__SSLSocket_version_impl(PySSLSocket
+     return PyUnicode_FromString(version);
+ }
+ 
+-#ifdef OPENSSL_NPN_NEGOTIATED
++#if defined(OPENSSL_NPN_NEGOTIATED) && !defined(OPENSSL_NO_NEXTPROTONEG)
+ /*[clinic input]
+ _ssl._SSLSocket.selected_npn_protocol
+ [clinic start generated code]*/
+@@ -2375,7 +2375,7 @@ _ssl__SSLContext_impl(PyTypeObject *type
+         return NULL;
+     }
+     self->ctx = ctx;
+-#ifdef OPENSSL_NPN_NEGOTIATED
++#if defined(OPENSSL_NPN_NEGOTIATED) && !defined(OPENSSL_NO_NEXTPROTONEG)
+     self->npn_protocols = NULL;
+ #endif
+ #ifdef HAVE_ALPN
+@@ -2469,7 +2469,7 @@ context_dealloc(PySSLContext *self)
+     PyObject_GC_UnTrack(self);
+     context_clear(self);
+     SSL_CTX_free(self->ctx);
+-#ifdef OPENSSL_NPN_NEGOTIATED
++#if defined(OPENSSL_NPN_NEGOTIATED) && !defined(OPENSSL_NO_NEXTPROTONEG)
+     PyMem_FREE(self->npn_protocols);
+ #endif
+ #ifdef HAVE_ALPN
+@@ -2501,7 +2501,7 @@ _ssl__SSLContext_set_ciphers_impl(PySSLC
+     Py_RETURN_NONE;
+ }
+ 
+-#ifdef OPENSSL_NPN_NEGOTIATED
++#if defined(OPENSSL_NPN_NEGOTIATED) && !defined(OPENSSL_NO_NEXTPROTONEG) || defined(HAVE_ALPN)
+ static int
+ do_protocol_selection(int alpn, unsigned char **out, unsigned char *outlen,
+                       const unsigned char *server_protocols, unsigned int server_protocols_len,
+@@ -2525,7 +2525,9 @@ do_protocol_selection(int alpn, unsigned
+ 
+     return SSL_TLSEXT_ERR_OK;
+ }
++#endif
+ 
++#if defined(OPENSSL_NPN_NEGOTIATED) && !defined(OPENSSL_NO_NEXTPROTONEG)
+ /* this callback gets passed to SSL_CTX_set_next_protos_advertise_cb */
+ static int
+ _advertiseNPN_cb(SSL *s,
+@@ -2568,7 +2570,7 @@ _ssl__SSLContext__set_npn_protocols_impl
+                                          Py_buffer *protos)
+ /*[clinic end generated code: output=72b002c3324390c6 input=319fcb66abf95bd7]*/
+ {
+-#ifdef OPENSSL_NPN_NEGOTIATED
++#if defined(OPENSSL_NPN_NEGOTIATED) && !defined(OPENSSL_NO_NEXTPROTONEG)
+     PyMem_Free(self->npn_protocols);
+     self->npn_protocols = PyMem_Malloc(protos->len);
+     if (self->npn_protocols == NULL)
+@@ -4843,7 +4845,7 @@ PyInit__ssl(void)
+     Py_INCREF(r);
+     PyModule_AddObject(m, "HAS_ECDH", r);
+ 
+-#ifdef OPENSSL_NPN_NEGOTIATED
++#if defined(OPENSSL_NPN_NEGOTIATED) && !defined(OPENSSL_NO_NEXTPROTONEG)
+     r = Py_True;
+ #else
+     r = Py_False;
+--- Modules/clinic/_ssl.c.h.orig	2018-02-04 23:40:56 UTC
++++ Modules/clinic/_ssl.c.h
+@@ -130,7 +130,7 @@ _ssl__SSLSocket_version(PySSLSocket *sel
+     return _ssl__SSLSocket_version_impl(self);
+ }
+ 
+-#if defined(OPENSSL_NPN_NEGOTIATED)
++#if (defined(OPENSSL_NPN_NEGOTIATED) && !defined(OPENSSL_NO_NEXTPROTONEG))
+ 
+ PyDoc_STRVAR(_ssl__SSLSocket_selected_npn_protocol__doc__,
+ "selected_npn_protocol($self, /)\n"
+@@ -149,7 +149,7 @@ _ssl__SSLSocket_selected_npn_protocol(Py
+     return _ssl__SSLSocket_selected_npn_protocol_impl(self);
+ }
+ 
+-#endif /* defined(OPENSSL_NPN_NEGOTIATED) */
++#endif /* (defined(OPENSSL_NPN_NEGOTIATED) && !defined(OPENSSL_NO_NEXTPROTONEG)) */
+ 
+ #if defined(HAVE_ALPN)
+ 
+@@ -1102,4 +1102,4 @@ exit:
+ #ifndef _SSL_ENUM_CRLS_METHODDEF
+     #define _SSL_ENUM_CRLS_METHODDEF
+ #endif /* !defined(_SSL_ENUM_CRLS_METHODDEF) */
+-/*[clinic end generated code: output=6fb10594d8351dc5 input=a9049054013a1b77]*/
++/*[clinic end generated code: output=8f9d480117387554 input=a9049054013a1b77]*/

_oldver/python35/pkg-descr

@@ -0,0 +1,4 @@
+Python is an interpreted object-oriented programming language, and is
+often compared to Tcl, Perl or Scheme.
+
+WWW: http://www.python.org/