Ticket #58026: libssh.diff

devel/libssh/Portfile

@@ -1 +1 @@
 # -*- 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
-PortGroup           cmake 1.0
+PortGroup           cmake 1.1
 
 name                libssh
 epoch               1
-version             0.7.5
-revision            0
-master_sites        https://git.libssh.org/projects/libssh.git/snapshot/
+version             0.8.6
+set major           [join [lrange [split ${version} .] 0 1] .]
+master_sites        https://www.libssh.org/files/${major}
 use_xz              yes
-checksums           rmd160  916c9a48c8bb14c657d91a5a07452e4db0caab98 \
-                    sha256  6f7d5b9f3089164eec7408d35b99194b17352cce436a4a95485b511bce2aab4b
+checksums           rmd160  7f83581296ec7eee3165bb37a8a79a4cd906de22 \
+                    sha256  1046b95632a07fc00b1ea70ee683072d0c8a23f544f4535440b727812002fd01 \
+                    size    433680
 
 categories          devel security net
 platforms           darwin
@@ -25 +26 @@
 
 homepage            http://www.libssh.org
 
-patchfiles          patch-fix-config-parsing.diff \
-                    patch-fix-config-buffer-underflow.patch
-
 depends_build-append \
                     port:pkgconfig
 
@@ -40 +38 @@
     file mkdir ${workpath}/build
 }
 
-cmake.out_of_source yes
-
 # -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

deleted file devel/libssh/files/patch-fix-config-buffer-underflow.patch

@@ -1 @@
-From 0cffb88b80b1e8b7e292646b955e9b9ca02315c4 Mon Sep 17 00:00:00 2001
-From: Aris Adamantiadis <aris@0xbadc0de.be>
-Date: Thu, 8 Jun 2017 00:22:02 +0200
-Subject: config: fix buffer underflow with unrecognized opcodes
-
----
- src/config.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/config.c b/src/config.c
-index 519926e7..6187c90f 100644
---- src/config.c.orig
-+++ src/config.c
-@@ -218,7 +218,7 @@ static int ssh_config_parse_line(ssh_session session, const char *line,
-   }
- 
-   opcode = ssh_config_get_opcode(keyword);
--  if (*parsing == 1 && opcode != SOC_HOST) {
-+  if (*parsing == 1 && opcode != SOC_HOST && opcode != SOC_UNSUPPORTED) {
-       if (seen[opcode] != 0) {
-           return 0;
-       }
--- 
-cgit v1.1
-

deleted file devel/libssh/files/patch-fix-config-parsing.diff

@@ -1 @@
-From 5333be5988c3789e7011598995f4df90d50d84d0 Mon Sep 17 00:00:00 2001
-From: "Artyom V. Poptsov" <poptsov.artyom@gmail.com>
-Date: Sun, 4 Jun 2017 11:54:55 +0300
-Subject: config: Bugfix: Don't skip unseen opcodes
-
-libssh fails to read the configuration from a config file due to a
-wrong check in 'ssh_config_parse_line' procedure in 'config.c'; it's
-effectively skipping every opcode (and therefore every option) from
-the file.  The change fixes that behaviour.
-
-Signed-off-by: Artyom V. Poptsov <poptsov.artyom@gmail.com>
-Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
----
- src/config.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/config.c b/src/config.c
-index 6478fc5f..519926e7 100644
---- src/config.c.orig
-+++ src/config.c
-@@ -219,7 +219,7 @@ static int ssh_config_parse_line(ssh_session session, const char *line,
- 
-   opcode = ssh_config_get_opcode(keyword);
-   if (*parsing == 1 && opcode != SOC_HOST) {
--      if (seen[opcode] == 0) {
-+      if (seen[opcode] != 0) {
-           return 0;
-       }
-       seen[opcode] = 1;
--- 
-cgit v1.1
-