SPECS: kernel-desktop.spec - apply netfilter patches

[sparky]

Author: sparky                       Date: Mon Jun 12 17:05:35 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- apply netfilter patches

---- Files affected:
SPECS:
   kernel-desktop.spec (1.14 -> 1.15) 

---- Diffs:

================================================================
Index: SPECS/kernel-desktop.spec
diff -u SPECS/kernel-desktop.spec:1.14 SPECS/kernel-desktop.spec:1.15
--- SPECS/kernel-desktop.spec:1.14	Sun Jun 11 23:00:39 2006
+++ SPECS/kernel-desktop.spec	Mon Jun 12 19:05:30 2006
@@ -44,7 +44,7 @@
 
 %define		_rel			0.1
 
-%define		_netfilter_snap		20060329
+%define		_netfilter_snap		20060504
 %define		_nf_hipac_ver		0.9.1
 
 %define		_enable_debug_packages			0
@@ -123,28 +123,28 @@
 
 ########	netfilter snap
 ## base
-#Patch10:	pom-ng-IPV4OPTSSTRIP-%{_netfilter_snap}.patch
-#Patch11:	pom-ng-connlimit-%{_netfilter_snap}.patch
-#Patch12:	pom-ng-expire-%{_netfilter_snap}.patch
-#Patch13:	pom-ng-fuzzy-%{_netfilter_snap}.patch
-#Patch14:	pom-ng-ipv4options-%{_netfilter_snap}.patch
-#Patch15:	pom-ng-nth-%{_netfilter_snap}.patch
-#Patch16:	pom-ng-osf-%{_netfilter_snap}.patch
-#Patch17:	pom-ng-psd-%{_netfilter_snap}.patch
-#Patch18:	pom-ng-quota-%{_netfilter_snap}.patch
-#Patch19:	pom-ng-random-%{_netfilter_snap}.patch
-#Patch20:	pom-ng-set-%{_netfilter_snap}.patch
-#Patch21:	pom-ng-time-%{_netfilter_snap}.patch
-#Patch22:	pom-ng-u32-%{_netfilter_snap}.patch
+Patch10:	pom-ng-IPV4OPTSSTRIP-%{_netfilter_snap}.patch
+Patch11:	pom-ng-connlimit-%{_netfilter_snap}.patch
+Patch12:	pom-ng-expire-%{_netfilter_snap}.patch
+Patch13:	pom-ng-fuzzy-%{_netfilter_snap}.patch
+Patch14:	pom-ng-ipv4options-%{_netfilter_snap}.patch
+Patch15:	pom-ng-nth-%{_netfilter_snap}.patch
+Patch16:	pom-ng-osf-%{_netfilter_snap}.patch
+Patch17:	pom-ng-psd-%{_netfilter_snap}.patch
+Patch18:	pom-ng-quota-%{_netfilter_snap}.patch
+Patch19:	pom-ng-random-%{_netfilter_snap}.patch
+Patch20:	pom-ng-set-%{_netfilter_snap}.patch
+Patch21:	pom-ng-time-%{_netfilter_snap}.patch
+Patch22:	pom-ng-u32-%{_netfilter_snap}.patch
 
 ## extra
-#Patch30:	pom-ng-ACCOUNT-%{_netfilter_snap}.patch
-#Patch31:	pom-ng-IPMARK-%{_netfilter_snap}.patch
-#Patch32:	pom-ng-ROUTE-%{_netfilter_snap}.patch
-#Patch33:	pom-ng-TARPIT-%{_netfilter_snap}.patch
-#Patch34:	pom-ng-account-%{_netfilter_snap}.patch
-#Patch35:	pom-ng-ipp2p-%{_netfilter_snap}.patch
-#Patch36:	pom-ng-rpc-%{_netfilter_snap}.patch
+Patch30:	pom-ng-ACCOUNT-%{_netfilter_snap}.patch
+Patch31:	pom-ng-IPMARK-%{_netfilter_snap}.patch
+Patch32:	pom-ng-ROUTE-%{_netfilter_snap}.patch
+Patch33:	pom-ng-TARPIT-%{_netfilter_snap}.patch
+Patch34:	pom-ng-account-%{_netfilter_snap}.patch
+Patch35:	pom-ng-ipp2p-%{_netfilter_snap}.patch
+Patch36:	pom-ng-rpc-%{_netfilter_snap}.patch
 ########	End netfilter
 
 # from http://www.linuximq.net/patchs/linux-2.6.16-imq2.diff
@@ -653,28 +653,28 @@
 
 ### netfilter
 # base
-#patch10 -p1
-#patch11 -p1
-#patch12 -p1
-#patch13 -p1
-#patch14 -p1
-#patch15 -p1
-#patch16 -p1
-#patch17 -p1
-#patch18 -p1
-#patch19 -p1
-#patch20 -p1
-#patch21 -p1
-#patch22 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
+%patch18 -p1
+%patch19 -p1
+%patch20 -p1
+%patch21 -p1
+%patch22 -p1
 
 ## extra
-#patch30 -p1
-#patch31 -p1
-#patch32 -p1
-#patch33 -p1
-#patch34 -p1
-#patch35 -p1
-#patch36 -p1
+%patch30 -p1
+%patch31 -p1
+%patch32 -p1
+%patch33 -p1
+%patch34 -p1
+%patch35 -p1
+%patch36 -p1
 ### end of netfilter
 
 %patch50 -p1
@@ -1371,6 +1371,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2006/06/12 17:05:30  sparky
+- apply netfilter patches
+
 Revision 1.14  2006/06/11 21:00:39  sparky
 - reiser4 applies and builds
 
================================================================

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