1 |
commit: 13c93be34bcf32350b94c0093d85cbf59788122e |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Aug 28 16:58:25 2018 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Aug 28 16:59:41 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13c93be3 |
7 |
|
8 |
net-libs/liboping: fix building with GCC8 |
9 |
|
10 |
Package-Manager: Portage-2.3.48, Repoman-2.3.10 |
11 |
RepoMan-Options: --force |
12 |
|
13 |
.../liboping/files/liboping-1.10.0-gcc8-fix.patch | 28 ++++++++++++++++++++++ |
14 |
...ing-1.10.0.ebuild => liboping-1.10.0-r1.ebuild} | 1 + |
15 |
2 files changed, 29 insertions(+) |
16 |
|
17 |
diff --git a/net-libs/liboping/files/liboping-1.10.0-gcc8-fix.patch b/net-libs/liboping/files/liboping-1.10.0-gcc8-fix.patch |
18 |
new file mode 100644 |
19 |
index 00000000000..a7b3a3edd1c |
20 |
--- /dev/null |
21 |
+++ b/net-libs/liboping/files/liboping-1.10.0-gcc8-fix.patch |
22 |
@@ -0,0 +1,28 @@ |
23 |
+From 18ca43507b351f339ff23062541ee8d58e813a53 Mon Sep 17 00:00:00 2001 |
24 |
+From: Florian Forster <ff@××××.it> |
25 |
+Date: Sun, 29 Jul 2018 14:34:19 +0200 |
26 |
+Subject: [PATCH] ping_host_add: Decrease buffer size to make GCC's truncation |
27 |
+ check happy. |
28 |
+ |
29 |
+Fixes: #38 |
30 |
+--- |
31 |
+ src/liboping.c | 6 ++---- |
32 |
+ 1 file changed, 2 insertions(+), 4 deletions(-) |
33 |
+ |
34 |
+diff --git a/src/liboping.c b/src/liboping.c |
35 |
+index 5253e8c..2470988 100644 |
36 |
+--- a/src/liboping.c |
37 |
++++ b/src/liboping.c |
38 |
+@@ -1636,10 +1636,8 @@ int ping_host_add (pingobj_t *obj, const char *host) |
39 |
+ } |
40 |
+ else |
41 |
+ { |
42 |
+- char errmsg[PING_ERRMSG_LEN]; |
43 |
+- |
44 |
+- snprintf (errmsg, PING_ERRMSG_LEN, "Unknown `ai_family': %i", ai_ptr->ai_family); |
45 |
+- errmsg[PING_ERRMSG_LEN - 1] = '\0'; |
46 |
++ char errmsg[64]; |
47 |
++ snprintf (errmsg, sizeof(errmsg), "Unknown `ai_family': %d", ai_ptr->ai_family); |
48 |
+ |
49 |
+ dprintf ("%s", errmsg); |
50 |
+ ping_set_error (obj, "getaddrinfo", errmsg); |
51 |
|
52 |
diff --git a/net-libs/liboping/liboping-1.10.0.ebuild b/net-libs/liboping/liboping-1.10.0-r1.ebuild |
53 |
similarity index 97% |
54 |
rename from net-libs/liboping/liboping-1.10.0.ebuild |
55 |
rename to net-libs/liboping/liboping-1.10.0-r1.ebuild |
56 |
index 8f0bc99aa44..50dc00c8fb4 100644 |
57 |
--- a/net-libs/liboping/liboping-1.10.0.ebuild |
58 |
+++ b/net-libs/liboping/liboping-1.10.0-r1.ebuild |
59 |
@@ -19,6 +19,7 @@ RDEPEND=${DEPEND} |
60 |
|
61 |
PATCHES=( |
62 |
"${FILESDIR}/${PN}-1.6.2-nouidmagic.patch" |
63 |
+ "${FILESDIR}"/${P}-gcc8-fix.patch |
64 |
) |
65 |
|
66 |
src_prepare() { |