Ticket #58026: libssh.diff

File libssh.diff, 4.1 KB (added by RJVB (René Bertin), 6 years ago)
  • devel/libssh/Portfile

    diff --git a/devel/libssh/Portfile b/devel/libssh/Portfile
    index a7116f24c3..6d794b321b 100644
    a b  
    11# -*- 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
    22
    33PortSystem          1.0
    4 PortGroup           cmake 1.0
     4PortGroup           cmake 1.1
    55
    66name                libssh
    77epoch               1
    8 version             0.7.5
    9 revision            0
    10 master_sites        https://git.libssh.org/projects/libssh.git/snapshot/
     8version             0.8.6
     9set major           [join [lrange [split ${version} .] 0 1] .]
     10master_sites        https://www.libssh.org/files/${major}
    1111use_xz              yes
    12 checksums           rmd160  916c9a48c8bb14c657d91a5a07452e4db0caab98 \
    13                     sha256  6f7d5b9f3089164eec7408d35b99194b17352cce436a4a95485b511bce2aab4b
     12checksums           rmd160  7f83581296ec7eee3165bb37a8a79a4cd906de22 \
     13                    sha256  1046b95632a07fc00b1ea70ee683072d0c8a23f544f4535440b727812002fd01 \
     14                    size    433680
    1415
    1516categories          devel security net
    1617platforms           darwin
    long_description The ssh library was designed to be used by \ 
    2526
    2627homepage            http://www.libssh.org
    2728
    28 patchfiles          patch-fix-config-parsing.diff \
    29                     patch-fix-config-buffer-underflow.patch
    30 
    3129depends_build-append \
    3230                    port:pkgconfig
    3331
    post-extract { 
    4038    file mkdir ${workpath}/build
    4139}
    4240
    43 cmake.out_of_source yes
    44 
    4541# -isystem has the added benefit of moving the include
    4642# directory specified to the end of the include path list.
    4743# This will help the build system respect custom include
  • deleted file devel/libssh/files/patch-fix-config-buffer-underflow.patch

    diff --git a/devel/libssh/files/patch-fix-config-buffer-underflow.patch b/devel/libssh/files/patch-fix-config-buffer-underflow.patch
    deleted file mode 100644
    index 95d3f03309..0000000000
    + -  
    1 From 0cffb88b80b1e8b7e292646b955e9b9ca02315c4 Mon Sep 17 00:00:00 2001
    2 From: Aris Adamantiadis <aris@0xbadc0de.be>
    3 Date: Thu, 8 Jun 2017 00:22:02 +0200
    4 Subject: config: fix buffer underflow with unrecognized opcodes
    5 
    6 ---
    7  src/config.c | 2 +-
    8  1 file changed, 1 insertion(+), 1 deletion(-)
    9 
    10 diff --git a/src/config.c b/src/config.c
    11 index 519926e7..6187c90f 100644
    12 --- src/config.c.orig
    13 +++ src/config.c
    14 @@ -218,7 +218,7 @@ static int ssh_config_parse_line(ssh_session session, const char *line,
    15    }
    16  
    17    opcode = ssh_config_get_opcode(keyword);
    18 -  if (*parsing == 1 && opcode != SOC_HOST) {
    19 +  if (*parsing == 1 && opcode != SOC_HOST && opcode != SOC_UNSUPPORTED) {
    20        if (seen[opcode] != 0) {
    21            return 0;
    22        }
    23 --
    24 cgit v1.1
    25 
  • deleted file devel/libssh/files/patch-fix-config-parsing.diff

    diff --git a/devel/libssh/files/patch-fix-config-parsing.diff b/devel/libssh/files/patch-fix-config-parsing.diff
    deleted file mode 100644
    index f5101b8b91..0000000000
    + -  
    1 From 5333be5988c3789e7011598995f4df90d50d84d0 Mon Sep 17 00:00:00 2001
    2 From: "Artyom V. Poptsov" <poptsov.artyom@gmail.com>
    3 Date: Sun, 4 Jun 2017 11:54:55 +0300
    4 Subject: config: Bugfix: Don't skip unseen opcodes
    5 
    6 libssh fails to read the configuration from a config file due to a
    7 wrong check in 'ssh_config_parse_line' procedure in 'config.c'; it's
    8 effectively skipping every opcode (and therefore every option) from
    9 the file.  The change fixes that behaviour.
    10 
    11 Signed-off-by: Artyom V. Poptsov <poptsov.artyom@gmail.com>
    12 Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
    13 ---
    14  src/config.c | 2 +-
    15  1 file changed, 1 insertion(+), 1 deletion(-)
    16 
    17 diff --git a/src/config.c b/src/config.c
    18 index 6478fc5f..519926e7 100644
    19 --- src/config.c.orig
    20 +++ src/config.c
    21 @@ -219,7 +219,7 @@ static int ssh_config_parse_line(ssh_session session, const char *line,
    22  
    23    opcode = ssh_config_get_opcode(keyword);
    24    if (*parsing == 1 && opcode != SOC_HOST) {
    25 -      if (seen[opcode] == 0) {
    26 +      if (seen[opcode] != 0) {
    27            return 0;
    28        }
    29        seen[opcode] = 1;
    30 --
    31 cgit v1.1
    32