From owner-svn-ports-head@freebsd.org Fri May 17 08:23:46 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EA374158B8B2; Fri, 17 May 2019 08:23:45 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8B73D68360; Fri, 17 May 2019 08:23:45 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 641895B64; Fri, 17 May 2019 08:23:45 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x4H8NjbP081963; Fri, 17 May 2019 08:23:45 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x4H8Njt7081961; Fri, 17 May 2019 08:23:45 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201905170823.x4H8Njt7081961@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Fri, 17 May 2019 08:23:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r501840 - in head/security/py-certstream: . files X-SVN-Group: ports-head X-SVN-Commit-Author: antoine X-SVN-Commit-Paths: in head/security/py-certstream: . files X-SVN-Commit-Revision: 501840 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 8B73D68360 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.97)[-0.972,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 May 2019 08:23:46 -0000 Author: antoine Date: Fri May 17 08:23:44 2019 New Revision: 501840 URL: https://svnweb.freebsd.org/changeset/ports/501840 Log: Unbreak at runtime after py-websocket-client upgrade Added: head/security/py-certstream/files/ head/security/py-certstream/files/patch-certstream_core.py (contents, props changed) Modified: head/security/py-certstream/Makefile Modified: head/security/py-certstream/Makefile ============================================================================== --- head/security/py-certstream/Makefile Fri May 17 08:22:27 2019 (r501839) +++ head/security/py-certstream/Makefile Fri May 17 08:23:44 2019 (r501840) @@ -2,7 +2,7 @@ PORTNAME= certstream PORTVERSION= 1.10 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -17,9 +17,10 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}termcolor>=0:dev RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}termcolor>=0:devel/py-termcolor@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}websocket-client>=0:www/py-websocket-client@${PY_FLAVOR} -NO_ARCH= yes USES= python USE_PYTHON= distutils autoplist concurrent + +NO_ARCH= yes post-patch: @${REINPLACE_CMD} 's,==.*,,' ${WRKSRC}/requirements.txt Added: head/security/py-certstream/files/patch-certstream_core.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/py-certstream/files/patch-certstream_core.py Fri May 17 08:23:44 2019 (r501840) @@ -0,0 +1,32 @@ +--- certstream/core.py.orig 2018-03-02 11:20:56 UTC ++++ certstream/core.py +@@ -27,12 +27,12 @@ class CertStreamClient(WebSocketApp): + on_error=self._on_error, + ) + +- def _on_open(self, instance): ++ def _on_open(self): + logging.info("Connection established to CertStream! Listening for events...") + if self.on_open_handler: +- self.on_open_handler(instance) ++ self.on_open_handler() + +- def _on_message(self, _, message): ++ def _on_message(self, message): + frame = json.loads(message) + + if frame.get('message_type', None) == "heartbeat" and self.skip_heartbeats: +@@ -40,11 +40,11 @@ class CertStreamClient(WebSocketApp): + + self.message_callback(frame, self._context) + +- def _on_error(self, instance, ex): ++ def _on_error(self, ex): + if type(ex) == KeyboardInterrupt: + raise + if self.on_error_handler: +- self.on_error_handler(instance, ex) ++ self.on_error_handler(ex) + logging.error("Error connecting to CertStream - {} - Sleeping for a few seconds and trying again...".format(ex)) + + def listen_for_events(message_callback, url, skip_heartbeats=True, setup_logger=True, on_open=None, on_error=None, **kwargs):