fedora-cvs-commits@redhat.com
[Top] [All Lists]

rpms/mc/devel mc-ftpcrash.patch, NONE, 1.1 mc-extensions.patch, 1.2, 1.3

Subject: rpms/mc/devel mc-ftpcrash.patch, NONE, 1.1 mc-extensions.patch, 1.2, 1.3 mc.spec, 1.58, 1.59
From:
Date: Mon, 29 Aug 2005 09:50:22 -0400
Author: jnovy

Update of /cvs/dist/rpms/mc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31144

Modified Files:
        mc-extensions.patch mc.spec 
Added Files:
        mc-ftpcrash.patch 
Log Message:
don't hang when ftpfs times out, extension file fixes


mc-ftpcrash.patch:
 ftpfs.c |   23 ++++++++++++++++++++---
 1 files changed, 20 insertions(+), 3 deletions(-)

--- NEW FILE mc-ftpcrash.patch ---
--- mc-2004-12-01-22/vfs/ftpfs.c        2004-11-03 03:54:00.000000000 +0200
+++ mc-2004-12-01-22-new/vfs/ftpfs.c    2005-02-07 17:34:25.000000000 +0200
@@ -316,6 +316,8 @@
     va_list ap;
     char *cmdstr;
     int status, cmdlen;
+    static int retry = 0;
+    static int level = 0;      /* ftpfs_login_server() use ftpfs_command() */
 
     va_start (ap, fmt);
     cmdstr = g_strdup_vprintf (fmt, ap);
@@ -343,7 +345,6 @@
        code = 421;
 
        if (errno == EPIPE) {   /* Remote server has closed connection */
-           static int level = 0;       /* ftpfs_login_server() use 
ftpfs_command() */
            if (level == 0) {
                level = 1;
                status = ftpfs_reconnect (me, super);
@@ -359,14 +360,30 @@
        disable_interrupt_key ();
        return TRANSIENT;
     }
+    retry = 0;
   ok:
-    g_free (cmdstr);
     disable_interrupt_key ();
 
     if (wait_reply)
-       return ftpfs_get_reply (me, SUP.sock,
+    {
+       status = ftpfs_get_reply (me, SUP.sock,
                          (wait_reply & WANT_STRING) ? reply_str : NULL,
                          sizeof (reply_str) - 1);
+       if ((wait_reply & WANT_STRING) && !retry && !level && code == 421)
+       {
+           retry = 1;
+           level = 1;
+           status = ftpfs_reconnect (me, super);           
+           level = 0;
+           if (status && (write (SUP.sock, cmdstr, cmdlen) > 0)) {
+               goto ok;
+           }
+       }
+       retry = 0;
+        g_free (cmdstr);       
+       return status;
+    }
+    g_free (cmdstr);    
     return COMPLETE;
 }
 

mc-extensions.patch:
 mc.ext.in |   49 ++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 42 insertions(+), 7 deletions(-)

Index: mc-extensions.patch
===================================================================
RCS file: /cvs/dist/rpms/mc/devel/mc-extensions.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mc-extensions.patch 25 Jul 2005 11:07:17 -0000      1.2
+++ mc-extensions.patch 29 Aug 2005 13:50:20 -0000      1.3
@@ -1,6 +1,6 @@
 --- mc-4.6.1/lib/mc.ext.in.extensions  2005-07-23 18:51:15.000000000 +0200
-+++ mc-4.6.1/lib/mc.ext.in     2005-07-25 09:53:08.367448216 +0200
-@@ -210,14 +210,25 @@ shell/.7z
++++ mc-4.6.1/lib/mc.ext.in     2005-08-17 10:30:06.000000000 +0200
+@@ -210,14 +210,25 @@
  
  # C
  shell/.c
@@ -28,7 +28,7 @@
        Open=%var{EDITOR:vi} %f
  
  # Object
-@@ -242,9 +253,11 @@ regex/\.(te?xi|texinfo)$
+@@ -242,9 +253,11 @@
  # GNU Info page
  type/^Info\ text
        Open=info -f %f
@@ -40,7 +40,7 @@
  
  # Manual page
  # Exception - .so libraries are not manual pages
-@@ -313,6 +326,12 @@ type/^PPM
+@@ -313,6 +326,12 @@
  type/^Netpbm
        Include=image
  
@@ -53,7 +53,7 @@
  shell/.xcf
        Open=gimp %f
  
-@@ -324,7 +343,7 @@ shell/.xpm
+@@ -324,7 +343,7 @@
        View=sxpm %f
  
  include/image
@@ -62,7 +62,7 @@
        View=%view{ascii} identify %f
        #View=%view{ascii} asciiview %f
  
-@@ -342,8 +361,12 @@ regex/\.([wW][aA][wW]22)$
+@@ -342,8 +361,12 @@
         Open=vplay -s 22 %f
  
  regex/\.([mM][pP]3)$
@@ -77,7 +77,7 @@
  
  regex/\.([oO][gG][gG])$
        Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms %f &); fi
-@@ -356,6 +379,9 @@ regex/\.([wW][mM][aA])$
+@@ -356,6 +379,9 @@
        Open=mplayer -vo null %f
        View=%view{ascii} mplayer -quiet -slave -frames 0 -vo null -ao null 
-identify %f 2>/dev/null | tail +13 || file %f
  
@@ -87,7 +87,7 @@
  
  ### Play lists ###
  
-@@ -380,20 +406,28 @@ regex/\.([mM][oO][vV]|[qQ][tT])$
+@@ -380,20 +406,28 @@
  regex/\.([mM][pP]4|[mM][pP][eE]?[gG])$
        Include=video
  
@@ -116,3 +116,22 @@
        #Open=(gtv %f >/dev/null 2>&1 &)
        #Open=(xanim %f >/dev/null 2>&1 &)
  
+@@ -407,7 +441,8 @@
+ 
+ # PDF
+ type/^PDF
+-      Open=(xpdf %f &)
++      Open=(evince %f &)
++      #Open=(xpdf %f &)
+       #Open=(acroread %f &)
+       #Open=(ghostview %f &)
+       View=%view{ascii} pdftotext %f -
+@@ -418,7 +453,7 @@
+ # html
+ regex/\.([hH][tT][mM][lL]?)$
+       Open=(if test -n "@X11_WWW@" && test -n "$DISPLAY"; then (@X11_WWW@ 
file://%d/%p &) 1>&2; else links %f || lynx -force_html %f || ${PAGER:-more} 
%f; fi) 2>/dev/null
+-      View=%view{ascii} lynx -dump -force_html %f
++      View=%view{ascii} links -dump %f
+ 
+ # StarOffice 5.2
+ shell/.sdw


Index: mc.spec
===================================================================
RCS file: /cvs/dist/rpms/mc/devel/mc.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- mc.spec     25 Jul 2005 11:07:17 -0000      1.58
+++ mc.spec     29 Aug 2005 13:50:20 -0000      1.59
@@ -1,7 +1,7 @@
 Summary:       User-friendly text console file manager and visual shell.
 Name:          mc
 Version:       4.6.1a
-Release:       0.12
+Release:       0.13
 Epoch:         1
 License:       GPL
 Group:         System Environment/Shells
@@ -20,6 +20,7 @@
 Patch5:                mc-userhost.patch
 Patch6:                mc-64bit.patch
 Patch7:                mc-gcc4.patch
+Patch8:                mc-ftpcrash.patch
 
 %description
 Midnight Commander is a visual shell much like a file manager, only
@@ -39,6 +40,7 @@
 %patch5 -p1 -b .userhost
 %patch6 -p1 -b .64bit
 %patch7 -p1 -b .gcc4
+%patch8 -p1 -b .ftpcrash
 
 # convert files in /lib to UTF-8
 pushd lib
@@ -173,6 +175,10 @@
 %dir %{_datadir}/mc
 
 %changelog
+* Mon Aug 29 2005 Jindrich Novy <jnovy@xxxxxxxxxx> 4.6.1a-0.13
+- don't hang when ftpfs connection times out - Hans de Goede (#166976)
+- fix extension file to better fit FC (xpdf->evince, lynx->links)
+
 * Mon Jul 25 2005 Jindrich Novy <jnovy@xxxxxxxxxx> 4.6.1a-0.12
 - new mc release 4.6.1
 - sync extensions patch

-- 
fedora-cvs-commits mailing list
fedora-cvs-commits@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-cvs-commits

<Prev in Thread] Current Thread [Next in Thread>
  • rpms/mc/devel mc-ftpcrash.patch, NONE, 1.1 mc-extensions.patch, 1.2, 1.3 mc.spec, 1.58, 1.59, fedora-cvs-commits <=