From b2a19ca2d10d7b304220bb0ffc44ee6b2920c6bf Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Mon, 29 Mar 2010 18:15:03 +0000 Subject: Old. (Portage version: 2.2_rc67/cvs/Linux i686) --- net-libs/libssh2/Manifest | 10 ----- .../libssh2/files/libssh2-0.14-banner-wait.patch | 23 ----------- .../files/libssh2-0.14-channel-failure.patch | 24 ------------ .../libssh2/files/libssh2-0.14-configure.patch | 12 ------ .../libssh2/files/libssh2-0.14-peer-shutdown.patch | 44 ---------------------- net-libs/libssh2/libssh2-0.18.ebuild | 29 -------------- net-libs/libssh2/libssh2-1.1.ebuild | 38 ------------------- net-libs/libssh2/libssh2-1.2.1.ebuild | 38 ------------------- 8 files changed, 218 deletions(-) delete mode 100644 net-libs/libssh2/files/libssh2-0.14-banner-wait.patch delete mode 100644 net-libs/libssh2/files/libssh2-0.14-channel-failure.patch delete mode 100644 net-libs/libssh2/files/libssh2-0.14-configure.patch delete mode 100644 net-libs/libssh2/files/libssh2-0.14-peer-shutdown.patch delete mode 100644 net-libs/libssh2/libssh2-0.18.ebuild delete mode 100644 net-libs/libssh2/libssh2-1.1.ebuild delete mode 100644 net-libs/libssh2/libssh2-1.2.1.ebuild (limited to 'net-libs/libssh2') diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest index 94980fe2a49e..12a60eaefd5d 100644 --- a/net-libs/libssh2/Manifest +++ b/net-libs/libssh2/Manifest @@ -1,14 +1,4 @@ -AUX libssh2-0.14-banner-wait.patch 675 RMD160 833419dd74233e52a37416d1f94c746b921f13c9 SHA1 726f10577f1815a6b04ef99bdf6d012f86a92a02 SHA256 662c068446bc8ac8d8949fe678f89915e6237edb43fff7bdba4340abf9d3f954 -AUX libssh2-0.14-channel-failure.patch 700 RMD160 1393b9e07a8760fb75c95c37604044b4181acc2e SHA1 d0eb800c79488254b5ac46a689164e1e7434d61d SHA256 121d8a0385d36f8a4c01d746719d1745a04cafb8a3a6e47c637d1395e89c1617 -AUX libssh2-0.14-configure.patch 545 RMD160 47f83facd1be7198145a535c1ae88c459408aa8f SHA1 f68fd70d04a6522a4fb8b294d67b243f329f0962 SHA256 af8d0c9afdeb20501f6062dbedaa044a7eff42ef23ffe18d71d9fc2abff341db -AUX libssh2-0.14-peer-shutdown.patch 1191 RMD160 086e212748aedcb002c5e120e7a55e2fa796310a SHA1 765dff3df921bf26528a2818251f030fcd631a92 SHA256 d902d7777621e34d454ec8a109358427536890298256308e5f38cf96e251ff52 -DIST libssh2-0.18.tar.gz 541428 RMD160 2088c73a7903828670e14c6289a6961f5a3e4764 SHA1 9bc6148869fca08350e27ea2c9fc44917ac027ff SHA256 6964a5869d757c8c9f64256bdafcff302826acf9898150ada69eb229b3017ccc -DIST libssh2-1.1.tar.gz 582185 RMD160 6cc3d6dcf35178b8646efc18c4720b559720bbe0 SHA1 f3d65c8a24c6e8090366b9901e9be97a7d3f38e2 SHA256 507b7a60b7cafeef071c58a93d2c3c9ee07092a61d5ab29aee73e8c4c6c7020a -DIST libssh2-1.2.1.tar.gz 533302 RMD160 12da32cc6a1f79dd3627037645b848f4bf1c7b20 SHA1 fc5e66089340cce1cf03a8cfd75b6f15ed59d30c SHA256 d225403bbd8c0c2ecc5dc8e3f0e81525818965f285ad4b8b4c2f1d54f3f9c854 DIST libssh2-1.2.2.tar.gz 535430 RMD160 21e90f957019c11d0447352c5ac19c9dc3f8dd5c SHA1 d1a52cd4949efc7befcd61052de7fce4ae3e7415 SHA256 1e2a133b111a367c579b89d72d5da9e65a73b8e57202b91d540a51141aca69aa -EBUILD libssh2-0.18.ebuild 775 RMD160 dc339e1c1550144039a1d1e989d4c027169022b6 SHA1 65bc6ffccd63486726ca38442a5e19cfb3ba392f SHA256 c493d2ce17ace2366319d6bc9e77c22b4416c99bf2b43aaeccfa8a3bb4d48eb9 -EBUILD libssh2-1.1.ebuild 879 RMD160 e13ac3abe4686540823c7141c9317fbf1633a893 SHA1 88555278bfc9c90371207e7248438055cf9f26a6 SHA256 90b4d0849069342bd72a6f6a725427b0240dc347d86b67d9471efadb96c4825f -EBUILD libssh2-1.2.1.ebuild 885 RMD160 8ed0a23b535dfc742a0722df6da9bc21c585ae67 SHA1 e35e205089860ce00bb52295d015ac75a27f3a0e SHA256 af30df00f94b663bf5ce76392e84576ba92464a40cbe5c2c1fa42d46d9e25191 EBUILD libssh2-1.2.2.ebuild 1091 RMD160 0487e598c61c5b577ec20d3f3908e445923f815a SHA1 2599cb3ee32197dcfd4a665ea5c7b95cc0ece34e SHA256 fa0974fd9a9f7cc951d0bcfe3b8f025569a2cf4f5a58dc2031b5f2d948145e2c MISC ChangeLog 4087 RMD160 7b92bf88a85f6c75bbbf2d02d9d0c1446a434d96 SHA1 3efc8d2bef79cb3fc452b14459be7ce6632eb518 SHA256 808f17b57c41fd5c7840f84130e1cc9bb9f56b64c56ce87f1f4936d1e0748132 MISC metadata.xml 254 RMD160 999b0e56d48f4d85cef9cd4560ee0d251581421b SHA1 73eb56da4bf79beda2ad262cd42a41ba2c21bb66 SHA256 776a37a5fdfe9fc7935617b72ec8def2a97350c40c658ee8dafe14b5dbf2633b diff --git a/net-libs/libssh2/files/libssh2-0.14-banner-wait.patch b/net-libs/libssh2/files/libssh2-0.14-banner-wait.patch deleted file mode 100644 index 6b9b8edefa07..000000000000 --- a/net-libs/libssh2/files/libssh2-0.14-banner-wait.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -urb libssh2-0.11/src/session.c libssh2-0.11-jmk/src/session.c ---- libssh2-0.11/src/session.c 2005-06-27 17:24:29.000000000 -0500 -+++ libssh2-0.11-jmk/src/session.c 2005-11-10 20:27:34.000000000 -0600 -@@ -95,12 +95,19 @@ - { - char banner[256]; - int banner_len = 0; -+ int wait_count = 0; - - while ((banner_len < sizeof(banner)) && - ((banner_len == 0) || (banner[banner_len-1] != '\n'))) { - char c = '\0'; - int ret; - -+ wait_count++; -+ -+ /* If server is not responding, don't wait in loop forever */ -+ if (wait_count > 1000) -+ return 1; -+ - ret = recv(session->socket_fd, &c, 1, LIBSSH2_SOCKET_RECV_FLAGS(session)); - - if ((ret < 0) && (ret != EAGAIN)) { diff --git a/net-libs/libssh2/files/libssh2-0.14-channel-failure.patch b/net-libs/libssh2/files/libssh2-0.14-channel-failure.patch deleted file mode 100644 index 9833635a3f20..000000000000 --- a/net-libs/libssh2/files/libssh2-0.14-channel-failure.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- libssh2-0.12/src/packet.c 2006-01-30 18:27:07.000000000 +0100 -+++ libssh2-0.12-ced/src/packet.c 2006-01-30 17:56:18.000000000 +0100 -@@ -515,6 +515,21 @@ - LIBSSH2_FREE(session, data); - return 0; - } -+ { -+ unsigned char packet[1]; -+ -+ *packet = SSH_MSG_CHANNEL_FAILURE; -+ -+ if (libssh2_packet_write(session, packet, 1)) { -+ libssh2_error(session, LIBSSH2_ERROR_SOCKET_SEND, "Unable to send channel failure", 0); -+ } -+ -+#ifdef LIBSSH2_DEBUG_CONNECTION -+ _libssh2_debug(session, LIBSSH2_DBG_CONN, "Channel request failure"); -+#endif -+ LIBSSH2_FREE(session, data); -+ return 0; -+ } - } - break; - case SSH_MSG_CHANNEL_CLOSE: diff --git a/net-libs/libssh2/files/libssh2-0.14-configure.patch b/net-libs/libssh2/files/libssh2-0.14-configure.patch deleted file mode 100644 index 69352d57f298..000000000000 --- a/net-libs/libssh2/files/libssh2-0.14-configure.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur libssh2-0.14~/configure libssh2-0.14/configure ---- libssh2-0.14~/configure 2006-06-30 10:18:14.000000000 +0200 -+++ libssh2-0.14/configure 2006-06-30 10:20:16.000000000 +0200 -@@ -3739,7 +3739,7 @@ - found_openssl=yes - pkgcfg_openssl=yes - OPENSSL_LIBLINE=`$PKG_CONFIG --libs openssl` -- OPENSSL_INCLINE=`$PKG_CONFIG --variable=includedir openssl` -+ OPENSSL_INCLINE="-I`$PKG_CONFIG --variable=includedir openssl`" - echo "$as_me:$LINENO: result: Using paths from pkg-config" >&5 - echo "${ECHO_T}Using paths from pkg-config" >&6 - fi diff --git a/net-libs/libssh2/files/libssh2-0.14-peer-shutdown.patch b/net-libs/libssh2/files/libssh2-0.14-peer-shutdown.patch deleted file mode 100644 index 213729bc5268..000000000000 --- a/net-libs/libssh2/files/libssh2-0.14-peer-shutdown.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- libssh2-0.12/src/packet.c 2006-01-30 18:27:07.000000000 +0100 -+++ libssh2-0.12-ced/src/packet.c 2006-02-01 15:50:36.000000000 +0100 -@@ -744,10 +744,36 @@ - if (should_block) { - read_len = libssh2_blocking_read(session, block, blocksize); - } else { -+#ifdef HAVE_SELECT -+ fd_set read_socket; -+ struct timeval timeout; -+ int retval; -+ -+ FD_ZERO(&read_socket); -+ FD_SET(session->socket_fd, &read_socket); -+ -+ timeout.tv_sec = 0; -+ timeout.tv_usec = 0; -+ -+ retval = select(session->socket_fd + 1, &read_socket, NULL, NULL, &timeout); -+ -+ if (retval <= 0) -+ return 0; -+#endif - read_len = recv(session->socket_fd, block, 1, LIBSSH2_SOCKET_RECV_FLAGS(session)); -+#ifdef HAVE_SELECT -+ /*The return value will be 0 when the peer has performed an orderly shutdown */ -+ if (read_len == 0) { -+ session->socket_state = LIBSSH2_SOCKET_DISCONNECTED; -+ return 0; -+ } -+ else if (read_len < 0) -+ return -1; -+#else - if (read_len <= 0) { - return 0; - } -+#endif - read_len += libssh2_blocking_read(session, block + read_len, blocksize - read_len); - } - if (read_len < blocksize) { -@@ -1176,3 +1202,4 @@ - } - } - /* }}} */ -+ diff --git a/net-libs/libssh2/libssh2-0.18.ebuild b/net-libs/libssh2/libssh2-0.18.ebuild deleted file mode 100644 index b21320fc641e..000000000000 --- a/net-libs/libssh2/libssh2-0.18.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh2/libssh2-0.18.ebuild,v 1.15 2009/06/26 11:25:30 pva Exp $ - -inherit eutils - -DESCRIPTION="Library implementing the SSH2 protocol" -HOMEPAGE="http://www.libssh2.org/" -SRC_URI="mirror://sourceforge/libssh2/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" -IUSE="gcrypt" - -DEPEND="!gcrypt? ( dev-libs/openssl ) - gcrypt? ( dev-libs/libgcrypt ) - sys-libs/zlib" -RDEPEND=${DEPEND} - -src_compile() { - econf $(use_enable gcrypt libgcrypt) - emake || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc README -} diff --git a/net-libs/libssh2/libssh2-1.1.ebuild b/net-libs/libssh2/libssh2-1.1.ebuild deleted file mode 100644 index df6f8e62709c..000000000000 --- a/net-libs/libssh2/libssh2-1.1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh2/libssh2-1.1.ebuild,v 1.2 2009/06/26 11:25:30 pva Exp $ - -EAPI="2" - -DESCRIPTION="Library implementing the SSH2 protocol" -HOMEPAGE="http://www.libssh2.org/" -SRC_URI="mirror://sourceforge/libssh2/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="gcrypt zlib" - -DEPEND="!gcrypt? ( dev-libs/openssl ) - gcrypt? ( dev-libs/libgcrypt ) - zlib? ( sys-libs/zlib )" -RDEPEND="${DEPEND}" - -src_configure() { - local myconf - - if use gcrypt ; then - myconf="--with-libgcrypt" - else - myconf="--with-openssl" - fi - - econf \ - $(use_with zlib libz) \ - ${myconf} -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc README -} diff --git a/net-libs/libssh2/libssh2-1.2.1.ebuild b/net-libs/libssh2/libssh2-1.2.1.ebuild deleted file mode 100644 index d45e0ea76a35..000000000000 --- a/net-libs/libssh2/libssh2-1.2.1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh2/libssh2-1.2.1.ebuild,v 1.1 2009/10/06 20:32:13 patrick Exp $ - -EAPI="2" - -DESCRIPTION="Library implementing the SSH2 protocol" -HOMEPAGE="http://www.libssh2.org/" -SRC_URI="mirror://sourceforge/libssh2/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="gcrypt zlib" - -DEPEND="!gcrypt? ( dev-libs/openssl ) - gcrypt? ( dev-libs/libgcrypt ) - zlib? ( sys-libs/zlib )" -RDEPEND="${DEPEND}" - -src_configure() { - local myconf - - if use gcrypt ; then - myconf="--with-libgcrypt" - else - myconf="--with-openssl" - fi - - econf \ - $(use_with zlib libz) \ - ${myconf} -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc README -} -- cgit v1.2.3-65-gdbad