diff options
| author |   Jan Brinkmann <luckyduck@gentoo.org> | 2005-02-03 21:09:22 +0000 |
|---|---|---|
| committer | Jan Brinkmann <luckyduck@gentoo.org> | 2005-02-03 21:09:22 +0000 |
| commit | 72e48d2cd344a9a6fc0af69637f89b4bd30f7015 (patch) | |
| tree | d3c66717397c3cc41b5115f00d29469ac9e22323 | |
| parent | fixes build break (diff) | |
| download | historical-72e48d2cd344a9a6fc0af69637f89b4bd30f7015.tar.gz historical-72e48d2cd344a9a6fc0af69637f89b4bd30f7015.tar.bz2 historical-72e48d2cd344a9a6fc0af69637f89b4bd30f7015.zip | |
applied an patch to fix scp with openssh-3.9. also see #77365
Package-Manager: portage-2.0.51-r15
| -rw-r--r-- | dev-java/ant-core/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/ant-core/Manifest | 5 | ||||
| -rw-r--r-- | dev-java/ant-core/ant-core-1.6.2.ebuild | 6 | ||||
| -rw-r--r-- | dev-java/ant-core/files/1.6.2-scp.patch | 12 |
4 files changed, 25 insertions, 4 deletions
diff --git a/dev-java/ant-core/ChangeLog b/dev-java/ant-core/ChangeLog index 835ed933be72..acf60d42ae5d 100644 --- a/dev-java/ant-core/ChangeLog +++ b/dev-java/ant-core/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/ant-core # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.12 2005/01/29 21:27:25 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.13 2005/02/03 21:09:22 luckyduck Exp $ + + 03 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> +files/1.6.2-scp.patch, + ant-core-1.6.2.ebuild: + applied an patch to fix scp with openssh-3.9. also see #77365 29 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> files/1.6.2-ant: updated java-config -p call in 1.6.2-ant to reflect the new rhino slots. diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest index d2aafa8657fe..17f06cbee8d7 100644 --- a/dev-java/ant-core/Manifest +++ b/dev-java/ant-core/Manifest @@ -1,10 +1,11 @@ MD5 e9577f39414ff99938fdadbd15ce5359 ant-core-1.5.4-r2.ebuild 3054 -MD5 1c3f7bdf21a0d4700dff8cb71702b457 ant-core-1.6.2.ebuild 1791 -MD5 b0b28ce14e8a9347e8866ba568ec67f6 ChangeLog 15130 +MD5 0e844a8705ff106e95707c2b29dec50a ant-core-1.6.2.ebuild 1935 +MD5 7ec1efb6d072b47564cc95b45478446e ChangeLog 15296 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158 MD5 d7186edf4c71dc0531330f90e2c08fe9 files/1.5.4-ant 2283 MD5 177818a51c02ad0c0c5c78312fc538fb files/1.6.2-ant 5018 MD5 4383441650437fec5622070e48e4324c files/build.sh-exit-fix.patch.gz 256 MD5 55ece9ccf573b244b3dff966839528c5 files/rpmbuild.patch.gz 1164 MD5 8d86f265f37d0d73cdd2e8a3fd2ff6eb files/digest-ant-core-1.5.4-r2 70 +MD5 8c69a473b88559829069ac80730f2f1b files/1.6.2-scp.patch 877 MD5 aac477e88787ed6f0ad5cabe0f6a001a files/digest-ant-core-1.6.2 74 diff --git a/dev-java/ant-core/ant-core-1.6.2.ebuild b/dev-java/ant-core/ant-core-1.6.2.ebuild index 7e8c36e3e899..32230a8d31a2 100644 --- a/dev-java/ant-core/ant-core-1.6.2.ebuild +++ b/dev-java/ant-core/ant-core-1.6.2.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-core/ant-core-1.6.2.ebuild,v 1.9 2005/01/26 20:41:09 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.6.2.ebuild,v 1.10 2005/02/03 21:09:22 luckyduck Exp $ inherit java-pkg eutils @@ -28,6 +28,10 @@ src_unpack() { unpack ${A} cd ${S} + # also see #77365 and + # http://sourceforge.net/mailarchive/forum.php?thread_id=6173225&forum_id=12628 + epatch ${FILESDIR}/${PV}-scp.patch + # Patch build.sh to die with non-zero exit code in case of errors. # This patch may be useful for all ant versions. epatch ${FILESDIR}/build.sh-exit-fix.patch.gz diff --git a/dev-java/ant-core/files/1.6.2-scp.patch b/dev-java/ant-core/files/1.6.2-scp.patch new file mode 100644 index 000000000000..37174f6114e9 --- /dev/null +++ b/dev-java/ant-core/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();
|