From 85e45f83436f6c043b112f78917d71007e1a21d4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Petteri=20R=C3=A4ty?= Date: Mon, 30 Apr 2007 23:49:45 +0000 Subject: [PATCH] Apply patch from upstream to work with >=dev-java/jsch-0.1.30. Package-Manager: portage-2.1.2.5 --- dev-java/ant-jsch/ChangeLog | 8 ++++- dev-java/ant-jsch/Manifest | 29 ++++++++++++++++--- dev-java/ant-jsch/ant-jsch-1.7.0-r1.ebuild | 16 ++++++++++ dev-java/ant-jsch/files/1.7-scp-hang.patch | 14 +++++++++ .../ant-jsch/files/digest-ant-jsch-1.7.0-r1 | 6 ++++ 5 files changed, 68 insertions(+), 5 deletions(-) create mode 100644 dev-java/ant-jsch/ant-jsch-1.7.0-r1.ebuild create mode 100644 dev-java/ant-jsch/files/1.7-scp-hang.patch create mode 100644 dev-java/ant-jsch/files/digest-ant-jsch-1.7.0-r1 diff --git a/dev-java/ant-jsch/ChangeLog b/dev-java/ant-jsch/ChangeLog index 5bf157eb2c07..9af31ad6c006 100644 --- a/dev-java/ant-jsch/ChangeLog +++ b/dev-java/ant-jsch/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-java/ant-jsch # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jsch/ChangeLog,v 1.5 2007/01/27 02:04:57 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jsch/ChangeLog,v 1.6 2007/04/30 23:49:45 betelgeuse Exp $ + +*ant-jsch-1.7.0-r1 (30 Apr 2007) + + 30 Apr 2007; Petteri Räty + +files/1.7-scp-hang.patch, +ant-jsch-1.7.0-r1.ebuild: + Apply patch from upstream to work with >=dev-java/jsch-0.1.30. 27 Jan 2007; Vlastimil Babka ant-jsch-1.7.0.ebuild: Add ~ia64 keyword, bug #159820. diff --git a/dev-java/ant-jsch/Manifest b/dev-java/ant-jsch/Manifest index 1dced8bedcce..e35c05f24114 100644 --- a/dev-java/ant-jsch/Manifest +++ b/dev-java/ant-jsch/Manifest @@ -1,13 +1,24 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX 1.7-scp-hang.patch 766 RMD160 2c965af8a33d1e733f15f208542bc83816e1a9d3 SHA1 a92319f352de7e70dfc2245c80b57cfc26ba55e2 SHA256 885da77349a3718f2d1d607e942fa339b23d1805c8495c3ef06563452e8f82e9 +MD5 7064e47c033975211f858f04c6daed93 files/1.7-scp-hang.patch 766 +RMD160 2c965af8a33d1e733f15f208542bc83816e1a9d3 files/1.7-scp-hang.patch 766 +SHA256 885da77349a3718f2d1d607e942fa339b23d1805c8495c3ef06563452e8f82e9 files/1.7-scp-hang.patch 766 DIST ant-1.7.0-gentoo.tar.bz2 11720 RMD160 51d24f2c0c98195ed6ef1852045201a567a5d9ea SHA1 41acb8398a5ac9713dec30d6305b5abc6c014fff SHA256 7b1e0c63bec193c010c3fcca7a3524e2e35cc4ca56b86e4571737ac1e169e35c DIST apache-ant-1.7.0-src.tar.bz2 6831017 RMD160 e18ecde1996401f03529d80d2b6f3be2c55e64ab SHA1 3f01c35265ba50a49caafe1fb34ec8998bf45eb3 SHA256 a6698e8420f6d1cefd9e02c5a6b610b84495a3f9bfe1fc9e1b4fe8a8769e3779 +EBUILD ant-jsch-1.7.0-r1.ebuild 447 RMD160 995118780c1b3806022120d000b8ebb7830f033b SHA1 f31f0b67e5c56550f39290355bcc2f8f8c2bdaa1 SHA256 edd287beb1c1b1e3a37e80a1cf48d7c8165134680e5a314497b1610c9919a20c +MD5 b13ba66576cd3b42e34ea5c638685c72 ant-jsch-1.7.0-r1.ebuild 447 +RMD160 995118780c1b3806022120d000b8ebb7830f033b ant-jsch-1.7.0-r1.ebuild 447 +SHA256 edd287beb1c1b1e3a37e80a1cf48d7c8165134680e5a314497b1610c9919a20c ant-jsch-1.7.0-r1.ebuild 447 EBUILD ant-jsch-1.7.0.ebuild 348 RMD160 0224951c9abb19d07197ea7e618f5024e0a4c1a9 SHA1 48d0e1ed2e7aa6ca94ae804a3fe5be4fca0ef33a SHA256 2ee7976653dab0aec40daa46730b8ac78cc3f0b8f3d6c3846333f470f5a530be MD5 6af78f8b5aeb6484262e2d809d9f1794 ant-jsch-1.7.0.ebuild 348 RMD160 0224951c9abb19d07197ea7e618f5024e0a4c1a9 ant-jsch-1.7.0.ebuild 348 SHA256 2ee7976653dab0aec40daa46730b8ac78cc3f0b8f3d6c3846333f470f5a530be ant-jsch-1.7.0.ebuild 348 -MISC ChangeLog 791 RMD160 d2959e1be95735801c4c554c1576d5c008c86cb5 SHA1 d1652918f14844b6c8adadddf254fb22b93352b2 SHA256 7b00e0fdc855af93068e6648ba9762a61f2fc91cb9be131e3dfc4afe59731c4e -MD5 f0999c69d9d6596c55abb6104808e200 ChangeLog 791 -RMD160 d2959e1be95735801c4c554c1576d5c008c86cb5 ChangeLog 791 -SHA256 7b00e0fdc855af93068e6648ba9762a61f2fc91cb9be131e3dfc4afe59731c4e ChangeLog 791 +MISC ChangeLog 1004 RMD160 4b5ee9f064e14dac5d2fd3fe78bc046bed600481 SHA1 62b57009947550c316fa8835db595cc41f0e0a19 SHA256 395ccf1ea2e316088ae4d5dd911bdb5bd4a0e8eba574343ff75cf00b05ec5af6 +MD5 958d6292eef6297b18b266d6e1050459 ChangeLog 1004 +RMD160 4b5ee9f064e14dac5d2fd3fe78bc046bed600481 ChangeLog 1004 +SHA256 395ccf1ea2e316088ae4d5dd911bdb5bd4a0e8eba574343ff75cf00b05ec5af6 ChangeLog 1004 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158 @@ -15,3 +26,13 @@ SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb metadata MD5 a7b309b2642e68941a45f02dd5a5c96d files/digest-ant-jsch-1.7.0 518 RMD160 d03eca1d95f01c905fe3b77f5a2c39ac67d13c22 files/digest-ant-jsch-1.7.0 518 SHA256 99ca534318f44bd6e836a90ba168e57156af32905f50619d14887361de2823b9 files/digest-ant-jsch-1.7.0 518 +MD5 a7b309b2642e68941a45f02dd5a5c96d files/digest-ant-jsch-1.7.0-r1 518 +RMD160 d03eca1d95f01c905fe3b77f5a2c39ac67d13c22 files/digest-ant-jsch-1.7.0-r1 518 +SHA256 99ca534318f44bd6e836a90ba168e57156af32905f50619d14887361de2823b9 files/digest-ant-jsch-1.7.0-r1 518 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.3 (GNU/Linux) + +iD8DBQFGNoCacxLzpIGCsLQRArPNAJ4zl2NUddQhW4DSnhBtoIGoDNTeCQCeKEWI +u8tSuE+SaFx68JnlZOq8axI= +=7B3l +-----END PGP SIGNATURE----- diff --git a/dev-java/ant-jsch/ant-jsch-1.7.0-r1.ebuild b/dev-java/ant-jsch/ant-jsch-1.7.0-r1.ebuild new file mode 100644 index 000000000000..5298b2d275cc --- /dev/null +++ b/dev-java/ant-jsch/ant-jsch-1.7.0-r1.ebuild @@ -0,0 +1,16 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jsch/ant-jsch-1.7.0-r1.ebuild,v 1.1 2007/04/30 23:49:45 betelgeuse Exp $ + +inherit ant-tasks + +KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd" + +DEPEND=">=dev-java/jsch-0.1.21-r2" +RDEPEND="${DEPEND}" + +src_unpack() { + ant-tasks_src_unpack + cd "${S}" + epatch "${FILESDIR}/1.7-scp-hang.patch" +} diff --git a/dev-java/ant-jsch/files/1.7-scp-hang.patch b/dev-java/ant-jsch/files/1.7-scp-hang.patch new file mode 100644 index 000000000000..ee79dc213f28 --- /dev/null +++ b/dev-java/ant-jsch/files/1.7-scp-hang.patch @@ -0,0 +1,14 @@ +Taken from http://issues.apache.org/bugzilla/show_bug.cgi?id=41090 +http://issues.apache.org/bugzilla/attachment.cgi?id=19296 + +diff -Naur apache-ant-1.7.0/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java apache-ant-1.7.0_20061221/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java +--- apache-ant-1.7.0/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java 2006-12-12 22:16:20.000000000 +0000 ++++ apache-ant-1.7.0_20061221/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java 2006-12-21 07:38:27.000000000 +0000 +@@ -209,6 +209,7 @@ + waitForAck(in); + sendDirectory(directory, in, out); + out.write("E\n".getBytes()); ++ out.flush(); + waitForAck(in); + } + diff --git a/dev-java/ant-jsch/files/digest-ant-jsch-1.7.0-r1 b/dev-java/ant-jsch/files/digest-ant-jsch-1.7.0-r1 new file mode 100644 index 000000000000..035927394fcb --- /dev/null +++ b/dev-java/ant-jsch/files/digest-ant-jsch-1.7.0-r1 @@ -0,0 +1,6 @@ +MD5 9e834373c21fe197ac66f4da51dd47a5 ant-1.7.0-gentoo.tar.bz2 11720 +RMD160 51d24f2c0c98195ed6ef1852045201a567a5d9ea ant-1.7.0-gentoo.tar.bz2 11720 +SHA256 7b1e0c63bec193c010c3fcca7a3524e2e35cc4ca56b86e4571737ac1e169e35c ant-1.7.0-gentoo.tar.bz2 11720 +MD5 22b378e27ab300e4d73bf09d91c7e2a6 apache-ant-1.7.0-src.tar.bz2 6831017 +RMD160 e18ecde1996401f03529d80d2b6f3be2c55e64ab apache-ant-1.7.0-src.tar.bz2 6831017 +SHA256 a6698e8420f6d1cefd9e02c5a6b610b84495a3f9bfe1fc9e1b4fe8a8769e3779 apache-ant-1.7.0-src.tar.bz2 6831017 -- 2.26.2