SPECS (LINUX_2_6): kernel.spec - old pom-ng patches: TARPIT, IPMARK, geoip, ...

[zbyniu]

Author: zbyniu                       Date: Fri May 23 11:57:05 2008 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- old pom-ng patches: TARPIT, IPMARK, geoip, ipp2p, use new ported versions from external spec - xtables-addons
- ipt_SAME module lost, needed?; rel 1

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1909 -> 1.441.2.1910) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1909 SPECS/kernel.spec:1.441.2.1910
--- SPECS/kernel.spec:1.441.2.1909	Wed May 21 19:15:00 2008
+++ SPECS/kernel.spec	Fri May 23 13:56:58 2008
@@ -6,7 +6,6 @@
 # - suspend2 renamed to tuxonice (as project name)
 #
 # TODO:
-# - another nf modules disappeared?
 # - benchmark NO_HZ & HZ=1000 vs HZ=300 on i686
 # - apparmor (no future?)
 #
@@ -109,7 +108,7 @@
 %define		_prepatch		%{nil}
 %define		_pre_rc			%{nil}
 %define		_rc			%{nil}
-%define		_rel			0.2
+%define		_rel			1
 
 %define		_enable_debug_packages			0
 
@@ -128,7 +127,7 @@
 
 # Our Kernel ABI, increase this when you want the out of source modules being rebuilt
 # Usually same as %{_rel}
-%define		KABI		0
+%define		KABI		1
 
 Summary:	The Linux kernel (the core of the Linux operating system)
 Summary(de.UTF-8):	Der Linux-Kernel (Kern des Linux-Betriebssystems)
@@ -220,11 +219,7 @@
 Patch11:	kernel-pom-ng-ipv4options.patch
 Patch12:	kernel-pom-ng-set.patch
 Patch14:	kernel-pom-ng-ROUTE.patch
-Patch15:	kernel-pom-ng-TARPIT.patch
 Patch16:	kernel-pom-ng-mms-conntrack-nat.patch
-Patch17:	kernel-pom-ng-IPMARK.patch
-Patch19:	kernel-pom-ng-geoip.patch
-Patch20:	kernel-pom-ng-ipp2p.patch
 Patch22:	kernel-pom-ng-rsh.patch
 Patch23:	kernel-pom-ng-rpc.patch
 
@@ -782,21 +777,9 @@
 # kernel-pom-ng-ROUTE.patch
 %patch14 -p1
 
-# kernel-pom-ng-TARPIT.patch
-%patch15 -p1
-
 # kernel-pom-ng-mms-conntrack-nat.patch
 %patch16 -p1
 
-# kernel-pom-ng-IPMARK.patch
-%patch17 -p1
-
-# kernel-pom-ng-geoip.patch
-%patch19 -p1
-
-# kernel-pom-ng-ipp2p.patch
-%patch20 -p1
-
 # kernel-pom-ng-rsh.patch
 %patch22 -p1
 
@@ -1681,6 +1664,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1910  2008-05-23 11:56:58  zbyniu
+- old pom-ng patches: TARPIT, IPMARK, geoip, ipp2p, use new ported versions from external spec - xtables-addons
+- ipt_SAME module lost, needed?; rel 1
+
 Revision 1.441.2.1909  2008-05-21 17:15:00  zbyniu
 - bcond without regparm not needed anymore
 
================================================================

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