From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id 0KxFJFygLmbN2wAA62LTzQ:P1 (envelope-from ) for ; Sun, 28 Apr 2024 21:15:40 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id 0KxFJFygLmbN2wAA62LTzQ (envelope-from ) for ; Sun, 28 Apr 2024 21:15:40 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=wmeyer.eu header.s=mail header.b=P8YVZfrV; dmarc=fail reason="SPF not aligned (relaxed)" header.from=wmeyer.eu (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1714331740; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=ug4y3V/qfnqoHqmGfC1SPEDnVz7OifCUU7M6ik5/j54=; b=Z0t/LiUfVZqFfGeWaPsY2MmmKQ3mWT2zJH2nB3coafSz/zpH1ZWF5gF2kjQqzFQQNGC8mL v06M8OfFtK9TO00GjSdSI83rTHYBEyl6AISWeWvTZAMUDcl8G4WovF7SNW9GhUWSTyYcB9 9kdJ3BnVeyPujoX0nYy09y3rKfkB+9MQqrKDedzZo/CfdRfTPzKa4ld3DUyRS1J4VEnYVl D6i8la/BgER7hO2QKUGho3gntKHaJ2MJX5RCTfNNxzvmIHbTyW8Np/9YSTOUbK3HGTmBav VUVrJ7hwPhR+mk/hr05gN/fUOYwHmLA4vjNRkbgo8MNvUl4DRwWaBY5Lpfvw0Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1714331740; a=rsa-sha256; cv=none; b=cZ8dyUUB087lzjDRabtL8fFTP+Zz+CT0rJewQfBVItiGvUuzN40rGhTJY/i0K+DA1mDPqz pT26WCstRoCoUVDtafoyKCw3BpgElrJMiGM7OvhV6PKFlzMdIE1ChXFvjyB1desRzTqanD mXGwlj6fhJ27Z3c939hPfwk+X1467HsJxa4M7ei0nx6f/8RFwqYbntgAj/XFz4bvaee1S5 8et/KV9Pj3X2PoMEkQMqsyLg7e+eSb1tbw9pqzsIZJhP3tRfwbaXXQjUe0M3qe52rpuUgD U9IuX4WLuMd2Ys496e99X7cAVBePRYKImFOpflYZCeWoX582XzUxIjqUhObklw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=wmeyer.eu header.s=mail header.b=P8YVZfrV; dmarc=fail reason="SPF not aligned (relaxed)" header.from=wmeyer.eu (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 1BDA4381AE for ; Sun, 28 Apr 2024 21:15:40 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s19yE-0000f0-MT; Sun, 28 Apr 2024 15:13:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s19yC-0000eY-Is for guix-patches@gnu.org; Sun, 28 Apr 2024 15:13:52 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s19y3-0001BI-5m for guix-patches@gnu.org; Sun, 28 Apr 2024 15:13:52 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s19yM-0006BB-Ak for guix-patches@gnu.org; Sun, 28 Apr 2024 15:14:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70634] [PATCH] gnu: Add biboumi. Resent-From: Wilko Meyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 28 Apr 2024 19:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 70634 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70634@debbugs.gnu.org Cc: Wilko Meyer X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.171433161723735 (code B ref -1); Sun, 28 Apr 2024 19:14:02 +0000 Received: (at submit) by debbugs.gnu.org; 28 Apr 2024 19:13:37 +0000 Received: from localhost ([127.0.0.1]:52211 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s19xu-0006Al-R3 for submit@debbugs.gnu.org; Sun, 28 Apr 2024 15:13:36 -0400 Received: from lists.gnu.org ([2001:470:142::17]:55264) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s19xq-0006Ae-O4 for submit@debbugs.gnu.org; Sun, 28 Apr 2024 15:13:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s19xN-0000aA-ML for guix-patches@gnu.org; Sun, 28 Apr 2024 15:13:01 -0400 Received: from mail.wmeyer.eu ([95.216.196.112]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s19xK-00012f-RU for guix-patches@gnu.org; Sun, 28 Apr 2024 15:13:01 -0400 From: Wilko Meyer DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wmeyer.eu; s=mail; t=1714331575; bh=ug4y3V/qfnqoHqmGfC1SPEDnVz7OifCUU7M6ik5/j54=; h=From:To:Cc:Subject:Date; b=P8YVZfrVqsP50/OaAQpFWUavu7M9/m8317E3FmtxviYBGn8+pfMzlaodtkyhiWSog Qg/EdYT3LMLpoiOPvlPmlejesP2yzXlLCfmmY1B4qbooW6bdZskTuWkZcL91DK0a0B XIGCK73zpF5S+KTldfb9t46mBeVw1UgUoVGePXro= Date: Sun, 28 Apr 2024 21:11:30 +0200 Message-ID: <90496269da21832ff00c1240a1325261c3e0e261.1714331488.git.w@wmeyer.eu> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=95.216.196.112; envelope-from=w@wmeyer.eu; helo=mail.wmeyer.eu X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -1.29 X-Spam-Score: -1.29 X-Migadu-Queue-Id: 1BDA4381AE X-Migadu-Scanner: mx11.migadu.com X-TUID: 5I4yLaizyEIG * gnu/packages/messaging.scm (biboumi): New variable. * gnu/packages/messaging.scm: Add copyright. * gnu/packages/patches/biboumi-cmake-ignore-git.patch: New patch. Change-Id: Ibb2bcadc8f64cbda3a0dbfe8ef5a931c52052658 --- Hi Guix, This patch series adds biboumi, a IRC<->XMPP gateway daemon. It also contains a patch the biboumi debian package maintainers apply on their biboumi package that removes louiz/Catch as a external project dependency from CMakeLists.txt. I considered packaging louiz/Catch, but the repository containing it seems to be gone. There's one optional dependency not packaged for guix, udns, the project homepage seems unavailable as well, even though the source code is still up[0]. As it's not needed to operate biboumi and only has a performance impact according to biboumis docs: #+BEGIN_QUOTE Asynchronously resolve domain names. This offers better reactivity and performances when connecting to a big number of IRC servers at the same time. #+END_QUOTE I'll leave it out for now. Tests are disabled for now as they seem to depend on louiz/Catch as well as network. As I yet have to migrate my prosody instance to guix I am currently unable to test biboumi any further than verifying that it builds succesfully. [0]: https://github.com/ortclib/udns [1]: https://doc.biboumi.louiz.org/install.html#libraries gnu/packages/messaging.scm | 44 ++++++++++++++++++ .../patches/biboumi-cmake-ignore-git.patch | 45 +++++++++++++++++++ 2 files changed, 89 insertions(+) create mode 100644 gnu/packages/patches/biboumi-cmake-ignore-git.patch diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 20bdb713b5..f178eafd9b 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -41,6 +41,7 @@ ;;; Copyright © 2023 Yovan Naumovski ;;; Copyright © 2023 gemmaro ;;; Copyright © 2024 Carlo Zancanaro +;;; Copyright © 2024 Wilko Meyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -163,6 +164,49 @@ (define-module (gnu packages messaging) #:use-module (guix packages) #:use-module (guix utils)) +(define-public biboumi + (package + (name "biboumi") + (version "9.0") + (source (origin + (method url-fetch) + (uri (string-append "https://git.louiz.org/biboumi/snapshot/biboumi-" + version ".tar.xz")) + (sha256 + (base32 "1jvygri165aknmvlinx3jb8cclny6cxdykjf8dp0a3l3228rmzqy")) + ;; see https://sources.debian.org/patches/biboumi/9.0-5/2001_cmake_ignore_git.patch/ + (patches (search-patches "biboumi-cmake-ignore-git.patch")))) + (arguments + ;; Tests seem to partially depend on networking as well as + ;; louiz/Catch which we remove as a dependency via the patch above as + ;; the repository seems dead. Deactivating those for now, possibly fix + ;; some of them later. + `(#:tests? #f + #:configure-flags '("-DWITHOUT_SYSTEMD=1") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-cmake-substitutions + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "CMakeLists.txt" + (("/etc") (string-append (assoc-ref outputs "out") "/etc")))))))) + (build-system cmake-build-system) + (inputs (list botan + expat + libiconv + libidn + openssl + postgresql ;; libpq + sqlite + ;; TODO: package optional dependency: udns + (list util-linux "lib") ;; libuuid + pkg-config)) + (home-page "https://biboumi.louiz.org") + (synopsis "Biboumi is a XMPP gateway that connects to IRC") + (description "Biboumi is a Free, Libre and Open Source XMPP gateway that connects to IRC +servers and translates between the two protocols. Its goal is to let XMPP +users take part in IRC discussions, using their favourite XMPP client.") + (license license:zlib))) + (define-public omemo-wget (package (name "omemo-wget") diff --git a/gnu/packages/patches/biboumi-cmake-ignore-git.patch b/gnu/packages/patches/biboumi-cmake-ignore-git.patch new file mode 100644 index 0000000000..cf9aa6c82d --- /dev/null +++ b/gnu/packages/patches/biboumi-cmake-ignore-git.patch @@ -0,0 +1,45 @@ +Description: Avoid cmake messing with git +Author: Jonas Smedegaard +Last-Update: 2016-12-21 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -288,27 +288,6 @@ + endforeach() + + # +-## Add a rule to download the catch unit test framework +-# +-include(ExternalProject) +-ExternalProject_Add(catch +- GIT_REPOSITORY "https://lab.louiz.org/louiz/Catch.git" +- PREFIX "external" +- UPDATE_COMMAND "" +- CONFIGURE_COMMAND "" +- BUILD_COMMAND "" +- INSTALL_COMMAND "" +- ) +-set_target_properties(catch PROPERTIES EXCLUDE_FROM_ALL TRUE) +-ExternalProject_Get_Property(catch SOURCE_DIR) +-if(NOT EXISTS ${CMAKE_SOURCE_DIR}/tests/catch.hpp) +- target_include_directories(test_suite +- PUBLIC "${SOURCE_DIR}/single_include/" +- ) +- add_dependencies(test_suite catch) +-endif() +- +-# + ## Add some custom rules to launch the tests + # + add_custom_target(check COMMAND "test_suite" +@@ -371,8 +350,7 @@ + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + ) + add_custom_target(dist +- DEPENDS ${ARCHIVE_NAME}.tar.xz +- DEPENDS catch) ++ DEPENDS ${ARCHIVE_NAME}.tar.xz) + + add_custom_target(rpm + DEPENDS dist base-commit: 8d29f416a9378d30f63c2a95f1bd1a420d9ccab4 prerequisite-patch-id: 455921dbaa6babc3a0f666eff8be41973ba1dad5 -- 2.41.0