1 |
commit: 6b88e653f4cc941302f16d1bf7a85412657a478b |
2 |
Author: Nicholas Vinson <nvinson234 <AT> gmail <DOT> com> |
3 |
AuthorDate: Sat Oct 8 19:09:05 2016 +0000 |
4 |
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Oct 11 08:59:02 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b88e653 |
7 |
|
8 |
net-misc/connman: Fix polkit check, resolv.conf overwrite issue |
9 |
|
10 |
Fixes the broken pollkit detection error |
11 |
Fixes the issue of /etc/resolv.conf being overwritten unconditionally |
12 |
Removes the unneeded hunks from the connman-1.32-execinfo-assumptions.patch |
13 |
|
14 |
Gentoo-bug: #591596 |
15 |
Gentoo-bug: #596270 |
16 |
Gentoo-bug: #596276 |
17 |
|
18 |
Closes: https://github.com/gentoo/gentoo/pull/2515 |
19 |
|
20 |
Package-Manager: portage-2.3.1 |
21 |
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org> |
22 |
|
23 |
net-misc/connman/connman-1.33-r1.ebuild | 82 ++++++++++++++++++++++ |
24 |
.../files/connman-1.32-execinfo-assumptions.patch | 25 ------- |
25 |
.../connman-1.33-polkit-configure-check-fix.patch | 15 ++++ |
26 |
.../files/connman-1.33-resolv-conf-overwrite.patch | 6 ++ |
27 |
4 files changed, 103 insertions(+), 25 deletions(-) |
28 |
|
29 |
diff --git a/net-misc/connman/connman-1.33-r1.ebuild b/net-misc/connman/connman-1.33-r1.ebuild |
30 |
new file mode 100644 |
31 |
index 00000000..6e13889 |
32 |
--- /dev/null |
33 |
+++ b/net-misc/connman/connman-1.33-r1.ebuild |
34 |
@@ -0,0 +1,82 @@ |
35 |
+# Copyright 1999-2016 Gentoo Foundation |
36 |
+# Distributed under the terms of the GNU General Public License v2 |
37 |
+# $Id$ |
38 |
+ |
39 |
+EAPI="6" |
40 |
+inherit autotools systemd |
41 |
+ |
42 |
+DESCRIPTION="Provides a daemon for managing internet connections" |
43 |
+HOMEPAGE="https://01.org/connman" |
44 |
+SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.xz" |
45 |
+ |
46 |
+LICENSE="GPL-2" |
47 |
+SLOT="0" |
48 |
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" |
49 |
+IUSE="bluetooth debug doc examples +ethernet l2tp ofono openvpn openconnect pptp policykit tools vpnc +wifi wispr" |
50 |
+ |
51 |
+RDEPEND=">=dev-libs/glib-2.16 |
52 |
+ >=sys-apps/dbus-1.2.24 |
53 |
+ >=net-firewall/iptables-1.4.8 |
54 |
+ bluetooth? ( net-wireless/bluez ) |
55 |
+ l2tp? ( net-dialup/xl2tpd ) |
56 |
+ ofono? ( net-misc/ofono ) |
57 |
+ openconnect? ( net-misc/openconnect ) |
58 |
+ openvpn? ( net-misc/openvpn ) |
59 |
+ policykit? ( sys-auth/polkit ) |
60 |
+ pptp? ( net-dialup/pptpclient ) |
61 |
+ vpnc? ( net-misc/vpnc ) |
62 |
+ wifi? ( >=net-wireless/wpa_supplicant-2.0[dbus] ) |
63 |
+ wispr? ( net-libs/gnutls )" |
64 |
+ |
65 |
+DEPEND="${RDEPEND} |
66 |
+ >=sys-kernel/linux-headers-2.6.39 |
67 |
+ virtual/pkgconfig" |
68 |
+ |
69 |
+PATCHES=( |
70 |
+ "${FILESDIR}/${PN}-1.31-xtables.patch" |
71 |
+ "${FILESDIR}/${PN}-1.33-polkit-configure-check-fix.patch" |
72 |
+ "${FILESDIR}/${PN}-1.33-resolv-conf-overwrite.patch" |
73 |
+) |
74 |
+ |
75 |
+src_prepare() { |
76 |
+ default |
77 |
+ eautoreconf |
78 |
+} |
79 |
+ |
80 |
+src_configure() { |
81 |
+ econf \ |
82 |
+ --localstatedir=/var \ |
83 |
+ --with-systemdunitdir=$(systemd_get_systemunitdir) \ |
84 |
+ --with-tmpfilesdir=${EPRIFEX}/usr/lib/tmpfiles.d \ |
85 |
+ --enable-client \ |
86 |
+ --enable-datafiles \ |
87 |
+ --enable-loopback=builtin \ |
88 |
+ $(use_enable examples test) \ |
89 |
+ $(use_enable ethernet ethernet builtin) \ |
90 |
+ $(use_enable wifi wifi builtin) \ |
91 |
+ $(use_enable bluetooth bluetooth builtin) \ |
92 |
+ $(use_enable l2tp l2tp builtin) \ |
93 |
+ $(use_enable ofono ofono builtin) \ |
94 |
+ $(use_enable openconnect openconnect builtin) \ |
95 |
+ $(use_enable openvpn openvpn builtin) \ |
96 |
+ $(use_enable policykit polkit builtin) \ |
97 |
+ $(use_enable pptp pptp builtin) \ |
98 |
+ $(use_enable vpnc vpnc builtin) \ |
99 |
+ $(use_enable wispr wispr builtin) \ |
100 |
+ $(use_enable debug) \ |
101 |
+ $(use_enable tools) \ |
102 |
+ --disable-iospm \ |
103 |
+ --disable-hh2serial-gps |
104 |
+} |
105 |
+ |
106 |
+src_install() { |
107 |
+ default |
108 |
+ dobin client/connmanctl |
109 |
+ |
110 |
+ if use doc; then |
111 |
+ dodoc doc/*.txt |
112 |
+ fi |
113 |
+ keepdir /var/lib/${PN} |
114 |
+ newinitd "${FILESDIR}"/${PN}.initd2 ${PN} |
115 |
+ newconfd "${FILESDIR}"/${PN}.confd ${PN} |
116 |
+} |
117 |
|
118 |
diff --git a/net-misc/connman/files/connman-1.32-execinfo-assumptions.patch b/net-misc/connman/files/connman-1.32-execinfo-assumptions.patch |
119 |
index eb8e4fc..c27e896 100644 |
120 |
--- a/net-misc/connman/files/connman-1.32-execinfo-assumptions.patch |
121 |
+++ b/net-misc/connman/files/connman-1.32-execinfo-assumptions.patch |
122 |
@@ -1,28 +1,3 @@ |
123 |
-diff -uNr a/config.h.in b/config.h.in |
124 |
---- a/config.h.in 2013-07-02 17:41:03.715261748 +0000 |
125 |
-+++ b/config.h.in 2013-07-02 17:41:21.707260667 +0000 |
126 |
-@@ -3,6 +3,9 @@ |
127 |
- /* Define to 1 if you have the <dlfcn.h> header file. */ |
128 |
- #undef HAVE_DLFCN_H |
129 |
- |
130 |
-+/* Define to 1 if you have the <execinfo.h> header file. */ |
131 |
-+#undef HAVE_EXECINFO_H |
132 |
-+ |
133 |
- /* Define to 1 if you have the <inttypes.h> header file. */ |
134 |
- #undef HAVE_INTTYPES_H |
135 |
- |
136 |
-diff -uNr a/configure.ac b/configure.ac |
137 |
---- a/configure.ac 2013-07-02 17:41:03.715261748 +0000 |
138 |
-+++ b/configure.ac 2013-07-02 17:41:21.719260666 +0000 |
139 |
-@@ -181,6 +181,8 @@ |
140 |
- AC_CHECK_FUNC(signalfd, dummy=yes, |
141 |
- AC_MSG_ERROR(signalfd support is required)) |
142 |
- |
143 |
-+AC_CHECK_HEADERS([execinfo.h], [], []) |
144 |
-+ |
145 |
- AC_CHECK_LIB(dl, dlopen, dummy=yes, |
146 |
- AC_MSG_ERROR(dynamic linking loader is required)) |
147 |
- |
148 |
diff -uNr a/src/backtrace.c b/src/backtrace.c |
149 |
--- a/src/backtrace.c 2013-07-02 17:41:03.727261747 +0000 |
150 |
+++ b/src/backtrace.c 2013-07-02 17:42:12.717257603 +0000 |
151 |
|
152 |
diff --git a/net-misc/connman/files/connman-1.33-polkit-configure-check-fix.patch b/net-misc/connman/files/connman-1.33-polkit-configure-check-fix.patch |
153 |
new file mode 100644 |
154 |
index 00000000..57ef5e8 |
155 |
--- /dev/null |
156 |
+++ b/net-misc/connman/files/connman-1.33-polkit-configure-check-fix.patch |
157 |
@@ -0,0 +1,15 @@ |
158 |
+--- connman-1.33/configure.ac.old 2016-10-09 11:26:43.137856416 -0700 |
159 |
++++ connman-1.33/configure.ac 2016-10-09 11:26:52.819722799 -0700 |
160 |
+@@ -281,11 +281,11 @@ AM_CONDITIONAL(NMCOMPAT, test "${enable_ |
161 |
+ |
162 |
+ AC_ARG_ENABLE(polkit, AC_HELP_STRING([--enable-polkit], |
163 |
+ [enable PolicyKit support]), |
164 |
+ [enable_polkit=${enableval}], [enable_polkit="no"]) |
165 |
+ if (test "${enable_polkit}" != "no"); then |
166 |
+- POLKIT_DATADIR="`$PKG_CONFIG --variable=actiondir polkit`" |
167 |
++ POLKIT_DATADIR="`$PKG_CONFIG --variable=actiondir polkit-gobject-1`" |
168 |
+ POLKIT_DATADIR="" |
169 |
+ if (test -z "${POLKIT_DATADIR}"); then |
170 |
+ POLKIT_DATADIR="${datadir}/polkit-1/actions" |
171 |
+ fi |
172 |
+ AC_SUBST(POLKIT_DATADIR) |
173 |
|
174 |
diff --git a/net-misc/connman/files/connman-1.33-resolv-conf-overwrite.patch b/net-misc/connman/files/connman-1.33-resolv-conf-overwrite.patch |
175 |
new file mode 100644 |
176 |
index 00000000..49bb8ba |
177 |
--- /dev/null |
178 |
+++ b/net-misc/connman/files/connman-1.33-resolv-conf-overwrite.patch |
179 |
@@ -0,0 +1,6 @@ |
180 |
+--- connman-1.33/scripts/connman_resolvconf.conf.in.old 2016-10-09 11:27:20.425341843 -0700 |
181 |
++++ connman-1.33/scripts/connman_resolvconf.conf.in 2016-10-09 11:27:10.662476565 -0700 |
182 |
+@@ -1,2 +1,2 @@ |
183 |
+ d @runstatedir@/connman - - - - |
184 |
+-L+ /etc/resolv.conf - - - - @runstatedir@/connman/resolv.conf |
185 |
++L /etc/resolv.conf - - - - @runstatedir@/connman/resolv.conf |