From patchwork Fri Mar 18 01:11:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vagrant Cascadian X-Patchwork-Id: 37913 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 252CF27BBEA; Fri, 18 Mar 2022 01:12:55 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS autolearn=unavailable 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 DFC3527BBE9 for ; Fri, 18 Mar 2022 01:12:54 +0000 (GMT) Received: from localhost ([::1]:48068 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nV1Aj-0004Yg-T6 for patchwork@mira.cbaines.net; Thu, 17 Mar 2022 21:12:54 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48552) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nV19v-0004YT-Bg for guix-patches@gnu.org; Thu, 17 Mar 2022 21:12:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33607) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nV19u-0000o3-6r for guix-patches@gnu.org; Thu, 17 Mar 2022 21:12:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nV19u-0003We-1L for guix-patches@gnu.org; Thu, 17 Mar 2022 21:12:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54440] [PATCH 1/2] gnu: genext2fs: Update to 1.5.0. Resent-From: Vagrant Cascadian Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Mar 2022 01:12:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54440 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 54440@debbugs.gnu.org Received: via spool by 54440-submit@debbugs.gnu.org id=B54440.164756591313538 (code B ref 54440); Fri, 18 Mar 2022 01:12:01 +0000 Received: (at 54440) by debbugs.gnu.org; 18 Mar 2022 01:11:53 +0000 Received: from localhost ([127.0.0.1]:55737 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nV19l-0003WH-BM for submit@debbugs.gnu.org; Thu, 17 Mar 2022 21:11:53 -0400 Received: from cascadia.aikidev.net ([173.255.214.101]:60306) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nV19k-0003W4-2B for 54440@debbugs.gnu.org; Thu, 17 Mar 2022 21:11:52 -0400 Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:20]) (Authenticated sender: vagrant@cascadia.debian.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id E93201ABC7 for <54440@debbugs.gnu.org>; Thu, 17 Mar 2022 18:11:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org; s=1.vagrant.user; t=1647565906; bh=1bICD0AYK0THQlyhOYOj7rB2AdeVDgm+/xNWogPdPk0=; h=From:To:Subject:In-Reply-To:References:Date:From; b=PJwr62JcsUZLUrPg+vNii6P7HBO89Bs6ezqcFh1FvGbzwF2YUMbubMNTfkPAqKaqE KfHMsQiyK1DMRPJgCmdB39n4kZL4S0scqhVYY6dTP3bGAeRGWQGIg7nKQkf2yMRhFN xMeduHnK6dlOSyvk/X4cJbErdJ0wRsnPS85Cd+mGMWkGm+O+HF7DZ0ooOMhoRB+LI8 edxqANHRBiYRZfocSr2Tfe8VLi7/gMSGsY2WBGJWqs7r8iUSK56Usl5eZUA50vHgMp x5Tu2R2rYy2ArEsYJ9f3Z10Ca189l5mhB2ILFRSQMMlHn9+ed4L0cBWbzor6bn/LSJ gqoZbbcetvlgQ== From: Vagrant Cascadian In-Reply-To: <87sfrgt7ou.fsf@contorta> References: <87sfrgt7ou.fsf@contorta> Date: Thu, 17 Mar 2022 18:11:41 -0700 Message-ID: <87lex8t67m.fsf@contorta> MIME-Version: 1.0 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 * gnu/packages/linux.scm (genext2fs): Update to 1.5.0. [source] Update URL. [arguments] Remove 'apply-debian-patches phase. [home-page] Update URL. --- gnu/packages/linux.scm | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index bf18724990..db6eb2db6f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -8020,34 +8020,19 @@ (define-public xfs_repair/static (define-public genext2fs (package (name "genext2fs") - (version "1.4.1-4") + (version "1.5.0") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/jeremie-koenig/genext2fs") - ;; 1.4.1-3 had a VCS tag but 1.4.1-4 doesn't. - (commit "9ee43894634998b0b2b309d636f25c64314c9421"))) + (url "https://github.com/bestouff/genext2fs") + (commit "474111097321f03de9e009aa9f7d4a8948e310b2"))) (file-name (git-file-name name version)) (sha256 - (base32 "0ib5icn78ciz00zhc1bgdlrwaxvsdz7wnplwblng0jirwi9ml7sq")))) + (base32 "14lgvml5zz99845ja47jpf4iirjzfqv36ffzachh3hw2ggji9c7l")))) (build-system gnu-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'apply-debian-patches - ;; Debian changes (the revision after ‘-’ in VERSION) are - ;; maintained as separate patches. Apply those relevant to us. - (lambda _ - (for-each - (lambda (file-name) - (invoke "patch" "-p1" "-i" - (string-append "debian/patches/" file-name))) - (list "blocksize+creator.diff" ; add -B/-o options - "byteswap_fix.diff")) - #t))))) (native-inputs (list autoconf automake)) - (home-page "https://github.com/jeremie-koenig/genext2fs") + (home-page "https://github.com/bestouff/genext2fs") (synopsis "Generate ext2 file system as a normal user") (description "This package provides a program to generate an ext2 file system as a normal (non-root) user. It does not require you to mount From patchwork Fri Mar 18 01:12:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vagrant Cascadian X-Patchwork-Id: 37914 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 3C04827BBEA; Fri, 18 Mar 2022 01:13:41 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS autolearn=unavailable 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 0611E27BBE9 for ; Fri, 18 Mar 2022 01:13:41 +0000 (GMT) Received: from localhost ([::1]:48824 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nV1BT-000547-VH for patchwork@mira.cbaines.net; Thu, 17 Mar 2022 21:13:40 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48662) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nV1At-00052v-9s for guix-patches@gnu.org; Thu, 17 Mar 2022 21:13:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33616) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nV1At-0000xr-1H for guix-patches@gnu.org; Thu, 17 Mar 2022 21:13:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nV1As-0003Ym-R4 for guix-patches@gnu.org; Thu, 17 Mar 2022 21:13:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54440] [PATCH 2/2] gnu: genimage: Update to 15. Resent-From: Vagrant Cascadian Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Mar 2022 01:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54440 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 54440@debbugs.gnu.org Received: via spool by 54440-submit@debbugs.gnu.org id=B54440.164756598013669 (code B ref 54440); Fri, 18 Mar 2022 01:13:02 +0000 Received: (at 54440) by debbugs.gnu.org; 18 Mar 2022 01:13:00 +0000 Received: from localhost ([127.0.0.1]:55745 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nV1Aq-0003YO-86 for submit@debbugs.gnu.org; Thu, 17 Mar 2022 21:13:00 -0400 Received: from cascadia.aikidev.net ([173.255.214.101]:60308) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nV1Ap-0003Y7-4A for 54440@debbugs.gnu.org; Thu, 17 Mar 2022 21:12:59 -0400 Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:20]) (Authenticated sender: vagrant@cascadia.debian.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id 4F5211ABC7 for <54440@debbugs.gnu.org>; Thu, 17 Mar 2022 18:12:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org; s=1.vagrant.user; t=1647565973; bh=MOJHRpEyMQGHrJv8ATJLhgwl72No4j8Dz8z6Ik5olbk=; h=From:To:Subject:In-Reply-To:References:Date:From; b=cr2yhJGgnolcDTXFv5zDUYNuEcGN8n8lDzr6ftoe+BMB4X9rsWJ+Dlb+VTbDjrYpY JHMv/Eu2aeLGymJEbLXDLNkxG751PPhcjufo1S0bCUBVBh15/W10GEsMKDFE2FW+mg crq815aM2fkkX1GPq3Er2/7crK+i7L8AzuV9qxK181MZJEKShRMnRN3Gp5RrwxIwbG Em2iQo3WoNDgmoYoGSrp7CZrQAlsg38ruFcWy4XDZlYJdNS2S2uo8VkqYeJlVXMBKA HUTAk3PSqgwadh1IEdC2VM7bS39qbAyU8oDbL+jzH9KO3VRnDBVoybrMPkDBn7BrIo rrYyY7zE92BBQ== From: Vagrant Cascadian In-Reply-To: <87lex8t67m.fsf@contorta> References: <87sfrgt7ou.fsf@contorta> <87lex8t67m.fsf@contorta> Date: Thu, 17 Mar 2022 18:12:47 -0700 Message-ID: <87ilsct65s.fsf@contorta> MIME-Version: 1.0 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 * gnu/packages/genimage.scm (genimage): Update to 15. [arguments]: Update 'fix-failing-tests phase to reference new files. --- gnu/packages/genimage.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gnu/packages/genimage.scm b/gnu/packages/genimage.scm index eb50141374..4a9d24fe78 100644 --- a/gnu/packages/genimage.scm +++ b/gnu/packages/genimage.scm @@ -41,11 +41,11 @@ (define-module (gnu packages genimage) #:use-module (gnu packages virtualization)) (define-public genimage - (let ((commit "11bb04455eaf5434f0723c91a2224918ebd0a196") + (let ((commit "ec44ae086c705e6f0439e742c5a2e9b8f3d6ca82") (revision "1")) (package (name "genimage") - (version (git-version "14" revision commit)) + (version (git-version "15" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -54,7 +54,7 @@ (define-public genimage (file-name (git-file-name name version)) (sha256 (base32 - "1dq3lk0awk12v2aidry35gvrci5a3nr6rzcq0j9hyyf0w1z1rn0l")) + "0amj2vjff58yna6kq959i2gqmbjywqr8j5kr5pjqsvbqam3vgg0r")) (patches (search-patches "genimage-mke2fs-test.patch")))) (build-system gnu-build-system) @@ -93,9 +93,13 @@ (define-public genimage ;; We don't have /etc/passwd so uid 0 is not known as "root". ;; Thus patch it out. (substitute* '("test/ext2test.0.dump" + "test/ext2test.1.dump" "test/ext3test.0.dump" + "test/ext3test.1.dump" "test/ext4test.0.dump" + "test/ext4test.1.dump" "test/ext2test-percent.0.dump" + "test/ext2test-percent.1.dump" "test/mke2fs.0.dump") (("root") "unknown")))) (add-before 'check 'setenv-check