<pre style='margin:0'>
Daniel J. Luke (danielluke) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6b0e41731691c96de3f89d1ef32b80f9352ca16b">https://github.com/macports/macports-ports/commit/6b0e41731691c96de3f89d1ef32b80f9352ca16b</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 6b0e4173169 sshguard: add upstream off-by-one patch
</span>6b0e4173169 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6b0e41731691c96de3f89d1ef32b80f9352ca16b
</span>Author: Daniel J. Luke <dluke@macports.org>
AuthorDate: Wed Sep 1 15:27:34 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> sshguard: add upstream off-by-one patch
</span>---
net/sshguard/Portfile | 5 +++--
net/sshguard/files/patch-memset-off-by-one.diff | 14 ++++++++++++++
2 files changed, 17 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/sshguard/Portfile b/net/sshguard/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ecd87ad7d8f..b937dd83eae 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/sshguard/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/sshguard/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup bitbucket 1.0
bitbucket.setup sshguard sshguard 2.4.2 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
categories net security
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,7 +29,8 @@ use_autoreconf yes
</span> depends_build-append \
port:py38-docutils
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-configure.ac.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-memset-off-by-one.diff
</span>
# Before Lion firewall is ipfw, afterwards pf.
if {${os.major} < 11} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/sshguard/files/patch-memset-off-by-one.diff b/net/sshguard/files/patch-memset-off-by-one.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..6fa59dc7078
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/sshguard/files/patch-memset-off-by-one.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/blocker/sshguard_whitelist.c b/src/blocker/sshguard_whitelist.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 30c6717..555237a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/blocker/sshguard_whitelist.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/blocker/sshguard_whitelist.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -275,7 +275,7 @@ int whitelist_add_block6(const char *restrict address, int masklen) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bitlen = masklen % 8;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bitmask = 0xFF << (8 - bitlen);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ab.address.ip6.mask.s6_addr[bytelen] = bitmask;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- memset(& ab.address.ip6.mask.s6_addr[bytelen+1], 0x00, sizeof(ab.address.ip6.mask.s6_addr) - bytelen);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ memset(& ab.address.ip6.mask.s6_addr[bytelen+1], 0x00, sizeof(ab.address.ip6.mask.s6_addr) - bytelen - 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (! list_contains(& whitelist, &ab)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ list_append(& whitelist, &ab);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>