From 6cef603bfc4353c863a1a0b460a0aa882d2dc51c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 30 Aug 2022 22:49:20 +0100 Subject: gentoo auto-resync : 30:08:2022 - 22:49:20 --- net-libs/libssh/Manifest | 5 +- .../files/libssh-0.10.0-fix-musl-gnu-source.patch | 58 ++++++++++ net-libs/libssh/libssh-0.10.0-r1.ebuild | 126 +++++++++++++++++++++ net-libs/libssh/libssh-0.10.0.ebuild | 122 -------------------- net-libs/libssh/metadata.xml | 27 +++-- 5 files changed, 202 insertions(+), 136 deletions(-) create mode 100644 net-libs/libssh/files/libssh-0.10.0-fix-musl-gnu-source.patch create mode 100644 net-libs/libssh/libssh-0.10.0-r1.ebuild delete mode 100644 net-libs/libssh/libssh-0.10.0.ebuild (limited to 'net-libs/libssh') diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest index fe0188bdd3e5..bdfbac5caa90 100644 --- a/net-libs/libssh/Manifest +++ b/net-libs/libssh/Manifest @@ -1,7 +1,8 @@ +AUX libssh-0.10.0-fix-musl-gnu-source.patch 1961 BLAKE2B 2a6fe18a8a1e1a712b8af791721ee46f862c56cf88188bc9788b61842f4a429d0d2b02126f4a5c4c76859aea6896fba071b077a69e1c5ec2b36e264d30200d29 SHA512 1d7d73fa1d3219e1fe11559c53e4fe0024458e3a5238c3c6680c938189da33742eb222a7f3d7a9a38fe58d6eda35b63a9bb15cca3978a115857f0cdf56007103 AUX libssh-0.8.0-tests.patch 503 BLAKE2B 22c3527e4b06ab9a00936e84c66ed14c7163a285aa5c88cfec5543e7c7aada8ffb716e20f3d3a0fef9425e244629f0d1c35250bdb9ce454b6cb247a3537cd411 SHA512 43145c2c202510ebe5cf64b47a6963b9335a844997f986938eacb0171a129863cdbd2676b8016941c85ec8c820d0543b8ab20f6aca5af86b3506e78aa29cf7e8 DIST libssh-0.10.0.tar.xz 553384 BLAKE2B 4a57e2095a4f56d06b2be591e02c9b9ded5e1fa28ed2774389a2902a8277f6e6b99014f8868f0740ca2900409d33b968f65c9eaa312e259926436afb49fc108c SHA512 d97235f78b94a980aabc844ee7614108944967441219f0c2417b207734d5200eb26efd5fd6de0da97a34fb612b843dc0a3b32a3364c1d8333e4c49680212aaaa DIST libssh-0.9.6.tar.xz 1053056 BLAKE2B e8565279a430786b8877386a26700a39386e908546a209815b135a2bf4ef42c37b9890dc29cda9ce6c8bfe3f3bae4942097dc794302aec767d106a45c44b811d SHA512 4040ec4af937e95be2e41313ef6d4db60b46b8d4dea10c09402398127c1d1ca8843392d207088aeee3c7ef631c6ae7b66861327dcebf78ed3af0723777619fd1 -EBUILD libssh-0.10.0.ebuild 3235 BLAKE2B 1baf12eaae4002ea04742900310076a7f7e87781018162211f0529f53c8fea173304afdd993df3a2a42c1e6e740215615ac63a90811baea61c3525767ee7b559 SHA512 d94cf9bf306f5affdc32be9dfbfc27276d75c91f8401be090853e3658f5da887891023bb44d0306dcaee53ac18f4287319c58482be17b6fb417bb7c4b688ebd3 +EBUILD libssh-0.10.0-r1.ebuild 3294 BLAKE2B 4b714f450303a30b52f882d405ef3f4328ad9f23e60b4fd4f231c9ed9943f2db168eca2ba2718594fb6fa2fe142157fa85ed25742d5233e954a45d8f2906889c SHA512 f08ac0db3214801c4a63a6dfe591b423af82a4543853a080ac556c4c0f89fbcb86f32d0f9e5e9fb64ff5c65053caca0ac46c87afb761fcd3c5b562b23b7aa240 EBUILD libssh-0.9.6.ebuild 3249 BLAKE2B 262c8a347a8f2f22fbd8f64d592666b6f41272709ced4caa7f7b8642bfa0047e208494938073acc22c35251aa5742b4391ad863bd57438661368328c5635ea7b SHA512 f6cc5499261f82c457740bdfe2665f380d62a23447857d0ee9eb5c7c4dc28b064bb49ccb86265921eb9ff47d366f298f84caa9751cb175a9f7b963442833e513 EBUILD libssh-9999.ebuild 3235 BLAKE2B 1baf12eaae4002ea04742900310076a7f7e87781018162211f0529f53c8fea173304afdd993df3a2a42c1e6e740215615ac63a90811baea61c3525767ee7b559 SHA512 d94cf9bf306f5affdc32be9dfbfc27276d75c91f8401be090853e3658f5da887891023bb44d0306dcaee53ac18f4287319c58482be17b6fb417bb7c4b688ebd3 -MISC metadata.xml 629 BLAKE2B 7e39c205fc187646d471362dd85d59f3d7988a151eec3b758c6d830ff0b0f472f4d49e38d9bfe9c99b504b52d7db1db384c9286cc41d9627fdf9a5f3c1989aab SHA512 02a38b6ec328a0b638ea94745e97a2e0f3bdf767044124b3136a6425120fbfcd377ae2b0d78a22c62569dbd8e90d795c47ce3ede81f5acbf8ba26582f36c45e2 +MISC metadata.xml 726 BLAKE2B 351703a7c13b7f66c152121dac43d09b53f3d141d9a37e0dfcd8601f6f30943698c66cf6e51cb6053d1891313b1bc46fbf4071aca39bf3d07d218f8d47ed1e83 SHA512 8f639e4c5ee39a54778e9948e347551372b2f83ca30fe360a1281a52c681563c5dd2d2e053c2263b24440fc1a11c6d3cf866eaa46e39610cbd01c76c29fde7bc 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 new file mode 100644 index 000000000000..be234bab53c9 --- /dev/null +++ b/net-libs/libssh/files/libssh-0.10.0-fix-musl-gnu-source.patch @@ -0,0 +1,58 @@ +https://gitlab.com/libssh/libssh-mirror/-/commit/8cf9c8162fc317761f19c35f60fc0cae7337ceea +https://gitlab.com/libssh/libssh-mirror/-/issues/141 + +From: Jakub Jelen +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 +Reviewed-by: Andreas Schneider +--- 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 + $ +@@ -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 + #include + #include +GitLab diff --git a/net-libs/libssh/libssh-0.10.0-r1.ebuild b/net-libs/libssh/libssh-0.10.0-r1.ebuild new file mode 100644 index 000000000000..0a5989b9a16b --- /dev/null +++ b/net-libs/libssh/libssh-0.10.0-r1.ebuild @@ -0,0 +1,126 @@ +# 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 +} diff --git a/net-libs/libssh/libssh-0.10.0.ebuild b/net-libs/libssh/libssh-0.10.0.ebuild deleted file mode 100644 index 9b897cf8885e..000000000000 --- a/net-libs/libssh/libssh-0.10.0.ebuild +++ /dev/null @@ -1,122 +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" ) - -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 -} diff --git a/net-libs/libssh/metadata.xml b/net-libs/libssh/metadata.xml index 2f3dde22b5cf..150ff493cf1a 100644 --- a/net-libs/libssh/metadata.xml +++ b/net-libs/libssh/metadata.xml @@ -1,16 +1,19 @@ - - kde@gentoo.org - Gentoo KDE Project - - - Use dev-libs/libgcrypt as TLS provider - Enable gssapi support - Use net-libs/mbedtls as TLS provider - Build with PCAP output support - Build with SSH server support - Build with SFTP support - + + kde@gentoo.org + Gentoo KDE Project + + + Use dev-libs/libgcrypt as TLS provider + Enable gssapi support + Use net-libs/mbedtls as TLS provider + Build with PCAP output support + Build with SSH server support + Build with SFTP support + + + libssh/libssh-mirror + -- cgit v1.2.3