From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CC9C5138350 for ; Sun, 26 Jan 2020 10:55:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 05881E083B; Sun, 26 Jan 2020 10:55:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2BF4DE083B for ; Sun, 26 Jan 2020 10:55:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1161634E13D for ; Sun, 26 Jan 2020 10:55:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AAC7F3E for ; Sun, 26 Jan 2020 10:55:03 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1580036089.78a2814f6e83699b6d46d6d28097e5a5d0fbecc4.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/, net-libs/libssh/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/libssh/Manifest net-libs/libssh/files/libssh-0.9.0-libressl.patch net-libs/libssh/libssh-0.9.0.ebuild X-VCS-Directories: net-libs/libssh/ net-libs/libssh/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 78a2814f6e83699b6d46d6d28097e5a5d0fbecc4 X-VCS-Branch: master Date: Sun, 26 Jan 2020 10:55:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 70115e3f-a868-4621-8601-97bd222cf56f X-Archives-Hash: 5637de2b801d025cb18857c3d7364249 commit: 78a2814f6e83699b6d46d6d28097e5a5d0fbecc4 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jan 26 10:53:50 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jan 26 10:54:49 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78a2814f net-libs/libssh: Drop 0.9.0 Bug: https://bugs.gentoo.org/701598 Package-Manager: Portage-2.3.85, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> net-libs/libssh/Manifest | 1 - net-libs/libssh/files/libssh-0.9.0-libressl.patch | 33 ------ net-libs/libssh/libssh-0.9.0.ebuild | 117 ---------------------- 3 files changed, 151 deletions(-) diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest index 514dfeaaa99..46c2c2c9b3f 100644 --- a/net-libs/libssh/Manifest +++ b/net-libs/libssh/Manifest @@ -1,2 +1 @@ -DIST libssh-0.9.0.tar.xz 487628 BLAKE2B 43c9c889160089f8ab4ce9d486e1892ef9fb7941d7473baf2c27e3fe05da0299bd8a7fa5c4392f24411ec0970f61fc302fbe18b8c807efe07d65f6fc326467e3 SHA512 8c91b31e49652d93c295ca62c2ff1ae30f26c263195a8bc2390e44f6e688959507f609125d342ee8180fc03cec2d73258ac72f864696281b53ba9ad244060865 DIST libssh-0.9.3.tar.xz 500068 BLAKE2B 9532db5f0fd9a6f4167f57dc25a1131f7483aff2f0fa659d967b21a7eff8507843c09dae1fe8161c9b41aed1bb1dae6d619a35122812d3d9b4c71f78ff1817e2 SHA512 6e59718565daeca6d224426cc1095a112deff9af8e0b021917e04f08bb7409263c35724de95f591f38e26f0fb3bbbbc69b679b6775edc21dec158d241b076c6f diff --git a/net-libs/libssh/files/libssh-0.9.0-libressl.patch b/net-libs/libssh/files/libssh-0.9.0-libressl.patch deleted file mode 100644 index 355e832308e..00000000000 --- a/net-libs/libssh/files/libssh-0.9.0-libressl.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 08bdd5b26388f92867ab03e36d73e32481faed88 Mon Sep 17 00:00:00 2001 -From: Stefan Strogin -Date: Mon, 1 Jul 2019 13:35:09 +0300 -Subject: [PATCH] libcrypto: fix compilation with LibreSSL - -LibreSSL does not support FIPS, so do not check it. - -Signed-off-by: Stefan Strogin -Upstream-Status: Submitted -[https://www.libssh.org/archive/libssh/2019-07/0000000.html] ---- - include/libssh/libcrypto.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/include/libssh/libcrypto.h b/include/libssh/libcrypto.h -index 541912b5..1a1df635 100644 ---- a/include/libssh/libcrypto.h -+++ b/include/libssh/libcrypto.h -@@ -112,7 +112,11 @@ typedef BN_CTX* bignum_CTX; - - - /* Returns true if the OpenSSL is operating in FIPS mode */ -+#ifndef LIBRESSL_VERSION_NUMBER - #define ssh_fips_mode() (FIPS_mode() != 0) -+#else -+#define ssh_fips_mode() false -+#endif - - #endif /* HAVE_LIBCRYPTO */ - --- -2.22.0 - diff --git a/net-libs/libssh/libssh-0.9.0.ebuild b/net-libs/libssh/libssh-0.9.0.ebuild deleted file mode 100644 index 32102181030..00000000000 --- a/net-libs/libssh/libssh-0.9.0.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_ECLASS=cmake -inherit cmake-multilib - -DESCRIPTION="Access a working SSH implementation by means of a library" -HOMEPAGE="https://www.libssh.org/" - -if [[ "${PV}" == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git" -else - SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" -fi - -LICENSE="LGPL-2.1" -SLOT="0/4" # subslot = soname major version -IUSE="debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp static-libs test zlib" -RESTRICT="!test? ( test )" -# Maintainer: check IUSE-defaults at DefineOptions.cmake - -REQUIRED_USE="?? ( gcrypt mbedtls ) test? ( static-libs )" - -RDEPEND=" - !gcrypt? ( - !mbedtls? ( - !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) - libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] ) - ) - ) - gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] ) - gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) - mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] ) - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) -" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen[dot] ) - test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] ) -" - -DOCS=( AUTHORS README ChangeLog ) - -PATCHES=( - "${FILESDIR}/${PN}-0.8.0-tests.patch" - "${FILESDIR}/${PN}-0.9.0-libressl.patch" -) - -src_prepare() { - cmake_src_prepare - - # just install the examples, do not compile them - cmake_comment_add_subdirectory examples - - # keyfile torture test is currently broken - sed -e "/torture_keyfiles/d" \ - -i tests/unittests/CMakeLists.txt || die - - # disable tests that take too long (bug #677006) - if use sparc; then - sed -e "/torture_threads_pki_rsa/d" -e "/torture_pki_dsa/d" \ - -i tests/unittests/CMakeLists.txt || die - fi - - sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \ - -i ConfigureChecks.cmake || die -} - -multilib_src_configure() { - local mycmakeargs=( - -DWITH_NACL=OFF - -DWITH_STACK_PROTECTOR=OFF - -DWITH_STACK_PROTECTOR_STRONG=OFF - -DWITH_DEBUG_CALLTRACE="$(usex debug)" - -DWITH_DEBUG_CRYPTO="$(usex debug)" - -DWITH_GCRYPT="$(usex gcrypt)" - -DWITH_GSSAPI="$(usex gssapi)" - -DWITH_MBEDTLS="$(usex mbedtls)" - -DWITH_PCAP="$(usex pcap)" - -DWITH_SERVER="$(usex server)" - -DWITH_SFTP="$(usex sftp)" - -DWITH_STATIC_LIB="$(usex static-libs)" - -DUNIT_TESTING="$(usex test)" - -DWITH_ZLIB="$(usex zlib)" - ) - - multilib_is_native_abi || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON ) - - cmake_src_configure -} - -multilib_src_compile() { - cmake_src_compile - multilib_is_native_abi && use doc && cmake_src_compile docs -} - -multilib_src_install() { - cmake_src_install - multilib_is_native_abi && use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/. ) - - # compatibility symlink until all consumers have been updated - # to no longer use libssh_threads.so - dosym libssh.so /usr/$(get_libdir)/libssh_threads.so -} - -multilib_src_install_all() { - use mbedtls && DOCS+=( README.mbedtls ) - einstalldocs - - if use examples; then - docinto examples - dodoc examples/*.{c,h,cpp} - fi -}