Bug 241751 - security/sshguard: Remove redundant pidfile check
Summary: security/sshguard: Remove redundant pidfile check
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Many People
Assignee: Xin LI
URL:
Keywords: buildisok, needs-qa
Depends on:
Blocks:
 
Reported: 2019-11-06 05:39 UTC by Xin LI
Modified: 2019-11-10 18:36 UTC (History)
2 users (show)

See Also:
bugzilla: maintainer-feedback? (dan.mcgregor)
koobs: merge-quarterly?


Attachments
Proposed patch (1.37 KB, patch)
2019-11-06 05:39 UTC, Xin LI
koobs: maintainer-approval+
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Xin LI freebsd_committer 2019-11-06 05:39:20 UTC
Created attachment 208906 [details]
Proposed patch

The new SSHguard script performs an incomplete check of pidfile, which is not needed on FreeBSD and can prevent the service from starting.  The issue seems to be introduced by https://bitbucket.org/sshguard/sshguard/commits/32a4676599a900a7a072f66303d9c48b22d1107c

Reproduction case:

1. echo "blah" > /var/run/sshguard.pid
2. service sshguard start

Expected result:

sshguard should start and write the PID.

Actual result:

sshguard won't start; if the command was executed manually, the user would see "/var/run/sshguard.pid already exists; is SSHGuard already running?".

Proposed patch attached.
Comment 1 Kubilay Kocak freebsd_committer freebsd_triage 2019-11-06 06:09:55 UTC
Comment on attachment 208906 [details]
Proposed patch

This patch is:

Approved by: portmgr (blanket(s): ports compliance, bugfix)

Pending / contingent on QA
Comment 2 Kubilay Kocak freebsd_committer freebsd_triage 2019-11-06 06:10:11 UTC
If quarterly is affected, please MFH
Comment 3 Automation User 2019-11-06 15:06:59 UTC
Build info is available at https://gitlab.com/swills/freebsd-ports/pipelines/94102580
Comment 4 commit-hook freebsd_committer 2019-11-10 18:35:17 UTC
A commit references this bug:

Author: delphij
Date: Sun Nov 10 18:34:55 UTC 2019
New revision: 517220
URL: https://svnweb.freebsd.org/changeset/ports/517220

Log:
  Remove redundant pidfile check.

  This fixes an issue that SSHguard won't start after an incompelete
  shutdown.

  PR:		ports/241751
  Approved by:	portmgr (bugfix blanket)
  MFH:		2019Q4

Changes:
  head/security/sshguard/Makefile
  head/security/sshguard/files/patch-src_sshguard.in
Comment 5 commit-hook freebsd_committer 2019-11-10 18:36:18 UTC
A commit references this bug:

Author: delphij
Date: Sun Nov 10 18:35:56 UTC 2019
New revision: 517221
URL: https://svnweb.freebsd.org/changeset/ports/517221

Log:
  MFH: r517220

  Remove redundant pidfile check.

  This fixes an issue that SSHguard won't start after an incompelete
  shutdown.

  PR:		ports/241751
  Approved by:	portmgr (bugfix blanket)
  Approved by:	ports-secteam (bugfix blanket)

Changes:
_U  branches/2019Q4/
  branches/2019Q4/security/sshguard/Makefile
  branches/2019Q4/security/sshguard/files/patch-src_sshguard.in