Use acme-client from openbsd

The portable version is no longer maintained.

5 files changed, 50 insertions, 2 deletions

diff --git a/pkg/openbsd/.gitignore b/pkg/openbsd/.gitignore
index 3abe5d25..b5992db7 100644
--- a/pkg/openbsd/.gitignore
+++ b/pkg/openbsd/.gitignore
@@ -1,3 +1,4 @@
+/acme-client.ninja
 /src
 /src.tar.gz
 /sys.tar.gz
diff --git a/pkg/openbsd/fetch.sh b/pkg/openbsd/fetch.sh
index dfbe46e4..bd9e2061 100644
--- a/pkg/openbsd/fetch.sh
+++ b/pkg/openbsd/fetch.sh
@@ -26,7 +26,8 @@ zcat src.tar.gz | ${PAXREAD:-pax -r} -s ',^,src/,' \
 	'usr.bin/m4/*' \
 	'usr.bin/nc/*' \
 	'usr.bin/patch/*' \
-	'usr.bin/yacc/*'
+	'usr.bin/yacc/*' \
+	'usr.sbin/acme-client/*'
 zcat sys.tar.gz | ${PAXREAD:-pax -r} -s ',^,src/,' 'sys/sys/*'
 
 git apply -v --whitespace=nowarn --directory "$dir/src" patch/*
diff --git a/pkg/openbsd/gen.lua b/pkg/openbsd/gen.lua
index 6434d5a4..ad04c5f3 100644
--- a/pkg/openbsd/gen.lua
+++ b/pkg/openbsd/gen.lua
@@ -28,6 +28,27 @@ lib('libbsd.a', [[
 ]])
 file('lib/libbsd.a', '644', '$outdir/libbsd.a')
 
+-- acme-client
+sub('acme-client.ninja', function()
+	cflags{
+		'-D _GNU_SOURCE',  -- for memmem
+		'-I $builddir/pkg/libressl/include',
+	}
+
+	yacc('usr.sbin/acme-client/parse', 'usr.sbin/acme-client/parse.y')
+	cc('$outdir/usr.sbin/acme-client/parse.tab.c', nil, {cflags='$cflags -I $srcdir/usr.sbin/acme-client'})
+	exe('acme-client', [[
+		usr.sbin/acme-client/(
+			acctproc.c base64.c certproc.c chngproc.c dbg.c dnsproc.c
+			fileproc.c http.c jsmn.c json.c keyproc.c main.c netproc.c
+			parse.tab.c.o revokeproc.c rsa.c util.c
+		)
+		$builddir/pkg/libressl/libtls.a.d
+	]], {'pkg/libressl/headers'})
+	file('bin/acme-client', '755', '$outdir/acme-client')
+	man{'usr.sbin/acme-client/acme-client.1', 'usr.sbin/acme-client/acme-client.conf.5'}
+end)
+
 -- diff
 exe('diff', 'usr.bin/diff/(diff.c diffdir.c diffreg.c xmalloc.c) libbsd.a')
 file('bin/diff', '755', '$outdir/diff')
diff --git a/pkg/openbsd/patch/0024-acme-client-Add-missing-includes.patch b/pkg/openbsd/patch/0024-acme-client-Add-missing-includes.patch
new file mode 100644
index 00000000..31f034c6
--- /dev/null
+++ b/pkg/openbsd/patch/0024-acme-client-Add-missing-includes.patch
@@ -0,0 +1,25 @@
+From 7ea4349d2ed8afd672348a7d2f3534007e5dc442 Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Mon, 18 Mar 2019 14:52:31 -0700
+Subject: [PATCH] acme-client: Add missing includes
+
+---
+ usr.sbin/acme-client/extern.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/usr.sbin/acme-client/extern.h b/usr.sbin/acme-client/extern.h
+index dda2edde4..d83ead634 100644
+--- a/usr.sbin/acme-client/extern.h
++++ b/usr.sbin/acme-client/extern.h
+@@ -17,6 +17,8 @@
+ #ifndef EXTERN_H
+ #define EXTERN_H
+ 
++#include <sys/cdefs.h>
++#include <sys/types.h>
+ #include "parse.h"
+ 
+ #define MAX_SERVERS_DNS 8
+-- 
+2.21.0
+
diff --git a/pkg/openbsd/ver b/pkg/openbsd/ver
index d31e00ec..ee7fae4e 100644
--- a/pkg/openbsd/ver
+++ b/pkg/openbsd/ver
@@ -1 +1 @@
-6.4 r0
+6.4 r1