From c8f83ad526fb6b554daf375e0ad65eb2d56e669b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 31 Aug 2022 04:49:49 +0100 Subject: gentoo auto-resync : 31:08:2022 - 04:49:49 --- net-libs/Manifest.gz | Bin 32609 -> 32631 bytes net-libs/libnftnl/Manifest | 1 - .../libnftnl-1.2.1-missing-export-set_elem.patch | 21 ---- net-libs/libssh/Manifest | 8 +- .../files/libssh-0.10.0-fix-musl-gnu-source.patch | 58 ---------- .../files/libssh-0.10.1-disable-broken-test.patch | 28 +++++ net-libs/libssh/libssh-0.10.0-r1.ebuild | 126 -------------------- net-libs/libssh/libssh-0.10.1.ebuild | 127 +++++++++++++++++++++ net-libs/libssh/libssh-9999.ebuild | 31 ++--- net-libs/socket_wrapper/Manifest | 2 +- .../socket_wrapper/socket_wrapper-1.3.4.ebuild | 2 +- 11 files changed, 179 insertions(+), 225 deletions(-) delete mode 100644 net-libs/libnftnl/files/libnftnl-1.2.1-missing-export-set_elem.patch delete mode 100644 net-libs/libssh/files/libssh-0.10.0-fix-musl-gnu-source.patch create mode 100644 net-libs/libssh/files/libssh-0.10.1-disable-broken-test.patch delete mode 100644 net-libs/libssh/libssh-0.10.0-r1.ebuild create mode 100644 net-libs/libssh/libssh-0.10.1.ebuild (limited to 'net-libs') diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz index 3db62b8e4ec8..6f6c6842e014 100644 Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ diff --git a/net-libs/libnftnl/Manifest b/net-libs/libnftnl/Manifest index d8887d8afe91..11bdc3026f4c 100644 --- a/net-libs/libnftnl/Manifest +++ b/net-libs/libnftnl/Manifest @@ -1,4 +1,3 @@ -AUX libnftnl-1.2.1-missing-export-set_elem.patch 640 BLAKE2B 6b5a1470c2e8175a1ed9667f7dc8dba09f074b57d20b3b5baff27f3cc3cc08014070744022b004573255c29f8124b6a0bc5a2d569fdf955c1e566a7646ead773 SHA512 afe61d68f2348c9ad02386a452611cb38b88eaf32cbbe565efc0cc929d73db89541b3675301773bd195e09c1834c006b22be92d1c7e923aeb2095d8db78ea54a DIST libnftnl-1.2.1.tar.bz2 395299 BLAKE2B 9f525eb540ed959075199aab4b4217bdcf0f67d6744e58d7eab9f7a50aca2d22c6d65419b15c98d24772ef020c3ed2662eba7a0812a5919a840cee5aa589b056 SHA512 cabe6896210c451d7917d1abde5e73a65594d53f011486f75dd7be5b4804c49d10f0e508675e091e1faf0363b82670b3f3a167a85db91d52742dc69445888b6a DIST libnftnl-1.2.1.tar.bz2.sig 566 BLAKE2B dd37a52dc185ef2e8af8f0fe32037a03bf8f50101d566be1d40217ea092ec1a9af08281b22193bb274a1ad462c081980ccc8da35c76d910cf0d613ecb0235449 SHA512 dc589d7fcd7d4b0e5e7d50b02967f265ef11b2de69018c8eb264251eb5fab4b4fabb147b8b934f29cdbf66e7bee3f030ef9f02b5872bd76c4cf3523f7e38b94b DIST libnftnl-1.2.2-clang-fortify-source.patch.xz 2704 BLAKE2B 107c90a2875e7477a5e8b7af8ff4c2139d2117e41a4ca9a7656b5f15c430668572c18a43e9b14a5af36c60818289e00bc082cad5d601b4c489335ca7161e5871 SHA512 c024607cb138748adcd28a511b858bbf51f2f09e13afa48d3090ba5ecd7bff1c1e87fcf38330eb24ae52c79d1a8bfce91f75be5dc81cfec6f0bc5334dd2f7456 diff --git a/net-libs/libnftnl/files/libnftnl-1.2.1-missing-export-set_elem.patch b/net-libs/libnftnl/files/libnftnl-1.2.1-missing-export-set_elem.patch deleted file mode 100644 index 0ff574ddc48a..000000000000 --- a/net-libs/libnftnl/files/libnftnl-1.2.1-missing-export-set_elem.patch +++ /dev/null @@ -1,21 +0,0 @@ -https://git.netfilter.org/libnftnl/commit/?id=accee9a75e0e6678863d092d6a4f4afbadf0eed9 - -From: Pablo Neira Ayuso -Date: Wed, 18 May 2022 23:54:03 +0200 -Subject: set_elem: missing export symbol - -nftnl_set_elem_nlmsg_build_payload() is already available through .map -file and headers, add missing EXPORT_SYMBOL. - -Signed-off-by: Pablo Neira Ayuso ---- a/src/set_elem.c -+++ b/src/set_elem.c -@@ -300,6 +300,7 @@ err: - return NULL; - } - -+EXPORT_SYMBOL(nftnl_set_elem_nlmsg_build_payload); - void nftnl_set_elem_nlmsg_build_payload(struct nlmsghdr *nlh, - struct nftnl_set_elem *e) - { -cgit v1.2.3 diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest index bdfbac5caa90..e7840ce3ed0a 100644 --- a/net-libs/libssh/Manifest +++ b/net-libs/libssh/Manifest @@ -1,8 +1,8 @@ -AUX libssh-0.10.0-fix-musl-gnu-source.patch 1961 BLAKE2B 2a6fe18a8a1e1a712b8af791721ee46f862c56cf88188bc9788b61842f4a429d0d2b02126f4a5c4c76859aea6896fba071b077a69e1c5ec2b36e264d30200d29 SHA512 1d7d73fa1d3219e1fe11559c53e4fe0024458e3a5238c3c6680c938189da33742eb222a7f3d7a9a38fe58d6eda35b63a9bb15cca3978a115857f0cdf56007103 +AUX libssh-0.10.1-disable-broken-test.patch 1182 BLAKE2B 2ae0c370077d0c8dc79b81f33b84949f26ced643788d414973b1cd56ab2ee0223fdabb1fcf4e311774a7d47018d8258e7b0f4d073c08f825eb0da62a5a45ed4b SHA512 923f18a7c125d1becb83aec6a743535588ca7b99e35a9a54f76189558892f56bbde55ef6f7b44141f7a8b30aed945fc6e7fc00625644b5621bdb82eaccdb05a0 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.10.1.tar.xz 553808 BLAKE2B 1e0a648153122619e473481484af70b9c388e75a6586a7b5ea605fede4a592f2f1ae2978c19762ac396d3dff2a3dd03451ee293c9fbd4f861a1bb5668e2489b7 SHA512 d56b2809527d4f3c1d88881b8f7a7cd49321df8abe4fde011dfe7323e7552641b36a607f3b1b37c26703adae01d0176fc3d71c6c207598aaae5ebdf10237742e DIST libssh-0.9.6.tar.xz 1053056 BLAKE2B e8565279a430786b8877386a26700a39386e908546a209815b135a2bf4ef42c37b9890dc29cda9ce6c8bfe3f3bae4942097dc794302aec767d106a45c44b811d SHA512 4040ec4af937e95be2e41313ef6d4db60b46b8d4dea10c09402398127c1d1ca8843392d207088aeee3c7ef631c6ae7b66861327dcebf78ed3af0723777619fd1 -EBUILD libssh-0.10.0-r1.ebuild 3294 BLAKE2B 4b714f450303a30b52f882d405ef3f4328ad9f23e60b4fd4f231c9ed9943f2db168eca2ba2718594fb6fa2fe142157fa85ed25742d5233e954a45d8f2906889c SHA512 f08ac0db3214801c4a63a6dfe591b423af82a4543853a080ac556c4c0f89fbcb86f32d0f9e5e9fb64ff5c65053caca0ac46c87afb761fcd3c5b562b23b7aa240 +EBUILD libssh-0.10.1.ebuild 3321 BLAKE2B 138549fbf62bb54e6f2568e76a0462d1d31a8383d014419e93d179c4c8a652c9ed1936cadcdf1a0fb57039a022792d12251b134d40ad9721c7c93c27ff9550a6 SHA512 08ab3d89a88bdc15e02078219cdd13731a6c42fa8289bc8e6e03bb534e073055ba60ce8dcac1ea78c4b375ac682c5c74703b5113ea552fe31d8a013cf224b585 EBUILD libssh-0.9.6.ebuild 3249 BLAKE2B 262c8a347a8f2f22fbd8f64d592666b6f41272709ced4caa7f7b8642bfa0047e208494938073acc22c35251aa5742b4391ad863bd57438661368328c5635ea7b SHA512 f6cc5499261f82c457740bdfe2665f380d62a23447857d0ee9eb5c7c4dc28b064bb49ccb86265921eb9ff47d366f298f84caa9751cb175a9f7b963442833e513 -EBUILD libssh-9999.ebuild 3235 BLAKE2B 1baf12eaae4002ea04742900310076a7f7e87781018162211f0529f53c8fea173304afdd993df3a2a42c1e6e740215615ac63a90811baea61c3525767ee7b559 SHA512 d94cf9bf306f5affdc32be9dfbfc27276d75c91f8401be090853e3658f5da887891023bb44d0306dcaee53ac18f4287319c58482be17b6fb417bb7c4b688ebd3 +EBUILD libssh-9999.ebuild 3321 BLAKE2B 138549fbf62bb54e6f2568e76a0462d1d31a8383d014419e93d179c4c8a652c9ed1936cadcdf1a0fb57039a022792d12251b134d40ad9721c7c93c27ff9550a6 SHA512 08ab3d89a88bdc15e02078219cdd13731a6c42fa8289bc8e6e03bb534e073055ba60ce8dcac1ea78c4b375ac682c5c74703b5113ea552fe31d8a013cf224b585 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 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 -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/files/libssh-0.10.1-disable-broken-test.patch b/net-libs/libssh/files/libssh-0.10.1-disable-broken-test.patch new file mode 100644 index 000000000000..0e91bedaef6e --- /dev/null +++ b/net-libs/libssh/files/libssh-0.10.1-disable-broken-test.patch @@ -0,0 +1,28 @@ +https://sources.debian.org/patches/libssh/0.9.6-2/2003-disable-expand_tilde_unix-test.patch/ + +Description: Disable torture_path_expand_tilde_unix, its not working well on buildd + On buildd, the HOME is set to a non-existing directory, this makes + torture_path_expand_tilde_unix fail +Author: Laurent Bigonville +Forwarded: not-needed + +--- a/tests/unittests/torture_misc.c ++++ b/tests/unittests/torture_misc.c +@@ -662,11 +662,11 @@ int torture_run_tests(void) { + cmocka_unit_test(torture_basename), + cmocka_unit_test(torture_dirname), + cmocka_unit_test(torture_ntohll), +-#ifdef _WIN32 +- cmocka_unit_test(torture_path_expand_tilde_win), +-#else +- cmocka_unit_test(torture_path_expand_tilde_unix), +-#endif ++//#ifdef _WIN32 ++// cmocka_unit_test(torture_path_expand_tilde_win), ++//#else ++// cmocka_unit_test(torture_path_expand_tilde_unix), ++//#endif + cmocka_unit_test_setup_teardown(torture_path_expand_escape, setup, teardown), + cmocka_unit_test_setup_teardown(torture_path_expand_known_hosts, setup, teardown), + cmocka_unit_test_setup_teardown(torture_path_expand_percent, setup, teardown), + 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 -} diff --git a/net-libs/libssh/libssh-0.10.1.ebuild b/net-libs/libssh/libssh-0.10.1.ebuild new file mode 100644 index 000000000000..25b41a81f804 --- /dev/null +++ b/net-libs/libssh/libssh-0.10.1.ebuild @@ -0,0 +1,127 @@ +# 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.10.1-disable-broken-test.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 + # 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 + + 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=$(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) + # 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_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-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild index 9b897cf8885e..25b41a81f804 100644 --- a/net-libs/libssh/libssh-9999.ebuild +++ b/net-libs/libssh/libssh-9999.ebuild @@ -45,7 +45,9 @@ BDEPEND="doc? ( app-doc/doxygen[dot] )" DOCS=( AUTHORS CHANGELOG README ) -PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" ) +PATCHES=( + "${FILESDIR}"/${PN}-0.10.1-disable-broken-test.patch +) src_prepare() { cmake_src_prepare @@ -53,22 +55,24 @@ 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 + sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \ + -i ConfigureChecks.cmake || 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" \ + if use test; then + # keyfile torture test is currently broken + sed -e "/torture_keyfiles/d" \ -i tests/unittests/CMakeLists.txt || die - fi - sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \ - -i ConfigureChecks.cmake || 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 - if use test && use elibc_musl; then - sed -e "/SOLARIS/d" \ - -i tests/CMakeLists.txt || die + if use elibc_musl; then + sed -e "/SOLARIS/d" \ + -i tests/CMakeLists.txt || die + fi fi } @@ -86,6 +90,7 @@ multilib_src_configure() { -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) ) diff --git a/net-libs/socket_wrapper/Manifest b/net-libs/socket_wrapper/Manifest index 54fb91c17b68..85933a222fd1 100644 --- a/net-libs/socket_wrapper/Manifest +++ b/net-libs/socket_wrapper/Manifest @@ -1,5 +1,5 @@ DIST socket_wrapper-1.3.2.tar.gz 86255 BLAKE2B 33f526a8871cfb1a889a84660ea8e82b6e591646924e16d2c452bb001e0eb4c1457b8151208bbec55c13c40fd124c160fc85d0df227519f62a2683e4ea1acb85 SHA512 f4d3a7026f1777a4c3b5481a0f6e6057b6372e9b64f44523ec1ebf0a34159d7154493dce6ee3c95fbea15607c6ada1382f2475d5d553133a061c80719c135b9d DIST socket_wrapper-1.3.4.tar.gz 81997 BLAKE2B 5d290ef59c16fbdde362749196cc91c3f050518f82cb14fbafa3e00d5fb51a6b085b94b08413ca601731440d8eadb5dfbe8d011567fd67b1240b0cc380504813 SHA512 6e6a940e26d0f4dc4f1c0f84643d5a124bb2cccd1713481e9c42ea7986884928d736b1ef8da8a2aef3d3803938b6e1ebd30bdbe9784fda95a9a59cdbd1d19f61 EBUILD socket_wrapper-1.3.2.ebuild 613 BLAKE2B c76ba6dda81912852db5c50ad35f504192b6743d7061584018b8ce0b85971f255fed41362b9ea56811b9b11743bb5e45ebb34563b190000ff0aa01dd190322bb SHA512 dde73f3b4057563727f4bd331dc326e73e9ec9d7a677e70f863053be9aca700330fd3853f8e11064c6100d85ed93ef5a28a5f88825ac04001e8e02662004ac47 -EBUILD socket_wrapper-1.3.4.ebuild 619 BLAKE2B c1ecfd3e196cb868e6ba0ecb973ff68fa49d59ca18e12ae2a1b1f38e4f238af011d9fa5d9909ebe8999f29e4f65974555c65c6225495dd913636348c31bfeb4e SHA512 c406ed7c9f6d670e9dd24d799cd9ba5c47504329a9e30de664d8bcee3361e9d603a4140253fbb063876d8e06cef2e8dcd7c814e6fb9122411c40128148dc1e8b +EBUILD socket_wrapper-1.3.4.ebuild 614 BLAKE2B ec0d695a1947e83ccd163808f7d09810ce91dfd7cd10345ccb79f915ea1b851812e5c8fe39aac21c9d937f05cec44ecc69436b649f5c4dc1f0d1065fc09d0825 SHA512 f9a8929c6b40ac3ea9d957e79a5857133e378c6a5f6eabea504ea21ff587a8a6f16428eab29da66c3da36a1f1387facb831051b6ed48df686b9f11ebea241d25 MISC metadata.xml 250 BLAKE2B e398673dd1a3522ccddb89a82a53fc2578d8e0777ec46f889d01d618609a22958d91699beef513c7912799e0e8ff985200f7c67bba941235da25c24cd4b48f09 SHA512 16834c3cbecd0dd5a9c8c311d2b8ebc63d8cd72c5891498f4f0048988993c104aadd4e24e632bf54071c11f810716432e89e4afab029555875f9f52794daa6e9 diff --git a/net-libs/socket_wrapper/socket_wrapper-1.3.4.ebuild b/net-libs/socket_wrapper/socket_wrapper-1.3.4.ebuild index 52c36e4a8cc9..ce8e5e090386 100644 --- a/net-libs/socket_wrapper/socket_wrapper-1.3.4.ebuild +++ b/net-libs/socket_wrapper/socket_wrapper-1.3.4.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://ftp.samba.org/pub/cwrap/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86" IUSE="test" RESTRICT="!test? ( test )" -- cgit v1.2.3