FS#44333 - [iptables] Replace unofficial patch with upstream commit

Attached to Project: Arch Linux
Opened by Evangelos Foutras (foutrelis) - Wednesday, 25 March 2015, 08:51 GMT
Last edited by Ronald van Haren (pressh) - Wednesday, 25 March 2015, 10:44 GMT
Task Type General Gripe
Category Packages: Testing
Status Closed
Assigned To Ronald van Haren (pressh)
Architecture All
Severity Low
Priority Normal
Reported Version
Due in Version Undecided
Due Date Undecided
Percent Complete 100%
Votes 0
Private No

Details

iptables 1.4.21-2 adds a patch to fix upstream issue 940. [1] [2]

The upstream Git repository contains a newer and more complete fix:

http://git.netfilter.org/iptables/commit/?id=2192c3a

My suggestion is to include that patch instead of the one that was provided in the upstream report.

[1] https://projects.archlinux.org/svntogit/packages.git/commit/trunk?h=packages/iptables&id=ecd0344
[2] https://bugzilla.netfilter.org/show_bug.cgi?id=940
This task depends upon

Closed by  Ronald van Haren (pressh)
Wednesday, 25 March 2015, 10:44 GMT
Reason for closing:  Implemented
Additional comments about closing:  1.4.21-3
Comment by Ronald van Haren (pressh) - Wednesday, 25 March 2015, 09:22 GMT
@Evangelos: That would require adding http://git.netfilter.org/iptables/patch/extensions/libip6t_DNPT.t?id=e8a95271dc8598261957f9ed5472dfb9065bdd9e as well (not sure if that in turn depends on other patches). If I'm not mistaken the patches are the same except for the changes to the *.t files, but these don't exist in the old code so won't be used anyway unless we move to a current git checkout of the stable branch.



Comment by Evangelos Foutras (foutrelis) - Wednesday, 25 March 2015, 09:52 GMT
I wasn't aware that the test files were added recently. The rest of the patch applies cleanly, so we can just ignore the chunks that refer to the tests. (See attached patch.)

The patches are not exactly the same; the upstream commit also fixes the output of the DNPT_print and SNPT_print functions (in addition to the *_save functions).
   0001-extensions-SNPT-DNPT-fix... (3 KiB)

Loading...