SPECS (LINUX_2_6): kernel.spec - squashfs and imq patches updated; ...

[zbyniu]

Author: zbyniu                       Date: Tue Feb 26 02:40:56 2008 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- squashfs and imq patches updated; cleanups; rel 0.5

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1844 -> 1.441.2.1845) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1844 SPECS/kernel.spec:1.441.2.1845
--- SPECS/kernel.spec:1.441.2.1844	Tue Feb 26 03:01:28 2008
+++ SPECS/kernel.spec	Tue Feb 26 03:40:50 2008
@@ -102,12 +102,12 @@
 %define		_prepatch		%{nil}
 %define		_pre_rc			%{nil}
 %define		_rc			%{nil}
-%define		_rel			0.4
+%define		_rel			0.5
 %define		subname			%{?with_pax:-pax}%{?with_grsec_full:-grsecurity}%{?with_xen0:-xen0}%{?with_xenU:-xenU}
 
 %define		_enable_debug_packages			0
 
-%define		squashfs_version	3.2
+%define		squashfs_version	3.3
 %define		tuxonice_version	3.0-rc1
 %define		netfilter_snap		20070806
 %define		xen_version		3.0.2
@@ -196,8 +196,9 @@
 # http://dev.gentoo.org/~spock/projects/vesafb-tng/archive/vesafb-tng-1.0-rc2-2.6.20-rc2.patch
 Patch5:		vesafb-tng-1.0-rc2-2.6.20-rc2.patch
 
-# Squashfs from squashfs: http://mesh.dl.sourceforge.net/sourceforge/squashfs/squashfs3.2-r2.tar.gz for linux-2.6.20
-Patch6:		squashfs%{squashfs_version}-patch
+# http://mesh.dl.sourceforge.net/sourceforge/squashfs/squashfs3.3.tgz
+# squashfs3.3/kernel-patches/linux-2.6.24/squashfs3.3-patch
+Patch6:		kernel-squashfs.patch
 Patch8:		linux-fbcon-margins.patch
 Patch9:		linux-static-dev.patch
 
@@ -238,9 +239,8 @@
 
 ### End netfilter
 
-# based on http://www.linuximq.net/patchs/linux-2.6.21-img2.diff with 2.6.23 fixes
+# based on http://www.linuximq.net/patchs/linux-2.6.24-imq.diff
 # some people report problems when using imq with wrr.
-
 Patch50:	kernel-imq.patch
 
 # previously based on ftp://ftp.namesys.com/pub/reiser4-for-2.6/2.6.22/reiser4-for-2.6.22-2.patch.gz
@@ -329,6 +329,7 @@
 Patch2001:	linux-2.6.21.1-pwc-uncompress.patch
 
 # kill some thousands of warnings
+# (only warnings, so just remove parts of this patch if conflics)
 Patch2500:	linux-2.6-warnings.patch
 
 Patch5000:	apparmor-2.6.20.3-v405-fullseries.diff
@@ -879,7 +880,6 @@
 %patch500 -p1
 %endif
 
-# FIXME !!! 2.6.24
 %patch2500 -p1
 
 # FIXME !!! 2.6.24 (no modular security? crap)
@@ -887,7 +887,7 @@
 # %patch5000 -p1
 # %patch5001 -p1
 
-# grsecurity & pax stuff - temporary - work in progress
+# grsecurity & pax stuff
 #
 
 %if %{with pax_full}
@@ -1082,7 +1082,7 @@
 # vesafb-tng
 	cat %{SOURCE44} >> arch/%{target_arch_dir}/defconfig
 
-# grsecurity & pax stuff - temporary - work in progress
+# grsecurity & pax stuff
 #
 
 %if %{with pax_full}
@@ -1602,6 +1602,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1845  2008-02-26 02:40:50  zbyniu
+- squashfs and imq patches updated; cleanups; rel 0.5
+
 Revision 1.441.2.1844  2008-02-26 02:01:28  zbyniu
 - kernel-grsec_fixes.patch added; hardening grsec options if with pax
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel.spec?r1=1.441.2.1844&r2=1.441.2.1845&f=u