diff options
| author |   Jan Brinkmann <luckyduck@gentoo.org> | 2005-02-03 20:57:18 +0000 |
|---|---|---|
| committer | Jan Brinkmann <luckyduck@gentoo.org> | 2005-02-03 20:57:18 +0000 |
| commit | c8c87fdffb21732c031f2ff16b9539a31dcc2c77 (patch) | |
| tree | 94f9447309cf34506354b10daf5f071b1a18a336 /dev-java/ant-tasks | |
| parent | Mark aria-1.0.0 as stable on x86 and amd64 (Manifest recommit) (diff) | |
| download | gentoo-2-c8c87fdffb21732c031f2ff16b9539a31dcc2c77.tar.gz gentoo-2-c8c87fdffb21732c031f2ff16b9539a31dcc2c77.tar.bz2 gentoo-2-c8c87fdffb21732c031f2ff16b9539a31dcc2c77.zip | |
applied an patch to fix scp with openssh-3.9. also see #77365
(Portage version: 2.0.51-r15)
Diffstat (limited to 'dev-java/ant-tasks')
| -rw-r--r-- | dev-java/ant-tasks/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-java/ant-tasks/ant-tasks-1.6.2-r5.ebuild | 10 | ||||
| -rw-r--r-- | dev-java/ant-tasks/files/1.6.2-scp.patch | 12 |
3 files changed, 25 insertions, 2 deletions
diff --git a/dev-java/ant-tasks/ChangeLog b/dev-java/ant-tasks/ChangeLog index be4bdbd025d7..39a2f97cca84 100644 --- a/dev-java/ant-tasks/ChangeLog +++ b/dev-java/ant-tasks/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-java/ant-tasks # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ChangeLog,v 1.15 2005/01/29 21:29:03 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ChangeLog,v 1.16 2005/02/03 20:57:18 luckyduck Exp $ + + 03 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> ant-tasks-1.6.2-r5.ebuild: + applied an patch to fix scp with openssh-3.9. also see #77365 29 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> ant-tasks-1.6.2-r5.ebuild: update to reflect the new rhino slots. diff --git a/dev-java/ant-tasks/ant-tasks-1.6.2-r5.ebuild b/dev-java/ant-tasks/ant-tasks-1.6.2-r5.ebuild index 5d69b1b11b83..bbf11fb500be 100644 --- a/dev-java/ant-tasks/ant-tasks-1.6.2-r5.ebuild +++ b/dev-java/ant-tasks/ant-tasks-1.6.2-r5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ant-tasks-1.6.2-r5.ebuild,v 1.8 2005/01/29 21:29:03 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ant-tasks-1.6.2-r5.ebuild,v 1.9 2005/02/03 20:57:18 luckyduck Exp $ inherit java-pkg eutils @@ -37,6 +37,14 @@ RDEPEND="${DEPEND}" S="${WORKDIR}/apache-ant-${PV}" +src_unpack() { + unpack ${A} + cd ${S} + + # also see #77365 + epatch ${FILESDIR}/${PV}-scp.patch +} + src_compile() { addwrite "/proc/self/maps" export JAVA_HOME=${JDK_HOME} diff --git a/dev-java/ant-tasks/files/1.6.2-scp.patch b/dev-java/ant-tasks/files/1.6.2-scp.patch new file mode 100644 index 000000000000..37174f6114e9 --- /dev/null +++ b/dev-java/ant-tasks/files/1.6.2-scp.patch @@ -0,0 +1,12 @@ +diff -urpN apache-ant-1.6.2.orig/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java apache-ant-1.6.2/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java +--- apache-ant-1.6.2.orig/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java 2005-02-03 21:37:32.032911472 +0100 ++++ apache-ant-1.6.2/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java 2005-02-03 21:38:37.399974168 +0100 +@@ -112,7 +112,7 @@ public class ScpToMessage extends Abstra + }
+
+ private void doMultipleTransfer() throws IOException, JSchException {
+- Channel channel = openExecChannel("scp -d -t " + remotePath);
++ Channel channel = openExecChannel("scp -r -d -t " + remotePath);
+ try {
+ OutputStream out = channel.getOutputStream();
+ InputStream in = channel.getInputStream();
|