From e59d8926b68b3d2c8b1341de8845e2d40bb0e75f Mon Sep 17 00:00:00 2001
From: Bruno Wolff III <bruno@wolff.to>
Date: Mar 02 2011 04:25:52 +0000
Subject: Update to 4.2 release.


---

diff --git a/.gitignore b/.gitignore
index 2affc6d..5270323 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ squashfs-4.1.tar.bz2
 /squashfs-4.2-2010-12-23.bz2
 /squashfs-4.2-20101223.bz2
 /squashfs-4.2-20101231.bz2
+/squashfs4.2.tar.gz
diff --git a/sources b/sources
index 999a8ae..df751a2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3f5e167796a3b2dbf1a4457d27c72e3c  squashfs-4.2-20101231.bz2
+1b7a781fb4cf8938842279bd3e8ee852  squashfs4.2.tar.gz
diff --git a/squashfs-bigendian.patch b/squashfs-bigendian.patch
deleted file mode 100644
index 952f523..0000000
--- a/squashfs-bigendian.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up squashfs-tools/xz_wrapper.c.bigendian squashfs-tools/xz_wrapper.c
---- squashfs-tools/xz_wrapper.c.bigendian	2011-01-11 14:16:43.000000000 +0100
-+++ squashfs-tools/xz_wrapper.c	2011-01-11 14:16:48.000000000 +0100
-@@ -214,7 +214,7 @@ static int xz_extract_options(int block_
- 		dictionary_size = block_size;
- 		flags = 0;
- 	} else {
--		SQUASHFS_INSWAP_COMP_OPTS(&comp_opts);
-+		SQUASHFS_INSWAP_COMP_OPTS(comp_opts);
- 
- 		dictionary_size = comp_opts->dictionary_size;
- 		flags = comp_opts->flags;
diff --git a/squashfs-cflags.patch b/squashfs-cflags.patch
deleted file mode 100644
index 439ab0b..0000000
--- a/squashfs-cflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- squashfs-tools/Makefile.orig	2010-12-31 15:36:47.000000000 -0600
-+++ squashfs-tools/Makefile	2011-01-01 10:58:33.000000000 -0600
-@@ -100,8 +100,8 @@
- UNSQUASHFS_OBJS = unsquashfs.o unsquash-1.o unsquash-2.o unsquash-3.o \
- 	unsquash-4.o swap.o compressor.o
- 
--CFLAGS = $(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
--	-D_GNU_SOURCE -DCOMP_DEFAULT=\"$(COMP_DEFAULT)\"  -O2 -Wall
-+CFLAGS = $(RPM_OPT_FLAGS) $(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
-+	-D_GNU_SOURCE -DCOMP_DEFAULT=\"$(COMP_DEFAULT)\"
- 
- LIBS = -lpthread -lm
- ifdef GZIP_SUPPORT
diff --git a/squashfs-tools.spec b/squashfs-tools.spec
index 2b81f4d..8f3dceb 100644
--- a/squashfs-tools.spec
+++ b/squashfs-tools.spec
@@ -1,18 +1,12 @@
 Summary: Utility for the creation of squashfs filesystems
 Name: squashfs-tools
 Version: 4.2
-%global cvsdate 20101231
-Release: 0.4.%{cvsdate}%{?dist}
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
-URL: http://squashfs.sf.net
-# cvs -z3 -d:pserver:anonymous@squashfs.cvs.sourceforge.net:/cvsroot/squashfs export -D "%{cvsdate} 2359 UTC" -d squashfs-%{version}-%{cvsdate} squashfs
-# tar cfj squashfs-%{version}-%{cvsdate}.bz2 squashfs-%{version}-%{cvsdate}
-Source0: squashfs-%{version}-%{cvsdate}.bz2
-Patch0: squashfs-cflags.patch
+URL: http://squashfs.sourceforge.net/
+Source0: http://downloads.sourceforge.net/squashfs/squashfs%{version}.tar.gz
 Patch1: squashfs-compressors.patch
-# https://sourceforge.net/tracker/?func=detail&aid=3155564&group_id=63835&atid=505343
-Patch2: squashfs-bigendian.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: zlib-devel
 BuildRequires: xz-devel
@@ -24,32 +18,38 @@ Squashfs is a highly compressed read-only filesystem for Linux.  This package
 contains the utilities for manipulating squashfs filesystems.
 
 %prep
-%setup -q -n squashfs-%{version}-%{cvsdate}
+%setup -q
 %patch0 -p0
 %patch1 -p0
-%patch2 -p0
 
 %build
 pushd squashfs-tools
-make RPM_OPT_FLAGS="%{optflags}"
+make CFLAGS="%{optflags}"
 
 %install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/sbin $RPM_BUILD_ROOT/usr/sbin
-install -m 755 squashfs-tools/mksquashfs $RPM_BUILD_ROOT/sbin/mksquashfs
-install -m 755 squashfs-tools/unsquashfs $RPM_BUILD_ROOT%{_sbindir}/unsquashfs
+mkdir -p %{buildroot}/sbin %{buildroot}/usr/sbin
+install -m 755 squashfs-tools/mksquashfs %{buildroot}/sbin/mksquashfs
+install -m 755 squashfs-tools/unsquashfs %{buildroot}%{_sbindir}/unsquashfs
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc README
+%doc README ACKNOWLEDGEMENTS DONATIONS PERFORMANCE.README README-4.2 CHANGES pseudo-file.example COPYING
 
 /sbin/mksquashfs
 %{_sbindir}/unsquashfs
 
 %changelog
+* Tue Mar 01 2011 Bruno Wolff III <bruno@wolff.to> - 4.2-1
+- 4.2 is released.
+- Bugfix for bad data causing crash.
+- Include doc files added for release.
+- Big endian patch is now upstream.
+- Buildroot tag isn't needed any more.
+- We can now specify CFLAGS on the make call.
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2-0.4.20101231
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild