diff options
| -rw-r--r-- | net-libs/libssh/Manifest | 1 | ||||
| -rw-r--r-- | net-libs/libssh/files/libssh-0.10.0-fix-musl-gnu-source.patch | 58 | ||||
| -rw-r--r-- | net-libs/libssh/libssh-0.10.0-r1.ebuild | 126 |
3 files changed, 0 insertions, 185 deletions
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest index f4d48d1a6473..4a35ffc7b747 100644 --- a/net-libs/libssh/Manifest +++ b/net-libs/libssh/Manifest @@ -1,3 +1,2 @@ -DIST libssh-0.10.0.tar.xz 553384 BLAKE2B 4a57e2095a4f56d06b2be591e02c9b9ded5e1fa28ed2774389a2902a8277f6e6b99014f8868f0740ca2900409d33b968f65c9eaa312e259926436afb49fc108c SHA512 d97235f78b94a980aabc844ee7614108944967441219f0c2417b207734d5200eb26efd5fd6de0da97a34fb612b843dc0a3b32a3364c1d8333e4c49680212aaaa DIST libssh-0.10.1.tar.xz 553808 BLAKE2B 1e0a648153122619e473481484af70b9c388e75a6586a7b5ea605fede4a592f2f1ae2978c19762ac396d3dff2a3dd03451ee293c9fbd4f861a1bb5668e2489b7 SHA512 d56b2809527d4f3c1d88881b8f7a7cd49321df8abe4fde011dfe7323e7552641b36a607f3b1b37c26703adae01d0176fc3d71c6c207598aaae5ebdf10237742e DIST libssh-0.9.6.tar.xz 1053056 BLAKE2B e8565279a430786b8877386a26700a39386e908546a209815b135a2bf4ef42c37b9890dc29cda9ce6c8bfe3f3bae4942097dc794302aec767d106a45c44b811d SHA512 4040ec4af937e95be2e41313ef6d4db60b46b8d4dea10c09402398127c1d1ca8843392d207088aeee3c7ef631c6ae7b66861327dcebf78ed3af0723777619fd1 diff --git a/net-libs/libssh/files/libssh-0.10.0-fix-musl-gnu-source.patch b/net-libs/libssh/files/libssh-0.10.0-fix-musl-gnu-source.patch deleted file mode 100644 index be234bab53c9..000000000000 --- a/net-libs/libssh/files/libssh-0.10.0-fix-musl-gnu-source.patch +++ /dev/null @@ -1,58 +0,0 @@ -https://gitlab.com/libssh/libssh-mirror/-/commit/8cf9c8162fc317761f19c35f60fc0cae7337ceea -https://gitlab.com/libssh/libssh-mirror/-/issues/141 - -From: Jakub Jelen <jjelen@redhat.com> -Date: Mon, 29 Aug 2022 12:48:34 +0200 -Subject: [PATCH] Do not force GNU_SOURCE during build to fix #141 - -Signed-off-by: Jakub Jelen <jjelen@redhat.com> -Reviewed-by: Andreas Schneider <asn@cryptomilk.org> ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -348,10 +348,6 @@ endif (WITH_SYMBOL_VERSIONING AND HAVE_LD_VERSION_SCRIPT AND ABIMAP_FOUND) - # This gets built as a static library, if -DBUILD_SHARED_LIBS=OFF is passed to - # cmake. - add_library(ssh ${libssh_SRCS}) --target_compile_options(ssh -- PRIVATE -- ${DEFAULT_C_COMPILE_FLAGS} -- -D_GNU_SOURCE) - target_include_directories(ssh - PUBLIC - $<BUILD_INTERFACE:${libssh_SOURCE_DIR}/include> -@@ -408,10 +404,6 @@ install(EXPORT libssh-config - - if (BUILD_STATIC_LIB) - add_library(ssh-static STATIC ${libssh_SRCS}) -- target_compile_options(ssh-static -- PRIVATE -- ${DEFAULT_C_COMPILE_FLAGS} -- -D_GNU_SOURCE) - - target_include_directories(ssh-static - PUBLIC ---- a/src/misc.c -+++ b/src/misc.c -@@ -1956,7 +1956,7 @@ char *ssh_strerror(int err_num, char *buf, size_t buflen) - #if defined(_WIN32) - strerror_s(buf, buflen, err_num); - return buf; --#elif defined(__linux__) && defined(_GNU_SOURCE) -+#elif defined(__linux__) && defined(__GLIBC__) && defined(_GNU_SOURCE) - /* GNU extension on Linux */ - return strerror_r(err_num, buf, buflen); - #else ---- a/tests/torture.h -+++ b/tests/torture.h -@@ -24,10 +24,6 @@ - #ifndef _TORTURE_H - #define _TORTURE_H - --#ifndef _GNU_SOURCE --#define _GNU_SOURCE --#endif -- - #include <stdio.h> - #include <stdlib.h> - #include <stdarg.h> -GitLab diff --git a/net-libs/libssh/libssh-0.10.0-r1.ebuild b/net-libs/libssh/libssh-0.10.0-r1.ebuild deleted file mode 100644 index 0a5989b9a16b..000000000000 --- a/net-libs/libssh/libssh-0.10.0-r1.ebuild +++ /dev/null @@ -1,126 +0,0 @@ -# Copyright 1999-2022 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 ~ia64 ~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 gcrypt gssapi mbedtls pcap server +sftp static-libs test zlib" -# Maintainer: check IUSE-defaults at DefineOptions.cmake - -REQUIRED_USE="?? ( gcrypt mbedtls )" -RESTRICT="!test? ( test )" - -RDEPEND=" - !gcrypt? ( - !mbedtls? ( - >=dev-libs/openssl-1.0.1h-r2:0=[${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} - test? ( - >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] - elibc_musl? ( sys-libs/argp-standalone ) - ) -" -BDEPEND="doc? ( app-doc/doxygen[dot] )" - -DOCS=( AUTHORS CHANGELOG README ) - -PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" ) - -PATCHES=( - "${FILESDIR}"/${P}-fix-musl-gnu-source.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 - - if use test && use elibc_musl; then - sed -e "/SOLARIS/d" \ - -i tests/CMakeLists.txt || die - 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=$(usex gcrypt) - -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) - -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 && 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 -} |