Received: (at submit) by debbugs.gnu.org; 28 Apr 2024 19:13:37 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sun Apr 28 15:13:37 2024 Received: from localhost ([127.0.0.1]:52211 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1s19xu-0006Al-R3 for submit <at> 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 <w@HIDDEN>) id 1s19xq-0006Ae-O4 for submit <at> 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 <w@HIDDEN>) id 1s19xN-0000aA-ML for guix-patches@HIDDEN; 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 <w@HIDDEN>) id 1s19xK-00012f-RU for guix-patches@HIDDEN; Sun, 28 Apr 2024 15:13:01 -0400 From: Wilko Meyer <w@HIDDEN> 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= To: guix-patches@HIDDEN Subject: [PATCH] gnu: Add biboumi. Date: Sun, 28 Apr 2024 21:11:30 +0200 Message-ID: <90496269da21832ff00c1240a1325261c3e0e261.1714331488.git.w@HIDDEN> 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@HIDDEN; 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-Spam-Score: 2.9 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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 --- Content analysis details: (2.9 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.9 SPF_FAIL SPF: sender does not match SPF record (fail) [SPF failed: Please see http://www.openspf.org/Why?s=mfrom; id=w%40wmeyer.eu; ip=2001%3A470%3A142%3A%3A17; r=debbugs.gnu.org] 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: gorski.stream (stream)] X-Debbugs-Envelope-To: submit Cc: Wilko Meyer <w@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: 1.9 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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 --- Content analysis details: (1.9 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.9 SPF_FAIL SPF: sender does not match SPF record (fail) [SPF failed: Please see http://www.openspf.org/Why?s=mfrom;id=w%40wmeyer.eu;ip=2001%3A470%3A142%3A%3A17;r=debbugs.gnu.org] 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: gorski.stream (stream)] -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * 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 <yovan@HIDDEN> ;;; Copyright © 2023 gemmaro <gemmaro.dev@HIDDEN> ;;; Copyright © 2024 Carlo Zancanaro <carlo@HIDDEN> +;;; Copyright © 2024 Wilko Meyer <w@HIDDEN> ;;; ;;; 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 <dr@HIDDEN> +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
Wilko Meyer <w@HIDDEN>
:guix-patches@HIDDEN
.
Full text available.guix-patches@HIDDEN
:bug#70634
; Package guix-patches
.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.