Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/telepathy-idle/files/, net-irc/telepathy-idle/
Date: Thu, 15 Apr 2021 15:36:52
Message-Id: 1618500809.417cca0f4b737ba96ed08b1bf3b2f3ee4675672f.mattst88@gentoo
1 commit: 417cca0f4b737ba96ed08b1bf3b2f3ee4675672f
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Thu Apr 15 15:33:29 2021 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 15 15:33:29 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=417cca0f
7
8 net-irc/telepathy-idle: Drop old versions
9
10 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
11
12 net-irc/telepathy-idle/Manifest | 3 -
13 .../files/telepathy-idle-0.2.0-fixes.patch | 223 ---------------------
14 .../telepathy-idle/telepathy-idle-0.2.0-r3.ebuild | 48 -----
15 3 files changed, 274 deletions(-)
16
17 diff --git a/net-irc/telepathy-idle/Manifest b/net-irc/telepathy-idle/Manifest
18 index 4ab26a5bcde..30e326c24a9 100644
19 --- a/net-irc/telepathy-idle/Manifest
20 +++ b/net-irc/telepathy-idle/Manifest
21 @@ -1,4 +1 @@
22 -DIST telepathy-idle-0.2.0-py3-1.patch 3849 BLAKE2B 48617c65e8c3af4aa40332eed66c1839b4a9db9c99a4e350fae89879dcbd67c133e0a05fd9a778a5e0ac737ddbf8f999f23095b9a2a3cdef233485b1c9422908 SHA512 41c90befc3bb2df84f35a2f53bbe29885f67a2ceb5dfbf906436655b9400368e74a1a4a6b408f669fa951ae9d50d89bc7e0e2285f50a6fecf1a1d719c307cb24
23 -DIST telepathy-idle-0.2.0-py3-2.patch 1441 BLAKE2B ea32a2c94216ff320f43c3bf8b537b197c0398507f812eecfab86359e43c53fc2724b2c0d0a0e0a7b342243b07cce38a86f802d9fbc777bba942df939f52a56b SHA512 c9f868f50c5300f4ed06953de935f44e2e87729a36a61d4c1e998d322c1dcdac2759200b66a04c965e9ef591475dfbd5997c83816c6fc2bfb178bfd4bcd260e8
24 -DIST telepathy-idle-0.2.0.tar.gz 566492 BLAKE2B d0e12bb23b96b7df5afb101ae2c62994777de616d5ea70a10fb2141e68066c7dfaae713340c7f8a2d8ce1f259f302729efa1927eaf7d2a9555120c58e89046f2 SHA512 f5e36afc3ab4b52eb865f2c1e6565b99011a7540fc1a7783d3bbd7bbf50bc671a2147df6bde646c82059a466cc1df9bdb10e2500db5b7bb06d57a989a75c261b
25 DIST telepathy-idle-0.2.2.tar.gz 606406 BLAKE2B e5d4a19df08bbb59c18d0601357134a6edab085b2b04463b085651f35ee135f0d3f3f27fc35417dcf023913f7ead939161cb1a72cb51824a988aad6c0cb2a136 SHA512 c66cf7b70c84a9b7b1ada01712b8d3b683f15a4021bb2d0f6d868b4ab30e2fb12fd26dd8d5ba25b5050e055bf425295049e84a53198d6586f7cfd7c6bc02f826
26
27 diff --git a/net-irc/telepathy-idle/files/telepathy-idle-0.2.0-fixes.patch b/net-irc/telepathy-idle/files/telepathy-idle-0.2.0-fixes.patch
28 deleted file mode 100644
29 index 07f14f9f4dd..00000000000
30 --- a/net-irc/telepathy-idle/files/telepathy-idle-0.2.0-fixes.patch
31 +++ /dev/null
32 @@ -1,223 +0,0 @@
33 -From bf6d596e40e5b9426a68dcd22aa62a697457c4f7 Mon Sep 17 00:00:00 2001
34 -From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@×××××.org>
35 -Date: Sat, 13 Feb 2016 10:08:42 +0100
36 -Subject: [PATCH 1/6] ctcp: Don't bling the non-bling
37 -
38 -When stripping color codes, we currently remove any sequence of digits
39 -following ^C. As color codes use at most two digits, this means that we
40 -also remove any numbers at the start of the colored text - make sure we
41 -stop doing that and only remove digits that are actually part of a color
42 -code.
43 -
44 -https://bugs.freedesktop.org/show_bug.cgi?id=94189
45 ----
46 - src/idle-ctcp.c | 9 +++++++--
47 - 1 file changed, 7 insertions(+), 2 deletions(-)
48 -
49 -diff --git a/src/idle-ctcp.c b/src/idle-ctcp.c
50 -index f282360..f28bf4b 100644
51 ---- a/src/idle-ctcp.c
52 -+++ b/src/idle-ctcp.c
53 -@@ -98,13 +98,18 @@ gchar *idle_ctcp_kill_blingbling(const gchar *msg) {
54 - case '\x03': /* ^C */
55 - iter++;
56 -
57 -- while (isdigit(*iter))
58 -+ /* Color codes are 1-2 digits */
59 -+ if (isdigit(*iter))
60 -+ iter++;
61 -+ if (isdigit(*iter))
62 - iter++;
63 -
64 - if (*iter == ',') {
65 - iter++;
66 -
67 -- while (isdigit(*iter))
68 -+ if (isdigit(*iter))
69 -+ iter++;
70 -+ if (isdigit(*iter))
71 - iter++;
72 - }
73 - break;
74 ---
75 -2.23.0
76 -
77 -From 5a2510ddea8f165f0808a8841e1dca311c003e20 Mon Sep 17 00:00:00 2001
78 -From: Diane Trout <diane@××××.org>
79 -Date: Sat, 4 Nov 2017 23:03:26 -0700
80 -Subject: [PATCH 2/6] Update self-signed certificate to 2048 bytes with SHA-256
81 - signature
82 -
83 -Valid for 10 years
84 ----
85 - tests/twisted/tools/idletest.cert | 26 +++++++++++++++++--------
86 - tests/twisted/tools/idletest.key | 32 ++++++++++++++++++++++++-------
87 - 2 files changed, 43 insertions(+), 15 deletions(-)
88 -
89 -diff --git a/tests/twisted/tools/idletest.cert b/tests/twisted/tools/idletest.cert
90 -index 655abc2..7ea6bcc 100644
91 ---- a/tests/twisted/tools/idletest.cert
92 -+++ b/tests/twisted/tools/idletest.cert
93 -@@ -1,10 +1,20 @@
94 - -----BEGIN CERTIFICATE-----
95 --MIIBTzCB+gIBATANBgkqhkiG9w0BAQQFADAzMRIwEAYDVQQKEwl0ZWxlcGF0aHkx
96 --HTAbBgNVBAsTFHRlbGVwYXRoeSBkZXZlbG9wZXJzMB4XDTA5MDExNDE3NDc0N1oX
97 --DTA5MDExNDE3NDg0N1owMzESMBAGA1UEChMJdGVsZXBhdGh5MR0wGwYDVQQLExR0
98 --ZWxlcGF0aHkgZGV2ZWxvcGVyczBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQC9z/pi
99 --zEMeL+bO3giJVGHGrOHLE7AfDorArwmA0u8Cgu06+J+SW+NJnkj8At4bioxREge6
100 --yeD6+cHCC9kzXrmXAgMBAAEwDQYJKoZIhvcNAQEEBQADQQBf1qg0gzSztx5pqqM8
101 --3wI5cEc7k13EzU6X2SkSCSxlMc4pF0hPdr0LuZJpeKBohIgKQ59+3Ny0LuUMEKYW
102 --ikGr
103 -+MIIDUDCCAjigAwIBAgIBATANBgkqhkiG9w0BAQsFADAzMRIwEAYDVQQKEwl0ZWxl
104 -+cGF0aHkxHTAbBgNVBAsTFHRlbGVwYXRoeSBkZXZlbG9wZXJzMB4XDTE3MTEwNTAw
105 -+NTEwMFoXDTE4MTEwNTAwNTEwMFowMzESMBAGA1UEChMJdGVsZXBhdGh5MR0wGwYD
106 -+VQQLExR0ZWxlcGF0aHkgZGV2ZWxvcGVyczCCASIwDQYJKoZIhvcNAQEBBQADggEP
107 -+ADCCAQoCggEBAL3wfZoTzmJqQyjw0tToAflpdmQMTNpzgXvH+uiuu4rWk7oGJsBN
108 -+HZfe4gkoYNLL8PwOGEQcIUN4Y0JU/mc9mSe44Vi0G0t/uJ/gI+CNtHzHjwtwCnYP
109 -+XsbCE69CsarvDVbsQHS6kWfgCYxMA0l+cydUfxuyIoFWjeM4hZs0JwdBGBTAtZkj
110 -+3xo+7Ee3xNBaaOtmoJO/QduAVA0UgiWU69m7Q+5aIuIl9PGOSL4MHqNXq/nwX5Ky
111 -+aFBpXdzmrVn8BophkBgOawp0e+Rhk5fCelyy54lIfpUxeOTP6EtAgsZYbZBPjsuz
112 -+8ewJbdnzcOCwTJpKQv9aHhkTKcK2PkN6tJMCAwEAAaNvMG0wDAYDVR0TAQH/BAIw
113 -+ADAdBgNVHQ4EFgQUuG8blqmQ1SEj/x5OhBc58XFv6vcwCwYDVR0PBAQDAgXgMBEG
114 -+CWCGSAGG+EIBAQQEAwIGQDAeBglghkgBhvhCAQ0EERYPeGNhIGNlcnRpZmljYXRl
115 -+MA0GCSqGSIb3DQEBCwUAA4IBAQBJCT/EPWqv/wUDn7jK4nRXXXwtIL7eYYTAvcJh
116 -+gxtrkkNB1LAp6mnb1WOw+Wbdpf2IgTqfAvpzCRL+kCM80Pqh365JlA5JflzhWxsJ
117 -+xtJQfNfiZhgXKN1rm5lT+U/WgGR6A1serbxUiRN2O6wB8nxtoc7sBJh18pcrwpam
118 -+vOGAolbePV8HPfyBRkCnSw1X6BdifEtxlRCfVWELSI6xQHX8OPTU+uGcvte5uAEi
119 -+7CRRJHlUoojyLOxlJ6IeXh7MjrDIi6tHDqVR9MlRRN3oXhvsN/TtsZUuuC7s280W
120 -+oapk/x7WNDSQsdsi0bmTLrJoZgHzaPRJPCwBFzbj/T1kCC0B
121 - -----END CERTIFICATE-----
122 -diff --git a/tests/twisted/tools/idletest.key b/tests/twisted/tools/idletest.key
123 -index 3a80dab..d579266 100644
124 ---- a/tests/twisted/tools/idletest.key
125 -+++ b/tests/twisted/tools/idletest.key
126 -@@ -1,9 +1,27 @@
127 - -----BEGIN RSA PRIVATE KEY-----
128 --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
160 - -----END RSA PRIVATE KEY-----
161 ---
162 -2.23.0
163 -
164 -From 0ce3a8fa2bd3f4e72358bb53ecd0acf8fe448483 Mon Sep 17 00:00:00 2001
165 -From: Diane Trout <diane@××××.org>
166 -Date: Sat, 4 Nov 2017 23:32:32 -0700
167 -Subject: [PATCH 3/6] Avoid errors from Python caused by the deliberatly
168 - invalid Unicode
169 -
170 -Because stream.nick is Unicode when sendMessage combines the command,
171 -nick, and invalid utf8 python 2.7 ends up converting everything to
172 -Unicode. Since this test deliberately includes invalid Unicode, Python
173 -notices and throws an exception.
174 -
175 -In Python 3, network traffic is usually encoded as bytes. So I thought
176 -coercing the nick to bytes would be appropriate, and as bytes can contain
177 -anything including invalid Unicode, Python doesn't throw an exception.
178 ----
179 - tests/twisted/messages/invalid-utf8.py | 2 +-
180 - 1 file changed, 1 insertion(+), 1 deletion(-)
181 -
182 -diff --git a/tests/twisted/messages/invalid-utf8.py b/tests/twisted/messages/invalid-utf8.py
183 -index a48c2f4..725e3bd 100644
184 ---- a/tests/twisted/messages/invalid-utf8.py
185 -+++ b/tests/twisted/messages/invalid-utf8.py
186 -@@ -33,7 +33,7 @@ def test_with_message(q, stream, parts):
187 -
188 - # Idle's default character set is UTF-8. We send it a message which is
189 - # basically UTF-8, except that one of its code points is invalid.
190 -- stream.sendMessage('PRIVMSG', stream.nick, ':%s' % invalid_utf8,
191 -+ stream.sendMessage('PRIVMSG', bytes(stream.nick), ':%s' % invalid_utf8,
192 - prefix='remoteuser')
193 -
194 - # Idle should signal that *something* was received. If it hasn't validated
195 ---
196 -2.23.0
197 -
198 -From acf5fcf4d830ae0b5953d8ded8eba4c17726c6f3 Mon Sep 17 00:00:00 2001
199 -From: Diane Trout <diane@××××.org>
200 -Date: Mon, 6 Nov 2017 21:46:00 -0800
201 -Subject: [PATCH 4/6] Returning FALSE from the timer function causes the
202 - timeout to be destroyed
203 -
204 -I asked one of the polari devs and was told that yes it is ok to set
205 -the timer id to zero in the timer function.
206 -
207 -With this patch make check works without changing any of the expected
208 -test results and without any coredumps
209 ----
210 - src/idle-connection.c | 1 +
211 - 1 file changed, 1 insertion(+)
212 -
213 -diff --git a/src/idle-connection.c b/src/idle-connection.c
214 -index 6ab5fea..71c020f 100644
215 ---- a/src/idle-connection.c
216 -+++ b/src/idle-connection.c
217 -@@ -600,6 +600,7 @@ _force_disconnect (gpointer data)
218 -
219 - IDLE_DEBUG("gave up waiting, forcibly disconnecting");
220 - idle_server_connection_force_disconnect(priv->conn);
221 -+ priv->force_disconnect_id = 0;
222 - return FALSE;
223 - }
224 -
225 ---
226 -2.23.0
227 -
228 -From 5e5b677173ef64055b4a7073cb5a15066fc03f70 Mon Sep 17 00:00:00 2001
229 -From: Guillaume Desmottes <guillaume.desmottes@××××××××××××.uk>
230 -Date: Fri, 14 Feb 2014 12:12:54 +0100
231 -Subject: [PATCH 5/6] idle-connection: make sure to always reset
232 - force_disconnect_id
233 -
234 -Recent GLib raises a critical when trying to remove an invalid source.
235 -
236 -(cherry picked from commit 12211654baa75db13a05b5c2b3293d1378fcf7a2)
237 ----
238 - src/idle-connection.c | 1 +
239 - 1 file changed, 1 insertion(+)
240 -
241 -diff --git a/src/idle-connection.c b/src/idle-connection.c
242 -index 71c020f..8614d52 100644
243 ---- a/src/idle-connection.c
244 -+++ b/src/idle-connection.c
245 -@@ -585,6 +585,7 @@ static gboolean _finish_shutdown_idle_func(gpointer data) {
246 - IdleConnectionPrivate *priv = self->priv;
247 - if (priv->force_disconnect_id != 0) {
248 - g_source_remove(priv->force_disconnect_id);
249 -+ priv->force_disconnect_id = 0;
250 - }
251 -
252 - tp_base_connection_finish_shutdown(conn);
253 ---
254 -2.23.0
255 -
256
257 diff --git a/net-irc/telepathy-idle/telepathy-idle-0.2.0-r3.ebuild b/net-irc/telepathy-idle/telepathy-idle-0.2.0-r3.ebuild
258 deleted file mode 100644
259 index 842f73c1242..00000000000
260 --- a/net-irc/telepathy-idle/telepathy-idle-0.2.0-r3.ebuild
261 +++ /dev/null
262 @@ -1,48 +0,0 @@
263 -# Copyright 1999-2020 Gentoo Authors
264 -# Distributed under the terms of the GNU General Public License v2
265 -
266 -EAPI=7
267 -
268 -PYTHON_COMPAT=( python3_{7..9} )
269 -inherit python-single-r1
270 -
271 -DESCRIPTION="Full-featured IRC connection manager for Telepathy"
272 -HOMEPAGE="https://cgit.freedesktop.org/telepathy/telepathy-idle"
273 -SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz
274 - https://src.fedoraproject.org/rpms/telepathy-idle/raw/93c37581c570200c3f646d0872a9c1327d3b3cb1/f/0001-tools-Fix-errors-running-glib-ginterface-gen-under-P.patch -> ${P}-py3-1.patch
275 - https://src.fedoraproject.org/rpms/telepathy-idle/raw/93c37581c570200c3f646d0872a9c1327d3b3cb1/f/0002-tools-Remove-outdated-is-unicode-checks.patch -> ${P}-py3-2.patch"
276 -
277 -LICENSE="LGPL-2.1+"
278 -SLOT="0"
279 -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
280 -IUSE="test"
281 -RESTRICT="!test? ( test )"
282 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
283 -
284 -BDEPEND="
285 - virtual/pkgconfig
286 - test? ( dev-python/twisted-words )
287 -"
288 -RDEPEND="
289 - >=dev-libs/dbus-glib-0.51
290 - >=dev-libs/glib-2.32:2
291 - >=net-libs/telepathy-glib-0.21
292 - sys-apps/dbus
293 - ${PYTHON_DEPS}
294 -"
295 -DEPEND="${RDEPEND}"
296 -
297 -PATCHES=(
298 - "${FILESDIR}/${P}-fixes.patch"
299 - "${DISTDIR}"/${P}-py3-{1,2}.patch
300 -)
301 -
302 -src_prepare() {
303 - default
304 -
305 - # Failed in 0.1.16 and code has not moved since october
306 - # Upstream is working on 1.0
307 - sed -e 's:connect/server-quit-ignore.py::' \
308 - -e 's:connect/server-quit-noclose.py::' \
309 - -i tests/twisted/Makefile.{am,in} || die
310 -}