Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 28 Sep 2018 11:20:29 +0000 (UTC)
From:      Renato Botelho <garga@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r480853 - in head/security/sshguard: . files
Message-ID:  <201809281120.w8SBKTFk087343@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: garga
Date: Fri Sep 28 11:20:29 2018
New Revision: 480853
URL: https://svnweb.freebsd.org/changeset/ports/480853

Log:
  Update security/sshguard to 2.2.0
  
  While here, break some long lines, Use INSTALL_DATA to install sample config
  file since it's not supposed to be changed and re-generate patches using
  `make makepatch`
  
  PR:		230861
  Approved by:	maintainer timeout (> 1 month)
  Obtained from:	pfSense
  Sponsored by:	Rubicon Communications, LLC (Netgate)

Modified:
  head/security/sshguard/Makefile
  head/security/sshguard/distinfo
  head/security/sshguard/files/patch-examples-sshguard.conf.sample
  head/security/sshguard/files/patch-src-sshguard.in

Modified: head/security/sshguard/Makefile
==============================================================================
--- head/security/sshguard/Makefile	Fri Sep 28 10:55:01 2018	(r480852)
+++ head/security/sshguard/Makefile	Fri Sep 28 11:20:29 2018	(r480853)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	sshguard
-PORTVERSION=	2.1.0
-PORTREVISION=	1
+PORTVERSION=	2.2.0
 CATEGORIES=	security
 MASTER_SITES=	SF/sshguard/sshguard/${PORTVERSION}
 
@@ -18,11 +17,14 @@ GNU_CONFIGURE=	yes
 SUB_FILES=	pkg-message
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%PREFIX%|${PREFIX}|' ${WRKSRC}/doc/sshguard.8.rst
-	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' ${WRKSRC}/examples/sshguard.conf.sample
+	@${REINPLACE_CMD} -e 's|%PREFIX%|${PREFIX}|' \
+		${WRKSRC}/doc/sshguard.8.rst
+	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' \
+		${WRKSRC}/examples/sshguard.conf.sample
 
 post-install:
 	${INSTALL} -d ${STAGEDIR}${PREFIX}/etc
-	${INSTALL} -m 644 ${WRKSRC}/examples/sshguard.conf.sample ${STAGEDIR}${PREFIX}/etc
+	${INSTALL_DATA} ${WRKSRC}/examples/sshguard.conf.sample \
+		${STAGEDIR}${PREFIX}/etc
 
 .include <bsd.port.mk>

Modified: head/security/sshguard/distinfo
==============================================================================
--- head/security/sshguard/distinfo	Fri Sep 28 10:55:01 2018	(r480852)
+++ head/security/sshguard/distinfo	Fri Sep 28 11:20:29 2018	(r480853)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1512597921
-SHA256 (sshguard-2.1.0.tar.gz) = 21252a4834ad8408df384ee4ddf468624aa9de9cead5afde1c77380a48cf028a
-SIZE (sshguard-2.1.0.tar.gz) = 1117466
+TIMESTAMP = 1535115330
+SHA256 (sshguard-2.2.0.tar.gz) = 2aff07fee6ec33e4ffd5411916b75189977af1d77b86dac5f3834dd3aa3656c2
+SIZE (sshguard-2.2.0.tar.gz) = 737612

Modified: head/security/sshguard/files/patch-examples-sshguard.conf.sample
==============================================================================
--- head/security/sshguard/files/patch-examples-sshguard.conf.sample	Fri Sep 28 10:55:01 2018	(r480852)
+++ head/security/sshguard/files/patch-examples-sshguard.conf.sample	Fri Sep 28 11:20:29 2018	(r480853)
@@ -1,4 +1,4 @@
---- examples/sshguard.conf.sample.orig	2017-12-06 22:18:20 UTC
+--- examples/sshguard.conf.sample.orig	2018-06-25 21:13:07 UTC
 +++ examples/sshguard.conf.sample
 @@ -6,10 +6,12 @@
  
@@ -15,7 +15,7 @@
  
  # Shell command that provides logs on standard output. (optional, no default)
  # Example 1: ssh and sendmail from systemd journal:
-@@ -40,12 +42,12 @@ DETECTION_TIME=1800
+@@ -40,12 +42,12 @@ IPV4_SUBNET=32
  # !! Warning: These features may not work correctly with sandboxing. !!
  
  # Full path to PID file (optional, no default)

Modified: head/security/sshguard/files/patch-src-sshguard.in
==============================================================================
--- head/security/sshguard/files/patch-src-sshguard.in	Fri Sep 28 10:55:01 2018	(r480852)
+++ head/security/sshguard/files/patch-src-sshguard.in	Fri Sep 28 11:20:29 2018	(r480853)
@@ -1,8 +1,6 @@
-diff --git src/sshguard.in src/sshguard.in
-index 40c864b..249ddb5 100644
---- src/sshguard.in
+--- src/sshguard.in.orig	2018-07-08 18:07:01 UTC
 +++ src/sshguard.in
-@@ -85,4 +85,4 @@ elif [ -z "$tailcmd" ]; then
+@@ -96,4 +96,4 @@ elif [ -z "$tailcmd" ]; then
  fi
  
  eval $tailcmd | $libexec/sshg-parser | \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201809281120.w8SBKTFk087343>