SPECS (LINUX_2_6_20): kernel.spec - rel 2 - added nf_conntrack_mms...

[mguevara]

Author: mguevara                     Date: Fri Mar 30 23:19:47 2007 GMT
Module: SPECS                         Tag: LINUX_2_6_20
---- Log message:
- rel 2
- added nf_conntrack_mms.patch which provides conntrack and nat support for
  mms protocol, kernel-netfilter.config updated for the patch
- spec cosmetics - todo and status update

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1698.2.93 -> 1.441.2.1698.2.94) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1698.2.93 SPECS/kernel.spec:1.441.2.1698.2.94
--- SPECS/kernel.spec:1.441.2.1698.2.93	Mon Mar 26 01:02:42 2007
+++ SPECS/kernel.spec	Sat Mar 31 01:19:41 2007
@@ -1,14 +1,13 @@
 # $Revision$, $Date$
 #
-# STATUS: 2.6.20.1-0.11/2.6.20.2-0.1
+# STATUS: 2.6.20.4-1
 # - standard config includes vserver, suspend2 and grsec_minimal
-# - works for me (i686 up)
+# - works for me (i686)
 # - builds on i686 with gcc-3.3.6-4 (Ac)
 # - builds on x86_64 with gcc-4.2.0-0.20070214.1.x86_64 (Th)
-# - builds for ppc with crossppc-gcc-4.0.2-2 (Ac) (but have to use proper ppc)
+# - builds for ppc 
 # - builds for alpha with crossalpha-gcc-4.0.1-1 (Th)
 # - builds --with vesafb_tng (i686)
-# - builds --with reiser4 (i686/x86_64)
 # - builds --with fbsplash (i686)
 # - builds --with pax (i686/x86_64)
 # - (external) nvidia works with & wo regparm
@@ -21,21 +20,17 @@
 # - (external) ipp2p builds
 # - (external) truecrypt builds and works (for me)
 #
-# TODO 2.6.20.3
-# - regenerete ppc and ppc64 config files based on powerpc kernel target
-# - test non default bconds for 2.6.20.3
+# TODO 2.6.20.4
+# - test non default bconds for 2.6.20.4
 # - test build --with pax --with reiser4 for alpha
 # - test build on sparc, sparc64
 # - pax hooks for selinux (experimental)
 # - spec cleanup
 # - test external modules
-# - mms-conntrack-nat - port to nf_conntrack and enable in kernel-netfilter.config
-# - for pax on 32-bit ppc disable CONFIG_PAX_EMUPLT (it will need gcc4 build userland -> Th only)
 #
 # FUTURE:
 # - new alsa rc2 - 1.0.14rc2 is in 2.6.20-git10 tree and in 2.6.21 line
 # - update xen patch for 2.6.20
-# - wanpipe -> use wanpipe.spec instead ?
 # - Linux ABI - needs update.
 # - pom-ng quake3-conntrack-nat -> nf_conntrack ?
 # - pom-ng rpc -> ?
@@ -44,6 +39,7 @@
 # - nf-hipac ?
 # - update configs for ia64 - no builder ?
 # - acrypto - http://tservice.net.ru/~s0mbre/blog/devel/acrypto
+# - for pax on 32-bit ppc disable CONFIG_PAX_EMUPLT (it will need gcc4 build userland -> Th only)
 #
 # Conditional build:
 %bcond_without	source		# don't build kernel-source package
@@ -146,7 +142,7 @@
 %define		_prepatch		%{nil}
 %define		_pre_rc			%{nil}
 %define		_rc			%{nil}
-%define		_rel			1
+%define		_rel			2
 
 %define		_netfilter_snap		20061213
 %define		_nf_hipac_ver		0.9.1
@@ -277,6 +273,9 @@
 Patch43:	pom-ng-ipp2p-%{_netfilter_snap}.patch
 Patch44:	pom-ng-time-%{_netfilter_snap}.patch
 
+# nf_conntrack ports
+Patch45:	nf_conntrack_mms.patch
+
 #layer7 with temporary fix
 Patch48:	kernel-2.6.18-layer7-2.7.patch
 Patch49:	kernel-2.6.18-layer7-2.7-2.6.19-fix.patch
@@ -855,6 +854,9 @@
 %patch43 -p1
 %patch44 -p1
 
+# nf_conn mms
+%patch45 -p1
+
 ## layer7
 %patch48 -p1
 %patch49 -p1
@@ -1688,6 +1690,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1698.2.94  2007/03/30 23:19:41  mguevara
+- rel 2
+- added nf_conntrack_mms.patch which provides conntrack and nat support for
+  mms protocol, kernel-netfilter.config updated for the patch
+- spec cosmetics - todo and status update
+
 Revision 1.441.2.1698.2.93  2007/03/25 23:02:42  zbyniu
 - linux-2.6-apparmor-caps.patch readded
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1698.2.93&r2=1.441.2.1698.2.94&f=u