1 |
commit: a9af4fc74490d0ca77c566bae92f63d021b6fd1f |
2 |
Author: Florian Schmaus <flow <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Feb 1 10:36:51 2022 +0000 |
4 |
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 1 10:36:55 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a9af4fc7 |
7 |
|
8 |
net-im/biboumi: treeclean, moved to ::gentoo |
9 |
|
10 |
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> |
11 |
|
12 |
net-im/biboumi/Manifest | 1 - |
13 |
net-im/biboumi/biboumi-9.0-r1.ebuild | 99 ---------------------- |
14 |
net-im/biboumi/biboumi-9.0.ebuild | 99 ---------------------- |
15 |
.../files/biboumi-9.0_rc1-split-cap-on-space.patch | 70 --------------- |
16 |
net-im/biboumi/files/biboumi.initd | 21 ----- |
17 |
net-im/biboumi/files/biboumi.logrotate.openrc | 10 --- |
18 |
net-im/biboumi/files/biboumi.logrotate.systemd | 8 -- |
19 |
net-im/biboumi/metadata.xml | 22 ----- |
20 |
8 files changed, 330 deletions(-) |
21 |
|
22 |
diff --git a/net-im/biboumi/Manifest b/net-im/biboumi/Manifest |
23 |
deleted file mode 100644 |
24 |
index 34c6c222d..000000000 |
25 |
--- a/net-im/biboumi/Manifest |
26 |
+++ /dev/null |
27 |
@@ -1 +0,0 @@ |
28 |
-DIST biboumi-9.0.tar.xz 161192 BLAKE2B 27c19f5c44e23caae07bd579b01d663e73cd8b432203ac95ae77e651936eea7cc443f389e589acebe5b36c32e96f215fdf0a86c97193726d601b53b709a2d66e SHA512 cfaacd831b56031906922472275c55fd6f1a5307ebe54959d21e3799ad4612499e8beeb34e8736df9eabc9fec1a861d17567250d64f316ace47395fd6c8f3c18 |
29 |
|
30 |
diff --git a/net-im/biboumi/biboumi-9.0-r1.ebuild b/net-im/biboumi/biboumi-9.0-r1.ebuild |
31 |
deleted file mode 100644 |
32 |
index 7b679f006..000000000 |
33 |
--- a/net-im/biboumi/biboumi-9.0-r1.ebuild |
34 |
+++ /dev/null |
35 |
@@ -1,99 +0,0 @@ |
36 |
-# Copyright 2020-2021 Gentoo Authors |
37 |
-# Distributed under the terms of the GNU General Public License v2 |
38 |
- |
39 |
-EAPI=7 |
40 |
- |
41 |
-inherit cmake fcaps |
42 |
- |
43 |
-MY_PV="${PV/_/-}" |
44 |
- |
45 |
-DESCRIPTION="XMPP gateway to IRC" |
46 |
-HOMEPAGE="https://biboumi.louiz.org/" |
47 |
-SRC_URI="https://git.louiz.org/biboumi/snapshot/biboumi-${MY_PV}.tar.xz" |
48 |
- |
49 |
-LICENSE="ZLIB" |
50 |
-SLOT="0" |
51 |
-KEYWORDS="~amd64" |
52 |
-IUSE="+idn logrotate postgres +sqlite +ssl systemd udns" |
53 |
- |
54 |
-DEPEND=" |
55 |
- dev-libs/expat |
56 |
- virtual/libiconv |
57 |
- sys-apps/util-linux |
58 |
- sqlite? ( dev-db/sqlite ) |
59 |
- postgres? ( dev-db/postgresql:* ) |
60 |
- idn? ( net-dns/libidn ) |
61 |
- udns? ( net-libs/udns ) |
62 |
- ssl? ( dev-libs/botan:2 ) |
63 |
- !ssl? ( dev-libs/libgcrypt ) |
64 |
- systemd? ( sys-apps/systemd ) |
65 |
-" |
66 |
-BDEPEND="dev-python/sphinx" |
67 |
-RDEPEND=" |
68 |
- ${DEPEND} |
69 |
- acct-user/biboumi |
70 |
-" |
71 |
- |
72 |
-S="${WORKDIR}/${PN}-${MY_PV}" |
73 |
- |
74 |
-DOCS=( README.rst CHANGELOG.rst doc/user.rst ) |
75 |
- |
76 |
-# Allow biboumi to run an identd on port 113. |
77 |
-FILECAPS=( -m 755 cap_net_bind_service+ep usr/bin/biboumi ) |
78 |
- |
79 |
-src_prepare() { |
80 |
- cmake_src_prepare |
81 |
- |
82 |
- if ! use systemd; then # Don't install biboumi.service. |
83 |
- sed -i '/DESTINATION lib\/systemd\/system/d' CMakeLists.txt || die |
84 |
- fi |
85 |
-} |
86 |
- |
87 |
-src_configure() { |
88 |
- local mycmakeargs=( |
89 |
- -DWITH_BOTAN="$(usex ssl)" |
90 |
- -DWITH_LIBIDN="$(usex idn)" |
91 |
- -DWITH_SYSTEMD="$(usex systemd)" |
92 |
- -DWITH_UDNS="$(usex udns)" |
93 |
- -DWITH_SQLITE3="$(usex sqlite)" |
94 |
- -DWITH_POSTGRESQL="$(usex postgres)" |
95 |
- |
96 |
- -DWITHOUT_SYSTEMD="$(usex systemd no yes)" |
97 |
- -DWITHOUT_POSTGRESQL="$(usex postgres no yes)" |
98 |
- ) # The WITHOUT_* is really needed. |
99 |
- |
100 |
- cmake_src_configure |
101 |
-} |
102 |
- |
103 |
-src_compile() { |
104 |
- cmake_src_compile |
105 |
- |
106 |
- cmake_build man |
107 |
-} |
108 |
- |
109 |
-src_install() { |
110 |
- cmake_src_install |
111 |
- |
112 |
- if ! use systemd; then |
113 |
- newinitd "${FILESDIR}/${PN}.initd" "${PN}" |
114 |
- fi |
115 |
- |
116 |
- if use logrotate; then |
117 |
- insinto etc/logrotate.d |
118 |
- if use systemd; then |
119 |
- newins "${FILESDIR}/${PN}.logrotate.systemd" "${PN}" |
120 |
- else |
121 |
- newins "${FILESDIR}/${PN}.logrotate.openrc" "${PN}" |
122 |
- fi |
123 |
- fi |
124 |
- |
125 |
- diropts --owner=biboumi --group=biboumi --mode=750 |
126 |
- if use sqlite; then |
127 |
- keepdir var/lib/biboumi |
128 |
- fi |
129 |
- keepdir var/log/biboumi |
130 |
- |
131 |
- insinto etc/biboumi |
132 |
- insopts --group=biboumi --mode=640 |
133 |
- newins conf/biboumi.cfg biboumi.cfg.example |
134 |
-} |
135 |
|
136 |
diff --git a/net-im/biboumi/biboumi-9.0.ebuild b/net-im/biboumi/biboumi-9.0.ebuild |
137 |
deleted file mode 100644 |
138 |
index 6df3ce672..000000000 |
139 |
--- a/net-im/biboumi/biboumi-9.0.ebuild |
140 |
+++ /dev/null |
141 |
@@ -1,99 +0,0 @@ |
142 |
-# Copyright 2020 Gentoo Authors |
143 |
-# Distributed under the terms of the GNU General Public License v2 |
144 |
- |
145 |
-EAPI=7 |
146 |
- |
147 |
-inherit cmake fcaps |
148 |
- |
149 |
-MY_PV="${PV/_/-}" |
150 |
- |
151 |
-DESCRIPTION="XMPP gateway to IRC" |
152 |
-HOMEPAGE="https://biboumi.louiz.org/" |
153 |
-SRC_URI="https://git.louiz.org/biboumi/snapshot/biboumi-${MY_PV}.tar.xz" |
154 |
- |
155 |
-LICENSE="ZLIB" |
156 |
-SLOT="0" |
157 |
-KEYWORDS="~amd64" |
158 |
-IUSE="+idn logrotate postgres +sqlite +ssl systemd udns" |
159 |
- |
160 |
-DEPEND=" |
161 |
- dev-libs/expat |
162 |
- virtual/libiconv |
163 |
- sys-apps/util-linux |
164 |
- sqlite? ( dev-db/sqlite ) |
165 |
- postgres? ( dev-db/postgresql:* ) |
166 |
- idn? ( net-dns/libidn ) |
167 |
- udns? ( net-libs/udns ) |
168 |
- ssl? ( dev-libs/botan:2 ) |
169 |
- !ssl? ( dev-libs/libgcrypt ) |
170 |
- systemd? ( sys-apps/systemd ) |
171 |
-" |
172 |
-BDEPEND="dev-python/sphinx" |
173 |
-RDEPEND=" |
174 |
- ${DEPEND} |
175 |
- acct-user/biboumi |
176 |
-" |
177 |
- |
178 |
-S="${WORKDIR}/${PN}-${MY_PV}" |
179 |
- |
180 |
-DOCS=( README.rst CHANGELOG.rst doc/user.rst ) |
181 |
- |
182 |
-# Allow biboumi to run an identd on port 113. |
183 |
-FILECAPS=( cap_net_bind_service+ep usr/bin/biboumi ) |
184 |
- |
185 |
-src_prepare() { |
186 |
- cmake_src_prepare |
187 |
- |
188 |
- if ! use systemd; then # Don't install biboumi.service. |
189 |
- sed -i '/DESTINATION lib\/systemd\/system/d' CMakeLists.txt || die |
190 |
- fi |
191 |
-} |
192 |
- |
193 |
-src_configure() { |
194 |
- local mycmakeargs=( |
195 |
- -DWITH_BOTAN="$(usex ssl)" |
196 |
- -DWITH_LIBIDN="$(usex idn)" |
197 |
- -DWITH_SYSTEMD="$(usex systemd)" |
198 |
- -DWITH_UDNS="$(usex udns)" |
199 |
- -DWITH_SQLITE3="$(usex sqlite)" |
200 |
- -DWITH_POSTGRESQL="$(usex postgres)" |
201 |
- |
202 |
- -DWITHOUT_SYSTEMD="$(usex systemd no yes)" |
203 |
- -DWITHOUT_POSTGRESQL="$(usex postgres no yes)" |
204 |
- ) # The WITHOUT_* is really needed. |
205 |
- |
206 |
- cmake_src_configure |
207 |
-} |
208 |
- |
209 |
-src_compile() { |
210 |
- cmake_src_compile |
211 |
- |
212 |
- cmake_build man |
213 |
-} |
214 |
- |
215 |
-src_install() { |
216 |
- cmake_src_install |
217 |
- |
218 |
- if ! use systemd; then |
219 |
- newinitd "${FILESDIR}/${PN}.initd" "${PN}" |
220 |
- fi |
221 |
- |
222 |
- if use logrotate; then |
223 |
- insinto etc/logrotate.d |
224 |
- if use systemd; then |
225 |
- newins "${FILESDIR}/${PN}.logrotate.systemd" "${PN}" |
226 |
- else |
227 |
- newins "${FILESDIR}/${PN}.logrotate.openrc" "${PN}" |
228 |
- fi |
229 |
- fi |
230 |
- |
231 |
- diropts --owner=biboumi --group=biboumi --mode=750 |
232 |
- if use sqlite; then |
233 |
- keepdir var/lib/biboumi |
234 |
- fi |
235 |
- keepdir var/log/biboumi |
236 |
- |
237 |
- insinto etc/biboumi |
238 |
- insopts --group=biboumi --mode=640 |
239 |
- newins conf/biboumi.cfg biboumi.cfg.example |
240 |
-} |
241 |
|
242 |
diff --git a/net-im/biboumi/files/biboumi-9.0_rc1-split-cap-on-space.patch b/net-im/biboumi/files/biboumi-9.0_rc1-split-cap-on-space.patch |
243 |
deleted file mode 100644 |
244 |
index af86ead1a..000000000 |
245 |
--- a/net-im/biboumi/files/biboumi-9.0_rc1-split-cap-on-space.patch |
246 |
+++ /dev/null |
247 |
@@ -1,70 +0,0 @@ |
248 |
-From b98434b5d04d1ada9b24475e17ee8947d96ad1e3 Mon Sep 17 00:00:00 2001 |
249 |
-From: =?UTF-8?q?louiz=E2=80=99?= <louiz@×××××.org> |
250 |
-Date: Sun, 16 Aug 2020 16:05:15 +0200 |
251 |
-Subject: [PATCH] In CAP messages, handle the last arg as a list of |
252 |
- capabilities |
253 |
- |
254 |
-Instead of just one. This fixes the issue of the "trailing whitespace" since we |
255 |
-now split it on ' ' |
256 |
- |
257 |
-Fix #3442 |
258 |
---- |
259 |
- src/irc/irc_client.cpp | 25 ++++++++++++++----------- |
260 |
- tests/utils.cpp | 3 +++ |
261 |
- 2 files changed, 17 insertions(+), 11 deletions(-) |
262 |
- |
263 |
-diff --git a/src/irc/irc_client.cpp b/src/irc/irc_client.cpp |
264 |
-index 3ae5ac6..5f0d9b9 100644 |
265 |
---- a/src/irc/irc_client.cpp |
266 |
-+++ b/src/irc/irc_client.cpp |
267 |
-@@ -1340,19 +1340,22 @@ long int IrcClient::get_throttle_limit() const |
268 |
- void IrcClient::on_cap(const IrcMessage &message) |
269 |
- { |
270 |
- const auto& sub_command = message.arguments[1]; |
271 |
-- const auto& cap = message.arguments[2]; |
272 |
-- auto it = this->capabilities.find(cap); |
273 |
-- if (it == this->capabilities.end()) |
274 |
-+ const auto& caps = utils::split(message.arguments[2], ' ', false); |
275 |
-+ for (const auto& cap: caps) |
276 |
- { |
277 |
-- log_warning("Received a CAP message for something we didn’t ask, or that we already handled."); |
278 |
-- return; |
279 |
-+ auto it = this->capabilities.find(cap); |
280 |
-+ if (it == this->capabilities.end()) |
281 |
-+ { |
282 |
-+ log_warning("Received a CAP message for something we didn’t ask, or that we already handled: [", cap, "]"); |
283 |
-+ return; |
284 |
-+ } |
285 |
-+ Capability& capability = it->second; |
286 |
-+ if (sub_command == "ACK") |
287 |
-+ capability.on_ack(); |
288 |
-+ else if (sub_command == "NACK") |
289 |
-+ capability.on_nack(); |
290 |
-+ this->capabilities.erase(it); |
291 |
- } |
292 |
-- Capability& capability = it->second; |
293 |
-- if (sub_command == "ACK") |
294 |
-- capability.on_ack(); |
295 |
-- else if (sub_command == "NACK") |
296 |
-- capability.on_nack(); |
297 |
-- this->capabilities.erase(it); |
298 |
- if (this->capabilities.empty()) |
299 |
- this->cap_end(); |
300 |
- } |
301 |
-diff --git a/tests/utils.cpp b/tests/utils.cpp |
302 |
-index 6de19f0..6151733 100644 |
303 |
---- a/tests/utils.cpp |
304 |
-+++ b/tests/utils.cpp |
305 |
-@@ -28,6 +28,9 @@ TEST_CASE("String split") |
306 |
- CHECK(splitted.size() == 2); |
307 |
- CHECK(splitted[0] == ""); |
308 |
- CHECK(splitted[1] == "a"); |
309 |
-+ splitted = utils::split("multi-prefix ", ' '); |
310 |
-+ CHECK(splitted[0] == "multi-prefix"); |
311 |
-+ CHECK(splitted.size() == 1); |
312 |
- } |
313 |
- |
314 |
- TEST_CASE("tolower") |
315 |
--- |
316 |
-2.26.2 |
317 |
- |
318 |
|
319 |
diff --git a/net-im/biboumi/files/biboumi.initd b/net-im/biboumi/files/biboumi.initd |
320 |
deleted file mode 100644 |
321 |
index 665db9120..000000000 |
322 |
--- a/net-im/biboumi/files/biboumi.initd |
323 |
+++ /dev/null |
324 |
@@ -1,21 +0,0 @@ |
325 |
-#!/sbin/openrc-run |
326 |
-# Copyright 1999-2020 Gentoo Authors |
327 |
-# Distributed under the terms of the GNU General Public License v2 |
328 |
- |
329 |
-description="XMPP gateway to IRC" |
330 |
-pidfile="/var/run/biboumi.pid" |
331 |
-command="/usr/bin/biboumi" |
332 |
-command_args="${BIBOUMI_CONFIG:-/etc/biboumi/biboumi.cfg}" |
333 |
-command_user="${BIBOUMI_USER:-biboumi}" |
334 |
-command_background="true" |
335 |
-extra_commands="reload" |
336 |
- |
337 |
-depend() { |
338 |
- use jabber-server |
339 |
-} |
340 |
- |
341 |
-reload() { |
342 |
- ebegin "Reloading configuration of Biboumi" |
343 |
- start-stop-daemon --pidfile ${pidfile} --signal USR1 |
344 |
- eend $? |
345 |
-} |
346 |
|
347 |
diff --git a/net-im/biboumi/files/biboumi.logrotate.openrc b/net-im/biboumi/files/biboumi.logrotate.openrc |
348 |
deleted file mode 100644 |
349 |
index 19964cf60..000000000 |
350 |
--- a/net-im/biboumi/files/biboumi.logrotate.openrc |
351 |
+++ /dev/null |
352 |
@@ -1,10 +0,0 @@ |
353 |
-/var/log/biboumi/*.log { |
354 |
- missingok |
355 |
- notifempty |
356 |
- sharedscripts |
357 |
- postrotate |
358 |
- for service in /etc/init.d/biboumi*; do |
359 |
- rc-service $(basename ${service}) reload > /dev/null |
360 |
- done |
361 |
- endscript |
362 |
-} |
363 |
|
364 |
diff --git a/net-im/biboumi/files/biboumi.logrotate.systemd b/net-im/biboumi/files/biboumi.logrotate.systemd |
365 |
deleted file mode 100644 |
366 |
index b14f1df05..000000000 |
367 |
--- a/net-im/biboumi/files/biboumi.logrotate.systemd |
368 |
+++ /dev/null |
369 |
@@ -1,8 +0,0 @@ |
370 |
-/var/log/biboumi/*.log { |
371 |
- missingok |
372 |
- notifempty |
373 |
- sharedscripts |
374 |
- postrotate |
375 |
- systemctl reload biboumi.service |
376 |
- endscript |
377 |
-} |
378 |
|
379 |
diff --git a/net-im/biboumi/metadata.xml b/net-im/biboumi/metadata.xml |
380 |
deleted file mode 100644 |
381 |
index dabf900f8..000000000 |
382 |
--- a/net-im/biboumi/metadata.xml |
383 |
+++ /dev/null |
384 |
@@ -1,22 +0,0 @@ |
385 |
-<?xml version="1.0" encoding="UTF-8"?> |
386 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
387 |
-<pkgmetadata> |
388 |
- <maintainer type="person"> |
389 |
- <email>gentoo@××××××××.de</email> |
390 |
- <name>Ronny (tastytea) Gutbrod</name> |
391 |
- </maintainer> |
392 |
- <longdescription lang="en"> |
393 |
- Biboumi is an XMPP gateway that connects to IRC servers and translates |
394 |
- between the two protocols. It can be used to access IRC channels using |
395 |
- any XMPP client as if these channels were XMPP MUCs. |
396 |
- </longdescription> |
397 |
- <upstream> |
398 |
- <doc>https://doc.biboumi.louiz.org/</doc> |
399 |
- <bugs-to>https://lab.louiz.org/louiz/biboumi/issues</bugs-to> |
400 |
- </upstream> |
401 |
- <use> |
402 |
- <flag name="udns">Asynchronously resolve domain names using |
403 |
- net-libs/udns</flag> |
404 |
- <flag name="logrotate">Use app-admin/logrotate for rotating logs</flag> |
405 |
- </use> |
406 |
-</pkgmetadata> |