logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git
commit: 0e46344b5f8ff15224140d961f62a731e8a36d1f
parent 5f74aa5e75a0442b86a26bcec9387af706a579f7
Author: Michael Forney <mforney@mforney.org>
Date:   Sat, 15 Jun 2019 19:45:00 -0700

openntpd: Remove a couple duplicate variable definitions

Diffstat:

Apkg/openntpd/patch/0001-Remove-duplicate-definitions.patch27+++++++++++++++++++++++++++
Mpkg/openntpd/ver2+-
2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/pkg/openntpd/patch/0001-Remove-duplicate-definitions.patch b/pkg/openntpd/patch/0001-Remove-duplicate-definitions.patch @@ -0,0 +1,27 @@ +From 63da2d40cd92c5851ac18fe9a8adecf512cd669c Mon Sep 17 00:00:00 2001 +From: Michael Forney <mforney@mforney.org> +Date: Sat, 15 Jun 2019 19:42:17 -0700 +Subject: [PATCH] Remove duplicate definitions + +--- + src/ntp.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/ntp.c b/src/ntp.c +index f7a6ede..8009755 100644 +--- a/src/ntp.c ++++ b/src/ntp.c +@@ -42,8 +42,8 @@ + + volatile sig_atomic_t ntp_quit = 0; + struct imsgbuf *ibuf_main; +-struct imsgbuf *ibuf_dns; +-struct ntpd_conf *conf; ++extern struct imsgbuf *ibuf_dns; ++extern struct ntpd_conf *conf; + struct ctl_conns ctl_conns; + u_int peer_cnt; + u_int sensors_cnt; +-- +2.20.1 + diff --git a/pkg/openntpd/ver b/pkg/openntpd/ver @@ -1 +1 @@ -6.2p3 r0 +6.2p3 r1