From patchwork Sun Mar 20 12:20:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?6Lev6L6J?= X-Patchwork-Id: 37955 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 A8A8327BBE9; Sun, 20 Mar 2022 12:22:15 +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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,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 A765A27BBEA for ; Sun, 20 Mar 2022 12:22:11 +0000 (GMT) Received: from localhost ([::1]:56804 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nVuZW-0004wV-PP for patchwork@mira.cbaines.net; Sun, 20 Mar 2022 08:22:10 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50558) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nVuZO-0004w8-Sa for guix-patches@gnu.org; Sun, 20 Mar 2022 08:22:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39157) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nVuZO-0007cd-JC for guix-patches@gnu.org; Sun, 20 Mar 2022 08:22:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nVuZO-00060K-88 for guix-patches@gnu.org; Sun, 20 Mar 2022 08:22:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#53319] [PATCH] gnu: Add n2n. Resent-From: =?utf-8?b?6Lev6L6J?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 20 Mar 2022 12:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53319 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Nicolas Goaziou Cc: 53319@debbugs.gnu.org, Maxime Devos Received: via spool by 53319-submit@debbugs.gnu.org id=B53319.164777888123035 (code B ref 53319); Sun, 20 Mar 2022 12:22:02 +0000 Received: (at 53319) by debbugs.gnu.org; 20 Mar 2022 12:21:21 +0000 Received: from localhost ([127.0.0.1]:33054 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nVuYi-0005zR-3Q for submit@debbugs.gnu.org; Sun, 20 Mar 2022 08:21:21 -0400 Received: from mail-pj1-f68.google.com ([209.85.216.68]:53244) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nVuYe-0005zE-P8 for 53319@debbugs.gnu.org; Sun, 20 Mar 2022 08:21:18 -0400 Received: by mail-pj1-f68.google.com with SMTP id v4so10953344pjh.2 for <53319@debbugs.gnu.org>; Sun, 20 Mar 2022 05:21:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=QSKlkHmf2OMuRascxsoc3qR9DZvP2UsYH4fgCL+vrKU=; b=hcpVWMQHDYtT9ZbJ5mnoZD8BeV/CIpkl3a7cDaZfnWeLy/WHtSBLVfAc7Jw8NTiML6 XjKP0zWi+9xDLnAYIOqc89XqWb5iv9v9x+Hl3okAg9pgz5sRn8d4WaB+0Sg7fD4wgn/k Hh0o4GeWTW/FjbsHzYdaPUTi/ZpqzCOBruCn8nX8HJdATgwc3kdunEltz1rHKSv/HS7y 2vOSaJ3SE1AuehO3m8jlejcVCa5Fn8/GdBjFjFZ9Upg03m/QTuxujsN9nJG61PD2ps05 PV4rEBuSP7nrpTfIOuAPDxmo0rhoqen5US2O2wIo6C4TxPCxkyYmJuF+mFqwj0WfqWyS BzMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=QSKlkHmf2OMuRascxsoc3qR9DZvP2UsYH4fgCL+vrKU=; b=ikfQVSMVHF3XIsFQHLWS3W2j9rF4oBb+DxkvhX5SnqFnCIDVeOmoWEYpHxz2i8rZ65 0ZAnvOQwK4z+dcJKdHu3WlWEEziFcqQ7kt8WIE/sVbIDhMcx/CcvMt7cBFRu9pg6YpSy IEWRa8+BVN5MO2iWpbbTnERvlm2iKGC0/hCauY0QHwD4NOL4v8BS1J1qiYH/hqI6pXb3 oWkJYCYhy7xTnOKAu3K6NZjAd2UVSwFfBqQdcZSV2SpOfC2pgEScoHA9zrukoVakkDc3 qHQQnNNcBVqYcvRg0Iqk5fUiNYOmXwOHpSacJr6dJLNLSDIDcaNFrXBiHgbJhK9auRrJ cFvg== X-Gm-Message-State: AOAM530eGg1U4orvtwH/YI9k6yL0Gu8hHQ3kXjYkWx7+gJX2Aqfu4yiM vZUFYLozPjcad0VaT8AruFU60ha+0Cc4EkhYSF8= X-Google-Smtp-Source: ABdhPJzriVgLsF3uj50zyJdrIVBkugVA7wJAxApV3Jtxr/DwEBci6rmUb062bX3R3sNXfrx5K5I2mkMyYE4KKiauBE8= X-Received: by 2002:a17:90b:4ac7:b0:1bf:2ef7:334a with SMTP id mh7-20020a17090b4ac700b001bf2ef7334amr31422579pjb.239.1647778870860; Sun, 20 Mar 2022 05:21:10 -0700 (PDT) MIME-Version: 1.0 References: <87r18stbll.fsf@nicolasgoaziou.fr> <87ilt63fep.fsf@nicolasgoaziou.fr> In-Reply-To: <87ilt63fep.fsf@nicolasgoaziou.fr> From: =?utf-8?b?6Lev6L6J?= Date: Sun, 20 Mar 2022 12:20:58 +0000 Message-ID: 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 Nicolas Goaziou 于2022年2月22日周二 18:49写道： > > Hello, > > Maxime Devos writes: > > > 'configure' is run during build, so for cross-compilation, a sh from > > 'native-inputs' shoud be used instead of 'inputs': > > > > (("/bin/sh") (search-input-file (or native-inputs inputs) "/bin/sh")) > > True, I keep forgetting about this. It would be more natural to use > (search-input-file native-inputs "/bin/sh"), but, IIRC, native-inputs > may be empty if we are not cross-compiling. > > I will fix it. > > > or simpler: > > > > (("/bin/sh") (which "sh")) > > IIUC, search-input-file is a replacement for `which', so that seems to > be going backwards. > > Of course, if `which' is the preferred solution for package style, I'd > love to hear a confirmation about it. > > > Also, this package definition packages version 2.8. Why not package > > the latest version instead? > > The OP waited one month without any feedback. I consider this is more > respectful to apply the patch in its current version rather than > requesting more changes now. YMMV. > > Of course, the update can happen in a later, very welcome, patch. > > > Also, looking at > > , > > it seems that n2n might not be bit-for-bit reproducible. > > I agree this package has room for improvement. Hopefully, 路辉 can have > a look at it. > > Regards, > -- > Nicolas Goaziou From a6c98dfaedebba172d451d62ba2d4c9b18aea3b8 Mon Sep 17 00:00:00 2001 From: Lu Hui Date: Sun, 20 Mar 2022 19:16:52 +0800 Subject: [PATCH 1/4] gnu: n2n: more reproducible. * gnu/packages/vpn.scm (n2n): [phases]: New Variable. --- gnu/packages/vpn.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 5bf5a62481..4b0e7d751a 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -322,6 +322,11 @@ (define-public n2n (lambda _ (substitute* "autogen.sh" (("./configure") "")))) + (add-before 'bootstrap 'more-reproducible + (lambda _ + (substitute* "configure.seed" + (("DATE=`date +\"%Y-%m-%d\"`") + "DATE=`TZ=utc date -d @0 +\"%Y-%m-%d\"`")))) (add-before 'configure 'fix-configure (lambda* (#:key inputs native-inputs #:allow-other-keys) (substitute* "configure" -- 2.34.0