<pre style='margin:0'>
Clemens Lang (neverpanic) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/949ea1055b84faddd955f8103c161ddfabfe0d93">https://github.com/macports/macports-ports/commit/949ea1055b84faddd955f8103c161ddfabfe0d93</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 949ea1055b84faddd955f8103c161ddfabfe0d93
</span>Author: Clemens Lang <cal@macports.org>
AuthorDate: Thu Feb 14 23:22:04 2019 +0100
<span style='display:block; white-space:pre;color:#404040;'> libssh: Update to 0.8.6
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/58026
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/57968
</span>---
devel/libssh/Portfile | 18 +++++-------
.../files/patch-fix-config-buffer-underflow.patch | 25 -----------------
devel/libssh/files/patch-fix-config-parsing.diff | 32 ----------------------
3 files changed, 7 insertions(+), 68 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 a7116f2..6d794b3 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;'>@@ -1,16 +1,17 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cmake 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span>
name libssh
epoch 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.7.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites https://git.libssh.org/projects/libssh.git/snapshot/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.8.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set major [join [lrange [split ${version} .] 0 1] .]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://www.libssh.org/files/${major}
</span> use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 916c9a48c8bb14c657d91a5a07452e4db0caab98 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6f7d5b9f3089164eec7408d35b99194b17352cce436a4a95485b511bce2aab4b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 7f83581296ec7eee3165bb37a8a79a4cd906de22 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 1046b95632a07fc00b1ea70ee683072d0c8a23f544f4535440b727812002fd01 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 433680
</span>
categories devel security net
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,9 +26,6 @@ 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 patch-fix-config-parsing.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-fix-config-buffer-underflow.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_build-append \
port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,8 +38,6 @@ post-extract {
</span> file mkdir ${workpath}/build
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-cmake.out_of_source yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # -isystem has the added benefit of moving the include
# directory specified to the end of the include path list.
# This will help the build system respect custom include
<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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 95d3f03..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libssh/files/patch-fix-config-buffer-underflow.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,25 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 0cffb88b80b1e8b7e292646b955e9b9ca02315c4 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Aris Adamantiadis <aris@0xbadc0de.be>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Thu, 8 Jun 2017 00:22:02 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: config: fix buffer underflow with unrecognized opcodes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/config.c | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/config.c b/src/config.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 519926e7..6187c90f 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/config.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/config.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -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:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- opcode = ssh_config_get_opcode(keyword);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (*parsing == 1 && opcode != SOC_HOST) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (*parsing == 1 && opcode != SOC_HOST && opcode != SOC_UNSUPPORTED) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (seen[opcode] != 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-cgit v1.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f5101b8..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libssh/files/patch-fix-config-parsing.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,32 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 5333be5988c3789e7011598995f4df90d50d84d0 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: "Artyom V. Poptsov" <poptsov.artyom@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sun, 4 Jun 2017 11:54:55 +0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: config: Bugfix: Don't skip unseen opcodes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libssh fails to read the configuration from a config file due to a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-wrong check in 'ssh_config_parse_line' procedure in 'config.c'; it's
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-effectively skipping every opcode (and therefore every option) from
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-the file. The change fixes that behaviour.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: Artyom V. Poptsov <poptsov.artyom@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/config.c | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/config.c b/src/config.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 6478fc5f..519926e7 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/config.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/config.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -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:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- opcode = ssh_config_get_opcode(keyword);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (*parsing == 1 && opcode != SOC_HOST) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (seen[opcode] == 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (seen[opcode] != 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- seen[opcode] = 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-cgit v1.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>