Bug 1450 - Generate again patch `contrib/aaaa-filter-iterator.patch`.
Generate again patch `contrib/aaaa-filter-iterator.patch`.
Status: RESOLVED FIXED
Product: unbound
Classification: Unclassified
Component: server
1.6.6
Other All
: P5 normal
Assigned To: unbound team
Depends on:
Blocks:
  Show dependency treegraph
 
Reported: 2017-09-23 02:59 CEST by Danilo G. Baio
Modified: 2017-09-26 14:41 CEST (History)
2 users (show)

See Also:


Attachments
unbound-regenerate-aaaa-filter-iterator.patch (9.01 KB, application/octet-stream)
2017-09-23 02:59 CEST, Danilo G. Baio
Details

Note You need to log in before you can comment on or make changes to this bug.
Description Danilo G. Baio 2017-09-23 02:59:49 CEST
Created attachment 460 [details]
unbound-regenerate-aaaa-filter-iterator.patch

Hi.

There is a problem applying `contrib/aaaa-filter-iterator.patch`.


--------------------------
|Index: trunk/iterator/iterator.h
|===================================================================
|--- trunk/iterator/iterator.h  (revision 3587)
|+++ trunk/iterator/iterator.h  (working copy)
--------------------------
Patching file iterator/iterator.h using Plan A...
Hunk #1 failed at 113.
Hunk #2 succeeded at 185 (offset 19 lines).
Hunk #3 succeeded at 376 (offset 19 lines).
1 out of 3 hunks failed--saving rejects to iterator/iterator.h.rej
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:


Probably related after these two commits in `iterator/iterator.h`:

------------------------------------------------------------------------
r4292 | ralph | 2017-08-03 09:52:33 -0300 (Thu, 03 Aug 2017) | 2 lines

- Added stats for queries that have been ratelimited by domain recursion.

------------------------------------------------------------------------
r4290 | ralph | 2017-08-03 06:29:21 -0300 (Thu, 03 Aug 2017) | 2 lines

- Remove unused iter_env member (ip6arpa_dname)

------------------------------------------------------------------------

This patch attached should fix this, re-generating `contrib/aaaa-filter-iterator.patch`.

Thank you.
Comment 1 Ralph Dolmans 2017-09-25 14:51:15 CEST
Hi Danilo,

Thank you! I patched the patch.

Regards,
-- Ralph
Comment 2 Danilo G. Baio 2017-09-26 14:41:57 CEST
(In reply to Ralph Dolmans from comment #1)
> Hi Danilo,
> 
> Thank you! I patched the patch.
> 
> Regards,
> -- Ralph

Thank you Ralph.