From nobody Fri Aug 16 11:54:34 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WlgQN4FvZz5SmDy; Fri, 16 Aug 2024 11:54:36 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WlgQL5t0Fz4G7l; Fri, 16 Aug 2024 11:54:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723809274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sxqv5Wl0te/UTM85kWNKPHXlugXiP60+HBv4LBjabnA=; b=LikMS0c0uI/PvUfwAfPahkG13R++ClNmYHOO4LE0zOm4n/bEbsqRTHSoXjIQhgP4VCBJuz 3OC5j5BkAAKRPq8mhNkFgghY2EnhWZkN0sryztq9DC7Sj0CwQS+iyG61Ip/VkOBs3QrS50 HPKCqOFV0ViZY9yawaz+/XuGSdKfCz8DYvSxj29JSiTh6Oreo5wkN1HX7efzV85t2yfaoh e2h9Oy+/lJHSL8DSHCj4kffrrNXK1lguJlqF06REcRNY2G5G9HDNBtNbn4iRq++Y8wbC+q s4q18Y9qtA5WGVv/H6YxFiG/35Wsl4Lk4KECZHTKjchD89IdYYAh1T1H0fOWeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723809274; a=rsa-sha256; cv=none; b=d8btuME6LbSnQ0eSFQLHcxsOpvov/BIaQsPktuSXIcHk0lAquf32FOrlbp4kj5/XbgDYD3 bSoRkBv+Y/TjJquT194jFARAs7fhDa9tQ/g3rq9IlOq/hqZalQ1/LMQJDB3ZpdMczxipvo w4WkR8xh0ce5fGE0H/a9VnLDKWfbG/0FFEX192gB4jh7qmDfZhHDZJp+CHp/ZEBm0rYb2b 9/Acm2HmVziXbhwCQTKjOTk+3iYUohuyuSC6OsUJx3EYGOMxn2jfvUIlyQ5OX6nNYN5BNN 6H6ryBzEgzA5kKq+06Z6sfJodi3V3Fu7CLDmgpEXqr+kGHZFiD7Cz3x26f+ifQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723809274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sxqv5Wl0te/UTM85kWNKPHXlugXiP60+HBv4LBjabnA=; b=vpMPJlHGcDyMMLXx0Zi+z1+X/GSnhVyTIgLGvvh0Mu56M3A0NbllxrCP0S7b4nDpyG2HJu Pi96QisYP2UXkUZn6dRneJkTEj/VuhYBVHV9/mIN9alkVD+RYYrXRvDkEWJrv1T+TOGJgb Dz5rTJM7t/UjvUkpDIUiUAlQNML0beEDO9HWEGAOxo+cC9kOkK+57v9KroYFX7y9Cf6y7b ZfoUaN2LT9YApRtAecLQJqfRb0Cj3CyA9iBL87mV0/Wji/Tz7B81vVIGG0IMHfdWLtUqe+ OJix2E66uzCMQ8GivG4+HZQEhS5Vo3OSdcNn71F/8XvUoIFzUXuQgUAQz2NYGA== 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 4WlgQL5B8yz156H; Fri, 16 Aug 2024 11:54:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47GBsYFX005877; Fri, 16 Aug 2024 11:54:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47GBsYN8005874; Fri, 16 Aug 2024 11:54:34 GMT (envelope-from git) Date: Fri, 16 Aug 2024 11:54:34 GMT Message-Id: <202408161154.47GBsYN8005874@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: f02e397c3be1 - main - security/py-ssh-audit: fix hang on runtime List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f02e397c3be1c20d736e3412ca82f14ba14b9e8c Auto-Submitted: auto-generated The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=f02e397c3be1c20d736e3412ca82f14ba14b9e8c commit f02e397c3be1c20d736e3412ca82f14ba14b9e8c Author: Piotr Kubaj AuthorDate: 2024-08-16 10:32:11 +0000 Commit: Piotr Kubaj CommitDate: 2024-08-16 11:54:25 +0000 security/py-ssh-audit: fix hang on runtime PR: 280827 Submitted by: michaelo --- security/py-ssh-audit/Makefile | 1 + .../files/patch-src_ssh__audit_dheat.py | 23 ++++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/security/py-ssh-audit/Makefile b/security/py-ssh-audit/Makefile index db5af9c0d653..db7b92d0d2a2 100644 --- a/security/py-ssh-audit/Makefile +++ b/security/py-ssh-audit/Makefile @@ -1,6 +1,7 @@ PORTNAME= ssh-audit DISTVERSIONPREFIX= v DISTVERSION= 3.2.0 +PORTREVISION= 1 CATEGORIES= security PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/security/py-ssh-audit/files/patch-src_ssh__audit_dheat.py b/security/py-ssh-audit/files/patch-src_ssh__audit_dheat.py new file mode 100644 index 000000000000..0049edb94d28 --- /dev/null +++ b/security/py-ssh-audit/files/patch-src_ssh__audit_dheat.py @@ -0,0 +1,23 @@ +--- src/ssh_audit/dheat.py.orig 2024-08-16 09:16:28 UTC ++++ src/ssh_audit/dheat.py +@@ -21,6 +21,7 @@ + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + """ ++import errno + import multiprocessing + import os + import queue +@@ -432,10 +433,10 @@ class DHEat: + # out.d("Creating socket (%u of %u already exist)..." % (len(socket_dict), concurrent_sockets), write_now=True) + ret = s.connect_ex((aconf.host, aconf.port)) + num_attempted_connections += 1 +- if ret in [0, 115]: # Check if connection is successful or EINPROGRESS. ++ if ret in [0, errno.EINPROGRESS]: + socket_dict[s] = now + else: +- out.d("connect_ex() returned: %d" % ret, write_now=True) ++ out.d("connect_ex() returned: %s (%d)" % (os.strerror(ret), ret), write_now=True) + + # out.d("Calling select() on %u sockets..." % len(socket_dict), write_now=True) + socket_list: List[socket.socket] = [*socket_dict] # Get a list of sockets from the dictionary.