From patchwork Wed Mar 26 23:48:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Giacomo Leidi X-Patchwork-Id: 40866 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 A5A7F27BBEA; Wed, 26 Mar 2025 23:50:32 +0000 (GMT) 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 2182927BBE9 for ; Wed, 26 Mar 2025 23:50:31 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1txaVd-0003nu-9D; Wed, 26 Mar 2025 19:50:10 -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 1txaVX-0003ib-LK for guix-patches@gnu.org; Wed, 26 Mar 2025 19:50:06 -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 1txaVX-0007cc-BG for guix-patches@gnu.org; Wed, 26 Mar 2025 19:50:03 -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:Date:From:To:Subject; bh=uXAK2IdSYN380//t8vkxMYuYaKxcmG7NH3WGMgfI0Fc=; b=Y8r/174fibRvFRXmUglBVWgnPvEppSVOUIowH81MbqkA2nuyymp6DMhmpH7GKulmwH12+YkZ4Bs04ikrXhVptiEeyQZZKjS1mJgUDyT2eDLYQ0KK4f/kDb5DjaiITSCieFH8moIDABGHsKEuy46CIW4Z27fQvy8UcOYVEC6zcKXxAz3iMuokHwKZah0VDiUaAjiNnnDdj3ygtyAv9cZ5rMmCX/T6S8+exWAbFK0GyXUQ8DU7KQGwrourXFGmADdMU11iMuC2nVDSE0ONm5KJHLZUIpLDTLrj8ifE0lOlJrs+hoivVWKHz9u0q3g0CCRK7L5tSXJ9vyCfhlk2BcCInA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1txaVW-00030m-MK; Wed, 26 Mar 2025 19:50:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77298] [PATCH] gnu: libguestfs: Update to 1.54.1. Resent-From: Giacomo Leidi Original-Sender: "Debbugs-submit" Resent-CC: sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Wed, 26 Mar 2025 23:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 77298 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77298@debbugs.gnu.org Cc: Giacomo Leidi , Sharlatan Hellseher X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Sharlatan Hellseher Received: via spool by submit@debbugs.gnu.org id=B.174303296611245 (code B ref -1); Wed, 26 Mar 2025 23:50:02 +0000 Received: (at submit) by debbugs.gnu.org; 26 Mar 2025 23:49:26 +0000 Received: from localhost ([127.0.0.1]:44913 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1txaUu-0002v3-Ir for submit@debbugs.gnu.org; Wed, 26 Mar 2025 19:49:25 -0400 Received: from lists.gnu.org ([2001:470:142::17]:43508) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1txaUs-0002tg-Gs for submit@debbugs.gnu.org; Wed, 26 Mar 2025 19:49:23 -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 1txaUa-0003Cd-I7 for guix-patches@gnu.org; Wed, 26 Mar 2025 19:49:06 -0400 Received: from confino.investici.org ([93.190.126.19]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1txaUV-0007Wl-4z for guix-patches@gnu.org; Wed, 26 Mar 2025 19:49:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1743032934; bh=uXAK2IdSYN380//t8vkxMYuYaKxcmG7NH3WGMgfI0Fc=; h=From:To:Cc:Subject:Date:From; b=Dsg7ZILOcjAS15Zu6bfHvO5u9wUZBBrdwNEirWQd/oxBku1b5eDWJF1KeDfgR1YX0 H6Xb5kbO5YDt8SYmhYNviwFEos+EeKR8AgnP9uy1wn9z1micRpRCP3efubyEv1AUem Tgq4LaAsROqtUL39ThU9dj5B3MCoz1E813Gs+/XQ= Received: from mx1.investici.org (unknown [127.0.0.1]) by confino.investici.org (Postfix) with ESMTP id 4ZNNm65ghDz12Cy; Wed, 26 Mar 2025 23:48:54 +0000 (UTC) Received: from [93.190.126.19] (mx1.investici.org [93.190.126.19]) (Authenticated sender: goodoldpaul@autistici.org) by localhost (Postfix) with ESMTPSA id 4ZNNm64gn6z12Ct; Wed, 26 Mar 2025 23:48:54 +0000 (UTC) Date: Thu, 27 Mar 2025 00:48:06 +0100 Message-ID: <253a1dd6a8247dfcd9b223a8e7f42448b45b2cdd.1743032886.git.goodoldpaul@autistici.org> X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 Received-SPF: pass client-ip=93.190.126.19; envelope-from=goodoldpaul@autistici.org; helo=confino.investici.org 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, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-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: , Reply-to: Giacomo Leidi X-ACL-Warn: , Giacomo Leidi via Guix-patches X-Patchwork-Original-From: Giacomo Leidi via Guix-patches via From: Giacomo Leidi 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 is the latest stable version according to https://libguestfs.org. * gnu/packages/virtualization.scm (libguestfs-minimal): Update to 1.54.1; [source]: https://libguestfs.org/download permanently redirects to https://download.libguestfs.org. [arguments]: Replace useless quasiquote with quote; : Update makefile patching; [native-inputs]: Add autoconf, automake and (zstd "lib") (libguestfs): Update to 1.54.1; [arguments]: Drop duplicated makefile patch; [native-inputs]: Drop autoconf, automake. Change-Id: I83c0d3e712d78cbd414ea8766705555325ed50fe --- gnu/packages/virtualization.scm | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) base-commit: cfdd0f58d0f85127c166f0908aa7b85c7cb9cc74 diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 9c72e1793f3..4ebe801093a 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -38,7 +38,7 @@ ;;; Copyright © 2024 jgart ;;; Copyright © 2024 Ashish SHUKLA ;;; Copyright © 2024 Jakob Kirsch -;;; Copyright © 2024 Giacomo Leidi +;;; Copyright © 2024, 2025 Giacomo Leidi ;;; Copyright © 2024 Artyom V. Poptsov ;;; Copyright © 2025 Karl Hallsby ;;; @@ -3171,15 +3171,15 @@ (define-public hivex (define-public libguestfs-minimal (package (name "libguestfs-minimal") - (version "1.53.6") + (version "1.54.1") (source (origin (method url-fetch) - (uri (string-append "https://libguestfs.org/download/" + (uri (string-append "https://download.libguestfs.org/" (version-major+minor version) "-stable/libguestfs-" version ".tar.gz")) (sha256 (base32 - "0vssarc3n4kv26fyjmkrrcvh55v41fhycba43pij3rc2izl72s2y")) + "0zhp59hczy2k5zm8hzzsimd3svd36sxn39a052ygfx9636nccgvf")) (patches (search-patches "libguestfs-syms.patch")))) (build-system gnu-build-system) @@ -3201,7 +3201,7 @@ (define-public libguestfs-minimal "--with-distro=\"Guix System\"" "--with-readline" (string-append "LDFLAGS=-Wl,-rpath," %output "/lib")) - #:make-flags #~`("REALLY_INSTALL=yes") + #:make-flags #~'("REALLY_INSTALL=yes") #:phases #~(let* ((lib (string-append #$output "/lib")) (lib/ocaml (string-append lib "/ocaml"))) @@ -3210,15 +3210,18 @@ (define-public libguestfs-minimal (lambda _ (for-each patch-shebang (find-files ".")) - (substitute* "ocaml/Makefile.in" - (("\\$\\(DESTDIR\\)\\$\\(OCAMLLIB\\)") + (substitute* "ocaml/Makefile.am" + (("\\$\\(DESTDIR\\)\\$\\(INSTALL_OCAMLLIB\\)") lib/ocaml)) ;; FIXME: Perl bindings have broken runpath, ;; this substitution doesn't seem to work. (substitute* "perl/Build.PL.in" (("extra_linker_flags => \\[") (string-append "extra_linker_flags => [ - '-L" #$output "/lib',"))))) + '-L" lib "',"))))) + (replace 'bootstrap + (lambda _ + (invoke "autoreconf" "-vif"))) (replace 'check (lambda* (#:key tests? make-flags #:allow-other-keys) (when tests? @@ -3254,6 +3257,8 @@ (define-public libguestfs-minimal (invoke "rm" "-rf" d)) (list man-dir info-dir))))))))) (native-inputs (list augeas + autoconf + automake bison cpio flex @@ -3270,7 +3275,8 @@ (define-public libguestfs-minimal po4a xorriso xz - zstd)) + zstd + (list zstd "lib"))) (inputs (list file fuse @@ -3333,9 +3339,6 @@ (define-public libguestfs (substitute* "m4/guestfs-bash-completion.m4" (("`pkg-config --variable=completionsdir bash-completion`") completions)) - (substitute* "ocaml/Makefile.am" - (("\\$\\(DESTDIR\\)\\$\\(OCAMLLIB\\)") - lib/ocaml)) (substitute* "lua/Makefile.am" (("\\$\\(DESTDIR\\)\\$\\(lualibdir\\)") lib/lua)) @@ -3352,9 +3355,7 @@ (define-public libguestfs create_header")))))))))) (native-inputs (modify-inputs (package-native-inputs libguestfs-minimal) - (prepend autoconf - automake - bash-completion + (prepend bash-completion cdrtools gobject-introspection python