From nobody Mon Nov 06 11:37:06 2023 X-Original-To: dev-commits-ports-all@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 4SP8TG5S7Mz50R9d; Mon, 6 Nov 2023 11:37:06 +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 4SP8TG4vW6z4d7J; Mon, 6 Nov 2023 11:37:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699270626; 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=I1pniR8OzF9+d6tXe8WZ56zCqsSPmc761znKZ1HHq+Y=; b=PR33IP7ZyBTijDyWbSvWduFMvyxgWvEPhjWDkHoGIIS44PoZH9BRyhAYsAZjtmkOkDEpH+ jLvS1qdMph37zK/RON/dTvbkgluhIvtcWtttdtIKiYZ6fQ0Jh4wqkZXFt9QPXuW7mZMVUo Ga2mi03VR9e0GeQf+SpFf+ZmjpJrwQoN+bSb6whzrdPx7xUkkVdJhAJCoLAQQL9k7tujUD gPAmVHhYAh4e041jwy6i5yq7jY3vOHSpwxr4Oas3AGKU/bGKPzBTgHnyKkohj1zpuwbVNt KJ7EmeKKNT6loxhZ6dDkmLMRJ6oERH4V1NhEJPmb2D+5iI8lyVNqY+iwwO5PAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699270626; 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=I1pniR8OzF9+d6tXe8WZ56zCqsSPmc761znKZ1HHq+Y=; b=RY3UrhPc5yo563ZaT4l63EjqyoIZa1FX1/0EY2BxkkDRYMkGRRX0flR4onuCLg+2jXqLxo 3KIH+/sjjuDz1Sqq8XSi2gGsjXBV8bXu1yJgaxvTYypSwHWlw0gtDql7Eza+wTARhDBm60 /3NoN6xcn4ZlV3qPnCrm65E/e1g0eK5g+1JD3LQmb7bB+u1lzoRdgP3m/3kPQ8H8KNxD2k 5rVUJI/u/JBy7tv3t2/qzrHrHAZaCV8dfCKHqGUi7I8mUfuA6hP/zeHb4Q5ZI47YqtssXk HVSY+I7duxDHmVqcbaaR2Ji2BxSQuBUuPWGxil6uxibbHB7GMZCBGxNRZdyp7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699270626; a=rsa-sha256; cv=none; b=mC+fIVDxlu6DMt2Tq9H4cXcd1zaI4yUrithiodJc9F4O/g5aGgKJ3rI1R6Lpr+Yz6KjnhP ISztz3XIKIk0IAJLFnmZokKhOiQwLgzM9LBCQ+H0Xi4E6H1OMxboYcivEDQiYEfLHt3Sac mC1lOc9wBWas6FzwfI4rDk0vZ6eYho9DTLBdz726DGFhMyv0orBhFwt0s1IabVDm7W42Es 2SD+Rqupox36/z2Elcw1BQYj0cToU/IMUrSnxPdbxzLG6W4atfQ6iCnOzpg/P3zMge0YvQ 7JymjdtivhMMw40MUGTMap7Hq/vOoqv3W1ZD8Lpls/9MRvOLB9PCWsY/6FxvOg== 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 4SP8TG3sRpz1596; Mon, 6 Nov 2023 11:37:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A6Bb6eb039938; Mon, 6 Nov 2023 11:37:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A6Bb6he039935; Mon, 6 Nov 2023 11:37:06 GMT (envelope-from git) Date: Mon, 6 Nov 2023 11:37:06 GMT Message-Id: <202311061137.3A6Bb6he039935@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Fernando =?utf-8?Q?Apestegu=C3=ADa?= Subject: git: efda5c514648 - main - security/sshguard: fix logging of entries with hostnames List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: efda5c514648db7c2bbacaa7a57dfa946dd9f054 Auto-Submitted: auto-generated The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=efda5c514648db7c2bbacaa7a57dfa946dd9f054 commit efda5c514648db7c2bbacaa7a57dfa946dd9f054 Author: Chris Moerz AuthorDate: 2023-11-03 08:18:27 +0000 Commit: Fernando Apesteguía CommitDate: 2023-11-06 11:36:49 +0000 security/sshguard: fix logging of entries with hostnames With work from martin@lispworks.com PR: 272249 Reported by: martin@lispworks.com Approved by: kevinz5000@gmail.com (maintainer) --- security/sshguard/Makefile | 3 +-- security/sshguard/distinfo | 6 +++--- .../sshguard/files/patch-src_blocker_sshguard__whitelist.c | 11 ----------- security/sshguard/files/patch-src_parser_attack__scanner.l | 11 +++++++++++ 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/security/sshguard/Makefile b/security/sshguard/Makefile index c1ec357278cd..c3d163ba6cab 100644 --- a/security/sshguard/Makefile +++ b/security/sshguard/Makefile @@ -1,6 +1,5 @@ PORTNAME= sshguard -PORTVERSION= 2.4.2 -PORTREVISION= 2 +PORTVERSION= 2.4.3 PORTEPOCH= 1 CATEGORIES= security MASTER_SITES= SF/sshguard/sshguard/${PORTVERSION} diff --git a/security/sshguard/distinfo b/security/sshguard/distinfo index df01aba97817..f0d1d8cc34ad 100644 --- a/security/sshguard/distinfo +++ b/security/sshguard/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1622991099 -SHA256 (sshguard-2.4.2.tar.gz) = 2770b776e5ea70a9bedfec4fd84d57400afa927f0f7522870d2dcbbe1ace37e8 -SIZE (sshguard-2.4.2.tar.gz) = 835431 +TIMESTAMP = 1698823793 +SHA256 (sshguard-2.4.3.tar.gz) = 64029deff6de90fdeefb1f497d414f0e4045076693a91da1a70eb7595e97efeb +SIZE (sshguard-2.4.3.tar.gz) = 1118756 diff --git a/security/sshguard/files/patch-src_blocker_sshguard__whitelist.c b/security/sshguard/files/patch-src_blocker_sshguard__whitelist.c deleted file mode 100644 index 6e468872f458..000000000000 --- a/security/sshguard/files/patch-src_blocker_sshguard__whitelist.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/blocker/sshguard_whitelist.c.orig 2020-12-31 17:06:03 UTC -+++ src/blocker/sshguard_whitelist.c -@@ -275,7 +275,7 @@ int whitelist_add_block6(const char *restrict address, - bitlen = masklen % 8; - bitmask = 0xFF << (8 - bitlen); - ab.address.ip6.mask.s6_addr[bytelen] = bitmask; -- memset(& ab.address.ip6.mask.s6_addr[bytelen+1], 0x00, sizeof(ab.address.ip6.mask.s6_addr) - bytelen); -+ memset(& ab.address.ip6.mask.s6_addr[bytelen+1], 0x00, sizeof(ab.address.ip6.mask.s6_addr) - bytelen - 1); - - if (! list_contains(& whitelist, &ab)) { - list_append(& whitelist, &ab); diff --git a/security/sshguard/files/patch-src_parser_attack__scanner.l b/security/sshguard/files/patch-src_parser_attack__scanner.l new file mode 100644 index 000000000000..b8e1abb51e74 --- /dev/null +++ b/security/sshguard/files/patch-src_parser_attack__scanner.l @@ -0,0 +1,11 @@ +--- src/parser/attack_scanner.l.orig 2021-03-01 01:01:21 UTC ++++ src/parser/attack_scanner.l +@@ -247,7 +247,7 @@ HTTP_LOGIN_200OK_BAD .*({WORDPRESS_LOGIN}|{TYPO3 + + /* cyrus-imap login error */ + "badlogin: "[^\[]*"[" { BEGIN(cyrusimap_loginerr); return CYRUSIMAP_SASL_LOGINERR_PREF; } +-"] ".*"SASL".*"failed".?$ { BEGIN(INITIAL); return CYRUSIMAP_SASL_LOGINERR_SUFF; } ++"] ".*"SASL".*"fail".*$ { BEGIN(INITIAL); return CYRUSIMAP_SASL_LOGINERR_SUFF; } + + /* postfix */ + "warning: "({WORD}|{HOSTADDR})"[" { BEGIN(postfix_loginerr); return POSTFIX_SASL_LOGINERR_PREF; }