From e0903265bd378706a241750f8ace1d6686249624 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Sep 13 2014 16:15:29 +0000 Subject: Fix squashing 2GB+ files This fix came from the squashfs-devel list, authored by Guan Xin --- diff --git a/2gb.patch b/2gb.patch new file mode 100644 index 0000000..33e9108 --- /dev/null +++ b/2gb.patch @@ -0,0 +1,11 @@ +--- squashfs-tools/mksquashfs.c.orig 2014-09-13 11:08:27.352318167 -0500 ++++ squashfs-tools/mksquashfs.c 2014-09-13 11:09:36.701132044 -0500 +@@ -2055,7 +2055,7 @@ + + inline int is_fragment(struct inode_info *inode) + { +- int file_size = inode->buf.st_size; ++ off_t file_size = inode->buf.st_size; + + /* + * If this block is to be compressed differently to the diff --git a/squashfs-tools.spec b/squashfs-tools.spec index 9f3da89..22dfa9a 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -1,7 +1,7 @@ Summary: Utility for the creation of squashfs filesystems Name: squashfs-tools Version: 4.3 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://squashfs.sourceforge.net/ @@ -16,6 +16,9 @@ Patch0: PAE.patch # From master branch (604b607d8ac91eb8afc0b6e3d917d5c073096103). # Prevent overflows when using the -mem option. Patch1: mem-overflow.patch +# From squashfs-devel@lists.sourceforge.net by Guan Xin +# For https://bugzilla.redhat.com/show_bug.cgi?id=1141206 +PAtch2: 2gb.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: zlib-devel BuildRequires: xz-devel @@ -31,6 +34,7 @@ contains the utilities for manipulating squashfs filesystems. %setup -q -n squashfs%{version} %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build pushd squashfs-tools @@ -57,6 +61,9 @@ rm -rf %{buildroot} %{_sbindir}/unsquashfs %changelog +* Sat Sep 13 2014 Bruno Wolff III 4.3-8 +- Fix for files >= 2gb rhbz #1141206 + * Mon Aug 18 2014 Fedora Release Engineering - 4.3-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild