From owner-dev-commits-ports-main@freebsd.org Sat May 22 06:02:37 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D63D4644AFD; Sat, 22 May 2021 06:02:37 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FnCYn5Hpfz4k2N; Sat, 22 May 2021 06:02:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 93C651F807; Sat, 22 May 2021 06:02:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14M62b6S020731; Sat, 22 May 2021 06:02:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14M62bMe020730; Sat, 22 May 2021 06:02:37 GMT (envelope-from git) Date: Sat, 22 May 2021 06:02:37 GMT Message-Id: <202105220602.14M62bMe020730@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: c875ddba98af - main - security/zeronet: Fix runtime by replacing the deprecated function MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c875ddba98af41ee5a88f221f340e7a5d563629c Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 May 2021 06:02:37 -0000 The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=c875ddba98af41ee5a88f221f340e7a5d563629c commit c875ddba98af41ee5a88f221f340e7a5d563629c Author: Yuri Victorovich AuthorDate: 2021-05-22 06:00:53 +0000 Commit: Yuri Victorovich CommitDate: 2021-05-22 06:02:35 +0000 security/zeronet: Fix runtime by replacing the deprecated function Python-38 has cgi.parse_qsl deprecated. It is replaced with urllib.parse.parse_qsl. --- security/zeronet/Makefile | 2 +- security/zeronet/files/patch-src_Ui_UiServer.py | 31 +++++++++++++++++-------- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/security/zeronet/Makefile b/security/zeronet/Makefile index f6fc805f39d2..25b553c71621 100644 --- a/security/zeronet/Makefile +++ b/security/zeronet/Makefile @@ -3,7 +3,7 @@ PORTNAME= zeronet DISTVERSIONPREFIX= v DISTVERSION= 0.7.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security net-p2p MAINTAINER= yuri@FreeBSD.org diff --git a/security/zeronet/files/patch-src_Ui_UiServer.py b/security/zeronet/files/patch-src_Ui_UiServer.py index 8db78e50e5a4..cd9ce3363e4f 100644 --- a/security/zeronet/files/patch-src_Ui_UiServer.py +++ b/security/zeronet/files/patch-src_Ui_UiServer.py @@ -1,6 +1,26 @@ +- replace the deprecated function cgi.parse_qsl -> urllib.parse.parse_qsl +- alter message about debugging + --- src/Ui/UiServer.py.orig 2019-09-04 18:16:57 UTC +++ src/Ui/UiServer.py -@@ -133,7 +133,7 @@ class UiServer: +@@ -4,6 +4,7 @@ import cgi + import socket + import sys + import gevent ++import urllib + + from gevent.pywsgi import WSGIServer + from gevent.pywsgi import WSGIHandler +@@ -95,7 +96,7 @@ class UiServer: + def handleRequest(self, env, start_response): + path = bytes(env["PATH_INFO"], "raw-unicode-escape").decode("utf8") + if env.get("QUERY_STRING"): +- get = dict(cgi.parse_qsl(env['QUERY_STRING'])) ++ get = dict(urllib.parse.parse_qsl(env['QUERY_STRING'])) + else: + get = {} + ui_request = UiRequest(self, get, env, start_response) +@@ -133,7 +134,7 @@ class UiServer: from werkzeug.debug import DebuggedApplication handler = DebuggedApplication(self.handleRequest, evalex=True) except Exception as err: @@ -9,12 +29,3 @@ from Debug import DebugReloader self.log.write = lambda msg: self.log.debug(msg.strip()) # For Wsgi access.log self.log.info("--------------------------------------") -@@ -192,7 +192,7 @@ class UiServer: - - self.server.socket.close() - self.server.stop() -- self.running = False -+ time.sleep(1) - time.sleep(1) - - def updateWebsocket(self, **kwargs):