Bug 227779 - net/chrony: Update to 3.3
Summary: net/chrony: Update to 3.3
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Tobias Kortkamp
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2018-04-26 02:22 UTC by takefu
Modified: 2018-05-09 03:03 UTC (History)
1 user (show)

See Also:
bugzilla: maintainer-feedback? (yonas)

Attachments
chrony-3.3.patch (3.21 KB, patch)
2018-04-26 02:22 UTC, takefu 		no flags Details | Diff
chrony-3.3.patch (2.46 KB, patch)
2018-05-09 01:50 UTC, takefu 		no flags Details | Diff
Show Obsolete (1) View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description takefu 2018-04-26 02:22:31 UTC 
Created attachment 192821 [details]
chrony-3.3.patch

Update to 3.3

add
  NETTLE Option

fix
  NSS option is broken
  %%PREFIX%% correction
  Standard option change from NSS to NETTLE
Comment 1 takefu 2018-04-26 02:27:31 UTC 
NSS broken report bug #223840
Comment 2 Tobias Kortkamp freebsd_committer freebsd_triage 2018-04-26 17:30:27 UTC 
+IPV6_CONFIGURE_ON=	--disable-readline

Why does enabling IPV6 require one to disable readline support? This
makes little immediate sense.

+do-build:
+.for file in ${PORTEXAMPLES}
+	@${REINPLACE_CMD} ${_SUB_LIST_TEMP} ${WRKSRC}/examples/${file}
+.endfor

This seems wrong:

a) do-build is being overwritten, which means that if chrony is built at all
   it would happen in the wrong phase (probably stage) by accident.
b) _SUB_LIST_TEMP is a private variable. I assume this is about the
   aforementioned %%PREFIX%% fix.  If so just make an explicit
   substitution instead.

Since this port uses PORTDOCS and PORTEXAMPLES adding explicit DOCS and
EXAMPLES options would be a good idea too.

+.if ${ARCH} == armv6 || ${ARCH} == armv7
+EXTRA_PATCHES=		${FILESDIR}/extra-util.c
+.endif

Why is this only needed on armv{6,7} now? It was applied on all
archs before. Leave a comment about this in the patch file header.
Comment 3 takefu 2018-05-09 01:50:41 UTC 
Created attachment 193198 [details]
chrony-3.3.patch

+IPV6_CONFIGURE_ON=	--disable-readline

+.if ${ARCH} == armv6 || ${ARCH} == armv7
+EXTRA_PATCHES=		${FILESDIR}/extra-util.c
+.endif

I deleted this because it was a problem of my individual environment.

+	@${REINPLACE_CMD} ${_SUB_LIST_TEMP} ${WRKSRC}/examples/${file}

If you do not write this, example2 and example3 do not overwrite.
It is probably because it is not rewritten to the setting value of PLIST_SUB.

I tried putting DOCS and EXAMPLES in options.
Comment 4 Tobias Kortkamp freebsd_committer freebsd_triage 2018-05-09 02:39:28 UTC 
(In reply to takefu from comment #3)
Looks better, but you're still overwriting the default do-build target and
chrony is still being build in the wrong phase.  Patching needs to happen
in the patch phase e.g. in post-patch.

I'll fix it and commit this tomorrow with maintainer timeout.
Comment 5 Yonas Yanfa 2018-05-09 02:42:55 UTC 
Thanks Tobias! I trust that your final patch can be committed straight away.
Comment 6 commit-hook freebsd_committer freebsd_triage 2018-05-09 03:02:33 UTC 
A commit references this bug:

Author: tobik
Date: Wed May  9 03:01:58 UTC 2018
New revision: 469426
URL: https://svnweb.freebsd.org/changeset/ports/469426

Log:
  net/chrony: Update to 3.3

  - Add explicit DOCS, EXAMPLES options
  - Replace %%PREFIX%% in sample files
  - Make sure chronyc is really linked with libedit from ports
  - Add support for security/nettle and use it by default since chrony crashes
    on startup when built with NSS. [1]

  PR:		227779, 223840 [1]
  Submitted by:	takefu@airport.fm
  Approved by:	maintainer

Changes:
  head/net/chrony/Makefile
  head/net/chrony/distinfo
Comment 7 Tobias Kortkamp freebsd_committer freebsd_triage 2018-05-09 03:03:16 UTC 
(In reply to Yonas Yanfa from comment #5)
Committed. Thanks!