Backport fix for 618020 (large inode issue) from 4.1.

(rhbz#523504)
- Add dist tag to version.

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: squashfs-tools
-# $Id: Makefile,v 1.1 2005/12/01 20:15:35 katzj Exp $
-NAME := squashfs-tools
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

squashfs-fix-unsquashing-v3.patch

@@ -0,0 +1,12 @@
+diff -Nur squashfs4.0/squashfs-tools/unsquash-3.c squashfs4.0.fix/squashfs-tools/unsquash-3.c
+--- squashfs4.0/squashfs-tools/unsquash-3.c	2009-03-31 00:35:10.000000000 -0400
++++ squashfs4.0.fix/squashfs-tools/unsquash-3.c	2010-05-05 23:09:00.112806775 -0400
+@@ -36,7 +36,7 @@
+ 		sBlk.fragment_table_start);
+ 
+ 	if(sBlk.fragments == 0)
+-		return;
++		return TRUE;
+ 
+ 	if((fragment_table = malloc(sBlk.fragments *
+ 			sizeof(squashfs_fragment_entry_3))) == NULL)

squashfs-large-inode.patch

@@ -0,0 +1,20 @@
+--- squashfs-tools/mksquashfs.c.orig	2009-04-05 16:22:48.000000000 -0500
++++ squashfs-tools/mksquashfs.c	2010-08-14 14:07:28.000000000 -0500
+@@ -938,7 +938,7 @@
+ 			(unsigned short *) (inode_table + inode_bytes), 1);
+ 		inode_bytes += SQUASHFS_COMPRESSED_SIZE(c_byte) + BLOCK_OFFSET;
+ 		total_inode_bytes += SQUASHFS_METADATA_SIZE + BLOCK_OFFSET;
+-		memcpy(data_cache, data_cache + SQUASHFS_METADATA_SIZE,
++		memmove(data_cache, data_cache + SQUASHFS_METADATA_SIZE,
+ 			cache_bytes - SQUASHFS_METADATA_SIZE);
+ 		cache_bytes -= SQUASHFS_METADATA_SIZE;
+ 	}
+@@ -1579,7 +1579,7 @@
+ 		directory_bytes += SQUASHFS_COMPRESSED_SIZE(c_byte) +
+ 			BLOCK_OFFSET;
+ 		total_directory_bytes += SQUASHFS_METADATA_SIZE + BLOCK_OFFSET;
+-		memcpy(directory_data_cache, directory_data_cache +
++		memmove(directory_data_cache, directory_data_cache +
+ 			SQUASHFS_METADATA_SIZE, directory_cache_bytes -
+ 			SQUASHFS_METADATA_SIZE);
+ 		directory_cache_bytes -= SQUASHFS_METADATA_SIZE;

squashfs-tools.spec

@@ -2,12 +2,14 @@ Summary: Utility for the creation of squashfs filesystems
 Name: squashfs-tools
 Version: 4.0
 # cvs snapshot from cvs -d:pserver:anonymous@squashfs.cvs.sourceforge.net:/cvsroot/squashfs co squashfs on 2009-01-25
-Release: 2
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://squashfs.sf.net
 Source0: squashfs-4.0.tar.bz2
 Patch0: squashfs-cflags.patch
+Patch1: squashfs-fix-unsquashing-v3.patch
+Patch2: squashfs-large-inode.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: zlib-devel
 
@@ -18,6 +20,8 @@ contains the utilities for manipulating squashfs filesystems.
 %prep
 %setup -q -n squashfs
 %patch0 -p1 -b .cflags
+%patch1 -p1 -b .fix-unsquashing-v3
+%patch2
 
 %build
 pushd squashfs-tools
@@ -40,6 +44,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/unsquashfs
 
 %changelog
+* Sat Aug 14 2010 Bruno Wolff III <bruno@wolff.to> 4.0-4
+- Backport fix for 619020 (large inode issue) from 4.1
+
+* Wed May 5 2010 Kyle McMartin <kyle@redhat.com> 4.0-3
+- squashfs-fix-unsquashing-v3.patch: pull in fix from cvs. Thanks pkl!
+  (rhbz#523504)
+- Add dist tag to version.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild