diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2007-04-30 23:49:45 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2007-04-30 23:49:45 +0000 |
| commit | bc2b4cbdc434d8ff462d0730d939d5f94dd16656 (patch) | |
| tree | 03b051ded4827c77b8e7eb84162938eded50287d /dev-java/ant-jsch | |
| parent | Replacing einfo with elog (diff) | |
| download | gentoo-2-bc2b4cbdc434d8ff462d0730d939d5f94dd16656.tar.gz gentoo-2-bc2b4cbdc434d8ff462d0730d939d5f94dd16656.tar.bz2 gentoo-2-bc2b4cbdc434d8ff462d0730d939d5f94dd16656.zip | |
Apply patch from upstream to work with >=dev-java/jsch-0.1.30.
(Portage version: 2.1.2.5)
Diffstat (limited to 'dev-java/ant-jsch')
| -rw-r--r-- | dev-java/ant-jsch/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-java/ant-jsch/ant-jsch-1.7.0-r1.ebuild | 16 | ||||
| -rw-r--r-- | dev-java/ant-jsch/files/1.7-scp-hang.patch | 14 | ||||
| -rw-r--r-- | dev-java/ant-jsch/files/digest-ant-jsch-1.7.0-r1 | 6 |
4 files changed, 43 insertions, 1 deletions
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 <betelgeuse@gentoo.org> + +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 <caster@gentoo.org> ant-jsch-1.7.0.ebuild: Add ~ia64 keyword, bug #159820. 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 |