Date: Sun, 23 Aug 2020 20:29:48 +0000 (UTC) From: Christian Weisgerber <naddy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r546021 - in head/net/openntpd: . files Message-ID: <202008232029.07NKTm1k022348@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: naddy Date: Sun Aug 23 20:29:47 2020 New Revision: 546021 URL: https://svnweb.freebsd.org/changeset/ports/546021 Log: Zap double definitions to fix build with -fno-common. Obtained from: upstream Added: head/net/openntpd/files/patch-src_ntp.c (contents, props changed) head/net/openntpd/files/patch-src_ntp__dns.c (contents, props changed) head/net/openntpd/files/patch-src_parse.y (contents, props changed) Modified: head/net/openntpd/Makefile Modified: head/net/openntpd/Makefile ============================================================================== --- head/net/openntpd/Makefile Sun Aug 23 19:50:11 2020 (r546020) +++ head/net/openntpd/Makefile Sun Aug 23 20:29:47 2020 (r546021) @@ -2,7 +2,7 @@ PORTNAME= openntpd PORTVERSION= 6.2p3 -PORTREVISION= 6 +PORTREVISION= 7 PORTEPOCH= 2 CATEGORIES= net MASTER_SITES= OPENBSD/OpenNTPD Added: head/net/openntpd/files/patch-src_ntp.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/openntpd/files/patch-src_ntp.c Sun Aug 23 20:29:47 2020 (r546021) @@ -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; Added: head/net/openntpd/files/patch-src_ntp__dns.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/openntpd/files/patch-src_ntp__dns.c Sun Aug 23 20:29:47 2020 (r546021) @@ -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); Added: head/net/openntpd/files/patch-src_parse.y ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/openntpd/files/patch-src_parse.y Sun Aug 23 20:29:47 2020 (r546021) @@ -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; +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008232029.07NKTm1k022348>