diff --git a/SOURCES/squashfs-tools-file_size-fix.patch b/SOURCES/squashfs-tools-file_size-fix.patch new file mode 100644 index 0000000..650333d --- /dev/null +++ b/SOURCES/squashfs-tools-file_size-fix.patch @@ -0,0 +1,13 @@ +Index: squashfs4.3/squashfs-tools/mksquashfs.c +=================================================================== +--- squashfs4.3.orig/squashfs-tools/mksquashfs.c ++++ squashfs4.3/squashfs-tools/mksquashfs.c +@@ -1946,7 +1946,7 @@ struct file_info *duplicate(long long fi + + 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/SPECS/squashfs-tools.spec b/SPECS/squashfs-tools.spec index 95bec47..0864def 100644 --- a/SPECS/squashfs-tools.spec +++ b/SPECS/squashfs-tools.spec @@ -1,7 +1,7 @@ Summary: Utility for the creation of squashfs filesystems Name: squashfs-tools Version: 4.3 -Release: 0.20.gitaae0aff4%{?dist} +Release: 0.21.gitaae0aff4%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://squashfs.sourceforge.net/ @@ -9,10 +9,12 @@ URL: http://squashfs.sourceforge.net/ # git clone git://git.kernel.org/pub/scm/fs/squashfs/squashfs-tools.git # cd squashfs-tools # git archive --format=tar --prefix=squashfs4.3/ aae0aff4f0b3081bd1dfc058c867033a89c11aac | gzip > squashfs4.3.tar.gz -Source0: http://downloads.sourceforge.net/squashfs/squashfs%{version}.tar.gz +Source0: squashfs%{version}.tar.gz +#Source0: http://downloads.sourceforge.net/squashfs/squashfs%{version}.tar.gz # manpages from http://ftp.debian.org/debian/pool/main/s/squashfs-tools/squashfs-tools_4.2+20121212-1.debian.tar.xz Source1: mksquashfs.1 Source2: unsquashfs.1 +Patch1: squashfs-tools-file_size-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: zlib-devel BuildRequires: xz-devel @@ -25,6 +27,7 @@ contains the utilities for manipulating squashfs filesystems. %prep %setup -q -n squashfs%{version} +%patch1 -p1 -b .file_size %build pushd squashfs-tools @@ -51,6 +54,9 @@ rm -rf %{buildroot} %{_sbindir}/unsquashfs %changelog +* Wed Oct 08 2014 Jarod Wilson - 4.3-0.21.gitaae0aff4 +- Fix corruption of last block of squashed images (rhbz 1052175) + * Fri Jan 24 2014 Daniel Mach - 4.3-0.20.gitaae0aff4 - Mass rebuild 2014-01-24