Skip to content

Instantly share code, notes, and snippets.

@rbgarga
Created April 23, 2020 18:04
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save rbgarga/2dabfef02a30b5941461733e80d0c645 to your computer and use it in GitHub Desktop.
Save rbgarga/2dabfef02a30b5941461733e80d0c645 to your computer and use it in GitHub Desktop.
git weirdness
>>> I see the commit 53e5b36834f1 is present on current branch (RELENG_2_4_5)
❯ git log RELENG_2_4_5 | grep -A5 53e5b36834f1 ✘ 130
commit 53e5b36834f1
Author: jim-p <jimp@netgate.com>
Date: Fri Jan 3 11:50:09 2020 -0500
Allow sshguard to process via stdin again. Issue #9971
>>> And this commit changed file 'security/sshguard/files/patch-src_sshguard.in'
❯ git show 53e5b36834f1 -- security/sshguard/files/patch-src_sshguard.in ✘ 130
commit 53e5b36834f1
Author: jim-p <jimp@netgate.com>
Date: Fri Jan 3 11:50:09 2020 -0500
Allow sshguard to process via stdin again. Issue #9971
diff --git a/security/sshguard/files/patch-src_sshguard.in b/security/sshguard/files/patch-src_sshguard.in
index 6881e162028f..788f0ac2bc47 100644
--- a/security/sshguard/files/patch-src_sshguard.in
+++ b/security/sshguard/files/patch-src_sshguard.in
@@ -1,6 +1,6 @@
--- src/sshguard.in.orig 2019-05-23 22:25:17 UTC
+++ src/sshguard.in
-@@ -97,14 +97,8 @@ elif [ -z "$tailcmd" ]; then
+@@ -97,19 +97,12 @@ elif [ -z "$tailcmd" ]; then
exit 1
fi
@@ -17,3 +17,9 @@
# Make sure to kill entire process group (subshell) on exit/interrupts.
trap "clean_and_exit" INT TERM
+ trap "kill 0" EXIT
+
+ eval $tailcmd | $libexec/sshg-parser | \
+- $libexec/sshg-blocker $flags | $BACKEND &
+-wait
++ $libexec/sshg-blocker $flags | ($BACKEND ; pkill -PIPE -P $$)
>>> But git log doesn't show this commit
❯ git log RELENG_2_4_5 -- security/sshguard/files/patch-src_sshguard.in
commit 88d6f4488ab5
Author: delphij <delphij@FreeBSD.org>
Date: Sun Nov 10 18:34:54 2019 +0000
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
>>> Unless I use --follow parameter, even the file never being renamed (WAT)
❯ git log RELENG_2_4_5 --follow -M -- security/sshguard/files/patch-src_sshguard.in
commit 53e5b36834f1
Author: jim-p <jimp@netgate.com>
Date: Fri Jan 3 11:50:09 2020 -0500
Allow sshguard to process via stdin again. Issue #9971
commit e4cccfc2c3ab
Author: delphij <delphij@FreeBSD.org>
Date: Sun Nov 10 18:35:55 2019 +0000
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)
commit 88d6f4488ab5
Author: delphij <delphij@FreeBSD.org>
Date: Sun Nov 10 18:34:54 2019 +0000
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment