diff options
| -rw-r--r-- | net-libs/libssh/ChangeLog | 7 | ||||
| -rw-r--r-- | net-libs/libssh/files/libssh-0.3.0-automagic-crypt.patch | 37 | ||||
| -rw-r--r-- | net-libs/libssh/files/libssh-0.4.1-debug-build.patch | 24 | ||||
| -rw-r--r-- | net-libs/libssh/libssh-0.4.1.ebuild | 56 |
4 files changed, 6 insertions, 118 deletions
diff --git a/net-libs/libssh/ChangeLog b/net-libs/libssh/ChangeLog index c6512ce5a080..94f1476d0487 100644 --- a/net-libs/libssh/ChangeLog +++ b/net-libs/libssh/ChangeLog @@ -1,6 +1,11 @@ # 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.41 2011/03/05 01:03:17 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/ChangeLog,v 1.42 2011/03/05 17:00:08 scarabeus Exp $ + + 05 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> + -files/libssh-0.3.0-automagic-crypt.patch, -libssh-0.4.1.ebuild, + -files/libssh-0.4.1-debug-build.patch: + remove old 05 Mar 2011; Brent Baude <ranger@gentoo.org> libssh-0.4.8.ebuild: stable ppc, bug 355857 diff --git a/net-libs/libssh/files/libssh-0.3.0-automagic-crypt.patch b/net-libs/libssh/files/libssh-0.3.0-automagic-crypt.patch deleted file mode 100644 index e786ddd0f8c1..000000000000 --- a/net-libs/libssh/files/libssh-0.3.0-automagic-crypt.patch +++ /dev/null @@ -1,37 +0,0 @@ -=== modified file 'CMakeLists.txt' ---- CMakeLists.txt 2009-05-25 19:43:46 +0000 -+++ CMakeLists.txt 2009-05-25 19:54:56 +0000 -@@ -38,14 +38,24 @@ - # search for libraries - find_package(ZLIB REQUIRED) - --find_package(OpenSSL) -- --if (NOT CRYPTO_FOUND) -- find_package(GCrypt) -- if (NOT GCRYPT_FOUND) -- message(FATAL_ERROR "Could not find OpenSSL or GCrypt") -- endif (NOT GCRYPT_FOUND) --endif (NOT CRYPTO_FOUND) -+option(WITH_GCRYPT "Prefer GCcrypt over OpenSSL" "AUTO") -+ -+if (WITH_GCRYPT STREQUAL "AUTO") -+ find_package(OpenSSL) -+ if (NOT CRYPTO_FOUND) -+ find_package(GCrypt) -+ endif (NOT CRYPTO_FOUND) -+else () -+ if (WITH_GCRYPT) -+ find_package(GCrypt) -+ else (WITH_GCRYPT) -+ find_package(OpenSSL) -+ endif (WITH_GCRYPT) -+endif (WITH_GCRYPT STREQUAL "AUTO") -+ -+if (NOT CRYPTO_FOUND AND NOT GCRYPT_FOUND) -+ message(FATAL_ERROR "Could not find OpenSSL or GCrypt") -+endif (NOT CRYPTO_FOUND AND NOT GCRYPT_FOUND) - - # config.h checks - include(ConfigureChecks.cmake) - diff --git a/net-libs/libssh/files/libssh-0.4.1-debug-build.patch b/net-libs/libssh/files/libssh-0.4.1-debug-build.patch deleted file mode 100644 index dad6b86cc00e..000000000000 --- a/net-libs/libssh/files/libssh-0.4.1-debug-build.patch +++ /dev/null @@ -1,24 +0,0 @@ -Author: Arttu Valo -http://bugs.gentoo.org/show_bug.cgi?id=304301 -http://dev.libssh.org/ticket/58 - ---- libssh/kex.c 2010-02-10 19:09:22.000000000 +0200 -+++ libssh/kex.c 2010-02-10 19:09:39.000000000 +0200 -@@ -40,6 +40,7 @@ - #include "libssh/wrapper.h" - #include "libssh/keys.h" - #include "libssh/dh.h" -+#include "libssh/string.h" - - #ifdef HAVE_LIBGCRYPT - #define BLOWFISH "blowfish-cbc," ---- libssh/keys.c 2010-02-10 20:08:30.000000000 +0200 -+++ libssh/keys.c 2010-02-10 20:09:04.000000000 +0200 -@@ -36,6 +36,7 @@ - #include "libssh/keys.h" - #include "libssh/dh.h" - #include "libssh/messages.h" -+#include "libssh/string.h" - - /** \addtogroup ssh_auth - * @{ diff --git a/net-libs/libssh/libssh-0.4.1.ebuild b/net-libs/libssh/libssh-0.4.1.ebuild deleted file mode 100644 index aed9d9d5fc4a..000000000000 --- a/net-libs/libssh/libssh-0.4.1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.4.1.ebuild,v 1.7 2010/09/03 19:29:07 josejx Exp $ - -# Maintainer: check IUSE-defaults at DefineOptions.cmake - -EAPI="2" - -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/${P}.tar.gz" - -LICENSE="LGPL-2.1" -KEYWORDS="amd64 ~arm ~hppa ppc ppc64 ~s390 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux" -SLOT="0" -IUSE="debug gcrypt examples +sftp ssh1 server static-libs zlib" - -DEPEND=" - zlib? ( >=sys-libs/zlib-1.2 ) - !gcrypt? ( >=dev-libs/openssl-0.9.8 ) - gcrypt? ( >=dev-libs/libgcrypt-1.4 ) -" -RDEPEND="${DEPEND}" - -DOCS="AUTHORS README ChangeLog" - -src_prepare() { - sed -i '/add_subdirectory(examples)/s/^/#DONOTWANT/' CMakeLists.txt - epatch "${FILESDIR}/${P}-debug-build.patch" -} - -src_configure() { - mycmakeargs=( - $(cmake-utils_use_with debug DEBUG_CALLTRACE) - $(cmake-utils_use_with debug DEBUG_CRYPTO) - $(cmake-utils_use_with gcrypt) - $(cmake-utils_use_with zlib LIBZ) - $(cmake-utils_use_with sftp) - $(cmake-utils_use_with ssh1) - $(cmake-utils_use_with server) - $(cmake-utils_use_with static-libs STATIC_LIB) - ) - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - if use examples; then - insinto /usr/share/doc/${PF}/examples - doins examples/*.c - fi -} |