commit: 2b50f49e0a21edb542f9aab52a2d7b10a7021035 Author: orbea <orbea <AT> riseup <DOT> net> AuthorDate: Sun Nov 23 03:29:50 2025 +0000 Commit: orbea <orbea <AT> riseup <DOT> net> CommitDate: Sun Nov 23 03:29:50 2025 +0000 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=2b50f49e
net-libs/libssh: drop 0.11.1-r1 Signed-off-by: orbea <orbea <AT> riseup.net> net-libs/libssh/Manifest | 1 - .../libssh/files/libssh-0.11.1-openssh-10.patch | 48 ------- net-libs/libssh/libssh-0.11.1-r1.ebuild | 138 --------------------- 3 files changed, 187 deletions(-) diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest index f56cfc3..ec88a27 100644 --- a/net-libs/libssh/Manifest +++ b/net-libs/libssh/Manifest @@ -1,3 +1,2 @@ -DIST libssh-0.11.1.tar.xz 621108 BLAKE2B 87079b4eaf66ceb77803b3d854f847b3f3fb6a67ac3bfa756ebcf8f06bf2b313e976044e0a1d81227fb5278fb04bc56f1a82877d14a6ee76bec0c690b14f38a7 SHA512 284d376ad9ea30b0274b4ac754b27d168286dca862ece43ef15ca6d89e66865ad7a6703cc12dd4a8564a60b8449ae9b36e6496fd51d34cc27ac4030f6cf216d6 DIST libssh-0.11.2.tar.xz 619428 BLAKE2B 7f4a97b2027e386f5bfd308b1aac1938484722d4d1bb55ce0fa2de8358bedea47955df1cb4e68679033d1a5538058422770872f2f6513a82199ff506eccfad0e SHA512 15d56c3f82ee81c3ab4af2b17eba054626bb53c3337ef45f829479f8b64c552f6e7cbf307e41c9792bcb3438f282d2690acbe994150bd03a8b6c21ba8b1cfe50 DIST libssh-0.11.3.tar.xz 622776 BLAKE2B 859e4af9bf6305e54175e456d153a85e678a6fc49ac184dbe09d94ab01dde42f0321f5a2ac35cf4ca9df188daab6c4bf3171dcd8a3776419a3a1a20474ccf89a SHA512 0670bee29a7cf5507dba7dd82b82cd8a926b83a43cee441fa8a698be2523b16aacb392433f9e63887bd72e6eb817667f6ef986f292f335d1856759af4ede40c4 diff --git a/net-libs/libssh/files/libssh-0.11.1-openssh-10.patch b/net-libs/libssh/files/libssh-0.11.1-openssh-10.patch deleted file mode 100644 index e8c9d64..0000000 --- a/net-libs/libssh/files/libssh-0.11.1-openssh-10.patch +++ /dev/null @@ -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 <[email protected]> -Date: Fri, 11 Apr 2025 09:04:40 +0200 -Subject: [PATCH] CmakeLists: Fix multiple digit major version for OpenSSH - -Signed-off-by: Norbert Pocs <[email protected]> -Reviewed-by: Jakub Jelen <[email protected]> ---- - 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 diff --git a/net-libs/libssh/libssh-0.11.1-r1.ebuild b/net-libs/libssh/libssh-0.11.1-r1.ebuild deleted file mode 100644 index 2f37fa9..0000000 --- a/net-libs/libssh/libssh-0.11.1-r1.ebuild +++ /dev/null @@ -1,138 +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 - "${FILESDIR}"/${PN}-0.11.1-libressl.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 -}
