rpms/squashfs-tools/F-13 squashfs-fix-unsquashing-v3.patch, NONE, 1.1 squashfs-tools.spec, 1.25, 1.26

[Kyle McMartin]

Author: kyle

Update of /cvs/pkgs/rpms/squashfs-tools/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv15714

Modified Files:
	squashfs-tools.spec 
Added Files:
	squashfs-fix-unsquashing-v3.patch 
Log Message:
* Wed May 5 2010 Kyle McMartin <kyle at redhat.com> 4.0-4
- squashfs-fix-unsquashing-v3.patch: pull in fix from cvs. Thanks pkl!
  (rhbz#523504)


squashfs-fix-unsquashing-v3.patch:
 unsquash-3.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE squashfs-fix-unsquashing-v3.patch ---
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)


Index: squashfs-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squashfs-tools/F-13/squashfs-tools.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- squashfs-tools.spec	18 Feb 2010 19:00:55 -0000	1.25
+++ squashfs-tools.spec	6 May 2010 03:19:38 -0000	1.26
@@ -2,12 +2,13 @@ Summary: Utility for the creation of squ
 Name: squashfs-tools
 Version: 4.0
 # cvs snapshot from cvs -d:pserver:anonymous at squashfs.cvs.sourceforge.net:/cvsroot/squashfs co squashfs on 2009-01-25
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://squashfs.sf.net
 Source0: http://cdnetworks-us-2.dl.sourceforge.net/project/squashfs/squashfs/squashfs%{version}/squashfs%{version}.tar.gz
 Patch0: squashfs-cflags.patch
+Patch1: squashfs-fix-unsquashing-v3.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: zlib-devel
 
@@ -18,6 +19,7 @@ contains the utilities for manipulating 
 %prep
 %setup -q -n squashfs%{version}
 %patch0 -p1 -b .cflags
+%patch1 -p1 -b .fix-unsquashing-v3
 
 %build
 pushd squashfs-tools
@@ -40,6 +42,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/unsquashfs
 
 %changelog
+* Wed May 5 2010 Kyle McMartin <kyle at redhat.com> 4.0-4
+- squashfs-fix-unsquashing-v3.patch: pull in fix from cvs. Thanks pkl!
+  (rhbz#523504)
+
 * Thu Feb 18 2010 Kyle McMartin <kyle at redhat.com> 4.0-3
 - Update to release tarball as opposed to cvs snapshot.
 - Add dist tag.