Hi!
Below follow updates to py-hg-git and py-dulwich. Also, as hinted by
dulwich tests, py-gevent and py-geventhttpclient defaulted to SSLv3 for
secure connections, and this is not available with python from ports.
Comments? OKs?
--
Dmitrij D. Czarkoff
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/py-dulwich/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile 7 Apr 2015 15:49:25 -0000 1.18
+++ Makefile 19 Sep 2015 09:37:56 -0000
@@ -2,23 +2,22 @@
COMMENT = pure Python implementation of Git file formats and
protocols
-MODPY_EGG_VERSION = 0.10.1a
+MODPY_EGG_VERSION = 0.11.1
DISTNAME = dulwich-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
CATEGORIES = devel
-HOMEPAGE = http://samba.org/~jelmer/dulwich/
+HOMEPAGE = https://www.dulwich.io/
-MAINTAINER = Dmitrij D. Czarkoff <czark...@gmail.com>
+MAINTAINER = Dmitrij D. Czarkoff <czark...@openbsd.org>
# GPLv2
PERMIT_PACKAGE_CDROM = Yes
WANTLIB += pthread ${MODPY_WANTLIB}
-MODPY_PI = Yes
-
+MASTER_SITES = ${HOMEPAGE:=releases/}
MODULES = lang/python
MODPY_SETUPTOOLS = Yes
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_2}
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/py-dulwich/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 7 Apr 2015 05:09:29 -0000 1.5
+++ distinfo 19 Sep 2015 03:34:59 -0000
@@ -1,2 +1,2 @@
-SHA256 (dulwich-0.10.1a.tar.gz) = ZmYAq16wttUxh57g9l3+/XG84uIas5EMKPd4nhW2Mws=
-SIZE (dulwich-0.10.1a.tar.gz) = 272688
+SHA256 (dulwich-0.11.1.tar.gz) = hO/tkwETec29yV7oEXnVmr+D7wVruuPRxS006l25e8M=
+SIZE (dulwich-0.11.1.tar.gz) = 289232
Index: patches/patch-dulwich_tests_compat_utils_py
===================================================================
RCS file: patches/patch-dulwich_tests_compat_utils_py
diff -N patches/patch-dulwich_tests_compat_utils_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-dulwich_tests_compat_utils_py 19 Sep 2015 03:54:31 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- dulwich/tests/compat/utils.py.orig Sat Sep 19 05:54:03 2015
++++ dulwich/tests/compat/utils.py Sat Sep 19 05:54:24 2015
+@@ -30,6 +30,8 @@ import sys
+ import tempfile
+ import time
+
++subprocess._has_poll = False
++
+ from dulwich.repo import Repo
+ from dulwich.protocol import TCP_GIT_PORT
+
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/py-dulwich/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 23 Mar 2015 11:06:39 -0000 1.4
+++ pkg/PLIST 19 Sep 2015 09:38:19 -0000
@@ -7,6 +7,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/dulwich-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/dulwich-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/dulwich-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/dulwich-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/pbr.json
lib/python${MODPY_VERSION}/site-packages/dulwich-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/dulwich/__init__.py
lib/python${MODPY_VERSION}/site-packages/dulwich/__init__.pyc
@@ -156,6 +157,9 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/dulwich/tests/data/repos/empty.git/refs/heads/.gitignore
lib/python${MODPY_VERSION}/site-packages/dulwich/tests/data/repos/empty.git/refs/tags/
lib/python${MODPY_VERSION}/site-packages/dulwich/tests/data/repos/empty.git/refs/tags/.gitignore
+lib/python${MODPY_VERSION}/site-packages/dulwich/tests/data/repos/issue88_expect_ack_nak_client.export
+lib/python${MODPY_VERSION}/site-packages/dulwich/tests/data/repos/issue88_expect_ack_nak_other.export
+lib/python${MODPY_VERSION}/site-packages/dulwich/tests/data/repos/issue88_expect_ack_nak_server.export
lib/python${MODPY_VERSION}/site-packages/dulwich/tests/data/repos/ooo_merge.git/
lib/python${MODPY_VERSION}/site-packages/dulwich/tests/data/repos/ooo_merge.git/HEAD
lib/python${MODPY_VERSION}/site-packages/dulwich/tests/data/repos/ooo_merge.git/objects/
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/py-gevent/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile 2 Apr 2015 14:21:14 -0000 1.4
+++ Makefile 19 Sep 2015 09:31:17 -0000
@@ -5,7 +5,7 @@ COMMENT = network library for easy and s
MODPY_EGG_VERSION = 0.13.7
DISTNAME = gevent-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
-REVISION = 0
+REVISION = 1
CATEGORIES = devel
HOMEPAGE = http://www.gevent.org/
Index: patches/patch-gevent_ssl_py
===================================================================
RCS file: patches/patch-gevent_ssl_py
diff -N patches/patch-gevent_ssl_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-gevent_ssl_py 19 Sep 2015 06:50:51 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- 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: Makefile
===================================================================
RCS file: /cvs/ports/net/py-geventhttpclient/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile 12 Oct 2014 20:45:56 -0000 1.1.1.1
+++ Makefile 19 Sep 2015 09:23:33 -0000
@@ -5,10 +5,11 @@ COMMENT = high performance, concurrent
MODPY_EGG_VERSION = 1.1.0
DISTNAME = py-geventhttpclient-${MODPY_EGG_VERSION}
CATEGORIES = net devel
+REVISION = 0
HOMEPAGE = https://github.com/gwik/geventhttpclient
-MAINTAINER = Dmitrij D. Czarkoff <czark...@gmail.com>
+MAINTAINER = Dmitrij D. Czarkoff <czark...@openbsd.org>
# MIT
PERMIT_PACKAGE_CDROM = Yes
Index: patches/patch-src_geventhttpclient_connectionpool_py
===================================================================
RCS file: patches/patch-src_geventhttpclient_connectionpool_py
diff -N patches/patch-src_geventhttpclient_connectionpool_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_geventhttpclient_connectionpool_py 19 Sep 2015
09:21:28 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/geventhttpclient/connectionpool.py.orig Sat Sep 19 11:20:54 2015
++++ src/geventhttpclient/connectionpool.py Sat Sep 19 11:21:19 2015
+@@ -149,7 +149,7 @@ class ConnectionPool(object):
+ class SSLConnectionPool(ConnectionPool):
+
+ default_options = {
+- 'ssl_version': gevent.ssl.PROTOCOL_SSLv3,
++ 'ssl_version': gevent.ssl.PROTOCOL_SSLv23,
+ 'ca_certs': CA_CERTS,
+ 'cert_reqs': gevent.ssl.CERT_REQUIRED
+ }
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/py-hg-git/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile 18 Mar 2015 18:04:55 -0000 1.17
+++ Makefile 19 Sep 2015 10:53:39 -0000
@@ -2,7 +2,7 @@
COMMENT = mercurial extension to work with git repositories
-MODPY_EGG_VERSION = 0.8.0
+MODPY_EGG_VERSION = 0.8.2
DISTNAME = py-hg-git-${MODPY_EGG_VERSION}
CATEGORIES = devel
@@ -20,9 +20,9 @@ DISTFILES = ${DISTNAME}{${MODPY_EGG_VER
MODULES = lang/python
MODPY_SETUPTOOLS = Yes
-WRKDIST = ${WRKDIR}/durin42-hg-git-cf3dafce0611
+WRKDIST = ${WRKDIR}/durin42-hg-git-e183fdc198f0
-RUN_DEPENDS = devel/py-dulwich>=0.9.5 \
+RUN_DEPENDS = devel/py-dulwich>=0.10.1 \
devel/mercurial
TEST_DEPENDS = ${RUN_DEPENDS} \
archivers/bzip2 \
@@ -34,7 +34,7 @@ pre-test:
ln -s ${MODPY_BIN} ${WRKDIR}/bin/python
do-test:
- cd ${WRKSRC}/tests && ${SETENV} ${MAKE_ENV} ${MODPY_BIN} run-tests.py \
- --with-hg=${LOCALBASE}/bin/hg
+ cd ${WRKSRC}/tests && ${SETENV} ${MAKE_ENV} PYTHONPATH="${WRKSRC}" \
+ ${MODPY_BIN} run-tests.py --with-hg=${LOCALBASE}/bin/hg
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/py-hg-git/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo 18 Mar 2015 18:04:55 -0000 1.8
+++ distinfo 19 Sep 2015 09:42:42 -0000
@@ -1,2 +1,2 @@
-SHA256 (py-hg-git-0.8.0.tar.gz) = 2Wy/umPMJw62uX2sEsXPbThyokb1TO6cF4aEjz0SpBs=
-SIZE (py-hg-git-0.8.0.tar.gz) = 94205
+SHA256 (py-hg-git-0.8.2.tar.gz) = 8mAoEkp2c+Mga3HJ71sd070yqYR+DBQxvmujvRT3Sz4=
+SIZE (py-hg-git-0.8.2.tar.gz) = 99762
