Bug 220205 - [MAINTAINER-UPDATE] dns/knot2: upgrade to 2.5.1
Summary: [MAINTAINER-UPDATE] dns/knot2: upgrade to 2.5.1
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: Matthew Seaman
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2017-06-22 09:21 UTC by Leo Vandewoestijne
Modified: 2017-06-23 15:41 UTC (History)
2 users (show)

See Also:


Attachments
knot update to 2.5.1 (5.72 KB, patch)
2017-06-22 09:21 UTC, Leo Vandewoestijne
freebsd: maintainer-approval-
Details | Diff
update - knot 2.5.1 (5.70 KB, patch)
2017-06-22 10:13 UTC, Leo Vandewoestijne
freebsd: maintainer-approval+
Details | Diff
Updated patch (4.38 KB, patch)
2017-06-22 11:54 UTC, Matthew Seaman
freebsd: maintainer-approval+
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Leo Vandewoestijne 2017-06-22 09:21:02 UTC
Created attachment 183699 [details]
knot update to 2.5.1

Recently a new release of knot2 with nice updates.

Meanwhile it turned out the port doesn't build anymore on i386 platforms due to atomic issues.
I tried my best to solve that, but I unfortunately had to mark it being broken for i386.
I'm convinced it's possible somehow, but am not enough of a C programmer to find a solution (and other than poudriere I also had no place to play around easily).
So if anyone sees what's missing for i386, then please let me know.
Comment 1 Leo Vandewoestijne 2017-06-22 10:03:40 UTC
Submitted the not-entirely-perfect patch...
One second please.
Comment 2 Leo Vandewoestijne 2017-06-22 10:13:25 UTC
Created attachment 183702 [details]
update - knot 2.5.1

This is the correct patch I intended to submit.
Comment 3 Matthew Seaman freebsd_committer freebsd_triage 2017-06-22 10:19:19 UTC
(In reply to Leo Vandewoestijne from comment #1)

Hi, Leo,

Yes, I can see there are some issues with the patch as it stands. I
haven't had a chance to look at in detail, but here's some things
that leapt out at me:

  * Some tabs seem to have turned into spaces.  That's not good in a Makefile
  * You've got both 'USES+=autoreconf' and a pre-configure target doing 
    autoreconf too.  You should only have the USES bit there.
  * You should USE shebangfix rather than your files/patch-src_utils_pykeymgr_pykeymgr.in
    Also, does this *really* have to use python3?  The ports default is still
    python2.7 and it would be helpful to allow that to be used if possible.
    If not, then you need to add a dependency on python3
Comment 4 Matthew Seaman freebsd_committer freebsd_triage 2017-06-22 11:54:44 UTC
Created attachment 183705 [details]
Updated patch

This removes the surplus pre-configure target for running autoreconf -- you get that automatically with 'USES autoreconf'

Remove files/patch-src_utils_pykeymgr_pykeymgr.in and instead add 

SHEBANG_FILES= src/utils/pykeymgr.in

Note: this will set the python interpreter to whatever is the default version
set by the user, typically /usr/local/bin/python2.7 -- judging by comments in that file, python2 seems to be supported.  If it really needs python 3.x then you need something like: 'USES+=python:3.3+' which will do the right thing with the shebangfix automatically.

Clean up various tabs vs spaces and other punctuation issues.

I also note in my testing that knot2 will apparently build without errors on FreeBSD 10.3-RELEASE i386 but I don't know if it will work correctly there.
Comment 5 Matthew Seaman freebsd_committer freebsd_triage 2017-06-23 07:11:46 UTC
Hi, Leo,

Let me know if you're happy with the changes I made or if there's anything else you want done differently.  Otherwise I'll commit this over the weekend.
Comment 6 Leo Vandewoestijne 2017-06-23 15:22:16 UTC
Comment on attachment 183705 [details]
Updated patch

> note in my testing that knot2 will apparently build without errors on FreeBSD 10.3-RELEASE i386
>
I'm happy to hear I'm not the only one who witnessed this.
However, I receive the build-failure alert emails, that point to logs like:
http://beefy10.nyi.freebsd.org/data/110i386-default/444089/logs/knot2-2.4.3.log
which shows the same I now see in my own poudriere also, but didn't get the moment when doing previous update.
Neither I didn't receive any negative feedback of i386 users.
Can you tell me what compiler yours used?

- if there's anything else you want done differently
Your patch is fine. Thanks. Please commit.
Earlier today 2.5.2 already came out, with very minor changes.
I will use that one to adjust, such that there can be a metaport for libknot only, which knot-resolver requires.
Comment 7 commit-hook freebsd_committer freebsd_triage 2017-06-23 15:37:00 UTC
A commit references this bug:

Author: matthew
Date: Fri Jun 23 15:36:52 UTC 2017
New revision: 444181
URL: https://svnweb.freebsd.org/changeset/ports/444181

Log:
  Update to 2.5.1

    * Add new USES: autoreconf, localbase, python, shebangfix
    * Mark broken on i386 --
         undefined reference to '__atomic_fetch_add_8'
    * Move libfstrm.so dependency so it is only added when the
      DNSTAP option is enabled.

  PR:		220205
  Submitted by:	freebsd@dns-lab.com (maintainer)

Changes:
  head/dns/knot2/Makefile
  head/dns/knot2/distinfo
  head/dns/knot2/files/pkg-message.in
  head/dns/knot2/pkg-plist
Comment 8 Matthew Seaman freebsd_committer freebsd_triage 2017-06-23 15:41:57 UTC
Committed, thanks!

My compile tests were, I believe, just using the system default clang on
10.3-RELEASE, but cached via CCACHE, all done via 'poudriere testport'

Feel free to ping me when you have your 2.5.2 update ready to go.