rpms/tuxcmd/devel tuxcmd-0.6.52-anon-ftp.patch, NONE, 1.1 tuxcmd-0.6.52-null-mounts.patch, NONE, 1.1 tuxcmd.spec, 1.7, 1.8

[Tomas Bzatek]

Author: tbzatek

Update of /cvs/extras/rpms/tuxcmd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30893

Modified Files:
	tuxcmd.spec 
Added Files:
	tuxcmd-0.6.52-anon-ftp.patch tuxcmd-0.6.52-null-mounts.patch 
Log Message:
* Tue Oct  7 2008 Tomas Bzatek <tbzatek at redhat.com> 0.6.50-2
- Hide '0' and NULL mount points
- GVFS plugin: supply proper user/pass for anonymous FTP login


tuxcmd-0.6.52-anon-ftp.patch:

--- NEW FILE tuxcmd-0.6.52-anon-ftp.patch ---
diff -up tuxcmd-modules-0.6.50/gvfs/Makefile.anon-ftp tuxcmd-modules-0.6.50/gvfs/Makefile
--- tuxcmd-modules-0.6.50/gvfs/Makefile.anon-ftp	2008-09-14 14:59:32.000000000 +0200
+++ tuxcmd-modules-0.6.50/gvfs/Makefile	2008-10-07 12:03:57.380185912 +0200
@@ -8,7 +8,7 @@ CC = gcc
 CPP = g++
 CFLAGS =-I. -I/usr/include \
 	-Wall -fPIC -O2 -g \
-	-DG_DISABLE_DEPRECATED -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+	-DG_DISABLE_DEPRECATED -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
 
 
 LIB_SUFFIX=`if test \`uname -m\` = x86_64; then echo 64; fi`
diff -up tuxcmd-modules-0.6.50/gvfs/gvfs.c.anon-ftp tuxcmd-modules-0.6.50/gvfs/gvfs.c
--- tuxcmd-modules-0.6.50/gvfs/gvfs.c.anon-ftp	2008-09-03 20:44:41.000000000 +0200
+++ tuxcmd-modules-0.6.50/gvfs/gvfs.c	2008-10-07 12:04:58.361291399 +0200
@@ -34,6 +34,7 @@
 #define VERSION "0.0.5"
 #define BUILD_DATE "2008-09-03"
 #define DEFAULT_BLOCK_SIZE 0x10000   /* 64kB */
+#define ANON_FTP_PASS "ftpuser at tuxcmd.net"
 
 #define CONST_DEFAULT_QUERY_INFO_ATTRIBUTES     G_FILE_ATTRIBUTE_STANDARD_TYPE "," G_FILE_ATTRIBUTE_STANDARD_NAME "," \
                                                 G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME "," G_FILE_ATTRIBUTE_STANDARD_SIZE "," \
@@ -50,6 +51,7 @@ struct TVFSGlobs {
   GMainLoop *mount_main_loop;
   TVFSResult mount_result;
   gchar *mount_password;
+  gboolean ftp_anonymous;
 
   gboolean break_get_dir_size;
   guint32 block_size;
@@ -131,18 +133,23 @@ ask_password_cb (GMountOperation *op,
   g_assert (globs != NULL);
 
   g_print ("(WW) ask_password_cb: message = '%s'\n", message);
+  if (globs->ftp_anonymous)
+    g_print ("(II) Trying anonymous FTP login...\n");
 
   if (flags & G_ASK_PASSWORD_NEED_USERNAME)
     {
       g_print ("      need username...\n");
-/* FIXME: need proper API and spawn callback
+      if (globs->ftp_anonymous)
+        g_mount_operation_set_username (op, "anonymous");
+
+/* FIXME: need proper API to spawn a callback
       g_mount_operation_set_username (op, s);  */
     }
 
   if (flags & G_ASK_PASSWORD_NEED_DOMAIN)
     {
       g_print ("      need domain...\n");
-/* FIXME: need proper API and spawn callback
+/* FIXME: need proper API to spawn a callback
       g_mount_operation_set_domain (op, s);  */
     }
 
@@ -151,6 +158,9 @@ ask_password_cb (GMountOperation *op,
       g_print ("      need password...\n");
       if (globs->mount_password)
         g_mount_operation_set_password (op, globs->mount_password);
+      else
+      if (globs->ftp_anonymous)
+        g_mount_operation_set_password (op, ANON_FTP_PASS);
     }
 
   g_mount_operation_reply (op, G_MOUNT_OPERATION_HANDLED);
@@ -287,6 +297,7 @@ VFSOpen (struct TVFSGlobs *globs, char *
 
   globs->file = NULL;
   globs->mount_password = NULL;
+  globs->ftp_anonymous = FALSE;
   uri = NULL;
 
   /*  Rip out password as GVFS URIs should contain only username (and domain).  */
@@ -338,6 +349,11 @@ VFSOpen (struct TVFSGlobs *globs, char *
     if (uri_service)
       free (uri_service);
   }
+  else
+  {
+    /*  should be anonymous  */
+    globs->ftp_anonymous = strcasestr (sName, "ftp://") == sName;
+  }
   
 
   g_print ("(II) VFSOpen: opening URI '%s'\n", uri ? uri : sName);

tuxcmd-0.6.52-null-mounts.patch:

--- NEW FILE tuxcmd-0.6.52-null-mounts.patch ---
From: Tomas Bzatek <tbzatek at vmrawhide.w2k3dom>
Date: Mon, 6 Oct 2008 10:36:24 +0000 (+0200)
Subject: Skip '0' and NULL mount points
X-Git-Url: http://git.bzatek.net/?p=tuxcmd%2F.git;a=commitdiff_plain;h=a6cc39e45a4464a037f82743e5b6a74a0df64036

Skip '0' and NULL mount points
---

diff --git a/UCore.pas b/UCore.pas
index 374045f..b2ac837 100644
--- a/UCore.pas
+++ b/UCore.pas
@@ -2386,11 +2386,12 @@ begin
   //  Get mount name
   mntent := getmntent(fd);
   while mntent <> nil do begin
-    DebugMsg(['FillDefaultFstabMounterItems: found "', mntent^.mnt_dir, '" --> "', mntent^.mnt_fsname, '", fstype ', mntent^.mnt_type]);
-    if (mntent^.mnt_dir <> '/') and (mntent^.mnt_dir <> '/boot') and (Pos('/proc', mntent^.mnt_dir) <> 1) and
+    DebugMsg(['FillDefaultFstabMounterItems: found "', mntent^.mnt_dir, '" --> "', mntent^.mnt_fsname, '", fstype "', mntent^.mnt_type, '"']);
+    if (mntent^.mnt_dir <> nil) and (mntent^.mnt_type <> nil) and (strlen(mntent^.mnt_dir) > 0) and (strlen(mntent^.mnt_type) > 0) and
+       (mntent^.mnt_dir <> '/') and (mntent^.mnt_dir <> '/boot') and (Pos('/proc', mntent^.mnt_dir) <> 1) and
        (Pos('/dev', mntent^.mnt_dir) <> 1) and (Pos('/sys', mntent^.mnt_dir) <> 1) and (mntent^.mnt_dir <> 'swap') and
        (mntent^.mnt_type <> 'swap') and (mntent^.mnt_type <> 'rpc_pipefs') and (mntent^.mnt_type <> 'none') and
-       (mntent^.mnt_dir <> 'none') and (mntent^.mnt_dir <> '') then
+       (mntent^.mnt_dir <> 'none') then
     begin
       MounterItem := TMounterItem.Create;
       MounterItem.DisplayText := '';


Index: tuxcmd.spec
===================================================================
RCS file: /cvs/extras/rpms/tuxcmd/devel/tuxcmd.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- tuxcmd.spec	3 Oct 2008 21:59:10 -0000	1.7
+++ tuxcmd.spec	7 Oct 2008 10:10:47 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           tuxcmd
 Version:        0.6.50
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Tux Commander: file manager with 2 panels side by side using GTK2
 
 Group:          Applications/File
@@ -20,6 +20,8 @@
 BuildRequires: gtk2-devel
 BuildRequires: desktop-file-utils
 
+Patch1: tuxcmd-0.6.52-null-mounts.patch
+Patch2: tuxcmd-0.6.52-anon-ftp.patch
 
 %description
 Tux Commander is open-source file manager with 2 panels side by side written
@@ -40,7 +42,7 @@
 The tuxcmd-modules package contains extra VFS (virtual file system) modules
 extending Tux Commander's functionality:
  * libarchive plugin - handles TAR/GZ/BZ2 archives
-
+ * ZIP plugin
 
 
 %package gvfs
@@ -51,7 +53,7 @@
 Requires: gvfs gvfs-smb
 
 %description gvfs
-This package contains GVFS module for Tux Commander file manager.
+This package contains networking GVFS module for Tux Commander file manager.
 
 
 
@@ -59,6 +61,10 @@
 %prep
 %setup -b 1 -q
 
+%patch1 -p1 -b .null-mounts
+cd ../%{name}-modules-%{version}
+%patch2 -p1 -b .anon-ftp
+
 
 %build
 
@@ -120,6 +126,10 @@
 
 
 %changelog
+* Tue Oct  7 2008 Tomas Bzatek <tbzatek at redhat.com> 0.6.50-2
+- Hide '0' and NULL mount points
+- GVFS plugin: supply proper user/pass for anonymous FTP login
+
 * Fri Oct  3 2008 Tomas Bzatek <tbzatek at redhat.com> 0.6.50-1
 - Update to v0.6.50