Gentoo Archives: gentoo-commits

From: Christoph Mende <angelos@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/oidentd/files/, net-misc/oidentd/
Date: Sat, 19 Dec 2015 12:25:24
Message-Id: 1450527918.55108e5462e1acf9adf6c67531b901e37648a2fa.angelos@gentoo
1 commit: 55108e5462e1acf9adf6c67531b901e37648a2fa
2 Author: Christoph Mende <angelos <AT> gentoo <DOT> org>
3 AuthorDate: Sat Dec 19 12:25:18 2015 +0000
4 Commit: Christoph Mende <angelos <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 19 12:25:18 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55108e54
7
8 net-misc/oidentd: fix compilation with gcc5 (bug #568586)
9
10 Package-Manager: portage-2.2.26
11
12 net-misc/oidentd/files/oidentd-2.0.8-gcc5.patch | 25 +++++++++++++++++++++++++
13 net-misc/oidentd/oidentd-2.0.8-r5.ebuild | 5 +++--
14 2 files changed, 28 insertions(+), 2 deletions(-)
15
16 diff --git a/net-misc/oidentd/files/oidentd-2.0.8-gcc5.patch b/net-misc/oidentd/files/oidentd-2.0.8-gcc5.patch
17 new file mode 100644
18 index 0000000..a401a65
19 --- /dev/null
20 +++ b/net-misc/oidentd/files/oidentd-2.0.8-gcc5.patch
21 @@ -0,0 +1,25 @@
22 +Description: Fix a failure to build with gcc5.
23 +Bug: http://bugs.debian.org/778035
24 +
25 +--- a/src/oidentd_util.c 2015-07-03 05:56:24.000000000 -0400
26 ++++ b/src/oidentd_util.c 2015-07-03 05:56:47.671378000 -0400
27 +@@ -75,7 +75,7 @@
28 + ** PRNG functions on systems whose libraries provide them.)
29 + */
30 +
31 +-inline int randval(int i) {
32 ++extern __attribute__ ((gnu_inline)) int randval(int i) {
33 + /* Per _Numerical Recipes in C_: */
34 + return ((double) i * rand() / (RAND_MAX+1.0));
35 + }
36 +--- a/src/oidentd_util.h 2015-07-03 05:56:32.000000000 -0400
37 ++++ b/src/oidentd_util.h 2015-07-03 05:56:53.835378000 -0400
38 +@@ -58,7 +58,7 @@
39 + int find_group(const char *temp_group, gid_t *gid);
40 +
41 + int random_seed(void);
42 +-inline int randval(int i);
43 ++extern __attribute__ ((gnu_inline)) int randval(int i);
44 +
45 + #ifndef HAVE_SNPRINTF
46 + int snprintf(char *str, size_t n, char const *fmt, ...);
47
48 diff --git a/net-misc/oidentd/oidentd-2.0.8-r5.ebuild b/net-misc/oidentd/oidentd-2.0.8-r5.ebuild
49 index 0193766..b93ad92 100644
50 --- a/net-misc/oidentd/oidentd-2.0.8-r5.ebuild
51 +++ b/net-misc/oidentd/oidentd-2.0.8-r5.ebuild
52 @@ -1,4 +1,4 @@
53 -# Copyright 1999-2014 Gentoo Foundation
54 +# Copyright 1999-2015 Gentoo Foundation
55 # Distributed under the terms of the GNU General Public License v2
56 # $Id$
57
58 @@ -17,7 +17,8 @@ IUSE="debug ipv6 masquerade"
59
60 src_prepare() {
61 epatch "${FILESDIR}/${P}-masquerading.patch" \
62 - "${FILESDIR}/${P}-bind-to-ipv6-too.patch"
63 + "${FILESDIR}/${P}-bind-to-ipv6-too.patch" \
64 + "${FILESDIR}/${P}-gcc5.patch"
65 }
66
67 src_configure() {