From patchwork Sun Oct 9 05:08:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thiago Jung Bauermann X-Patchwork-Id: 43234 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 C4B2227BBEA; Sun, 9 Oct 2022 06:10:41 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED 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 18E4F27BBE9 for ; Sun, 9 Oct 2022 06:10:41 +0100 (BST) Received: from localhost ([::1]:58890 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ohOaF-0000aG-VU for patchwork@mira.cbaines.net; Sun, 09 Oct 2022 01:10:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48484) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ohOZf-0000HM-79 for guix-patches@gnu.org; Sun, 09 Oct 2022 01:10:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42726) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ohOZe-0007rO-Tt for guix-patches@gnu.org; Sun, 09 Oct 2022 01:10:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ohOZe-0006AC-OK for guix-patches@gnu.org; Sun, 09 Oct 2022 01:10:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58244] [PATCH v2 2/2] gnu: public-inbox: Update to 1.9.0. Resent-From: Thiago Jung Bauermann Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Oct 2022 05:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58244 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58244@debbugs.gnu.org Cc: Thiago Jung Bauermann Received: via spool by 58244-submit@debbugs.gnu.org id=B58244.166529215523608 (code B ref 58244); Sun, 09 Oct 2022 05:10:02 +0000 Received: (at 58244) by debbugs.gnu.org; 9 Oct 2022 05:09:15 +0000 Received: from localhost ([127.0.0.1]:41802 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ohOYs-00068h-VC for submit@debbugs.gnu.org; Sun, 09 Oct 2022 01:09:15 -0400 Received: from mx.kolabnow.com ([212.103.80.154]:32260) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ohOYn-000681-IK for 58244@debbugs.gnu.org; Sun, 09 Oct 2022 01:09:13 -0400 Received: from localhost (unknown [127.0.0.1]) by mx.kolabnow.com (Postfix) with ESMTP id 036331A31 for <58244@debbugs.gnu.org>; Sun, 9 Oct 2022 07:09:04 +0200 (CEST) Authentication-Results: ext-mx-out001.mykolab.com (amavisd-new); dkim=pass (4096-bit key) reason="pass (just generated, assumed good)" header.d=kolabnow.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kolabnow.com; h= content-transfer-encoding:content-type:content-type:mime-version :references:in-reply-to:message-id:date:date:subject:subject :from:from:received:received:received; s=dkim20160331; t= 1665292143; x=1667106544; bh=nj+iZ7mbndFmOvvcl4PfrGHXIxRvkc/4IPH mIf7hVaE=; b=BM0VtbQ/YGW0faDzjcCtYYFGF6VijEHIgsweFD9tMSD/ihKAebA uQDri2V8QTw/N1N81eUReYZne8o3jjSrwng9gJQ59P0RiLz9YSrpAqGhHHLUd9I9 bzunVVKHSfiMrC0uWStQfD96kyU+hVauydm63lRHWbwwj+d757s/5seINzhFvRJg rOhaSJEG6fWhKLRnLupZb1glygeaHGL3hEfr2s9iOAZygRHWpFSti6N2KX2Lgv2e raM7Q1m6H005TvRIT+0gBivni8Yjhf+QIX1lEZoQ/Jag2C+jG9sX0DBaDGk8C0aQ 04i0xJCZH/84FgZx16QvYMZRrQbZ+ySpy0IYYHANqL/NEJJNDY3qU2yNzK2F/XZH bfAJiqkyN5WNX6MknOMUBCh11ACcOG509ZOhTDQZcU1AO1rqXUivD1iEPyAqLTyO 4oFgVQHRZRo/x9KT5G8Gc72/zn98gAart2ZWKELo5gxwJ/ixBSL+ilFZBmKlrg/1 GTiFm94OuksPjmYwcoz3ctk0kOz3WvRTiXerVIhWGTiTfzQnPhC8Rhfqt/wdM4cK /Rwz6Rcewv3HsWs6WjTUP+hS0D4B7MMxnHt3+tOVXoffwiSovKefXvEzP3a4qWCk YkCEoldyJSXt3JTKrIq7dK57jk/e7x4tFcQ8Z1VMUFDEs7i9ACOsHQuM= X-Virus-Scanned: amavisd-new at mykolab.com Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out001.mykolab.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KH2ieQaQNx2a for <58244@debbugs.gnu.org>; Sun, 9 Oct 2022 07:09:03 +0200 (CEST) Received: from int-mx002.mykolab.com (unknown [10.9.13.2]) by mx.kolabnow.com (Postfix) with ESMTPS id 260281972 for <58244@debbugs.gnu.org>; Sun, 9 Oct 2022 07:09:02 +0200 (CEST) Received: from ext-subm001.mykolab.com (unknown [10.9.6.1]) by int-mx002.mykolab.com (Postfix) with ESMTPS id E3FBCA030; Sun, 9 Oct 2022 07:09:02 +0200 (CEST) Date: Sun, 9 Oct 2022 02:08:24 -0300 Message-Id: <20221009050824.130410-3-bauermann@kolabnow.com> In-Reply-To: <20221009050824.130410-1-bauermann@kolabnow.com> References: <20221009050824.130410-1-bauermann@kolabnow.com> 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" Reply-to: Thiago Jung Bauermann X-ACL-Warn: , Thiago Jung Bauermann via Guix-patches X-Patchwork-Original-From: Thiago Jung Bauermann via Guix-patches via From: Thiago Jung Bauermann X-getmail-retrieved-from-mailbox: Patches The patch is included in version 1.9.0, so remove it from Guix. On i686-linux, test t/pop3d.t fails unless the File::FcntlLock module is present so add it. * gnu/packages/patches/public-inbox-fix-spawn-test.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove patch. * gnu/packages/mail.scm (public-inbox)[version]: Change to 1.9.0. [source]: Update hash. Remove patch. [inputs]: Add perl-file-fcntllock if target is x86-32. --- Hello, It's possible that File::FcntlLock is needed on other 32-bit targets as well, but the only one I can test is i686-linux. gnu/local.mk | 1 - gnu/packages/mail.scm | 67 ++++++++++--------- .../patches/public-inbox-fix-spawn-test.patch | 43 ------------ 3 files changed, 36 insertions(+), 75 deletions(-) delete mode 100644 gnu/packages/patches/public-inbox-fix-spawn-test.patch diff --git a/gnu/local.mk b/gnu/local.mk index a013647d7e1e..a6b9585bb6df 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1685,7 +1685,6 @@ dist_patch_DATA = \ %D%/packages/patches/psm-disable-memory-stats.patch \ %D%/packages/patches/psm-ldflags.patch \ %D%/packages/patches/psm-repro.patch \ - %D%/packages/patches/public-inbox-fix-spawn-test.patch \ %D%/packages/patches/pulseaudio-fix-mult-test.patch \ %D%/packages/patches/pulseaudio-longer-test-timeout.patch \ %D%/packages/patches/pulseview-qt515-compat.patch \ diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 65d806086205..82126f5a3bbe 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -4141,7 +4141,7 @@ (define-public l2md (define-public public-inbox (package (name "public-inbox") - (version "1.8.0") + (version "1.9.0") (source (origin (method git-fetch) (uri (git-reference @@ -4149,9 +4149,8 @@ (define-public public-inbox (commit (string-append "v" version)))) (sha256 (base32 - "0xni1l54v1z3p0zb52807maay0yqabp8jgf5iras5zmhgjyk3swz")) - (file-name (git-file-name name version)) - (patches (search-patches "public-inbox-fix-spawn-test.patch")))) + "0cgvxg0f32nvb3079x46gjkfis4bc98s6nx6kl8rm90kmb1kxkx9")) + (file-name (git-file-name name version)))) (build-system perl-build-system) (arguments `(#:imported-modules (,@%perl-build-system-modules @@ -4227,33 +4226,39 @@ (define-public public-inbox (list ;; For testing. lsof openssl tini)) (inputs - (list bash-minimal - curl - git - perl-dbd-sqlite - perl-dbi - perl-email-address-xs - perl-email-mime-contenttype - perl-email-mime - perl-email-simple - perl-net-server - perl-plack-middleware-deflater - perl-plack-middleware-reverseproxy - perl-plack - perl-search-xapian - perl-socket-msghdr - perl-timedate - perl-uri-escape - perl-inline-c - perl-parse-recdescent - perl-linux-inotify2 - ;; FIXME: Perl modules are unable to find the config file for highlight - ;; https://issues.guix.gnu.org/48033#4 - ;; ("highlight" ,highlight) - ;; For testing. - perl-ipc-run - perl-xml-feed - xapian)) + (append + (if (target-x86-32?) + ;; Required by test t/pop3d.t, otherwise fails with + ;; “sizeof(off_t)=8 requires File::FcntlLock”. + (list perl-file-fcntllock) + '()) + (list bash-minimal + curl + git + perl-dbd-sqlite + perl-dbi + perl-email-address-xs + perl-email-mime-contenttype + perl-email-mime + perl-email-simple + perl-net-server + perl-plack-middleware-deflater + perl-plack-middleware-reverseproxy + perl-plack + perl-search-xapian + perl-socket-msghdr + perl-timedate + perl-uri-escape + perl-inline-c + perl-parse-recdescent + perl-linux-inotify2 + ;; FIXME: Perl modules are unable to find the config file for highlight + ;; https://issues.guix.gnu.org/48033#4 + ;; ("highlight" ,highlight) + ;; For testing. + perl-ipc-run + perl-xml-feed + xapian))) (home-page "https://public-inbox.org/README.html") (synopsis "Archive mailing lists in Git repositories") (description diff --git a/gnu/packages/patches/public-inbox-fix-spawn-test.patch b/gnu/packages/patches/public-inbox-fix-spawn-test.patch deleted file mode 100644 index 2739b1974de8..000000000000 --- a/gnu/packages/patches/public-inbox-fix-spawn-test.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 5593489d9c3ce22b1942f35c7ebb0e06fcf2bfa8 Mon Sep 17 00:00:00 2001 -From: Thiago Jung Bauermann -Date: Fri, 10 Jun 2022 12:39:18 -0300 -Subject: [PATCH] t/spawn: Find invalid PID to try to join its process group - -In the container used to build packages of the GNU Guix distribution, PID 1 -runs as the same user as the test so this spawn that should fail actually -succeeds. - -Fix the problem by going through different PIDs and picking one that -either doesn't exist or we aren't allowed to signal. ---- - -This patch is taken from the public-inbox repository and will appear in the -release after v1.8. - - t/spawn.t | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) - -diff --git a/t/spawn.t b/t/spawn.t -index 6168c1f6171c..5fc99a2a101c 100644 ---- a/t/spawn.t -+++ b/t/spawn.t -@@ -24,7 +24,18 @@ SKIP: { - is(waitpid($pid, 0), $pid, 'waitpid succeeds on spawned process'); - is($?, 0, 'true exited successfully'); - pipe(my ($r, $w)) or BAIL_OUT; -- $pid = eval { spawn(['true'], undef, { pgid => 1, 2 => $w }) }; -+ -+ # Find invalid PID to try to join its process group. -+ my $wrong_pgid = 1; -+ for (my $i=0x7fffffff; $i >= 2; $i--) { -+ if (kill(0, $i) == 0) { -+ $wrong_pgid = $i; -+ last; -+ } -+ } -+ -+ # Test spawn behavior when it can't join the requested process group. -+ $pid = eval { spawn(['true'], undef, { pgid => $wrong_pgid, 2 => $w }) }; - close $w; - my $err = do { local $/; <$r> }; - # diag "$err ($@)";