Ubuntu
iptables package

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

  1. Maverick (10.10)
  2. iptable-fix.600195
  3. Merge into maverick
Proposed by Surbhi Palande
Status: Merged
Merged at revision: 25
Proposed branch: lp://qastaging/~csurbhi/ubuntu/maverick/iptables/iptable-fix.600195
Merge into: lp://qastaging/ubuntu/maverick/iptables
Diff against target: 150 lines (+130/-0)
3 files modified
debian/changelog (+9/-0)
debian/patch/03-compilation-error.patch (+120/-0)
debian/patch/series (+1/-0)
To merge this branch: bzr merge lp://qastaging/~csurbhi/ubuntu/maverick/iptables/iptable-fix.600195
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+29779@code.qastaging.launchpad.net

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) wrote :

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.

Revision history for this message
Surbhi Palande (csurbhi) wrote :

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://qastaging/~csurbhi/ubuntu/maverick/iptables/iptable-fix.600195 updated
25. By Surbhi Palande

* 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()

Revision history for this message
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: