From nobody Mon Nov 13 11:36:43 2023 X-Original-To: dev-commits-ports-branches@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 4STS7c0nLfz51FsR; Mon, 13 Nov 2023 11:36:44 +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 4STS7c0LVQz4QlS; Mon, 13 Nov 2023 11:36:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699875404; 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=nPqY1gCYvONYvIpEipT3orvbgKrlFnx0OE9rs0vsjSw=; b=IsnvWBFtbSvirAd/S1QkD9WtHUjGiFa1AHiIPZQTKW9bD+k8Dc9WtsonydFm5tD8LZ2nvy 19KjxqYaJmZVbz7BZ7VnfTPzzBOy4oM2v5ltuA1yW//im427/jDPs7kWmRKJWHlMNdpKL2 kxRep2mKP5mt1Q62Jf/fSHuqKvi2r0yV1geuOZsl1lL9EF2hZN1z8rLk+z7O3Kh4VShde3 V7v9RRTgDu5c29bpMoiyLe4epm/YP3ChZKxTz8HBSWxUK2fQGKIKOjkdEp8eTvmh20xuad /d8c/p6A9zCUlVq9zBrK4tkk2Ab3yySm/cS3S/0AUF9GWvU7PlOYivb9Gz7vWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699875404; 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=nPqY1gCYvONYvIpEipT3orvbgKrlFnx0OE9rs0vsjSw=; b=x6dTRVDrRPEG6HAwud0gJRkoWffDQ0mhz3MceO5nIMnI4oPVTfWWSa++RwEGpHj2NFtIK+ dBvVGvtjFCg3SSG/T9FFRCbxxDrY+aZoaIfSyr6bxs7ImsOTeW6wWWy/Q0FIZqnzyLETPa 6EuQuE7RXAu0gZ44vF8zQdfhtja+3gPOGy7f2GXruFXhKOy9F8eaP/1t4L3oGVVEcWXrjK nJwrmsu/uAaBJFMVfaBdcJB339ZZdZ4jorXIsYDDD6NJ2zX0d/oOYcarnNoHTA0S6Vj6AN TglljcK6Sz8WcXbrvQzYqzpOfvmRRc8vcOUhGJb7/+BcNANGdfpntCEYDqW0hQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699875404; a=rsa-sha256; cv=none; b=NIypyZq4FS7GMdGuK1Ygt+JsI8yvyiaL7mzWGbTv2RpZPHpbMj+6a8Hkq1T+EUadPSo3lr bDu8J8xn2dMvpHWHzr+uDWtALZK8svZn4DgrlVouOQNRXH+d/AnykBJBr+BINXhUHDI2Z3 9NVeocdTcjWUGSk9T5thjqkM1xld8cR39YMEqGhidRzDFDxtlMgoKSNEQmBef6o8zzSEke sMLEiia1Fmb/IdJoJuquxSVVdOM44+l+MEFum3E/TqxyxdXVIz5E1jCZWQE/DSQ9VsHI9i ktoiQ+KHpaY1QRH1JeK+0Zewsi0dbmrlqUfemPQRHlFXgcYEyzxME28NH2O0hw== 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 4STS7b6X08z13hK; Mon, 13 Nov 2023 11:36:43 +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 3ADBahOs077120; Mon, 13 Nov 2023 11:36:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ADBahNv077117; Mon, 13 Nov 2023 11:36:43 GMT (envelope-from git) Date: Mon, 13 Nov 2023 11:36:43 GMT Message-Id: <202311131136.3ADBahNv077117@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Renato Botelho Subject: git: 74229fe9f145 - 2023Q4 - security/sshguard: fix logging of entries with hostnames List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: garga X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q4 X-Git-Reftype: branch X-Git-Commit: 74229fe9f145578948cde5597c3945ff662372e9 Auto-Submitted: auto-generated The branch 2023Q4 has been updated by garga: URL: https://cgit.FreeBSD.org/ports/commit/?id=74229fe9f145578948cde5597c3945ff662372e9 commit 74229fe9f145578948cde5597c3945ff662372e9 Author: Chris Moerz AuthorDate: 2023-11-03 08:18:27 +0000 Commit: Renato Botelho CommitDate: 2023-11-13 11:36:36 +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) (cherry picked from commit efda5c514648db7c2bbacaa7a57dfa946dd9f054) --- 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; }