Fix annoying leading spaces in ftp directories (upstream patch)

Package-Manager: portage-2.2.0_alpha77_p1/cvs/Linux x86_64

4 files changed, 129 insertions, 6 deletions

diff --git a/app-misc/mc/ChangeLog b/app-misc/mc/ChangeLog
index 22fb26d86f6d..36d2bf9db38d 100644
--- a/app-misc/mc/ChangeLog
+++ b/app-misc/mc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/mc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.230 2011/11/11 13:23:20 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.231 2011/11/30 07:21:30 slyfox Exp $
+
+*mc-4.8.0-r2 (30 Nov 2011)
+
+  30 Nov 2011; Sergei Trofimovich <slyfox@gentoo.org> +mc-4.8.0-r2.ebuild,
+  +files/mc-4.8.0-fix-ftp-spaces.patch:
+  Fix annoying leading spaces in ftp directories (upstream patch)
 
   11 Nov 2011; Naohiro Aota <naota@gentoo.org> mc-4.7.5.3.ebuild,
   mc-4.7.5.5.ebuild, mc-4.8.0.ebuild, mc-4.8.0-r1.ebuild:
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 360ed1c82dfd..869f87943484 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX mc-4.8.0-fix-ftp-spaces.patch 1047 RMD160 8bfc6c0ffdcaded6a7f1382f0fee80d78fb928f0 SHA1 d6e1f843ce85a7351fd485cc6ec141ecd2a9c9fc SHA256 4285ba9907b4460739802876e39c8e2df858264214ef81ed8c2291b22f039515
 AUX mc-4.8.0-fix-nls.patch 949 RMD160 24627543ec6744b1b1d710a306dce4d5782e360e SHA1 d70b0ec63f65b72e414efcac2cc04e75740848d1 SHA256 504856248f6c3ab21870c7555f31cdcd9ac509c883ab6cc2929440fb9d1e2216
 DIST mc-4.7.0.10.tar.bz2 2862849 RMD160 83a527a94a81f886eb7f80b8965554bf927cad65 SHA1 2bc13f963780eaddac2f675b9145656d759f974e SHA256 99136c447a718c6bd681cb0f7d3ab9df4f5494d35cb3682f01ccf004873e56fb
 DIST mc-4.7.0.3.tar.bz2 2793651 RMD160 ecda5e6befe4b1e0442044b732e7903b01ed73ae SHA1 2d319fc940283e4327cd5bc2f977b724461f1305 SHA256 71caeaf00606c45228362fb6a4d2f1b6d47b6c1056db46b975255aac5af45ef7
@@ -14,13 +15,14 @@ EBUILD mc-4.7.5.2.ebuild 1950 RMD160 1ca9e3bda31808ca7ef6134f4dc0bd1f960dce16 SH
 EBUILD mc-4.7.5.3.ebuild 2039 RMD160 ca38a2608717dfe83b88c1add29ef3cc6bbf1c2a SHA1 9100c032f26241fabb4154ba642d299a61a3b72b SHA256 ed767a7539db737132b496c04f57a95e36084bd715834c232efec74f3261f544
 EBUILD mc-4.7.5.5.ebuild 2037 RMD160 0118de937f9787474f988c79191743ba2d7d4fae SHA1 31d8d714368b48eda34eb2991b0d5140e8af6c8c SHA256 c8e739027220fe2e00c3d6fc87e833456c4bb2008c9315feb907ad4ac384a57c
 EBUILD mc-4.8.0-r1.ebuild 2186 RMD160 0c400afcde21118788baeed01b15b0c21364c6bb SHA1 65d569dc7359f628fea7447ca18cc361ab19fa6a SHA256 8c8540dff2cb5e26089affd1e7088b004ed6da730af8bad5813629d97d0cd902
+EBUILD mc-4.8.0-r2.ebuild 2237 RMD160 1e97d628a8baaf5b621083efbe5915fe34c925fe SHA1 6f46c2c11fc45fcce4bbf5f1fa64605630491960 SHA256 ef3a0a94cec9dc495c14193f549e4041fd2b1160d9fab30fb77a9b21e7fd1306
 EBUILD mc-4.8.0.ebuild 2148 RMD160 603957dd6cd7026c1f154402a3102f3383fb6a72 SHA1 70f8db75714beb7890ba10d32cd54244621bb6d6 SHA256 db190dbf73724291d73d0ca2526d944dfdc61c9a4f154d891268c5c0930239a7
-MISC ChangeLog 32681 RMD160 24205b451f2f33dba8192f07a155516431bccbf1 SHA1 8d334584fdaa0f44a87faa6585409af4f1532ff5 SHA256 480790fe3f38447f582733f8870a224dacbc9458b6a0865c2d78fdabf7cca867
+MISC ChangeLog 32892 RMD160 97694ee623db83d5b31e7af822c60a8175ced5a2 SHA1 c7066ffd7c81f69e9c4d006ca69ec367fa91fdb5 SHA256 e8c15bd5c65fea3eb2bfd90d56d73d070709747bd4406e48085fdf13cac3c7c8
 MISC metadata.xml 537 RMD160 c0111e0e7a9f3d60dbed2c2d623cd302caa71d2f SHA1 d93980823087e3a75b2c1fdb2bcddcf7af05b40c SHA256 b48a361bbc299ba292ab56ced28b9dba200c3006e97604435da7f8f4004638bf
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk69IdcACgkQGpDnPLSHuMAyJgCgvDR5ID+nMIm4NIsqn+miBwr8
-EQsAniVeLZ/qgu/KelLhM0NWN0G/E6IY
-=HeJA
+iEYEARECAAYFAk7V2YcACgkQcaHudmEf86qyBACfV9M1oI9vrfdXx5ECZOUAUnNW
+JcoAnAyeZsiQwxjyPl3negdhQsQunNtB
+=ldn0
 -----END PGP SIGNATURE-----
diff --git a/app-misc/mc/files/mc-4.8.0-fix-ftp-spaces.patch b/app-misc/mc/files/mc-4.8.0-fix-ftp-spaces.patch
new file mode 100644
index 000000000000..8944690261ad
--- /dev/null
+++ b/app-misc/mc/files/mc-4.8.0-fix-ftp-spaces.patch
@@ -0,0 +1,32 @@
+commit 95c553c46770f89f09c4408cbdf61ed76b4a8766
+Author: Sergey <sergemp@mail.ru>
+Date:   Thu Oct 20 14:28:39 2011 +0300
+
+    Ticket #2635: mc adds spaces an the beginning of all files/dirs at the ftp server
+    
+    For FTP servers, that do not send ".." in directory listing, mc adds one space to the name of every file and directory. Attached patch should fix this problem.
+    
+    Steps to reproduce:
+    cd /#ftp:ftp.symantec.com
+    
+    Expected result:
+    Correct list of files/directories
+    
+    Actual result:
+    File/directory names with leading spaces
+    
+    Signed-off-by: Slava Zanko <slavazanko@gmail.com>
+
+diff --git a/lib/vfs/parse_ls_vga.c b/lib/vfs/parse_ls_vga.c
+index 8091c14..5424ee9 100644
+--- a/lib/vfs/parse_ls_vga.c
++++ b/lib/vfs/parse_ls_vga.c
+@@ -657,7 +657,7 @@ vfs_split_text (char *p)
+ void
+ vfs_parse_ls_lga_init (void)
+ {
+-    vfs_parce_ls_final_num_spaces = 0;
++    vfs_parce_ls_final_num_spaces = 1;
+ }
+ 
+ /* --------------------------------------------------------------------------------------------- */
diff --git a/app-misc/mc/mc-4.8.0-r2.ebuild b/app-misc/mc/mc-4.8.0-r2.ebuild
new file mode 100644
index 000000000000..c2206bc7629f
--- /dev/null
+++ b/app-misc/mc/mc-4.8.0-r2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.8.0-r2.ebuild,v 1.1 2011/11/30 07:21:30 slyfox Exp $
+
+EAPI=4
+
+inherit base flag-o-matic
+
+MY_P=${P/_/-}
+
+DESCRIPTION="GNU Midnight Commander is a text based file manager"
+HOMEPAGE="http://www.midnight-commander.org"
+SRC_URI="http://www.midnight-commander.org/downloads/${MY_P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE="+edit gpm mclib +ncurses nls samba slang test X"
+
+REQUIRED_USE="^^ ( ncurses slang )"
+
+RDEPEND=">=dev-libs/glib-2.8:2
+	gpm? ( sys-libs/gpm )
+	kernel_linux? ( sys-fs/e2fsprogs )
+	ncurses? ( sys-libs/ncurses )
+	samba? ( net-fs/samba )
+	slang? ( >=sys-libs/slang-2 )
+	X? ( x11-libs/libX11
+		x11-libs/libICE
+		x11-libs/libXau
+		x11-libs/libXdmcp
+		x11-libs/libSM )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	dev-util/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? ( dev-libs/check )
+	"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=("${FILESDIR}/${PN}"-4.8.0-fix-nls.patch
+	"${FILESDIR}/${PN}"-4.8.0-fix-ftp-spaces.patch
+	)
+
+src_configure() {
+	local myscreen=ncurses
+	use slang && myscreen=slang
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
+
+	econf \
+		--disable-dependency-tracking \
+		$(use_enable nls) \
+		--enable-vfs \
+		$(use_enable kernel_linux vfs-undelfs) \
+		--enable-charset \
+		$(use_with X x) \
+		$(use_enable samba vfs-smb) \
+		$(use_with gpm gpm-mouse) \
+		--with-screen=${myscreen} \
+		$(use_with edit) \
+		$(use_enable mclib) \
+		$(use_enable test tests)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS README NEWS
+
+	# fix bug #334383
+	if use kernel_linux && [[ ${EUID} == 0 ]] ; then
+		fowners root:tty /usr/libexec/mc/cons.saver ||
+			die "setting cons.saver's owner failed"
+		fperms g+s /usr/libexec/mc/cons.saver ||
+			die "setting cons.saver's permissions failed"
+	fi
+}
+
+pkg_postinst() {
+	elog "To enable exiting to latest working directory,"
+	elog "put this into your ~/.bashrc:"
+	elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
+}