Gentoo Archives: gentoo-commits

From: Sam Jorna <wraeth@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/connman/files/, net-misc/connman/
Date: Fri, 29 Apr 2016 07:30:13
Message-Id: 1461914975.5209abd6842cfe1306874c0766f10ec939e4869c.wraeth@gentoo
1 commit: 5209abd6842cfe1306874c0766f10ec939e4869c
2 Author: Nicholas Vinson <nvinson234 <AT> gmail <DOT> com>
3 AuthorDate: Wed Apr 27 13:46:41 2016 +0000
4 Commit: Sam Jorna <wraeth <AT> gentoo <DOT> org>
5 CommitDate: Fri Apr 29 07:29:35 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5209abd6
7
8 net-misc/connman: Version bump to 1.32
9
10 Gentoo-bug: 581368
11 Package-Manager: portage-2.2.28
12
13 net-misc/connman/Manifest | 2 +-
14 net-misc/connman/connman-1.32.ebuild | 73 ++++++++++++++++++++++
15 .../files/connman-1.32-execinfo-assumptions.patch | 54 ++++++++++++++++
16 3 files changed, 128 insertions(+), 1 deletion(-)
17
18 diff --git a/net-misc/connman/Manifest b/net-misc/connman/Manifest
19 index 4c1b30e..ef0a9eb 100644
20 --- a/net-misc/connman/Manifest
21 +++ b/net-misc/connman/Manifest
22 @@ -1,2 +1,2 @@
23 DIST connman-1.29.tar.xz 653324 SHA256 2a5a69693566f7fd59b2e677fa89356ada6d709998aa665caef8707b1e7a8594 SHA512 19f623dd23c6312f29bbd570dcb22d31154ffcd16ee66ed2280df3d9d844301f18538418363222d99eabdc33da0021488ed66ba2e4f88df30646004b724538ee WHIRLPOOL 9439cadeb20b72c922b1426da213f8567fe7b0da45f9a4abf270c38687a9d9161a8ee14250623344864d612e130e6f28926918468aaf4346a9e5ff41e6ad22bb
24 -DIST connman-1.31.tar.xz 668120 SHA256 88fcf0b6df334796b90e2fd2e434d6f5b36cd6f13b886a119b8c90276b72b8e2 SHA512 f9871ead096ead37d3bc524fb143ec8c88125e9c18b5eb1f451581b9a2061719e90361e5b7f3e09901701707d977c42c630457b0ead8e76e04e964a7542c7bbd WHIRLPOOL 0e7f73e1d83a862fb33d2a3b6983c00b2305fea95803836d5dadbb31a8a55d19e2a21447e5e5654b04b0320929eaef2eba99b5921ab4a6fbf2d89e3befbe81b4
25 +DIST connman-1.32.tar.xz 668404 SHA256 3185864c73206a6033d12e9f583689dcd03f714a40a58333709d3f74a4e0934c SHA512 031b876f98b27c1a657af1e5242d06d9295f3710053c365fc94b13f386fe25e150ef95fbed81462c0d770522625bd5f55c621f5ecb1ad638dd64779c3e444066 WHIRLPOOL b20652bcb19b172b09aa3c10de3736eaeb500bd56a131b8580d750bf72ef9ba034b80c563b929f9d81de226b381e56b2aeee84186db66b0d169ffd2463e9417b
26
27 diff --git a/net-misc/connman/connman-1.32.ebuild b/net-misc/connman/connman-1.32.ebuild
28 new file mode 100644
29 index 0000000..d035086
30 --- /dev/null
31 +++ b/net-misc/connman/connman-1.32.ebuild
32 @@ -0,0 +1,73 @@
33 +# Copyright 1999-2016 Gentoo Foundation
34 +# Distributed under the terms of the GNU General Public License v2
35 +# $Id$
36 +
37 +EAPI="6"
38 +inherit systemd
39 +
40 +DESCRIPTION="Provides a daemon for managing internet connections"
41 +HOMEPAGE="https://01.org/connman"
42 +SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.xz"
43 +
44 +LICENSE="GPL-2"
45 +SLOT="0"
46 +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
47 +IUSE="bluetooth debug doc examples +ethernet l2tp ofono openvpn openconnect pptp policykit tools vpnc +wifi wispr"
48 +
49 +RDEPEND=">=dev-libs/glib-2.16
50 + >=sys-apps/dbus-1.2.24
51 + >=net-firewall/iptables-1.4.8
52 + bluetooth? ( net-wireless/bluez )
53 + l2tp? ( net-dialup/xl2tpd )
54 + ofono? ( net-misc/ofono )
55 + openconnect? ( net-misc/openconnect )
56 + openvpn? ( net-misc/openvpn )
57 + policykit? ( sys-auth/polkit )
58 + pptp? ( net-dialup/pptpclient )
59 + vpnc? ( net-misc/vpnc )
60 + wifi? ( >=net-wireless/wpa_supplicant-2.0[dbus] )
61 + wispr? ( net-libs/gnutls )"
62 +
63 +DEPEND="${RDEPEND}
64 + >=sys-kernel/linux-headers-2.6.39"
65 +
66 +PATCHES=(
67 + "${FILESDIR}/${PN}-1.32-execinfo-assumptions.patch"
68 + "${FILESDIR}/${PN}-1.31-xtables.patch"
69 +)
70 +
71 +src_configure() {
72 + econf \
73 + --localstatedir=/var \
74 + --enable-client \
75 + --enable-datafiles \
76 + --enable-loopback=builtin \
77 + $(use_enable examples test) \
78 + $(use_enable ethernet ethernet builtin) \
79 + $(use_enable wifi wifi builtin) \
80 + $(use_enable bluetooth bluetooth builtin) \
81 + $(use_enable l2tp l2tp builtin) \
82 + $(use_enable ofono ofono builtin) \
83 + $(use_enable openconnect openconnect builtin) \
84 + $(use_enable openvpn openvpn builtin) \
85 + $(use_enable policykit polkit builtin) \
86 + $(use_enable pptp pptp builtin) \
87 + $(use_enable vpnc vpnc builtin) \
88 + $(use_enable wispr wispr builtin) \
89 + $(use_enable debug) \
90 + $(use_enable tools) \
91 + --disable-iospm \
92 + --disable-hh2serial-gps
93 +}
94 +
95 +src_install() {
96 + default
97 + dobin client/connmanctl
98 +
99 + if use doc; then
100 + dodoc doc/*.txt
101 + fi
102 + keepdir /var/lib/${PN}
103 + newinitd "${FILESDIR}"/${PN}.initd2 ${PN}
104 + newconfd "${FILESDIR}"/${PN}.confd ${PN}
105 +}
106
107 diff --git a/net-misc/connman/files/connman-1.32-execinfo-assumptions.patch b/net-misc/connman/files/connman-1.32-execinfo-assumptions.patch
108 new file mode 100644
109 index 0000000..eb8e4fc
110 --- /dev/null
111 +++ b/net-misc/connman/files/connman-1.32-execinfo-assumptions.patch
112 @@ -0,0 +1,54 @@
113 +diff -uNr a/config.h.in b/config.h.in
114 +--- a/config.h.in 2013-07-02 17:41:03.715261748 +0000
115 ++++ b/config.h.in 2013-07-02 17:41:21.707260667 +0000
116 +@@ -3,6 +3,9 @@
117 + /* Define to 1 if you have the <dlfcn.h> header file. */
118 + #undef HAVE_DLFCN_H
119 +
120 ++/* Define to 1 if you have the <execinfo.h> header file. */
121 ++#undef HAVE_EXECINFO_H
122 ++
123 + /* Define to 1 if you have the <inttypes.h> header file. */
124 + #undef HAVE_INTTYPES_H
125 +
126 +diff -uNr a/configure.ac b/configure.ac
127 +--- a/configure.ac 2013-07-02 17:41:03.715261748 +0000
128 ++++ b/configure.ac 2013-07-02 17:41:21.719260666 +0000
129 +@@ -181,6 +181,8 @@
130 + AC_CHECK_FUNC(signalfd, dummy=yes,
131 + AC_MSG_ERROR(signalfd support is required))
132 +
133 ++AC_CHECK_HEADERS([execinfo.h], [], [])
134 ++
135 + AC_CHECK_LIB(dl, dlopen, dummy=yes,
136 + AC_MSG_ERROR(dynamic linking loader is required))
137 +
138 +diff -uNr a/src/backtrace.c b/src/backtrace.c
139 +--- a/src/backtrace.c 2013-07-02 17:41:03.727261747 +0000
140 ++++ b/src/backtrace.c 2013-07-02 17:42:12.717257603 +0000
141 +@@ -30,7 +30,9 @@
142 + #include <unistd.h>
143 + #include <stdlib.h>
144 + #include <string.h>
145 ++#ifdef HAVE_EXECINFO_H
146 + #include <execinfo.h>
147 ++#endif
148 + #include <dlfcn.h>
149 +
150 + #include "connman.h"
151 +@@ -37,6 +38,7 @@
152 + void print_backtrace(const char* program_path, const char* program_exec,
153 + unsigned int offset)
154 + {
155 ++#ifdef HAVE_EXECINFO_H
156 + void *frames[99];
157 + size_t n_ptrs;
158 + unsigned int i;
159 +@@ -135,6 +138,7 @@
160 +
161 + close(outfd[1]);
162 + close(infd[0]);
163 ++#endif
164 + }
165 +
166 + static void signal_handler(int signo)