From: Mike Frysinger Date: Mon, 11 Oct 2004 01:44:56 +0000 (+0000) Subject: fix REMOTE_SHELL error #66959 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4378745987f6c9fb634c29c7c9e37721d55f03e0;p=gentoo.git fix REMOTE_SHELL error #66959 --- diff --git a/app-arch/tar/ChangeLog b/app-arch/tar/ChangeLog index e1062cacb5d1..fd4b414caa13 100644 --- a/app-arch/tar/ChangeLog +++ b/app-arch/tar/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-arch/tar # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/ChangeLog,v 1.29 2004/10/10 20:26:15 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/ChangeLog,v 1.30 2004/10/11 01:44:56 vapier Exp $ + + 10 Oct 2004; Mike Frysinger + +files/1.14.90-remote-shell.patch, tar-1.14.90.ebuild: + Fix build failure when rsh doesnt exist #66959 by Didier Link. 10 Oct 2004; Jeremy Huddleston tar-1.14.90.ebuild: Fixed SRC_URI. diff --git a/app-arch/tar/Manifest b/app-arch/tar/Manifest index b8012b758317..5ba0b4522647 100644 --- a/app-arch/tar/Manifest +++ b/app-arch/tar/Manifest @@ -1,16 +1,17 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 d04c2cd52a429e1965a1ff867e3a6853 ChangeLog 7427 -MD5 22ca02e93a3001b028e4a6b376abfe6f tar-1.14.90.ebuild 1199 +MD5 98f4f9b988a4bfe3a99b4e2ec0bf766e ChangeLog 7596 +MD5 cd2e69902f2fc7c1c043d52110d23b70 tar-1.14.90.ebuild 1271 MD5 d0b3e45115a461b08fc996e4036fa171 tar-1.14.ebuild 1337 MD5 a19a156b33f2b725bccc907941208c92 files/digest-tar-1.14.90 65 -MD5 e7c9ac5824e453f73a56032123c46f97 files/digest-tar-1.14 62 +MD5 afe4f707a5851659a448c05a5bb6868e files/1.14.90-remote-shell.patch 594 MD5 5fbfc1df8f8641b9b99de73d8be1a4dc files/tar.1 7956 +MD5 e7c9ac5824e453f73a56032123c46f97 files/digest-tar-1.14 62 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.6 (GNU/Linux) +Version: GnuPG v1.9.10 (GNU/Linux) -iD8DBQFBaZrzArHZZzCEUG0RAnPeAJ9KdfIyBdPwhH+lQZ82P6NmzrBIsQCfZ9DV -hx7xIO7/4BnnXik56QcmNDM= -=5LKN +iD8DBQFBaeWuHTu7gpaalycRAopfAJ41jaYaWxtu29Vg+8SCiB97bd2tUwCff9h5 +xTCI13GmfunWJwi+i3wYrJM= +=6WcE -----END PGP SIGNATURE----- diff --git a/app-arch/tar/files/1.14.90-remote-shell.patch b/app-arch/tar/files/1.14.90-remote-shell.patch new file mode 100644 index 000000000000..c5dd6e699c47 --- /dev/null +++ b/app-arch/tar/files/1.14.90-remote-shell.patch @@ -0,0 +1,23 @@ +--- src/tar.c.orig 2004-10-10 21:39:07.872276960 -0400 ++++ src/tar.c 2004-10-10 21:39:52.512490616 -0400 +@@ -544,10 +544,18 @@ + show_default_settings (FILE *stream) + { + fprintf (stream, +- "--format=%s -f%s -b%d --rmt-command=%s --rsh-command=%s\n", ++ "--format=%s -f%s -b%d --rmt-command=%s" ++#ifdef REMOTE_SHELL ++" --rsh-command=%s" ++#endif ++ "\n", + archive_format_string (DEFAULT_ARCHIVE_FORMAT), + DEFAULT_ARCHIVE, DEFAULT_BLOCKING, +- DEFAULT_RMT_COMMAND, REMOTE_SHELL); ++ DEFAULT_RMT_COMMAND ++#ifdef REMOTE_SHELL ++ ,REMOTE_SHELL ++#endif ++ ); + } + + static void diff --git a/app-arch/tar/tar-1.14.90.ebuild b/app-arch/tar/tar-1.14.90.ebuild index d2b2efaa14e0..0af17985cd09 100644 --- a/app-arch/tar/tar-1.14.90.ebuild +++ b/app-arch/tar/tar-1.14.90.ebuild @@ -1,12 +1,13 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.14.90.ebuild,v 1.2 2004/10/10 20:26:15 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.14.90.ebuild,v 1.3 2004/10/11 01:44:56 vapier Exp $ inherit flag-o-matic eutils gnuconfig DESCRIPTION="Use this to make tarballs :)" HOMEPAGE="http://www.gnu.org/software/tar/" -SRC_URI="http://alpha.gnu.org/gnu/tar/${P}.tar.bz2" +SRC_URI="http://alpha.gnu.org/gnu/tar/${P}.tar.bz2 + mirror://gnu/tar/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" @@ -23,6 +24,7 @@ RDEPEND="${DEPEND} src_unpack() { unpack ${A} cd ${S} + epatch ${FILESDIR}/${PV}-remote-shell.patch gnuconfig_update use static && append-ldflags -static }