From unknown Sat Aug 16 11:42:12 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#69272 <69272@debbugs.gnu.org> To: bug#69272 <69272@debbugs.gnu.org> Subject: Status: [PATCH 0/4] Refactor prosody modules, and add prosody-vcard-muc. Reply-To: bug#69272 <69272@debbugs.gnu.org> Date: Sat, 16 Aug 2025 18:42:12 +0000 retitle 69272 [PATCH 0/4] Refactor prosody modules, and add prosody-vcard-m= uc. reassign 69272 guix-patches submitter 69272 Carlo Zancanaro severity 69272 normal tag 69272 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 19 07:32:30 2024 Received: (at submit) by debbugs.gnu.org; 19 Feb 2024 12:32:30 +0000 Received: from localhost ([127.0.0.1]:40562 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rc2ov-0001BG-Sx for submit@debbugs.gnu.org; Mon, 19 Feb 2024 07:32:30 -0500 Received: from lists.gnu.org ([209.51.188.17]:49602) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rc2ou-0001B9-K7 for submit@debbugs.gnu.org; Mon, 19 Feb 2024 07:32:29 -0500 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 1rc2oY-0007nP-Lp for guix-patches@gnu.org; Mon, 19 Feb 2024 07:32:06 -0500 Received: from voltorb.zancanaro.id.au ([45.77.50.64]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rc2oW-0004Tb-NB for guix-patches@gnu.org; Mon, 19 Feb 2024 07:32:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=k1; bh=QoeTVGG0OlrE0LW Rch6qE55mE72PymBIQwQGyEg2gpQ=; h=date:subject:to:from; d=zancanaro.id.au; b=h0+AccJFH+zdP4C4Hi70A1FBvWKj43M2uNMRLRJIs6MOWI/qW HczuoGSofIGWhMkqvgJ29VcHpUN6HBtxCkzA0e3c6kkdFsdSxWz2rGGCkgY1WibFspDw+P Yure0ejt1ZXMdf3LaSE8V5UvgFfHduzq37z5FRqRh+J+ftnQnG04= Received: by voltorb.zancanaro.id.au (OpenSMTPD) with ESMTPSA id 085bb5d0 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Mon, 19 Feb 2024 12:31:56 +0000 (UTC) From: Carlo Zancanaro To: guix-patches@gnu.org Subject: [PATCH 0/4] Refactor prosody modules, and add prosody-vcard-muc. Date: Mon, 19 Feb 2024 23:31:03 +1100 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=45.77.50.64; envelope-from=carlo@zancanaro.id.au; helo=voltorb.zancanaro.id.au 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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -3.5 (---) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.5 (----) I wanted to add prosody-vcard-muc, which is a prosody module. When I saw the code for the two existing modules I thought it could use a refactor before adding it, so I did that, too. I have successfully reconfigured my prosody server, which uses all three of the Guix-packaged prosody modules, with this change. Carlo Zancanaro (4): gnu: Extract prosody-module from existing prosody modules. gnu: Use copy-build-system for prosody modules. gnu: Update prosody modules to the newest revision. gnu: Add prosody-vcard-muc. gnu/packages/messaging.scm | 88 +++++++++++++++++--------------------- 1 file changed, 39 insertions(+), 49 deletions(-) base-commit: 07ecdb99b6c4b6b3e993d08034138bf69414020b -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 19 07:35:54 2024 Received: (at 69272) by debbugs.gnu.org; 19 Feb 2024 12:35:54 +0000 Received: from localhost ([127.0.0.1]:40584 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rc2sD-0001Hx-Ni for submit@debbugs.gnu.org; Mon, 19 Feb 2024 07:35:54 -0500 Received: from voltorb.zancanaro.id.au ([45.77.50.64]:47274) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rc2sA-0001He-Gd for 69272@debbugs.gnu.org; Mon, 19 Feb 2024 07:35:52 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=k1; bh=tqKdjaicQochg4o 6liHd5LIH7N58ktHP5R7tsDQcOZk=; h=references:in-reply-to:date:subject: to:from; d=zancanaro.id.au; b=ai23NI5Znm3qAcPd6jvYDlBUMpdF20UtgkRIHanq 9SLAS8oiQjpNhOH58NDmDLN9fQP6VGkcDrT5obdKnZHwcG6M9FD5qPxXG2z9MEnD7k2Ccv zFXiKnOuzxPRQVdRAKRNp0wKDPp4XVEKsQISaet/+4XJt2d93y7Xyft1H5ldY= Received: by voltorb.zancanaro.id.au (OpenSMTPD) with ESMTPSA id 05a384df (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <69272@debbugs.gnu.org>; Mon, 19 Feb 2024 12:35:18 +0000 (UTC) From: Carlo Zancanaro To: 69272@debbugs.gnu.org Subject: [PATCH 1/4] gnu: Extract prosody-module from existing prosody modules. Date: Mon, 19 Feb 2024 23:34:56 +1100 Message-ID: <7a66ea0fe55fc6cd059eea7492df0f1889155d47.1708345640.git.carlo@zancanaro.id.au> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -1.9 (-) X-Debbugs-Envelope-To: 69272 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.9 (--) * gnu/packages/messaging.scm (prosody-module): New procedure. (prosody-http-upload, prosody-smacks): Use it. Change-Id: I55c69104460adbbd89c491b18f9f22681aefb92a --- gnu/packages/messaging.scm | 67 ++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 39 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 98c1c9bf67..9cc90c588b 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -40,6 +40,7 @@ ;;; Copyright © 2023 Giacomo Leidi ;;; Copyright © 2023 Yovan Naumovski ;;; Copyright © 2023 gemmaro +;;; Copyright © 2024 Carlo Zancanaro ;;; ;;; This file is part of GNU Guix. ;;; @@ -1577,11 +1578,18 @@ (define-public prosody protocols.") (license license:x11))) -(define-public prosody-http-upload +(define (prosody-module module-name) (let ((changeset "765735bb590b") - (revision "1")) + (revision "1") + (package-name (string-append + "prosody-" + (string-replace-substring + (if (string-prefix? "mod_" module-name) + (substring module-name 4) + module-name) + "_" "-")))) (package - (name "prosody-http-upload") + (name package-name) (version (string-append "0-" revision "." (string-take changeset 7))) (source (origin (method hg-fetch) @@ -1600,47 +1608,28 @@ (define-public prosody-http-upload (use-modules (guix build utils)) (let ((out (assoc-ref %outputs "out")) (source (assoc-ref %build-inputs "source"))) - (with-directory-excursion (in-vicinity source "mod_http_upload") - (install-file "mod_http_upload.lua" out)) + (with-directory-excursion (in-vicinity source module-name) + (install-file (string-append module-name ".lua") out)) #t)))) - (home-page "https://modules.prosody.im/mod_http_upload.html") - (synopsis "XEP-0363: Allow clients to upload files over HTTP") - (description "This module implements XEP-0363: it allows clients to -upload files over HTTP.") + (home-page #f) + (synopsis #f) + (description #f) (license (package-license prosody))))) +(define-public prosody-http-upload + (package + (inherit (prosody-module "mod_http_upload")) + (synopsis "XEP-0363: Allow clients to upload files over HTTP") + (description "This module implements XEP-0363: it allows clients to +upload files over HTTP."))) + (define-public prosody-smacks - (let ((changeset "67f1d1f22625") - (revision "1")) - (package - (name "prosody-smacks") - (version (string-append "0-" revision "." (string-take changeset 7))) - (source (origin - (method hg-fetch) - (uri (hg-reference - (url "https://hg.prosody.im/prosody-modules/") - (changeset changeset))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "020ngpax30fgarah98yvlj0ni8rcdwq60if03a9hqdw8mic0nxxs")))) - (build-system trivial-build-system) - (arguments - '(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (let ((out (assoc-ref %outputs "out")) - (source (assoc-ref %build-inputs "source"))) - (with-directory-excursion (in-vicinity source "mod_smacks") - (install-file "mod_smacks.lua" out)) - #t)))) - (home-page "https://modules.prosody.im/mod_smacks.html") - (synopsis "XEP-0198: Reliability and fast reconnects for XMPP") - (description "This module implements XEP-0198: when supported by both + (package + (inherit (prosody-module "mod_smacks")) + (synopsis "XEP-0198: Reliability and fast reconnects for XMPP") + (description "This module implements XEP-0198: when supported by both the client and server, it can allow clients to resume a disconnected session, -and prevent message loss.") - (license (package-license prosody))))) +and prevent message loss."))) (define-public libtoxcore (let ((revision "2") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 19 07:35:57 2024 Received: (at 69272) by debbugs.gnu.org; 19 Feb 2024 12:35:57 +0000 Received: from localhost ([127.0.0.1]:40588 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rc2sH-0001IP-Am for submit@debbugs.gnu.org; Mon, 19 Feb 2024 07:35:57 -0500 Received: from voltorb.zancanaro.id.au ([45.77.50.64]:47274) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rc2sC-0001He-Vr for 69272@debbugs.gnu.org; Mon, 19 Feb 2024 07:35:53 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=k1; bh=YO+tbExRar6Ey+d tytYwklq1izk9ZltusP9axhbWV9w=; h=references:in-reply-to:date:subject: to:from; d=zancanaro.id.au; b=EiLT1FBW95BI9/41HBbms6bmHib3fJKOJuOLPW02 VPbMaFbtq1VRS6d7ta9AUS84cCcqZmfX5wXs6PqrWryO6I+/d8siV25CbkqgWYdQMNdWOR 2S/O/QMPxtX2cVfIpY6GxxuDJ/YBJ3PVCbLSKIK5TxF8erT5LX4YLGrTH690g= Received: by voltorb.zancanaro.id.au (OpenSMTPD) with ESMTPSA id 92aa67a4 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <69272@debbugs.gnu.org>; Mon, 19 Feb 2024 12:35:19 +0000 (UTC) From: Carlo Zancanaro To: 69272@debbugs.gnu.org Subject: [PATCH 2/4] gnu: Use copy-build-system for prosody modules. Date: Mon, 19 Feb 2024 23:34:57 +1100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -1.9 (-) X-Debbugs-Envelope-To: 69272 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.9 (--) * gnu/packages/messaging.scm (prosody-module): Use copy-build system. Change-Id: I6de2827c63cb454d80b20f3af84fa610a75172f4 --- gnu/packages/messaging.scm | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 9cc90c588b..3f39900c44 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -144,6 +144,7 @@ (define-module (gnu packages messaging) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (guix build-system cmake) + #:use-module (guix build-system copy) #:use-module (guix build-system go) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) @@ -1600,18 +1601,11 @@ (define (prosody-module module-name) (sha256 (base32 "142wrcism70nf8ffahhd961cqg2pi1h7ic8adfs3zwh0j3pnf41f")))) - (build-system trivial-build-system) + (build-system copy-build-system) (arguments - '(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (let ((out (assoc-ref %outputs "out")) - (source (assoc-ref %build-inputs "source"))) - (with-directory-excursion (in-vicinity source module-name) - (install-file (string-append module-name ".lua") out)) - #t)))) - (home-page #f) + `(#:install-plan '((,(string-append module-name "/") ".")))) + (home-page (string-append "https://modules.prosody.im/" + module-name ".html")) (synopsis #f) (description #f) (license (package-license prosody))))) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 19 07:35:58 2024 Received: (at 69272) by debbugs.gnu.org; 19 Feb 2024 12:35:58 +0000 Received: from localhost ([127.0.0.1]:40590 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rc2sH-0001IR-Qd for submit@debbugs.gnu.org; Mon, 19 Feb 2024 07:35:58 -0500 Received: from voltorb.zancanaro.id.au ([45.77.50.64]:47274) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rc2sE-0001He-GG for 69272@debbugs.gnu.org; Mon, 19 Feb 2024 07:35:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=k1; bh=oSuSaoLCkQNVwsl 1PyKok9vTDvPOso/v3bjWD4naz0g=; h=references:in-reply-to:date:subject: to:from; d=zancanaro.id.au; b=Uk3wRTB6XgHjffQhD9lc4fJ11ejid2SKVmMxvtJt /+OTCnxIHN1wl8CMklZOsHVWYeCOfE5ieGby/BIDSBNzZYSCpXMc4BMuycw+moAzF9iQMZ WTGZfOCccRmEBB1J9RHc5bJ+skrJ74x/ivB2X/BBQO/aqr1KZTGEQ45e0WpJ8= Received: by voltorb.zancanaro.id.au (OpenSMTPD) with ESMTPSA id 36d3adce (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <69272@debbugs.gnu.org>; Mon, 19 Feb 2024 12:35:19 +0000 (UTC) From: Carlo Zancanaro To: 69272@debbugs.gnu.org Subject: [PATCH 3/4] gnu: Update prosody modules to the newest revision. Date: Mon, 19 Feb 2024 23:34:58 +1100 Message-ID: <9777065af632fd021fa1be2c9ec641fe941ab16c.1708345640.git.carlo@zancanaro.id.au> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -1.9 (-) X-Debbugs-Envelope-To: 69272 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.9 (--) * gnu/packages/messaging.scm (prosody-module): Update to fba64b043c52. Change-Id: I012c2f661200cc59ae088e522ac233c09d77d2af --- gnu/packages/messaging.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 3f39900c44..f360e69fcb 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1580,8 +1580,8 @@ (define-public prosody (license license:x11))) (define (prosody-module module-name) - (let ((changeset "765735bb590b") - (revision "1") + (let ((changeset "fba64b043c52") + (revision "2") (package-name (string-append "prosody-" (string-replace-substring @@ -1600,7 +1600,7 @@ (define (prosody-module module-name) (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "142wrcism70nf8ffahhd961cqg2pi1h7ic8adfs3zwh0j3pnf41f")))) + "1nvka8s3zqs97jqsknhp2q956rrdga1qaxa1y3i0h8zx3g9vgdch")))) (build-system copy-build-system) (arguments `(#:install-plan '((,(string-append module-name "/") ".")))) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 19 07:35:58 2024 Received: (at 69272) by debbugs.gnu.org; 19 Feb 2024 12:35:58 +0000 Received: from localhost ([127.0.0.1]:40592 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rc2sI-0001IZ-5o for submit@debbugs.gnu.org; Mon, 19 Feb 2024 07:35:58 -0500 Received: from voltorb.zancanaro.id.au ([45.77.50.64]:47274) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rc2sF-0001He-TT for 69272@debbugs.gnu.org; Mon, 19 Feb 2024 07:35:56 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=k1; bh=5jisR5SIU5ez7GU VOfTMSkheEFMV0AXMBKPg2Xyuq/g=; h=references:in-reply-to:date:subject: to:from; d=zancanaro.id.au; b=o3wmQrsOyTbktZ1HU0v2SFFbUTmw2qLBa55kH+GQ yK0wzuohbYRuxfbZ8O2q82n1wDpwSYv9thfmgQ2OucZI1TH/kgHRkXq0/Yq3pGQ2RS1MoU o/nHDALtsGsNRy18ijGh+R1tuk9fX7mUZ4TZl+8e56plefdABF8jmo787v81U= Received: by voltorb.zancanaro.id.au (OpenSMTPD) with ESMTPSA id e30d1f5c (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <69272@debbugs.gnu.org>; Mon, 19 Feb 2024 12:35:19 +0000 (UTC) From: Carlo Zancanaro To: 69272@debbugs.gnu.org Subject: [PATCH 4/4] gnu: Add prosody-vcard-muc. Date: Mon, 19 Feb 2024 23:34:59 +1100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -1.9 (-) X-Debbugs-Envelope-To: 69272 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.9 (--) * gnu/packages/messaging.scm (prosody-vcard-muc): New variable. Change-Id: I57eae8373369e7e954084803fd7b861ab85ce4ad --- gnu/packages/messaging.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index f360e69fcb..03b7368ae0 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1625,6 +1625,13 @@ (define-public prosody-smacks the client and server, it can allow clients to resume a disconnected session, and prevent message loss."))) +(define-public prosody-vcard-muc + (package + (inherit (prosody-module "mod_vcard_muc")) + (synopsis "Support for MUC vCards and avatars") + (description "This module adds the ability to set vCard for MUC rooms. One +of the most common use cases is to define avatars for MUC rooms."))) + (define-public libtoxcore (let ((revision "2") (commit "bf69b54f64003d160d759068f4816b2d9b2e1e21")) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 19 16:47:20 2024 Received: (at 69272) by debbugs.gnu.org; 19 Feb 2024 21:47:20 +0000 Received: from localhost ([127.0.0.1]:43689 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rcBTs-0005ox-A4 for submit@debbugs.gnu.org; Mon, 19 Feb 2024 16:47:20 -0500 Received: from voltorb.zancanaro.id.au ([45.77.50.64]:47840) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rcBTo-0005og-Fj for 69272@debbugs.gnu.org; Mon, 19 Feb 2024 16:47:18 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=k1; bh=K5d6Kcn2PMOlHZT ByYaC9wiz4jbcw3tW+0DwkgAd5h4=; h=references:in-reply-to:date:subject: to:from; d=zancanaro.id.au; b=nVhUs0+NqhV1h7CK5gG1Es3OLutiphKm8qIhOq89 KU8yjkH06Kpcz71Tdl2WTA39w0ir+YzyFQdcRfQxks2moehENvxnH5rzWCN2/ypjYABRON sTSGqFj/GmaBs0ZyGZ4Ck+hb0cG2L8mNCIa+IwFeYb/0/AHAm/IiwjElCTc9c= Received: by voltorb.zancanaro.id.au (OpenSMTPD) with ESMTPSA id 76f3cc26 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <69272@debbugs.gnu.org>; Mon, 19 Feb 2024 21:46:44 +0000 (UTC) From: Carlo Zancanaro To: 69272@debbugs.gnu.org Subject: [PATCH v2 0/4] Refactor prosody modules, and add prosody-vcard-muc. Date: Tue, 20 Feb 2024 08:44:15 +1100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -1.9 (-) X-Debbugs-Envelope-To: 69272 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.9 (--) I noticed that the home-page line snuck out of the first commit and ended up in the second. This should be better. Carlo Zancanaro (4): gnu: Extract prosody-module from existing prosody modules. gnu: Use copy-build-system for prosody modules. gnu: Update prosody modules to the newest revision. gnu: Add prosody-vcard-muc. gnu/packages/messaging.scm | 88 +++++++++++++++++--------------------- 1 file changed, 39 insertions(+), 49 deletions(-) base-commit: 07ecdb99b6c4b6b3e993d08034138bf69414020b -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 19 16:47:24 2024 Received: (at 69272) by debbugs.gnu.org; 19 Feb 2024 21:47:24 +0000 Received: from localhost ([127.0.0.1]:43694 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rcBTv-0005pN-K5 for submit@debbugs.gnu.org; Mon, 19 Feb 2024 16:47:24 -0500 Received: from voltorb.zancanaro.id.au ([45.77.50.64]:47840) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rcBTr-0005og-DV for 69272@debbugs.gnu.org; Mon, 19 Feb 2024 16:47:20 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=k1; bh=4sr8/oL5m/iPkFM cLbVRp/d1DhcMhgosDKJ4+SVfLXk=; h=references:in-reply-to:date:subject: to:from; d=zancanaro.id.au; b=o6Ic/RHSIbvEqurgRpVCgJrbruMen3p8r1C5vMKm 9ep9SHjcrH2LQD6iHk+p3PAMVE2gQq8YSl64ky7NLoFr2/fJBr2jLcKpgYsaDTna9XJ182 XHe/zpBXnotfoBGlcokKDIzdFbVgutjS4JlggAxuPNiZD0ZgG5synP8pX9wKY= Received: by voltorb.zancanaro.id.au (OpenSMTPD) with ESMTPSA id bf5397f4 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <69272@debbugs.gnu.org>; Mon, 19 Feb 2024 21:46:44 +0000 (UTC) From: Carlo Zancanaro To: 69272@debbugs.gnu.org Subject: [PATCH v2 1/4] gnu: Extract prosody-module from existing prosody modules. Date: Tue, 20 Feb 2024 08:44:16 +1100 Message-ID: <55c015b018c39d59922c916574eb59de27f9a353.1708379059.git.carlo@zancanaro.id.au> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -1.9 (-) X-Debbugs-Envelope-To: 69272 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.9 (--) * gnu/packages/messaging.scm (prosody-module): New procedure. (prosody-http-upload, prosody-smacks): Use it. Change-Id: I55c69104460adbbd89c491b18f9f22681aefb92a --- The only change from v1 is to properly define home-page in prosody-module. gnu/packages/messaging.scm | 70 ++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 40 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 98c1c9bf67..d06cd74177 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -40,6 +40,7 @@ ;;; Copyright © 2023 Giacomo Leidi ;;; Copyright © 2023 Yovan Naumovski ;;; Copyright © 2023 gemmaro +;;; Copyright © 2024 Carlo Zancanaro ;;; ;;; This file is part of GNU Guix. ;;; @@ -1577,11 +1578,18 @@ (define-public prosody protocols.") (license license:x11))) -(define-public prosody-http-upload +(define (prosody-module module-name) (let ((changeset "765735bb590b") - (revision "1")) + (revision "1") + (package-name (string-append + "prosody-" + (string-replace-substring + (if (string-prefix? "mod_" module-name) + (substring module-name 4) + module-name) + "_" "-")))) (package - (name "prosody-http-upload") + (name package-name) (version (string-append "0-" revision "." (string-take changeset 7))) (source (origin (method hg-fetch) @@ -1600,47 +1608,29 @@ (define-public prosody-http-upload (use-modules (guix build utils)) (let ((out (assoc-ref %outputs "out")) (source (assoc-ref %build-inputs "source"))) - (with-directory-excursion (in-vicinity source "mod_http_upload") - (install-file "mod_http_upload.lua" out)) + (with-directory-excursion (in-vicinity source module-name) + (install-file (string-append module-name ".lua") out)) #t)))) - (home-page "https://modules.prosody.im/mod_http_upload.html") - (synopsis "XEP-0363: Allow clients to upload files over HTTP") - (description "This module implements XEP-0363: it allows clients to -upload files over HTTP.") + (home-page (string-append "https://modules.prosody.im/" + module-name ".html")) + (synopsis #f) + (description #f) (license (package-license prosody))))) -(define-public prosody-smacks - (let ((changeset "67f1d1f22625") - (revision "1")) - (package - (name "prosody-smacks") - (version (string-append "0-" revision "." (string-take changeset 7))) - (source (origin - (method hg-fetch) - (uri (hg-reference - (url "https://hg.prosody.im/prosody-modules/") - (changeset changeset))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "020ngpax30fgarah98yvlj0ni8rcdwq60if03a9hqdw8mic0nxxs")))) - (build-system trivial-build-system) - (arguments - '(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (let ((out (assoc-ref %outputs "out")) - (source (assoc-ref %build-inputs "source"))) - (with-directory-excursion (in-vicinity source "mod_smacks") - (install-file "mod_smacks.lua" out)) - #t)))) - (home-page "https://modules.prosody.im/mod_smacks.html") - (synopsis "XEP-0198: Reliability and fast reconnects for XMPP") - (description "This module implements XEP-0198: when supported by both +(define-public prosody-http-upload + (package + (inherit (prosody-module "mod_http_upload")) + (synopsis "XEP-0363: Allow clients to upload files over HTTP") + (description "This module implements XEP-0363: it allows clients to +upload files over HTTP."))) + +(define-public prosody-smack + (package + (inherit (prosody-module "mod_smacks")) + (synopsis "XEP-0198: Reliability and fast reconnects for XMPP") + (description "This module implements XEP-0198: when supported by both the client and server, it can allow clients to resume a disconnected session, -and prevent message loss.") - (license (package-license prosody))))) +and prevent message loss."))) (define-public libtoxcore (let ((revision "2") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 19 16:47:24 2024 Received: (at 69272) by debbugs.gnu.org; 19 Feb 2024 21:47:25 +0000 Received: from localhost ([127.0.0.1]:43696 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rcBTw-0005pV-Aa for submit@debbugs.gnu.org; Mon, 19 Feb 2024 16:47:24 -0500 Received: from voltorb.zancanaro.id.au ([45.77.50.64]:47840) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rcBTt-0005og-FJ for 69272@debbugs.gnu.org; Mon, 19 Feb 2024 16:47:22 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=k1; bh=EJDjrg7TbDYwCqo fXc6YFFo3NvkEcv4hxLwA9iUWZO4=; h=references:in-reply-to:date:subject: to:from; d=zancanaro.id.au; b=N4vpEoP5kKU8MPhCS07GcdTxrCtLC9p4tt6VxPIw bSQThsluvgRNrNcYvt3EUY8/kIu2SxGzBe5KxKWsF2XVEWN9mHVY3NIN7vQHqF2mX0OilL bdHvG+gD2anMHZTNgy/gvvjmFuYhXibWYWRD3++pc1RkjRki/KPtgA2+GVvdM= Received: by voltorb.zancanaro.id.au (OpenSMTPD) with ESMTPSA id a5a937e7 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <69272@debbugs.gnu.org>; Mon, 19 Feb 2024 21:46:44 +0000 (UTC) From: Carlo Zancanaro To: 69272@debbugs.gnu.org Subject: [PATCH v2 2/4] gnu: Use copy-build-system for prosody modules. Date: Tue, 20 Feb 2024 08:44:17 +1100 Message-ID: <6bf5ba79c63dc0e6e5cc46e5a89f020aa8a790e3.1708379059.git.carlo@zancanaro.id.au> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -1.9 (-) X-Debbugs-Envelope-To: 69272 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.9 (--) * gnu/packages/messaging.scm (prosody-module): Use copy-build system. Change-Id: I6de2827c63cb454d80b20f3af84fa610a75172f4 --- The only change from v1 is to remove the home-page definition from this diff (because it's now in the earlier patch). gnu/packages/messaging.scm | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index d06cd74177..3dd1e66e81 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -144,6 +144,7 @@ (define-module (gnu packages messaging) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (guix build-system cmake) + #:use-module (guix build-system copy) #:use-module (guix build-system go) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) @@ -1600,17 +1601,9 @@ (define (prosody-module module-name) (sha256 (base32 "142wrcism70nf8ffahhd961cqg2pi1h7ic8adfs3zwh0j3pnf41f")))) - (build-system trivial-build-system) + (build-system copy-build-system) (arguments - '(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (let ((out (assoc-ref %outputs "out")) - (source (assoc-ref %build-inputs "source"))) - (with-directory-excursion (in-vicinity source module-name) - (install-file (string-append module-name ".lua") out)) - #t)))) + `(#:install-plan '((,(string-append module-name "/") ".")))) (home-page (string-append "https://modules.prosody.im/" module-name ".html")) (synopsis #f) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 19 16:47:25 2024 Received: (at 69272) by debbugs.gnu.org; 19 Feb 2024 21:47:25 +0000 Received: from localhost ([127.0.0.1]:43698 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rcBTw-0005pc-Qz for submit@debbugs.gnu.org; Mon, 19 Feb 2024 16:47:25 -0500 Received: from voltorb.zancanaro.id.au ([45.77.50.64]:47844) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rcBTu-0005om-57 for 69272@debbugs.gnu.org; Mon, 19 Feb 2024 16:47:22 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=k1; bh=9XQjgYa4/d3rnMJ S255wRFzXjEBI9Ly3KCVt49udSRo=; h=references:in-reply-to:date:subject: to:from; d=zancanaro.id.au; b=kLPgcdRObwiZhqYBlVXgffp62Kn2TrF0keC+c03P BrRoN6E32IAh6kOhxtjpv9Ncdk456otp8+9k8ox3wJU6O0ZAiBhjtKJ/Zhj/71DSGNk+tc mu4lV4ehIV8ETKTWlUR61l/zLuBrYOWd+lYxBbCD/jPPMOfDaRe9pRB49toxw= Received: by voltorb.zancanaro.id.au (OpenSMTPD) with ESMTPSA id 40d4b300 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <69272@debbugs.gnu.org>; Mon, 19 Feb 2024 21:46:44 +0000 (UTC) From: Carlo Zancanaro To: 69272@debbugs.gnu.org Subject: [PATCH v2 3/4] gnu: Update prosody modules to the newest revision. Date: Tue, 20 Feb 2024 08:44:18 +1100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -1.9 (-) X-Debbugs-Envelope-To: 69272 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.9 (--) * gnu/packages/messaging.scm (prosody-module): Update to fba64b043c52. Change-Id: I012c2f661200cc59ae088e522ac233c09d77d2af --- gnu/packages/messaging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 3dd1e66e81..ef009577c4 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1580,8 +1580,8 @@ (define-public prosody (license license:x11))) (define (prosody-module module-name) - (let ((changeset "765735bb590b") - (revision "1") + (let ((changeset "fba64b043c52") + (revision "2") (package-name (string-append "prosody-" (string-replace-substring -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 19 16:47:32 2024 Received: (at 69272) by debbugs.gnu.org; 19 Feb 2024 21:47:32 +0000 Received: from localhost ([127.0.0.1]:43700 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rcBU4-0005pw-8a for submit@debbugs.gnu.org; Mon, 19 Feb 2024 16:47:32 -0500 Received: from voltorb.zancanaro.id.au ([45.77.50.64]:47840) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rcBTu-0005og-W1 for 69272@debbugs.gnu.org; Mon, 19 Feb 2024 16:47:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=k1; bh=q4+LnwSEYl3+iFl nG3K/puKJvLuMLotZa2zJr+MzTCc=; h=references:in-reply-to:date:subject: to:from; d=zancanaro.id.au; b=WCWDc/AM6EXraHP6K2HEEj1dD24QR0WlEa7uox03 RIaXP0tzgtdi4dG2bsXGuDn+C+qEuUqj52T/oKQNw5mv6Dqk18stmEQiTD7b5FQDPsNTfm gQ0Qe1O8KttBMy0TuRcRM7eOLGlVehlCoeK3Ra1CB6ZjDHV5EccQ7y7uLQ5qI= Received: by voltorb.zancanaro.id.au (OpenSMTPD) with ESMTPSA id 211b0af4 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <69272@debbugs.gnu.org>; Mon, 19 Feb 2024 21:46:45 +0000 (UTC) From: Carlo Zancanaro To: 69272@debbugs.gnu.org Subject: [PATCH v2 4/4] gnu: Add prosody-vcard-muc. Date: Tue, 20 Feb 2024 08:44:19 +1100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -1.9 (-) X-Debbugs-Envelope-To: 69272 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.9 (--) * gnu/packages/messaging.scm (prosody-vcard-muc): New variable. Change-Id: I57eae8373369e7e954084803fd7b861ab85ce4ad --- gnu/packages/messaging.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index ef009577c4..421a7afd78 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1625,6 +1625,13 @@ (define-public prosody-smack the client and server, it can allow clients to resume a disconnected session, and prevent message loss."))) +(define-public prosody-vcard-muc + (package + (inherit (prosody-module "mod_vcard_muc")) + (synopsis "Support for MUC vCards and avatars") + (description "This module adds the ability to set vCard for MUC rooms. One +of the most common use cases is to define avatars for MUC rooms."))) + (define-public libtoxcore (let ((revision "2") (commit "bf69b54f64003d160d759068f4816b2d9b2e1e21")) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 24 06:33:51 2024 Received: (at 69272) by debbugs.gnu.org; 24 Feb 2024 11:33:51 +0000 Received: from localhost ([127.0.0.1]:49428 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdqHr-0007Tr-94 for submit@debbugs.gnu.org; Sat, 24 Feb 2024 06:33:51 -0500 Received: from mail-ed1-f65.google.com ([209.85.208.65]:59428) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdqHm-0007TM-V8 for 69272@debbugs.gnu.org; Sat, 24 Feb 2024 06:33:45 -0500 Received: by mail-ed1-f65.google.com with SMTP id 4fb4d7f45d1cf-563bb51c36eso1437921a12.2 for <69272@debbugs.gnu.org>; Sat, 24 Feb 2024 03:33:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708774333; x=1709379133; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=ZEen+8wgTzeJ8DN8FIAenIpDouvLMDl70stCiPan4hs=; b=M4OOB1vc4Q6ArAFtOClgkeawVclp0JKUUjQlz/PP/CY5S4OaH0Fdccrjm9pyJ5vHZX GFfqF4JBO2IF/H/s64jm92HNiI/GCumg59myT2NgltCos7QSngBJLr9m5mTyOPWI4NQP EySuZbbfpBeFEggHvFd+z3DHjjN4VhWdyrr3bAJXO/jZZkzZCJVt3sZ7rTNuektGk+NJ A0oWIzRPrF6NMwMBipDv045uQAgUHnSY3M9CkvVcLwrckuxi9DeN0VRZOroRBSoC+ff1 fhObQb89BDfSy7gTtAN0urf0u3D+z42kK4imDlfG/wSUhLbpWv7rsaZCKMpJi07c8tto bc+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708774333; x=1709379133; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=ZEen+8wgTzeJ8DN8FIAenIpDouvLMDl70stCiPan4hs=; b=Nu51xo/hVCe+kUoFSRY+XaccvDC8Lfgt0mlOQoiLsM0J/75OY5DPQ8cYH7POlTXgaJ JqlixzR1Ilp8jc1MF7k+Rj/It8PiaZLQ9HMyqWhFWrAKCKYjMAsvASCBsBQ7dFk00M9E JED3fKc/AEWDD+4SGYvY9hGAMOm6Hgr7vCG94If4G+XnXn/+hGJCWG4npa2UCok7HsMN HOzPeEE5uYjAHwJa+rLn4iYbaciqhSOyR+BIoWFvNAc10GcbXxvr4My9F/T3GZEQBREG 3BTyZ6BMzewkA+tKephCG18ie4f8Nry9a66Ikw0RYP6zViIEn4F6uZrbqat8/4B8P6nl 43VQ== X-Forwarded-Encrypted: i=1; AJvYcCVrIgCsU5Jx0B9B4zdTvzOpBl2dTKO9N8lt0uzD9/gUssP4g9cviqu6z7xmX1UF0ugJjb+hsHMuzkNPDyIdAuu2lwQqj88= X-Gm-Message-State: AOJu0YwFFmXwUFKMlwSiWrHqjAP7GKv+HgflFCtdghQqu4frLhMMlRfc rb7DgBJXbAa/9Crqwm0nAq8Q8FCI5c1AwrVYEfzUzOmXb72j7jfq X-Google-Smtp-Source: AGHT+IFngRBb2S8xGcIfv9GehsuNQA6EAuzKHVoAcuSHuU4tZKyHJnz7MZ8ojamnd7XCHuKsg3SQ6Q== X-Received: by 2002:a17:906:6dcf:b0:a3e:b3e6:5b71 with SMTP id j15-20020a1709066dcf00b00a3eb3e65b71mr1448907ejt.62.1708774332949; Sat, 24 Feb 2024 03:32:12 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id z23-20020a170906241700b00a3fb62260e3sm509184eja.72.2024.02.24.03.32.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Feb 2024 03:32:12 -0800 (PST) Message-ID: <1d9b2c49f4c3870103bd3417286f754418deff0f.camel@gmail.com> Subject: Re: [PATCH v2 0/4] Refactor prosody modules, and add prosody-vcard-muc. From: Liliana Marie Prikler To: Carlo Zancanaro , 69272@debbugs.gnu.org Date: Sat, 24 Feb 2024 12:32:09 +0100 In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69272 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Dienstag, dem 20.02.2024 um 08:44 +1100 schrieb Carlo Zancanaro: > I noticed that the home-page line snuck out of the first commit and > ended up in the second. This should be better. Hi, I just noticed that the prosody system test, as can be run through make check-system TESTS=3Dprosody appears to not be working. Now, it does print a warning Prosody was unable to find lua-unbound [=E2=80=A6] but I think you can ignore that. What's worse is that despite seemingly having a timeout of one minute for its operations, it just=E2=80= =A6 stalls. You might want to fix that and also add a test for the vcard-muc you added. Cheers From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 24 07:52:24 2024 Received: (at 69272) by debbugs.gnu.org; 24 Feb 2024 12:52:24 +0000 Received: from localhost ([127.0.0.1]:54123 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdrVp-0005XE-Tk for submit@debbugs.gnu.org; Sat, 24 Feb 2024 07:52:24 -0500 Received: from mail-lf1-f66.google.com ([209.85.167.66]:57844) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdrVo-0005Wi-5j for 69272@debbugs.gnu.org; Sat, 24 Feb 2024 07:52:16 -0500 Received: by mail-lf1-f66.google.com with SMTP id 2adb3069b0e04-512bce554a5so1846320e87.3 for <69272@debbugs.gnu.org>; Sat, 24 Feb 2024 04:51:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708779045; x=1709383845; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=qS66Fkt5n2FWxZin0VZgjDkZj2Vp267B6B0EuISKolU=; b=TC7QuET4CNYSyUtxffhVLyihqTZF7Iq3fLyceLsq4wIBcQoYX8wTj3vfE/ym1Hm7Gf 1OfaLl5FM4oOv0aReAUBQJSOEea2ke7XJFtRXMwxnsPfaLHuDN17F9OpVaVU3ogAuOBx EvJkOFMlGkxAPi1lQpQ15wr/bdjMrq7fxh97XhFYYTLX3MEDdjqsANAlFBXUz13NsC4T JLZGRYP/WHbyzAM6KKGEEal6R1TW/0c8c64qq9dfSfI9EFUaysECBx5LT01y0SYunXaC hhEDMMi0bjWM3X0QRShkZ+plf6cgt2WhTL5RJh9RwYKSMoGpajnf5Wx5k7i5RBhza6JJ S3pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708779045; x=1709383845; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=qS66Fkt5n2FWxZin0VZgjDkZj2Vp267B6B0EuISKolU=; b=ogooEbuSI7tmJsBYn6Vev+2rsbJsOcuCUv56Y5HAOekZAr994xVIynSfb5zZAwxkx0 B6tSnTCjJRAtWsGdgzhKfbPThDJT0vD99Xpb98huNlHPkfGizUWEhVJwqCreDeY682ia r9dV58o+EYl/6ufGR3niPEo84ZhdbC6HV/GfuF/kffI7uivGa9NHH12t+z2IsxLvZxgk xEl+OomZsWUdCvpmn49DuMb9qh3HyPHa0ZyR10ntmME4M3N0vkSQJGJ1660Df6gSRICM B2e8HnZRtYOtjI9NSm+2abhHHeRvfvl92uBdkEMk472ZETO+6rGY9AGtWm471Nz2h3VX LFxg== X-Gm-Message-State: AOJu0YxZAMoeREM6bRWW+vXmhVVWabgCot+xnmb/W9nExl5ydbYiDa+g 6k+GogCrHdf51b4rfJ5ECPfBEY7mIZd4K6zcHcQ1IF3+oVrmS8Sq1dmzsAjG7LQ= X-Google-Smtp-Source: AGHT+IGnSIkDVp1TQ/xy50WK+szum34ZZdj8U7FlJMXHp/iO5kC+Zo/iULCu+9WKwwC5/Ijws4zdPQ== X-Received: by 2002:a19:4307:0:b0:512:bb47:967c with SMTP id q7-20020a194307000000b00512bb47967cmr1364662lfa.19.1708779045020; Sat, 24 Feb 2024 04:50:45 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id d4-20020a170906304400b00a3ee2530a11sm558720ejd.194.2024.02.24.04.50.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Feb 2024 04:50:44 -0800 (PST) Message-ID: Subject: Re: [bug#69272] [PATCH v2 0/4] Refactor prosody modules, and add prosody-vcard-muc. From: Liliana Marie Prikler To: Carlo Zancanaro Date: Sat, 24 Feb 2024 13:50:43 +0100 In-Reply-To: <87plwmnkf1.fsf@zancanaro.id.au> References: <1d9b2c49f4c3870103bd3417286f754418deff0f.camel@gmail.com> <87plwmnkf1.fsf@zancanaro.id.au> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69272 Cc: 69272@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Samstag, dem 24.02.2024 um 22:58 +1100 schrieb Carlo Zancanaro: > Fixing this test is beyond the scope of this patch series, and as far > as I can tell there are no tests for other specific prosody modules. > At the moment I don't really have the time/inclination to add these > things. =C2=A0 That's fine and relatable. > If that is a blocker for this patch series being accepted then I'll > just keep it in my own channel for now. Not really, but I would have been more confident in fast-tracking this if there was a test case attached to it. I'll give it one more week on the ML if no one else wants to push it. Cheers From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 24 08:13:59 2024 Received: (at 69272) by debbugs.gnu.org; 24 Feb 2024 13:13:59 +0000 Received: from localhost ([127.0.0.1]:55521 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdrqp-0006XS-9L for submit@debbugs.gnu.org; Sat, 24 Feb 2024 08:13:59 -0500 Received: from mail-lj1-f177.google.com ([209.85.208.177]:58664) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdrqm-0006X1-96 for 69272@debbugs.gnu.org; Sat, 24 Feb 2024 08:13:57 -0500 Received: by mail-lj1-f177.google.com with SMTP id 38308e7fff4ca-2d1094b5568so15512821fa.1 for <69272@debbugs.gnu.org>; Sat, 24 Feb 2024 05:13:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708780346; x=1709385146; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=0YpN3v31PIxUnQJQTFA7apPMZuyzTY5BVMsQGr2lnj0=; b=mZBbknlPVUWGbu2/YwGuzgO4lEzI9eepAJg+PxwYZsJpABtRCoJnH5/Lc9BBhxcDlx aul58Z6EzjmwGNryDgFKUHdKOS9WdpjVJrDB7Mbx+g2SCPzCVH2JwwSNP/jpscwrVXvC o/tOUoNLwF2QkKqeOvHIg5n6ayIFGMrDR89++iBJ2fguanUliRPG5sahm6/Z0suzyhbg 5Q/UoOv2lDUX2WD8VYP0NNH4J3oBBSoFdi+P8YJRDPVDDhuC3/Nsi6xZkLqb5Gd4va1n ZjvnYkWyBQRDZdjeInfpbDib7sQbsI6vWCdJUNtqD3yhfjxDmj1NS9ZpINOf8MhuvXyo NJfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708780346; x=1709385146; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=0YpN3v31PIxUnQJQTFA7apPMZuyzTY5BVMsQGr2lnj0=; b=qOAvky9oPF1uI9nAKBh58kDwCeJZi3cEE5XIb8XkyMpoiGD1b2jc5fjyrzlbeXz5uq 7l1OgX+vMyEkARVg9IPSUe2Qbhymlz2zACj8IcG1lJEemmicR1hMtUnuf4ZhKOpGXc94 cdNnKSCpODVokbuTTA9mh+NpZ6LxDKKzmXHYohH/JXHj71yOV1TWaYX5LblbfeLnfFzg iisvIg33mDOTfGEIk3W/B1549nuNDZPg88Dc3iiFCkdUi4/FXN1UEN0UGPzPBbUXZ4DU XqHw3CF3A7rgaE8R3Q6Y8gCZDptzQdcU8lX8dyknhsKKldr55kgUWu6JGbscV1ixxcuw ftDw== X-Forwarded-Encrypted: i=1; AJvYcCXxeVlScjHOIBu/PUGs5sxBCaBB5aQaJHblqo0vLNvLoKHvpuxnmvxJ63+MosHkzy+jgOtwDWU8NBnRq8hBTsSHBWN8njc= X-Gm-Message-State: AOJu0Yz4C+lZ2eiHDNZoj+FXbUmWZUXMrajLB2m5xFkcbH5jUA6W7v8Q hxVjbl73Vbn/B5npCQICEY5iQJ5sgNDgC0Q+MUCgkoDCRMn3SbHGoKA4CChR X-Google-Smtp-Source: AGHT+IFY3ZsXzb4MJKDB9ZScnP0hGSOf2uWrfZ78KVf0H2MvODAho6okr1lSBri4aUHjzh2Yc7UkBA== X-Received: by 2002:a17:906:1818:b0:a3f:9629:d305 with SMTP id v24-20020a170906181800b00a3f9629d305mr1443942eje.28.1708778695461; Sat, 24 Feb 2024 04:44:55 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id lb10-20020a170906adca00b00a3e6e8dbebfsm559977ejb.30.2024.02.24.04.44.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Feb 2024 04:44:55 -0800 (PST) Message-ID: <2831bfc9561871e584f32d64b6d5ee596fe81473.camel@gmail.com> Subject: Re: [PATCH v2 0/4] Refactor prosody modules, and add prosody-vcard-muc. From: Liliana Marie Prikler To: Carlo Zancanaro , 69272@debbugs.gnu.org Date: Sat, 24 Feb 2024 13:44:51 +0100 In-Reply-To: <1d9b2c49f4c3870103bd3417286f754418deff0f.camel@gmail.com> References: <1d9b2c49f4c3870103bd3417286f754418deff0f.camel@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69272 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Samstag, dem 24.02.2024 um 12:32 +0100 schrieb Liliana Marie Prikler: > Am Dienstag, dem 20.02.2024 um 08:44 +1100 schrieb Carlo Zancanaro: > > I noticed that the home-page line snuck out of the first commit and > > ended up in the second. This should be better. > Hi, I just noticed that the prosody system test, as can be run > through > =C2=A0 make check-system TESTS=3Dprosody > appears to not be working. >=20 > Now, it does print a warning > =C2=A0 Prosody was unable to find lua-unbound > =C2=A0 [=E2=80=A6] > but I think you can ignore that.=C2=A0 What's worse is that despite > seemingly having a timeout of one minute for its operations, it just=E2= =80=A6 > stalls. Turns out I should have just waited longer. Both without and with your patches, the failure is Test begin: test-name: "client-to-server communication" source-file: "/gnu/store/wqrrwk1w5wn4hdniffj3gsb91h3fpirl-prosody- builder" source-line: 1 source-form: (test-assert "client-to-server communication" (let ((freetalk-bin (string-append "/gnu/store/9zl6dl4s2b57qax0ablavxbpk1h0aq9h-freetalk-4.2" ) Test end: result-kind: fail actual-value: #f actual-error: (misc-error #f "~A ~S" ("file didn't show up" "/tmp/freetalk-witness") #f) Cheers From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 24 10:58:59 2024 Received: (at 69272) by debbugs.gnu.org; 24 Feb 2024 15:58:59 +0000 Received: from localhost ([127.0.0.1]:38778 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rduQV-00061F-8v for submit@debbugs.gnu.org; Sat, 24 Feb 2024 10:58:59 -0500 Received: from voltorb.zancanaro.id.au ([45.77.50.64]:33564) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rduQS-00060m-1P for 69272@debbugs.gnu.org; Sat, 24 Feb 2024 10:58:57 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=k1; bh=jsIwS7ufeDVTDim /2sa42iA2zhP58aWTw/yXvkoqMhU=; h=date:references:in-reply-to:subject: cc:to:from; d=zancanaro.id.au; b=gWRbfQ6CP4O8vtMxn0oX3A7Yv8++0eu0Soocy JMqc5jOzxR1FqL3CQrVV2qs/bI0AdttS9wAb5akDIpdR4RucCbSpolful9P9Q0Y0VF1H7h jPn184mwGQN0xwq8iNJKfojZxmTsG6eq6W/MS94GzPgB+FZnAHB9Z7m5C6ct9TOM= Received: by voltorb.zancanaro.id.au (OpenSMTPD) with ESMTPSA id 731a4916 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sat, 24 Feb 2024 11:58:22 +0000 (UTC) From: Carlo Zancanaro To: Liliana Marie Prikler Subject: Re: [bug#69272] [PATCH v2 0/4] Refactor prosody modules, and add prosody-vcard-muc. In-Reply-To: <1d9b2c49f4c3870103bd3417286f754418deff0f.camel@gmail.com> (Liliana Marie Prikler's message of "Sat, 24 Feb 2024 12:32:09 +0100") References: <1d9b2c49f4c3870103bd3417286f754418deff0f.camel@gmail.com> Date: Sat, 24 Feb 2024 22:58:26 +1100 Message-ID: <87plwmnkf1.fsf@zancanaro.id.au> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69272 Cc: 69272@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Liliana, On Sat, Feb 24 2024, Liliana Marie Prikler wrote: > Hi, I just noticed that the prosody system test, as can be run through > make check-system TESTS=prosody > appears to not be working. That is unfortunate, but seems unrelated to my patch. Running this test without my changes also hangs. > You might want to fix that and also add a test for the vcard-muc you > added. Fixing this test is beyond the scope of this patch series, and as far as I can tell there are no tests for other specific prosody modules. At the moment I don't really have the time/inclination to add these things. If that is a blocker for this patch series being accepted then I'll just keep it in my own channel for now. Carlo From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 02 01:44:40 2024 Received: (at 69272) by debbugs.gnu.org; 2 Mar 2024 06:44:40 +0000 Received: from localhost ([127.0.0.1]:37843 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rgJ6t-0008V4-PF for submit@debbugs.gnu.org; Sat, 02 Mar 2024 01:44:40 -0500 Received: from mail-wr1-f65.google.com ([209.85.221.65]:60728) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rgJ6q-0008Ul-2m for 69272@debbugs.gnu.org; Sat, 02 Mar 2024 01:44:38 -0500 Received: by mail-wr1-f65.google.com with SMTP id ffacd0b85a97d-33e162b1b71so1709019f8f.1 for <69272@debbugs.gnu.org>; Fri, 01 Mar 2024 22:44:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709361782; x=1709966582; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=gDv+9o2Aq/9+SH0I8rGxdi23/FfqCPIkBv75sIOFzoA=; b=jwuzvm2/N3iYwuu9PjYrNg/k9xkmKE7wrInnY3A63faoS9E1jMn2G9ROM3HdQIIRP0 vFPC0f5KFQUlre5UfNhyBbJwsWQFapMt0HxGunD4QOQ7LynMf0ZA0fsfP3Nas9H3TKAw 4GDvD4Gdkh4njsaFZ+ZOC3nRqk5Br9MKM69PGMhjA4uAk1lhzfB6Rk2ui9JI1mWd3zya diTbjaGa5YigU30aWNuS3lM5OR69z3v5S6K93JnKdnpl/QblgpUlSRnjsa90NZW316e+ tRO8uQVkl5ziOXqBfnTaSreJFYYrwD0P/mJmpQ7iY3Cl0CqLGm1pT7mPG4tQ+OhCYC/V b0lA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709361782; x=1709966582; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=gDv+9o2Aq/9+SH0I8rGxdi23/FfqCPIkBv75sIOFzoA=; b=h4fu2WpdcWXK4y/P8zEkl78aqYYFX3Ue2Resg21X1r+nMKqBddfTR5R/OZVWrMEXDA h5L1M3+FkWhjgvEz5iV8tUMSPjBlYJ2dSftTS5dJA+C/Mcy55f+4bEYX/Nm/uK5QXCFa ecAyPTCMTtp/PA6YbLEHTvtY22D0DK4R6L2+fg40jYdeyifh0Q0Okm9vgOWDCGf7hC81 yVAAfr0OIukodJGm9Jd6MJl6Tx40rrmbgBFQ1PsDXnDc5VrJacgeqmYaDvO3X+JUDUJt RulOqFaAmKh+zn4DL84+9C4xQ8y+hXi+fXEa8Y1kAOZXFRQ4zp/DPsVOoi3GhxUk3I3t zhZg== X-Forwarded-Encrypted: i=1; AJvYcCW3nl/U6qo3J2RG5no3SOW7j0jAXS3bvPZZ1VX/KWrQymGbk80CYCtSqMjQDwb8hoB/CxH4XpHlAvEZHo9V6zKOi/h5FSc= X-Gm-Message-State: AOJu0Yz3n9zWIYUpqQMBeqOv6pTq0tCXTy1Gh2ud1KW17Z9+nXDwsafl fl4tM10Xt5phlpHIQUABj4OZmUw69us8a5c3djDi1jrhhkvFE8p7iUWPkDbFq+U= X-Google-Smtp-Source: AGHT+IH9ITa1e0dc6Ybo/070tngMPnTMCBO3GsXsB9Xj9N9lLeyUwpC4uvNun1LXQzEMdqMec6ni+g== X-Received: by 2002:a5d:4682:0:b0:33e:d26:3780 with SMTP id u2-20020a5d4682000000b0033e0d263780mr2772480wrq.17.1709361781796; Fri, 01 Mar 2024 22:43:01 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id bn26-20020a056000061a00b0033e032bc26bsm6693117wrb.82.2024.03.01.22.43.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Mar 2024 22:43:01 -0800 (PST) Message-ID: Subject: Re: [PATCH v2 4/4] gnu: Add prosody-vcard-muc. From: Liliana Marie Prikler To: Carlo Zancanaro , 69272@debbugs.gnu.org Date: Sat, 02 Mar 2024 07:42:58 +0100 In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69272 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Am Dienstag, dem 20.02.2024 um 08:44 +1100 schrieb Carlo Zancanaro: > * gnu/packages/messaging.scm (prosody-vcard-muc): New variable. >=20 > Change-Id: I57eae8373369e7e954084803fd7b861ab85ce4ad > --- > =C2=A0gnu/packages/messaging.scm | 7 +++++++ > =C2=A01 file changed, 7 insertions(+) >=20 > diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm > index ef009577c4..421a7afd78 100644 > --- a/gnu/packages/messaging.scm > +++ b/gnu/packages/messaging.scm > @@ -1625,6 +1625,13 @@ (define-public prosody-smack > =C2=A0the client and server, it can allow clients to resume a disconnecte= d > session, > =C2=A0and prevent message loss."))) > =C2=A0 > +(define-public prosody-vcard-muc > +=C2=A0 (package > +=C2=A0=C2=A0=C2=A0 (inherit (prosody-module "mod_vcard_muc")) > +=C2=A0=C2=A0=C2=A0 (synopsis "Support for MUC vCards and avatars") > +=C2=A0=C2=A0=C2=A0 (description "This module adds the ability to set vCa= rd for MUC > rooms. One > +of the most common use cases is to define avatars for MUC rooms."))) > + Trying to build this locally, I get a hash mismatch for the checkout. expected hash: 142wrcism70nf8ffahhd961cqg2pi1h7ic8adfs3zwh0j3pnf41f actual hash: 1nvka8s3zqs97jqsknhp2q956rrdga1qaxa1y3i0h8zx3g9vgdch Do the hashes on prosody change that quickly? From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 02 06:28:32 2024 Received: (at 69272) by debbugs.gnu.org; 2 Mar 2024 11:28:32 +0000 Received: from localhost ([127.0.0.1]:38124 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rgNXc-0002Yg-0f for submit@debbugs.gnu.org; Sat, 02 Mar 2024 06:28:32 -0500 Received: from voltorb.zancanaro.id.au ([45.77.50.64]:46928) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rgNXV-0002YK-VE for 69272@debbugs.gnu.org; Sat, 02 Mar 2024 06:28:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=k1; bh=Ad9GEB8pcHqA0uQ Uv+yFa2j5i4b1J8ZKD5koIaGL3YE=; h=date:references:in-reply-to:subject: cc:to:from; d=zancanaro.id.au; b=jVKlbDGC/Zjn3muP6YQAMJx63jkZke5fWufzv /hl+SKdPzdqWryrzypOzw4kQ5k4/0BNHNBeRKtlupCx4K6nwXyaeVwjz2IXGlIm7Xxj+uN vVIlFsiS9sdDrn2YB5THjQk7cSR9OdzmH9ou1n6DLAZIwGbLtOlnLLkLuGD1vNPA= Received: by voltorb.zancanaro.id.au (OpenSMTPD) with ESMTPSA id 1ee18ada (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sat, 2 Mar 2024 11:27:45 +0000 (UTC) From: Carlo Zancanaro To: Liliana Marie Prikler Subject: Re: [bug#69272] [PATCH v2 4/4] gnu: Add prosody-vcard-muc. In-Reply-To: (Liliana Marie Prikler's message of "Sat, 02 Mar 2024 07:42:58 +0100") References: Date: Sat, 02 Mar 2024 22:27:49 +1100 Message-ID: <87v864j2kq.fsf@zancanaro.id.au> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69272 Cc: 69272@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Liliana, On Sat, Mar 02 2024, Liliana Marie Prikler wrote: > Do the hashes on prosody change that quickly? Nope! This is using a mercurial checkout, so the hashes shouldn't change at all. I just made a mistake in my commits. Patch 3/4 in v2 updates the changeset and revision, but not the expected hash. I'm not sure how I messed this up, given patch 3/4 in v1 updated the hash. The actual hash that you got is the same as my v1 patch: 1nvka8s3zqs97jqsknhp2q956rrdga1qaxa1y3i0h8zx3g9vgdch I'll send through a v3 today. Carlo P.S. Apologies that you'll get this message twice. I forgot to Cc the bug tracer on the first attempt. From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 02 06:36:19 2024 Received: (at 69272) by debbugs.gnu.org; 2 Mar 2024 11:36:19 +0000 Received: from localhost ([127.0.0.1]:38129 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rgNf8-0002mi-U8 for submit@debbugs.gnu.org; Sat, 02 Mar 2024 06:36:19 -0500 Received: from voltorb.zancanaro.id.au ([45.77.50.64]:39162) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rgNf5-0002mR-Mi for 69272@debbugs.gnu.org; Sat, 02 Mar 2024 06:36:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=k1; bh=VpU9AM4NPA+drRB HpyYi++DOeVse+xyDZJKKmGD/68A=; h=references:in-reply-to:date:subject: cc:to:from; d=zancanaro.id.au; b=hTbPw1X33MKgUmD1wJyhSFDvIvscSW0B4UoxL BYFGvhgY6qiY+5XbrvztP6PxklD3ondIz1KSeX/xTwy7qSxd/VvIlhIGeoXvjt3kyifJg+ /s8VlCTn2tEZ14RWOrWQFRY0Jzl1XqKiT5WD+JeXqKWBry1cVzev7+DWYS8xigcQ= Received: by voltorb.zancanaro.id.au (OpenSMTPD) with ESMTPSA id 6af504b6 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sat, 2 Mar 2024 11:35:36 +0000 (UTC) From: Carlo Zancanaro To: 69272@debbugs.gnu.org Subject: [PATCH v3 1/4] gnu: Extract prosody-module from existing prosody modules. Date: Sat, 2 Mar 2024 22:35:12 +1100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: <87v864j2kq.fsf@zancanaro.id.au> References: <87v864j2kq.fsf@zancanaro.id.au> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 69272 Cc: Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/messaging.scm (prosody-module): New procedure. (prosody-http-upload, prosody-smacks): Use it. Change-Id: I55c69104460adbbd89c491b18f9f22681aefb92a --- gnu/packages/messaging.scm | 69 ++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 40 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 98c1c9bf67..35e11fb5dc 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -40,6 +40,7 @@ ;;; Copyright © 2023 Giacomo Leidi ;;; Copyright © 2023 Yovan Naumovski ;;; Copyright © 2023 gemmaro +;;; Copyright © 2024 Carlo Zancanaro ;;; ;;; This file is part of GNU Guix. ;;; @@ -1577,11 +1578,18 @@ (define-public prosody protocols.") (license license:x11))) -(define-public prosody-http-upload +(define (prosody-module module-name) (let ((changeset "765735bb590b") - (revision "1")) + (revision "1") + (package-name (string-append + "prosody-" + (string-replace-substring + (if (string-prefix? "mod_" module-name) + (substring module-name 4) + module-name) + "_" "-")))) (package - (name "prosody-http-upload") + (name package-name) (version (string-append "0-" revision "." (string-take changeset 7))) (source (origin (method hg-fetch) @@ -1600,47 +1608,28 @@ (define-public prosody-http-upload (use-modules (guix build utils)) (let ((out (assoc-ref %outputs "out")) (source (assoc-ref %build-inputs "source"))) - (with-directory-excursion (in-vicinity source "mod_http_upload") - (install-file "mod_http_upload.lua" out)) + (with-directory-excursion (in-vicinity source module-name) + (install-file (string-append module-name ".lua") out)) #t)))) - (home-page "https://modules.prosody.im/mod_http_upload.html") - (synopsis "XEP-0363: Allow clients to upload files over HTTP") - (description "This module implements XEP-0363: it allows clients to -upload files over HTTP.") + (home-page #f) + (synopsis #f) + (description #f) (license (package-license prosody))))) -(define-public prosody-smacks - (let ((changeset "67f1d1f22625") - (revision "1")) - (package - (name "prosody-smacks") - (version (string-append "0-" revision "." (string-take changeset 7))) - (source (origin - (method hg-fetch) - (uri (hg-reference - (url "https://hg.prosody.im/prosody-modules/") - (changeset changeset))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "020ngpax30fgarah98yvlj0ni8rcdwq60if03a9hqdw8mic0nxxs")))) - (build-system trivial-build-system) - (arguments - '(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (let ((out (assoc-ref %outputs "out")) - (source (assoc-ref %build-inputs "source"))) - (with-directory-excursion (in-vicinity source "mod_smacks") - (install-file "mod_smacks.lua" out)) - #t)))) - (home-page "https://modules.prosody.im/mod_smacks.html") - (synopsis "XEP-0198: Reliability and fast reconnects for XMPP") - (description "This module implements XEP-0198: when supported by both +(define-public prosody-http-upload + (package + (inherit (prosody-module "mod_http_upload")) + (synopsis "XEP-0363: Allow clients to upload files over HTTP") + (description "This module implements XEP-0363: it allows clients to +upload files over HTTP."))) + +(define-public prosody-smack + (package + (inherit (prosody-module "mod_smacks")) + (synopsis "XEP-0198: Reliability and fast reconnects for XMPP") + (description "This module implements XEP-0198: when supported by both the client and server, it can allow clients to resume a disconnected session, -and prevent message loss.") - (license (package-license prosody))))) +and prevent message loss."))) (define-public libtoxcore (let ((revision "2") base-commit: 4a0549be52f3f46fbce61342d8de30f7b83130c5 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 02 06:36:20 2024 Received: (at 69272) by debbugs.gnu.org; 2 Mar 2024 11:36:20 +0000 Received: from localhost ([127.0.0.1]:38132 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rgNfA-0002n0-Iu for submit@debbugs.gnu.org; Sat, 02 Mar 2024 06:36:20 -0500 Received: from voltorb.zancanaro.id.au ([45.77.50.64]:39162) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rgNf8-0002mR-Dh for 69272@debbugs.gnu.org; Sat, 02 Mar 2024 06:36:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=k1; bh=HJfWvIqwvzO1fRq 9UX5MfoSB8w+MFRcjL3HcyreNB2g=; h=references:in-reply-to:date:subject: cc:to:from; d=zancanaro.id.au; b=JkM7ZUcRK5uuELFoZDdZZix4382M9dnHAnY+C i+P1BEVUq3GB0VWavsOIpuUQgF1Mkw1LcNpO8REMJ9LtFmQhdgB5+QfTYQxIrm7SZXkX49 4E9ocUwfpXfH9XShIgm/pzoKGzvWsKnZETBziTNoUMwehBjE7b3yTt7Mg+CatIGE= Received: by voltorb.zancanaro.id.au (OpenSMTPD) with ESMTPSA id f9e57f2d (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sat, 2 Mar 2024 11:35:41 +0000 (UTC) From: Carlo Zancanaro To: 69272@debbugs.gnu.org Subject: [PATCH v3 2/4] gnu: Use copy-build-system for prosody modules. Date: Sat, 2 Mar 2024 22:35:13 +1100 Message-ID: <027b22fdcfe21c50a3870c94a3b0e1f61fb4ea9e.1709379315.git.carlo@zancanaro.id.au> X-Mailer: git-send-email 2.41.0 In-Reply-To: <87v864j2kq.fsf@zancanaro.id.au> References: <87v864j2kq.fsf@zancanaro.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69272 Cc: Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/messaging.scm (prosody-module): Use copy-build system. Change-Id: I6de2827c63cb454d80b20f3af84fa610a75172f4 --- gnu/packages/messaging.scm | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 35e11fb5dc..3dd1e66e81 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -144,6 +144,7 @@ (define-module (gnu packages messaging) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (guix build-system cmake) + #:use-module (guix build-system copy) #:use-module (guix build-system go) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) @@ -1600,18 +1601,11 @@ (define (prosody-module module-name) (sha256 (base32 "142wrcism70nf8ffahhd961cqg2pi1h7ic8adfs3zwh0j3pnf41f")))) - (build-system trivial-build-system) + (build-system copy-build-system) (arguments - '(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (let ((out (assoc-ref %outputs "out")) - (source (assoc-ref %build-inputs "source"))) - (with-directory-excursion (in-vicinity source module-name) - (install-file (string-append module-name ".lua") out)) - #t)))) - (home-page #f) + `(#:install-plan '((,(string-append module-name "/") ".")))) + (home-page (string-append "https://modules.prosody.im/" + module-name ".html")) (synopsis #f) (description #f) (license (package-license prosody))))) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 02 06:36:22 2024 Received: (at 69272) by debbugs.gnu.org; 2 Mar 2024 11:36:22 +0000 Received: from localhost ([127.0.0.1]:38135 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rgNfB-0002nD-Se for submit@debbugs.gnu.org; Sat, 02 Mar 2024 06:36:22 -0500 Received: from voltorb.zancanaro.id.au ([45.77.50.64]:39162) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rgNf9-0002mR-Ow for 69272@debbugs.gnu.org; Sat, 02 Mar 2024 06:36:20 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=k1; bh=7k1Jacs/E4Ny3Rp RYehS/ZDLEqcNBz1GNsxhdO7UEdU=; h=references:in-reply-to:date:subject: cc:to:from; d=zancanaro.id.au; b=EqQgjkX9iWStoqd8as5YdgMfFdQrKOHemPcAv wDR5L+iuUv2TJlEztFg0p7mVjDm2Wzeor4fyVLmHs22WC0X9QNxiOKE6CO4hXP/L0nSInR 5+zxn2iShACFBEwjoW8cZ4bGphWL/Pmbys+I7hKeBTXH0lT8mTtxxwnGOknwDYGo= Received: by voltorb.zancanaro.id.au (OpenSMTPD) with ESMTPSA id aeb2ecc8 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sat, 2 Mar 2024 11:35:41 +0000 (UTC) From: Carlo Zancanaro To: 69272@debbugs.gnu.org Subject: [PATCH v3 3/4] gnu: Update prosody modules to the newest revision. Date: Sat, 2 Mar 2024 22:35:14 +1100 Message-ID: <129fe7a78ae6fb061ff63761e1f987d2e4b0374d.1709379315.git.carlo@zancanaro.id.au> X-Mailer: git-send-email 2.41.0 In-Reply-To: <87v864j2kq.fsf@zancanaro.id.au> References: <87v864j2kq.fsf@zancanaro.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69272 Cc: Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/messaging.scm (prosody-module): Update to fba64b043c52. Change-Id: I012c2f661200cc59ae088e522ac233c09d77d2af --- gnu/packages/messaging.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 3dd1e66e81..2e665f47e3 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1580,8 +1580,8 @@ (define-public prosody (license license:x11))) (define (prosody-module module-name) - (let ((changeset "765735bb590b") - (revision "1") + (let ((changeset "fba64b043c52") + (revision "2") (package-name (string-append "prosody-" (string-replace-substring @@ -1600,7 +1600,7 @@ (define (prosody-module module-name) (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "142wrcism70nf8ffahhd961cqg2pi1h7ic8adfs3zwh0j3pnf41f")))) + "1nvka8s3zqs97jqsknhp2q956rrdga1qaxa1y3i0h8zx3g9vgdch")))) (build-system copy-build-system) (arguments `(#:install-plan '((,(string-append module-name "/") ".")))) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 02 06:36:24 2024 Received: (at 69272) by debbugs.gnu.org; 2 Mar 2024 11:36:24 +0000 Received: from localhost ([127.0.0.1]:38137 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rgNfE-0002nM-5M for submit@debbugs.gnu.org; Sat, 02 Mar 2024 06:36:24 -0500 Received: from voltorb.zancanaro.id.au ([45.77.50.64]:39162) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rgNfB-0002mR-2g for 69272@debbugs.gnu.org; Sat, 02 Mar 2024 06:36:21 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=k1; bh=oRBE2rxQ8PPq94z D1du+Y2sJ6Dg/IiYVZFFFtoWjByQ=; h=references:in-reply-to:date:subject: cc:to:from; d=zancanaro.id.au; b=ITzVax5CCN1YCkoO6Ss/1NlqiaCjhu0dXaV0O 3jeSvwrzYW395o4FhWvCyf9LJsR6Bk913wJGTqK1A1/2/af/JRe+nyTw9anG1Ty1atlVy2 y7efABrQRU9Ax4QwGFOFXJQrs9nKrZHE7tCvhylJTSxNaVoiYLg3releVQAP5Dt0= Received: by voltorb.zancanaro.id.au (OpenSMTPD) with ESMTPSA id 465e47bb (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sat, 2 Mar 2024 11:35:42 +0000 (UTC) From: Carlo Zancanaro To: 69272@debbugs.gnu.org Subject: [PATCH v3 4/4] gnu: Add prosody-vcard-muc. Date: Sat, 2 Mar 2024 22:35:15 +1100 Message-ID: <99747d7eb10ade26e39478f8e0cdfb03f20fc593.1709379315.git.carlo@zancanaro.id.au> X-Mailer: git-send-email 2.41.0 In-Reply-To: <87v864j2kq.fsf@zancanaro.id.au> References: <87v864j2kq.fsf@zancanaro.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69272 Cc: Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/messaging.scm (prosody-vcard-muc): New variable. Change-Id: I57eae8373369e7e954084803fd7b861ab85ce4ad --- gnu/packages/messaging.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 2e665f47e3..aa9feffb97 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1625,6 +1625,13 @@ (define-public prosody-smack the client and server, it can allow clients to resume a disconnected session, and prevent message loss."))) +(define-public prosody-vcard-muc + (package + (inherit (prosody-module "mod_vcard_muc")) + (synopsis "Support for MUC vCards and avatars") + (description "This module adds the ability to set vCard for MUC rooms. One +of the most common use cases is to define avatars for MUC rooms."))) + (define-public libtoxcore (let ((revision "2") (commit "bf69b54f64003d160d759068f4816b2d9b2e1e21")) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 02 08:01:56 2024 Received: (at 69272-done) by debbugs.gnu.org; 2 Mar 2024 13:01:56 +0000 Received: from localhost ([127.0.0.1]:38172 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rgP00-00081U-J8 for submit@debbugs.gnu.org; Sat, 02 Mar 2024 08:01:56 -0500 Received: from mail-lf1-f65.google.com ([209.85.167.65]:49518) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rgOzv-00081C-LB for 69272-done@debbugs.gnu.org; Sat, 02 Mar 2024 08:01:55 -0500 Received: by mail-lf1-f65.google.com with SMTP id 2adb3069b0e04-5132b1e66ddso2204679e87.3 for <69272-done@debbugs.gnu.org>; Sat, 02 Mar 2024 05:01:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709384417; x=1709989217; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=LtWMNoFulefzRKqEP70mSRGCYoO9kz13BZCLH1mgKSg=; b=Or/gdgX9qmKZUa5mTmLDkGqM7V0t/kCK+gxsI+y2DK6ca480QNGLCrb+SXjeWjJA+A EPFSyZgdjexoXgZkBuZ927trPQKmGYkYNcmxoPFyPPhUc1LYBOpOt3RLcB+Ax+rHlgi4 YN6arDzX18kPe7ZFy3tSVhlGKxLNip7YV4hkX8j5DSNSJPr9L5UlcGRLXdZsr4/WF6ch KUosfX3GEx4oB8vzFhbXmkniJYeN3BjkJ8wzUKwe4KFS3tjdzXzCqqQynAwkGchqGbmV 7xCyFJxAsJKw/41+lqs/t7GItDulK3Qm9bRp0gqJWGbX0a3eHVTV3LVSjmYSOqKAz3UW l4Jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709384417; x=1709989217; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=LtWMNoFulefzRKqEP70mSRGCYoO9kz13BZCLH1mgKSg=; b=fubXLZLTp/NPyFp9wCc8SFT272jlJvm/FuqNClOCZ8M+iRV6x1GSGK1PlTQA/vHyjw GQwP7MRj4T9H0MnfCQej/7A+bslERY/BwCdQ0vKCImS677adz0H7HlKnoivCA0LK0x47 6jXj1qnun5puxBOj8NNqZH7QWgaUlTFnNor20uowbeELnzIN/9Fm7jFDU5I40vzQ46tJ hDql5/k9aLOVTTtrE3okZsiX3egSdI/ZtBuEcVKhwN432ZoadUP32932PV46L9g5TAuE JJsgmY2ib75lKeYFv3LwCAneMEc1XP2eJcur421fhlb47HsOXrnOaGlSzX4s5vNxc7/h 0oIQ== X-Gm-Message-State: AOJu0YwQbiZ5Tjsb/4czOtyxkssM34Sj+fBA1hREypaynUjXiHG2DCy6 mGXIsX6Z1IxHIoBNAev21LqFnkWICmGueodCUDWNvLbx2pG4hLYYkIISautctqQ= X-Google-Smtp-Source: AGHT+IHac4PLF6gXRg5lQxOocSntdB//xY0UtxUxbTC5lfVNjHSZlVgYaDCzUPTWhT/ChAX77HUT4A== X-Received: by 2002:a05:6512:3d03:b0:512:ac35:381a with SMTP id d3-20020a0565123d0300b00512ac35381amr3976091lfv.44.1709384416869; Sat, 02 Mar 2024 05:00:16 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id k8-20020a170906578800b00a4470864eaesm1893492ejq.154.2024.03.02.05.00.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Mar 2024 05:00:16 -0800 (PST) Message-ID: Subject: Re: [bug#69272] [PATCH v2 4/4] gnu: Add prosody-vcard-muc. From: Liliana Marie Prikler To: Carlo Zancanaro Date: Sat, 02 Mar 2024 14:00:15 +0100 In-Reply-To: <87v864j2kq.fsf@zancanaro.id.au> References: <87v864j2kq.fsf@zancanaro.id.au> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69272-done Cc: 69272-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Samstag, dem 02.03.2024 um 22:27 +1100 schrieb Carlo Zancanaro: > P.S. Apologies that you'll get this message twice. I forgot to Cc the > bug tracer on the first attempt. Apologies from me for not checking earlier. Pushed now, thanks! From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 02 23:08:36 2024 Received: (at 69272) by debbugs.gnu.org; 3 Mar 2024 04:08:36 +0000 Received: from localhost ([127.0.0.1]:39545 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rgd9P-0004bb-PN for submit@debbugs.gnu.org; Sat, 02 Mar 2024 23:08:35 -0500 Received: from voltorb.zancanaro.id.au ([45.77.50.64]:59086) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rgd9M-0004bL-DW for 69272@debbugs.gnu.org; Sat, 02 Mar 2024 23:08:34 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=k1; bh=LTBKjNTL65QYJ9Q rrV9UqMpRVFfPPXWjXOC1lBtgAGM=; h=date:references:in-reply-to:subject: cc:to:from; d=zancanaro.id.au; b=owKV4eIlqQHPQ4vQg+77kX01cYJMfqRgKARnQ 87exApPWF/uUE4WMuLohVyhj0sBq5JdoaZhZtMtPfwMweo/UNwfsrmiZxa0RECBLnWjrV/ Ikw6NrjOwhOZ4IttulpqIFDpoNchOrIIoeMxE7W9E6HjxcfIvTX2g5vYc5056NuI= Received: by voltorb.zancanaro.id.au (OpenSMTPD) with ESMTPSA id 27dde507 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sun, 3 Mar 2024 04:07:50 +0000 (UTC) From: Carlo Zancanaro To: Liliana Marie Prikler Subject: Re: bug#69272: [PATCH v2 4/4] gnu: Add prosody-vcard-muc. In-Reply-To: (Liliana Marie Prikler's message of "Sat, 02 Mar 2024 14:00:15 +0100") References: <87v864j2kq.fsf@zancanaro.id.au> Date: Sun, 03 Mar 2024 15:07:53 +1100 Message-ID: <87a5ngez52.fsf@zancanaro.id.au> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69272 Cc: 69272@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On Sat, Mar 02 2024, Liliana Marie Prikler wrote: > Pushed now, thanks! Unfortunately I've discovered another silly mistake: bca48fdef48150a3c4e96e3941feb1986ea3e631 refactored things, but accidentally changed the "prosody-smacks" package's variable name to "prosody-smack". I can put together a patch to change this back, but I don't have time to do so right now. If anyone else gets to it before me then please feel free to fix it! =F0=9F=99=82 Carlo From unknown Sat Aug 16 11:42:12 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 31 Mar 2024 11:24:11 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator