diff options
Diffstat (limited to 'net-libs/libssh2')
| -rw-r--r-- | net-libs/libssh2/Manifest | 4 | ||||
| -rw-r--r-- | net-libs/libssh2/libssh2-1.8.1.ebuild | 59 | ||||
| -rw-r--r-- | net-libs/libssh2/libssh2-9999.ebuild | 64 |
3 files changed, 97 insertions, 30 deletions
diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest index 3d76137f7302..ed6a478fdea5 100644 --- a/net-libs/libssh2/Manifest +++ b/net-libs/libssh2/Manifest @@ -3,7 +3,9 @@ AUX libssh2-1.8.0-mansyntax_sh.patch 770 BLAKE2B 743bb8032baab056fb578429bf540c8 AUX libssh2-1.8.0-openssl11-memleak.patch 823 BLAKE2B 3d2abd43798a23b551ef5ba97b705f8e8e24db010a19a2387efe10299e436e0dbe655db419fa8da1467aed18ec2bb39e1d863eb981603afecb302700c565159e SHA512 d93ee0b8ea5f37b81883ff79fb7d2f19633a4415990de1743f1388f49f7897be200ae0911b6ca14d505498294727aa5542c7d76a29e7b8df0051a53e6dcd586a AUX libssh2-1.8.0-openssl11.patch 2551 BLAKE2B 32875e90a9cfb754050559a315c24d51065ceb9be22e450984aef9dea0a59b5b93cac7498e3c3e9cf8057ac13dd93330bc470bd717c9a06af9d9294ef7172eed SHA512 3cfd11ef23884a3de173422e001b0ec0f9af48c832948b5d0f90f0be2008334c30ed769a642786cad9aa68ea445b66780b10d3c64434178978018e709510deab DIST libssh2-1.8.0.tar.gz 854916 BLAKE2B 618c4a19789f2e5eda85852760dffff5672d420d2fa50393b05b7398a1913f74e5f6695f078628050ac9851965d6e45cf410b7c4590a8f18d67c718c829ab352 SHA512 289aa45c4f99653bebf5f99565fe9c519abc204feb2084b47b7cc3badc8bf4ecdedd49ea6acdce8eb902b3c00995d5f92a3ca77b2508b92f04ae0e7de7287558 +DIST libssh2-1.8.1.tar.gz 858088 BLAKE2B 4e7358c55355265ec3c7d7ce749b01d74bc1c37ba73467401c24f0abb2b22da12ba938393f3cf7278ef30900c0cfa700ab71c4fd32a1d41eaeb6fb47669c1ee1 SHA512 f09ad9ed04d25305b966e7f8c210082fe06c2b236dcd5018b009bd0bd6aaff123d16559d280892a5060760ed055ffe295bc02dc6e8dd1e7b8383c6c703f09290 EBUILD libssh2-1.8.0-r1.ebuild 1362 BLAKE2B 0765a2ec7cfb2b0eb5ab4f52054d4cf8abebeda0b47814520ec76a5b3ff4299efa642483bfad8051788a27cc0934bdecf9a91bf6a17b49e81562e2b3a6b246d6 SHA512 61067547b394f9c5959bf7dec2ec2cb0a69629ca5a65f9f5dbc6f71b8664767802af0fe59eae210eefb165378c9f4af58eae0358421ae4f339da3812a80dd579 EBUILD libssh2-1.8.0-r2.ebuild 1621 BLAKE2B ce45c14d1f62ca3fc41bb1c0b3f3c51bb7b752fce9f24b53b4b6b59567ad89a02a0191e67935d93969b8b464eca017c5e2d6025c4dc648eed07103964793a08b SHA512 472bd3eadc918e6d785ce0af09bce7a811236dbe3a62de12612556a66d7c89fc20322a47c4779b389175ed39041a1ad710fd8956c2d11a1f79685b2f862980eb -EBUILD libssh2-9999.ebuild 1131 BLAKE2B d4413bf097b892cb8fa1747614e0194ea0db57c91b00dad158da1b88405e3d1d6d9372efd5c39447f4a7c87b2e3d215f66df8bcc212e1fc599b839e8275ff6f2 SHA512 a9ed6e5e56b005f8c46f957befa279360e127f30b95a33f98e0f3dcd73fa3e921f45e5577f4d2632b841ee1ae002011b1042e1f67ac55bab2e56bbc19ef532c5 +EBUILD libssh2-1.8.1.ebuild 1621 BLAKE2B f3bea26503e369179cd8556d82441456a7e11ccea46ca0166f4e2f512f5ba6dbf2231e95deb3645fcc7973a1d0b48c522f32cf6863fc8229865687d5e4febd2f SHA512 d27e38c726d87b19f3107dc0744343d5618226037fe8a751a73d31b785acab40dc5101ec91d570ee601cede993587e451d63fd78b3943f81629854ad4be46c4f +EBUILD libssh2-9999.ebuild 1324 BLAKE2B 2ceb2fc6efd161d8c2f42bc3a2bf28273d9084311f4749859a757a8d31663e7dd9806793bf1f00b8cbbb8524549ae154441459fb03e15daba8d84ad6d2d82a87 SHA512 59e65c232c435fc439bca3d2ee4f0010c50684aa3f7e519050e5fae309f25b0a27e737dfd6bbf6540a9c5b08601546979aa4824736becd0c0d5cf03700f9bd3c MISC metadata.xml 634 BLAKE2B 09afb03a2a77e95f5717d21936668a650f01d0dc44173a57cf6d702d5a51076ae41b1a71974dfbaf66baf3b746af2dbb07e02556aeed793edfff93d0b38e14ba SHA512 4596f1e9a12c3d35d2a0b69e349b12a9bba72e57ea505e10fb814a3d310a7e63f75d1e5628946cd2045260c7466bc654a6770aea5743afa52c742913f7c62960 diff --git a/net-libs/libssh2/libssh2-1.8.1.ebuild b/net-libs/libssh2/libssh2-1.8.1.ebuild new file mode 100644 index 000000000000..75e39f52b68e --- /dev/null +++ b/net-libs/libssh2/libssh2-1.8.1.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit cmake-multilib + +DESCRIPTION="Library implementing the SSH2 protocol" +HOMEPAGE="https://www.libssh2.org" +SRC_URI="https://www.${PN}.org/download/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" +IUSE="gcrypt libressl mbedtls zlib" +REQUIRED_USE=" + ?? ( gcrypt libressl mbedtls ) +" +RESTRICT="test" + +RDEPEND=" + !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) + gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] ) + libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) + mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] ) + zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) +" +DEPEND=" + ${RDEPEND} +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.8.0-libgcrypt-prefix.patch + "${FILESDIR}"/${PN}-1.8.0-mansyntax_sh.patch + "${FILESDIR}"/${PN}-1.8.0-openssl11-memleak.patch + "${FILESDIR}"/${PN}-1.8.0-openssl11.patch +) + +multilib_src_configure() { + local crypto_backend=OpenSSL + if use gcrypt; then + crypto_backend=Libgcrypt + elif use mbedtls; then + crypto_backend=mbedTLS + fi + + local mycmakeargs=( + -DBUILD_SHARED_LIBS=ON + -DCRYPTO_BACKEND=${crypto_backend} + -DENABLE_ZLIB_COMPRESSION=$(usex zlib) + ) + cmake-utils_src_configure +} + +multilib_src_install_all() { + einstalldocs + find "${ED}" -name '*.la' -delete || die + mv "${ED}"/usr/share/doc/${PN}/* "${ED}"/usr/share/doc/${PF}/ || die + rm -r "${ED}"/usr/share/doc/${PN}/ || die +} diff --git a/net-libs/libssh2/libssh2-9999.ebuild b/net-libs/libssh2/libssh2-9999.ebuild index 4ed00d509733..456ca9203854 100644 --- a/net-libs/libssh2/libssh2-9999.ebuild +++ b/net-libs/libssh2/libssh2-9999.ebuild @@ -1,50 +1,56 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit autotools git-r3 multilib-minimal +inherit git-r3 cmake-multilib -EGIT_REPO_URI="https://github.com/libssh2/libssh2" DESCRIPTION="Library implementing the SSH2 protocol" HOMEPAGE="https://www.libssh2.org" -SRC_URI="" +EGIT_REPO_URI="https://github.com/libssh2/libssh2" LICENSE="BSD" SLOT="0" KEYWORDS="" -IUSE="gcrypt libressl static-libs test zlib" +IUSE="gcrypt libressl mbedtls zlib" +REQUIRED_USE=" + ?? ( gcrypt libressl mbedtls ) +" +RESTRICT="test" -DEPEND=" - !gcrypt? ( - !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) - libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] ) - ) +RDEPEND=" + !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] ) + libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) + mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) " -RDEPEND="${DEPEND}" - -DOCS=( NEWS README ) - -src_prepare() { - default - - sed -i -e 's|mansyntax.sh||g' tests/Makefile.am || die - ln -s ../src/libssh2_config.h.in example/libssh2_config.h.in || die +DEPEND=" + ${RDEPEND} +" - eautoreconf -} +PATCHES=( + "${FILESDIR}"/${PN}-1.8.0-mansyntax_sh.patch +) multilib_src_configure() { - # Disable tests that require extra permissions (bug #333319) - use test && local -x ac_cv_path_SSHD= - - local crypto + local crypto_backend=OpenSSL if use gcrypt; then - crypto=libgcrypt - else - crypto=openssl + crypto_backend=Libgcrypt + elif use mbedtls; then + crypto_backend=mbedTLS fi - ECONF_SOURCE="${S}" econf --with-crypto=${crypto} + local mycmakeargs=( + -DBUILD_SHARED_LIBS=ON + -DCRYPTO_BACKEND=${crypto_backend} + -DENABLE_ZLIB_COMPRESSION=$(usex zlib) + ) + cmake-utils_src_configure +} + +multilib_src_install_all() { + einstalldocs + find "${ED}" -name '*.la' -delete || die + mv "${ED}"/usr/share/doc/${PN}/* "${ED}"/usr/share/doc/${PF}/ || die + rm -r "${ED}"/usr/share/doc/${PN}/ || die } |