OBS User unknown 2007-01-23 16:08:53 +00:00 committed by Git OBS Bridge
parent 0d17ded3fa
commit 16f3f3dffe
5 changed files with 75 additions and 14 deletions

View File

@ -1,6 +1,6 @@
--- squashfs-tools/mksquashfs.c 2006/08/21 15:03:26 1.1
+++ squashfs-tools/mksquashfs.c 2006/08/21 15:03:41
@@ -1643,6 +1643,7 @@
--- squashfs-tools/mksquashfs.c 2007-01-16 02:33:13.000000000 +0100
+++ squashfs-tools/mksquashfs.c 2007-01-23 17:01:41.761826000 +0100
@@ -1682,6 +1682,7 @@
for(entry = priority_list[i]; entry; entry = entry->next)
reader_read_file(entry->dir);
}
@ -8,3 +8,20 @@
}
@@ -1830,7 +1831,7 @@
int spaces = columns - used - hashes;
if(!progress || columns - used < 0)
- return;
+ return 0;
printf("\r[");
@@ -1843,6 +1844,7 @@
printf("] %*lld/%*lld", max_digits, current, max_digits, max);
printf(" %3lld%%", current * 100 / max);
fflush(stdout);
+ return 0;
}

View File

@ -1,3 +1,27 @@
-------------------------------------------------------------------
Tue Jan 23 15:45:15 CET 2007 - ro@suse.de
- update to 3.2r2
- Kernel patches 2.6.19/2.6.20 have been updated to use
const structures and mutexes rather than older semaphores.
- Minor SMP bug fixes.
- Progress bar broken on x86-64. Fixed.
- update to 3.2
- Improvements:
- Squashfs filesystems can now be exported via NFS.
- Unsquashfs now supports 2.x filesystems.
- Mksquashfs now displays a progress bar.
- Squashfs kernel code has been hardened against accidently or
maliciously corrupted Squashfs filesystems.
- Bug fixes:
- Race condition occurring on S390 in readpage() fixed.
- Odd behaviour of MIPS memcpy in read_data() routine worked-around.
- Missing cache_flush in Squashfs symlink_readpage() added.
- update to 3.1r2
- A code optimisation after testing unfortunately
broke sorting in Mksquashfs. This has been fixed.
-------------------------------------------------------------------
Mon Aug 21 16:54:16 CEST 2006 - ro@suse.de

View File

@ -1,7 +1,7 @@
#
# spec file for package squashfs (Version 3.1)
# spec file for package squashfs (Version 3.2)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@ -13,11 +13,11 @@
# Commandline:
Name: squashfs
BuildRequires: kernel-source kernel-syms
License: GPL
License: GNU General Public License (GPL)
Group: System/Filesystems
Version: 3.1
Version: 3.2
Release: 1
Source0: %{name}%{version}.tar.gz
Source0: %{name}%{version}-r2.tar.gz
Patch: squashfs-retval.patch
URL: http://squashfs.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -49,10 +49,10 @@ Authors:
Phillip Lougher
%prep
%setup -n %{name}%{version}
%setup -n %{name}%{version}-r2
%patch
# turn patch into plain sources :-/
patch -f -p2 < linux-2.6.18/squashfs3.1-patch || true
patch -f -p2 < kernel-patches/linux-2.6.20/squashfs3.2-patch || true
mv linux squashfs/.
echo '#define CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE 3' >> squashfs/squashfs.h
@ -86,10 +86,30 @@ done
%files
%defattr(-,root,root)
%doc README CHANGES README-3.1 PERFORMANCE.README
%doc README CHANGES README-3.2 PERFORMANCE.README
/usr/bin/*squashfs
%changelog -n squashfs
* Tue Jan 23 2007 - ro@suse.de
- update to 3.2r2
- Kernel patches 2.6.19/2.6.20 have been updated to use
const structures and mutexes rather than older semaphores.
- Minor SMP bug fixes.
- Progress bar broken on x86-64. Fixed.
- update to 3.2
- Improvements:
- Squashfs filesystems can now be exported via NFS.
- Unsquashfs now supports 2.x filesystems.
- Mksquashfs now displays a progress bar.
- Squashfs kernel code has been hardened against accidently or
maliciously corrupted Squashfs filesystems.
- Bug fixes:
- Race condition occurring on S390 in readpage() fixed.
- Odd behaviour of MIPS memcpy in read_data() routine worked-around.
- Missing cache_flush in Squashfs symlink_readpage() added.
- update to 3.1r2
- A code optimisation after testing unfortunately
broke sorting in Mksquashfs. This has been fixed.
* Mon Aug 21 2006 - ro@suse.de
- update to version 3.1 to fix build on 2.6.18
* Thu May 11 2006 - duwe@suse.de

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8233a6f98b63de38500f9d3403d0a4c5b50277c695e29da765043cc3638f6f96
size 477979

3
squashfs3.2-r2.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8482465d58d78099c608b32fc034921f7c8c3cf7934b5edc68c463cd450b40a7
size 314764