summaryrefslogtreecommitdiff
path: root/pkg/openbsd/patch/0029-acme-client-Prevent-duplicate-definitions-of-global-.patch
diff options
context:
space:
mode:
Diffstat (limited to 'pkg/openbsd/patch/0029-acme-client-Prevent-duplicate-definitions-of-global-.patch')
-rw-r--r--pkg/openbsd/patch/0029-acme-client-Prevent-duplicate-definitions-of-global-.patch56
1 files changed, 56 insertions, 0 deletions
diff --git a/pkg/openbsd/patch/0029-acme-client-Prevent-duplicate-definitions-of-global-.patch b/pkg/openbsd/patch/0029-acme-client-Prevent-duplicate-definitions-of-global-.patch
new file mode 100644
index 00000000..3dab8fce
--- /dev/null
+++ b/pkg/openbsd/patch/0029-acme-client-Prevent-duplicate-definitions-of-global-.patch
@@ -0,0 +1,56 @@
+From 6f080695f603d1a5f2ddb8c251c146cf9be59463 Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Sat, 15 Jun 2019 20:20:36 -0700
+Subject: [PATCH] acme-client: Prevent duplicate definitions of global
+ variables
+
+---
+ usr.sbin/acme-client/extern.h | 4 ++--
+ usr.sbin/acme-client/main.c | 5 +++--
+ 2 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/usr.sbin/acme-client/extern.h b/usr.sbin/acme-client/extern.h
+index cf0abbdfb2c..1ea82ec0b8e 100644
+--- a/usr.sbin/acme-client/extern.h
++++ b/usr.sbin/acme-client/extern.h
+@@ -253,12 +253,12 @@ char *json_fmt_signed(const char *,
+ /*
+ * Should we print debugging messages?
+ */
+-int verbose;
++extern int verbose;
+
+ /*
+ * What component is the process within (COMP__MAX for none)?
+ */
+-enum comp proccomp;
++extern enum comp proccomp;
+
+ __END_DECLS
+
+diff --git a/usr.sbin/acme-client/main.c b/usr.sbin/acme-client/main.c
+index bbedeb76357..d98d7560174 100644
+--- a/usr.sbin/acme-client/main.c
++++ b/usr.sbin/acme-client/main.c
+@@ -32,6 +32,9 @@
+ #define WWW_DIR "/var/www/acme"
+ #define CONF_FILE "/etc/acme-client.conf"
+
++int verbose;
++enum comp proccomp;
++
+ int
+ main(int argc, char *argv[])
+ {
+@@ -48,8 +51,6 @@ main(int argc, char *argv[])
+ int c, rc, revocate = 0;
+ int popts = 0;
+ pid_t pids[COMP__MAX];
+- extern int verbose;
+- extern enum comp proccomp;
+ size_t i, altsz, ne;
+
+ struct acme_conf *conf = NULL;
+--
+2.22.0
+