SPECS: kernel-desktop.spec - netfilter reverted

[sparky]

Author: sparky                       Date: Tue May  2 13:21:13 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- netfilter reverted

---- Files affected:
SPECS:
   kernel-desktop.spec (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SPECS/kernel-desktop.spec
diff -u SPECS/kernel-desktop.spec:1.7 SPECS/kernel-desktop.spec:1.8
--- SPECS/kernel-desktop.spec:1.7	Tue May  2 03:02:23 2006
+++ SPECS/kernel-desktop.spec	Tue May  2 15:21:07 2006
@@ -97,7 +97,7 @@
 Source43:	kernel-suspend2.config
 Source44:	kernel-vesafb-tng.config
 Source45:	kernel-squashfs.config
-Source46:	kernel-desktop-nonetfilter.config
+Source46:	kernel-netfilter.config
 Source47:	kernel-grsec.config
 
 ###
@@ -122,6 +122,32 @@
 Patch8:		linux-fbcon-margins.patch
 Patch9:		linux-static-dev.patch
 
+########	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
+
+## 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
+########	End netfilter
+
 # from http://www.linuximq.net/patchs/linux-2.6.16-imq2.diff
 Patch50:	linux-2.6.16-imq2.diff
 
@@ -593,6 +619,32 @@
 %patch8 -p1
 %patch9 -p1
 
+### 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
+
+## extra
+%patch30 -p1
+%patch31 -p1
+%patch32 -p1
+%patch33 -p1
+%patch34 -p1
+%patch35 -p1
+%patch36 -p1
+### end of netfilter
+
 %patch50 -p1
 
 %patch51 -p1
@@ -710,7 +762,7 @@
 	# squashfs
 	cat %{SOURCE45} >> arch/%{_target_base_arch}/defconfig
 
-	# no netfilter
+	# netfilter
 	cat %{SOURCE46} >> arch/%{_target_base_arch}/defconfig
 
 %if %{with grsec_minimal}
@@ -1276,6 +1328,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2006/05/02 13:21:07  sparky
+- netfilter reverted
+
 Revision 1.7  2006/05/02 01:02:23  shadzik
 - de supplement; de typo fixes
 
================================================================

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