upgpkg: acme-client 0.1.12

3 files changed, 42 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 38e68d2d4bef..34e02160a3ed 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = acme-client-git
 	pkgdesc = Yet another ACME client, specifically for Let's Encrypt, but one with a strong focus on security. Written in C.
-	pkgver = 0.1.11.r4.ge15995f
-	pkgrel = 2
+	pkgver = 0.1.12.r0.g2d209d4
+	pkgrel = 1
 	url = https://kristaps.bsd.lv/acme-client/
 	arch = x86_64
 	arch = i686
@@ -18,11 +18,13 @@ pkgbase = acme-client-git
 	source = acme@.timer
 	source = acme@.service
 	source = example.conf
+	source = bsd-cdefs.patch
 	sha256sums = SKIP
 	sha256sums = bd5726f3e247e7a7d30ce69946d174b8fb92d999d22710c65f176c969812960e
 	sha256sums = c7d852229ae8a1b816ec476554c5d703a5513e6578a38672a52f7e7fca653b73
 	sha256sums = d6e274929979a385308f29b4f15a923ce888b57faca9925b6f46a995b2bfd662
 	sha256sums = 297cf2592b1baed8da591136334ab7fc1f4f64a6a093a1ac657ceaae45aa8583
+	sha256sums = 0336ab833dc0332bbeaacf952d2dba41614de2cbc9f129b85334206ddb5082cd
 
 pkgname = acme-client-git
 
diff --git a/PKGBUILD b/PKGBUILD
index ad934ee105ce..f7f32e90f470 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 
 pkgname=acme-client-git
 _pkgname=acme-client
-pkgver=0.1.11.r4.ge15995f
-pkgrel=2
+pkgver=0.1.12.r0.g2d209d4
+pkgrel=1
 arch=('x86_64' 'i686')
 license=('BSD')
 pkgdesc="Yet another ACME client, specifically for Let's Encrypt, but one with a strong focus on security. Written in C."
@@ -15,13 +15,15 @@ source=(${pkgname}::'git+https://github.com/kristapsdz/acme-client-portable.git'
         "http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${_sslver}.tar.gz"
         'acme@.timer'
         'acme@.service'
-        'example.conf')
+        'example.conf'
+        'bsd-cdefs.patch')
 
 sha256sums=('SKIP'
             'bd5726f3e247e7a7d30ce69946d174b8fb92d999d22710c65f176c969812960e'
             'c7d852229ae8a1b816ec476554c5d703a5513e6578a38672a52f7e7fca653b73'
             'd6e274929979a385308f29b4f15a923ce888b57faca9925b6f46a995b2bfd662'
-            '297cf2592b1baed8da591136334ab7fc1f4f64a6a093a1ac657ceaae45aa8583')
+            '297cf2592b1baed8da591136334ab7fc1f4f64a6a093a1ac657ceaae45aa8583'
+            '0336ab833dc0332bbeaacf952d2dba41614de2cbc9f129b85334206ddb5082cd')
 
 depends=('libbsd')
 makedepends=('git')
@@ -36,14 +38,17 @@ pkgver() {
 	git describe --long --tags | sed 's/VERSION_//;s/\([^-]*-g\)/r\1/;s/[-_]/./g'
 }
 
+prepare() {
+	cd "${pkgname}"
+	patch -Np1 <../bsd-cdefs.patch
+}
+
 build() {
-	pushd "libressl-${_sslver}"
+	cd "libressl-${_sslver}"
 	./configure --disable-shared --enable-static
 	make
 
-	popd
-
-	pushd "${pkgname}"
+	cd "../${pkgname}"
 	make \
 		CPPFLAGS="-I../libressl-${_sslver}/include" \
 		LDFLAGS="-L../libressl-${_sslver}/{tls,ssl,crypto}/.libs"
@@ -60,5 +65,4 @@ package() {
 	install -Dm644 -t "${pkgdir}/etc/acme" ../example.conf
 
 	install -dm0755 "${pkgdir}/var/lib/acme/accounts" "${pkgdir}/var/lib/acme/certs"
-
 }
diff --git a/bsd-cdefs.patch b/bsd-cdefs.patch
new file mode 100644
index 000000000000..84676f212716
--- /dev/null
+++ b/bsd-cdefs.patch
@@ -0,0 +1,25 @@
+diff --git a/config.h b/config.h
+index 6187523..537933e 100644
+--- a/config.h
++++ b/config.h
+@@ -20,6 +20,7 @@
+ # ifndef MUSL_LIBC
+ #  include <bsd/stdlib.h>
+ #  include <bsd/string.h>
++#  include <bsd/sys/cdefs.h>
+ # else
+ #  include <errno.h>
+ #  include <unistd.h>
+diff --git a/main.c b/main.c
+index 1ccfe4a..45ef79d 100644
+--- a/main.c
++++ b/main.c
+@@ -120,7 +120,7 @@ xdup(int infd, int outfd)
+  * Execute "newargs", which is already created in main(), as a
+  * subprocess of type "comp".
+  */
+-static __dead void
++static __dead2 void
+ xrun(enum comp comp, const char **newargs)
+ {
+