Bug 260553

Summary: dns/unbound: Fails to patch with AAAA=ON: aaaa-filter-iterator.patch
Product: Ports & Packages Reporter: tech-lists
Component: Individual Port(s)Assignee: Li-Wen Hsu <lwhsu>
Status: Closed FIXED    
Severity: Affects Some People CC: doctorwhoguy, jaap, jau, lwhsu, tomasz.sowinski
Priority: --- Flags: koobs: maintainer-feedback+
koobs: merge-quarterly+
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
poudriere build log
none
patch to patch the aaa-filter patch jaap: maintainer-approval+

Description tech-lists 2021-12-19 22:12:11 UTC
Created attachment 230252 [details]
poudriere build log

Hi,

dns/unbound fails the patch stage of the build process in poudriere.

[00:00:09] =======================<phase: patch-depends  >============================
[00:00:09] ===== env: USE_PACKAGE_DEPENDS_ONLY=1 USER=root UID=0 GID=0
[00:00:09] ===========================================================================
[00:00:09] =======================<phase: patch          >============================
[00:00:09] ===== env: NO_DEPENDS=yes USER=root UID=0 GID=0
[00:00:09] ===>  Patching for unbound-1.14.0
[00:00:09] /bin/cat /wrkdirs/usr/ports/dns/unbound/work/unbound-1.14.0/contrib/aaaa-filter-iterator.patch | /usr/bin/patch -d /wrkdirs/usr/ports/dns/unbound/work/unbound-1.14.0 -p1 -s
[00:00:09] 1 out of 1 hunks failed--saving rejects to iterator/iter_utils.c.rej
[00:00:09] 1 out of 3 hunks failed--saving rejects to util/configparser.y.rej
[00:00:09] *** Error code 1
[00:00:09] 
[00:00:09] Stop.
[00:00:09] make: stopped in /usr/ports/dns/unbound
[00:00:09] =>> Cleaning up wrkdir
[00:00:09] ===>  Cleaning for unbound-1.14.0
[00:00:09] build of dns/unbound | unbound-1.14.0 ended at Sun Dec 19 21:26:29 GMT 2021
Comment 1 tech-lists 2021-12-19 22:14:59 UTC
it builds if the AAAA option is unselected.
Comment 2 Jaap Akkerhuis 2021-12-21 15:26:23 UTC
Created attachment 230289 [details]
patch to patch the aaa-filter patch

The aaaa-filer-patch is user contributed and apparently doesn't work with the oudated source.

This is a bit of a kludge but place the attach patch file in ../unbound/file and it will patch the aaa-filter patch. Lt me know if this works for you.

Meanwhile I'll try to prod the contributor to update his patch.
Comment 3 tech-lists 2021-12-23 04:38:34 UTC
(In reply to Jaap Akkerhuis from comment #2)

Thanks! yes, the patch worked
Comment 4 Fernando ApesteguĂ­a freebsd_committer freebsd_triage 2022-01-04 16:09:58 UTC
*** Bug 260839 has been marked as a duplicate of this bug. ***
Comment 5 commit-hook freebsd_committer freebsd_triage 2022-01-25 13:13:59 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=6eb036d0d6656a72d27b34557ed4bf1feb1cd4f0

commit 6eb036d0d6656a72d27b34557ed4bf1feb1cd4f0
Author:     Jaap Akkerhuis <jaap@NLnetLabs.nl>
AuthorDate: 2022-01-25 13:11:23 +0000
Commit:     Li-Wen Hsu <lwhsu@FreeBSD.org>
CommitDate: 2022-01-25 13:12:42 +0000

    dns/unbound: Fix the aaaa-filter-iterator.patch

    PR:             260553
    Reported by:    tech-lists@zyxst.net

 .../patch-contrib_aaaa-filter-iterator.patch (new) | 35 ++++++++++++++++++++++
 1 file changed, 35 insertions(+)
Comment 6 commit-hook freebsd_committer freebsd_triage 2022-01-25 13:47:05 UTC
A commit in branch 2022Q1 references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=cf6fc06c62277cbafa756dc74137c9c70a3d8766

commit cf6fc06c62277cbafa756dc74137c9c70a3d8766
Author:     Jaap Akkerhuis <jaap@NLnetLabs.nl>
AuthorDate: 2022-01-25 13:11:23 +0000
Commit:     Li-Wen Hsu <lwhsu@FreeBSD.org>
CommitDate: 2022-01-25 13:46:37 +0000

    dns/unbound: Fix the aaaa-filter-iterator.patch

    PR:             260553
    Reported by:    tech-lists@zyxst.net

    (cherry picked from commit 6eb036d0d6656a72d27b34557ed4bf1feb1cd4f0)

 .../patch-contrib_aaaa-filter-iterator.patch (new) | 35 ++++++++++++++++++++++
 1 file changed, 35 insertions(+)
Comment 7 Li-Wen Hsu freebsd_committer freebsd_triage 2022-01-25 13:48:39 UTC
*** Bug 261463 has been marked as a duplicate of this bug. ***