rpms/squashfs-tools
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Update to 3.3

Browse Source
This commit is contained in:
Jeremy Katz 2007-12-14 15:37:43 +00:00
parent fad2168aef
commit 171345c123
5 changed files with 11 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
squashfs3.2-r2.tar.gz
squashfs3.3.tgz

2
sources
View File

@ -1 +1 @@
bf360b92eba9e6d5610196ce2e02fcd1 squashfs3.2-r2.tar.gz
95c40fca0d886893631b5de14a0af25b squashfs3.3.tgz

4
squashfs-cflags.patch
View File

@ -3,8 +3,8 @@
@@ -1,6 +1,6 @@
INCLUDEDIR = .
-CFLAGS := -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -O2
+CFLAGS := $(RPM_OPT_FLAGS) -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -O2
-CFLAGS := -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -O2
+CFLAGS := $(RPM_OPT_FLAGS) -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -O2
all: mksquashfs unsquashfs

29
squashfs-fragmentsize.patch
View File

@ -1,29 +0,0 @@
diff -Naur old-mksquashfs/mksquashfs.c mksquashfs/mksquashfs.c
--- a/squashfs-tools/mksquashfs.c 2006-08-16 23:48:05.000000000 +0100
+++ b/squashfs-tools/mksquashfs.c 2006-08-16 23:50:18.000000000 +0100
@@ -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 = frag_bytes > SQUASHFS_METADATA_SIZE ? SQUASHFS_METADATA_SIZE : frag_bytes;
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));
@@ -997,6 +997,7 @@
compressed_size = SQUASHFS_COMPRESSED_SIZE(c_byte) + block_offset;
write_bytes(fd, bytes, compressed_size, cbuffer);
bytes += compressed_size;
+ frag_bytes -= avail_bytes;
}
if(!swap)
@@ -1791,7 +1792,7 @@
#define VERSION() \
- printf("mksquashfs version 3.0 (2006/03/15)\n");\
+ printf("mksquashfs version 3.0-patched (2006//08/16)\n");\
printf("copyright (C) 2006 Phillip Lougher <phillip@lougher.org.uk>\n\n"); \
printf("This program is free software; you can redistribute it and/or\n");\
printf("modify it under the terms of the GNU General Public License\n");\

11
squashfs-tools.spec
View File

@ -1,11 +1,11 @@
Summary: Utility for the creation of squashfs filesystems
Name: squashfs-tools
Version: 3.2
Release: 2
Version: 3.3
Release: 1
License: GPLv2+
Group: System Environment/Base
URL: http://squashfs.sf.net
Source0: squashfs3.2-r2.tar.gz
Source0: squashfs3.3.tgz
Patch0: squashfs-cflags.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: zlib-devel
@ -15,7 +15,7 @@ Squashfs is a highly compressed read-only filesystem for Linux. This package
contains the utilities for manipulating squashfs filesystems.
%prep
%setup -q -n squashfs3.2-r2
%setup -q -n squashfs3.3
%patch0 -p1 -b .cflags
%build
@ -41,6 +41,9 @@ rm -rf $RPM_BUILD_ROOT
%{_sbindir}/unsquashfs
%changelog
* Fri Dec 14 2007 Jeremy Katz <katzj@redhat.com> - 3.3-1
- Update to 3.3
* Wed Sep 5 2007 Jeremy Katz <katzj@redhat.com> - 3.2-2
- fixes from package review (#226430)