public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

acme-client: 0.2.5 -> 1.0.0 

The upstream version fails to compile due to a missing limits.h include.
I added a patch to fix that.

I opened a pull request to upstream it too, but the project has moved
from GitHub onto sr.ht and now asks me to send a patch to the mailing
list. My default email client is not really suitable for that, and
getting git-send-email set up will take some work, so in the meantime
it is easier to just patch it here.
This commit is contained in:
Ruud van Asseldonk 2020-05-19 23:01:00 +02:00
parent aeeb341c3e
commit d4c80a478b
2 changed files with 45 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/networking/acme-client/default.nix
View File

@ -12,13 +12,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "acme-client";
version = "0.2.5";
version = "1.0.0";
src = fetchFromGitHub {
owner = "graywolf";
repo = "acme-client-portable";
rev = "v${version}";
sha256 = "1d9yk87nj5gizkq26m4wqfh4xhlrn5xlfj7mfgvrpsdiwibqxrrw";
sha256 = "1p6jbxg00ing9v3jnpvq234w5r2gf8b04k9qm06mn336lcd2lgpl";
};
nativeBuildInputs = [ autoreconfHook bison pkgconfig ];
@ -26,6 +26,8 @@ stdenv.mkDerivation rec {
makeFlags = [ "PREFIX=${placeholder "out"}" ];
patches = [ ./limits.h.patch ];
meta = {
homepage = "https://github.com/graywolf/acme-client-portable";
description = "Secure ACME/Let's Encrypt client";

41
pkgs/tools/networking/acme-client/limits.h.patch Normal file
View File

@ -0,0 +1,41 @@
From 05b32236adf0f3f43d74b7824b7b20bc917c6db9 Mon Sep 17 00:00:00 2001
From: Ruud van Asseldonk <dev@veniogames.com>
Date: Tue, 19 May 2020 22:32:01 +0200
Subject: [PATCH] Include limits.h in compat.c
Without this, the compiler says:
compat.c: In function 'strtonum':
compat.c:235:19: error: 'LLONG_MIN' undeclared (first use in this function)
235 | else if ((ll == LLONG_MIN && errno == ERANGE) || ll < minval)
| ^~~~~~~~~
compat.c:9:1: note: 'LLONG_MIN' is defined in header '<limits.h>'; did you forget to '#include <limits.h>'?
8 | #include <unistd.h>
+++ |+#include <limits.h>
9 |
compat.c:235:19: note: each undeclared identifier is reported only once for each function it appears in
235 | else if ((ll == LLONG_MIN && errno == ERANGE) || ll < minval)
| ^~~~~~~~~
compat.c:237:19: error: 'LLONG_MAX' undeclared (first use in this function)
237 | else if ((ll == LLONG_MAX && errno == ERANGE) || ll > maxval)
| ^~~~~~~~~
compat.c:237:19: note: 'LLONG_MAX' is defined in header '<limits.h>'; did you forget to '#include <limits.h>'?
---
compat.c | 1 +
1 file changed, 1 insertion(+)
diff --git ./compat.c ./compat.c
index 72a2f96..f990eca 100644
--- compat.c
+++ compat.c
@@ -1,6 +1,7 @@
#include "compat.h"
#include <errno.h>
+#include <limits.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
--
2.26.2