svn commit: r505999 - in head/security/sshguard: . files

[Adam Weinberger]

Author: adamw
Date: Sat Jul  6 15:33:10 2019
New Revision: 505999
URL: https://svnweb.freebsd.org/changeset/ports/505999

Log:
  sshguard: Update to 2.4.0 and fix rc(8) script
  
  There is some strange new behaviour on the rc script in 2.4.0. It
  would either hang on start, or hang on stop. A custom stop function
  seemed the easiest way to achieve both.
  
  PR:		238458

Modified:
  head/security/sshguard/Makefile
  head/security/sshguard/distinfo
  head/security/sshguard/files/sshguard.in

Modified: head/security/sshguard/Makefile
==============================================================================
--- head/security/sshguard/Makefile	Sat Jul  6 15:14:24 2019	(r505998)
+++ head/security/sshguard/Makefile	Sat Jul  6 15:33:10 2019	(r505999)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	sshguard
-PORTVERSION=	2.3.1
+PORTVERSION=	2.4.0
 PORTEPOCH=	1
 CATEGORIES=	security
 MASTER_SITES=	SF/sshguard/sshguard/${PORTVERSION}

Modified: head/security/sshguard/distinfo
==============================================================================
--- head/security/sshguard/distinfo	Sat Jul  6 15:14:24 2019	(r505998)
+++ head/security/sshguard/distinfo	Sat Jul  6 15:33:10 2019	(r505999)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1562003151
-SHA256 (sshguard-2.3.1.tar.gz) = 769055e26df78f4bca34c9a7acf265dfa224c055b33ced47f53d55bf659d20a2
-SIZE (sshguard-2.3.1.tar.gz) = 765330
+TIMESTAMP = 1562425350
+SHA256 (sshguard-2.4.0.tar.gz) = 065ca4091b3a96802714b560dbbc3d9f0e67574e99e2b6e8857aa1027d17d6c0
+SIZE (sshguard-2.4.0.tar.gz) = 771506

Modified: head/security/sshguard/files/sshguard.in
==============================================================================
--- head/security/sshguard/files/sshguard.in	Sat Jul  6 15:14:24 2019	(r505998)
+++ head/security/sshguard/files/sshguard.in	Sat Jul  6 15:33:10 2019	(r505999)
@@ -78,8 +78,9 @@ pidfile=${sshguard_pidfile:="/var/run/sshguard.pid"}
 
 command=/usr/sbin/daemon
 actual_command="%%PREFIX%%/sbin/sshguard"
-procname="%%PREFIX%%/libexec/sshg-blocker"
+procname="/bin/sh"
 start_precmd=sshguard_prestart
+stop_cmd=sshguard_stop
 command_args="-c ${actual_command} \${sshguard_flags} \${sshguard_blacklist_params} \${sshguard_watch_params} \${sshguard_danger_params} \${sshguard_release_params} \${sshguard_reset_params} \${sshguard_whitelist_params} -i ${pidfile}"
 
 sshguard_prestart()
@@ -113,6 +114,13 @@ sshguard_prestart()
 	if [ ! -z "${sshguard_watch_logs}" ]; then
 		sshguard_watch_params=$(echo ${sshguard_watch_logs} | tr : \\\n | sed -e s/^/-l\ /g | tr \\\n \ )
 	fi
+}
+
+sshguard_stop()
+{
+	sshg_blocker="%%PREFIX%%/libexec/sshg-blocker"
+	rc_pid="$(check_process ${sshg_blocker})"
+	kill $sig_stop "$rc_pid"
 }
 
 run_rc_command "$1"