commit: 02b6145e1946b99f8c939dab3f4db81b9259f85a
parent 638a869d2c7ada3ed7a33c19ed269d19989c708f
Author: Michael Forney <mforney@mforney.org>
Date: Mon, 18 Mar 2019 15:01:54 -0700
Use acme-client from openbsd
The portable version is no longer maintained.
Diffstat:
11 files changed, 50 insertions(+), 104 deletions(-)
diff --git a/.gitmodules b/.gitmodules
@@ -1,7 +1,3 @@
-[submodule "pkg/acme-client/src"]
- path = pkg/acme-client/src
- url = https://github.com/kristapsdz/acme-client
- ignore = all
[submodule "pkg/alsa-lib/src"]
path = pkg/alsa-lib/src
url = git://git.alsa-project.org/alsa-lib.git
diff --git a/pkg/acme-client/gen.lua b/pkg/acme-client/gen.lua
@@ -1,33 +0,0 @@
-cflags{
- '-D _GNU_SOURCE',
- '-I pkg/openbsd/include',
- '-I $builddir/pkg/libressl/include',
-}
-
-pkg.deps = {'pkg/libressl/headers'}
-
-exe('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',
- 'revokeproc.c',
- 'rsa.c',
- 'sandbox-pledge.c',
- 'util.c',
- 'util-pledge.c',
- '$builddir/pkg/libressl/libtls.a.d',
-})
-file('bin/acme-client', '755', '$outdir/acme-client')
-man{'acme-client.1'}
-
-fetch 'git'
diff --git a/pkg/acme-client/patch/0001-Remove-__-BEGIN-END-_DECLS-and-add-sys-types-include.patch b/pkg/acme-client/patch/0001-Remove-__-BEGIN-END-_DECLS-and-add-sys-types-include.patch
@@ -1,62 +0,0 @@
-From e25b260070a79b63f8f6be0cfcfcd1bd48f5e75c Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Thu, 6 Jul 2017 20:32:01 -0700
-Subject: [PATCH] Remove __{BEGIN,END}_DECLS and add sys/types include
-
----
- extern.h | 6 ++----
- http.h | 4 ----
- 2 files changed, 2 insertions(+), 8 deletions(-)
-
-diff --git a/extern.h b/extern.h
-index cb7664e..3d43c05 100644
---- a/extern.h
-+++ b/extern.h
-@@ -17,6 +17,8 @@
- #ifndef EXTERN_H
- #define EXTERN_H
-
-+#include <sys/types.h>
-+
- #ifndef PATH_VAR_EMPTY
- #define PATH_VAR_EMPTY "/var/empty"
- #endif
-@@ -173,8 +175,6 @@ struct capaths {
-
- struct jsmnn;
-
--__BEGIN_DECLS
--
- /*
- * Start with our components.
- * These are all isolated and talk to each other using sockets.
-@@ -267,6 +267,4 @@ int verbose;
- */
- enum comp proccomp;
-
--__END_DECLS
--
- #endif /* ! EXTERN_H */
-diff --git a/http.h b/http.h
-index ba88107..af196db 100644
---- a/http.h
-+++ b/http.h
-@@ -62,8 +62,6 @@ struct httpget {
- size_t bodypartsz; /* size of bodypart */
- };
-
--__BEGIN_DECLS
--
- /* Configuration functions. */
- struct httpcfg *http_init(void);
- void http_uninit(struct httpcfg *);
-@@ -96,6 +94,4 @@ int http_head_status(const struct http *,
- struct httphead *http_head_get(const char *,
- struct httphead *, size_t);
-
--__END_DECLS
--
- #endif /* HTTP_H */
---
-2.13.2
-
diff --git a/pkg/acme-client/src b/pkg/acme-client/src
@@ -1 +0,0 @@
-Subproject commit e771e191bfca7b09b9d6af312ddbbba936db15e7
diff --git a/pkg/acme-client/ver b/pkg/acme-client/ver
@@ -1 +0,0 @@
-0.1.16 r0
diff --git a/pkg/gen.lua b/pkg/gen.lua
@@ -1,4 +1,3 @@
-subgen 'acme-client'
subgen 'adobe-source-fonts'
subgen 'alsa-lib'
subgen 'alsa-utils'
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -1 +1 @@
-6.4 r0
+6.4 r1
