CVS commit: pkgsrc/security/libssh

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Sep 13 09:22:57 UTC 2020

Modified Files:
        pkgsrc/security/libssh: Makefile PLIST buildlink3.mk distinfo

Log Message:
libssh: update to 0.95.

version 0.9.5 (released 2020-XX-XX)
  * CVE-2020-16135: Avoid null pointer dereference in sftpserver (T232)
  * Improve handling of library initialization (T222)
  * Fix parsing of subsecond times in SFTP (T219)
  * Make the documentation reproducible
  * Remove deprecated API usage in OpenSSL
  * Fix regression of ssh_channel_poll_timeout() returning SSH_AGAIN
  * Define version in one place (T226)
  * Prevent invalid free when using different C runtimes than OpenSSL (T229)
  * Compatibility improvements to testsuite


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 pkgsrc/security/libssh/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/security/libssh/PLIST
cvs rdiff -u -r1.19 -r1.20 pkgsrc/security/libssh/buildlink3.mk
cvs rdiff -u -r1.23 -r1.24 pkgsrc/security/libssh/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/libssh/Makefile
diff -u pkgsrc/security/libssh/Makefile:1.38 pkgsrc/security/libssh/Makefile:1.39
--- pkgsrc/security/libssh/Makefile:1.38        Wed Sep  2 11:45:51 2020
+++ pkgsrc/security/libssh/Makefile     Sun Sep 13 09:22:57 2020
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.38 2020/09/02 11:45:51 nia Exp $
+# $NetBSD: Makefile,v 1.39 2020/09/13 09:22:57 wiz Exp $
 #
 # history: upstream renamed 0.11 to 0.1.1;
 # we have to use the old-style convention so that version compares work.
 
-VER=           0.9.4
+VER=           0.9.5
 DISTNAME=      libssh-${VER}
-PKGNAME=       libssh-0.94
-PKGREVISION=   1
+PKGNAME=       libssh-0.95
 CATEGORIES=    security
 MASTER_SITES=  https://www.libssh.org/files/${VER:R}/
 EXTRACT_SUFX=  .tar.xz
@@ -21,7 +20,7 @@ USE_LANGUAGES=                c c++
 PKGCONFIG_OVERRIDE+=   libssh.pc.cmake
 TEST_TARGET=           test
 
-CONFIGURE_DIRS=                ${WRKDIR}/build
+CONFIGURE_DIRS=                build
 CMAKE_ARG_PATH=                ${WRKSRC}
 CMAKE_ARGS+=           -DUNIT_TESTING=ON
 CMAKE_ARGS+=           -DWITH_EXAMPLES=OFF
@@ -33,7 +32,7 @@ BUILDLINK_TRANSFORM+= rm:-Werror=strict-
 .include "options.mk"
 
 post-extract:
-       ${MKDIR} ${WRKDIR}/build
+       ${MKDIR} ${WRKSRC}/build
 
 .include "../../devel/argp/buildlink3.mk"
 .include "../../devel/cmocka/buildlink3.mk"

Index: pkgsrc/security/libssh/PLIST
diff -u pkgsrc/security/libssh/PLIST:1.16 pkgsrc/security/libssh/PLIST:1.17
--- pkgsrc/security/libssh/PLIST:1.16   Sun Apr 12 21:05:01 2020
+++ pkgsrc/security/libssh/PLIST        Sun Sep 13 09:22:57 2020
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.16 2020/04/12 21:05:01 wiz Exp $
+@comment $NetBSD: PLIST,v 1.17 2020/09/13 09:22:57 wiz Exp $
 include/libssh/callbacks.h
 include/libssh/legacy.h
 include/libssh/libssh.h
+include/libssh/libssh_version.h
 include/libssh/libsshpp.hpp
 include/libssh/server.h
 include/libssh/sftp.h
@@ -11,5 +12,5 @@ lib/cmake/libssh/libssh-config-version.c
 lib/cmake/libssh/libssh-config.cmake
 lib/libssh.so
 lib/libssh.so.4
-lib/libssh.so.4.8.5
+lib/libssh.so.4.8.6
 lib/pkgconfig/libssh.pc

Index: pkgsrc/security/libssh/buildlink3.mk
diff -u pkgsrc/security/libssh/buildlink3.mk:1.19 pkgsrc/security/libssh/buildlink3.mk:1.20
--- pkgsrc/security/libssh/buildlink3.mk:1.19   Sat Jan 18 21:48:23 2020
+++ pkgsrc/security/libssh/buildlink3.mk        Sun Sep 13 09:22:57 2020
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2020/01/18 21:48:23 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2020/09/13 09:22:57 wiz Exp $
 
 BUILDLINK_TREE+=       libssh
 
@@ -12,7 +12,7 @@ BUILDLINK_PKGSRCDIR.libssh?=  ../../secur
 pkgbase := libssh
 .include "../../mk/pkg-build-options.mk"
 
-.if !empty(PKG_BUILD_OPTIONS.libssh:Mopenssl)
+.if ${PKG_BUILD_OPTIONS.libssh:Mopenssl}
 .include "../../security/openssl/buildlink3.mk"
 .endif
 

Index: pkgsrc/security/libssh/distinfo
diff -u pkgsrc/security/libssh/distinfo:1.23 pkgsrc/security/libssh/distinfo:1.24
--- pkgsrc/security/libssh/distinfo:1.23        Mon Jul 20 15:56:24 2020
+++ pkgsrc/security/libssh/distinfo     Sun Sep 13 09:22:57 2020
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.23 2020/07/20 15:56:24 micha Exp $
+$NetBSD: distinfo,v 1.24 2020/09/13 09:22:57 wiz Exp $
 
-SHA1 (libssh-0.9.4.tar.xz) = 93289b77379263328c843fa85ba5ed4b274b689f
-RMD160 (libssh-0.9.4.tar.xz) = 4d1323a8ee50d54d66151177002fd9d12d696fed
-SHA512 (libssh-0.9.4.tar.xz) = 38705c19c293ea5e6d286d22eb17021dbe58d88c1e647b699933aa0db9ca1174d43d1ff76c1a1b17bf2cc1a8297ec02f1a67dd9e969676dd69cf6fbdae9bc8d4
-Size (libssh-0.9.4.tar.xz) = 500776 bytes
+SHA1 (libssh-0.9.5.tar.xz) = cac8772e6bea068e4defea067d4290991d566964
+RMD160 (libssh-0.9.5.tar.xz) = 2ebc61443caa488bacdffe363775129e88c83f8a
+SHA512 (libssh-0.9.5.tar.xz) = 64e692a0bfa7f73585ea7b7b8b1d4c9a7f9be59565bfd4de32ca8cd9db121f87e7ad51f5c80269fbd99545af34dcf1894374ed8a6d6c1ac5f8601c026572ac18
+Size (libssh-0.9.5.tar.xz) = 502876 bytes
 SHA1 (patch-CompilerChecks.cmake) = 77b93572006132c557cb9a57698e8455f7874073
 SHA1 (patch-examples_sshd__direct-tcpip.c) = 62de8625d58dbc03c38b0eb23f6e7f20a46e91de
 SHA1 (patch-tests_torture.c) = 2c70e9d827f15ec36a62e0d0f5dd98774f24f79e