diff options
author | Tim Harder <radhermit@gentoo.org> | 2011-07-07 23:07:28 +0000 |
---|---|---|
committer | Tim Harder <radhermit@gentoo.org> | 2011-07-07 23:07:28 +0000 |
commit | 9c54087e48797c5e71f1dacd0e7db6c557210555 (patch) | |
tree | 19e5c7ec54071c2ebd5b258a5fb1ac60d6dba587 /net-libs/libssh | |
parent | keyword ~x86-fbsd, bug #346449 (diff) | |
download | historical-9c54087e48797c5e71f1dacd0e7db6c557210555.tar.gz historical-9c54087e48797c5e71f1dacd0e7db6c557210555.tar.bz2 historical-9c54087e48797c5e71f1dacd0e7db6c557210555.zip |
Version bump. Add doc and test USE flags.
Package-Manager: portage-2.2.0_alpha43/cvs/Linux x86_64
Diffstat (limited to 'net-libs/libssh')
-rw-r--r-- | net-libs/libssh/ChangeLog | 9 | ||||
-rw-r--r-- | net-libs/libssh/Manifest | 19 | ||||
-rw-r--r-- | net-libs/libssh/files/libssh-0.5.0-no-pdf-doc.patch | 31 | ||||
-rw-r--r-- | net-libs/libssh/files/libssh-0.5.0-no-server.patch | 38 | ||||
-rw-r--r-- | net-libs/libssh/files/libssh-0.5.0-tests.patch | 11 | ||||
-rw-r--r-- | net-libs/libssh/libssh-0.5.0.ebuild | 73 |
6 files changed, 175 insertions, 6 deletions
diff --git a/net-libs/libssh/ChangeLog b/net-libs/libssh/ChangeLog index 497b5cb63b90..3b7df80472b7 100644 --- a/net-libs/libssh/ChangeLog +++ b/net-libs/libssh/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-libs/libssh # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/ChangeLog,v 1.44 2011/05/03 11:32:59 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/ChangeLog,v 1.45 2011/07/07 23:07:28 radhermit Exp $ + +*libssh-0.5.0 (07 Jul 2011) + + 07 Jul 2011; Tim Harder <radhermit@gentoo.org> +libssh-0.5.0.ebuild, + +files/libssh-0.5.0-no-pdf-doc.patch, +files/libssh-0.5.0-no-server.patch, + +files/libssh-0.5.0-tests.patch: + Version bump. Add doc and test USE flags. 03 May 2011; Tomáš Chvátal <scarabeus@gentoo.org> libssh-9999.ebuild: Migrate to git-2 eclass. diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest index a4fac13f1497..7fbfa6ee6a33 100644 --- a/net-libs/libssh/Manifest +++ b/net-libs/libssh/Manifest @@ -1,17 +1,26 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA512 +AUX libssh-0.5.0-no-pdf-doc.patch 1195 RMD160 496f4c7a2ba7826cbf79822266d2456cd40be297 SHA1 b71b64be55b5c32838dcde5cbb8d04dbc4911bde SHA256 116f436073bb6eed8ec776828efcba399852019483a10da2691b3d350570c793 +AUX libssh-0.5.0-no-server.patch 959 RMD160 0208a42fa8eee053359e31c3be8e0ab90f8806d0 SHA1 3c6090dbee1da072e42c6d5d17bf42d0e892c185 SHA256 1f684d8d173235832d1571a6326bfa643baa6d4bd2d2c1377b06778928f2296f +AUX libssh-0.5.0-tests.patch 473 RMD160 b0d2af4276ae19f316c2e2ec5bd372509aa2e825 SHA1 48f40afcc4ce97c8b004a714913f8b73219060f1 SHA256 aa57848a7e67fe4e62bad6ade2dbeb45c616b03f9d38594ac90deba893c649c1 DIST libssh-0.4.8.tar.gz 277614 RMD160 1f2b31e7ff87fda102050d97ba5d10ea96b95b8d SHA1 97750c95389e425e10c9b1a8f8ce49667e7fbfe0 SHA256 15c239a426c7fbdddf97127ffddee6c4a5bcafac37f94987cf4f28cf218aa815 DIST libssh-0.4.91.tar.gz 312078 RMD160 e9a58a31b49dc0310ce6e10a26336da975baa9d3 SHA1 61aff7b7e6c7d4a36ef68a58f47f216f7e5a019d SHA256 52d6a7202308de8df4c6bee2df56a5994eac2c64c4835407b64660632029d6e2 +DIST libssh-0.5.0.tar.gz 314429 RMD160 22af6792cfa6cca8c5371fc60a1607f7489cee28 SHA1 ec72a2e23f97d412c465f8ba97d688679550ac18 SHA256 4bfd09676d1cb6667cfc778a2729c85fc8e3bdb6ad85d6661ab976419f4f993c EBUILD libssh-0.4.8.ebuild 1470 RMD160 1019596fcf9d2a56e0d407b0a041edc14f2094a5 SHA1 1b4f040d827f2c7cc1b88f555e37964f644f28aa SHA256 3faeacbb2cd3aca4b6b10ebcd2607843f318156112015cdf1423f60c518e8c9e EBUILD libssh-0.4.91.ebuild 1548 RMD160 d484b3afcd4d2c4cb7461a2041ad7fb80808b98c SHA1 d8b16c754a4ca0fc16bc9011e5a982da1f3e97c8 SHA256 89c1cd9009b183d180acdbd90fa094a8d6c550cd59a5402aac269f341e3f5835 +EBUILD libssh-0.5.0.ebuild 1823 RMD160 1a0a53e41c69d13c09657e0bdb46ace5e0e4ca3a SHA1 72dd2682a19d623b1982d6875c4697047ac7ac7a SHA256 a3152743481c202170bfd0dcb28bda554c80fd13cd3fb32d66e256b6e6eaeb6a EBUILD libssh-9999.ebuild 1476 RMD160 621b94791a2be1585871e68685ba59fae4bfe987 SHA1 add26fc157d81f50aff2d33f8f01a308da9e490b SHA256 f7de35a5de94e8fbf7df009e4a03d361bc8f748cdde9accae8ecad73018943f3 -MISC ChangeLog 6505 RMD160 0170156b4c1be1931df20cb3c58651d565a526bc SHA1 1cc59c3f066838244cae4df4c65f705864a98589 SHA256 db8ddb4c47a17fd199289fcdf91ed69f5f9ab04137faef0fb42604f8cf3b3a3e +MISC ChangeLog 6762 RMD160 5b801c940ea2bede2e7a8daa5bac09bcb4138694 SHA1 0946e380be796549fc0b80851a0b7e5f2cdfdf46 SHA256 cd517365d81cac462e973129b4516090e484ae7441fde2eae8253598d56014b7 MISC metadata.xml 617 RMD160 62c9a2d4ef7d2d96b7d92d991955fabd7e852938 SHA1 3a3043b5b0684bb959008f0107957841cee6b4cb SHA256 cad0b9d4d822716fa2a55fde2b79b85456b83a555a07161190d3ad48400cae8c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk2/5+QACgkQHB6c3gNBRYd0xgCfQU82B22Oj4HZ3s3DXb7ttlzH -TS8An0zgJfQTO+aGzIQRcvkQljJk3kv1 -=GxGT +iQEcBAEBCgAGBQJOFjw6AAoJEEqz6FtPBkyj3PoH+wXjor2Zrj4dJMS+tr5BWpMt +jb8MLB6IqCfky/Ekn6q6/Q9x4DWGQSXGBUoLDxkHfCfIlSHacdpXZHl9rByD9H3m +xp77e2L28auM+87uDwt8mfG1GVaJOoxjY0VJSSPEdrITZDLvItJ7toAa66/aux1f +G8Qvii9TyuNAc4bF0fqzdIZLGwm5GxEnadpbVjG+4D5txm0IrPf3DyXA4vZiAAXE +l3PDdTWhNh8WA7CdrrSuR7Jj13LLqoC19Y+5jvlkDohphHBtH7Whhyx2TGMYRHvP +QHHqsg5LnTHEHLirHRDRvH0JY1bTlaApT5txfWxNxh7wAvxay/Ci6psmqv+/+EQ= +=kwQ3 -----END PGP SIGNATURE----- diff --git a/net-libs/libssh/files/libssh-0.5.0-no-pdf-doc.patch b/net-libs/libssh/files/libssh-0.5.0-no-pdf-doc.patch new file mode 100644 index 000000000000..3de2b9b496a5 --- /dev/null +++ b/net-libs/libssh/files/libssh-0.5.0-no-pdf-doc.patch @@ -0,0 +1,31 @@ +--- libssh-0.5.0/cmake/Modules/UseDoxygen.cmake.orig ++++ libssh-0.5.0/cmake/Modules/UseDoxygen.cmake +@@ -63,28 +63,6 @@ + set(DOXYFILE_PDFLATEX FALSE) + set(DOXYFILE_DOT FALSE) + +- find_package(LATEX) +- if(LATEX_COMPILER AND MAKEINDEX_COMPILER) +- set(DOXYFILE_LATEX TRUE) +- usedoxygen_set_default(DOXYFILE_LATEX_DIR "latex") +- +- set_property(DIRECTORY APPEND PROPERTY +- ADDITIONAL_MAKE_CLEAN_FILES +- "${DOXYFILE_OUTPUT_DIR}/${DOXYFILE_LATEX_DIR}") +- +- if(PDFLATEX_COMPILER) +- set(DOXYFILE_PDFLATEX TRUE) +- endif() +- if(DOXYGEN_DOT_EXECUTABLE) +- set(DOXYFILE_DOT TRUE) +- endif() +- +- add_custom_command(TARGET doxygen +- POST_BUILD +- COMMAND ${CMAKE_MAKE_PROGRAM} +- WORKING_DIRECTORY "${DOXYFILE_OUTPUT_DIR}/${DOXYFILE_LATEX_DIR}") +- endif() +- + configure_file(${DOXYFILE_IN} ${CMAKE_CURRENT_BINARY_DIR}/doxy.config ESCAPE_QUOTES IMMEDIATE @ONLY) + if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/doxy.trac.in) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/doxy.trac.in ${CMAKE_CURRENT_BINARY_DIR}/doxy.trac ESCAPE_QUOTES IMMEDIATE @ONLY) diff --git a/net-libs/libssh/files/libssh-0.5.0-no-server.patch b/net-libs/libssh/files/libssh-0.5.0-no-server.patch new file mode 100644 index 000000000000..fe3d5373ea6c --- /dev/null +++ b/net-libs/libssh/files/libssh-0.5.0-no-server.patch @@ -0,0 +1,38 @@ +--- libssh-0.5.0/src/messages.c.orig ++++ libssh-0.5.0/src/messages.c +@@ -41,7 +41,7 @@ + #include "libssh/keys.h" + #include "libssh/dh.h" + #include "libssh/messages.h" +-#if WITH_SERVER ++#ifdef WITH_SERVER + #include "libssh/server.h" + #endif + +@@ -69,6 +69,26 @@ + return msg; + } + ++#ifndef WITH_SERVER ++ ++/* Reduced version of the reply default that only reply with ++ * SSH_MSG_UNIMPLEMENTED ++ */ ++static int ssh_message_reply_default(ssh_message msg) { ++ ssh_log(msg->session, SSH_LOG_FUNCTIONS, "Reporting unknown packet"); ++ ++ if (buffer_add_u8(msg->session->out_buffer, SSH2_MSG_UNIMPLEMENTED) < 0) ++ goto error; ++ if (buffer_add_u32(msg->session->out_buffer, ++ htonl(msg->session->recv_seq-1)) < 0) ++ goto error; ++ return packet_send(msg->session); ++ error: ++ return SSH_ERROR; ++} ++ ++#endif ++ + static int ssh_execute_message_callback(ssh_session session, ssh_message msg) { + int ret; + if(session->ssh_message_callback != NULL) { diff --git a/net-libs/libssh/files/libssh-0.5.0-tests.patch b/net-libs/libssh/files/libssh-0.5.0-tests.patch new file mode 100644 index 000000000000..ecae9cc5f8b3 --- /dev/null +++ b/net-libs/libssh/files/libssh-0.5.0-tests.patch @@ -0,0 +1,11 @@ +--- libssh-0.5.0/tests/unittests/torture_misc.c.orig ++++ libssh-0.5.0/tests/unittests/torture_misc.c +@@ -195,7 +195,7 @@ + #ifdef _WIN32 + unit_test(torture_path_expand_tilde_win), + #else +- unit_test(torture_path_expand_tilde_unix), ++ //unit_test(torture_path_expand_tilde_unix), + #endif + unit_test_setup_teardown(torture_path_expand_escape, setup, teardown), + unit_test_setup_teardown(torture_path_expand_known_hosts, setup, teardown), diff --git a/net-libs/libssh/libssh-0.5.0.ebuild b/net-libs/libssh/libssh-0.5.0.ebuild new file mode 100644 index 000000000000..cb8617d99837 --- /dev/null +++ b/net-libs/libssh/libssh-0.5.0.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.5.0.ebuild,v 1.1 2011/07/07 23:07:28 radhermit Exp $ + +EAPI=4 + +inherit eutils cmake-utils + +DESCRIPTION="Access a working SSH implementation by means of a library" +HOMEPAGE="http://www.libssh.org/" +SRC_URI="http://www.${PN}.org/files/${PV:0:3}/${P}.tar.gz" + +LICENSE="LGPL-2.1" +KEYWORDS="~amd64 ~x86" +SLOT="0" +IUSE="debug doc examples gcrypt pcap +sftp ssh1 server static-libs test zlib" +# Maintainer: check IUSE-defaults at DefineOptions.cmake + +RDEPEND=" + zlib? ( >=sys-libs/zlib-1.2 ) + !gcrypt? ( >=dev-libs/openssl-0.9.8 ) + gcrypt? ( >=dev-libs/libgcrypt-1.4 ) +" +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen ) + test? ( dev-util/cmockery ) +" + +DOCS=( AUTHORS README ChangeLog ) + +src_prepare() { + # just install the examples do not compile them + sed -i \ + -e '/add_subdirectory(examples)/s/^/#DONOTWANT/' \ + CMakeLists.txt || die + + epatch "${FILESDIR}"/${P}-no-server.patch \ + "${FILESDIR}"/${P}-no-pdf-doc.patch \ + "${FILESDIR}"/${P}-tests.patch +} + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_with debug DEBUG_CALLTRACE) + $(cmake-utils_use_with debug DEBUG_CRYPTO) + $(cmake-utils_use_with gcrypt) + $(cmake-utils_use_with pcap) + $(cmake-utils_use_with server) + $(cmake-utils_use_with sftp) + $(cmake-utils_use_with ssh1) + $(cmake-utils_use_with static-libs STATIC_LIB) + $(cmake-utils_use_with test TESTING) + $(cmake-utils_use_with zlib LIBZ) + ) + + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile + use doc && cmake-utils_src_compile doc +} + +src_install() { + cmake-utils_src_install + + use doc && dohtml -r "${CMAKE_BUILD_DIR}"/doc/html/* + + if use examples; then + docinto examples + dodoc examples/*.{c,h,cpp} + fi +} |