- include needed headers (ipt_rpc.h, xt_layer7.h) in related patches, like upstream...

Changed files:
    iptables-layer7.patch -> 1.8
    iptables-old-1.3.7.patch -> 1.7
    iptables.spec -> 1.296

diff --git a/iptables-layer7.patch b/iptables-layer7.patch
index 07ba17c3926824d5bd3155a7479d3c0b2ebc513f..3963f5ea3dae019f0594b402104184496cf0831f 100644 (file)
--- a/iptables-layer7.patch
+++ b/iptables-layer7.patch
@@ -388,3 +388,19 @@ diff -urN iptables-1.4.9.1.org/extensions/libxt_layer7.man iptables-1.4.9.1/exte
 +Use \fIdirectory\fP instead of /etc/l7-protocols/.  This option must be 
 +specified before --l7proto.
 +
+--- iptables.orig/include/linux/netfilter/xt_layer7.h  1969-12-31 18:00:00.000000000 -0600
++++ iptables/include/linux/netfilter/xt_layer7.h       2009-01-07 16:07:31.000000000 -0600
+@@ -0,0 +1,13 @@
++#ifndef _XT_LAYER7_H
++#define _XT_LAYER7_H
++
++#define MAX_PATTERN_LEN 8192
++#define MAX_PROTOCOL_LEN 256
++
++struct xt_layer7_info {
++    char protocol[MAX_PROTOCOL_LEN];
++    char pattern[MAX_PATTERN_LEN];
++    u_int8_t invert;
++};
++
++#endif /* _XT_LAYER7_H */

diff --git a/iptables-old-1.3.7.patch b/iptables-old-1.3.7.patch
index cc388ea35a0fdcc21ce0db1380fe9336d2dd8f18..09f0ea7d9a180d973e20aebf99f29bdd920d6711 100644 (file)
--- a/iptables-old-1.3.7.patch
+++ b/iptables-old-1.3.7.patch
@@ -373,3 +373,41 @@
 +      xtables_register_match(&rpcstruct);
 +}
 +
+--- iptables.orig/include/linux/netfilter_ipv4/ipt_rpc.h       1970-01-01 01:00:00.000000000 +0100
++++ iptables/include/linux/netfilter_ipv4/ipt_rpc.h    2006-05-04 11:26:08.000000000 +0200
+@@ -0,0 +1,35 @@
++/* RPC extension for IP netfilter matching, Version 2.2
++ * (C) 2000 by Marcelo Barbosa Lima <marcelo.lima@dcc.unicamp.br>
++ *    - original rpc tracking module
++ *    - "recent" connection handling for kernel 2.3+ netfilter
++ *
++ * (C) 2001 by Rusty Russell <rusty@rustcorp.com.au>
++ *    - upgraded conntrack modules to oldnat api - kernel 2.4.0+
++ *
++ * (C) 2002 by Ian (Larry) Latter <Ian.Latter@mq.edu.au>
++ *    - upgraded conntrack modules to newnat api - kernel 2.4.20+
++ *    - extended matching to support filtering on procedures
++ *
++ * ipt_rpc.h.c,v 2.2 2003/01/12 18:30:00
++ *
++ *    This program is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU General Public License
++ *    as published by the Free Software Foundation; either version
++ *    2 of the License, or (at your option) any later version.
++ **
++ */
++
++#ifndef _IPT_RPC_H
++#define _IPT_RPC_H
++
++struct ipt_rpc_data;
++
++struct ipt_rpc_info {
++      int inverse;
++      int strict;
++      const char c_procs[1408];
++      int i_procs;
++      struct ipt_rpc_data *data;
++};
++
++#endif /* _IPT_RPC_H */

diff --git a/iptables.spec b/iptables.spec
index 68077c488a2026bc436d8ecdf2c66018f60d15c1..b286631528ebdac4c801c3fe7054266a18d8d51a 100644 (file)
--- a/iptables.spec
+++ b/iptables.spec
@@ -1,6 +1,7 @@
 #
 # TODO:
 # - update BR to real required llh version
+# - check if kernel-headers are still required to properly build iptabels for dist kernel
 # - fix makefile (-D_UNKNOWN_KERNEL_POINTER_SIZE issue)
 # - owner needs rewrite to xt
 #
@@ -11,8 +12,8 @@
 %bcond_with    batch           # build iptables-batch
 %bcond_with    static          # build static libraries, no dynamic modules (all linked into binaries)
 %bcond_with    ipt_IPV4OPTSSTRIP # enable ipt_IPV4OPTSSTRIP for non-dist kernel
-%bcond_with    ipt_rpc         # enable ipt_rpc for non-dist kernel (needs ipt_rpc.h header)
-%bcond_with    xt_layer7       # enable xt_layer7 for non-dist kernel (needs xt_layer7.h header)
+%bcond_with    ipt_rpc         # enable ipt_rpc for non-dist kernel
+%bcond_with    xt_layer7       # enable xt_layer7 for non-dist kernel
 %bcond_with    usekernelsrc    # include kernel headers from %{_kernelsrcdir}
 
 %if %{with dist_kernel}
@@ -78,7 +79,6 @@ BuildRequires:        tetex-latex
 BuildRequires: tetex-tex-babel
 %endif
 %if %{with dist_kernel}
-# needed for xt_layer7, ipt_rpc
 BuildRequires: kernel%{_alt_kernel}-headers(netfilter)
 %endif
 BuildRequires: linux-libc-headers >= 7:2.6.22.1