Hi,

this is the diff to be in adequation with upstream.

Ok?

Cheers,

Remi.
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/python/3.5/Makefile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 Makefile
--- Makefile    24 Sep 2015 19:16:42 -0000      1.2
+++ Makefile    27 Sep 2015 08:28:20 -0000
@@ -7,7 +7,7 @@
 
 VERSION =              3.5
 PATCHLEVEL =           .0
-REVISION-main =                0
+REVISION-main =                1
 SHARED_LIBS =          python3.5m 0.0
 VERSION_SPEC =         >=3.5,<3.6
 
Index: patches/patch-Modules__ssl_c
===================================================================
RCS file: /cvs/ports/lang/python/3.5/patches/patch-Modules__ssl_c,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-Modules__ssl_c
--- patches/patch-Modules__ssl_c        23 Sep 2015 19:23:57 -0000      1.1.1.1
+++ patches/patch-Modules__ssl_c        27 Sep 2015 08:28:20 -0000
@@ -1,6 +1,7 @@
 $OpenBSD: patch-Modules__ssl_c,v 1.1.1.1 2015/09/23 19:23:57 rpointel Exp $
 
 http://bugs.python.org/issue23329
+commited upstream: https://hg.python.org/cpython/rev/38a5b0f6531b
 
 --- Modules/_ssl.c.orig        Sun Sep 13 13:41:24 2015
 +++ Modules/_ssl.c     Wed Sep 23 21:15:44 2015
Index: patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/lang/python/3.5/patches/patch-configure_ac,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-configure_ac
--- patches/patch-configure_ac  23 Sep 2015 19:23:57 -0000      1.1.1.1
+++ patches/patch-configure_ac  27 Sep 2015 08:28:20 -0000
@@ -10,14 +10,3 @@ $OpenBSD: patch-configure_ac,v 1.1.1.1 2
  
  # The later defininition of _XOPEN_SOURCE disables certain features
  # on Linux, so we need _GNU_SOURCE to re-enable them (makedev, tm_zone).
-@@ -2429,6 +2429,10 @@ AC_CHECK_LIB(dld, shl_load)     # Dynamic linking for 
HP-U
- AC_CHECK_LIB(crypto, RAND_egd,
-              AC_DEFINE(HAVE_RAND_EGD, 1,
-              [Define if the libcrypto has RAND_egd]))
-+AC_CHECK_LIB(ssl, ssl_alpn,
-+             AC_DEFINE(HAVE_ALPN, 1,
-+             [Define if the libssl has ALPN support]))
-+
- 
- # only check for sem_init if thread support is requested
- if test "$with_threads" = "yes" -o -z "$with_threads"; then

Reply via email to