From owner-svn-ports-head@freebsd.org Sat Jul 6 15:33:12 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 77F8615CAA40; Sat, 6 Jul 2019 15:33:12 +0000 (UTC) (envelope-from adamw@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 15BE78FA97; Sat, 6 Jul 2019 15:33:12 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C99C723807; Sat, 6 Jul 2019 15:33:11 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x66FXBMx013939; Sat, 6 Jul 2019 15:33:11 GMT (envelope-from adamw@FreeBSD.org) Received: (from adamw@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x66FXBaZ013936; Sat, 6 Jul 2019 15:33:11 GMT (envelope-from adamw@FreeBSD.org) Message-Id: <201907061533.x66FXBaZ013936@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adamw set sender to adamw@FreeBSD.org using -f From: Adam Weinberger Date: Sat, 6 Jul 2019 15:33:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r505999 - in head/security/sshguard: . files X-SVN-Group: ports-head X-SVN-Commit-Author: adamw X-SVN-Commit-Paths: in head/security/sshguard: . files X-SVN-Commit-Revision: 505999 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 15BE78FA97 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.93 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.93)[-0.934,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Jul 2019 15:33:12 -0000 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"