From nobody Sat Dec 21 12:11:53 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 4YFjnj5cYmz5h0Ff; Sat, 21 Dec 2024 12:11:53 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YFjnj57cxz3xGg; Sat, 21 Dec 2024 12:11:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734783113; 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=JLwH3pqrWey7meWAwDyaB7uK22PIedYudyUnMur2PU4=; b=uFX+amVdakErVi94R/1SBDDPjkayM3SQAtpXj4lS2NUKGiTDU11MBuvBPDSWXQVA1mrRk4 9OBhQcOe8CJN2Jqzom6+kr5TveqrF9+LmoJCpYRmU670rbWXmcXwHVtF9MeyipNmzRYt6Z szBSGIszu1zFYGkzuLyWfIw0t/stT+S6VDy7sd4nKgMUI+O6a/CRTO4X+Gi067ooIrhTOf Roh+/dL2vE2o1CpxyBuw9YIHMUin4xqHExz8gwl2ts+flT0c9fDyo3B5HvV5Gl7naYuY0U +bhPho/Mdozy7D6csuC+LuQQ9hOjCkuCtUcMUNl5NNuJJFJM67fsM2kHefwI8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734783113; 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=JLwH3pqrWey7meWAwDyaB7uK22PIedYudyUnMur2PU4=; b=LGn/7Azgr/z7XQjnUjKL/hQmcNjpeLJlMI2S972U5C+vlTYw8x5AYryGFkYC0+065coufq ykpfNJLDPoyx32aGIElYAqdufK2mDwDbHDdAFMuF93HSMWPyxoHjRtg8nqJldSpYruHDNm GWLZw1W+SDl9SBqQw3CEk3TSGi6TtSvK4pNJ+oAP1bvwNkHzfVGsLCpD+FQRAUGXPnIBBN xrMhjJQGFJmdJpBTmVqqDHY5CX30LDrmwXHbd3SfzEQwUsVc7bRQVaWmQ1zhI3xBquk3Yz IP6FTS6lf9nNgWKVL4fksLLl+GdYQYKDeI8xHKfPpSWnBD+GOqcbpq18TFUWww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734783113; a=rsa-sha256; cv=none; b=gJgWSO6nwCW7k9Ear8jqe1yyNjUEhhxrXO0QHRTZT4p8kmc4HNZeRd3MkRwczU82mQBeTt PACFRtEqOA6wczKOYgFXZVzgbTuTOyWZ8JmE8Oxz6WAcYrHUTrVe4GIcgz6WlAI+0hwUmN wIisFJla0D5l2XONas3HutYZV1MgnilPAwbDGTDXODblYdWq3uPIcrQVV7BgOnsPDw4BD0 vY1SeO3e9i7JUMPM8G3BxNnGLFTos6gJ0Kd/0kgb6Qkaqwc7A8C9cHGrp7eJWgBiYGFWdF eR8VhJVbBKcUGuvYCnU8yTcQ98xvf4YVeD3sre4DTLXQHZft1Qx8d9Y+q7N+jg== 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 4YFjnj4l9PzN2n; Sat, 21 Dec 2024 12:11:53 +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 4BLCBr6e028502; Sat, 21 Dec 2024 12:11:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BLCBreA028499; Sat, 21 Dec 2024 12:11:53 GMT (envelope-from git) Date: Sat, 21 Dec 2024 12:11:53 GMT Message-Id: <202412211211.4BLCBreA028499@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Oleksii Samorukov Subject: git: ac0282045520 - main - security/bruteblock: update to 0.0.6 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: samm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ac0282045520435d004be4bf56591ac9ea5c7b03 Auto-Submitted: auto-generated The branch main has been updated by samm: URL: https://cgit.FreeBSD.org/ports/commit/?id=ac0282045520435d004be4bf56591ac9ea5c7b03 commit ac0282045520435d004be4bf56591ac9ea5c7b03 Author: Oleksii Samorukov AuthorDate: 2024-12-21 12:10:04 +0000 Commit: Oleksii Samorukov CommitDate: 2024-12-21 12:11:23 +0000 security/bruteblock: update to 0.0.6 - use pcre2 instead of pcre - integrate patches from the port - take maintainership PR: 282821 --- security/bruteblock/Makefile | 11 ++++++----- security/bruteblock/distinfo | 5 +++-- security/bruteblock/files/patch-Makefile | 11 ----------- security/bruteblock/files/patch-bruteblock.c | 12 ------------ security/bruteblock/files/patch-etc-ssh.conf | 22 ---------------------- 5 files changed, 9 insertions(+), 52 deletions(-) diff --git a/security/bruteblock/Makefile b/security/bruteblock/Makefile index 989f5b1ec0b7..20033d9fcfb8 100644 --- a/security/bruteblock/Makefile +++ b/security/bruteblock/Makefile @@ -1,21 +1,22 @@ PORTNAME= bruteblock -PORTVERSION= 0.0.5 -PORTREVISION= 11 +PORTVERSION= 0.0.6 +DISTVERSIONPREFIX= v CATEGORIES= security -MASTER_SITES= https://samm.kiev.ua/bruteblock/ -MAINTAINER= amdmi3@FreeBSD.org +MAINTAINER= samm@FreeBSD.org COMMENT= Software for blocking bruteforce attacks with ipfw WWW= https://samm.kiev.ua/bruteblock/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/doc/LICENSE -LIB_DEPENDS= libpcre.so:devel/pcre +LIB_DEPENDS= libpcre2-8.so:devel/pcre2 SUB_FILES= pkg-message USE_RC_SUBR= bruteblockd +USE_GITHUB= yes +GH_ACCOUNT= samm-git CONFDIR= ${PREFIX}/etc/${PORTNAME} diff --git a/security/bruteblock/distinfo b/security/bruteblock/distinfo index ef5276f8b8bc..a1208e109fa1 100644 --- a/security/bruteblock/distinfo +++ b/security/bruteblock/distinfo @@ -1,2 +1,3 @@ -SHA256 (bruteblock-0.0.5.tar.gz) = 7c7ef533b27be1d72e43a7fa6828896124a4f22808f2a0ecca2e587e1563e253 -SIZE (bruteblock-0.0.5.tar.gz) = 24971 +TIMESTAMP = 1731881673 +SHA256 (samm-git-bruteblock-v0.0.6_GH0.tar.gz) = f13df4444c9686ff109e1fadaa62e95608630c0284e57bcad27f0528e3bcf51a +SIZE (samm-git-bruteblock-v0.0.6_GH0.tar.gz) = 24665 diff --git a/security/bruteblock/files/patch-Makefile b/security/bruteblock/files/patch-Makefile deleted file mode 100644 index 0cfbff38c566..000000000000 --- a/security/bruteblock/files/patch-Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.orig 2006-08-20 10:22:37.000000000 +0400 -+++ Makefile 2009-03-24 22:12:58.000000000 +0300 -@@ -18,7 +18,7 @@ - bruteblock: $(BRUTEBLOCK_OBJS) iniparse/libiniparser.a - $(CC) $(LDFLAGS) -o $@ $(BRUTEBLOCK_OBJS) $(EXTRA_LIBS) - --bruteblockd: $(BRUTEBLOCKD_OBJS) pidfile.h -+bruteblockd: $(BRUTEBLOCKD_OBJS) iniparse/libiniparser.a pidfile.h - $(CC) $(LDFLAGS) -o $@ $(BRUTEBLOCKD_OBJS) $(EXTRA_LIBS) - - clean: diff --git a/security/bruteblock/files/patch-bruteblock.c b/security/bruteblock/files/patch-bruteblock.c deleted file mode 100644 index a8574896cb09..000000000000 --- a/security/bruteblock/files/patch-bruteblock.c +++ /dev/null @@ -1,12 +0,0 @@ ---- bruteblock.c.orig 2006-08-20 08:22:37.000000000 +0200 -+++ bruteblock.c 2014-10-15 16:19:19.000000000 +0200 -@@ -99,7 +99,7 @@ - snprintf(table, sizeof(table), "%d", ipfw2_table_no); - argv[1] = table; - argv[2] = command; -- snprintf(utime, sizeof(utime), "%d", -- time(NULL) + reset_ip); -+ snprintf(utime, sizeof(utime), "%lld", -+ (long long)(time(NULL) + reset_ip)); - argv[4] = utime; - argv[3] = host; diff --git a/security/bruteblock/files/patch-etc-ssh.conf b/security/bruteblock/files/patch-etc-ssh.conf deleted file mode 100644 index a701b837afb8..000000000000 --- a/security/bruteblock/files/patch-etc-ssh.conf +++ /dev/null @@ -1,22 +0,0 @@ ---- etc/ssh.conf.orig 2006-08-20 10:22:37.000000000 +0400 -+++ etc/ssh.conf 2009-10-14 03:46:53.000000000 +0400 -@@ -14,8 +14,17 @@ - # comment: correct user, but wrong password - #sshd[72626]: Failed password for samm from 1.2.3.4 - # --regexp = sshd.*Illegal user \S+ from (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) --regexp1 = sshd.*Failed password for (?:illegal user )?\S+ from (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) -+# comment: other messages -+#sshd[41945]: error: PAM: authentication error for alice from 192.168.0.1 -+#sshd[41945]: error: PAM: authentication error for illegal user root from 192.168.0.1 -+#sshd[41945]: Failed keyboard-interactive/pam for invalid user root from 192.168.0.1 port 64507 ssh2 -+#sshd[16666]: Failed unknown for illegal user asdfasdfasd from 192.168.0.1 port 52652 ssh2 -+#sshd[16666]: Did not receive identification string from 192.168.0.1 -+# -+regexp = sshd.*(?:Illegal|Invalid) user \S+ from (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) -+regexp1 = sshd.*Failed \S+ for (?:(?:illegal|invalid) user )?\S+ from (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) -+regexp2 = sshd.*error: PAM: authentication error for (?:(?:illegal|invalid) user )?\S+ from (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) -+regexp3 = sshd.*Did not receive identification string from (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) - - # Number of failed login attempts within time before we block - max_count = 4