From 171345c12383947e7d4243b74e3ab803934dccba Mon Sep 17 00:00:00 2001
From: Jeremy Katz <katzj@fedoraproject.org>
Date: Dec 14 2007 15:37:43 +0000
Subject: - Update to 3.3


---

diff --git a/.cvsignore b/.cvsignore
index 021abb9..64e222a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-squashfs3.2-r2.tar.gz
+squashfs3.3.tgz
diff --git a/sources b/sources
index a2d65f8..0719da9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bf360b92eba9e6d5610196ce2e02fcd1  squashfs3.2-r2.tar.gz
+95c40fca0d886893631b5de14a0af25b  squashfs3.3.tgz
diff --git a/squashfs-cflags.patch b/squashfs-cflags.patch
index 6ae4d02..c5d197d 100644
--- a/squashfs-cflags.patch
+++ b/squashfs-cflags.patch
@@ -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
  
diff --git a/squashfs-fragmentsize.patch b/squashfs-fragmentsize.patch
deleted file mode 100644
index d20d909..0000000
--- a/squashfs-fragmentsize.patch
+++ /dev/null
@@ -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");\
diff --git a/squashfs-tools.spec b/squashfs-tools.spec
index 9e128f5..bca4af0 100644
--- a/squashfs-tools.spec
+++ b/squashfs-tools.spec
@@ -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)