Attachment #192821 for bug #227779




# $FreeBSD: head/net/chrony/Makefile 454559 2017-11-20 13:49:59Z rodrigo $

PORTNAME=	chrony
PORTVERSION=	3.3
PORTREVISION=	3
CATEGORIES=	net
MASTER_SITES=	http://download.tuxfamily.org/chrony/



# XXX: there are also other potentially useful options worth looking into:
#  --disable-pps        Disable PPS API support
OPTIONS_DEFINE=		IPV6 NSS NETTLE
OPTIONS_DEFAULT=	NETTLE

IPV6_CATEGORIES=	ipv6
IPV6_CONFIGURE_OFF=	--disable-ipv6
IPV6_CONFIGURE_ON=	--disable-readline

NSS_BROKEN=		see Bug 223840
NSS_DESC=		Add support for more hashing algorithms
NSS_CONFIGURE_OFF=	--without-nss
NSS_LIB_DEPENDS=	libfreebl3.so:security/nss
NSS_USES=		pkgconfig

NETTLE_DESC=		Nettle crypto library support
NETTLE_CONFIGURE_OFF=	--without-nettle
NETTLE_LIB_DEPENDS=	libnettle.so:security/nettle

.include <bsd.port.pre.mk>

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

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

post-install:
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/chronyc
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/chronyd

	${INSTALL_DATA} ${WRKSRC}/examples/chrony.conf.example3 \
		${STAGEDIR}${PREFIX}/etc/chrony.conf.sample

.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)./distinfo (-3 / +3 lines)
1	TIMESTAMP = 1488375273	1	TIMESTAMP = 1524659947
2	SHA256 (chrony-3.1.tar.gz) = 9d9107dcdb7768a03dc129d33b2a7a25f1eea2f5620bc85eb00cfea07c1b6075	2	SHA256 (chrony-3.3.tar.gz) = 0d1fb2d5875032f2d5a86f3770374c87ee4c941916f64171e81f7684f2a73128
3	SIZE (chrony-3.1.tar.gz) = 424109	3	SIZE (chrony-3.3.tar.gz) = 443571

Line 0 Link Here

(-)./files/extra-util.c (+11 lines)
	1	--- util.c.orig 2017-01-31 10:22:11 UTC
	2	+++ util.c
	3	@@ -738,7 +738,7 @@ UTI_TimespecToNtp64(struct timespec *src
	4	hi = lo = 0;
	5	} else {
	6	hi = htonl(sec + JAN_1970);
	7	- lo = htonl(NSEC_PER_NTP64 * nsec);
	8	+ lo = htonl((uint32_t)(NSEC_PER_NTP64 * nsec));
	9
	10	/* Add the fuzz */
	11	if (fuzz) {

Lines 1-11 Link Here

(-)./files/patch-util.c (-11 lines)
1	--- util.c.orig 2017-01-31 10:22:11 UTC
2	+++ util.c
3	@@ -738,7 +738,7 @@ UTI_TimespecToNtp64(struct timespec *src
4	hi = lo = 0;
5	} else {
6	hi = htonl(sec + JAN_1970);
7	- lo = htonl(NSEC_PER_NTP64 * nsec);
8	+ lo = htonl((uint32_t)(NSEC_PER_NTP64 * nsec));
9
10	/* Add the fuzz */
11	if (fuzz) {

Return to bug 227779

Lines 2-9 Link Here

(-)./Makefile (-5 / +21 lines)
2	# $FreeBSD: head/net/chrony/Makefile 454559 2017-11-20 13:49:59Z rodrigo $	2	# $FreeBSD: head/net/chrony/Makefile 454559 2017-11-20 13:49:59Z rodrigo $
3		3
4	PORTNAME= chrony	4	PORTNAME= chrony
5	PORTVERSION= 3.1	5	PORTVERSION= 3.3
6	PORTREVISION= 3
7	CATEGORIES= net	6	CATEGORIES= net
8	MASTER_SITES= http://download.tuxfamily.org/chrony/	7	MASTER_SITES= http://download.tuxfamily.org/chrony/
9		8
Lines 34-50 PORTEXAMPLES= chrony.conf.example1 chron Link Here
34		33
35	# XXX: there are also other potentially useful options worth looking into:	34	# XXX: there are also other potentially useful options worth looking into:
36	# --disable-pps Disable PPS API support	35	# --disable-pps Disable PPS API support
37	OPTIONS_DEFINE= IPV6 NSS	36	OPTIONS_DEFINE= IPV6 NSS NETTLE
38	OPTIONS_DEFAULT= NSS	37	OPTIONS_DEFAULT= NETTLE
39		38
40	IPV6_CATEGORIES= ipv6	39	IPV6_CATEGORIES= ipv6
41	IPV6_CONFIGURE_OFF= --disable-ipv6	40	IPV6_CONFIGURE_OFF= --disable-ipv6
		41	IPV6_CONFIGURE_ON= --disable-readline
42		42
		43	NSS_BROKEN= see Bug 223840
43	NSS_DESC= Add support for more hashing algorithms	44	NSS_DESC= Add support for more hashing algorithms
44	NSS_CONFIGURE_OFF= --without-nss	45	NSS_CONFIGURE_OFF= --without-nss
45	NSS_LIB_DEPENDS= libfreebl3.so:security/nss	46	NSS_LIB_DEPENDS= libfreebl3.so:security/nss
46	NSS_USES= pkgconfig	47	NSS_USES= pkgconfig
47		48
		49	NETTLE_DESC= Nettle crypto library support
		50	NETTLE_CONFIGURE_OFF= --without-nettle
		51	NETTLE_LIB_DEPENDS= libnettle.so:security/nettle
		52
		53	.include <bsd.port.pre.mk>
		54
		55	.if ${ARCH} == armv6 \|\| ${ARCH} == armv7
		56	EXTRA_PATCHES= ${FILESDIR}/extra-util.c
		57	.endif
		58
		59	do-build:
		60	.for file in ${PORTEXAMPLES}
		61	@${REINPLACE_CMD} ${_SUB_LIST_TEMP} ${WRKSRC}/examples/${file}
		62	.endfor
		63
48	post-install:	64	post-install:
49	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/chronyc	65	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/chronyc
50	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/chronyd	66	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/chronyd
Lines 56-59 post-install: Link Here
56	${INSTALL_DATA} ${WRKSRC}/examples/chrony.conf.example3 \	72	${INSTALL_DATA} ${WRKSRC}/examples/chrony.conf.example3 \
57	${STAGEDIR}${PREFIX}/etc/chrony.conf.sample	73	${STAGEDIR}${PREFIX}/etc/chrony.conf.sample
58		74
59	.include <bsd.port.mk>	75	.include <bsd.port.post.mk>