rpms/mc/devel mc-newlinedir.patch, NONE, 1.1 .cvsignore, 1.29, 1.30 mc-ipv6.patch, 1.2, 1.3 mc.spec, 1.110, 1.111 sources, 1.36, 1.37 mc-fishfix.patch, 1.2, NONE mc-rpmconf.patch, 1.1, NONE mc-uglydir.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Nov 20 14:08:52 UTC 2006
Author: jnovy
Update of /cvs/dist/rpms/mc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6184
Modified Files:
.cvsignore mc-ipv6.patch mc.spec sources
Added Files:
mc-newlinedir.patch
Removed Files:
mc-fishfix.patch mc-rpmconf.patch mc-uglydir.patch
Log Message:
- update to new CVS snapshot
- drop .fishfix, .rpmconf patches, applied upstream
- fix IPv6 patch (should fix #206234 and #213212)
- don't crash when directory ending with newline is listed (#215909),
disable support for directories with '\n' in name to avoid
further issues (remove .uglydir patch) and report chdir error
mc-newlinedir.patch:
main.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE mc-newlinedir.patch ---
--- mc-2006-11-14-16/src/main.c.newlinedir 2006-11-20 14:54:21.000000000 +0100
+++ mc-2006-11-14-16/src/main.c 2006-11-20 14:47:52.000000000 +0100
@@ -647,7 +647,7 @@
}
directory = *new_dir ? new_dir : home_dir;
- if (mc_chdir (directory) == -1) {
+ if (strchr(directory,'\n') || mc_chdir (directory) == -1) {
strcpy (panel->cwd, olddir);
g_free (olddir);
g_free (translated_url);
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mc/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore 27 Oct 2006 13:19:40 -0000 1.29
+++ .cvsignore 20 Nov 2006 14:08:49 -0000 1.30
@@ -4,3 +4,4 @@
mc-2006-09-12-21.tar.gz
mc-2006-09-25-14.tar.gz
mc-2006-10-15-16.tar.gz
+mc-2006-11-14-16.tar.gz
mc-ipv6.patch:
mc-2006-08-12-18/vfs/utilvfs.c | 16 ++
mc-2006-09-12-21/vfs/ftpfs.c | 300 +++++++++++++++++++++++++++--------------
mc-2006-09-12-21/vfs/ftpfs.h | 3
3 files changed, 222 insertions(+), 97 deletions(-)
Index: mc-ipv6.patch
===================================================================
RCS file: /cvs/dist/rpms/mc/devel/mc-ipv6.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mc-ipv6.patch 27 Oct 2006 13:11:34 -0000 1.2
+++ mc-ipv6.patch 20 Nov 2006 14:08:49 -0000 1.3
@@ -259,7 +259,7 @@
-
- SUP.use_passive_connection = 0;
- print_vfs_message (_("ftpfs: could not setup passive mode"));
-+ if (getsockname (SUP.sock, (struct sockaddr *) &data_addr, &data_addrlen) == -1)
++ if (getpeername (SUP.sock, (struct sockaddr *) &data_addr, &data_addrlen) == -1)
+ return -1;
+
+ switch (data_addr.ss_family) {
Index: mc.spec
===================================================================
RCS file: /cvs/dist/rpms/mc/devel/mc.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- mc.spec 8 Nov 2006 13:04:08 -0000 1.110
+++ mc.spec 20 Nov 2006 14:08:49 -0000 1.111
@@ -1,9 +1,9 @@
-%define date 2006-10-15-16
+%define date 2006-11-14-16
Summary: User-friendly text console file manager and visual shell
Name: mc
Version: 4.6.1a
-Release: 34%{?dist}
+Release: 35%{?dist}
Epoch: 1
License: GPL
Group: System Environment/Shells
@@ -15,20 +15,18 @@
Patch0: mc-utf8.patch
Patch1: mc-extensions.patch
-Patch2: mc-uglydir.patch
-Patch4: mc-userhost.patch
-Patch5: mc-64bit.patch
-Patch6: mc-utf8-look-and-feel.patch
-Patch7: mc-concat.patch
-Patch8: mc-showfree.patch
-Patch9: mc-cedit.patch
-Patch10: mc-delcheck.patch
-Patch11: mc-etcmc.patch
-Patch12: mc-exit.patch
-Patch13: mc-fishfix.patch
-Patch14: mc-utf8-8bit-hex.patch
-Patch15: mc-ipv6.patch
-Patch16: mc-rpmconf.patch
+Patch2: mc-userhost.patch
+Patch3: mc-64bit.patch
+Patch4: mc-utf8-look-and-feel.patch
+Patch5: mc-concat.patch
+Patch6: mc-showfree.patch
+Patch7: mc-cedit.patch
+Patch8: mc-delcheck.patch
+Patch9: mc-etcmc.patch
+Patch10: mc-exit.patch
+Patch11: mc-utf8-8bit-hex.patch
+Patch12: mc-ipv6.patch
+Patch13: mc-newlinedir.patch
%description
Midnight Commander is a visual shell much like a file manager, only
@@ -42,20 +40,18 @@
%patch0 -p1 -b .utf8
%patch1 -p1 -b .extensions
-%patch2 -p1 -b .uglydir
-%patch4 -p1 -b .userhost
-%patch5 -p1 -b .64bit
-%patch6 -p1 -b .laf
-%patch7 -p1 -b .concat
-%patch8 -p1 -b .showfree
-%patch9 -p1 -b .cedit
-%patch10 -p1 -b .delcheck
-%patch11 -p1 -b .etcmc
-%patch12 -p1 -b .exit
-%patch13 -p1 -b .fishfix
-%patch14 -p1 -b .8bit-hex
-%patch15 -p1 -b .ipv6
-%patch16 -p1 -b .rpmconf
+%patch2 -p1 -b .userhost
+%patch3 -p1 -b .64bit
+%patch4 -p1 -b .laf
+%patch5 -p1 -b .concat
+%patch6 -p1 -b .showfree
+%patch7 -p1 -b .cedit
+%patch8 -p1 -b .delcheck
+%patch9 -p1 -b .etcmc
+%patch10 -p1 -b .exit
+%patch11 -p1 -b .8bit-hex
+%patch12 -p1 -b .ipv6
+%patch13 -p1 -b .newlinedir
# convert files in /lib to UTF-8
pushd lib
@@ -200,6 +196,14 @@
%dir %{_sysconfdir}/mc
%changelog
+* Thu Nov 16 2006 Jindrich Novy <jnovy at redhat.com> 4.6.1a-35
+- update to new CVS snapshot
+- drop .fishfix, .rpmconf patches, applied upstream
+- fix IPv6 patch (should fix #206234 and #213212)
+- don't crash when directory ending with newline is listed (#215909),
+ disable support for directories with '\n' in name to avoid
+ further issues (remove .uglydir patch) and report chdir error
+
* Wed Nov 2 2006 Jindrich Novy <jnovy at redhat.com> 4.6.1a-34
- fix #214255 - sh vfs disconnects with special character in filename
- drop fish-upload patch, applied upstream
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mc/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources 31 Oct 2006 14:04:54 -0000 1.36
+++ sources 20 Nov 2006 14:08:49 -0000 1.37
@@ -1 +1 @@
-4057fa1eca69fea254a92c9d1a4496f6 mc-2006-10-15-16.tar.gz
+bd4f2e1c98a283ce7634365c9d4567f0 mc-2006-11-14-16.tar.gz
--- mc-fishfix.patch DELETED ---
--- mc-rpmconf.patch DELETED ---
--- mc-uglydir.patch DELETED ---
More information about the fedora-cvs-commits
mailing list