Hi!
Following diff updates devel/py-gevent to version 1.0.2. It removes
SSL patches (at this point upstream doesn't force SSLv3 any more).
OK?
--
Dmitrij D. Czarkoff
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/py-gevent/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile 29 Sep 2015 10:51:53 -0000 1.6
+++ Makefile 17 Oct 2015 08:17:32 -0000
@@ -1,29 +1,31 @@
# $OpenBSD: Makefile,v 1.6 2015/09/29 10:51:53 sthen Exp $
-COMMENT = network library for easy and scalable concurrency
+COMMENT = network library for easy and scalable concurrency
-MODPY_EGG_VERSION = 0.13.7
-DISTNAME = gevent-${MODPY_EGG_VERSION}
-PKGNAME = py-${DISTNAME}
-REVISION = 2
-MAINTAINER = Dmitrij D. Czarkoff <[email protected]>
+MODPY_EGG_VERSION = 1.0.2
+DISTNAME = gevent-${MODPY_EGG_VERSION}
+PKGNAME = py-${DISTNAME}
+MAINTAINER = Dmitrij D. Czarkoff <[email protected]>
-CATEGORIES = devel
-HOMEPAGE = http://www.gevent.org/
+CATEGORIES = devel
+HOMEPAGE = http://www.gevent.org/
# MPL
PERMIT_PACKAGE_CDROM = Yes
-MODPY_PI = Yes
-
-MODULES = lang/python
+WANTLIB += ${MODPY_WANTLIB} cares ev pthread
+MODULES = lang/python
+MODPY_PI = Yes
MODPY_SETUPTOOLS = Yes
-MODPY_DISTUTILS_BUILD= build --build-base=${WRKSRC} \
- -I${LOCALBASE}/include -L${LOCALBASE}/lib
-LIB_DEPENDS = devel/libeventextra
-WANTLIB = ${MODPY_WANTLIB} event eventextra pthread
-RUN_DEPENDS = devel/py-greenlet
+LIB_DEPENDS = devel/libev \
+ net/libcares
+RUN_DEPENDS = devel/py-greenlet
+TEST_DEPENDS = ${RUN_DEPENDS}
+
+MAKE_ENV = CARES_EMBED=0 LIBEV_EMBED=0
+CFLAGS += -I/usr/local/include
+LDFLAGS += -L/usr/local/lib
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/py-gevent/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 18 Jan 2015 03:13:41 -0000 1.2
+++ distinfo 10 Oct 2015 06:08:34 -0000
@@ -1,2 +1,2 @@
-SHA256 (gevent-0.13.7.tar.gz) = B1TxQdKIn6hhkY63VIK5VydjvWYUebv8c6jCUPTqtsU=
-SIZE (gevent-0.13.7.tar.gz) = 288284
+SHA256 (gevent-1.0.2.tar.gz) = OuHKD1M93LF6qxbOZrQks/O4Vf87lQhSaRXTxrc/ujE=
+SIZE (gevent-1.0.2.tar.gz) = 1735721
Index: patches/patch-gevent_ssl_py
===================================================================
RCS file: patches/patch-gevent_ssl_py
diff -N patches/patch-gevent_ssl_py
--- patches/patch-gevent_ssl_py 23 Sep 2015 07:07:54 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-gevent_ssl_py,v 1.1 2015/09/23 07:07:54 czarkoff Exp $
---- gevent/ssl.py.orig Sat Sep 19 08:46:08 2015
-+++ gevent/ssl.py Sat Sep 19 08:50:22 2015
-@@ -419,7 +419,7 @@ def wrap_socket(sock, keyfile=None, certfile=None,
- ciphers=ciphers)
-
-
--def get_server_certificate(addr, ssl_version=PROTOCOL_SSLv3, ca_certs=None):
-+def get_server_certificate(addr, ssl_version=PROTOCOL_SSLv23, ca_certs=None):
- """Retrieve the certificate from the server at the specified address,
- and return it as a PEM-encoded string.
- If 'ca_certs' is specified, validate the server cert against it.
Index: patches/patch-setup_py
===================================================================
RCS file: patches/patch-setup_py
diff -N patches/patch-setup_py
--- patches/patch-setup_py 13 Dec 2012 20:42:45 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-setup_py,v 1.1 2012/12/13 20:42:45 landry Exp $
---- setup.py.orig Thu Dec 13 21:30:07 2012
-+++ setup.py Thu Dec 13 21:30:38 2012
-@@ -277,7 +277,7 @@ else:
- for filename in libevent_sources:
- sources.append(filename)
- else:
-- libraries = ['event']
-+ libraries = ['event', 'eventextra']
- if (libevent_source_path
- and (exists(join(libevent_source_path, ".libs"))
- or not exists(join(libevent_source_path, "configure")))):
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/py-gevent/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 17 Jul 2012 19:23:31 -0000 1.1.1.1
+++ pkg/PLIST 17 Oct 2015 08:05:32 -0000
@@ -8,6 +8,15 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/gevent-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/gevent/__init__.py
lib/python${MODPY_VERSION}/site-packages/gevent/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/gevent/_semaphore.so
+lib/python${MODPY_VERSION}/site-packages/gevent/_ssl2.py
+lib/python${MODPY_VERSION}/site-packages/gevent/_ssl2.pyc
+lib/python${MODPY_VERSION}/site-packages/gevent/_sslgte279.py
+lib/python${MODPY_VERSION}/site-packages/gevent/_sslgte279.pyc
+lib/python${MODPY_VERSION}/site-packages/gevent/_threading.py
+lib/python${MODPY_VERSION}/site-packages/gevent/_threading.pyc
+lib/python${MODPY_VERSION}/site-packages/gevent/_util.so
+lib/python${MODPY_VERSION}/site-packages/gevent/ares.so
lib/python${MODPY_VERSION}/site-packages/gevent/backdoor.py
lib/python${MODPY_VERSION}/site-packages/gevent/backdoor.pyc
lib/python${MODPY_VERSION}/site-packages/gevent/baseserver.py
@@ -15,30 +24,32 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/gevent/core.so
lib/python${MODPY_VERSION}/site-packages/gevent/coros.py
lib/python${MODPY_VERSION}/site-packages/gevent/coros.pyc
-lib/python${MODPY_VERSION}/site-packages/gevent/dns.py
-lib/python${MODPY_VERSION}/site-packages/gevent/dns.pyc
lib/python${MODPY_VERSION}/site-packages/gevent/event.py
lib/python${MODPY_VERSION}/site-packages/gevent/event.pyc
+lib/python${MODPY_VERSION}/site-packages/gevent/fileobject.py
+lib/python${MODPY_VERSION}/site-packages/gevent/fileobject.pyc
lib/python${MODPY_VERSION}/site-packages/gevent/greenlet.py
lib/python${MODPY_VERSION}/site-packages/gevent/greenlet.pyc
-lib/python${MODPY_VERSION}/site-packages/gevent/http.py
-lib/python${MODPY_VERSION}/site-packages/gevent/http.pyc
-lib/python${MODPY_VERSION}/site-packages/gevent/httplib.py
-lib/python${MODPY_VERSION}/site-packages/gevent/httplib.pyc
lib/python${MODPY_VERSION}/site-packages/gevent/hub.py
lib/python${MODPY_VERSION}/site-packages/gevent/hub.pyc
lib/python${MODPY_VERSION}/site-packages/gevent/local.py
lib/python${MODPY_VERSION}/site-packages/gevent/local.pyc
+lib/python${MODPY_VERSION}/site-packages/gevent/lock.py
+lib/python${MODPY_VERSION}/site-packages/gevent/lock.pyc
lib/python${MODPY_VERSION}/site-packages/gevent/monkey.py
lib/python${MODPY_VERSION}/site-packages/gevent/monkey.pyc
+lib/python${MODPY_VERSION}/site-packages/gevent/os.py
+lib/python${MODPY_VERSION}/site-packages/gevent/os.pyc
lib/python${MODPY_VERSION}/site-packages/gevent/pool.py
lib/python${MODPY_VERSION}/site-packages/gevent/pool.pyc
lib/python${MODPY_VERSION}/site-packages/gevent/pywsgi.py
lib/python${MODPY_VERSION}/site-packages/gevent/pywsgi.pyc
lib/python${MODPY_VERSION}/site-packages/gevent/queue.py
lib/python${MODPY_VERSION}/site-packages/gevent/queue.pyc
-lib/python${MODPY_VERSION}/site-packages/gevent/rawgreenlet.py
-lib/python${MODPY_VERSION}/site-packages/gevent/rawgreenlet.pyc
+lib/python${MODPY_VERSION}/site-packages/gevent/resolver_ares.py
+lib/python${MODPY_VERSION}/site-packages/gevent/resolver_ares.pyc
+lib/python${MODPY_VERSION}/site-packages/gevent/resolver_thread.py
+lib/python${MODPY_VERSION}/site-packages/gevent/resolver_thread.pyc
lib/python${MODPY_VERSION}/site-packages/gevent/select.py
lib/python${MODPY_VERSION}/site-packages/gevent/select.pyc
lib/python${MODPY_VERSION}/site-packages/gevent/server.py
@@ -47,10 +58,14 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/gevent/socket.pyc
lib/python${MODPY_VERSION}/site-packages/gevent/ssl.py
lib/python${MODPY_VERSION}/site-packages/gevent/ssl.pyc
-lib/python${MODPY_VERSION}/site-packages/gevent/sslold.py
-lib/python${MODPY_VERSION}/site-packages/gevent/sslold.pyc
+lib/python${MODPY_VERSION}/site-packages/gevent/subprocess.py
+lib/python${MODPY_VERSION}/site-packages/gevent/subprocess.pyc
lib/python${MODPY_VERSION}/site-packages/gevent/thread.py
lib/python${MODPY_VERSION}/site-packages/gevent/thread.pyc
+lib/python${MODPY_VERSION}/site-packages/gevent/threading.py
+lib/python${MODPY_VERSION}/site-packages/gevent/threading.pyc
+lib/python${MODPY_VERSION}/site-packages/gevent/threadpool.py
+lib/python${MODPY_VERSION}/site-packages/gevent/threadpool.pyc
lib/python${MODPY_VERSION}/site-packages/gevent/timeout.py
lib/python${MODPY_VERSION}/site-packages/gevent/timeout.pyc
lib/python${MODPY_VERSION}/site-packages/gevent/util.py
