git: af556305e8d1 - main - security/bruteblock: renovate

From: Dmitry Marakasov <amdmi3_at_FreeBSD.org>
Date: Tue, 30 Aug 2022 18:56:15 UTC
The branch main has been updated by amdmi3:

URL: https://cgit.FreeBSD.org/ports/commit/?id=af556305e8d13466f41558ebd3dd81490cfd1e43

commit af556305e8d13466f41558ebd3dd81490cfd1e43
Author:     Dmitry Marakasov <amdmi3@FreeBSD.org>
AuthorDate: 2022-08-30 18:37:16 +0000
Commit:     Dmitry Marakasov <amdmi3@FreeBSD.org>
CommitDate: 2022-08-30 18:55:08 +0000

    security/bruteblock: renovate
    
    - Update URLs
    - Reformat pkg-message and fix service start command [1]
    - Add LICENSE
    - Switch to options helpers
    - Fix manpage location
    - Silence mkdirs
    
    Submitted by:   Elvin Aslanov [1]
    GitHub:         fixes #129
---
 security/bruteblock/Makefile             | 16 ++++++++++------
 security/bruteblock/files/pkg-message.in | 32 +++++++++++++++++---------------
 security/bruteblock/pkg-descr            |  2 +-
 security/bruteblock/pkg-plist            |  2 +-
 4 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/security/bruteblock/Makefile b/security/bruteblock/Makefile
index ee083b278f94..d96ed2b9e084 100644
--- a/security/bruteblock/Makefile
+++ b/security/bruteblock/Makefile
@@ -1,13 +1,15 @@
 PORTNAME=	bruteblock
 PORTVERSION=	0.0.5
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	security
-MASTER_SITES=	http://samm.kiev.ua/bruteblock/ \
-		http://mirror.amdmi3.ru/distfiles/
+MASTER_SITES=	https://samm.kiev.ua/bruteblock/
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Software for blocking bruteforce attacks with ipfw
 
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/doc/LICENSE
+
 LIB_DEPENDS=	libpcre.so:devel/pcre
 
 SUB_FILES=	pkg-message
@@ -23,12 +25,14 @@ OPTIONS_DEFINE=	DOCS
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bruteblock ${STAGEDIR}${PREFIX}/sbin/
 	${INSTALL_PROGRAM} ${WRKSRC}/bruteblockd ${STAGEDIR}${PREFIX}/sbin/
-	${MKDIR} ${STAGEDIR}${CONFDIR}
+	@${MKDIR} ${STAGEDIR}${CONFDIR}
 .for file in ssh proftpd
 	${INSTALL_DATA} ${WRKSRC}/etc/${file}.conf ${STAGEDIR}${CONFDIR}/${file}.conf.sample
 .endfor
-	${INSTALL_MAN} ${WRKSRC}/doc/bruteblock.8 ${STAGEDIR}${MAN8PREFIX}/share/man/man8/
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/doc/bruteblock.8 ${STAGEDIR}${MAN8PREFIX}/man/man8/
+
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for file in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${STAGEDIR}${DOCSDIR}/
 .endfor
diff --git a/security/bruteblock/files/pkg-message.in b/security/bruteblock/files/pkg-message.in
index cc956b191ed5..5111df352449 100644
--- a/security/bruteblock/files/pkg-message.in
+++ b/security/bruteblock/files/pkg-message.in
@@ -1,29 +1,31 @@
 [
 { type: install
   message: <<EOM
-  Configuration of the bruteblock is done via configuration files
-  located at %%PREFIX%%/etc/bruteblock/
+Configuration of the bruteblock is done via configuration files
+located at %%PREFIX%%/etc/bruteblock.
 
-  To run the script, append following lines to /etc/syslog.conf:
+To run the script, append following lines to /etc/syslog.conf:
 
-!*
-auth.info;authpriv.info                         |exec %%PREFIX%%/sbin/bruteblock -f %%PREFIX%%/etc/bruteblock/ssh.conf
+    !*
+    auth.info;authpriv.info    |exec %%PREFIX%%/sbin/bruteblock -f %%PREFIX%%/etc/bruteblock/ssh.conf
 
-  and restart syslogd.
+and restart syslogd.
 
-  Also you should add ipfw2 table and the corresponding deny rule.
-  For example,
+Also you should add ipfw2 table and the corresponding deny rule.
+For example,
 
-# ipfw add deny ip from table(1) to any
+    ipfw add deny ip from table(1) to any
 
-  Next, you'll want to setup periodical cleanup of ipfw2 table.  Add following
-  lines to /etc/rc.conf:
+Next, you'll want to setup periodical cleanup of ipfw2 table.
+Add following lines to /etc/rc.conf:
 
-     bruteblockd_enable="YES"
-     bruteblockd_table="1"
-     bruteblockd_flags="-s 5"
+    bruteblockd_enable="YES"
+    bruteblockd_table="1"
+    bruteblockd_flags="-s 5"
 
-  and start bruteblockd: %%PREFIX%%/etc/rc.d/bruteblockd.sh start
+and start bruteblockd:
+
+    service bruteblockd start
 
 See bruteblock(8) for more details.
 EOM
diff --git a/security/bruteblock/pkg-descr b/security/bruteblock/pkg-descr
index 57338d2d1f29..c652f53e62b0 100644
--- a/security/bruteblock/pkg-descr
+++ b/security/bruteblock/pkg-descr
@@ -7,4 +7,4 @@ which provides flexibility allowing it to be used with almost any
 network service.  Bruteblock is written in pure C, doesn't use any
 external programs and work with ipfw2 tables via raw sockets API.
 
-WWW: http://samm.kiev.ua/bruteblock/
+WWW: https://samm.kiev.ua/bruteblock/
diff --git a/security/bruteblock/pkg-plist b/security/bruteblock/pkg-plist
index a67a00d9ce4f..ef8db0444e65 100644
--- a/security/bruteblock/pkg-plist
+++ b/security/bruteblock/pkg-plist
@@ -2,4 +2,4 @@ sbin/bruteblock
 sbin/bruteblockd
 @sample etc/bruteblock/proftpd.conf.sample
 @sample etc/bruteblock/ssh.conf.sample
-share/man/man8/bruteblock.8.gz
+man/man8/bruteblock.8.gz