.../tags/46d492bd32096d0489ad468849ccf07f267c77ed  |   13 --

 .../tags/efae6792b00275513cf0cb8f31fe09660e48eef3  |   13 ++

 .gear/tags/list                                    |    2 +-

 ...-cc0257cd5a34261439152f331b8d93014109cbff.patch |   34 ----

 ...-e4961563c4019892d8965779c6979c38c2f68017.patch |  203 --------------------

 alt-patches/mc-4.7.5.5-ftpspaces.patch             |   13 ++

 mc.spec                                            |   55 +++++-

 7 files changed, 71 insertions(+), 262 deletions(-)

diff --git a/.gear/tags/46d492bd32096d0489ad468849ccf07f267c77ed b/.gear/tags/46d492bd32096d0489ad468849ccf07f267c77ed

deleted file mode 100644

index e554a38..0000000

--- a/.gear/tags/46d492bd32096d0489ad468849ccf07f267c77ed

+++ /dev/null

@@ -1,13 +0,0 @@

-object 1918b095faede10222ae6cf6a1ab1ac0901a1e78

-type commit

-tag 4.7.5.3

-tagger Sergey Y. Afonin <asy@altlinux.org> 1312824639 +0400

-

-4.7.5.3

------BEGIN PGP SIGNATURE-----

-Version: GnuPG v1.4.11 (GNU/Linux)

-

-iEYEABECAAYFAk5AHT8ACgkQ9lmILNBvYft4LwCghmF1ApcJSL/a9PV9caUFMD/R

-Na8AoI4xbVqCYRQzbIeejeL8i1VUi630

-=8KWN

------END PGP SIGNATURE-----

diff --git a/.gear/tags/efae6792b00275513cf0cb8f31fe09660e48eef3 b/.gear/tags/efae6792b00275513cf0cb8f31fe09660e48eef3

new file mode 100644

index 0000000..6c1efb2

--- /dev/null

+++ b/.gear/tags/efae6792b00275513cf0cb8f31fe09660e48eef3

@@ -0,0 +1,13 @@

+object b027ff8cf8c47b40163b8344f9f690ab236dec03

+type commit

+tag 4.7.5.5

+tagger Sergey Y. Afonin <asy@altlinux.org> 1319046600 +0400

+

+4.7.5.5

+-----BEGIN PGP SIGNATURE-----

+Version: GnuPG v1.4.11 (GNU/Linux)

+

+iEYEABECAAYFAk6fDcgACgkQ9lmILNBvYfs6HACfeN0XC+vpOCzcw+TfUT6BzoVo

+vXUAmwUJPMLrQaRTFcXTDkUSMl/btD1H

+=zvVs

+-----END PGP SIGNATURE-----

diff --git a/.gear/tags/list b/.gear/tags/list

index 43a190c..32e4208 100644

--- a/.gear/tags/list

+++ b/.gear/tags/list

@@ -1 +1 @@

-46d492bd32096d0489ad468849ccf07f267c77ed 4.7.5.3

+efae6792b00275513cf0cb8f31fe09660e48eef3 4.7.5.5

diff --git a/alt-files/mc.git-cc0257cd5a34261439152f331b8d93014109cbff.patch b/alt-files/mc.git-cc0257cd5a34261439152f331b8d93014109cbff.patch

deleted file mode 100644

index be14e09..0000000

--- a/alt-files/mc.git-cc0257cd5a34261439152f331b8d93014109cbff.patch

+++ /dev/null

@@ -1,34 +0,0 @@

-From cc0257cd5a34261439152f331b8d93014109cbff Mon Sep 17 00:00:00 2001

-From: Slava Zanko <slavazanko@gmail.com>

-Date: Wed, 13 Jul 2011 12:49:34 +0300

-Subject: [PATCH] Ticket #81: Fixup of extfs.

-

-Signed-off-by: Slava Zanko <slavazanko@gmail.com>

----

- lib/vfs/mc-vfs/extfs.c |    3 +--

- 1 files changed, 1 insertions(+), 2 deletions(-)

-

-diff --git a/lib/vfs/mc-vfs/extfs.c b/lib/vfs/mc-vfs/extfs.c

-index 368a4fc..12c0eeb 100644

---- a/lib/vfs/mc-vfs/extfs.c

-+++ b/lib/vfs/mc-vfs/extfs.c

-@@ -474,7 +474,6 @@ extfs_read_archive (int fstype, const char *name, struct archive **pparc)

-     char *buffer;

-     struct archive *current_archive;

-     char *current_file_name, *current_link_name;

--    size_t filepos = 0;

- 

-     info = &g_array_index (extfs_plugins, extfs_plugin_info_t, fstype);

- 

-@@ -492,7 +491,7 @@ extfs_read_archive (int fstype, const char *name, struct archive **pparc)

-         struct stat hstat;

- 

-         current_link_name = NULL;

--        if (vfs_parse_ls_lga (buffer, &hstat, &current_file_name, &current_link_name, &filepos))

-+        if (vfs_parse_ls_lga (buffer, &hstat, &current_file_name, &current_link_name, NULL))

-         {

-             struct entry *entry, *pent;

-             struct inode *inode;

--- 

-1.7.3.3

-

diff --git a/alt-files/mc.git-e4961563c4019892d8965779c6979c38c2f68017.patch b/alt-files/mc.git-e4961563c4019892d8965779c6979c38c2f68017.patch

deleted file mode 100644

index 38efc5e..0000000

--- a/alt-files/mc.git-e4961563c4019892d8965779c6979c38c2f68017.patch

+++ /dev/null

@@ -1,203 +0,0 @@

-From e4961563c4019892d8965779c6979c38c2f68017 Mon Sep 17 00:00:00 2001

-From: Slava Zanko <slavazanko@gmail.com>

-Date: Tue, 19 Jul 2011 11:30:20 +0300

-Subject: [PATCH] Ticket #81: savannah: can't access files on ftp starting with space

-

-files starting with space can't be acessed by mc through ftp - it

-shows the file as not having the leading space and attempts to

-access it produce 'permission denied' errors.

-

-Signed-off-by: Slava Zanko <slavazanko@gmail.com>

----

- lib/vfs/mc-vfs/direntry.c  |   25 +++++++++++++++++++++++++

- lib/vfs/mc-vfs/extfs.c     |    3 ++-

- lib/vfs/mc-vfs/ftpfs.c     |    6 +++++-

- lib/vfs/mc-vfs/utilvfs.c   |   19 ++++++++++++++-----

- lib/vfs/mc-vfs/utilvfs.h   |    2 +-

- lib/vfs/mc-vfs/xdirentry.h |    9 +++++++++

- 6 files changed, 56 insertions(+), 8 deletions(-)

-

-diff --git a/lib/vfs/mc-vfs/direntry.c b/lib/vfs/mc-vfs/direntry.c

-index 314696b..959f8ca 100644

---- a/lib/vfs/mc-vfs/direntry.c

-+++ b/lib/vfs/mc-vfs/direntry.c

-@@ -1468,3 +1468,28 @@ vfs_s_get_line_interruptible (struct vfs_class *me, char *buffer, int size, int

- #endif /* ENABLE_VFS_NET */

- 

- /* --------------------------------------------------------------------------------------------- */

-+

-+/**

-+ * Normalize filenames start position

-+ */

-+

-+void

-+vfs_s_normalize_filename_pos (struct vfs_s_inode *root_inode, size_t final_filepos)

-+{

-+    struct vfs_s_entry *entry;

-+

-+    for (entry = root_inode->subdir; entry != NULL; entry = entry->next)

-+    {

-+        if ((size_t) entry->ino->data_offset > final_filepos)

-+        {

-+            char *source_name = entry->name;

-+            char *spacer = g_strnfill (entry->ino->data_offset - final_filepos, ' ');

-+            entry->name = g_strdup_printf ("%s%s", spacer, source_name);

-+            g_free (spacer);

-+            g_free (source_name);

-+        }

-+        entry->ino->data_offset = -1;

-+    }

-+}

-+

-+/* --------------------------------------------------------------------------------------------- */

-diff --git a/lib/vfs/mc-vfs/extfs.c b/lib/vfs/mc-vfs/extfs.c

-index cb1475c..368a4fc 100644

---- a/lib/vfs/mc-vfs/extfs.c

-+++ b/lib/vfs/mc-vfs/extfs.c

-@@ -474,6 +474,7 @@ extfs_read_archive (int fstype, const char *name, struct archive **pparc)

-     char *buffer;

-     struct archive *current_archive;

-     char *current_file_name, *current_link_name;

-+    size_t filepos = 0;

- 

-     info = &g_array_index (extfs_plugins, extfs_plugin_info_t, fstype);

- 

-@@ -491,7 +492,7 @@ extfs_read_archive (int fstype, const char *name, struct archive **pparc)

-         struct stat hstat;

- 

-         current_link_name = NULL;

--        if (vfs_parse_ls_lga (buffer, &hstat, &current_file_name, &current_link_name))

-+        if (vfs_parse_ls_lga (buffer, &hstat, &current_file_name, &current_link_name, &filepos))

-         {

-             struct entry *entry, *pent;

-             struct inode *inode;

-diff --git a/lib/vfs/mc-vfs/ftpfs.c b/lib/vfs/mc-vfs/ftpfs.c

-index 9ed3b3a..47c9b9e 100644

---- a/lib/vfs/mc-vfs/ftpfs.c

-+++ b/lib/vfs/mc-vfs/ftpfs.c

-@@ -1644,6 +1644,7 @@ ftpfs_dir_load (struct vfs_class *me, struct vfs_s_inode *dir, char *remote_path

-     int sock, num_entries = 0;

-     char lc_buffer[BUF_8K];

-     int cd_first;

-+    size_t filepos = 0;

- 

-     cd_first = ftpfs_first_cd_then_ls || (SUP.strict == RFC_STRICT)

-         || (strchr (remote_path, ' ') != NULL);

-@@ -1714,13 +1715,14 @@ ftpfs_dir_load (struct vfs_class *me, struct vfs_s_inode *dir, char *remote_path

- 

-         ent = vfs_s_generate_entry (me, NULL, dir, 0);

-         i = ent->ino->st.st_nlink;

--        if (!vfs_parse_ls_lga (lc_buffer, &ent->ino->st, &ent->name, &ent->ino->linkname))

-+        if (!vfs_parse_ls_lga (lc_buffer, &ent->ino->st, &ent->name, &ent->ino->linkname, &filepos))

-         {

-             vfs_s_free_entry (me, ent);

-             continue;

-         }

-         ent->ino->st.st_nlink = i;      /* Ouch, we need to preserve our counts :-( */

-         num_entries++;

-+        vfs_s_store_filename_pos (ent, filepos);

-         vfs_s_insert_entry (me, dir, ent);

-     }

- 

-@@ -1745,6 +1747,8 @@ ftpfs_dir_load (struct vfs_class *me, struct vfs_s_inode *dir, char *remote_path

-         goto again;

-     }

- 

-+    vfs_s_normalize_filename_pos (dir, filepos);

-+

-     if (SUP.strict == RFC_AUTODETECT)

-         SUP.strict = RFC_DARING;

- 

-diff --git a/lib/vfs/mc-vfs/utilvfs.c b/lib/vfs/mc-vfs/utilvfs.c

-index ab4cbdf..df57bce 100644

---- a/lib/vfs/mc-vfs/utilvfs.c

-+++ b/lib/vfs/mc-vfs/utilvfs.c

-@@ -929,8 +929,9 @@ vfs_parse_filedate (int idx, time_t * t)

- 

- /* --------------------------------------------------------------------------------------------- */

- 

--int

--vfs_parse_ls_lga (const char *p, struct stat *s, char **filename, char **linkname)

-+gboolean

-+vfs_parse_ls_lga (const char *p, struct stat * s, char **filename, char **linkname,

-+                  size_t * filename_pos)

- {

-     int idx, idx2, num_cols;

-     int i;

-@@ -940,7 +941,7 @@ vfs_parse_ls_lga (const char *p, struct stat *s, char **filename, char **linknam

-     size_t skipped;

- 

-     if (strncmp (p, "total", 5) == 0)

--        return 0;

-+        return FALSE;

- 

-     if (!vfs_parse_filetype (p, &skipped, &s->st_mode))

-         goto error;

-@@ -1058,6 +1059,14 @@ vfs_parse_ls_lga (const char *p, struct stat *s, char **filename, char **linknam

-     s->st_blocks = (s->st_size + 511) / 512;

- #endif

- 

-+    if (filename_pos != NULL)

-+    {

-+        if ((*filename_pos == 0) || (*filename_pos > (size_t) column_ptr[idx]))

-+            *filename_pos = column_ptr[idx];

-+        else

-+            column_ptr[idx] = *filename_pos;

-+    }

-+

-     for (i = idx + 1, idx2 = 0; i < num_cols; i++)

-         if (strcmp (columns[i], "->") == 0)

-         {

-@@ -1107,7 +1116,7 @@ vfs_parse_ls_lga (const char *p, struct stat *s, char **filename, char **linknam

-     }

- 

-     g_free (p_copy);

--    return 1;

-+    return TRUE;

- 

-   error:

-     {

-@@ -1122,7 +1131,7 @@ vfs_parse_ls_lga (const char *p, struct stat *s, char **filename, char **linknam

-     }

- 

-     g_free (p_copy);

--    return 0;

-+    return FALSE;

- }

- 

- /* --------------------------------------------------------------------------------------------- */

-diff --git a/lib/vfs/mc-vfs/utilvfs.h b/lib/vfs/mc-vfs/utilvfs.h

-index 0c1159d..7967daf 100644

---- a/lib/vfs/mc-vfs/utilvfs.h

-+++ b/lib/vfs/mc-vfs/utilvfs.h

-@@ -52,7 +52,7 @@ gboolean vfs_parse_fileperms (const char *s, size_t * ret_skipped, mode_t * ret_

- gboolean vfs_parse_filemode (const char *s, size_t * ret_skipped, mode_t * ret_mode);

- gboolean vfs_parse_raw_filemode (const char *s, size_t * ret_skipped, mode_t * ret_mode);

- 

--int vfs_parse_ls_lga (const char *p, struct stat *s, char **filename, char **linkname);

-+gboolean vfs_parse_ls_lga (const char *p, struct stat *s, char **filename, char **linkname, size_t *filename_pos);

- int vfs_parse_filedate (int idx, time_t * t);

- 

- /*** inline functions ****************************************************************************/

-diff --git a/lib/vfs/mc-vfs/xdirentry.h b/lib/vfs/mc-vfs/xdirentry.h

-index 9e87f1f..0d43743 100644

---- a/lib/vfs/mc-vfs/xdirentry.h

-+++ b/lib/vfs/mc-vfs/xdirentry.h

-@@ -249,5 +249,14 @@ int vfs_s_get_line_interruptible (struct vfs_class *me, char *buffer, int size,

- /* misc */

- int vfs_s_retrieve_file (struct vfs_class *me, struct vfs_s_inode *ino);

- 

-+void vfs_s_normalize_filename_pos (struct vfs_s_inode *root_inode, size_t final_filepos);

-+

- /*** inline functions ****************************************************************************/

-+

-+static inline void

-+vfs_s_store_filename_pos (struct vfs_s_entry *entry, size_t position)

-+{

-+    entry->ino->data_offset = (off_t) position;

-+}

-+

- #endif

--- 

-1.7.3.3

-

diff --git a/alt-patches/mc-4.7.5.5-ftpspaces.patch b/alt-patches/mc-4.7.5.5-ftpspaces.patch

new file mode 100644

index 0000000..e71914b

--- /dev/null

+++ b/alt-patches/mc-4.7.5.5-ftpspaces.patch

@@ -0,0 +1,13 @@

+Set better default value for RFC_STRICT servers that do not show ".." in LIST

+diff -urN mc-4.7.5.5.orig/lib/vfs/mc-vfs/parse_ls_vga.c mc-4.7.5.5/lib/vfs/mc-vfs/parse_ls_vga.c

+--- mc-4.7.5.5.orig/lib/vfs/mc-vfs/parse_ls_vga.c	2011-09-28 12:49:09.000000000 -0400

++++ mc-4.7.5.5/lib/vfs/mc-vfs/parse_ls_vga.c	2011-10-19 13:14:30.000000000 -0400

+@@ -648,7 +648,7 @@

+ void

+ vfs_parse_ls_lga_init (void)

+ {

+-    vfs_parce_ls_final_num_spaces = 0;

++    vfs_parce_ls_final_num_spaces = 1;

+ }

+ 

+ /* --------------------------------------------------------------------------------------------- */

diff --git a/mc.spec b/mc.spec

index a7be624..2b0ff7c 100644

--- a/mc.spec

+++ b/mc.spec

@@ -1,6 +1,6 @@

 Name: mc

-Version: 4.7.5.3

-Release: alt3

+Version: 4.7.5.5

+Release: alt0.M51.3

 License: %gpllgpl2plus

 Summary: An user-friendly file manager and visual shell

@@ -34,9 +34,8 @@ Patch51: mc-4.7.0-debian-mc.ext-use-arj.patch

 # https://savannah.gnu.org/patch/?4211

 Patch101: mc-4.7.0.2-savannah-edit-homekey.patch

-# Errata

-Patch500: mc.git-cc0257cd5a34261439152f331b8d93014109cbff.patch

-Patch501: mc.git-e4961563c4019892d8965779c6979c38c2f68017.patch

+#Errata

+Patch500: mc-4.7.5.5-ftpspaces.patch

 BuildRequires(pre): rpm-build-licenses

@@ -48,6 +47,8 @@ Obsoletes: %name-data

 Obsoletes: %name-locales

 Obsoletes: %name-doc

+Obsoletes: mc47

+

 BuildPreReq: glib2-devel libe2fs-devel libgpm-devel

 BuildPreReq: groff-base cvs libX11-devel unzip

 BuildPreReq: libslang2-devel

@@ -100,17 +101,16 @@ needed for working all components (some vfs for example)

 %patch101 -p1

 #Errata

-# rollback fix for Ticket #81: new problem described in

-# https://www.midnight-commander.org/ticket/2594

-%patch500 -p1 -R

-%patch501 -p1 -R

+%patch500 -p1

 cat <<EOF > version.h

 #ifndef MC_CURRENT_VERSION

-#define MC_CURRENT_VERSION "4.7.5.3"

+#define MC_CURRENT_VERSION "@@VERSION@@"

 #endif

 EOF

+subst 's|@@VERSION@@|%version-%release|' version.h

+

 #%%autoreconf

 ./autogen.sh

@@ -132,7 +132,7 @@ rm -rf lib/vfs/mc-vfs/samba/

 install -d %buildroot%_sysconfdir/{profile.d,bashrc.d}

 mv %buildroot%_libexecdir/mc/mc.csh %buildroot%_sysconfdir/profile.d/

 mv %buildroot%_libexecdir/mc/mc.sh %buildroot%_sysconfdir/bashrc.d/

-install -m755 %SOURCE6 %buildroot%_sysconfdir/profile.d/mc.sh

+#install -m755 %SOURCE6 %buildroot%_sysconfdir/profile.d/mc.sh

 # Install DosNavigator color scheme

 install -m644 %SOURCE2 .

 # Install Dark color scheme

@@ -195,6 +195,29 @@ install -pD -m644 %SOURCE5 %buildroot%_niconsdir/%name.png

 %files full

 %changelog

+* Sat Oct 22 2011 Sergey Y. Afonin <asy@altlinux.ru> 4.7.5.5-alt0.M51.3

+- Branch 5.1 backport

+

+* Sat Oct 22 2011 Sergey Y. Afonin <asy@altlinux.ru> 4.7.5.5-alt3

+- applied fix from #2635

+

+* Thu Oct 20 2011 Sergey Y. Afonin <asy@altlinux.ru> 4.7.5.5-alt0.M51.2

+- Branch 5.1 backport

+

+* Thu Oct 20 2011 Sergey Y. Afonin <asy@altlinux.ru> 4.7.5.5-alt2

+- fixed output of version string (typo in spec of 4.7.5.5-alt1)

+

+* Wed Oct 19 2011 Sergey Y. Afonin <asy@altlinux.ru> 4.7.5.5-alt0.M51.1

+- Branch 5.1 backport

+

+* Wed Oct 19 2011 Sergey Y. Afonin <asy@altlinux.ru> 4.7.5.5-alt1

+- 4.7.5.5

+- disabled rollback for #81

+

+* Tue Aug 23 2011 Sergey Y. Afonin <asy@altlinux.ru> 4.7.5.3-alt0.M51.3

+- Branch 5.1 backport

+- disabled separated alias definition for zsh

+

 * Tue Aug 23 2011 Sergey Y. Afonin <asy@altlinux.ru> 4.7.5.3-alt3

 - moved mc.sh back to bashrc.d (ALT #25703/c#3)

 - added alias definition for zsh in profile.d (ALT #25703)

@@ -203,6 +226,9 @@ install -pD -m644 %SOURCE5 %buildroot%_niconsdir/%name.png

 * Tue Aug 09 2011 Sergey Y. Afonin <asy@altlinux.ru> 4.7.5.3-alt2

 - moved mc.sh from bashrc.d to profile.d (ALT #25703)

+* Mon Aug 08 2011 Sergey Y. Afonin <asy@altlinux.ru> 4.7.5.3-alt0.M51.1

+- Branch 5.1 backport

+

 * Mon Aug 08 2011 Sergey Y. Afonin <asy@altlinux.ru> 4.7.5.3-alt1

 - 4.7.5.3

@@ -221,6 +247,10 @@ install -pD -m644 %SOURCE5 %buildroot%_niconsdir/%name.png

     mc-4.7.0-alt-po.patch

     mc-4.7.0-alt-defaults.patch

+* Sat Dec 25 2010 Sergey Y. Afonin <asy@altlinux.ru> 4.7.0.10-alt0.M51.5

+- Branch 5.1 update

+- added "mc47" to "Obsoletes"

+

 * Tue Dec 21 2010 Sergey Y. Afonin <asy@altlinux.ru> 4.7.0.10-alt5

 - fixed processing of ";1" in some ISO images (closes: #12299)

@@ -249,6 +279,9 @@ install -pD -m644 %SOURCE5 %buildroot%_niconsdir/%name.png

 - disabled mc-4.7.0.2-alt-esc.patch (not needed now)

 - added cdrkit-utils to "Requires" (closes: #24662)

+* Wed Sep 01 2010 Radik Usupov <radik@altlinux.org> 4.7.0.2-alt0.M51.2

+- Build for branch 5.1

+

 * Thu Feb 25 2010 Andrey Rahmatullin <wrar@altlinux.ru> 4.7.0.2-alt2

 - 4.7.0.2-37-ge0030fd (closes: #22979)