From owner-svn-ports-all@freebsd.org Mon Jul 1 17:56:50 2019 Return-Path: Delivered-To: svn-ports-all@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 06A2015E1003; Mon, 1 Jul 2019 17:56:50 +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 9D24189C80; Mon, 1 Jul 2019 17:56:49 +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 751BC18744; Mon, 1 Jul 2019 17:56:49 +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 x61HunaC006303; Mon, 1 Jul 2019 17:56:49 GMT (envelope-from adamw@FreeBSD.org) Received: (from adamw@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x61HumfP006301; Mon, 1 Jul 2019 17:56:48 GMT (envelope-from adamw@FreeBSD.org) Message-Id: <201907011756.x61HumfP006301@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adamw set sender to adamw@FreeBSD.org using -f From: Adam Weinberger Date: Mon, 1 Jul 2019 17:56:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r505626 - 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: 505626 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 9D24189C80 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_SHORT(-0.97)[-0.973,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jul 2019 17:56:50 -0000 Author: adamw Date: Mon Jul 1 17:56:48 2019 New Revision: 505626 URL: https://svnweb.freebsd.org/changeset/ports/505626 Log: Back out r505456. sshguard 2.4.0 misbehaves SSHGuard has always exited cleanly on FreeBSD. In 2.4.0, sshguard fixed that. It is impossible to terminate sshguard without manually killing each process. So, apologies to everyone who's already updated, but you'll have to manually kill all the processes: pkill -f sshguard pkill -f sshg- pkill -f tail rm /var/run/sshguard.pid So, back this out while awaiting upstream fix. 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 Mon Jul 1 17:55:32 2019 (r505625) +++ head/security/sshguard/Makefile Mon Jul 1 17:56:48 2019 (r505626) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= sshguard -PORTVERSION= 2.4.0 -PORTREVISION= 1 +PORTVERSION= 2.3.1 +PORTEPOCH= 1 CATEGORIES= security MASTER_SITES= SF/sshguard/sshguard/${PORTVERSION} @@ -24,7 +24,7 @@ post-patch: ${WRKSRC}/examples/sshguard.conf.sample post-install: - ${INSTALL} -d ${STAGEDIR}${PREFIX}/etc + ${MKDIR} ${STAGEDIR}${PREFIX}/etc ${INSTALL_DATA} ${WRKSRC}/examples/sshguard.conf.sample \ ${STAGEDIR}${PREFIX}/etc Modified: head/security/sshguard/distinfo ============================================================================== --- head/security/sshguard/distinfo Mon Jul 1 17:55:32 2019 (r505625) +++ head/security/sshguard/distinfo Mon Jul 1 17:56:48 2019 (r505626) @@ -1,3 +1,3 @@ -TIMESTAMP = 1560183055 -SHA256 (sshguard-2.4.0.tar.gz) = 065ca4091b3a96802714b560dbbc3d9f0e67574e99e2b6e8857aa1027d17d6c0 -SIZE (sshguard-2.4.0.tar.gz) = 771506 +TIMESTAMP = 1562003151 +SHA256 (sshguard-2.3.1.tar.gz) = 769055e26df78f4bca34c9a7acf265dfa224c055b33ced47f53d55bf659d20a2 +SIZE (sshguard-2.3.1.tar.gz) = 765330 Modified: head/security/sshguard/files/sshguard.in ============================================================================== --- head/security/sshguard/files/sshguard.in Mon Jul 1 17:55:32 2019 (r505625) +++ head/security/sshguard/files/sshguard.in Mon Jul 1 17:56:48 2019 (r505626) @@ -78,7 +78,7 @@ pidfile=${sshguard_pidfile:="/var/run/sshguard.pid"} command=/usr/sbin/daemon actual_command="%%PREFIX%%/sbin/sshguard" -procname="/bin/sh" +procname="%%PREFIX%%/libexec/sshg-blocker" start_precmd=sshguard_prestart 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}"