Index: head/net/openntpd/Makefile =================================================================== --- head/net/openntpd/Makefile (revision 546020) +++ head/net/openntpd/Makefile (revision 546021) @@ -1,59 +1,59 @@ # $FreeBSD$ PORTNAME= openntpd PORTVERSION= 6.2p3 -PORTREVISION= 6 +PORTREVISION= 7 PORTEPOCH= 2 CATEGORIES= net MASTER_SITES= OPENBSD/OpenNTPD MAINTAINER= naddy@FreeBSD.org COMMENT= Network Time Protocol (NTP) daemon LICENSE= ISCL RUN_DEPENDS= ca_root_nss>=0:security/ca_root_nss USES= ssl CONFLICTS= ntp ntp-devel ntpsec USE_RC_SUBR= openntpd USERS= _ntp GROUPS= _ntp GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-cacert=${LOCALBASE}/etc/ssl/cert.pem SUB_FILES= 480.status-openntpd pkg-message SUB_LIST= MANPREFIX="${MANPREFIX}" pre-build: ${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \ ${WRKSRC}/src/ntpd.conf.5 ${WRKSRC}/src/ntpd.8 post-install: cd ${STAGEDIR}${PREFIX}/etc && ${MV} ntpd.conf ntpd.conf.sample ${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily ${INSTALL_SCRIPT} ${WRKDIR}/480.status-openntpd \ ${STAGEDIR}${PREFIX}/etc/periodic/daily .include # Requires libtls from LibreSSL .if ${SSL_DEFAULT:Mlibressl*} CPPFLAGS+= -I${OPENSSLINC} LDFLAGS+= -L${OPENSSLLIB} .else # SSL_DEFAULT BUILD_DEPENDS+= ${NONEXISTENT}:security/libressl:stage CPPFLAGS+= -I${WRKDIR}/libressl/include LDFLAGS+= -L${WRKDIR}/libressl/lib # Don't use COPYTREE_SHARE here as it hard links files, and the original files # are owned by root, which creates problems of its own. pre-configure: @cd `${MAKE} -V STAGEDIR -C ${PORTSDIR}/security/libressl`${PREFIX} \ && ${FIND} . ! -name *.so\* | ${CPIO} -dump ${WRKDIR}/libressl >/dev/null 2>&1 .endif # SSL_DEFAULT .include Index: head/net/openntpd/files/patch-src_ntp.c =================================================================== --- head/net/openntpd/files/patch-src_ntp.c (nonexistent) +++ head/net/openntpd/files/patch-src_ntp.c (revision 546021) @@ -0,0 +1,11 @@ +--- src/ntp.c.orig 2017-06-19 13:23:10 UTC ++++ src/ntp.c +@@ -42,7 +42,7 @@ + + volatile sig_atomic_t ntp_quit = 0; + struct imsgbuf *ibuf_main; +-struct imsgbuf *ibuf_dns; ++static struct imsgbuf *ibuf_dns; + struct ntpd_conf *conf; + struct ctl_conns ctl_conns; + u_int peer_cnt; Property changes on: head/net/openntpd/files/patch-src_ntp.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/openntpd/files/patch-src_ntp__dns.c =================================================================== --- head/net/openntpd/files/patch-src_ntp__dns.c (nonexistent) +++ head/net/openntpd/files/patch-src_ntp__dns.c (revision 546021) @@ -0,0 +1,11 @@ +--- src/ntp_dns.c.orig 2017-06-19 13:23:10 UTC ++++ src/ntp_dns.c +@@ -33,7 +33,7 @@ + #include "ntpd.h" + + volatile sig_atomic_t quit_dns = 0; +-struct imsgbuf *ibuf_dns; ++static struct imsgbuf *ibuf_dns; + + void sighdlr_dns(int); + int dns_dispatch_imsg(void); Property changes on: head/net/openntpd/files/patch-src_ntp__dns.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/openntpd/files/patch-src_parse.y =================================================================== --- head/net/openntpd/files/patch-src_parse.y (nonexistent) +++ head/net/openntpd/files/patch-src_parse.y (revision 546021) @@ -0,0 +1,10 @@ +--- src/parse.y.orig 2020-08-23 20:10:30 UTC ++++ src/parse.y +@@ -57,7 +57,6 @@ int lgetc(int); + int lungetc(int); + int findeol(void); + +-struct ntpd_conf *conf; + struct sockaddr_in query_addr4; + struct sockaddr_in6 query_addr6; + Property changes on: head/net/openntpd/files/patch-src_parse.y ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property