commit fusepod

Hello community, here is the log from the commit of package fusepod checked in at Wed Jul 4 23:17:16 CEST 2007. -------- --- fusepod/fusepod.changes 2006-10-25 02:11:19.000000000 +0200 +++ /mounts/work_src_done/STABLE/fusepod/fusepod.changes 2007-07-04 12:54:30.533723000 +0200 @@ -1,0 +2,6 @@ +Wed Jul 4 12:53:05 CEST 2007 - mszeredi@suse.de + +- update to version 0.5.2 + * Fixed mounting over samba + +------------------------------------------------------------------- Old: ---- fusepod-0.5.1.tar.bz2 fusepod-libgpod.patch New: ---- fusepod-0.5.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fusepod.spec ++++++ --- /var/tmp/diff_new_pack.Q30697/_old 2007-07-04 23:15:25.000000000 +0200 +++ /var/tmp/diff_new_pack.Q30697/_new 2007-07-04 23:15:25.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package fusepod (Version 0.5.1) +# spec file for package fusepod (Version 0.5.2) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -13,12 +13,11 @@ Name: fusepod BuildRequires: fuse-devel gcc-c++ libgpod-devel pkgconfig taglib-devel Summary: FUSEPod is a virtual user-space filesystem that mounts your iPod -Version: 0.5.1 -Release: 11 -License: GNU General Public License (GPL) - all versions, GNU Library General Public License v. 2.0 and 2.1 (LGPL) +Version: 0.5.2 +Release: 1 +License: GPL v2 or later, LGPL v2 or later Group: System/Filesystems Source: %{name}-%{version}.tar.bz2 -Patch: fusepod-libgpod.patch URL: http://sourceforge.net/projects/fusepod/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -36,7 +35,6 @@ %prep %setup -q -%patch %build autoreconf -fi @@ -56,7 +54,10 @@ %{_bindir}/* %{_mandir}/man1/fusepod.1.gz -%changelog -n fusepod +%changelog +* Wed Jul 04 2007 - mszeredi@suse.de +- update to version 0.5.2 + * Fixed mounting over samba * Wed Oct 25 2006 - ro@suse.de - fix build with current libgpod * Sun Oct 01 2006 - cthiel@suse.de ++++++ fusepod-0.5.1.tar.bz2 -> fusepod-0.5.2.tar.bz2 ++++++ ++++ 5155 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fusepod-0.5.1/ChangeLog new/fusepod-0.5.2/ChangeLog --- old/fusepod-0.5.1/ChangeLog 2006-08-07 16:40:04.000000000 +0200 +++ new/fusepod-0.5.2/ChangeLog 2007-07-02 22:16:35.000000000 +0200 @@ -1,3 +1,11 @@ +2007-07-02 + + * src/fusepod.cpp: Fixed st_nlink problem, which intern fixes samba problems. + +2007-02-06 + + * src/fusepod_ipod.cpp: Fix so that it compiles against libgpod 0.4. Thanks to Todd Zullinger + 2006-08-07 * src/fusepod.cpp: Fixed crash in autodetecting. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fusepod-0.5.1/configure.ac new/fusepod-0.5.2/configure.ac --- old/fusepod-0.5.1/configure.ac 2006-08-07 16:42:25.000000000 +0200 +++ new/fusepod-0.5.2/configure.ac 2006-08-08 23:29:40.000000000 +0200 @@ -1,4 +1,4 @@ -AC_INIT([fusepod], [0.5.1], +AC_INIT([fusepod], [0.5.2], [Keegan Carruthers-Smith ]) AM_INIT_AUTOMAKE diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fusepod-0.5.1/README new/fusepod-0.5.2/README --- old/fusepod-0.5.1/README 2006-06-27 23:24:18.000000000 +0200 +++ new/fusepod-0.5.2/README 2007-07-02 22:43:31.000000000 +0200 @@ -28,10 +28,10 @@ Installation ============ -This program has only been tested with Linux 2.6.11 and 2.6.16, but should -work with any kernel version that FUSE supports. You require: +This program has only been tested with Linux 2.6.20, but should work with any +kernel version that FUSE supports. You require: * FUSE 2.5 or higher (http://sourceforge.net/projects/fuse) - * libgpod (www.gtkpod.org) (Tested with 0.3.2) + * libgpod (www.gtkpod.org) (Tested with 0.3.2 and 0.4.2) * TagLib 1.4 or higher (http://developer.kde.org/~wheeler/taglib/) Read the file INSTALL for instruction on installing. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fusepod-0.5.1/src/fusepod.cpp new/fusepod-0.5.2/src/fusepod.cpp --- old/fusepod-0.5.1/src/fusepod.cpp 2006-08-07 16:39:18.000000000 +0200 +++ new/fusepod-0.5.2/src/fusepod.cpp 2007-07-02 22:13:52.000000000 +0200 @@ -149,11 +149,17 @@ } memset (stbuf, 0, sizeof (struct stat)); - stbuf->st_uid = getuid (); - stbuf->st_gid = getgid (); - stbuf->st_mode = tn->value.mode; - stbuf->st_size = tn->value.size; - + stbuf->st_uid = getuid (); + stbuf->st_gid = getgid (); + stbuf->st_mode = tn->value.mode; + stbuf->st_size = 4096; + stbuf->st_nlink = 1; + + if (tn->value.mode == MODE_DIR) + stbuf->st_nlink = tn->value.size + 2; /* +2 for .. and . */ + else + stbuf->st_size = tn->value.size; + return 0; } @@ -776,10 +782,10 @@ if (argc > 1) { /* This finds out were the mount point is so that any app can use it. Note that it may contain ../ and ./ in it */ - fuse_mount_point = argv [1]; + fuse_mount_point = argv [argc-1]; if (fuse_mount_point [0] != '/') { if (!getenv ("PWD")) { - cerr << "ERROR: Please supply the PWD environment var or an absolute mount point" << endl; + cerr << "ERROR: Please supply the PWD environment variable or an absolute mount point" << endl; exit (1); } fuse_mount_point = string (getenv ("PWD")) + "/" + fuse_mount_point; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fusepod-0.5.1/src/fusepod_ipod.cpp new/fusepod-0.5.2/src/fusepod_ipod.cpp --- old/fusepod-0.5.1/src/fusepod_ipod.cpp 2006-08-08 23:28:23.000000000 +0200 +++ new/fusepod-0.5.2/src/fusepod_ipod.cpp 2007-07-02 22:09:55.000000000 +0200 @@ -58,12 +58,22 @@ return 0; Node * n = new Node (nv, this); children.insert (n); + + /* Update nlinks if necessary */ + if (nv.mode == MODE_DIR) + value.size++; + return n; } void Node::remove_from_parent () { if (parent) { parent->children.erase (this); + + /* Update nlinks if necessary */ + if (value.mode == MODE_DIR) + parent->value.size--; + parent = 0; } } @@ -102,15 +112,19 @@ string FUSEPod::discover_ipod () { char * ipod_dir = getenv ("IPOD_DIR"); - if (!ipod_dir) ipod_dir = getenv ("IPOD_MOUNTPOINT"); + if (!ipod_dir) + ipod_dir = getenv ("IPOD_MOUNTPOINT"); if (ipod_dir) return string (ipod_dir); string mounts = "/proc/mounts"; - if (access (mounts.c_str(), R_OK)) + if (access (mounts.c_str(), R_OK) != 0) mounts = "/etc/mtab"; + if (access (mounts.c_str(), R_OK) != 0) + return ""; + vector<string> possible; //Store possible places for fusepod to mount set<string> already_mounted; @@ -136,6 +150,7 @@ if (!fusepod_starts_with (line.c_str(), "Real Mountpoint: ")) continue; + // Gets the path of the mount point already_mounted.insert (string (line, strlen("Real Mountpoint: "))); break; } @@ -417,7 +432,7 @@ stats << "FUSEPod Version: " << PACKAGE_VERSION << endl; stats << "ITunesDB Version: " << this->ipod->version << endl; - stats << "Real Mountpoint: " << this->ipod->mountpoint << endl; + stats << "Real Mountpoint: " << itdb_get_mountpoint(this->ipod) << endl; Playlist * mpl = itdb_playlist_mpl (ipod); stats << "iPod Name: " << (mpl && mpl->name ? string(mpl->name) : "Unknown") << endl; @@ -608,6 +623,7 @@ return; set<string> files_in_itdb; + // Iterate through all the tracks in the iTunesDB. Add these to files_in_itdb for (GList * i=ipod->tracks; i; i=i->next) { Track * track = (Track*) i->data; @@ -638,6 +654,7 @@ struct dirent * dir_ent; + // Now traverse the Music directory looking at each mp3 while (dir_ent = readdir (music)) { if (strcmp(dir_ent->d_name, ".") == 0 || strcmp(dir_ent->d_name, "..") == 0) @@ -650,6 +667,8 @@ struct dirent * subdir_ent; + // These files should be mp3s in the db. If they are not in files_in_itdb, + // the song gets added to the database. while (subdir_ent = readdir (subdir)) { if (strcmp(subdir_ent->d_name, ".") == 0 || strcmp(subdir_ent->d_name, "..") == 0) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fusepod-0.5.1/src/fusepod_ipod.h new/fusepod-0.5.2/src/fusepod_ipod.h --- old/fusepod-0.5.1/src/fusepod_ipod.h 2006-07-03 20:18:53.000000000 +0200 +++ new/fusepod-0.5.2/src/fusepod_ipod.h 2007-07-02 21:59:03.000000000 +0200 @@ -42,7 +42,7 @@ mode_t mode; /** Pointer to libgpod Track item. If 0, Node is not a track */ Track * track; - /** File size in bytes. */ + /** File size in bytes. If directory, number of child directories */ off_t size; }; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fusepod-0.5.1/TODO new/fusepod-0.5.2/TODO --- old/fusepod-0.5.1/TODO 2006-06-30 13:44:32.000000000 +0200 +++ new/fusepod-0.5.2/TODO 2007-07-02 22:46:25.000000000 +0200 @@ -3,6 +3,7 @@ + = DONE + Unicode (utf-8) + * Fix crash when copying unicode files into transfer directory * Better Playlists Support * Creating + Removing @@ -19,6 +20,7 @@ + Option to display information while syncing + Have a stat file for stats on the ipod * Test on FreeBSD + * Port to Mac + Stop crashing when trying to delete a readonly file + If the specified IPOD_DIR has no iTunesDB, create one + Support IPOD_MOUNTPOINT environment variable aswell @@ -31,3 +33,5 @@ * Change tags + Finding mountpoint: If /proc/mounts doesn't exist, try /etc/mtab * Video, photo and cd cover support + * Fix find orphan files + + Work over samba ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org