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

Move to 4.1 prerelease version.

Browse Source
This commit is contained in:
Bruno Wolff III 2010-06-11 16:43:35 +00:00
parent 42f88525b2
commit cf2602f158
5 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
squashfs4.0.tar.gz squashfs-4.1.tar.bz2

2
sources
View File

@ -1 +1 @@
a3c23391da4ebab0ac4a75021ddabf96 squashfs4.0.tar.gz 4be16f0856a8b933ca757ebc91180d86 squashfs-4.1.tar.bz2

12
squashfs-fix-unsquashing-v3.patch
View File

@ -1,12 +0,0 @@
diff -Nur squashfs4.0/squashfs-tools/unsquash-3.c squashfs4.0.fix/squashfs-tools/unsquash-3.c
--- squashfs4.0/squashfs-tools/unsquash-3.c 2009-03-31 00:35:10.000000000 -0400
+++ squashfs4.0.fix/squashfs-tools/unsquash-3.c 2010-05-05 23:09:00.112806775 -0400
@@ -36,7 +36,7 @@
sBlk.fragment_table_start);
if(sBlk.fragments == 0)
- return;
+ return TRUE;
if((fragment_table = malloc(sBlk.fragments *
sizeof(squashfs_fragment_entry_3))) == NULL)

24
squashfs-tools.spec
View File

@ -1,25 +1,27 @@
Summary: Utility for the creation of squashfs filesystems Summary: Utility for the creation of squashfs filesystems
Name: squashfs-tools Name: squashfs-tools
Version: 4.0 Version: 4.1
# cvs snapshot from cvs -d:pserver:anonymous@squashfs.cvs.sourceforge.net:/cvsroot/squashfs co squashfs on 2009-01-25 Release: 0.1.20100607%{?dist}
Release: 4%{?dist}
License: GPLv2+ License: GPLv2+
Group: System Environment/Base Group: System Environment/Base
URL: http://squashfs.sf.net URL: http://squashfs.sf.net
Source0: http://cdnetworks-us-2.dl.sourceforge.net/project/squashfs/squashfs/squashfs%{version}/squashfs%{version}.tar.gz # cvs -d:pserver:anonymous@squashfs.cvs.sourceforge.net:/cvsroot/squashfs export -D 2010-06-07 squashfs
Source0: squashfs-4.1.tar.bz2
Patch0: squashfs-cflags.patch Patch0: squashfs-cflags.patch
Patch1: squashfs-fix-unsquashing-v3.patch Patch1: squashfs-xz.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: zlib-devel BuildRequires: zlib-devel
BuildRequires: xz-devel
BuildRequires: libattr-devel
%description %description
Squashfs is a highly compressed read-only filesystem for Linux. This package Squashfs is a highly compressed read-only filesystem for Linux. This package
contains the utilities for manipulating squashfs filesystems. contains the utilities for manipulating squashfs filesystems.
%prep %prep
%setup -q -n squashfs%{version} %setup -q -n squashfs
%patch0 -p1 -b .cflags %patch0 -p0
%patch1 -p1 -b .fix-unsquashing-v3 %patch1 -p0
%build %build
pushd squashfs-tools pushd squashfs-tools
@ -37,11 +39,15 @@ rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc README %doc README
%doc README-4.0
/sbin/mksquashfs /sbin/mksquashfs
%{_sbindir}/unsquashfs %{_sbindir}/unsquashfs
%changelog %changelog
* Wed Jun 08 2010 Bruno Wolff III <bruno@wolff.to> - 4.1-0.1.20100607
- Rebase to 4.1 prerelease with xz wrapper
- Provides lzma compression as an option.
- squashfs-fix-unsquashing-v3.patch is part of the 4.1 prerelease
* Wed May 5 2010 Kyle McMartin <kyle@redhat.com> 4.0-4 * Wed May 5 2010 Kyle McMartin <kyle@redhat.com> 4.0-4
- squashfs-fix-unsquashing-v3.patch: pull in fix from cvs. Thanks pkl! - squashfs-fix-unsquashing-v3.patch: pull in fix from cvs. Thanks pkl!
(rhbz#523504) (rhbz#523504)

11
squashfs-xz.patch Normal file
View File

@ -0,0 +1,11 @@
--- squashfs-tools/Makefile.orig 2010-02-13 14:05:21.000000000 -0600
+++ squashfs-tools/Makefile 2010-02-13 14:05:29.000000000 -0600
@@ -11,7 +11,7 @@
# work) - download and unpack it, uncomment and set LZMA_DIR to unpacked source,
# and uncomment the LZMA_SUPPORT line below.
-#XZ_SUPPORT = 1
+XZ_SUPPORT = 1
#LZMA_SUPPORT = 1
#LZMA_DIR = ../../../LZMA/lzma465