A new quarter of ports, a new (unfixed) version of m2crypto!

install/ports/emulab-py-m2crypto/Makefile

@@ -12,18 +12,22 @@ PKGORIGIN=		misc/emulab-py-m2crypto
 .include "../../security/py-m2crypto/Makefile"
 
 # Our extra patch
-.if ${PORTVERSION} == "0.29.0"
+.if ${PORTVERSION} == "0.30.1"
+EXTRA_PATCHES=  $(FILESDIR)/emulab-patch-SSL-Connection-30
+.else
+.if (${PORTVERSION} == "0.29.0" || ${PORTVERSION} == "0.30.1")
 EXTRA_PATCHES=  $(FILESDIR)/emulab-patch-SSL-Connection-29
 .else
 EXTRA_PATCHES=  $(FILESDIR)/emulab-patch-SSL-Connection
 .endif
+.endif
 
 .if ${PORTVERSION} == "0.25.1"
 # Missing dependency for 0.25
 RUN_DEPENDS+=   ${PYTHON_PKGNAMEPREFIX}typing>0:${PORTSDIR}/devel/py-typing
 .endif
 
-.if (${PORTVERSION} == "0.25.1" || ${PORTVERSION} == "0.26.0" || ${PORTVERSION} == "0.26.4" || ${PORTVERSION} == "0.29.0")
-# Fix bug in 0.25.1 and 0.26
+.if !(${PORTVERSION} == "0.22.3" || ${PORTVERSION} == "0.22.5" || ${PORTVERSION} == "0.24.0")
+# Fix bug in 0.25.1 and above
 EXTRA_PATCHES+= $(FILESDIR)/emulab-patch-httpslib
 .endif

install/ports/emulab-py-m2crypto/distinfo

@@ -12,3 +12,5 @@ SHA256 (M2Crypto-0.26.4.tar.gz) = 5cae7acc0b34821f8c0ddf6665e482893fe1f198ad6379
 SIZE (M2Crypto-0.26.4.tar.gz) = 1116587
 SHA256 (M2Crypto-0.29.0.tar.gz) = a0fea2c5ab913e42864d1ccbaee5878c23886368b606e923609fda4ce37d26c0
 SIZE (M2Crypto-0.29.0.tar.gz) = 1269694
+SHA256 (M2Crypto-0.30.1.tar.gz) = a1b2751cdadc6afac3df8a5799676b7b7c67a6ad144bb62d38563062e7cd3fc6
+SIZE (M2Crypto-0.30.1.tar.gz) = 1272599

install/ports/emulab-py-m2crypto/files/emulab-patch-SSL-Connection-30

+--- M2Crypto/SSL/Connection.py.orig	2018-02-22 15:43:29.000000000 -0700
++++ M2Crypto/SSL/Connection.py	2018-04-04 15:57:44.341502000 -0600
+@@ -32,11 +32,15 @@
+     # type: (*Any, **Any) -> int
+     return 1
+ 
++def _clientPostConnectionCheck(*args, **kw):
++    # type: (*Any, **Any) -> int
++    return 1
++
+ 
+ class Connection(object):
+     """An SSL connection."""
+ 
+-    clientPostConnectionCheck = Checker.Checker()
++    clientPostConnectionCheck = _clientPostConnectionCheck
+     serverPostConnectionCheck = _serverPostConnectionCheck
+ 
+     m2_bio_free = m2.bio_free