testing/acme-client: upgrade to 0.1.14

this should fix https://github.com/kristapsdz/acme-client-portable/pull/8
This commit is contained in:
Carlo Landmeter 2016-11-03 16:12:26 +01:00
parent 17ef1c8d4a
commit bc26d7e9db
2 changed files with 5 additions and 87 deletions

View File

@ -1,9 +1,9 @@
# Contributor: ScrumpyJack <scrumpyjack@st.ilet.to>
# Maintainer: ScrumpyJack <scrumpyjack@st.ilet.to>
pkgname=acme-client
pkgver=0.1.11
pkgver=0.1.14
_ver=${pkgver//./_}
pkgrel=1
pkgrel=0
pkgdesc="An ACME client for Let's Encrypt written in C"
url="https://github.com/kristapsdz/acme-client-portable"
arch="all"
@ -13,7 +13,6 @@ makedepends="bsd-compat-headers libressl-dev"
install=""
subpackages="$pkgname-doc"
source="https://github.com/kristapsdz/acme-client-portable/archive/VERSION_$_ver.tar.gz
musl-fixes.patch
"
builddir="$srcdir/acme-client-portable-VERSION_$_ver"
@ -29,9 +28,6 @@ package() {
|| return 1
}
md5sums="7cba9c27c78db90820b2213dfe26455e VERSION_0_1_11.tar.gz
cff25a3cd6dacf36ee45cee8c7e1ffac musl-fixes.patch"
sha256sums="666270aae33f9ae2332a7847cc127d28a075801415e23570ceab5dc2beca1be2 VERSION_0_1_11.tar.gz
9555157ed40ea9d7a2d3868504f41e37f68623aa11e7b971a56536af85992921 musl-fixes.patch"
sha512sums="8fb0a73076ddcfd6a0a8da9a810d2f65e1cace051a8841fca7f466c9a6488307239be669a951c95481a2bb1c703e9e53e3149c4369a9fd71cfe6af4f5a31736f VERSION_0_1_11.tar.gz
39c0942d49db644ca1698f1d68d2f71b48f82b4192e654ec7dcbe61d7dd30cc0596b9a6cd0845bc2abe1ee360a4f24a551b071bcc5ad5a47f26d185282ccf014 musl-fixes.patch"
md5sums="4bd07ce3000dfee2595d5b7ba05741e7 VERSION_0_1_14.tar.gz"
sha256sums="41bdf18485fd3e0f0ca290b6844e704c2be16ebc6106a51dc4548693ab9d6667 VERSION_0_1_14.tar.gz"
sha512sums="03058da278da9c5a53940a5ba289e1d2eac52e57ef565fb061e9d2093b8baac77f7ec299a4deecfac9b02286d62d9fac198595ca2ba7d2b502be5adc4a41b5ab VERSION_0_1_14.tar.gz"

View File

@ -1,78 +0,0 @@
From aa0f79a965bf54351ff2d86f1d7a8c36d7f59c62 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 20 Oct 2016 11:37:47 +0200
Subject: [PATCH] Support musl libc without libbsd
libbsd is not very portable and does not work with musl libc on arm.
When on linux we only require libbsd if GNU libc is detected.
---
GNUmakefile | 4 ++++
config.h | 18 ++++++++++++++++--
extern.h | 2 ++
3 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/GNUmakefile b/GNUmakefile
index c6a605d..af2b815 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -25,7 +25,11 @@ OBJS = acctproc.o \
ifeq ($(shell uname), Linux)
# Compiling on Linux.
+ifeq ($(shell $(CC) -dM -E - < /dev/null | grep __GLIBC__),__GLIBC__)
+# require libbsd for GNU libc, but not for musl libc
+CFLAGS += -DHAVE_LIBBSD
LIBBSD = -lbsd
+endif
CFLAGS += -I/usr/local/include/libressl
LDFLAGS += -L/usr/local/lib
OBJS += util-portable.o \
diff --git a/config.h b/config.h
index 3aa6563..423382f 100644
--- a/config.h
+++ b/config.h
@@ -17,8 +17,21 @@
*/
#ifdef __linux__
# define _GNU_SOURCE
-# include <bsd/stdlib.h>
-# include <bsd/string.h>
+# ifdef HAVE_LIBBSD
+# include <bsd/stdlib.h>
+# include <bsd/string.h>
+# else
+# ifndef __BEGIN_DECLS
+# define __BEGIN_DECLS
+# endif
+# ifndef __END_DECLS
+# define __END_DECLS
+# endif
+# include <errno.h>
+ static inline const char *getprogname() {
+ return program_invocation_short_name;
+ }
+# endif
# include <grp.h>
#endif
@@ -41,3 +54,4 @@ int setresuid(gid_t, gid_t, gid_t);
#include <netinet/in.h>
#include <resolv.h>
#endif
+
diff --git a/extern.h b/extern.h
index ada0063..ebf38aa 100644
--- a/extern.h
+++ b/extern.h
@@ -17,6 +17,8 @@
#ifndef EXTERN_H
#define EXTERN_H
+#include <unistd.h> /* for pid_t */
+
#ifndef PATH_VAR_EMPTY
#define PATH_VAR_EMPTY "/var/empty"
#endif
--
2.10.1