From patchwork Sat Oct 26 22:42:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 69519 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 0B64F27BBEA; Sat, 26 Oct 2024 23:45:57 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7D1E427BBE2 for ; Sat, 26 Oct 2024 23:45:56 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t4pWO-00011z-SZ; Sat, 26 Oct 2024 18:44:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t4pWM-0000zQ-6a for guix-patches@gnu.org; Sat, 26 Oct 2024 18:44:34 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t4pWL-0007Sj-UE for guix-patches@gnu.org; Sat, 26 Oct 2024 18:44:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=HJTQtCycCpSf9vJMXGVPbShzezeUn1n31dE0uCrODeI=; b=njYtBWzWhME0uaw9HOBHKPBluSaxpSehvnq9RDQsMnF3jp2XDJ7NkWP/6zqK5QkIidfdvpMWdbuRZJs1aUNh5JVyyqmU2vBrV/Egc9xPMH9l7Vq3WMMjgg61W44K2QuriS9kCKoixBwaIsHV+T/g5EiuPpoZIGJRU7M3AQhb8SdZKn+pW3tRYx1Pgk+3bG8js8txBgPlUhUEr39X2PWQdbvcGkXEf59p3ipSZ8jq3IM3/SARVe8ZO8HmhURXDGQPkk1bz8lwa//O+2m98/27cPkaMuDVqkaemLlt2H+JchisJwmwHMxxHJQSYZMh/miSWQ7oTF9SuQJjy4PIywEPbQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t4pWt-0006rU-R2 for guix-patches@gnu.org; Sat, 26 Oct 2024 18:45:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#74035] [PATCH 20/24] gnu: liblouis: Update to 3.31.0. [security fixes] Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Oct 2024 22:45:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74035 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74035@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 74035-submit@debbugs.gnu.org id=B74035.172998267826205 (code B ref 74035); Sat, 26 Oct 2024 22:45:07 +0000 Received: (at 74035) by debbugs.gnu.org; 26 Oct 2024 22:44:38 +0000 Received: from localhost ([127.0.0.1]:43079 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t4pWP-0006oU-Ob for submit@debbugs.gnu.org; Sat, 26 Oct 2024 18:44:38 -0400 Received: from 18.mo582.mail-out.ovh.net ([46.105.73.110]:59593) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t4pWL-0006nZ-SY for 74035@debbugs.gnu.org; Sat, 26 Oct 2024 18:44:34 -0400 Received: from director11.ghost.mail-out.ovh.net (unknown [10.109.139.198]) by mo582.mail-out.ovh.net (Postfix) with ESMTP id 4XbZSt4QFsz1L5D for <74035@debbugs.gnu.org>; Sat, 26 Oct 2024 22:43:58 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-z975m (unknown [10.110.96.188]) by director11.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 5DB0A1FD91; Sat, 26 Oct 2024 22:43:58 +0000 (UTC) Received: from ngraves.fr ([37.59.142.98]) by ghost-submission-5b5ff79f4f-z975m with ESMTPSA id XP1WEK5wHWdDnRYALPVG/g (envelope-from ); Sat, 26 Oct 2024 22:43:58 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-98R002ddec64d4-163d-46fa-9755-117b99a7a3c6, E6BF9B87AE7FBE7894246B3B643E76DCC103CD4C) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 86.246.19.221 Date: Sun, 27 Oct 2024 00:42:41 +0200 Message-ID: <20241026224300.30694-20-ngraves@ngraves.fr> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241026224300.30694-1-ngraves@ngraves.fr> References: <20241026224300.30694-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 8119427179217543906 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrvdejhedgudefucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkeeirddvgeeirdduledrvddvuddpfeejrdehledrudegvddrleeknecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeejgedtfeehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkedvpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=HJTQtCycCpSf9vJMXGVPbShzezeUn1n31dE0uCrODeI=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1729982638; v=1; b=r2L4JAo/91uzWsrKMI3GXAWVqGa9z04tYeL4Y5RWeVYWzy6m50rH+cB+dzJV2AgUXmyRotmk WC4PTxN2j9Vb4zpA8qoXXc2Fmda+DM4Wsp8Qc4qQjCHmuk9p0Q5Pxg9CAd4c2AgWg5zmuosEWcs mIThd7xubi0uV0zBNALuq58pM334BNT8C6vKcJzgtkyIOKjqmy6aVDhY8uD9PKvEBfVCYnHz+OI Luxzvn1OTTpjjhXr8EovhBBAKo1SMvnmAFs0Y3WhmhBzaVnw5SkOgwVRGJlMjwmjn/6EDTaJQM4 GGXviUNaq8m9grzEE+QxAse4IMJqjfdLp24XYT1RLpnXw== 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches This fixes CVE-2022-26981. * gnu/packages/language.scm (liblouis): Update to 3.31.0. [arguments]: Improve style using gexps. [native-inputs]: Rewrite and replace python-wrapper by python. --- gnu/packages/language.scm | 47 ++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 25 deletions(-) diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index 78fcba4287..6a5e7927b4 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2023 gemmaro ;;; Copyright © 2024 Efraim Flashner ;;; Copyright © 2024 Charles +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -338,7 +339,7 @@ (define-public libchewing (define-public liblouis (package (name "liblouis") - (version "3.15.0") + (version "3.31.0") (source (origin (method git-fetch) @@ -348,34 +349,30 @@ (define-public liblouis (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1ljy5xsy7vf2r0ix0d7bqcr6qvr6897f8madsx9zlm1mrj31n5px")))) + (base32 "02bga2l4jiyrgfqdl27wszz5yd6h80n2dmq3p6nb2br83jywisfh")))) (build-system gnu-build-system) (outputs '("out" "bin" "doc" "python")) (arguments - `(#:configure-flags - (list - "--disable-static" - "--enable-ucs4") - #:phases - (modify-phases %standard-phases - (add-after 'install 'install-python-extension - (lambda* (#:key outputs #:allow-other-keys) - (with-directory-excursion "python" - (invoke "python" "setup.py" "install" - (string-append "--prefix=" - (assoc-ref outputs "python")) - "--root=/"))))))) + (list + #:configure-flags #~(list "--disable-static" "--enable-ucs4") + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'install-python-extension + (lambda _ + (with-directory-excursion "python" + (invoke "python3" "setup.py" "install" "--root=/" + (string-append "--prefix=" #$output:python)))))))) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("clang-format" ,clang) - ("help2man" ,help2man) - ("libtool" ,libtool) - ("libyaml" ,libyaml) - ("makeinfo" ,texinfo) - ("perl" ,perl) - ("pkg-config" ,pkg-config) - ("python" ,python-wrapper))) + (list autoconf + automake + clang + help2man + libtool + libyaml + texinfo + perl + pkg-config + python)) (synopsis "Braille translator and back-translator") (description "Liblouis is a braille translator and back-translator named in honor of Louis Braille. It features support for computer and literary braille,