<pre style='margin:0'>
Mihai Moldovan (Ionic) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/bda623942dbfd5d5abd328fce1505fe9c1c5b33a">https://github.com/macports/macports-ports/commit/bda623942dbfd5d5abd328fce1505fe9c1c5b33a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit bda623942dbfd5d5abd328fce1505fe9c1c5b33a
</span>Author: Mihai Moldovan <ionic@ionic.de>
AuthorDate: Thu Sep 21 04:29:42 2017 +0200
<span style='display:block; white-space:pre;color:#404040;'> devel/libssh: update to 0.7.5.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Includes backported patches for ssh config file parsing.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Switch to xz-compressed tarballs.
</span>---
devel/libssh/Portfile | 11 ++++----
.../files/patch-fix-config-buffer-underflow.patch | 25 +++++++++++++++++
devel/libssh/files/patch-fix-config-parsing.diff | 32 ++++++++++++++++++++++
3 files changed, 63 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libssh/Portfile b/devel/libssh/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 50a1d97..b12c6d1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libssh/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libssh/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,12 +5,12 @@ PortGroup cmake 1.0
</span>
name libssh
epoch 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.7.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.7.5
</span> revision 0
master_sites https://git.libssh.org/projects/libssh.git/snapshot/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_bzip2 yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 ae7a59880ec608c06b96225d6fa187793407e452 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4c8bc918b350a3b350d83a6e4d10db5b836f76765139fd54bdf09f358ac24cc2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_xz yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 916c9a48c8bb14c657d91a5a07452e4db0caab98 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6f7d5b9f3089164eec7408d35b99194b17352cce436a4a95485b511bce2aab4b
</span>
categories devel security net
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,7 +25,8 @@ long_description The ssh library was designed to be used by \
</span>
homepage http://www.libssh.org
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#patchfiles
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-fix-config-parsing.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix-config-buffer-underflow.patch
</span>
depends_build-append \
port:pkgconfig
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libssh/files/patch-fix-config-buffer-underflow.patch b/devel/libssh/files/patch-fix-config-buffer-underflow.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..95d3f03
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libssh/files/patch-fix-config-buffer-underflow.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 0cffb88b80b1e8b7e292646b955e9b9ca02315c4 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Aris Adamantiadis <aris@0xbadc0de.be>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Thu, 8 Jun 2017 00:22:02 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: config: fix buffer underflow with unrecognized opcodes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/config.c | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/config.c b/src/config.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 519926e7..6187c90f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/config.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/config.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -218,7 +218,7 @@ static int ssh_config_parse_line(ssh_session session, const char *line,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ opcode = ssh_config_get_opcode(keyword);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (*parsing == 1 && opcode != SOC_HOST) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (*parsing == 1 && opcode != SOC_HOST && opcode != SOC_UNSUPPORTED) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (seen[opcode] != 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cgit v1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libssh/files/patch-fix-config-parsing.diff b/devel/libssh/files/patch-fix-config-parsing.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..f5101b8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libssh/files/patch-fix-config-parsing.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,32 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 5333be5988c3789e7011598995f4df90d50d84d0 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: "Artyom V. Poptsov" <poptsov.artyom@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun, 4 Jun 2017 11:54:55 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: config: Bugfix: Don't skip unseen opcodes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+libssh fails to read the configuration from a config file due to a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+wrong check in 'ssh_config_parse_line' procedure in 'config.c'; it's
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+effectively skipping every opcode (and therefore every option) from
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+the file. The change fixes that behaviour.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: Artyom V. Poptsov <poptsov.artyom@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/config.c | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/config.c b/src/config.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6478fc5f..519926e7 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/config.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/config.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -219,7 +219,7 @@ static int ssh_config_parse_line(ssh_session session, const char *line,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ opcode = ssh_config_get_opcode(keyword);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (*parsing == 1 && opcode != SOC_HOST) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (seen[opcode] == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (seen[opcode] != 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ seen[opcode] = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cgit v1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>