Merge lp:~csurbhi/ubuntu/maverick/iptables/iptable-fix.600195 into lp:ubuntu/maverick/iptables

[Surbhi Palande]

I have added 3 patches to the iptables package.

a) The first one of them fixes bug 600195 on LP. It resolves the following compilation error:
"./include/linux/netfilter_ipv4/ipt_ECN.h:11: fatal error: linux/netfilter_ipv4/ipt_DSCP.h: No such file or directory". This was resolved by replacing ipt_DSCP.h to xpt_DSCP.h as seen in debian unstable package.

b) The next patch adds the following 2 flags to the regular_CFLAGS in configure file:
1) -fno-strict-aliasing 2) -Werror
so that in future, errors like the on in lp#600195 would be captured early.

c) The last patch removes the unused functions 1) TC_NUM_RULES i.e ip6tc_num_rules and 2) TC_GET_RULEip6 i.e tc_get_rule. This removal is necessary if we add the patch 2. iptables would not compile without removing these functions.

Please do consider merging these changes in iptables for Maverick.

Thanks!

Warm Regards,
Surbhi.

[Colin Watson (cjwatson)]

OK, so this is a different packaging style from gparted. iptables uses
quilt, and (oddly, perhaps uniquely?) keeps patches relative to upstream
in debian/patch/ rather than debian/patches/. However, it does not use
3.0 (quilt), so the basic state of the tree is to have patches
unapplied.

Thus, what you should do here is temporarily export
QUILT_PATCHES=debian/patch, and then add your non-debian/ patches to
quilt in the way you did before. When you've added them, 'quilt pop
-a', 'bzr add' your new patch files, and commit. The merge preview
should show just debian/changelog and some files in debian/patches/.

Please also consolidate your changelog entries into one stanza with one
version number. The upload target should be 'maverick' (or 'UNRELEASED'
if you like, and I'll set it to 'maverick' when uploading) rather than
'lucid'. The usual style is:

  * Description of change (LP: #nnnnnn).

The substantive changes themselves look fine to me.

[Surbhi Palande (csurbhi)]

1) Now, uploaded the non debian changes as a patch added to debian/patch/03-compilation-error-fix.patch
2) Added the debian changes through bzr.

[lp:~csurbhi/ubuntu/maverick/iptables/iptable-fix.600195]

25. By Surbhi Palande on 2010-07-14

* Replaced ipt_DSCP.h by xpt_DSCP.h in ipt_ECN.h and ipt_echn.h (LP: #600195)
* Added -fno-strict-aliasing -Werror switches to regular_CFLAGS for catching
  errors early
* Removed unused TC_NUM_RULES() and TC_GET_RULE()

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-03-04 07:16:17 +0000
+++ debian/changelog	2010-07-14 09:34:47 +0000
@@ -1,3 +1,12 @@
+iptables (1.4.4-2ubuntu3) maverick; urgency=low
+
+  * Replaced ipt_DSCP.h by xpt_DSCP.h in ipt_ECN.h and ipt_echn.h (LP: #600195)
+  * Added -fno-strict-aliasing -Werror switches to regular_CFLAGS for catching
+    errors early
+  * Removed unused TC_NUM_RULES() and TC_GET_RULE()
+
+ -- Surbhi Palande <[e-mail]>  Wed, 14 Jul 2010 12:30:38 +0300
+
 iptables (1.4.4-2ubuntu2) lucid; urgency=low
 
   * Added support for the xt_recent filter --reap switch. This

=== added file 'debian/patch/03-compilation-error.patch'
--- debian/patch/03-compilation-error.patch	1970-01-01 00:00:00 +0000
+++ debian/patch/03-compilation-error.patch	2010-07-14 09:34:47 +0000
@@ -0,0 +1,120 @@
+Index: b/configure
+===================================================================
+--- a/configure
++++ b/configure
+@@ -11441,6 +11441,7 @@
+ 	-D_REENTRANT -Wall -Waggregate-return -Wmissing-declarations \
+ 	-Wmissing-prototypes -Wredundant-decls -Wshadow -Wstrict-prototypes \
+ 	-Winline -pipe \
++	-fno-strict-aliasing -Werror\
+ 	-DXTABLES_LIBDIR=\\\"\${xtlibdir}\\\" -DXTABLES_INTERNAL";
+ kinclude_CFLAGS="";
+ if [ -n "$kbuilddir" ]; then
+Index: b/include/linux/netfilter_ipv4/ipt_ECN.h
+===================================================================
+--- a/include/linux/netfilter_ipv4/ipt_ECN.h
++++ b/include/linux/netfilter_ipv4/ipt_ECN.h
+@@ -8,9 +8,9 @@
+ */
+ #ifndef _IPT_ECN_TARGET_H
+ #define _IPT_ECN_TARGET_H
+-#include <linux/netfilter_ipv4/ipt_DSCP.h>
++#include <linux/netfilter/xt_DSCP.h>
+ 
+-#define IPT_ECN_IP_MASK	(~IPT_DSCP_MASK)
++#define IPT_ECN_IP_MASK (~XT_DSCP_MASK)
+ 
+ #define IPT_ECN_OP_SET_IP	0x01	/* set ECN bits of IPv4 header */
+ #define IPT_ECN_OP_SET_ECE	0x10	/* set ECE bit of TCP header */
+Index: b/include/linux/netfilter_ipv4/ipt_ecn.h
+===================================================================
+--- a/include/linux/netfilter_ipv4/ipt_ecn.h
++++ b/include/linux/netfilter_ipv4/ipt_ecn.h
+@@ -8,9 +8,9 @@
+ */
+ #ifndef _IPT_ECN_H
+ #define _IPT_ECN_H
+-#include <linux/netfilter_ipv4/ipt_dscp.h>
++#include <linux/netfilter/xt_DSCP.h>
+ 
+-#define IPT_ECN_IP_MASK	(~IPT_DSCP_MASK)
++#define IPT_ECN_IP_MASK (~XT_DSCP_MASK)
+ 
+ #define IPT_ECN_OP_MATCH_IP	0x01
+ #define IPT_ECN_OP_MATCH_ECE	0x10
+Index: b/libiptc/libip4tc.c
+===================================================================
+--- a/libiptc/libip4tc.c
++++ b/libiptc/libip4tc.c
+@@ -93,8 +93,6 @@
+ #define TC_FREE			iptc_free
+ #define TC_COMMIT		iptc_commit
+ #define TC_STRERROR		iptc_strerror
+-#define TC_NUM_RULES		iptc_num_rules
+-#define TC_GET_RULE		iptc_get_rule
+ 
+ #define TC_AF			AF_INET
+ #define TC_IPPROTO		IPPROTO_IP
+Index: b/libiptc/libip6tc.c
+===================================================================
+--- a/libiptc/libip6tc.c
++++ b/libiptc/libip6tc.c
+@@ -88,8 +88,6 @@
+ #define TC_FREE			ip6tc_free
+ #define TC_COMMIT		ip6tc_commit
+ #define TC_STRERROR		ip6tc_strerror
+-#define TC_NUM_RULES		ip6tc_num_rules
+-#define TC_GET_RULE		ip6tc_get_rule
+ 
+ #define TC_AF			AF_INET6
+ #define TC_IPPROTO		IPPROTO_IPV6
+Index: b/libiptc/libiptc.c
+===================================================================
+--- a/libiptc/libiptc.c
++++ b/libiptc/libiptc.c
+@@ -1563,45 +1563,6 @@
+ 	return r->entry;
+ }
+ 
+-/* How many rules in this chain? */
+-static unsigned int
+-TC_NUM_RULES(const char *chain, struct xtc_handle *handle)
+-{
+-	struct chain_head *c;
+-	iptc_fn = TC_NUM_RULES;
+-	CHECK(handle);
+-
+-	c = iptcc_find_label(chain, handle);
+-	if (!c) {
+-		errno = ENOENT;
+-		return (unsigned int)-1;
+-	}
+-
+-	return c->num_rules;
+-}
+-
+-static const STRUCT_ENTRY *
+-TC_GET_RULE(const char *chain, unsigned int n, struct xtc_handle *handle)
+-{
+-	struct chain_head *c;
+-	struct rule_head *r;
+-
+-	iptc_fn = TC_GET_RULE;
+-
+-	CHECK(handle);
+-
+-	c = iptcc_find_label(chain, handle);
+-	if (!c) {
+-		errno = ENOENT;
+-		return NULL;
+-	}
+-
+-	r = iptcc_get_rule_num(c, n);
+-	if (!r)
+-		return NULL;
+-	return r->entry;
+-}
+-
+ /* Returns a pointer to the target name of this position. */
+ static const char *standard_target_map(int verdict)
+ {

=== modified file 'debian/patch/series'
--- debian/patch/series	2010-03-04 07:16:17 +0000
+++ debian/patch/series	2010-07-14 09:34:47 +0000
@@ -1,3 +1,4 @@
+03-compilation-error.patch
 0101-changelog.patch
 0102-howtos.patch
 0103-sgml_errors.patch