pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/security/libssh
Module Name: pkgsrc
Committed By: adam
Date: Mon Dec 3 15:19:51 UTC 2018
Modified Files:
pkgsrc/security/libssh: Makefile PLIST buildlink3.mk distinfo
options.mk
Added Files:
pkgsrc/security/libssh/patches: patch-CompilerChecks.cmake
Removed Files:
pkgsrc/security/libssh/patches: patch-aa
patch-cmake_Modules_DefineCompilerFlags.cmake
Log Message:
libssh: updated to 0.8.5
version 0.8.5:
* Added support to get known_hosts locations with ssh_options_get()
* Fixed preferred algorithm for known hosts negotiations
* Fixed KEX with some server implementations (e.g. Cisco)
* Fixed issues with MSVC
* Fixed keyboard-interactive auth in server mode
(regression from CVE-2018-10933)
* Fixed gssapi auth in server mode (regression from CVE-2018-10933)
* Fixed socket fd handling with proxy command
* Fixed a memory leak with OpenSSL
version 0.8.4:
* Fixed CVE-2018-10933
* Fixed building without globbing support
* Fixed possible memory leaks
* Avoid SIGPIPE on sockets
version 0.8.3:
* Added support for rsa-sha2
* Added support to parse private keys in openssh container format
(other than ed25519)
* Added support for diffie-hellman-group18-sha512 and
diffie-hellman-group16-sha512
* Added ssh_get_fingerprint_hash()
* Added ssh_pki_export_privkey_base64()
* Added support for Match keyword in config file
* Improved performance and reduced memory footprint for sftp
* Fixed ecdsa publickey auth
* Fixed reading a closed channel
* Added support to announce posix-rename%openssh.com@localhost and
hardlink%openssh.com@localhost in the sftp server
version 0.8.2:
* Added sha256 fingerprints for pubkeys
* Improved compiler flag detection
* Fixed race condition in reading sftp messages
* Fixed doxygen generation and added modern style
* Fixed library initialization on Windows
* Fixed __bounded__ attribute detection
* Fixed a bug in the options parser
* Fixed documentation for new knwon_hosts API
version 0.8.1:
* Fixed version number in the header
* Fixed version number in pkg-config and cmake config
* Fixed library initialization
* Fixed attribute detection
version 0.8.0:
* Removed support for deprecated SSHv1 protocol
* Added new connector API for clients
* Added new known_hosts parsing API
* Added support for OpenSSL 1.1
* Added support for chacha20-poly1305 cipher
* Added crypto backend for mbedtls crypto library
* Added ECDSA support with gcrypt backend
* Added advanced client and server testing using cwrap.org
* Added support for curve25519-sha256 alias
* Added support for global known_hosts file
* Added support for symbol versioning
* Improved ssh_config parsing
* Improved threading support
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/security/libssh/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/security/libssh/PLIST
cvs rdiff -u -r1.17 -r1.18 pkgsrc/security/libssh/buildlink3.mk
cvs rdiff -u -r1.13 -r1.14 pkgsrc/security/libssh/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/libssh/options.mk
cvs rdiff -u -r0 -r1.1 \
pkgsrc/security/libssh/patches/patch-CompilerChecks.cmake
cvs rdiff -u -r1.6 -r0 pkgsrc/security/libssh/patches/patch-aa
cvs rdiff -u -r1.1 -r0 \
pkgsrc/security/libssh/patches/patch-cmake_Modules_DefineCompilerFlags.cmake
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.24 pkgsrc/security/libssh/Makefile:1.25
--- pkgsrc/security/libssh/Makefile:1.24 Tue Oct 16 20:25:25 2018
+++ pkgsrc/security/libssh/Makefile Mon Dec 3 15:19:51 2018
@@ -1,31 +1,36 @@
-# $NetBSD: Makefile,v 1.24 2018/10/16 20:25:25 maya Exp $
+# $NetBSD: Makefile,v 1.25 2018/12/03 15:19:51 adam 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.7.6
-DISTNAME= libssh-${VER}
-PKGNAME= libssh-0.76
-CATEGORIES= security
-MASTER_SITES= https://www.libssh.org/files/0.7/
-EXTRACT_SUFX= .tar.xz
-
-MAINTAINER= is%NetBSD.org@localhost
-HOMEPAGE= http://www.libssh.org/
-COMMENT= SSHv2+v1 protocol library
-LICENSE= 2-clause-bsd
-DIST_SUBDIR= security
+VER= 0.8.5
+DISTNAME= libssh-${VER}
+PKGNAME= libssh-0.85
+CATEGORIES= security
+MASTER_SITES= https://www.libssh.org/files/${VER:R}/
+EXTRACT_SUFX= .tar.xz
+
+MAINTAINER= is%NetBSD.org@localhost
+HOMEPAGE= http://www.libssh.org/
+COMMENT= SSHv2+v1 protocol library
+LICENSE= 2-clause-bsd
USE_CMAKE= yes
USE_LANGUAGES= c c++
-CMAKE_ARGS+= WITH_TESTING=yes
-
PKGCONFIG_OVERRIDE+= libssh.pc.in
-TEST_TARGET= check
+TEST_TARGET= test
+
+CONFIGURE_DIRS= ${WRKDIR}/build
+CMAKE_ARG_PATH= ${WRKSRC}
+CMAKE_ARGS+= -DUNIT_TESTING=ON
.include "options.mk"
+post-extract:
+ ${MKDIR} ${WRKDIR}/build
+
.include "../../devel/argp/buildlink3.mk"
+.include "../../devel/cmocka/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
+.include "../../mk/krb5.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/security/libssh/PLIST
diff -u pkgsrc/security/libssh/PLIST:1.8 pkgsrc/security/libssh/PLIST:1.9
--- pkgsrc/security/libssh/PLIST:1.8 Tue Oct 16 20:25:25 2018
+++ pkgsrc/security/libssh/PLIST Mon Dec 3 15:19:51 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2018/10/16 20:25:25 maya Exp $
+@comment $NetBSD: PLIST,v 1.9 2018/12/03 15:19:51 adam Exp $
include/libssh/callbacks.h
include/libssh/legacy.h
include/libssh/libssh.h
@@ -10,9 +10,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.4.3
-lib/libssh_threads.so
-lib/libssh_threads.so.4
-lib/libssh_threads.so.4.4.3
+lib/libssh.so.4.7.2
lib/pkgconfig/libssh.pc
-lib/pkgconfig/libssh_threads.pc
Index: pkgsrc/security/libssh/buildlink3.mk
diff -u pkgsrc/security/libssh/buildlink3.mk:1.17 pkgsrc/security/libssh/buildlink3.mk:1.18
--- pkgsrc/security/libssh/buildlink3.mk:1.17 Sun Oct 9 22:02:07 2016
+++ pkgsrc/security/libssh/buildlink3.mk Mon Dec 3 15:19:51 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2016/10/09 22:02:07 kamil Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2018/12/03 15:19:51 adam Exp $
BUILDLINK_TREE+= libssh
@@ -12,15 +12,13 @@ BUILDLINK_PKGSRCDIR.libssh?= ../../secur
pkgbase := libssh
.include "../../mk/pkg-build-options.mk"
-.if !empty(PKG_BUILD_OPTIONS.libssh:Mzlib)
-.include "../../devel/zlib/buildlink3.mk"
-.endif
-
.if !empty(PKG_BUILD_OPTIONS.libssh:Mopenssl)
.include "../../security/openssl/buildlink3.mk"
.endif
.include "../../devel/argp/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../mk/krb5.buildlink3.mk"
.endif # LIBSSH_BUILDLINK3_MK
BUILDLINK_TREE+= -libssh
Index: pkgsrc/security/libssh/distinfo
diff -u pkgsrc/security/libssh/distinfo:1.13 pkgsrc/security/libssh/distinfo:1.14
--- pkgsrc/security/libssh/distinfo:1.13 Tue Oct 16 20:25:25 2018
+++ pkgsrc/security/libssh/distinfo Mon Dec 3 15:19:51 2018
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.13 2018/10/16 20:25:25 maya Exp $
+$NetBSD: distinfo,v 1.14 2018/12/03 15:19:51 adam Exp $
-SHA1 (security/libssh-0.7.6.tar.xz) = 8e5f23a861f84fa214ca1da0e3f98b839ff7c051
-RMD160 (security/libssh-0.7.6.tar.xz) = 7316fae4a5355cf2c511cd91a5a65d7354ab361f
-SHA512 (security/libssh-0.7.6.tar.xz) = 2a01402b5a9fab9ecc29200544ed45d3f2c40871ed1c8241ca793f8dc7fdb3ad2150f6a522c4321affa9b8778e280dc7ed10f76adfc4a73f0751ae735a42f56c
-Size (security/libssh-0.7.6.tar.xz) = 366556 bytes
-SHA1 (patch-aa) = 2f9a7c8a629188f40f3c94d4304b1e44720e45ae
-SHA1 (patch-cmake_Modules_DefineCompilerFlags.cmake) = 9f140ad664363953e4c7ff4e3bede74c693da993
+SHA1 (libssh-0.8.5.tar.xz) = b5564774f986e396a7288a593595455bf10d9ce8
+RMD160 (libssh-0.8.5.tar.xz) = a118e08705257814531ce6c01d2d48cf0d6e59ce
+SHA512 (libssh-0.8.5.tar.xz) = f1e90a5046e006d44a48ab36675167761d8e308ada7a1d7a1f7ba2825d222a2fab7e19dbc78b1371fee9ba74d9c55d9856a623f97842c9b9ad4c79215e344124
+Size (libssh-0.8.5.tar.xz) = 427372 bytes
+SHA1 (patch-CompilerChecks.cmake) = 86de41ab778d25368691c1b0b9ecfa653f24cc5d
Index: pkgsrc/security/libssh/options.mk
diff -u pkgsrc/security/libssh/options.mk:1.3 pkgsrc/security/libssh/options.mk:1.4
--- pkgsrc/security/libssh/options.mk:1.3 Thu Jan 25 19:52:38 2018
+++ pkgsrc/security/libssh/options.mk Mon Dec 3 15:19:51 2018
@@ -1,19 +1,12 @@
-# $NetBSD: options.mk,v 1.3 2018/01/25 19:52:38 markd Exp $
+# $NetBSD: options.mk,v 1.4 2018/12/03 15:19:51 adam Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.libssh
PKG_OPTIONS_REQUIRED_GROUPS= crypto
PKG_OPTIONS_GROUP.crypto= openssl libgcrypt
-#PKG_SUPPORTED_OPTIONS= compression
-PKG_SUGGESTED_OPTIONS= openssl # XXX zlib
+PKG_SUGGESTED_OPTIONS= openssl
.include "../../mk/bsd.options.mk"
-.if !empty(PKG_OPTIONS:Mzlib)
-BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2
-CONFIGURE_ARGS+= --with-libz=${BUILDLINK_PREFIX.zlib:Q}
-.include "../../devel/zlib/buildlink3.mk"
-.endif
-
.if !empty(PKG_OPTIONS:Mopenssl)
BUILDLINK_API_DEPENDS.openssl+= openssl>=0.9.8
CMAKE_ARGS+= -DWITH_GCRYPT:BOOL=OFF
Added files:
Index: pkgsrc/security/libssh/patches/patch-CompilerChecks.cmake
diff -u /dev/null pkgsrc/security/libssh/patches/patch-CompilerChecks.cmake:1.1
--- /dev/null Mon Dec 3 15:19:51 2018
+++ pkgsrc/security/libssh/patches/patch-CompilerChecks.cmake Mon Dec 3 15:19:51 2018
@@ -0,0 +1,27 @@
+$NetBSD: patch-CompilerChecks.cmake,v 1.1 2018/12/03 15:19:51 adam Exp $
+
+Let PkgSrc handle security features.
+
+--- CompilerChecks.cmake.orig 2018-12-03 09:27:44.000000000 +0000
++++ CompilerChecks.cmake
+@@ -62,20 +62,7 @@ if (UNIX)
+ endif()
+ endif()
+
+- check_c_compiler_flag_ssp("-fstack-protector-strong" WITH_STACK_PROTECTOR_STRONG)
+- if (WITH_STACK_PROTECTOR_STRONG)
+- list(APPEND SUPPORTED_COMPILER_FLAGS "-fstack-protector-strong")
+- else (WITH_STACK_PROTECTOR_STRONG)
+- check_c_compiler_flag_ssp("-fstack-protector" WITH_STACK_PROTECTOR)
+- if (WITH_STACK_PROTECTOR)
+- list(APPEND SUPPORTED_COMPILER_FLAGS "-fstack-protector")
+- endif()
+- endif (WITH_STACK_PROTECTOR_STRONG)
+
+- check_c_compiler_flag_ssp("-fstack-clash-protection" WITH_STACK_CLASH_PROTECTION)
+- if (WITH_STACK_CLASH_PROTECTION)
+- list(APPEND SUPPORTED_COMPILER_FLAGS "-fstack-clash-protection")
+- endif()
+
+ if (PICKY_DEVELOPER)
+ add_c_compiler_flag("-Wno-error=deprecated-declarations" SUPPORTED_COMPILER_FLAGS)
Home |
Main Index |
Thread Index |
Old Index