Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/adcli/, app-crypt/adcli/files/
Date: Thu, 13 Jan 2022 06:03:00
Message-Id: 1642052958.6b33c454fa3ca9eb1aaddc0ecb20c4ae24133cbf.sam@gentoo
1 commit: 6b33c454fa3ca9eb1aaddc0ecb20c4ae24133cbf
2 Author: Henning Schild <henning <AT> hennsch <DOT> de>
3 AuthorDate: Tue Jan 11 10:42:00 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 13 05:49:18 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b33c454
7
8 app-crypt/adcli: fix musl linking bug
9
10 apply a patch which has been merged upstream
11
12 Closes: https://bugs.gentoo.org/830325
13 Signed-off-by: Henning Schild <henning <AT> hennsch.de>
14 Closes: https://github.com/gentoo/gentoo/pull/23739
15 Signed-off-by: Sam James <sam <AT> gentoo.org>
16
17 app-crypt/adcli/adcli-0.9.1-r1.ebuild | 3 ++-
18 ....9.1-library-include-endian.h-for-le32toh.patch | 28 ++++++++++++++++++++++
19 2 files changed, 30 insertions(+), 1 deletion(-)
20
21 diff --git a/app-crypt/adcli/adcli-0.9.1-r1.ebuild b/app-crypt/adcli/adcli-0.9.1-r1.ebuild
22 index 5224249d5001..f353d5f60544 100644
23 --- a/app-crypt/adcli/adcli-0.9.1-r1.ebuild
24 +++ b/app-crypt/adcli/adcli-0.9.1-r1.ebuild
25 @@ -1,4 +1,4 @@
26 -# Copyright 2021 Gentoo Authors
27 +# Copyright 2021-2022 Gentoo Authors
28 # Distributed under the terms of the GNU General Public License v2
29
30 EAPI=8
31 @@ -27,6 +27,7 @@ BDEPEND="
32
33 PATCHES=(
34 "${FILESDIR}"/${P}-glibc-2.34-resolv.patch
35 + "${FILESDIR}"/${P}-library-include-endian.h-for-le32toh.patch
36 )
37
38 src_prepare() {
39
40 diff --git a/app-crypt/adcli/files/adcli-0.9.1-library-include-endian.h-for-le32toh.patch b/app-crypt/adcli/files/adcli-0.9.1-library-include-endian.h-for-le32toh.patch
41 new file mode 100644
42 index 000000000000..246ccd990f12
43 --- /dev/null
44 +++ b/app-crypt/adcli/files/adcli-0.9.1-library-include-endian.h-for-le32toh.patch
45 @@ -0,0 +1,28 @@
46 +From dfbaa1b7f7cde281e23464ceb24699d4686651ab Mon Sep 17 00:00:00 2001
47 +From: Henning Schild <henning@×××××××.de>
48 +Date: Tue, 11 Jan 2022 08:22:55 +0100
49 +Subject: [PATCH] library: include endian.h for le32toh
50 +
51 +upstream commit 938065a751c0876eb837a27f8c1443fc7d0d2551
52 +
53 +linking against musl libc we need to include that specifically, actually
54 +also according to "man 3 endian".
55 +---
56 + library/adutil.c | 1 +
57 + 1 file changed, 1 insertion(+)
58 +
59 +diff --git a/library/adutil.c b/library/adutil.c
60 +index 9b0c47f3b7e9..4bb06a3a7588 100644
61 +--- a/library/adutil.c
62 ++++ b/library/adutil.c
63 +@@ -29,6 +29,7 @@
64 +
65 + #include <assert.h>
66 + #include <ctype.h>
67 ++#include <endian.h>
68 + #include <errno.h>
69 + #include <stdio.h>
70 + #include <stdlib.h>
71 +--
72 +2.34.1
73 +