1 |
commit: 1202b6e7b9e4e4738c7994733fa33950fb990fd2 |
2 |
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue May 5 12:29:55 2020 +0000 |
4 |
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue May 5 12:30:31 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1202b6e7 |
7 |
|
8 |
net-misc/connman-json-client: add json-0.14 fix |
9 |
|
10 |
Closes: https://bugs.gentoo.org/720446 |
11 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
12 |
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org> |
13 |
|
14 |
.../connman-json-client-1.0_p20150721-r1.ebuild | 34 ++++++++++++++++++++++ |
15 |
.../files/cjc-fix-for-json-0.14.patch | 33 +++++++++++++++++++++ |
16 |
2 files changed, 67 insertions(+) |
17 |
|
18 |
diff --git a/net-misc/connman-json-client/connman-json-client-1.0_p20150721-r1.ebuild b/net-misc/connman-json-client/connman-json-client-1.0_p20150721-r1.ebuild |
19 |
new file mode 100644 |
20 |
index 00000000000..71df6bec799 |
21 |
--- /dev/null |
22 |
+++ b/net-misc/connman-json-client/connman-json-client-1.0_p20150721-r1.ebuild |
23 |
@@ -0,0 +1,34 @@ |
24 |
+# Copyright 1999-2020 Gentoo Authors |
25 |
+# Distributed under the terms of the GNU General Public License v2 |
26 |
+ |
27 |
+EAPI=6 |
28 |
+ |
29 |
+inherit autotools vcs-snapshot |
30 |
+COMMIT="3c34b2ee62d2e188090d20e7ed2fd94bab9c47f2" |
31 |
+ |
32 |
+DESCRIPTION="An ncurses UI for connman" |
33 |
+HOMEPAGE="https://github.com/eurogiciel-oss/connman-json-client" |
34 |
+SRC_URI="https://github.com/eurogiciel-oss/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" |
35 |
+ |
36 |
+LICENSE="GPL-2" |
37 |
+SLOT="0" |
38 |
+KEYWORDS="~amd64 ~x86" |
39 |
+IUSE="" |
40 |
+ |
41 |
+DEPEND="dev-libs/json-c:0= |
42 |
+ >=sys-apps/dbus-1.4 |
43 |
+ sys-libs/ncurses:0" |
44 |
+RDEPEND="${DEPEND}" |
45 |
+ |
46 |
+PATCHES=( "${FILESDIR}"/cjc-fix-for-json-0.14.patch ) |
47 |
+ |
48 |
+src_prepare() { |
49 |
+ sed -i -e '/^AM_CFLAGS/ s/ -Werror$//' Makefile.am || die |
50 |
+ default |
51 |
+ eautoreconf |
52 |
+} |
53 |
+ |
54 |
+src_install() { |
55 |
+ default |
56 |
+ dobin connman_ncurses |
57 |
+} |
58 |
|
59 |
diff --git a/net-misc/connman-json-client/files/cjc-fix-for-json-0.14.patch b/net-misc/connman-json-client/files/cjc-fix-for-json-0.14.patch |
60 |
new file mode 100644 |
61 |
index 00000000000..5cc8d55f324 |
62 |
--- /dev/null |
63 |
+++ b/net-misc/connman-json-client/files/cjc-fix-for-json-0.14.patch |
64 |
@@ -0,0 +1,33 @@ |
65 |
+diff -ur a/json_regex.c b/json_regex.c |
66 |
+--- a/json_regex.c 2020-05-05 07:24:03.294949374 -0500 |
67 |
++++ b/json_regex.c 2020-05-05 07:24:38.883944012 -0500 |
68 |
+@@ -64,7 +64,7 @@ |
69 |
+ json_object_object_add(jregex_agent_response, "Username", json_object_new_string("^([[:print:]]*)$")); |
70 |
+ json_object_object_add(jregex_agent_response, "Password", json_object_new_string("^([[:print:]]*)$")); |
71 |
+ |
72 |
+- jregex_agent_retry_response = json_object_new_boolean(TRUE); |
73 |
++ jregex_agent_retry_response = json_object_new_boolean(1); |
74 |
+ |
75 |
+ // See commands.c __cmd_config_service for a better idea of the format. |
76 |
+ jregex_config_service = json_object_new_object(); |
77 |
+@@ -94,7 +94,7 @@ |
78 |
+ json_object_array_add(arr, json_object_new_string("^([[:print:]]*)$")); |
79 |
+ json_object_object_add(tmp, key_serv_proxy_excludes, arr); |
80 |
+ json_object_object_add(opt, key_serv_proxy_config, tmp); |
81 |
+- json_object_object_add(opt, key_serv_autoconnect, json_object_new_boolean(TRUE)); |
82 |
++ json_object_object_add(opt, key_serv_autoconnect, json_object_new_boolean(1)); |
83 |
+ arr = json_object_new_array(); |
84 |
+ json_object_array_add(arr, json_object_new_string("^([[:print:]]*)$")); |
85 |
+ json_object_object_add(opt, key_serv_domains_config, arr); |
86 |
+diff -ur a/json_utils.c b/json_utils.c |
87 |
+--- a/json_utils.c 2020-05-05 07:24:03.294949374 -0500 |
88 |
++++ b/json_utils.c 2020-05-05 07:24:58.877379129 -0500 |
89 |
+@@ -83,7 +83,7 @@ |
90 |
+ key_is_trusted = json_object_object_get_ex(jtrusted, key, |
91 |
+ &tmp_trusted); |
92 |
+ |
93 |
+- if (key_is_trusted == FALSE) |
94 |
++ if (key_is_trusted == 0) |
95 |
+ return false; |
96 |
+ |
97 |
+ res = __json_type_dispatch(val, tmp_trusted); |