mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
net-libs/libssh: drop 0.11.1-r1, 0.11.1-r2
Bug: https://bugs.gentoo.org/959101 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
@@ -1,2 +1 @@
|
||||
DIST libssh-0.11.1.tar.xz 621108 BLAKE2B 87079b4eaf66ceb77803b3d854f847b3f3fb6a67ac3bfa756ebcf8f06bf2b313e976044e0a1d81227fb5278fb04bc56f1a82877d14a6ee76bec0c690b14f38a7 SHA512 284d376ad9ea30b0274b4ac754b27d168286dca862ece43ef15ca6d89e66865ad7a6703cc12dd4a8564a60b8449ae9b36e6496fd51d34cc27ac4030f6cf216d6
|
||||
DIST libssh-0.11.2.tar.xz 619428 BLAKE2B 7f4a97b2027e386f5bfd308b1aac1938484722d4d1bb55ce0fa2de8358bedea47955df1cb4e68679033d1a5538058422770872f2f6513a82199ff506eccfad0e SHA512 15d56c3f82ee81c3ab4af2b17eba054626bb53c3337ef45f829479f8b64c552f6e7cbf307e41c9792bcb3438f282d2690acbe994150bd03a8b6c21ba8b1cfe50
|
||||
|
||||
@@ -1,55 +0,0 @@
|
||||
From https://gitlab.com/libssh/libssh-mirror/-/commit/7712c7d0f97241c68e520d600b5857ebfcfd7439
|
||||
From: Davidwed <davidwe@posteo.de>
|
||||
Date: Tue, 3 Sep 2024 11:43:32 +0200
|
||||
Subject: [PATCH] cmake: Fixed compatibility issues with "CPM.cmake" in
|
||||
combination with the libraries MBedTLS and libgcrypt.
|
||||
|
||||
Signed-off-by: Davidwed <davidwe@posteo.de>
|
||||
Reviewed-by: Jakub Jelen <jjelen@redhat.com>
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -1,6 +1,7 @@
|
||||
set(LIBSSH_PUBLIC_INCLUDE_DIRS ${libssh_SOURCE_DIR}/include)
|
||||
|
||||
set(LIBSSH_PRIVATE_INCLUDE_DIRS
|
||||
+ ${libssh_BINARY_DIR}/include
|
||||
${libssh_BINARY_DIR}
|
||||
)
|
||||
|
||||
@@ -12,27 +13,13 @@ if (TARGET OpenSSL::Crypto)
|
||||
list(APPEND LIBSSH_LINK_LIBRARIES OpenSSL::Crypto)
|
||||
endif ()
|
||||
|
||||
-if (MBEDTLS_CRYPTO_LIBRARY)
|
||||
- set(LIBSSH_PRIVATE_INCLUDE_DIRS
|
||||
- ${LIBSSH_PRIVATE_INCLUDE_DIRS}
|
||||
- ${MBEDTLS_INCLUDE_DIR}
|
||||
- )
|
||||
- set(LIBSSH_LINK_LIBRARIES
|
||||
- ${LIBSSH_LINK_LIBRARIES}
|
||||
- ${MBEDTLS_CRYPTO_LIBRARY}
|
||||
- )
|
||||
-endif (MBEDTLS_CRYPTO_LIBRARY)
|
||||
-
|
||||
-if (GCRYPT_LIBRARIES)
|
||||
- set(LIBSSH_PRIVATE_INCLUDE_DIRS
|
||||
- ${LIBSSH_PRIVATE_INCLUDE_DIRS}
|
||||
- ${GCRYPT_INCLUDE_DIR}
|
||||
- )
|
||||
+if (TARGET MbedTLS::mbedcrypto)
|
||||
+ list(APPEND LIBSSH_LINK_LIBRARIES MbedTLS::mbedcrypto)
|
||||
+endif ()
|
||||
|
||||
- set(LIBSSH_LINK_LIBRARIES
|
||||
- ${LIBSSH_LINK_LIBRARIES}
|
||||
- ${GCRYPT_LIBRARIES})
|
||||
-endif()
|
||||
+if (TARGET libgcrypt::libgcrypt)
|
||||
+ list(APPEND LIBSSH_LINK_LIBRARIES ${GCRYPT_LIBRARIES})
|
||||
+endif ()
|
||||
|
||||
if (WITH_ZLIB)
|
||||
list(APPEND LIBSSH_LINK_LIBRARIES ZLIB::ZLIB)
|
||||
--
|
||||
GitLab
|
||||
|
||||
@@ -1,48 +0,0 @@
|
||||
https://gitlab.com/libssh/libssh-mirror/-/issues/298
|
||||
https://gitlab.com/libssh/libssh-mirror/-/commit/af10857aa3216f40c5c2e5d7116803fb03c166f9
|
||||
|
||||
From af10857aa3216f40c5c2e5d7116803fb03c166f9 Mon Sep 17 00:00:00 2001
|
||||
From: Norbert Pocs <norbertpocs0@gmail.com>
|
||||
Date: Fri, 11 Apr 2025 09:04:40 +0200
|
||||
Subject: [PATCH] CmakeLists: Fix multiple digit major version for OpenSSH
|
||||
|
||||
Signed-off-by: Norbert Pocs <norbertpocs0@gmail.com>
|
||||
Reviewed-by: Jakub Jelen <jjelen@redhat.com>
|
||||
---
|
||||
tests/CMakeLists.txt | 13 +++----------
|
||||
1 file changed, 3 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
|
||||
index 8d4e94b69..e8b196b83 100644
|
||||
--- a/tests/CMakeLists.txt
|
||||
+++ b/tests/CMakeLists.txt
|
||||
@@ -104,9 +104,10 @@ add_subdirectory(unittests)
|
||||
find_program(SSH_EXECUTABLE NAMES ssh)
|
||||
if (SSH_EXECUTABLE)
|
||||
execute_process(COMMAND ${SSH_EXECUTABLE} -V ERROR_VARIABLE OPENSSH_VERSION_STR)
|
||||
- string(REGEX REPLACE "^.*OpenSSH_([0-9]).[0-9].*$" "\\1" OPENSSH_VERSION_MAJOR "${OPENSSH_VERSION_STR}")
|
||||
- string(REGEX REPLACE "^.*OpenSSH_[0-9].([0-9]).*$" "\\1" OPENSSH_VERSION_MINOR "${OPENSSH_VERSION_STR}")
|
||||
+ string(REGEX REPLACE "^.*OpenSSH_([0-9]+).[0-9].*$" "\\1" OPENSSH_VERSION_MAJOR "${OPENSSH_VERSION_STR}")
|
||||
+ string(REGEX REPLACE "^.*OpenSSH_[0-9]+.([0-9]).*$" "\\1" OPENSSH_VERSION_MINOR "${OPENSSH_VERSION_STR}")
|
||||
set(OPENSSH_VERSION "${OPENSSH_VERSION_MAJOR}.${OPENSSH_VERSION_MINOR}")
|
||||
+ add_definitions(-DOPENSSH_VERSION_MAJOR=${OPENSSH_VERSION_MAJOR} -DOPENSSH_VERSION_MINOR=${OPENSSH_VERSION_MINOR})
|
||||
if("${OPENSSH_VERSION}" VERSION_LESS "6.3")
|
||||
# ssh - Q was introduced in 6.3
|
||||
message("Version less than 6.3, hardcoding cipher list")
|
||||
@@ -207,14 +208,6 @@ if (CLIENT_TESTING OR SERVER_TESTING)
|
||||
/usr/bin
|
||||
/usr/local/bin)
|
||||
|
||||
- find_program(SSH_EXECUTABLE NAMES ssh)
|
||||
- if (SSH_EXECUTABLE)
|
||||
- execute_process(COMMAND ${SSH_EXECUTABLE} -V ERROR_VARIABLE OPENSSH_VERSION_STR)
|
||||
- string(REGEX REPLACE "^.*OpenSSH_([0-9]).[0-9].*$" "\\1" OPENSSH_VERSION_MAJOR "${OPENSSH_VERSION_STR}")
|
||||
- string(REGEX REPLACE "^.*OpenSSH_[0-9].([0-9]).*$" "\\1" OPENSSH_VERSION_MINOR "${OPENSSH_VERSION_STR}")
|
||||
- add_definitions(-DOPENSSH_VERSION_MAJOR=${OPENSSH_VERSION_MAJOR} -DOPENSSH_VERSION_MINOR=${OPENSSH_VERSION_MINOR})
|
||||
- endif()
|
||||
-
|
||||
set(LOCAL_USER "nobody")
|
||||
set(LOCAL_UID "65533")
|
||||
find_program(ID_EXECUTABLE NAMES id)
|
||||
--
|
||||
GitLab
|
||||
@@ -1,137 +0,0 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
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 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
|
||||
fi
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0/4" # subslot = soname major version
|
||||
IUSE="debug doc examples gssapi mbedtls pcap server +sftp static-libs test zlib"
|
||||
# Maintainer: check IUSE-defaults at DefineOptions.cmake
|
||||
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
RDEPEND="
|
||||
!mbedtls? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
|
||||
gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
|
||||
mbedtls? ( net-libs/mbedtls:0=[${MULTILIB_USEDEP}] )
|
||||
zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
test? (
|
||||
>=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}]
|
||||
elibc_musl? ( sys-libs/argp-standalone )
|
||||
)
|
||||
"
|
||||
BDEPEND="doc? ( app-text/doxygen[dot] )"
|
||||
|
||||
DOCS=( AUTHORS CHANGELOG README )
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-0.11.1-openssh-10.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
cmake_src_prepare
|
||||
|
||||
# just install the examples, do not compile them
|
||||
cmake_comment_add_subdirectory examples
|
||||
|
||||
sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \
|
||||
-i ConfigureChecks.cmake || die
|
||||
|
||||
if use test; then
|
||||
local skip_tests=(
|
||||
# keyfile torture test is currently broken
|
||||
-e "/torture_keyfiles/d"
|
||||
|
||||
# Tries to expand ~ which fails w/ portage homedir
|
||||
# (torture_path_expand_tilde_unix and torture_config_make_absolute_no_sshdir)
|
||||
-e "/torture_misc/d"
|
||||
-e "/torture_config/d"
|
||||
)
|
||||
|
||||
# Disable tests that take too long (bug #677006)
|
||||
if use sparc; then
|
||||
skip_tests+=(
|
||||
-e "/torture_threads_pki_rsa/d"
|
||||
-e "/torture_pki_dsa/d"
|
||||
)
|
||||
fi
|
||||
|
||||
if (( ${#skip_tests[@]} )) ; then
|
||||
sed -i "${skip_tests[@]}" tests/unittests/CMakeLists.txt || die
|
||||
fi
|
||||
|
||||
if use elibc_musl; then
|
||||
sed -e "/SOLARIS/d" \
|
||||
-i tests/CMakeLists.txt || die
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
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=OFF
|
||||
-DWITH_GSSAPI=$(usex gssapi)
|
||||
-DWITH_MBEDTLS=$(usex mbedtls)
|
||||
-DWITH_PCAP=$(usex pcap)
|
||||
-DWITH_SERVER=$(usex server)
|
||||
-DWITH_SFTP=$(usex sftp)
|
||||
-DBUILD_STATIC_LIB=$(usex static-libs)
|
||||
# TODO: try enabling {CLIENT,SERVER}_TESTING
|
||||
-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_test() {
|
||||
cmake_src_test --timeout 3000
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
cmake_src_install
|
||||
multilib_is_native_abi && use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
|
||||
|
||||
use static-libs && dolib.a src/libssh.a
|
||||
|
||||
# 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
|
||||
}
|
||||
@@ -1,142 +0,0 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
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 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
|
||||
fi
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0/4" # subslot = soname major version
|
||||
IUSE="debug doc examples gssapi mbedtls pcap server +sftp static-libs test zlib"
|
||||
# Maintainer: check IUSE-defaults at DefineOptions.cmake
|
||||
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
RDEPEND="
|
||||
!mbedtls? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
|
||||
gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
|
||||
mbedtls? ( net-libs/mbedtls:3=[${MULTILIB_USEDEP},threads] )
|
||||
zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
test? (
|
||||
>=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}]
|
||||
elibc_musl? ( sys-libs/argp-standalone )
|
||||
)
|
||||
"
|
||||
BDEPEND="doc? ( app-text/doxygen[dot] )"
|
||||
|
||||
DOCS=( AUTHORS CHANGELOG README )
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-0.11.1-openssh-10.patch"
|
||||
"${FILESDIR}/${PN}-0.11.1-mbedtls-3.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
# Remove custom find module to use system one
|
||||
rm cmake/Modules/FindMbedTLS.cmake || die
|
||||
|
||||
cmake_src_prepare
|
||||
|
||||
# just install the examples, do not compile them
|
||||
cmake_comment_add_subdirectory examples
|
||||
|
||||
sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \
|
||||
-i ConfigureChecks.cmake || die
|
||||
|
||||
if use test; then
|
||||
local skip_tests=(
|
||||
# keyfile torture test is currently broken
|
||||
-e "/torture_keyfiles/d"
|
||||
|
||||
# Tries to expand ~ which fails w/ portage homedir
|
||||
# (torture_path_expand_tilde_unix and torture_config_make_absolute_no_sshdir)
|
||||
-e "/torture_misc/d"
|
||||
-e "/torture_config/d"
|
||||
)
|
||||
|
||||
# Disable tests that take too long (bug #677006)
|
||||
if use sparc; then
|
||||
skip_tests+=(
|
||||
-e "/torture_threads_pki_rsa/d"
|
||||
-e "/torture_pki_dsa/d"
|
||||
)
|
||||
fi
|
||||
|
||||
if (( ${#skip_tests[@]} )) ; then
|
||||
sed -i "${skip_tests[@]}" tests/unittests/CMakeLists.txt || die
|
||||
fi
|
||||
|
||||
if use elibc_musl; then
|
||||
sed -e "/SOLARIS/d" \
|
||||
-i tests/CMakeLists.txt || die
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
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=OFF
|
||||
-DWITH_GSSAPI=$(usex gssapi)
|
||||
-DWITH_MBEDTLS=$(usex mbedtls)
|
||||
-DMBEDTLS_FOUND=$(usex mbedtls) # Enforce variable from custom find module
|
||||
-DWITH_PCAP=$(usex pcap)
|
||||
-DWITH_SERVER=$(usex server)
|
||||
-DWITH_SFTP=$(usex sftp)
|
||||
-DBUILD_STATIC_LIB=$(usex static-libs)
|
||||
# TODO: try enabling {CLIENT,SERVER}_TESTING
|
||||
-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_test() {
|
||||
cmake_src_test --timeout 3000
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
cmake_src_install
|
||||
multilib_is_native_abi && use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
|
||||
|
||||
use static-libs && dolib.a src/libssh.a
|
||||
|
||||
# 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
|
||||
}
|
||||
Reference in New Issue
Block a user