From patchwork Mon Aug 30 17:39:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 32417 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 427E227BBE3; Mon, 30 Aug 2021 18:40:43 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 14ACC27BBE1 for ; Mon, 30 Aug 2021 18:40:43 +0100 (BST) Received: from localhost ([::1]:58354 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mKlH0-0005go-3J for patchwork@mira.cbaines.net; Mon, 30 Aug 2021 13:40:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33224) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mKlGN-0005fL-Kl for guix-patches@gnu.org; Mon, 30 Aug 2021 13:40:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48640) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mKlGM-0001NV-Nd for guix-patches@gnu.org; Mon, 30 Aug 2021 13:40:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mKlGM-0003fq-ET for guix-patches@gnu.org; Mon, 30 Aug 2021 13:40:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50281] [RFC PATCH] build/jami-service: Fix range ends in account-fingerprint-rx. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 30 Aug 2021 17:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 50281 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50281@debbugs.gnu.org Cc: Maxime Devos , Maxim Cournoyer X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163034519714104 (code B ref -1); Mon, 30 Aug 2021 17:40:02 +0000 Received: (at submit) by debbugs.gnu.org; 30 Aug 2021 17:39:57 +0000 Received: from localhost ([127.0.0.1]:60186 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mKlGH-0003fQ-BR for submit@debbugs.gnu.org; Mon, 30 Aug 2021 13:39:57 -0400 Received: from lists.gnu.org ([209.51.188.17]:33258) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mKlGD-0003fG-Dv for submit@debbugs.gnu.org; Mon, 30 Aug 2021 13:39:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33196) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mKlGB-0005T3-HZ for guix-patches@gnu.org; Mon, 30 Aug 2021 13:39:53 -0400 Received: from michel.telenet-ops.be ([2a02:1800:110:4::f00:18]:46444) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mKlG9-00016k-56 for guix-patches@gnu.org; Mon, 30 Aug 2021 13:39:51 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by michel.telenet-ops.be with bizsmtp id ntfk2500E0mfAB406tfkVj; Mon, 30 Aug 2021 19:39:44 +0200 From: Maxime Devos Date: Mon, 30 Aug 2021 19:39:35 +0200 Message-Id: <20210830173935.31933-1-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1630345184; bh=ypW+PBTrXLxHc2QVpGrKKT3zPvjmRviGpXB8wHWzepE=; h=From:To:Cc:Subject:Date; b=nG7iqF4yXfNRSK0S2fTW8Uopt+H7nUQcpuWil2b2ongMZiYiB2ozh6SBxIVoq0k1L DQEuC5JVfJJFRyFUSoJlEILfNDnOq0LV8ywYMwzeQ2ACIv89gvKR3EOLsqsO5DpmQ5 DhDb0GcfHzxE7pYxSxASPpSM36gewK/OFHK2W/MvodVMeOdefkd+jig0dyjd5hV1zu LfIqAfwUzQ7UlH52FJucXDucykZxLSx/9xxuc9bQHSH40oWMk3LI6kzvzDwT5FE6tE V9D7SBIhxVhbCINn+zumqRcTtKsB1Uo5JTiS8oUH5GHU+rGyVD43QaxhLMA7aQ4y+v y197g5oDvF0vA== Received-SPF: pass client-ip=2a02:1800:110:4::f00:18; envelope-from=maximedevos@telenet.be; helo=michel.telenet-ops.be X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches This broke compilation of Guix with guile@3.0.2 with: In procedure make-regexp: Invalid range end The fix is to replace [0-9A-f] with [0-9A-Fa-f]. TODO: were both uppercase and lowercase intended, or only one of the two? * gnu/build/jami-service.scm (account-fingerprint-rx): Correct regexp. --- gnu/build/jami-service.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/build/jami-service.scm b/gnu/build/jami-service.scm index d44e87387d..ddfc8cf937 100644 --- a/gnu/build/jami-service.scm +++ b/gnu/build/jami-service.scm @@ -96,7 +96,7 @@ before each retry." (list key value))) alist)) -(define account-fingerprint-rx (make-regexp "[0-9A-f]{40}")) +(define account-fingerprint-rx (make-regexp "[0-9A-Fa-f]{40}")) (define (account-fingerprint? val) "A Jami account fingerprint is 40 characters long and only contains