SPECS (LINUX_2_6): kernel.spec - ipp2p and layer7 moved to externa...

[pluto]

Author: pluto                        Date: Wed Nov  2 23:44:06 2005 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- ipp2p and layer7 moved to external nf section.
- omnibook rt-lock fixed.
- amd64 undefined symols fixed.
- release 0.6.

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1286 -> 1.441.2.1287) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1286 SPECS/kernel.spec:1.441.2.1287
--- SPECS/kernel.spec:1.441.2.1286	Wed Nov  2 23:13:46 2005
+++ SPECS/kernel.spec	Thu Nov  3 00:44:01 2005
@@ -130,7 +130,7 @@
 %define		_oprofile_ver		0.5.3
 %define		_udev_ver		058
 
-%define		_rel		0.5
+%define		_rel		0.6
 
 %define		_netfilter_snap		20051028
 %define		_nf_hipac_ver		0.9.1
@@ -268,11 +268,15 @@
 Patch66:	linux-2.6-nf-geoip.patch
 Patch67:	linux-2.6-nf-h323-conntrack-nat.patch
 Patch68:	linux-2.6-nf-ip_queue_vwmark.patch
-Patch69:	linux-2.6-nf-ipp2p.patch
-Patch70:	linux-2.6-nf-policy.patch
-Patch71:	linux-2.6-nf-rpc.patch
-Patch72:	linux-2.6-nf-unclean.patch
+Patch69:	linux-2.6-nf-policy.patch
+Patch70:	linux-2.6-nf-rpc.patch
+Patch71:	linux-2.6-nf-unclean.patch
 # [extra/conntrack]
+# [external]
+# http://www.ipp2p.org/news_en.html (ipp2p v0.8.0)
+Patch72:	linux-2.6-nf-ipp2p.patch
+# http://l7-filter.sourceforge.net/ (2.0-beta)
+Patch73:	linux-2.6-nf-layer7.patch
 # /patch-o-matic-ng
 
 # http://tahoe.pl/patch.htm
@@ -788,8 +792,10 @@
 %patch69 -p1
 %patch70 -p1
 %patch71 -p1
-%patch72 -p1
 # [extra/conntrack]
+# [external]
+%patch72 -p1
+%patch73 -p1
 # /patch-o-matic-ng
 
 %patch80 -p1
@@ -864,6 +870,7 @@
 %if %{with preemptive}
 sed -i 's:SPIN_LOCK_UNLOCKED:SPIN_LOCK_UNLOCKED(SendCmplPktQ.QueueLock):' drivers/net/sk98lin/sky2.c
 for f in \
+	drivers/char/omnibook/ec.c \
 	net/ipv4/netfilter/ip_set.c \
 	net/ipv4/netfilter/ipt_account.c \
 	net/ipv4/netfilter/ipt_expire.c \
@@ -1695,6 +1702,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1287  2005/11/02 23:44:01  pluto
+- ipp2p and layer7 moved to external nf section.
+- omnibook rt-lock fixed.
+- amd64 undefined symols fixed.
+- release 0.6.
+
 Revision 1.441.2.1286  2005/11/02 22:13:46  pluto
 - ipp2p updated to 0.8.0, provides added.
 
================================================================

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