1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-20 00:21:35 +00:00

Zap double definitions to fix build with -fno-common.

Obtained from:	upstream
This commit is contained in:
Christian Weisgerber 2020-08-23 20:29:47 +00:00
parent 8cbdc0fbd6
commit 7d3866c970
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=546021
4 changed files with 33 additions and 1 deletions

View File

@ -2,7 +2,7 @@
PORTNAME= openntpd
PORTVERSION= 6.2p3
PORTREVISION= 6
PORTREVISION= 7
PORTEPOCH= 2
CATEGORIES= net
MASTER_SITES= OPENBSD/OpenNTPD

View File

@ -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;

View File

@ -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);

View File

@ -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;