- add upstream patch for fragment size problem (#202663)

This commit is contained in:
Jeremy Katz 2006-08-16 14:59:13 +00:00
parent ad560d0881
commit 1e4afd7c93
2 changed files with 18 additions and 1 deletions

View File

@ -0,0 +1,11 @@
--- squashfs3.0/squashfs-tools/mksquashfs.c.fragment 2006-08-16 10:56:00.000000000 -0400
+++ squashfs3.0/squashfs-tools/mksquashfs.c 2006-08-16 10:56:46.000000000 -0400
@@ -985,7 +985,7 @@
}
for(i = 0; i < meta_blocks; i++) {
- int avail_bytes = i == meta_blocks - 1 ? frag_bytes % SQUASHFS_METADATA_SIZE : SQUASHFS_METADATA_SIZE;
+ int avail_bytes = i == meta_blocks - 1 ? frag_bytes - i % SQUASHFS_METADATA_SIZE : SQUASHFS_METADATA_SIZE;
c_byte = mangle(cbuffer + block_offset, buffer + i * SQUASHFS_METADATA_SIZE , avail_bytes, SQUASHFS_METADATA_SIZE, noF, 0);
if(!swap)
memcpy(cbuffer, &c_byte, sizeof(unsigned short));

View File

@ -1,12 +1,14 @@
Summary: squashfs utilities
Name: squashfs-tools
Version: 3.0
Release: 1.1
Release: 2
License: GPL
Group: System Environment/Base
URL: http://squashfs.sf.net
Source0: squashfs3.0.tar.gz
Patch0: squashfs-cflags.patch
#http://sourceforge.net/mailarchive/forum.php?thread_id=11544292&forum_id=39601
Patch1: squahsfs-fragmentsize.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: zlib-devel
@ -17,6 +19,7 @@ contains the utilities for manipulating squashfs filesystems.
%prep
%setup -q -n squashfs3.0
%patch0 -p1 -b .cflags
%patch1 -p1 -b .fragment
%build
pushd squashfs-tools
@ -39,6 +42,9 @@ rm -rf $RPM_BUILD_ROOT
/usr/sbin/unsquashfs
%changelog
* Wed Aug 16 2006 Jeremy Katz <katzj@redhat.com> - 3.0-2
- add upstream patch for fragment size problem (#202663)
* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 3.0-1.1
- rebuild