rpms/fusecompress_offline1/devel README.fedora, NONE, 1.1 fusecompress-1.99.19-gcc44.patch, NONE, 1.1 fusecompress-1.99.19-types.patch, NONE, 1.1 fusecompress-offline-decompress.patch, NONE, 1.1 fusecompress_offline1.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Sun Sep 27 16:10:27 UTC 2009

Author: toshio

Update of /cvs/pkgs/rpms/fusecompress_offline1/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30896/devel

Modified Files:
	.cvsignore sources 
Added Files:
	README.fedora fusecompress-1.99.19-gcc44.patch 
	fusecompress-1.99.19-types.patch 
	fusecompress-offline-decompress.patch 
	fusecompress_offline1.spec import.log 
Log Message:
Initial import

--- NEW FILE README.fedora ---
This package exists to allow people to upgrade from the fusecompress-1.x
on-disk format to fusecompress-2.x.

Let's say that in Fedora 11 your old fusecompress rootDir (where the files are
actually stored) is in ~/.fusestorage and you mount it on ~/storage. Now you've
updated to Fedora 12 and need to get your fusecompress filesystems updated to
the new on-disk format.  Here's the basic steps::

    # Make sure the old fusecompress filesystem is unmounted
    fusermount -u ~/storage
    # Move it to a new location
    mv ~/.fusestorage ~/.fusestorage.old
    # Create a new directory for our new format data
    mkdir ~/.fusestorage
    # Mount the new directory.  It's now a new format fusecompress filesystem
    fusecompress ~/.fusestorage ~/storage
    # Decompress all the files in the old fusecompress data directory
    fusecompress_offline1 ~/.fusestorage.old
    # Move the files into the new format storage
    mv .fusestorage.old/* ~/storage
    # If you have any hidden files, remember to move them too
    mv .fusestorage.old/.?* ~/storage

Note that to use this exact procedure you need to have enough disk space to
uncompress all of the files stored in ~/.fusestorage.old.  If you don't have
that much space, you'll have to run fusecompress_offline1 on portions of
~/.fusestorage.old and move them to ~/storage where they'll be recompressed,
freeing up the space for you to run fusecompress_offline1 on more files.

fusecompress-1.99.19-gcc44.patch:
 main.cpp         |    1 +
 main_offline.cpp |    1 +
 2 files changed, 2 insertions(+)

--- NEW FILE fusecompress-1.99.19-gcc44.patch ---
The STL headers in gcc-4.4 have been cleaned up, so that the headers don't drag in
unnecessary dependencies which aren't requested by the standard.
This fixes build for gcc-4.4

Lubomir Rintel <lkundrak at v3.sk>

diff -urp fusecompress-1.99.19.orig/src/main.cpp fusecompress-1.99.19/src/main.cpp
--- fusecompress-1.99.19.orig/src/main.cpp	2008-08-11 14:25:10.000000000 +0200
+++ fusecompress-1.99.19/src/main.cpp	2009-02-03 19:48:16.000000000 +0100
@@ -11,6 +11,7 @@
 #include "CompressedTable.hpp"
 #include "CompressedMagic.hpp"
 
+#include <cstdio>
 #include <cstdlib>
 #include <cstring>
 #include <iostream>
diff -urp fusecompress-1.99.19.orig/src/main_offline.cpp fusecompress-1.99.19/src/main_offline.cpp
--- fusecompress-1.99.19.orig/src/main_offline.cpp	2008-07-14 14:32:58.000000000 +0200
+++ fusecompress-1.99.19/src/main_offline.cpp	2009-02-03 19:58:39.000000000 +0100
@@ -16,6 +16,7 @@
 #include "Compress.hpp"
 #include "TransformTable.hpp"
 
+#include <cstdio>
 #include <iostream>
 #include <vector>
 #include <sstream>

fusecompress-1.99.19-types.patch:
 Memory.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE fusecompress-1.99.19-types.patch ---
For some reason this is required on i386, but not on x86_64.

Lubomir Rintel <lkundrak at v3.sk>

diff -up fusecompress-1.99.19/src/Memory.cpp.types fusecompress-1.99.19/src/Memory.cpp
--- fusecompress-1.99.19/src/Memory.cpp.types	2008-09-28 10:37:28.000000000 +0200
+++ fusecompress-1.99.19/src/Memory.cpp	2008-09-28 10:37:35.000000000 +0200
@@ -181,11 +181,11 @@ ssize_t Memory::read(char *buf, size_t s
 		{
 			// m_FileSize, offset, size, block_offset
 			//
-			cs = min(block_offset - offset, len);
+			cs = min((ssize_t) (block_offset - offset), len);
 			cs = Parent::read(buf, cs, offset);
 			if (cs == 0)
 			{
-				cs = min(block_offset - offset, len);
+				cs = min((ssize_t) (block_offset - offset), len);
 				memset(buf, 0, cs);
 			}
 		}

fusecompress-offline-decompress.patch:
 main_offline.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE fusecompress-offline-decompress.patch ---
diff -up fusecompress-1.99.19/src/main_offline.cpp.mine fusecompress-1.99.19/src/main_offline.cpp
--- fusecompress-1.99.19/src/main_offline.cpp.mine	2009-09-25 05:50:49.271880984 -0700
+++ fusecompress-1.99.19/src/main_offline.cpp	2009-09-25 05:52:20.348642922 -0700
@@ -226,7 +226,7 @@ inline bool test(const char *input)
 	{
 		// File is compressed with FuseCompress.
 		//
-		if (fh.type == g_TransformTable->getDefaultIndex())
+		if (fh.type == g_TransformTable->getDefaultIndex() && !g_RawOutput)
 		{
 			// File is compressed with the same compression
 			// method.


--- NEW FILE fusecompress_offline1.spec ---
Name:           fusecompress_offline1
Version:        1.99.19
Release:        6%{?dist}
Summary:        Utility to help migrate off of fusecompress-1.x

Group:          System Environment/Libraries
License:        GPLv2
URL:            http://miio.net/fusecompress/
Source0:        http://miio.net/files/fusecompress-%{version}.tar.gz
Source1:        README.fedora
Patch0:         fusecompress-1.99.19-types.patch
Patch1:         fusecompress-1.99.19-gcc44.patch
Patch2:         fusecompress-offline-decompress.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  rlog-devel fuse-devel zlib-devel bzip2-devel file-devel
BuildRequires:  autoconf
Requires:       fuse


%description
FuseCompress provides a mountable Linux filesystem which transparently
compresses its content.  Files stored in this filesystem are compressed
on the fly and Fuse allows to create a transparent interface between
compressed files and user applications.

This package provides fusecompress_offline1, a utility which enables users
of fusecompress-1.x filesystems to decompress their files.  This is a
necessary step in preparing their files for use with fusecompress-2.x
filesystems.  Instructions for performing an upgrade are in README.fedora or
the Fedora 12 release notes.

%prep
%setup -q -n fusecompress-%{version}
%patch0 -p1 -b .types
%patch1 -p1 -b .gcc44
%patch2 -p1 -b .offline
cp %{SOURCE1} .
chmod a-x ChangeLog

find src -type f -exec chmod 0644 \{\} \;

%build
autoconf
autoheader
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

mv $RPM_BUILD_ROOT%{_bindir}/fusecompress_offline $RPM_BUILD_ROOT%{_bindir}/fusecompress_offline1
mv $RPM_BUILD_ROOT%{_mandir}/man1/fusecompress_offline.1 $RPM_BUILD_ROOT%{_mandir}/man1/fusecompress_offline1.1

# This package is just for upgrading to fusecompress2.  So we don't want the
# binaries that enable mounting the old format
rm -f $RPM_BUILD_ROOT%{_bindir}/fusecompress
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/fusecompress.1*


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_bindir}/fusecompress_offline1
%{_mandir}/man1/fusecompress_offline1.1*
%doc ChangeLog README AUTHORS COPYING NEWS README.fedora


%changelog
* Fri Sep 25 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.99.19-6
- Remove executable bit from source files
- Rename package to fusecompress_offline1 to more closely match what's actually
  in it.

* Fri Sep 25 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.99.19-5
- Fix build as a package just to enable migration from old on-disk format.
- Patch to fix offline decompression when the old compression format was lzo.

* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.99.19-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

* Tue Feb 03 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.99.19-3
- Fix build with gcc44

* Sun Sep 28 2008 Lubomir Rintel <lkundrak at v3.sk> - 1.99.19-2
- Fix build
- Drop silly mount wrapper

* Sat Sep 27 2008 Luke Macken <lmacken at redhat.com> - 1.99.19-1
- Update to 1.99.19
- Remove fusecompress-1.99.17-attr.patch and fusecompress-1.99.17-gcc43.patch,
  as they are now upstream in this release.

* Sun Aug 10 2008 Lubomir Rintel <lkundrak at v3.sk> - 1.99.18-1
- New upstream release, bugfix

* Wed Jul 16 2008 Lubomir Rintel <lkundrak at v3.sk> - 1.99.17-2
- Fix build:
- Upstream added manual
- Upstream looks for xattr.h in a little non-standard place
- GCC 4.3 fix

* Wed Jul 16 2008 Lubomir Rintel <lkundrak at v3.sk> - 1.99.17-1
- Upstream integrated our fix

* Sun Jul 13 2008 Lubomir Rintel <lkundrak at v3.sk> 1.99.16-1
- New upstream release
- Fedora patches integrated upstream
- Rebuild against newer librlog

* Mon Apr 07 2008 Lubomir Kundrak <lkundrak at redhat.com> 1.99.14-3
- Fix build with gcc43

* Mon Apr 07 2008 Lubomir Kundrak <lkundrak at redhat.com> 1.99.14-2
- move mount helper to doc

* Mon Mar 10 2008 Lubomir Kundrak <lkundrak at redhat.com> 1.99.14-1
- mount helper
- new upstream

* Fri Nov 02 2007 Lubomir Kundrak <lkundrak at redhat.com> 1.99.13-1
- Initial package


--- NEW FILE import.log ---
fusecompress_offline1-1_99_19-6_fc11:HEAD:fusecompress_offline1-1.99.19-6.fc11.src.rpm:1254067501


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fusecompress_offline1/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	27 Sep 2009 16:03:58 -0000	1.1
+++ .cvsignore	27 Sep 2009 16:10:26 -0000	1.2
@@ -0,0 +1 @@
+fusecompress-1.99.19.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fusecompress_offline1/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	27 Sep 2009 16:03:58 -0000	1.1
+++ sources	27 Sep 2009 16:10:26 -0000	1.2
@@ -0,0 +1 @@
+2d1e10397f888ac46697070790a06ddc  fusecompress-1.99.19.tar.gz


