From 7c096bce9b2a55adcec8e5bf4d82e75e53ab6b9d Mon Sep 17 00:00:00 2001 From: Michael Forney Date: Sun, 16 Jun 2019 12:02:51 -0700 Subject: openntpd: Fix patch numbering --- .../patch/0001-Remove-duplicate-definitions.patch | 27 ---------------------- .../patch/0002-Remove-duplicate-definitions.patch | 27 ++++++++++++++++++++++ 2 files changed, 27 insertions(+), 27 deletions(-) delete mode 100644 pkg/openntpd/patch/0001-Remove-duplicate-definitions.patch create mode 100644 pkg/openntpd/patch/0002-Remove-duplicate-definitions.patch (limited to 'pkg') diff --git a/pkg/openntpd/patch/0001-Remove-duplicate-definitions.patch b/pkg/openntpd/patch/0001-Remove-duplicate-definitions.patch deleted file mode 100644 index 899de486..00000000 --- a/pkg/openntpd/patch/0001-Remove-duplicate-definitions.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 63da2d40cd92c5851ac18fe9a8adecf512cd669c Mon Sep 17 00:00:00 2001 -From: Michael Forney -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/patch/0002-Remove-duplicate-definitions.patch b/pkg/openntpd/patch/0002-Remove-duplicate-definitions.patch new file mode 100644 index 00000000..899de486 --- /dev/null +++ b/pkg/openntpd/patch/0002-Remove-duplicate-definitions.patch @@ -0,0 +1,27 @@ +From 63da2d40cd92c5851ac18fe9a8adecf512cd669c Mon Sep 17 00:00:00 2001 +From: Michael Forney +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 + -- cgit v1.2.3