From unknown Sat Jun 14 05:07:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#47495] [PATCH] gnu: vsftpd: Use CentOS version and patches. Resent-From: david larsson Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 30 Mar 2021 07:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 47495 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47495@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.161709075712630 (code B ref -1); Tue, 30 Mar 2021 07:53:02 +0000 Received: (at submit) by debbugs.gnu.org; 30 Mar 2021 07:52:37 +0000 Received: from localhost ([127.0.0.1]:50318 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lR9Av-0003HX-Dh for submit@debbugs.gnu.org; Tue, 30 Mar 2021 03:52:37 -0400 Received: from lists.gnu.org ([209.51.188.17]:52688) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lR9At-0003HP-F1 for submit@debbugs.gnu.org; Tue, 30 Mar 2021 03:52:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39744) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lR9As-00068C-RI for guix-patches@gnu.org; Tue, 30 Mar 2021 03:52:31 -0400 Received: from server0.selfhosted.xyz ([217.64.149.7]:49728) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lR9Ap-0002Et-Kf for guix-patches@gnu.org; Tue, 30 Mar 2021 03:52:30 -0400 Received: from server0.selfhosted.xyz (localhost [127.0.0.1]) by server0.selfhosted.xyz (Postfix) with ESMTP id 976901CC20B3 for ; Tue, 30 Mar 2021 09:52:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=selfhosted.xyz; s=dkim; t=1617090739; bh=yZKctYrPl35HLblEPb4XbYshdFHRWjKZUzGpIK2qRa8=; h=Date:From:To:Subject; b=NDJFUCghlwhQEcE6CeZ/40kj7zWyxghK7l9eAAQUGY+Y1PEGDoJBPBA5eq8r7KWhh Neist2jGqNdfUcDunsDCJt+NXK4MLw+sZp7gZUbLZylgzGkbmdDlF59cWR1zb0YpgZ CveanYeO8tlnOpmm2fzZU7itNuZuiGOE6bNoTBvAzs9TVgY1c3dKKDm5x68Uiv0bip z8+4wbInxnT+cffVix1agzMvS5mapOcrKRPnxAgwU5EIX7E1Jme8+Qxotv1ibVE4vm JAQiX8X60dMXEsoQGt5uIvYrbT+uRqt1q+GHe/ChtpVQJOaXTehJWnjO0OazXXID44 wRqemwVbZJEuA== X-Fuglu-Suspect: 9af56d6e4c5b424cbc0ed11e75e56835 X-Fuglu-Spamstatus: NO Received: from webmail.selfhosted.xyz (office.selfhosted.xyz [192.168.1.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: mail@selfhosted.xyz) by server0.selfhosted.xyz (Postfix) with ESMTPSA for ; Tue, 30 Mar 2021 09:52:12 +0200 (CEST) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=_62e48f7bb1b8b1216d33a61217f702be" Date: Tue, 30 Mar 2021 09:52:12 +0200 From: david larsson Message-ID: <14748028ccd69b0d3a767a70b5832a79@selfhosted.xyz> X-Sender: david.larsson@selfhosted.xyz Received-SPF: pass client-ip=217.64.149.7; envelope-from=david.larsson@selfhosted.xyz; helo=server0.selfhosted.xyz X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 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, FROM_SUSPICIOUS_NTLD=0.499, FROM_SUSPICIOUS_NTLD_FP=0.001, PDS_OTHER_BAD_TLD=1.999, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi, the attached patch updates vsftpd so it can use tlsv1.2 etc. //David From 4f11b0960610e2afe670630bb1b93150714ce516 Mon Sep 17 00:00:00 2001 From: methuselah-0 Date: Tue, 30 Mar 2021 09:45:41 +0200 Subject: [PATCH] gnu: vsftpd: Use [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.9 SPF_FAIL SPF: sender does not match SPF record (fail) [SPF failed: Please see http://www.openspf.org/Why?s=mfrom; id=david.larsson%40selfhosted.xyz; ip=209.51.188.17; r=debbugs.gnu.org] 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: selfhosted.xyz (xyz)] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [209.51.188.17 listed in list.dnswl.org] 0.0 RCVD_IN_MSPIKE_H4 RBL: Very Good reputation (+4) [209.51.188.17 listed in wl.mailspike.net] 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders 0.0 FROM_SUSPICIOUS_NTLD_FP From abused NTLD 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.4 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi, the attached patch updates vsftpd so it can use tlsv1.2 etc. //David From 4f11b0960610e2afe670630bb1b93150714ce516 Mon Sep 17 00:00:00 2001 From: methuselah-0 Date: Tue, 30 Mar 2021 09:45:41 +0200 Subject: [PATCH] gnu: vsftpd: Use [...] Content analysis details: (2.4 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H4 RBL: Very Good reputation (+4) [209.51.188.17 listed in wl.mailspike.net] 0.9 SPF_FAIL SPF: sender does not match SPF record (fail) [SPF failed: Please see http://www.openspf.org/Why?s=mfrom;id=david.larsson%40selfhosted.xyz;ip=209.51.188.17;r=debbugs.gnu.org] 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: selfhosted.xyz (xyz)] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager --=_62e48f7bb1b8b1216d33a61217f702be Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; format=flowed Hi, the attached patch updates vsftpd so it can use tlsv1.2 etc. //David --=_62e48f7bb1b8b1216d33a61217f702be Content-Transfer-Encoding: base64 Content-Type: text/x-diff; charset=us-ascii; name=0001-gnu-vsftpd-Use-CentOS-version-and-patches.patch Content-Disposition: attachment; filename=0001-gnu-vsftpd-Use-CentOS-version-and-patches.patch; size=13092 RnJvbSA0ZjExYjA5NjA2MTBlMmFmZTY3MDYzMGJiMWI5MzE1MDcxNGNlNTE2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBtZXRodXNlbGFoLTAgPGRhdmlkLmxhcnNzb25Ac2VsZmhvc3Rl ZC54eXo+CkRhdGU6IFR1ZSwgMzAgTWFyIDIwMjEgMDk6NDU6NDEgKzAyMDAKU3ViamVjdDogW1BB VENIXSBnbnU6IHZzZnRwZDogVXNlIENlbnRPUyB2ZXJzaW9uIGFuZCBwYXRjaGVzLgoKICAgICog Z251L3BhY2thZ2VzL2Z0cC5zY20gKHZmdHBkKTogVXNlIENlbnRPUyB2ZXJzaW9uIGFuZCBwYXRj aGVzLgotLS0KIGdudS9wYWNrYWdlcy9mdHAuc2NtIHwgMTM4ICsrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKy0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxMTggaW5zZXJ0aW9ucygr KSwgMjAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZ251L3BhY2thZ2VzL2Z0cC5zY20gYi9n bnUvcGFja2FnZXMvZnRwLnNjbQppbmRleCBiMTc4MDYzNTU2Li45ZDcwNGFhYTNmIDEwMDY0NAot LS0gYS9nbnUvcGFja2FnZXMvZnRwLnNjbQorKysgYi9nbnUvcGFja2FnZXMvZnRwLnNjbQpAQCAt MjgsMTggKzI4LDIxIEBACiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzKQogICAjOnVzZS1t b2R1bGUgKGdudSBwYWNrYWdlcyBhdXRvdG9vbHMpCiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2th Z2VzIGNoZWNrKQorICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBjcGlvKQogICAjOnVzZS1t b2R1bGUgKGdudSBwYWNrYWdlcyBjb21wcmVzc2lvbikKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFj a2FnZXMgZnJlZWRlc2t0b3ApCiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIGdldHRleHQp CiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIGdsaWIpCiAgICM6dXNlLW1vZHVsZSAoZ251 IHBhY2thZ2VzIGd0aykKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgbGliaWRuKQorICAj OnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBsaW51eCkKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFj a2FnZXMgbmN1cnNlcykKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgbmV0dGxlKQogICAj OnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBwa2ctY29uZmlnKQogICAjOnVzZS1tb2R1bGUgKGdu dSBwYWNrYWdlcyByZWFkbGluZSkKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgc3FsaXRl KQogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyB0bHMpCisgICM6dXNlLW1vZHVsZSAoZ251 IHBhY2thZ2VzIHZlcnNpb24tY29udHJvbCkKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMg d3h3aWRnZXRzKQogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyB4bWwpKQogCkBAIC0yNTYs MzIgKzI1OSwxMjcgQEAgZGlyZWN0b3J5IGNvbXBhcmlzb24gYW5kIG1vcmUuIikKICAgICAodmVy c2lvbiAiMy4wLjMiKQogICAgIChzb3VyY2UgKG9yaWdpbgogICAgICAgICAgICAgICAobWV0aG9k IHVybC1mZXRjaCkKLSAgICAgICAgICAgICAgKHVyaSAoc3RyaW5nLWFwcGVuZCAiaHR0cHM6Ly9z ZWN1cml0eS5hcHBzcG90LmNvbS9kb3dubG9hZHMvIgotICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIG5hbWUgIi0iIHZlcnNpb24gIi50YXIuZ3oiKSkKKyAgICAgICAgICAgICAgKHVy aSAiaHR0cHM6Ly92YXVsdC5jZW50b3Mub3JnL2NlbnRvcy84LjMuMjAxMS9BcHBTdHJlYW0vU291 cmNlL1NQYWNrYWdlcy92c2Z0cGQtMy4wLjMtMzIuZWw4LnNyYy5ycG0iKQogICAgICAgICAgICAg ICAoc2hhMjU2CiAgICAgICAgICAgICAgICAoYmFzZTMyCi0gICAgICAgICAgICAgICAgIjF4c3lq bjY4azNmZ20yaW5jcGIzbHoybmlrZmZsOWJ5MnNhZnA5OTRpMjcyd3Z2Mm5rY3giKSkpKQorICAg ICAgICAgICAgICAgICIxeGwwa3FjaXNtZjgyaGw5OWtscWJ2dnB5bHB5azF5cjFxank1aGQ4Zjgw Y2o0bHlsMGY0IikpKSkKICAgICAoYnVpbGQtc3lzdGVtIGdudS1idWlsZC1zeXN0ZW0pCiAgICAg KGFyZ3VtZW50cwotICAgICBgKCM6bWFrZS1mbGFncyAnKCJMREZMQUdTPS1sY3J5cHQiKQotICAg ICAgICM6dGVzdHM/ICNmICAgICAgICAgICAgICAgICAgICAgIDsgTm8gdGVzdHMgZXhpc3QuCisg ICAgIGAoIzptYWtlLWZsYWdzICcoIkxERkxBR1M9LWxjcnlwdCAtbHNzbCAtcGllIikKKyAgICAg ICAjOnRlc3RzPyAjZiA7IE5vIHRlc3RzIGV4aXN0LgogICAgICAgICM6cGhhc2VzCiAgICAgICAg KG1vZGlmeS1waGFzZXMgJXN0YW5kYXJkLXBoYXNlcwotICAgICAgICAgKGFkZC1hZnRlciAndW5w YWNrICdwYXRjaC1pbnN0YWxsYXRpb24tZGlyZWN0b3J5Ci0gICAgICAgICAgIChsYW1iZGEqICgj OmtleSBvdXRwdXRzICM6YWxsb3ctb3RoZXIta2V5cykKLSAgICAgICAgICAgICAoc3Vic3RpdHV0 ZSogIk1ha2VmaWxlIgotICAgICAgICAgICAgICAgKCgiL3VzciIpIChhc3NvYy1yZWYgb3V0cHV0 cyAib3V0IikpKQotICAgICAgICAgICAgICN0KSkKLSAgICAgICAgIChhZGQtYmVmb3JlICdpbnN0 YWxsICdta2RpcgotICAgICAgICAgICAobGFtYmRhKiAoIzprZXkgb3V0cHV0cyAjOmFsbG93LW90 aGVyLWtleXMpCi0gICAgICAgICAgICAgKGxldCAoKG91dCAoYXNzb2MtcmVmIG91dHB1dHMgIm91 dCIpKSkKLSAgICAgICAgICAgICAgIChta2Rpci1wIG91dCkKLSAgICAgICAgICAgICAgIChta2Rp ciAoc3RyaW5nLWFwcGVuZCBvdXQgIi9zYmluIikpCi0gICAgICAgICAgICAgICAobWtkaXIgKHN0 cmluZy1hcHBlbmQgb3V0ICIvbWFuIikpCi0gICAgICAgICAgICAgICAobWtkaXIgKHN0cmluZy1h cHBlbmQgb3V0ICIvbWFuL21hbjUiKSkKLSAgICAgICAgICAgICAgIChta2RpciAoc3RyaW5nLWFw cGVuZCBvdXQgIi9tYW4vbWFuOCIpKQotICAgICAgICAgICAgICAgI3QpKSkKLSAgICAgICAgIChk ZWxldGUgJ2NvbmZpZ3VyZSkpKSkKKyAgICAgICAgICAgICAgICAgICAgICAoYWRkLWFmdGVyICd1 bnBhY2sgJ3BhdGNoLWluc3RhbGxhdGlvbi1kaXJlY3RvcnkKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIChsYW1iZGEqICgjOmtleSBvdXRwdXRzICM6YWxsb3ctb3RoZXIta2V5cykK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHN1YnN0aXR1dGUqICJNYWtlZmls ZSIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICgoIi91 c3IiKSAoYXNzb2MtcmVmIG91dHB1dHMgIm91dCIpKSkKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgI3QpKQorICAgICAgICAgICAgICAgICAgICAgIChyZXBsYWNlICd1bnBhY2sK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAobGFtYmRhKiAoIzprZXkgc291cmNlICM6 YWxsb3ctb3RoZXIta2V5cykKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChpbnZv a2UgIjd6IiAiZSIgc291cmNlIChzdHJpbmctYXBwZW5kICItbyIgIi4vIiAidnNmdHBkLTMuMC4z LTMyLmVsOC5zcmMuY3BpbyIpKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGNo ZGlyICIuL3ZzZnRwZC0zLjAuMy0zMi5lbDguc3JjLmNwaW8iKQorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgKGludm9rZSAiY3BpbyIgIi1pZG12IiAoc3RyaW5nLWFwcGVuZCAiLS1m aWxlPS4vdnNmdHBkLTMuMC4zLTMyLmVsOC5zcmMuY3BpbyIpKQorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgKGludm9rZSAidGFyIiAieHZmIiAiLi92c2Z0cGQtMy4wLjMudGFyLmd6 IikKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChsZXQgKChwYXRjaGVzICcoIjAw MDEtRG9uLXQtdXNlLXRoZS1wcm92aWRlZC1zY3JpcHQtdG8tbG9jYXRlLWxpYnJhcmllcy5wYXRj aCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIjAw MDItRW5hYmxlLWJ1aWxkLXdpdGgtU1NMLnBhdGNoIgorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAiMDAwMy1FbmFibGUtYnVpbGQtd2l0aC1UQ1AtV3Jh cHBlci5wYXRjaCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIjAwMDQtVXNlLWV0Yy12c2Z0cGQtZGlyLWZvci1jb25maWctZmlsZXMtaW5zdGVhZC1v Zi1ldGMucGF0Y2giCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICIwMDA1LVVzZS1ob3N0bmFtZS13aGVuLWNhbGxpbmctUEFNLWF1dGhlbnRpY2F0aW9u LW1vZHVsZS5wYXRjaCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIjAwMDYtQ2xvc2Utc3RkaW4tb3V0LWVyci1iZWZvcmUtbGlzdGVuaW5nLWZvci1p bmNvbWluZy1jby5wYXRjaCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIjAwMDctTWFrZS1maWxlbmFtZS1maWx0ZXJzLXNtYXJ0ZXIucGF0Y2giCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICIwMDA4LVdy aXRlLWRlbmllZC1sb2dpbnMtaW50by10aGUtbG9nLnBhdGNoIgorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiMDAwOS1UcmltLXdoaXRlc3BhY2VzLXdo ZW4tcmVhZGluZy1jb25maWd1cmF0aW9uLnBhdGNoIgorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAiMDAxMC1JbXByb3ZlLWRhZW1vbml6aW5nLnBhdGNo IgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiMDAx MS1GaXgtbGlzdGluZy13aXRoLW1vcmUtdGhhbi1vbmUtc3Rhci5wYXRjaCIKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIjAwMTItUmVwbGFjZS1zeXNj YWxsLV9fTlJfY2xvbmUtLi13aXRoLWNsb25lLnBhdGNoIgorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiMDAxMy1FeHRlbmQtbWFuLXBhZ2VzLXdpdGgt c3lzdGVtZC1pbmZvLnBhdGNoIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAiMDAxNC1BZGQtc3VwcG9ydC1mb3Itc3F1YXJlLWJyYWNrZXRzLWluLWxz LnBhdGNoIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAiMDAxNS1MaXN0ZW4tb24tSVB2Ni1ieS1kZWZhdWx0LnBhdGNoIgorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiMDAxNi1JbmNyZWFzZS1WU0ZUUF9B U19MSU1JVC1mcm9tLTIwMFVMLXRvLTQwMFVMLnBhdGNoIgorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiMDAxNy1GaXgtYW4taXNzdWUtd2l0aC10aW1l c3RhbXBzLWR1cmluZy1EU1QucGF0Y2giCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICIwMDE4LUNoYW5nZS10aGUtZGVmYXVsdC1sb2ctZmlsZS1pbi1j b25maWd1cmF0aW9uLnBhdGNoIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAiMDAxOS1JbnRyb2R1Y2UtcmV2ZXJzZV9sb29rdXBfZW5hYmxlLW9wdGlv bi5wYXRjaCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIjAwMjAtVXNlLXVuc2lnbmVkLWludC1mb3ItdWlkLWFuZC1naWQtcmVwcmVzZW50YXRpb24u cGF0Y2giCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICIwMDIxLUludHJvZHVjZS1zdXBwb3J0LWZvci1ESEUtYmFzZWQtY2lwaGVyLXN1aXRlcy5wYXRj aCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIjAw MjItSW50cm9kdWNlLXN1cHBvcnQtZm9yLUVEREhFLWJhc2VkLWNpcGhlci1zdWl0ZXMucGF0Y2gi CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICIwMDIz LUFkZC1kb2N1bWVudGF0aW9uLWZvci1pc29sYXRlXy1vcHRpb25zLi1Db3JyZWN0LWRlZmEucGF0 Y2giCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICIw MDI0LUludHJvZHVjZS1uZXctcmV0dXJuLXZhbHVlLTQ1MC5wYXRjaCIKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIjAwMjUtSW1wcm92ZS1sb2NhbF9t YXhfcmF0ZS1vcHRpb24ucGF0Y2giCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICIwMDI2LVByZXZlbnQtaGFuZ2luZy1pbi1TSUdDSExELWhhbmRsZXIu cGF0Y2giCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICIwMDI3LURlbGV0ZS1maWxlcy13aGVuLXVwbG9hZC1mYWlscy5wYXRjaCIKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIjAwMjgtRml4LW1hbi1wYWdl LXJlbmRlcmluZy5wYXRjaCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIjAwMjktRml4LXNlZ2ZhdWx0LWluLWNvbmZpZy1maWxlLXBhcnNlci5wYXRj aCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIjAw MzAtRml4LWxvZ2dpbmctaW50by1zeXNsb2ctd2hlbi1lbmFibGVkLWluLWNvbmZpZy5wYXRjaCIK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIjAwMzEt Rml4LXF1ZXN0aW9uLW1hcmstd2lsZGNhcmQtd2l0aGluZy1hLWZpbGUtbmFtZS5wYXRjaCIKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIjAwMzItUHJv cGFnYXRlLWVycm9ycy1mcm9tLW5mcy13aXRoLXF1b3RhLXRvLWNsaWVudC5wYXRjaCIKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIjAwMzMtSW50cm9k dWNlLVRMU3YxLjEtYW5kLVRMU3YxLjItb3B0aW9ucy5wYXRjaCIKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIjAwMzQtVHVybi1vZmYtc2VjY29tcC1z YW5kYm94LWJlY2F1c2UtaXQtaXMtdG9vLXN0cmljdC5wYXRjaCIKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIjAwMzUtTW9kaWZ5LURILWVuYWJsZW1l bnQtcGF0Y2gtdG8tYnVpbGQtd2l0aC1PcGVuU1NMLTEuMS5wYXRjaCIKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIjAwMzYtUmVkZWZpbmUtVlNGVFBf Q09NTUFORF9GRC10by0xLnBhdGNoIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAiMDAzNy1Eb2N1bWVudC10aGUtcmVsYXRpb25zaGlwLW9mLXRleHRf dXNlcmRiX25hbWVzLWFuZC1jLnBhdGNoIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAiMDAzOC1Eb2N1bWVudC1hbGxvd193cml0ZWFibGVfY2hyb290 LWluLXRoZS1tYW4tcGFnZS5wYXRjaCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIjAwMzktSW1wcm92ZS1kb2N1bWVudGF0aW9uLW9mLUFTQ0lJLW1v ZGUtaW4tdGhlLW1hbi1wYWdlLnBhdGNoIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAiMDA0MC1Vc2Utc3lzdGVtLXdpZGUtY3J5cHRvLXBvbGljeS5w YXRjaCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IjAwNDEtRG9jdW1lbnQtdGhlLW5ldy1kZWZhdWx0LWZvci1zc2xfY2lwaGVycy1pbi10aGUtbWFu LS5wYXRjaCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIjAwNDItV2hlbi1oYW5kbGluZy1GRUFULWNvbW1hbmQtY2hlY2stc3NsX3Rsc3YxXzEtYW5k LXNzbC5wYXRjaCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIjAwNDMtRW5hYmxlLW9ubHktVExTdjEuMi1ieS1kZWZhdWx0LnBhdGNoIgorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiMDA0NC1EaXNhYmxl LWFub255bW91c19lbmFibGUtaW4tZGVmYXVsdC1jb25maWctZmlsZS5wYXRjaCIKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIjAwNDUtRXhwYW5kLWV4 cGxhbmF0aW9uLW9mLWFzY2lpXy1vcHRpb25zLWJlaGF2aW91ci1pbi1tYS5wYXRjaCIKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIjAwNDYtdnNmdHBk LmNvbmYtUmVmZXItdG8tdGhlLW1hbi1wYWdlLXJlZ2FyZGluZy10aGUtYXNjaS5wYXRjaCIKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIjAwNDctRGlz YWJsZS10Y3Bfd3JhcHBlcnMtc3VwcG9ydC5wYXRjaCIKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIjAwNDgtRml4LWRlZmF1bHQtdmFsdWUtb2Ytc3Ry aWN0X3NzbF9yZWFkX2VvZi1pbi1tYW4tcGFnZS5wYXRjaCIKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIjAwNDktQWRkLW5ldy1maWxlbmFtZS1nZW5l cmF0aW9uLWFsZ29yaXRobS1mb3ItU1RPVS1jb21tYS5wYXRjaCIKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIjAwNTAtRG9uLXQtbGluay13aXRoLWxp Ym5zbC5wYXRjaCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIjAwNTEtSW1wcm92ZS1kb2N1bWVudGF0aW9uLW9mLWJldHRlcl9zdG91LWluLXRoZS1t YW4tcGFnZS5wYXRjaCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIjAwNTItRml4LXJETlMtd2l0aC1JUHY2LnBhdGNoIgorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiMDA1My1BbHdheXMtZG8tY2hkaXIt YWZ0ZXItY2hyb290LnBhdGNoIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAiMDA1NC12c2Zfc3lzdXRpbF9yY3Z0aW1lby1DaGVjay1yZXR1cm4tdmFs dWUtb2Ytc2V0c29ja29wLnBhdGNoIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAiMDA1NS12c2Zfc3lzdXRpbF9nZXRfdHotQ2hlY2stdGhlLXJldHVy bi12YWx1ZS1vZi1zeXNjYWxsLnBhdGNoIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAiMDA1Ni1Mb2ctZGllLWNhbGxzLXRvLXN5c2xvZy5wYXRjaCIK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIjAwNTct SW1wcm92ZS1lcnJvci1tZXNzYWdlLXdoZW4tbWF4LW51bWJlci1vZi1iaW5kLWF0dGVtcC5wYXRj aCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIjAw NTgtTWFrZS10aGUtbWF4LW51bWJlci1vZi1iaW5kLXJldHJpZXMtdHVuYWJsZS5wYXRjaCIKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIjAwNTktRml4 LVNFR0ZBVUxULXdoZW4tcnVubmluZy1pbi1hLWNvbnRhaW5lci1hcy1QSUQtMS5wYXRjaCIKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIjAwMDEtTW92 ZS1jbG9zaW5nLXN0YW5kYXJkLUZEcy1hZnRlci1saXN0ZW4ucGF0Y2giCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICIwMDAyLVByZXZlbnQtcmVjdXJz aW9uLWluLWJ1Zy5wYXRjaCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIjAwMDEtU2V0LXNfdXd0bXBfaW5zZXJ0ZWQtb25seS1hZnRlci1yZWNvcmQt aW5zZXJ0aW9uLXJlbS5wYXRjaCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIjAwMDItUmVwZWF0LXB1dHV0eGxpbmUtaWYtaXQtZmFpbHMtd2l0aC1F SU5UUi5wYXRjaCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIjAwMDMtUmVwZWF0LXB1dHV0eGxpbmUtdW50aWwtaXQtc3VjY2VlZHMtaWYtaXQtZmFp bHMtd2l0aC5wYXRjaCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIjAwMDEtRml4LXRpbWVzdGFtcC1oYW5kbGluZy1pbi1NRFRNLnBhdGNoIgorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiMDAwMS1SZW1v dmUtYS1oaW50LWFib3V0LXRoZS1mdHBfaG9tZV9kaXItU0VMaW51eC1ib29sZWFuLnBhdGNoIgor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICApKSkKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKG1hcCAobGFtYmRhICh4KSAoaW52b2tl ICJtdiIgKHN0cmluZy1hcHBlbmQgIi4vIiB4KSAidnNmdHBkLTMuMC4zLyIpKSBwYXRjaGVzKQor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoY2hkaXIgIi4vdnNmdHBkLTMuMC4z IikKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGludm9rZSAiZ2l0IiAiaW5p dCIgIi4iKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoaW52b2tlICJnaXQi ICJjb25maWciICJ1c2VyLmVtYWlsIiAieW91QGV4YW1wbGUuY29tIikKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgKGludm9rZSAiZ2l0IiAiY29uZmlnIiAidXNlci5uYW1lIiAi WW91ciBOYW1lIiApCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChpbnZva2Ug ImdpdCIgImFkZCIgIi4iKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoaW52 b2tlICJnaXQiICJjb21taXQiICItbSIgImZpcnN0IikKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgKG1hcCAobGFtYmRhICh4KSAoaW52b2tlICJnaXQiICJhbSIgKHN0cmluZy1h cHBlbmQgIi4vIiB4KSkpIHBhdGNoZXMpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIChtYXAgKGxhbWJkYSAoeCkgKGludm9rZSAicm0iIChzdHJpbmctYXBwZW5kICIuLyIgeCkp KSBwYXRjaGVzKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoaW52b2tlICJy bSIgIi1yZiIgIi4vLmdpdCIpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChj aGRpciAiLi4vIikKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGludm9rZSAi bXYiICIuL3ZzZnRwZC0zLjAuMyIgIi4uLyIpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIChjaGRpciAiLi4vIikKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg KGludm9rZSAicm0iICItcmYiICIuL3ZzZnRwZC0zLjAuMy0zMi5lbDguc3JjLmNwaW8iKQorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoY2hkaXIgIi4vdnNmdHBkLTMuMC4zIikK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKQorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgI3QpKQorICAgICAgICAgICAgICAgICAgICAgIChhZGQtYmVmb3JlICdp bnN0YWxsICdta2RpcgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChsYW1iZGEq ICgjOmtleSBvdXRwdXRzICM6YWxsb3ctb3RoZXIta2V5cykKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIChsZXQgKChvdXQgKGFzc29jLXJlZiBvdXRwdXRzICJvdXQiKSkpCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChta2Rpci1wIG91dCkKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKG1rZGlyIChzdHJpbmctYXBwZW5kIG91 dCAiL3NiaW4iKSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKG1rZGly IChzdHJpbmctYXBwZW5kIG91dCAiL21hbiIpKQorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAobWtkaXIgKHN0cmluZy1hcHBlbmQgb3V0ICIvbWFuL21hbjUiKSkKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKG1rZGlyIChzdHJpbmctYXBwZW5kIG91 dCAiL21hbi9tYW44IikpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICN0 KSkpCisgICAgICAgICAgICAgICAgICAgICAgKGRlbGV0ZSAnY29uZmlndXJlKSkpKQorICAgIChu YXRpdmUtaW5wdXRzIGAoKCJvcGVuc3NsIiAsb3BlbnNzbCkKKyAgICAgICAgICAgICAgICAgICAg ICgibGludXgtcGFtIiAsbGludXgtcGFtKQorICAgICAgICAgICAgICAgICAgICAgKCJwN3ppcCIg LHA3emlwKQorICAgICAgICAgICAgICAgICAgICAgKCJjcGlvIiAsY3BpbykKKyAgICAgICAgICAg ICAgICAgICAgICgiZ2l0IiAsZ2l0LW1pbmltYWwpCisgICAgICAgICAgICAgICAgICAgICAoImxp YmNhcCIgLGxpYmNhcCkpKQogICAgIChzeW5vcHNpcyAidnNmdHBkIEZUUCBkYWVtb24iKQogICAg IChkZXNjcmlwdGlvbiAiQGNvbW1hbmR7dnNmdHBkfSBpcyBhIGRhZW1vbiB0aGF0IGxpc3RlbnMg b24gYSBUQ1Agc29ja2V0CiBmb3IgY2xpZW50cyBhbmQgZ2l2ZXMgdGhlbSBhY2Nlc3MgdG8gbG9j YWwgZmlsZXMgdmlhIEZpbGUgVHJhbnNmZXIKLS0gCjIuMzAuMgoK --=_62e48f7bb1b8b1216d33a61217f702be-- From unknown Sat Jun 14 05:07:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#47495] [PATCH] gnu: vsftpd: Use CentOS version and patches. Resent-From: david larsson Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 30 Mar 2021 09:21:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47495 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47495@debbugs.gnu.org Cc: Guix-patches Received: via spool by 47495-submit@debbugs.gnu.org id=B47495.161709605821697 (code B ref 47495); Tue, 30 Mar 2021 09:21:01 +0000 Received: (at 47495) by debbugs.gnu.org; 30 Mar 2021 09:20:58 +0000 Received: from localhost ([127.0.0.1]:50404 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lRAYS-0005ds-Sp for submit@debbugs.gnu.org; Tue, 30 Mar 2021 05:20:58 -0400 Received: from server0.selfhosted.xyz ([217.64.149.7]:48604) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lRAYP-0005db-By for 47495@debbugs.gnu.org; Tue, 30 Mar 2021 05:20:55 -0400 Received: from server0.selfhosted.xyz (localhost [127.0.0.1]) by server0.selfhosted.xyz (Postfix) with ESMTP id A97FC1CC324F; Tue, 30 Mar 2021 11:20:39 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=selfhosted.xyz; s=dkim; t=1617096046; bh=rkqJzHJSlVbgGL2zXNFsWzNyV2KLCKX3X/HmZrPFTcY=; h=Date:From:To:Cc:Subject:In-Reply-To:References; b=cIk0Xo78PND7OrgmCGQE5dPwLklWeFDt0h92azHoFP1M/UPoexwxzh1pfuPrABS93 aXsQ/jZSFTgRZS2V5Z4zofVpljumY72fbyzjgGtKLSzgc8MffL4Oh8tZkqwafPzYRg SrtgiID6nEJIF24FhHrUsiPaEino4OyNfugOyIUMRlpQtj9LbliZVO/Jk5uJtqfIFO XXJHhPH2DPTE6HggMuuikKE2p6llPvyyc0pW3hdOGrt67pBSLg+7Bm6obpHwboGRRb 2AJ+rUCSlL00TWd7PyqTxEV6A6TvmzHQJxpEs5hqUduo+XM/mau++AaOzX/m8KNgVp IKHxBOHFwZCNA== X-Fuglu-Suspect: f6ebba2e42f14ad1a2216a7043b6272f X-Fuglu-Spamstatus: NO Received: from webmail.selfhosted.xyz (office.selfhosted.xyz [192.168.1.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: mail@selfhosted.xyz) by server0.selfhosted.xyz (Postfix) with ESMTPSA; Tue, 30 Mar 2021 11:20:39 +0200 (CEST) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=_7cb1a1bec936e602efd9ecd58296d65e" Date: Tue, 30 Mar 2021 11:20:39 +0200 From: david larsson In-Reply-To: <14748028ccd69b0d3a767a70b5832a79@selfhosted.xyz> References: <14748028ccd69b0d3a767a70b5832a79@selfhosted.xyz> Message-ID: <08d5f3aefaeff390aa73a1e88bd64e13@selfhosted.xyz> X-Sender: david.larsson@selfhosted.xyz X-Spam-Score: 0.2 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.2 (/) --=_7cb1a1bec936e602efd9ecd58296d65e Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; format=flowed On 2021-03-30 09:52, david larsson wrote: > Hi, > the attached patch updates vsftpd so it can use tlsv1.2 etc. > > //David Sorry, that was the wrong patch that got attached. I have attached the correct one now, and pasted below: From 10868d1d6e705abc9e1d5744f6eea321f3dafc64 Mon Sep 17 00:00:00 2001 From: methuselah-0 Date: Tue, 30 Mar 2021 11:18:09 +0200 Subject: [PATCH] gnu: vsftpd: Use CentOS version and patches. * gnu/packages/ftp.scm (vftpd): Use CentOS version and patches. --- gnu/packages/ftp.scm | 185 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 150 insertions(+), 35 deletions(-) diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm index b178063556..1c2c8119c7 100644 --- a/gnu/packages/ftp.scm +++ b/gnu/packages/ftp.scm @@ -28,18 +28,21 @@ #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages check) + #:use-module (gnu packages cpio) #:use-module (gnu packages compression) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages libidn) + #:use-module (gnu packages linux) #:use-module (gnu packages ncurses) #:use-module (gnu packages nettle) #:use-module (gnu packages pkg-config) #:use-module (gnu packages readline) #:use-module (gnu packages sqlite) #:use-module (gnu packages tls) + #:use-module (gnu packages version-control) #:use-module (gnu packages wxwidgets) #:use-module (gnu packages xml)) @@ -251,40 +254,152 @@ directory comparison and more.") (properties '((upstream-name . "FileZilla"))))) (define-public vsftpd - (package - (name "vsftpd") - (version "3.0.3") - (source (origin - (method url-fetch) - (uri (string-append "https://security.appspot.com/downloads/" - name "-" version ".tar.gz")) - (sha256 - (base32 - "1xsyjn68k3fgm2incpb3lz2nikffl9by2safp994i272wvv2nkcx")))) - (build-system gnu-build-system) - (arguments - `(#:make-flags '("LDFLAGS=-lcrypt") - #:tests? #f ; No tests exist. - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-installation-directory - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "Makefile" - (("/usr") (assoc-ref outputs "out"))) - #t)) - (add-before 'install 'mkdir - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (mkdir-p out) - (mkdir (string-append out "/sbin")) - (mkdir (string-append out "/man")) - (mkdir (string-append out "/man/man5")) - (mkdir (string-append out "/man/man8")) - #t))) - (delete 'configure)))) - (synopsis "vsftpd FTP daemon") - (description "@command{vsftpd} is a daemon that listens on a TCP socket + (let ((version "3.0.3") + (revision "32") + (centos-version "8.3.2011")) + (package + (name "vsftpd") + (version version) + (source (origin + (method url-fetch) + (uri (string-append + "https://vault.centos.org/centos/" centos-version + "/AppStream/Source/SPackages/vsftpd-" version "-" + revision ".el8.src.rpm")) + (sha256 + (base32 + "1xl0kqcismf82hl99klqbvvpylpyk1yr1qjy5hd8f80cj4lyl0f4")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags '("LDFLAGS=-lcrypt -lssl -pie") + #:tests? #f ; No tests exist. + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-installation-directory + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "Makefile" + (("/usr") (assoc-ref outputs "out"))) + #t)) + (replace 'unpack + (lambda* (#:key source #:allow-other-keys) + (let ((version "3.0.3") + (revision "32") + (centos-version "8.3.2011")) + + (invoke "7z" "e" source (string-append "-o" "./vsftpd-" + version "-" + revision ".el8.src.cpio")) + (chdir (string-append "./vsftpd-" version "-" + revision ".el8.src.cpio")) + (invoke "cpio" "-idmv" (string-append "--file=./vsftpd-" + version "-" + revision ".el8.src.cpio")) + (invoke "tar" "xvf" (string-append "./vsftpd-" version ".tar.gz")) + (let ((patches + '("0001-Don-t-use-the-provided-script-to-locate-libraries.patch" + "0002-Enable-build-with-SSL.patch" + "0003-Enable-build-with-TCP-Wrapper.patch" + "0004-Use-etc-vsftpd-dir-for-config-files-instead-of-etc.patch" + "0005-Use-hostname-when-calling-PAM-authentication-module.patch" + "0006-Close-stdin-out-err-before-listening-for-incoming-co.patch" + "0007-Make-filename-filters-smarter.patch" + "0008-Write-denied-logins-into-the-log.patch" + "0009-Trim-whitespaces-when-reading-configuration.patch" + "0010-Improve-daemonizing.patch" + "0011-Fix-listing-with-more-than-one-star.patch" + "0012-Replace-syscall-__NR_clone-.-with-clone.patch" + "0013-Extend-man-pages-with-systemd-info.patch" + "0014-Add-support-for-square-brackets-in-ls.patch" + "0015-Listen-on-IPv6-by-default.patch" + "0016-Increase-VSFTP_AS_LIMIT-from-200UL-to-400UL.patch" + "0017-Fix-an-issue-with-timestamps-during-DST.patch" + "0018-Change-the-default-log-file-in-configuration.patch" + "0019-Introduce-reverse_lookup_enable-option.patch" + "0020-Use-unsigned-int-for-uid-and-gid-representation.patch" + "0021-Introduce-support-for-DHE-based-cipher-suites.patch" + "0022-Introduce-support-for-EDDHE-based-cipher-suites.patch" + "0023-Add-documentation-for-isolate_-options.-Correct-defa.patch" + "0024-Introduce-new-return-value-450.patch" + "0025-Improve-local_max_rate-option.patch" + "0026-Prevent-hanging-in-SIGCHLD-handler.patch" + "0027-Delete-files-when-upload-fails.patch" + "0028-Fix-man-page-rendering.patch" + "0029-Fix-segfault-in-config-file-parser.patch" + "0030-Fix-logging-into-syslog-when-enabled-in-config.patch" + "0031-Fix-question-mark-wildcard-withing-a-file-name.patch" + "0032-Propagate-errors-from-nfs-with-quota-to-client.patch" + "0033-Introduce-TLSv1.1-and-TLSv1.2-options.patch" + "0034-Turn-off-seccomp-sandbox-because-it-is-too-strict.patch" + "0035-Modify-DH-enablement-patch-to-build-with-OpenSSL-1.1.patch" + "0036-Redefine-VSFTP_COMMAND_FD-to-1.patch" + "0037-Document-the-relationship-of-text_userdb_names-and-c.patch" + "0038-Document-allow_writeable_chroot-in-the-man-page.patch" + "0039-Improve-documentation-of-ASCII-mode-in-the-man-page.patch" + "0040-Use-system-wide-crypto-policy.patch" + "0041-Document-the-new-default-for-ssl_ciphers-in-the-man-.patch" + "0042-When-handling-FEAT-command-check-ssl_tlsv1_1-and-ssl.patch" + "0043-Enable-only-TLSv1.2-by-default.patch" + "0044-Disable-anonymous_enable-in-default-config-file.patch" + "0045-Expand-explanation-of-ascii_-options-behaviour-in-ma.patch" + "0046-vsftpd.conf-Refer-to-the-man-page-regarding-the-asci.patch" + "0047-Disable-tcp_wrappers-support.patch" + "0048-Fix-default-value-of-strict_ssl_read_eof-in-man-page.patch" + "0049-Add-new-filename-generation-algorithm-for-STOU-comma.patch" + "0050-Don-t-link-with-libnsl.patch" + "0051-Improve-documentation-of-better_stou-in-the-man-page.patch" + "0052-Fix-rDNS-with-IPv6.patch" + "0053-Always-do-chdir-after-chroot.patch" + "0054-vsf_sysutil_rcvtimeo-Check-return-value-of-setsockop.patch" + "0055-vsf_sysutil_get_tz-Check-the-return-value-of-syscall.patch" + "0056-Log-die-calls-to-syslog.patch" + "0057-Improve-error-message-when-max-number-of-bind-attemp.patch" + "0058-Make-the-max-number-of-bind-retries-tunable.patch" + "0059-Fix-SEGFAULT-when-running-in-a-container-as-PID-1.patch" + "0001-Move-closing-standard-FDs-after-listen.patch" + "0002-Prevent-recursion-in-bug.patch" + "0001-Set-s_uwtmp_inserted-only-after-record-insertion-rem.patch" + "0002-Repeat-pututxline-if-it-fails-with-EINTR.patch" + "0003-Repeat-pututxline-until-it-succeeds-if-it-fails-with.patch" + "0001-Fix-timestamp-handling-in-MDTM.patch" + "0001-Remove-a-hint-about-the-ftp_home_dir-SELinux-boolean.patch"))) + (map (lambda (x) (invoke "mv" (string-append "./" x) + (string-append "vsftpd-" version "/"))) + patches) + (chdir (string-append "./vsftpd-" version)) + (invoke "git" "init" ".") + (invoke "git" "config" "user.email" "you@example.com") + (invoke "git" "config" "user.name" "Your Name" ) + (invoke "git" "add" ".") + (invoke "git" "commit" "-m" "first") + (map (lambda (x) (invoke "git" "am" (string-append "./" x))) patches) + (map (lambda (x) (invoke "rm" (string-append "./" x))) patches) + (invoke "rm" "-rf" "./.git") + (chdir "../") + (invoke "mv" (string-append "./vsftpd-" version) "../") + (chdir "../") + (invoke "rm" "-rf" (string-append "./vsftpd-" version "-" + revision ".el8.src.cpio")) + (chdir (string-append "./vsftpd-" version))) + #t))) + (add-before 'install 'mkdirFrom 10868d1d6e705abc9e1d5744f6eea321f3dafc64 Mon Sep 17 00:00:00 2001 From: methuselah-0 Date: Tue, 30 Mar 2021 11:18:09 +0200 Subject: [PATCH] gnu: vsftpd: Use CentOS version and patches. * gnu/packages/ftp.scm (vftpd): Use CentOS version and patches. --- gnu/packages/ftp.scm | 185 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 150 insertions(+), 35 deletions(-) diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm index b178063556..1c2c8119c7 100644 --- a/gnu/packages/ftp.scm +++ b/gnu/packages/ftp.scm @@ -28,18 +28,21 @@ #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages check) + #:use-module (gnu packages cpio) #:use-module (gnu packages compression) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages libidn) + #:use-module (gnu packages linux) #:use-module (gnu packages ncurses) #:use-module (gnu packages nettle) #:use-module (gnu packages pkg-config) #:use-module (gnu packages readline) #:use-module (gnu packages sqlite) #:use-module (gnu packages tls) + #:use-module (gnu packages version-control) #:use-module (gnu packages wxwidgets) #:use-module (gnu packages xml)) @@ -251,40 +254,152 @@ directory comparison and more.") (properties '((upstream-name . "FileZilla"))))) (define-public vsftpd - (package - (name "vsftpd") - (version "3.0.3") - (source (origin - (method url-fetch) - (uri (string-append "https://security.appspot.com/downloads/" - name "-" version ".tar.gz")) - (sha256 - (base32 - "1xsyjn68k3fgm2incpb3lz2nikffl9by2safp994i272wvv2nkcx")))) - (build-system gnu-build-system) - (arguments - `(#:make-flags '("LDFLAGS=-lcrypt") - #:tests? #f ; No tests exist. - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-installation-directory - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "Makefile" - (("/usr") (assoc-ref outputs "out"))) - #t)) - (add-before 'install 'mkdir - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (mkdir-p out) - (mkdir (string-append out "/sbin")) - (mkdir (string-append out "/man")) - (mkdir (string-append out "/man/man5")) - (mkdir (string-append out "/man/man8")) - #t))) - (delete 'configure)))) - (synopsis "vsftpd FTP daemon") - (description "@command{vsftpd} is a daemon that listens on a TCP socket + (let ((version "3.0.3") + (revision "32") + (centos-version "8.3.2011")) + (package + (name "vsftpd") + (version version) + (source (origin + (method url-fetch) + (uri (string-append + "https://vault.centos.org/centos/" centos-version + "/AppStream/Source/SPackages/vsftpd-" version "-" + revision ".el8.src.rpm")) + (sha256 + (base32 + "1xl0kqcismf82hl99klqbvvpylpyk1yr1qjy5hd8f80cj4lyl0f4")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags '("LDFLAGS=-lcrypt -lssl -pie") + #:tests? #f ; No tests exist. + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-installation-directory + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "Makefile" + (("/usr") (assoc-ref outputs "out"))) + #t)) + (replace 'unpack + (lambda* (#:key source #:allow-other-keys) + (let ((version "3.0.3") + (revision "32") + (centos-version "8.3.2011")) + + (invoke "7z" "e" source (string-append "-o" "./vsftpd-" + version "-" + revision ".el8.src.cpio")) + (chdir (string-append "./vsftpd-" version "-" + revision ".el8.src.cpio")) + (invoke "cpio" "-idmv" (string-append "--file=./vsftpd-" + version "-" + revision ".el8.src.cpio")) + (invoke "tar" "xvf" (string-append "./vsftpd-" version ".tar.gz")) + (let ((patches + '("0001-Don-t-use-the-provided-script-to-locate-libraries.patch" + "0002-Enable-build-with-SSL.patch" + "0003-Enable-build-with-TCP-Wrapper.patch" + "0004-Use-etc-vsftpd-dir-for-config-files-instead-of-etc.patch" + "0005-Use-hostname-when-calling-PAM-authentication-module.patch" + "0006-Close-stdin-out-err-before-listening-for-incoming-co.patch" + "0007-Make-filename-filters-smarter.patch" + "0008-Write-denied-logins-into-the-log.patch" + "0009-Trim-whitespaces-when-reading-configuration.patch" + "0010-Improve-daemonizing.patch" + "0011-Fix-listing-with-more-than-one-star.patch" + "0012-Replace-syscall-__NR_clone-.-with-clone.patch" + "0013-Extend-man-pages-with-systemd-info.patch" + "0014-Add-support-for-square-brackets-in-ls.patch" + "0015-Listen-on-IPv6-by-default.patch" + "0016-Increase-VSFTP_AS_LIMIT-from-200UL-to-400UL.patch" + "0017-Fix-an-issue-with-timestamps-during-DST.patch" + "0018-Change-the-default-log-file-in-configuration.patch" + "0019-Introduce-reverse_lookup_enable-option.patch" + "0020-Use-unsigned-int-for-uid-and-gid-representation.patch" + "0021-Introduce-support-for-DHE-based-cipher-suites.patch" + "0022-Introduce-support-for-EDDHE-based-cipher-suites.patch" + "0023-Add-documentation-for-isolate_-options.-Correct-defa.patch" + "0024-Introduce-new-return-value-450.patch" + "0025-Improve-local_max_rate-option.patch" + "0026-Prevent-hanging-in-SIGCHLD-handler.patch" + "0027-Delete-files-when-upload-fails.patch" + "0028-Fix-man-page-rendering.patch" + "0029-Fix-segfault-in-config-file-parser.patch" + "0030-Fix-logging-into-syslog-when-enabled-in-config.patch" + "0031-Fix-question-mark-wildcard-withing-a-file-name.patch" + "0032-Propagate-errors-from-nfs-with-quota-to-client.patch" + "0033-Introduce-TLSv1.1-and-TLSv1.2-options.patch" + "0034-Turn-off-seccomp-sandbox-because-it-is-too-strict.patch" + "0035-Modify-DH-enablement-patch-to-build-with-OpenSSL-1.1.patch" + "0036-Redefine-VSFTP_COMMAND_FD-to-1.patch" + "0037-Document-the-relationship-of-text_userdb_names-and-c.patch" + "0038-Document-allow_writeable_chroot-in-the-man-page.patch" + "0039-Improve-documentation-of-ASCII-mode-in-the-man-page.patch" + "0040-Use-system-wide-crypto-policy.patch" + "0041-Document-the-new-default-for-ssl_ciphers-in-the-man-.patch" + "0042-When-handling-FEAT-command-check-ssl_tlsv1_1-and-ssl.patch" + "0043-Enable-only-TLSv1.2-by-default.patch" + "0044-Disable-anonymous_enable-in-default-config-file.patch" + "0045-Expand-explanation-of-ascii_-options-behaviour-in-ma.patch" + "0046-vsftpd.conf-Refer-to-the-man-page-regarding-the-asci.patch" + "0047-Disable-tcp_wrappers-support.patch" + "0048-Fix-default-value-of-strict_ssl_read_eof-in-man-page.patch" + "0049-Add-new-filename-generation-algorithm-for-STOU-comma.patch" + "0050-Don-t-link-with-libnsl.patch" + "0051-Improve-documentation-of-better_stou-in-the-man-page.patch" + "0052-Fix-rDNS-with-IPv6.patch" + "0053-Always-do-chdir-after-chroot.patch" + "0054-vsf_sysutil_rcvtimeo-Check-return-value-of-setsockop.patch" + "0055-vsf_sysutil_get_tz-Check-the-return-value-of-syscall.patch" + "0056-Log-die-calls-to-syslog.patch" + "0057-Improve-error-message-when-max-number-of-bind-attemp.patch" + "0058-Make-the-max-number-of-bind-retries-tunable.patch" + "0059-Fix-SEGFAULT-when-running-in-a-container-as-PID-1.patch" + "0001-Move-closing-standard-FDs-after-listen.patch" + "0002-Prevent-recursion-in-bug.patch" + "0001-Set-s_uwtmp_inserted-only-after-record-insertion-rem.patch" + "0002-Repeat-pututxline-if-it-fails-with-EINTR.patch" + "0003-Repeat-pututxline-until-it-succeeds-if-it-fails-with.patch" + "0001-Fix-timestamp-handling-in-MDTM.patch" + "0001-Remove-a-hint-about-the-ftp_home_dir-SELinux-boolean.patch"))) + (map (lambda (x) (invoke "mv" (string-append "./" x) + (string-append "vsftpd-" version "/"))) + patches) + (chdir (string-append "./vsftpd-" version)) + (invoke "git" "init" ".") + (invoke "git" "config" "user.email" "you@example.com") + (invoke "git" "config" "user.name" "Your Name" ) + (invoke "git" "add" ".") + (invoke "git" "commit" "-m" "first") + (map (lambda (x) (invoke "git" "am" (string-append "./" x))) patches) + (map (lambda (x) (invoke "rm" (string-append "./" x))) patches) + (invoke "rm" "-rf" "./.git") + (chdir "../") + (invoke "mv" (string-append "./vsftpd-" version) "../") + (chdir "../") + (invoke "rm" "-rf" (string-append "./vsftpd-" version "-" + revision ".el8.src.cpio")) + (chdir (string-append "./vsftpd-" version))) + #t))) + (add-before 'install 'mkdir + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (mkdir-p out) + (mkdir (string-append out "/sbin")) + (mkdir (string-append out "/man")) + (mkdir (string-append out "/man/man5")) + (mkdir (string-append out "/man/man8")) + #t))) + (delete 'configure)))) + (native-inputs `(("openssl" ,openssl) + ("linux-pam" ,linux-pam) + ("p7zip" ,p7zip) + ("cpio" ,cpio) + ("git" ,git-minimal) + ("libcap" ,libcap))) + (synopsis "Share files securely over FTP or FTPS") + (description "@command{vsftpd} is a daemon that listens on a TCP socket for clients and gives them access to local files via File Transfer Protocol.") - (home-page "https://security.appspot.com/vsftpd.html") - (license gpl2))) + (home-page "https://security.appspot.com/vsftpd.html") + (license gpl2)))) -- 2.30.2 + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (mkdir-p out) + (mkdir (string-append out "/sbin")) + (mkdir (string-append out "/man")) + (mkdir (string-append out "/man/man5")) + (mkdir (string-append out "/man/man8")) + #t))) + (delete 'configure)))) + (native-inputs `(("openssl" ,openssl) + ("linux-pam" ,linux-pam) + ("p7zip" ,p7zip) + ("cpio" ,cpio) + ("git" ,git-minimal) + ("libcap" ,libcap))) + (synopsis "Share files securely over FTP or FTPS") + (description "@command{vsftpd} is a daemon that listens on a TCP socket for clients and gives them access to local files via File Transfer Protocol.") - (home-page "https://security.appspot.com/vsftpd.html") - (license gpl2))) + (home-page "https://security.appspot.com/vsftpd.html") + (license gpl2)))) -- 2.30.2 --=_7cb1a1bec936e602efd9ecd58296d65e Content-Transfer-Encoding: base64 Content-Type: text/x-diff; name=0001-gnu-vsftpd-Use-CentOS-version-and-patches.patch Content-Disposition: attachment; filename=0001-gnu-vsftpd-Use-CentOS-version-and-patches.patch; size=12287 RnJvbSAxMDg2OGQxZDZlNzA1YWJjOWUxZDU3NDRmNmVlYTMyMWYzZGFmYzY0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBtZXRodXNlbGFoLTAgPGRhdmlkLmxhcnNzb25Ac2VsZmhvc3Rl ZC54eXo+CkRhdGU6IFR1ZSwgMzAgTWFyIDIwMjEgMTE6MTg6MDkgKzAyMDAKU3ViamVjdDogW1BB VENIXSBnbnU6IHZzZnRwZDogVXNlIENlbnRPUyB2ZXJzaW9uIGFuZCBwYXRjaGVzLgoKICAgICog Z251L3BhY2thZ2VzL2Z0cC5zY20gKHZmdHBkKTogVXNlIENlbnRPUyB2ZXJzaW9uIGFuZCBwYXRj aGVzLgotLS0KIGdudS9wYWNrYWdlcy9mdHAuc2NtIHwgMTg1ICsrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxNTAgaW5zZXJ0aW9ucygr KSwgMzUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZ251L3BhY2thZ2VzL2Z0cC5zY20gYi9n bnUvcGFja2FnZXMvZnRwLnNjbQppbmRleCBiMTc4MDYzNTU2Li4xYzJjODExOWM3IDEwMDY0NAot LS0gYS9nbnUvcGFja2FnZXMvZnRwLnNjbQorKysgYi9nbnUvcGFja2FnZXMvZnRwLnNjbQpAQCAt MjgsMTggKzI4LDIxIEBACiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzKQogICAjOnVzZS1t b2R1bGUgKGdudSBwYWNrYWdlcyBhdXRvdG9vbHMpCiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2th Z2VzIGNoZWNrKQorICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBjcGlvKQogICAjOnVzZS1t b2R1bGUgKGdudSBwYWNrYWdlcyBjb21wcmVzc2lvbikKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFj a2FnZXMgZnJlZWRlc2t0b3ApCiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIGdldHRleHQp CiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIGdsaWIpCiAgICM6dXNlLW1vZHVsZSAoZ251 IHBhY2thZ2VzIGd0aykKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgbGliaWRuKQorICAj OnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBsaW51eCkKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFj a2FnZXMgbmN1cnNlcykKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgbmV0dGxlKQogICAj OnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBwa2ctY29uZmlnKQogICAjOnVzZS1tb2R1bGUgKGdu dSBwYWNrYWdlcyByZWFkbGluZSkKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgc3FsaXRl KQogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyB0bHMpCisgICM6dXNlLW1vZHVsZSAoZ251 IHBhY2thZ2VzIHZlcnNpb24tY29udHJvbCkKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMg d3h3aWRnZXRzKQogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyB4bWwpKQogCkBAIC0yNTEs NDAgKzI1NCwxNTIgQEAgZGlyZWN0b3J5IGNvbXBhcmlzb24gYW5kIG1vcmUuIikKICAgICAocHJv cGVydGllcyAnKCh1cHN0cmVhbS1uYW1lIC4gIkZpbGVaaWxsYSIpKSkpKQogCiAoZGVmaW5lLXB1 YmxpYyB2c2Z0cGQKLSAgKHBhY2thZ2UKLSAgICAobmFtZSAidnNmdHBkIikKLSAgICAodmVyc2lv biAiMy4wLjMiKQotICAgIChzb3VyY2UgKG9yaWdpbgotICAgICAgICAgICAgICAobWV0aG9kIHVy bC1mZXRjaCkKLSAgICAgICAgICAgICAgKHVyaSAoc3RyaW5nLWFwcGVuZCAiaHR0cHM6Ly9zZWN1 cml0eS5hcHBzcG90LmNvbS9kb3dubG9hZHMvIgotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIG5hbWUgIi0iIHZlcnNpb24gIi50YXIuZ3oiKSkKLSAgICAgICAgICAgICAgKHNoYTI1 NgotICAgICAgICAgICAgICAgKGJhc2UzMgotICAgICAgICAgICAgICAgICIxeHN5am42OGszZmdt MmluY3BiM2x6Mm5pa2ZmbDlieTJzYWZwOTk0aTI3Mnd2djJua2N4IikpKSkKLSAgICAoYnVpbGQt c3lzdGVtIGdudS1idWlsZC1zeXN0ZW0pCi0gICAgKGFyZ3VtZW50cwotICAgICBgKCM6bWFrZS1m bGFncyAnKCJMREZMQUdTPS1sY3J5cHQiKQotICAgICAgICM6dGVzdHM/ICNmICAgICAgICAgICAg ICAgICAgICAgIDsgTm8gdGVzdHMgZXhpc3QuCi0gICAgICAgIzpwaGFzZXMKLSAgICAgICAobW9k aWZ5LXBoYXNlcyAlc3RhbmRhcmQtcGhhc2VzCi0gICAgICAgICAoYWRkLWFmdGVyICd1bnBhY2sg J3BhdGNoLWluc3RhbGxhdGlvbi1kaXJlY3RvcnkKLSAgICAgICAgICAgKGxhbWJkYSogKCM6a2V5 IG91dHB1dHMgIzphbGxvdy1vdGhlci1rZXlzKQotICAgICAgICAgICAgIChzdWJzdGl0dXRlKiAi TWFrZWZpbGUiCi0gICAgICAgICAgICAgICAoKCIvdXNyIikgKGFzc29jLXJlZiBvdXRwdXRzICJv dXQiKSkpCi0gICAgICAgICAgICAgI3QpKQotICAgICAgICAgKGFkZC1iZWZvcmUgJ2luc3RhbGwg J21rZGlyCi0gICAgICAgICAgIChsYW1iZGEqICgjOmtleSBvdXRwdXRzICM6YWxsb3ctb3RoZXIt a2V5cykKLSAgICAgICAgICAgICAobGV0ICgob3V0IChhc3NvYy1yZWYgb3V0cHV0cyAib3V0Iikp KQotICAgICAgICAgICAgICAgKG1rZGlyLXAgb3V0KQotICAgICAgICAgICAgICAgKG1rZGlyIChz dHJpbmctYXBwZW5kIG91dCAiL3NiaW4iKSkKLSAgICAgICAgICAgICAgIChta2RpciAoc3RyaW5n LWFwcGVuZCBvdXQgIi9tYW4iKSkKLSAgICAgICAgICAgICAgIChta2RpciAoc3RyaW5nLWFwcGVu ZCBvdXQgIi9tYW4vbWFuNSIpKQotICAgICAgICAgICAgICAgKG1rZGlyIChzdHJpbmctYXBwZW5k IG91dCAiL21hbi9tYW44IikpCi0gICAgICAgICAgICAgICAjdCkpKQotICAgICAgICAgKGRlbGV0 ZSAnY29uZmlndXJlKSkpKQotICAgIChzeW5vcHNpcyAidnNmdHBkIEZUUCBkYWVtb24iKQotICAg IChkZXNjcmlwdGlvbiAiQGNvbW1hbmR7dnNmdHBkfSBpcyBhIGRhZW1vbiB0aGF0IGxpc3RlbnMg b24gYSBUQ1Agc29ja2V0CisgIChsZXQgKCh2ZXJzaW9uICIzLjAuMyIpCisgICAgICAgIChyZXZp c2lvbiAiMzIiKQorICAgICAgICAoY2VudG9zLXZlcnNpb24gIjguMy4yMDExIikpCisgICAgKHBh Y2thZ2UKKyAgICAgIChuYW1lICJ2c2Z0cGQiKQorICAgICAgKHZlcnNpb24gdmVyc2lvbikKKyAg ICAgIChzb3VyY2UgKG9yaWdpbgorICAgICAgICAgICAgICAgIChtZXRob2QgdXJsLWZldGNoKQor ICAgICAgICAgICAgICAgICh1cmkgKHN0cmluZy1hcHBlbmQKKyAgICAgICAgICAgICAgICAgICAg ICAiaHR0cHM6Ly92YXVsdC5jZW50b3Mub3JnL2NlbnRvcy8iIGNlbnRvcy12ZXJzaW9uCisgICAg ICAgICAgICAgICAgICAgICAgIi9BcHBTdHJlYW0vU291cmNlL1NQYWNrYWdlcy92c2Z0cGQtIiB2 ZXJzaW9uICItIgorICAgICAgICAgICAgICAgICAgICAgIHJldmlzaW9uICIuZWw4LnNyYy5ycG0i KSkKKyAgICAgICAgICAgICAgICAoc2hhMjU2CisgICAgICAgICAgICAgICAgIChiYXNlMzIKKyAg ICAgICAgICAgICAgICAgICIxeGwwa3FjaXNtZjgyaGw5OWtscWJ2dnB5bHB5azF5cjFxank1aGQ4 ZjgwY2o0bHlsMGY0IikpKSkKKyAgICAgIChidWlsZC1zeXN0ZW0gZ251LWJ1aWxkLXN5c3RlbSkK KyAgICAgIChhcmd1bWVudHMKKyAgICAgICBgKCM6bWFrZS1mbGFncyAnKCJMREZMQUdTPS1sY3J5 cHQgLWxzc2wgLXBpZSIpCisgICAgICAgICAjOnRlc3RzPyAjZiAgICAgICAgICAgICAgICAgICAg OyBObyB0ZXN0cyBleGlzdC4KKyAgICAgICAgICM6cGhhc2VzCisgICAgICAgICAobW9kaWZ5LXBo YXNlcyAlc3RhbmRhcmQtcGhhc2VzCisgICAgICAgICAgIChhZGQtYWZ0ZXIgJ3VucGFjayAncGF0 Y2gtaW5zdGFsbGF0aW9uLWRpcmVjdG9yeQorICAgICAgICAgICAgIChsYW1iZGEqICgjOmtleSBv dXRwdXRzICM6YWxsb3ctb3RoZXIta2V5cykKKyAgICAgICAgICAgICAgIChzdWJzdGl0dXRlKiAi TWFrZWZpbGUiCisgICAgICAgICAgICAgICAgICgoIi91c3IiKSAoYXNzb2MtcmVmIG91dHB1dHMg Im91dCIpKSkKKyAgICAgICAgICAgICAgICN0KSkKKyAgICAgICAgICAgKHJlcGxhY2UgJ3VucGFj aworICAgICAgICAgICAgIChsYW1iZGEqICgjOmtleSBzb3VyY2UgIzphbGxvdy1vdGhlci1rZXlz KQorICAgICAgICAgICAgICAgICAobGV0ICgodmVyc2lvbiAiMy4wLjMiKQorICAgICAgICAgICAg ICAgICAgICAgICAocmV2aXNpb24gIjMyIikKKyAgICAgICAgICAgICAgICAgICAgICAgKGNlbnRv cy12ZXJzaW9uICI4LjMuMjAxMSIpKQorCisgICAgICAgICAgICAgICAgICAgKGludm9rZSAiN3oi ICJlIiBzb3VyY2UgKHN0cmluZy1hcHBlbmQgIi1vIiAiLi92c2Z0cGQtIgorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHZlcnNpb24gIi0i CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgcmV2aXNpb24gIi5lbDguc3JjLmNwaW8iKSkKKyAgICAgICAgICAgICAgICAgICAoY2hkaXIg KHN0cmluZy1hcHBlbmQgIi4vdnNmdHBkLSIgdmVyc2lvbiAiLSIKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgcmV2aXNpb24gIi5lbDguc3JjLmNwaW8iKSkKKyAgICAg ICAgICAgICAgICAgICAoaW52b2tlICJjcGlvIiAiLWlkbXYiIChzdHJpbmctYXBwZW5kICItLWZp bGU9Li92c2Z0cGQtIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgdmVyc2lvbiAiLSIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJldmlzaW9uICIuZWw4LnNyYy5jcGlvIikpCisg ICAgICAgICAgICAgICAgICAgKGludm9rZSAidGFyIiAieHZmIiAoc3RyaW5nLWFwcGVuZCAiLi92 c2Z0cGQtIiB2ZXJzaW9uICIudGFyLmd6IikpCisgICAgICAgICAgICAgICAgICAgKGxldCAoKHBh dGNoZXMKKyAgICAgICAgICAgICAgICAgICAgJygiMDAwMS1Eb24tdC11c2UtdGhlLXByb3ZpZGVk LXNjcmlwdC10by1sb2NhdGUtbGlicmFyaWVzLnBhdGNoIgorICAgICAgICAgICAgICAgICAgICAg ICIwMDAyLUVuYWJsZS1idWlsZC13aXRoLVNTTC5wYXRjaCIKKyAgICAgICAgICAgICAgICAgICAg ICAiMDAwMy1FbmFibGUtYnVpbGQtd2l0aC1UQ1AtV3JhcHBlci5wYXRjaCIKKyAgICAgICAgICAg ICAgICAgICAgICAiMDAwNC1Vc2UtZXRjLXZzZnRwZC1kaXItZm9yLWNvbmZpZy1maWxlcy1pbnN0 ZWFkLW9mLWV0Yy5wYXRjaCIKKyAgICAgICAgICAgICAgICAgICAgICAiMDAwNS1Vc2UtaG9zdG5h bWUtd2hlbi1jYWxsaW5nLVBBTS1hdXRoZW50aWNhdGlvbi1tb2R1bGUucGF0Y2giCisgICAgICAg ICAgICAgICAgICAgICAgIjAwMDYtQ2xvc2Utc3RkaW4tb3V0LWVyci1iZWZvcmUtbGlzdGVuaW5n LWZvci1pbmNvbWluZy1jby5wYXRjaCIKKyAgICAgICAgICAgICAgICAgICAgICAiMDAwNy1NYWtl LWZpbGVuYW1lLWZpbHRlcnMtc21hcnRlci5wYXRjaCIKKyAgICAgICAgICAgICAgICAgICAgICAi MDAwOC1Xcml0ZS1kZW5pZWQtbG9naW5zLWludG8tdGhlLWxvZy5wYXRjaCIKKyAgICAgICAgICAg ICAgICAgICAgICAiMDAwOS1UcmltLXdoaXRlc3BhY2VzLXdoZW4tcmVhZGluZy1jb25maWd1cmF0 aW9uLnBhdGNoIgorICAgICAgICAgICAgICAgICAgICAgICIwMDEwLUltcHJvdmUtZGFlbW9uaXpp bmcucGF0Y2giCisgICAgICAgICAgICAgICAgICAgICAgIjAwMTEtRml4LWxpc3Rpbmctd2l0aC1t b3JlLXRoYW4tb25lLXN0YXIucGF0Y2giCisgICAgICAgICAgICAgICAgICAgICAgIjAwMTItUmVw bGFjZS1zeXNjYWxsLV9fTlJfY2xvbmUtLi13aXRoLWNsb25lLnBhdGNoIgorICAgICAgICAgICAg ICAgICAgICAgICIwMDEzLUV4dGVuZC1tYW4tcGFnZXMtd2l0aC1zeXN0ZW1kLWluZm8ucGF0Y2gi CisgICAgICAgICAgICAgICAgICAgICAgIjAwMTQtQWRkLXN1cHBvcnQtZm9yLXNxdWFyZS1icmFj a2V0cy1pbi1scy5wYXRjaCIKKyAgICAgICAgICAgICAgICAgICAgICAiMDAxNS1MaXN0ZW4tb24t SVB2Ni1ieS1kZWZhdWx0LnBhdGNoIgorICAgICAgICAgICAgICAgICAgICAgICIwMDE2LUluY3Jl YXNlLVZTRlRQX0FTX0xJTUlULWZyb20tMjAwVUwtdG8tNDAwVUwucGF0Y2giCisgICAgICAgICAg ICAgICAgICAgICAgIjAwMTctRml4LWFuLWlzc3VlLXdpdGgtdGltZXN0YW1wcy1kdXJpbmctRFNU LnBhdGNoIgorICAgICAgICAgICAgICAgICAgICAgICIwMDE4LUNoYW5nZS10aGUtZGVmYXVsdC1s b2ctZmlsZS1pbi1jb25maWd1cmF0aW9uLnBhdGNoIgorICAgICAgICAgICAgICAgICAgICAgICIw MDE5LUludHJvZHVjZS1yZXZlcnNlX2xvb2t1cF9lbmFibGUtb3B0aW9uLnBhdGNoIgorICAgICAg ICAgICAgICAgICAgICAgICIwMDIwLVVzZS11bnNpZ25lZC1pbnQtZm9yLXVpZC1hbmQtZ2lkLXJl cHJlc2VudGF0aW9uLnBhdGNoIgorICAgICAgICAgICAgICAgICAgICAgICIwMDIxLUludHJvZHVj ZS1zdXBwb3J0LWZvci1ESEUtYmFzZWQtY2lwaGVyLXN1aXRlcy5wYXRjaCIKKyAgICAgICAgICAg ICAgICAgICAgICAiMDAyMi1JbnRyb2R1Y2Utc3VwcG9ydC1mb3ItRURESEUtYmFzZWQtY2lwaGVy LXN1aXRlcy5wYXRjaCIKKyAgICAgICAgICAgICAgICAgICAgICAiMDAyMy1BZGQtZG9jdW1lbnRh dGlvbi1mb3ItaXNvbGF0ZV8tb3B0aW9ucy4tQ29ycmVjdC1kZWZhLnBhdGNoIgorICAgICAgICAg ICAgICAgICAgICAgICIwMDI0LUludHJvZHVjZS1uZXctcmV0dXJuLXZhbHVlLTQ1MC5wYXRjaCIK KyAgICAgICAgICAgICAgICAgICAgICAiMDAyNS1JbXByb3ZlLWxvY2FsX21heF9yYXRlLW9wdGlv bi5wYXRjaCIKKyAgICAgICAgICAgICAgICAgICAgICAiMDAyNi1QcmV2ZW50LWhhbmdpbmctaW4t U0lHQ0hMRC1oYW5kbGVyLnBhdGNoIgorICAgICAgICAgICAgICAgICAgICAgICIwMDI3LURlbGV0 ZS1maWxlcy13aGVuLXVwbG9hZC1mYWlscy5wYXRjaCIKKyAgICAgICAgICAgICAgICAgICAgICAi MDAyOC1GaXgtbWFuLXBhZ2UtcmVuZGVyaW5nLnBhdGNoIgorICAgICAgICAgICAgICAgICAgICAg ICIwMDI5LUZpeC1zZWdmYXVsdC1pbi1jb25maWctZmlsZS1wYXJzZXIucGF0Y2giCisgICAgICAg ICAgICAgICAgICAgICAgIjAwMzAtRml4LWxvZ2dpbmctaW50by1zeXNsb2ctd2hlbi1lbmFibGVk LWluLWNvbmZpZy5wYXRjaCIKKyAgICAgICAgICAgICAgICAgICAgICAiMDAzMS1GaXgtcXVlc3Rp b24tbWFyay13aWxkY2FyZC13aXRoaW5nLWEtZmlsZS1uYW1lLnBhdGNoIgorICAgICAgICAgICAg ICAgICAgICAgICIwMDMyLVByb3BhZ2F0ZS1lcnJvcnMtZnJvbS1uZnMtd2l0aC1xdW90YS10by1j bGllbnQucGF0Y2giCisgICAgICAgICAgICAgICAgICAgICAgIjAwMzMtSW50cm9kdWNlLVRMU3Yx LjEtYW5kLVRMU3YxLjItb3B0aW9ucy5wYXRjaCIKKyAgICAgICAgICAgICAgICAgICAgICAiMDAz NC1UdXJuLW9mZi1zZWNjb21wLXNhbmRib3gtYmVjYXVzZS1pdC1pcy10b28tc3RyaWN0LnBhdGNo IgorICAgICAgICAgICAgICAgICAgICAgICIwMDM1LU1vZGlmeS1ESC1lbmFibGVtZW50LXBhdGNo LXRvLWJ1aWxkLXdpdGgtT3BlblNTTC0xLjEucGF0Y2giCisgICAgICAgICAgICAgICAgICAgICAg IjAwMzYtUmVkZWZpbmUtVlNGVFBfQ09NTUFORF9GRC10by0xLnBhdGNoIgorICAgICAgICAgICAg ICAgICAgICAgICIwMDM3LURvY3VtZW50LXRoZS1yZWxhdGlvbnNoaXAtb2YtdGV4dF91c2VyZGJf bmFtZXMtYW5kLWMucGF0Y2giCisgICAgICAgICAgICAgICAgICAgICAgIjAwMzgtRG9jdW1lbnQt YWxsb3dfd3JpdGVhYmxlX2Nocm9vdC1pbi10aGUtbWFuLXBhZ2UucGF0Y2giCisgICAgICAgICAg ICAgICAgICAgICAgIjAwMzktSW1wcm92ZS1kb2N1bWVudGF0aW9uLW9mLUFTQ0lJLW1vZGUtaW4t dGhlLW1hbi1wYWdlLnBhdGNoIgorICAgICAgICAgICAgICAgICAgICAgICIwMDQwLVVzZS1zeXN0 ZW0td2lkZS1jcnlwdG8tcG9saWN5LnBhdGNoIgorICAgICAgICAgICAgICAgICAgICAgICIwMDQx LURvY3VtZW50LXRoZS1uZXctZGVmYXVsdC1mb3Itc3NsX2NpcGhlcnMtaW4tdGhlLW1hbi0ucGF0 Y2giCisgICAgICAgICAgICAgICAgICAgICAgIjAwNDItV2hlbi1oYW5kbGluZy1GRUFULWNvbW1h bmQtY2hlY2stc3NsX3Rsc3YxXzEtYW5kLXNzbC5wYXRjaCIKKyAgICAgICAgICAgICAgICAgICAg ICAiMDA0My1FbmFibGUtb25seS1UTFN2MS4yLWJ5LWRlZmF1bHQucGF0Y2giCisgICAgICAgICAg ICAgICAgICAgICAgIjAwNDQtRGlzYWJsZS1hbm9ueW1vdXNfZW5hYmxlLWluLWRlZmF1bHQtY29u ZmlnLWZpbGUucGF0Y2giCisgICAgICAgICAgICAgICAgICAgICAgIjAwNDUtRXhwYW5kLWV4cGxh bmF0aW9uLW9mLWFzY2lpXy1vcHRpb25zLWJlaGF2aW91ci1pbi1tYS5wYXRjaCIKKyAgICAgICAg ICAgICAgICAgICAgICAiMDA0Ni12c2Z0cGQuY29uZi1SZWZlci10by10aGUtbWFuLXBhZ2UtcmVn YXJkaW5nLXRoZS1hc2NpLnBhdGNoIgorICAgICAgICAgICAgICAgICAgICAgICIwMDQ3LURpc2Fi bGUtdGNwX3dyYXBwZXJzLXN1cHBvcnQucGF0Y2giCisgICAgICAgICAgICAgICAgICAgICAgIjAw NDgtRml4LWRlZmF1bHQtdmFsdWUtb2Ytc3RyaWN0X3NzbF9yZWFkX2VvZi1pbi1tYW4tcGFnZS5w YXRjaCIKKyAgICAgICAgICAgICAgICAgICAgICAiMDA0OS1BZGQtbmV3LWZpbGVuYW1lLWdlbmVy YXRpb24tYWxnb3JpdGhtLWZvci1TVE9VLWNvbW1hLnBhdGNoIgorICAgICAgICAgICAgICAgICAg ICAgICIwMDUwLURvbi10LWxpbmstd2l0aC1saWJuc2wucGF0Y2giCisgICAgICAgICAgICAgICAg ICAgICAgIjAwNTEtSW1wcm92ZS1kb2N1bWVudGF0aW9uLW9mLWJldHRlcl9zdG91LWluLXRoZS1t YW4tcGFnZS5wYXRjaCIKKyAgICAgICAgICAgICAgICAgICAgICAiMDA1Mi1GaXgtckROUy13aXRo LUlQdjYucGF0Y2giCisgICAgICAgICAgICAgICAgICAgICAgIjAwNTMtQWx3YXlzLWRvLWNoZGly LWFmdGVyLWNocm9vdC5wYXRjaCIKKyAgICAgICAgICAgICAgICAgICAgICAiMDA1NC12c2Zfc3lz dXRpbF9yY3Z0aW1lby1DaGVjay1yZXR1cm4tdmFsdWUtb2Ytc2V0c29ja29wLnBhdGNoIgorICAg ICAgICAgICAgICAgICAgICAgICIwMDU1LXZzZl9zeXN1dGlsX2dldF90ei1DaGVjay10aGUtcmV0 dXJuLXZhbHVlLW9mLXN5c2NhbGwucGF0Y2giCisgICAgICAgICAgICAgICAgICAgICAgIjAwNTYt TG9nLWRpZS1jYWxscy10by1zeXNsb2cucGF0Y2giCisgICAgICAgICAgICAgICAgICAgICAgIjAw NTctSW1wcm92ZS1lcnJvci1tZXNzYWdlLXdoZW4tbWF4LW51bWJlci1vZi1iaW5kLWF0dGVtcC5w YXRjaCIKKyAgICAgICAgICAgICAgICAgICAgICAiMDA1OC1NYWtlLXRoZS1tYXgtbnVtYmVyLW9m LWJpbmQtcmV0cmllcy10dW5hYmxlLnBhdGNoIgorICAgICAgICAgICAgICAgICAgICAgICIwMDU5 LUZpeC1TRUdGQVVMVC13aGVuLXJ1bm5pbmctaW4tYS1jb250YWluZXItYXMtUElELTEucGF0Y2gi CisgICAgICAgICAgICAgICAgICAgICAgIjAwMDEtTW92ZS1jbG9zaW5nLXN0YW5kYXJkLUZEcy1h ZnRlci1saXN0ZW4ucGF0Y2giCisgICAgICAgICAgICAgICAgICAgICAgIjAwMDItUHJldmVudC1y ZWN1cnNpb24taW4tYnVnLnBhdGNoIgorICAgICAgICAgICAgICAgICAgICAgICIwMDAxLVNldC1z X3V3dG1wX2luc2VydGVkLW9ubHktYWZ0ZXItcmVjb3JkLWluc2VydGlvbi1yZW0ucGF0Y2giCisg ICAgICAgICAgICAgICAgICAgICAgIjAwMDItUmVwZWF0LXB1dHV0eGxpbmUtaWYtaXQtZmFpbHMt d2l0aC1FSU5UUi5wYXRjaCIKKyAgICAgICAgICAgICAgICAgICAgICAiMDAwMy1SZXBlYXQtcHV0 dXR4bGluZS11bnRpbC1pdC1zdWNjZWVkcy1pZi1pdC1mYWlscy13aXRoLnBhdGNoIgorICAgICAg ICAgICAgICAgICAgICAgICIwMDAxLUZpeC10aW1lc3RhbXAtaGFuZGxpbmctaW4tTURUTS5wYXRj aCIKKyAgICAgICAgICAgICAgICAgICAgICAiMDAwMS1SZW1vdmUtYS1oaW50LWFib3V0LXRoZS1m dHBfaG9tZV9kaXItU0VMaW51eC1ib29sZWFuLnBhdGNoIikpKQorICAgICAgICAgICAgICAgICAg ICAgKG1hcCAobGFtYmRhICh4KSAoaW52b2tlICJtdiIgKHN0cmluZy1hcHBlbmQgIi4vIiB4KQor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChzdHJpbmctYXBw ZW5kICJ2c2Z0cGQtIiB2ZXJzaW9uICIvIikpKQorICAgICAgICAgICAgICAgICAgICAgICAgICBw YXRjaGVzKQorICAgICAgICAgICAgICAgICAgICAgKGNoZGlyIChzdHJpbmctYXBwZW5kICIuL3Zz ZnRwZC0iIHZlcnNpb24pKQorICAgICAgICAgICAgICAgICAgICAgKGludm9rZSAiZ2l0IiAiaW5p dCIgIi4iKQorICAgICAgICAgICAgICAgICAgICAgKGludm9rZSAiZ2l0IiAiY29uZmlnIiAidXNl ci5lbWFpbCIgInlvdUBleGFtcGxlLmNvbSIpCisgICAgICAgICAgICAgICAgICAgICAoaW52b2tl ICJnaXQiICJjb25maWciICJ1c2VyLm5hbWUiICJZb3VyIE5hbWUiICkKKyAgICAgICAgICAgICAg ICAgICAgIChpbnZva2UgImdpdCIgImFkZCIgIi4iKQorICAgICAgICAgICAgICAgICAgICAgKGlu dm9rZSAiZ2l0IiAiY29tbWl0IiAiLW0iICJmaXJzdCIpCisgICAgICAgICAgICAgICAgICAgICAo bWFwIChsYW1iZGEgKHgpIChpbnZva2UgImdpdCIgImFtIiAoc3RyaW5nLWFwcGVuZCAiLi8iIHgp KSkgcGF0Y2hlcykKKyAgICAgICAgICAgICAgICAgICAgIChtYXAgKGxhbWJkYSAoeCkgKGludm9r ZSAicm0iIChzdHJpbmctYXBwZW5kICIuLyIgeCkpKSBwYXRjaGVzKQorICAgICAgICAgICAgICAg ICAgICAgKGludm9rZSAicm0iICItcmYiICIuLy5naXQiKQorICAgICAgICAgICAgICAgICAgICAg KGNoZGlyICIuLi8iKQorICAgICAgICAgICAgICAgICAgICAgKGludm9rZSAibXYiIChzdHJpbmct YXBwZW5kICIuL3ZzZnRwZC0iIHZlcnNpb24pICIuLi8iKQorICAgICAgICAgICAgICAgICAgICAg KGNoZGlyICIuLi8iKQorICAgICAgICAgICAgICAgICAgICAgKGludm9rZSAicm0iICItcmYiIChz dHJpbmctYXBwZW5kICIuL3ZzZnRwZC0iIHZlcnNpb24gIi0iCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmV2aXNpb24gIi5lbDguc3JjLmNw aW8iKSkKKyAgICAgICAgICAgICAgICAgICAgIChjaGRpciAoc3RyaW5nLWFwcGVuZCAiLi92c2Z0 cGQtIiB2ZXJzaW9uKSkpCisgICAgICAgICAgICAgICAgICAgI3QpKSkKKyAgICAgICAgICAgKGFk ZC1iZWZvcmUgJ2luc3RhbGwgJ21rZGlyCisgICAgICAgICAgICAgKGxhbWJkYSogKCM6a2V5IG91 dHB1dHMgIzphbGxvdy1vdGhlci1rZXlzKQorICAgICAgICAgICAgICAgKGxldCAoKG91dCAoYXNz b2MtcmVmIG91dHB1dHMgIm91dCIpKSkKKyAgICAgICAgICAgICAgICAgKG1rZGlyLXAgb3V0KQor ICAgICAgICAgICAgICAgICAobWtkaXIgKHN0cmluZy1hcHBlbmQgb3V0ICIvc2JpbiIpKQorICAg ICAgICAgICAgICAgICAobWtkaXIgKHN0cmluZy1hcHBlbmQgb3V0ICIvbWFuIikpCisgICAgICAg ICAgICAgICAgIChta2RpciAoc3RyaW5nLWFwcGVuZCBvdXQgIi9tYW4vbWFuNSIpKQorICAgICAg ICAgICAgICAgICAobWtkaXIgKHN0cmluZy1hcHBlbmQgb3V0ICIvbWFuL21hbjgiKSkKKyAgICAg ICAgICAgICAgICAgI3QpKSkKKyAgICAgICAgICAgKGRlbGV0ZSAnY29uZmlndXJlKSkpKQorICAg ICAgKG5hdGl2ZS1pbnB1dHMgYCgoIm9wZW5zc2wiICxvcGVuc3NsKQorICAgICAgICAgICAgICAg ICAgICAgICAoImxpbnV4LXBhbSIgLGxpbnV4LXBhbSkKKyAgICAgICAgICAgICAgICAgICAgICAg KCJwN3ppcCIgLHA3emlwKQorICAgICAgICAgICAgICAgICAgICAgICAoImNwaW8iICxjcGlvKQor ICAgICAgICAgICAgICAgICAgICAgICAoImdpdCIgLGdpdC1taW5pbWFsKQorICAgICAgICAgICAg ICAgICAgICAgICAoImxpYmNhcCIgLGxpYmNhcCkpKQorICAgICAgKHN5bm9wc2lzICJTaGFyZSBm aWxlcyBzZWN1cmVseSBvdmVyIEZUUCBvciBGVFBTIikKKyAgICAgIChkZXNjcmlwdGlvbiAiQGNv bW1hbmR7dnNmdHBkfSBpcyBhIGRhZW1vbiB0aGF0IGxpc3RlbnMgb24gYSBUQ1Agc29ja2V0CiBm b3IgY2xpZW50cyBhbmQgZ2l2ZXMgdGhlbSBhY2Nlc3MgdG8gbG9jYWwgZmlsZXMgdmlhIEZpbGUg VHJhbnNmZXIKIFByb3RvY29sLiIpCi0gICAgKGhvbWUtcGFnZSAiaHR0cHM6Ly9zZWN1cml0eS5h cHBzcG90LmNvbS92c2Z0cGQuaHRtbCIpCi0gICAgKGxpY2Vuc2UgZ3BsMikpKQorICAgICAgKGhv bWUtcGFnZSAiaHR0cHM6Ly9zZWN1cml0eS5hcHBzcG90LmNvbS92c2Z0cGQuaHRtbCIpCisgICAg ICAobGljZW5zZSBncGwyKSkpKQotLSAKMi4zMC4yCgo= --=_7cb1a1bec936e602efd9ecd58296d65e-- From unknown Sat Jun 14 05:07:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#47495] [PATCH] gnu: vsftpd: Use CentOS version and patches. Resent-From: Tobias Geerinckx-Rice Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 30 Mar 2021 15:33:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47495 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: david larsson Cc: 47495@debbugs.gnu.org, guix-patches-bounces+david.larsson=selfhosted.xyz@gnu.org X-Debbugs-Original-Cc: 47495@debbugs.gnu.org, Guix-patches , guix-patches@gnu.org Received: via spool by 47495-submit@debbugs.gnu.org id=B47495.161711835619963 (code B ref 47495); Tue, 30 Mar 2021 15:33:01 +0000 Received: (at 47495) by debbugs.gnu.org; 30 Mar 2021 15:32:36 +0000 Received: from localhost ([127.0.0.1]:52670 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lRGM0-0005Bm-8l for submit@debbugs.gnu.org; Tue, 30 Mar 2021 11:32:36 -0400 Received: from tobias.gr ([80.241.217.52]:56782) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lRGLv-0005Bb-Ek for 47495@debbugs.gnu.org; Tue, 30 Mar 2021 11:32:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tobias.gr; s=2018; bh=pNryxV4qQ53LY8Ib3ZkWp59VVVhrRovQCNkwkqlaq5I=; h=date:in-reply-to: subject:cc:to:from:references; b=Bhtfyv10APXlr+rZ9dl6cTDahYZQQW4dK2/He Va+GGXLP+VsjRpcW4dGMETv7j+msZn7B+fIO7kfKn29iTvgnKoMA/SLOU+KvbPXlfsWZgG BywDamFchFbHc2SIEbuUew1njbkEsBV1VlylERZCOcjaZoEjc+D+sk0Jj1a47nZ3brAqmC 7afYdJipjGuQ35SwKhReFzRSqOBCIAs8oXUfAPwY+QLJlj/I2FSDVyfw/7Tj7Hn5LjXLtt X2KO6bo8SR7MZ7rEzYbzuPxk6pdUr9qPzq0Ziz/Ci6Sj2kN8J2PUNHJbq2vAQK+dabOeAW L+UveCUyagCIzWr8oRMMouxEQ== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id ac25ba79 (TLSv1.2:ECDHE-ECDSA-AES256-GCM-SHA384:256:NO); Tue, 30 Mar 2021 15:33:29 +0000 (UTC) References: <14748028ccd69b0d3a767a70b5832a79@selfhosted.xyz> <08d5f3aefaeff390aa73a1e88bd64e13@selfhosted.xyz> From: Tobias Geerinckx-Rice In-reply-to: <08d5f3aefaeff390aa73a1e88bd64e13@selfhosted.xyz> BIMI-Selector: v=BIMI1; s=default; Date: Tue, 30 Mar 2021 17:32:20 +0200 Message-ID: <87y2e4hd2z.fsf@nckx> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: -0.3 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) --=-=-= Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable David, david larsson writes: > Hi, > the attached patch updates vsftpd so it can use tlsv1.2 etc. Wow. Thanks! As indicated on IRC I've made some changes to the patch, mainly to=20 avoid hard-coding all patches. The result is attached. Let me=20 know what you think. Further random comments below: > From: methuselah-0 > Date: Tue, 30 Mar 2021 11:18:09 +0200 > Subject: [PATCH] gnu: vsftpd: Use CentOS version and patches. > > * gnu/packages/ftp.scm (vftpd): Use CentOS version and=20 > patches. ^^^^ This is what happens when you copy commit messages from git and=20 paste them right back in :-) In that case, remove the four=20 leading spaces. > + (let ((version "3.0.3") I renamed this to UPSTREAM-VERSION, so we can show a more specific=20 VERSION field in the Guix UI. What we offer isn't =E2=80=983.0.3=E2=80=99 = any=20 more. > + (revision "32") I subjectively added =E2=80=98.el8=E2=80=99 here, mainly to factor it out b= elow.=20 Neither of us knows what it means, though... > + (add-after 'unpack 'patch-installation-directory > + (lambda* (#:key outputs #:allow-other-keys) > + (substitute* "Makefile" > + (("/usr") (assoc-ref outputs "out"))) > + #t)) Moved below the redefined 'unpack phase for clarity. > + (replace 'unpack > + (lambda* (#:key source #:allow-other-keys) > + (let ((version "3.0.3") > + (revision "32") > + (centos-version "8.3.2011")) OK, so, as mentioned on IRC this can be avoided by quasiquoting=20 (as it already was, here) and using ,version instead. Quoting is probably the most confusing-yet-basic concept in=20 Scheme. > + > + (invoke "7z" "e" source (string-append "-o"=20 > "./vsftpd-" > +=20 > version "-" > +=20 > revision=20 > ".el8.src.cpio")) > + (chdir (string-append "./vsftpd-" version=20 > "-" > + revision=20 > ".el8.src.cpio")) > + (invoke "cpio" "-idmv" (string-append=20 > "--file=3D./vsftpd-" > +=20 > version "-" > +=20 > revision=20 > ".el8.src.cpio")) > + (invoke "tar" "xvf" (string-append=20 > "./vsftpd-"=20 > version ".tar.gz")) This dance had a few steps too many IMO, so I simplified it. It's=20 OK to keep the unpacked steps around during the (short) build=20 process; they are tiny by today's standards. > + (let ((patches I understand the reason for this: the patches need to be applied=20 in this order, or patching will appear to succeed but result in=20 unbuildable source. A simple FIND-FILES is right out. However, since the order is specified in vsftpd.spec, it's safer,=20 shorter, and simply more fun to parse it ourselves. > + (chdir (string-append "./vsftpd-"=20 > version)) > + (invoke "git" "init" ".") > + (invoke "git" "config" "user.email"=20 > "you@example.com") > + (invoke "git" "config" "user.name" "Your=20 > Name" ) > + (invoke "git" "add" ".") > + (invoke "git" "commit" "-m" "first") > + (map (lambda (x) (invoke "git" "am"=20 > (string-append=20 > "./" x))) patches) > + (map (lambda (x) (invoke "rm"=20 > (string-append "./"=20 > x))) patches) > + (invoke "rm" "-rf" "./.git") > + (chdir "../") > + (invoke "mv" (string-append "./vsftpd-"=20 > version)=20 > "../") > + (chdir "../") > + (invoke "rm" "-rf" (string-append=20 > "./vsftpd-"=20 > version "-" > + revision=20 > ".el8.src.cpio")) > + (chdir (string-append "./vsftpd-"=20 > version))) You lost me here. Why all the git? I removed all mention of git=20 from the package, since it didn't seem necessary, but please=20 correct me if needful. > + #t))) Whilst Guix on master still complains about =E2=80=98missing=E2=80=99 #Ts, = they=20 are a moribund relic and I've secretly started forgetting the odd=20 #t on master already... > + (native-inputs `(("openssl" ,openssl) > + ("linux-pam" ,linux-pam) > + ("p7zip" ,p7zip) > + ("cpio" ,cpio) > + ("git" ,git-minimal) > + ("libcap" ,libcap))) These are *all* new, correct? I removed git and added them all to=20 the commit message (check it out). Thanks again for your work! T G-R --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-vsftpd-Use-CentOS-version-and-patches.patch Content-Transfer-Encoding: quoted-printable >From 43ca5cf141a61120cf9b02d26394109be75e679f Mon Sep 17 00:00:00 2001 From: methuselah-0 Date: Tue, 30 Mar 2021 11:18:09 +0200 Subject: [PATCH] gnu: vsftpd: Use CentOS version and patches. * gnu/packages/ftp.scm (vftpd)[source]: Use CentOS source RPM. [arguments]: Adapt the 'unpack phase, and apply CentOS patches in a new 'apply-CentOS-patches phase. [native-inputs]: Add openssl, linux-pam, libcap, p7zip, and cpio. --- gnu/packages/ftp.scm | 116 +++++++++++++++++++++++++++++-------------- 1 file changed, 80 insertions(+), 36 deletions(-) diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm index b178063556..f3d3c68e5e 100644 --- a/gnu/packages/ftp.scm +++ b/gnu/packages/ftp.scm @@ -2,8 +2,9 @@ ;;; Copyright =C2=A9 2014, 2015, 2018 Ludovic Court=C3=A8s ;;; Copyright =C2=A9 2015 Andreas Enge ;;; Copyright =C2=A9 2015 Mark H Weaver -;;; Copyright =C2=A9 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright =C2=A9 2016=E2=80=932021 Tobias Geerinckx-Rice ;;; Copyright =C2=A9 2017 Rene Saavedra +;;; Copyright =C2=A9 2021 David Larsson ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,12 +29,14 @@ #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages check) + #:use-module (gnu packages cpio) #:use-module (gnu packages compression) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages libidn) + #:use-module (gnu packages linux) #:use-module (gnu packages ncurses) #:use-module (gnu packages nettle) #:use-module (gnu packages pkg-config) @@ -251,40 +254,81 @@ directory comparison and more.") (properties '((upstream-name . "FileZilla"))))) =20 (define-public vsftpd - (package - (name "vsftpd") - (version "3.0.3") - (source (origin - (method url-fetch) - (uri (string-append "https://security.appspot.com/downloads/" - name "-" version ".tar.gz")) - (sha256 - (base32 - "1xsyjn68k3fgm2incpb3lz2nikffl9by2safp994i272wvv2nkcx")))) - (build-system gnu-build-system) - (arguments - `(#:make-flags '("LDFLAGS=3D-lcrypt") - #:tests? #f ; No tests exist. - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-installation-directory - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "Makefile" - (("/usr") (assoc-ref outputs "out"))) - #t)) - (add-before 'install 'mkdir - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (mkdir-p out) - (mkdir (string-append out "/sbin")) - (mkdir (string-append out "/man")) - (mkdir (string-append out "/man/man5")) - (mkdir (string-append out "/man/man8")) - #t))) - (delete 'configure)))) - (synopsis "vsftpd FTP daemon") - (description "@command{vsftpd} is a daemon that listens on a TCP socket + ;; Use a significantly patched CentOS variant supporting TLSv1.2, =E2=80= =98email + ;; passwords=E2=80=99, and XXX davidl: anything else? + (let ((upstream-version "3.0.3") + (centos-version "8.3.2011") + (revision "32.el8")) + (package + (name "vsftpd") + (version (string-append upstream-version "." revision)) + (source + (origin + (method url-fetch) + (uri (string-append + "https://vault.centos.org/centos/" centos-version + "/AppStream/Source/SPackages/vsftpd-" upstream-version "-" + revision ".src.rpm")) + (sha256 + (base32 "1xl0kqcismf82hl99klqbvvpylpyk1yr1qjy5hd8f80cj4lyl0f4"))= )) + (build-system gnu-build-system) + (arguments + `(#:make-flags '("LDFLAGS=3D-lcrypt -lssl -pie") + #:tests? #f ; no tests exist + #:phases + (modify-phases %standard-phases + (replace 'unpack + (lambda* (#:key source #:allow-other-keys) + (invoke "7z" "e" source "-ocpio") + (invoke "cpio" "-idmv" + (string-append "--file=3Dcpio/vsftpd-" + ,upstream-version "-" ,revision + ".src.cpio")) + (invoke "tar" "xvf" + (string-append "vsftpd-" ,upstream-version ".tar.gz= ")) + (chdir (string-append "vsftpd-" ,upstream-version)))) + (add-after 'unpack 'apply-CentOS-patches + ;; Apply all patches as enumerated in vsftpd.spec, in order: + ;; simply using FIND-FILES would silently corrupt the result. + (lambda _ + (call-with-input-file "../vsftpd.spec" + (lambda (port) + (use-modules (ice-9 rdelim)) + (let loop () + (let ((line (read-line port))) + (unless (eof-object? line) + (when (string-prefix? "Patch" line) + (let* ((space (string-rindex line #\space)) + (patch (string-drop line (+ 1 space)))) + (invoke "patch" "-Np1" + "-i" (string-append "../" patch)))) + (loop)))))))) + (add-after 'unpack 'patch-installation-directory + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "Makefile" + (("/usr") (assoc-ref outputs "out"))) + #t)) + (add-before 'install 'mkdir + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (mkdir-p out) + (mkdir (string-append out "/sbin")) + (mkdir (string-append out "/man")) + (mkdir (string-append out "/man/man5")) + (mkdir (string-append out "/man/man8")) + #t))) + (delete 'configure)))) + (native-inputs + `(("openssl" ,openssl) + ("linux-pam" ,linux-pam) + ("libcap" ,libcap) + + ;; Used to unpack the source RPM. + ("p7zip" ,p7zip) + ("cpio" ,cpio))) + (home-page "https://security.appspot.com/vsftpd.html") + (synopsis "Share files securely over FTP or FTPS") + (description "@command{vsftpd} is a daemon that listens on a TCP soc= ket for clients and gives them access to local files via File Transfer Protocol.") - (home-page "https://security.appspot.com/vsftpd.html") - (license gpl2))) + (license gpl2)))) --=20 2.30.1 --=-=-=-- From unknown Sat Jun 14 05:07:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#47495] [PATCH] gnu: vsftpd: Use CentOS version and patches. Resent-From: Tobias Geerinckx-Rice Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 30 Mar 2021 15:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47495 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: david larsson Cc: 47495@debbugs.gnu.org, guix-patches-bounces+david.larsson=selfhosted.xyz@gnu.org X-Debbugs-Original-Cc: 47495@debbugs.gnu.org, Guix-patches , guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.161711847920184 (code B ref -1); Tue, 30 Mar 2021 15:35:02 +0000 Received: (at submit) by debbugs.gnu.org; 30 Mar 2021 15:34:39 +0000 Received: from localhost ([127.0.0.1]:52684 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lRGO6-0005FT-La for submit@debbugs.gnu.org; Tue, 30 Mar 2021 11:34:38 -0400 Received: from lists.gnu.org ([209.51.188.17]:52936) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lRGO5-0005FL-B3 for submit@debbugs.gnu.org; Tue, 30 Mar 2021 11:34:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36558) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRGO4-0008Nv-Ow; Tue, 30 Mar 2021 11:34:36 -0400 Received: from tobias.gr ([2a02:c205:2020:6054::1]:38614) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRGO2-00067y-5E; Tue, 30 Mar 2021 11:34:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tobias.gr; s=2018; bh=mJtlwkPZh5XvC0vdhALgUzpGxIsoM4PL6uhGOCg78QY=; h=date:in-reply-to: subject:cc:to:from:references; b=l6P2e7IYDU8XUkonngjTekXy8oxptvkAvSQ9Z fO5etdRDP0IkXfyhMnwCB7D2Cy8V9qtdzjTfjexCbzsdGCHlNrCU1fF3EEIscUW4Oqj2rx fQqfHkbeR1Nl1MkSUgeiI1BDWw7UWjkcFkEwAgV63o1b0KJKjxhb1fvpdaZW9kkz02xCZm ti87QLWyERT27M00gjf0mzAMEwYv88cpS2/oT9pLK7W6DrmOnAXNUM3luyy9rcj1a48BIf 84vBc5yHUgDOcLVLV0ZX95qO1lLNfTxA9ZEdohQJC939j7S3p8rkZqw97JJ/0x5eQ8uijc pQR8f0hiQ2M58nKYnpAT9ScOA== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id ce608ae9 (TLSv1.2:ECDHE-ECDSA-AES256-GCM-SHA384:256:NO); Tue, 30 Mar 2021 15:35:40 +0000 (UTC) References: <14748028ccd69b0d3a767a70b5832a79@selfhosted.xyz> <08d5f3aefaeff390aa73a1e88bd64e13@selfhosted.xyz> <87y2e4hd2z.fsf@nckx> From: Tobias Geerinckx-Rice In-reply-to: <87y2e4hd2z.fsf@nckx> BIMI-Selector: v=BIMI1; s=default; Date: Tue, 30 Mar 2021 17:34:32 +0200 Message-ID: <87v998hczb.fsf@nckx> MIME-Version: 1.0 Content-Type: text/plain; format=flowed Received-SPF: pass client-ip=2a02:c205:2020:6054::1; envelope-from=me@tobias.gr; helo=tobias.gr X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) Tobias Geerinckx-Rice forgot to write: > I've also added a copyright line for you. Kind regards, T G-R From unknown Sat Jun 14 05:07:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#47495] [PATCH] gnu: vsftpd: Use CentOS version and patches. Resent-From: david larsson Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 30 Mar 2021 18:40:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47495 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Tobias Geerinckx-Rice Cc: 47495@debbugs.gnu.org, guix-patches-bounces+david.larsson=selfhosted.xyz@gnu.org X-Debbugs-Original-Cc: 47495@debbugs.gnu.org, Guix-patches , guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16171295584731 (code B ref -1); Tue, 30 Mar 2021 18:40:01 +0000 Received: (at submit) by debbugs.gnu.org; 30 Mar 2021 18:39:18 +0000 Received: from localhost ([127.0.0.1]:52835 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lRJGo-0001EE-1a for submit@debbugs.gnu.org; Tue, 30 Mar 2021 14:39:18 -0400 Received: from lists.gnu.org ([209.51.188.17]:57698) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lRJGm-0001E7-QU for submit@debbugs.gnu.org; Tue, 30 Mar 2021 14:39:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38042) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRJGm-0006j5-EZ; Tue, 30 Mar 2021 14:39:16 -0400 Received: from server0.selfhosted.xyz ([217.64.149.7]:51124) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRJGj-0004lp-2r; Tue, 30 Mar 2021 14:39:16 -0400 Received: from server0.selfhosted.xyz (localhost [127.0.0.1]) by server0.selfhosted.xyz (Postfix) with ESMTP id AB0761CC429D; Tue, 30 Mar 2021 20:38:58 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=selfhosted.xyz; s=dkim; t=1617129545; bh=KE0fmHN58UfSO6+VeMqJw69iNuKU95ExnWKC9iySm3Q=; h=Date:From:To:Cc:Subject:In-Reply-To:References; b=Eg2T8Xo0qSW2Ahu1B741PfLHJl8w3nlIbbG40FUD6jtjC8T/Q+EmnoJzuYZbZWEES ErSl0zilMejjZkKTLEoA/pZwoIXUcTOrGuopgYqLydAuZqOVsQ9/RaSI++AfiZts9U fE2QayeAbnvXCqvG4NW0jlAzZx4VDX7GWQ7342F3+RvRnNUlFZdclCcwx4cBp9jDnG U2KCoFxQivMmGBnYXhmx+gR/uh7ct+lLsxZH7myW1tHaboZWXTUQmcwoQug5LSVsFZ YKVLAkGV757qEu5x9y9e0mnsrSH4aUNRrARnySc9WPd1MVccWUyBvBv8xn7NpNhnNL hioVxyERV9GiA== X-Fuglu-Suspect: cff58a3c339445028fdd2fc7e3a6b6d4 X-Fuglu-Spamstatus: NO Received: from webmail.selfhosted.xyz (office.selfhosted.xyz [192.168.1.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: mail@selfhosted.xyz) by server0.selfhosted.xyz (Postfix) with ESMTPSA; Tue, 30 Mar 2021 20:38:58 +0200 (CEST) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Date: Tue, 30 Mar 2021 20:38:58 +0200 From: david larsson In-Reply-To: <87y2e4hd2z.fsf@nckx> References: <14748028ccd69b0d3a767a70b5832a79@selfhosted.xyz> <08d5f3aefaeff390aa73a1e88bd64e13@selfhosted.xyz> <87y2e4hd2z.fsf@nckx> Message-ID: X-Sender: david.larsson@selfhosted.xyz Received-SPF: pass client-ip=217.64.149.7; envelope-from=david.larsson@selfhosted.xyz; helo=server0.selfhosted.xyz X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 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, FROM_SUSPICIOUS_NTLD=0.5, PDS_OTHER_BAD_TLD=1.999, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: On 2021-03-30 17:32, Tobias Geerinckx-Rice wrote: > As indicated on IRC I've made some changes to the patch, mainly to > avoid hard-coding all patches. The result is attached. Let me know > what you think. Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H4 RBL: Very Good reputation (+4) [209.51.188.17 listed in wl.mailspike.net] -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [209.51.188.17 listed in list.dnswl.org] 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: selfhosted.xyz (xyz)] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.9 SPF_FAIL SPF: sender does not match SPF record (fail) [SPF failed: Please see http://www.openspf.org/Why?s=mfrom; id=david.larsson%40selfhosted.xyz; ip=209.51.188.17; r=debbugs.gnu.org] 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: On 2021-03-30 17:32, Tobias Geerinckx-Rice wrote: > As indicated on IRC I've made some changes to the patch, mainly to > avoid hard-coding all patches. The result is attached. Let me know > what you think. Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [209.51.188.17 listed in list.dnswl.org] 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: selfhosted.xyz (xyz)] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.9 SPF_FAIL SPF: sender does not match SPF record (fail) [SPF failed: Please see http://www.openspf.org/Why?s=mfrom;id=david.larsson%40selfhosted.xyz;ip=209.51.188.17;r=debbugs.gnu.org] 0.0 RCVD_IN_MSPIKE_H4 RBL: Very Good reputation (+4) [209.51.188.17 listed in wl.mailspike.net] 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD 1.0 BULK_RE_SUSP_NTLD Precedence bulk and RE: from a suspicious TLD 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager On 2021-03-30 17:32, Tobias Geerinckx-Rice wrote: > As indicated on IRC I've made some changes to the patch, mainly to > avoid hard-coding all patches. The result is attached. Let me know > what you think. It looks great! Especially nice to see that you separated the patch and unpack phases - it looks much better now. >> >> * gnu/packages/ftp.scm (vftpd): Use CentOS version and >> patches. > ^^^^ > > This is what happens when you copy commit messages from git and paste > them right back in :-) In that case, remove the four leading spaces. Yep, thats what I did :-) will fix next time! Reg. why to use the significantly patched CentOS variant (asked in your updated patch's comments): the email passwords thing was a mistake to mention by me in IRC - that feature was probably already there - however, the tlsv1.2 was the main reason for switching to the CentOS version - other features added by the whole patch-set I don't know much about except from glancing over them and it looks mostly like bug and security fixes to me. > >> + (let ((version "3.0.3") > > I renamed this to UPSTREAM-VERSION, so we can show a more specific > VERSION field in the Guix UI. What we offer isn't ‘3.0.3’ any more. Ok, I think I understand. >> + (revision "32") > > I subjectively added ‘.el8’ here, mainly to factor it out below. > Neither of us knows what it means, though... That is fine with me. > >> + (add-after 'unpack 'patch-installation-directory >> + (lambda* (#:key outputs #:allow-other-keys) >> + (substitute* "Makefile" >> + (("/usr") (assoc-ref outputs "out"))) >> + #t)) > > Moved below the redefined 'unpack phase for clarity. Great! I had in mind to do the same myself, but didn't due to a combination of a lack of Guile/Guix coding skills and time. >> + (replace 'unpack >> + (lambda* (#:key source #:allow-other-keys) >> + (let ((version "3.0.3") >> + (revision "32") >> + (centos-version "8.3.2011")) > > OK, so, as mentioned on IRC this can be avoided by quasiquoting > (as it already was, here) and using ,version instead. > > Quoting is probably the most confusing-yet-basic concept in Scheme. Looks good to me! I am actually quite familiar with unquoting, including g-exp unquoting things, and I somehow missed that I was in a quasiquote context from after "arguments"... I intend to improve! > >> + >> + (invoke "7z" "e" source (string-append "-o" >> "./vsftpd-" >> + version "-" >> + revision ".el8.src.cpio")) >> + (chdir (string-append "./vsftpd-" version "-" >> + revision ".el8.src.cpio")) >> + (invoke "cpio" "-idmv" (string-append >> "--file=./vsftpd-" >> + version "-" >> + revision ".el8.src.cpio")) >> + (invoke "tar" "xvf" (string-append "./vsftpd-" >> version ".tar.gz")) > > This dance had a few steps too many IMO, so I simplified it. It's OK > to keep the unpacked steps around during the (short) build process; > they are tiny by today's standards. Agreed. I was not very happy with this myself. Thanks for fixing! > >> + (let ((patches > > I understand the reason for this: the patches need to be applied in > this order, or patching will appear to succeed but result in > unbuildable source. A simple FIND-FILES is right out. > > However, since the order is specified in vsftpd.spec, it's safer, > shorter, and simply more fun to parse it ourselves. > >> + (chdir (string-append "./vsftpd-" version)) >> + (invoke "git" "init" ".") >> + (invoke "git" "config" "user.email" >> "you@example.com") >> + (invoke "git" "config" "user.name" "Your Name" ) >> + (invoke "git" "add" ".") >> + (invoke "git" "commit" "-m" "first") >> + (map (lambda (x) (invoke "git" "am" >> (string-append "./" x))) patches) >> + (map (lambda (x) (invoke "rm" (string-append >> "./" x))) patches) >> + (invoke "rm" "-rf" "./.git") >> + (chdir "../") >> + (invoke "mv" (string-append "./vsftpd-" version) >> "../") >> + (chdir "../") >> + (invoke "rm" "-rf" (string-append "./vsftpd-" >> version "-" >> + revision >> ".el8.src.cpio")) >> + (chdir (string-append "./vsftpd-" version))) > > You lost me here. Why all the git? I removed all mention of git from > the package, since it didn't seem necessary, but please correct me if > needful. I am, or was, simply unfamiliar with the simplicity of just using "patch". I tried git am which failed and reported errors that was solved by the additional git commands. Your replacement is exactly what I need to learn more about, and looks great, thanks! > >> + (native-inputs `(("openssl" ,openssl) >> + ("linux-pam" ,linux-pam) >> + ("p7zip" ,p7zip) >> + ("cpio" ,cpio) >> + ("git" ,git-minimal) >> + ("libcap" ,libcap))) > > These are *all* new, correct? I removed git and added them all to the > commit message (check it out). Yep! > > Thanks again for your work! > > T G-R Well..., thank you for your work! You made this patch a lot better! :-) Best regards, David Larsson From unknown Sat Jun 14 05:07:40 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: david larsson Subject: bug#47495: closed (Re: [bug#47495] [PATCH] gnu: vsftpd: Use CentOS version and patches.) Message-ID: References: <87sg4ch1iz.fsf@nckx> <14748028ccd69b0d3a767a70b5832a79@selfhosted.xyz> X-Gnu-PR-Message: they-closed 47495 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 47495@debbugs.gnu.org Date: Tue, 30 Mar 2021 19:42:01 +0000 Content-Type: multipart/mixed; boundary="----------=_1617133321-10516-1" This is a multi-part message in MIME format... ------------=_1617133321-10516-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #47495: [PATCH] gnu: vsftpd: Use CentOS version and patches. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 47495@debbugs.gnu.org. --=20 47495: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D47495 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1617133321-10516-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 47495-done) by debbugs.gnu.org; 30 Mar 2021 19:42:01 +0000 Received: from localhost ([127.0.0.1]:52871 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lRKFU-0002jQ-TD for submit@debbugs.gnu.org; Tue, 30 Mar 2021 15:42:01 -0400 Received: from tobias.gr ([80.241.217.52]:57494) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lRKFS-0002jF-Au for 47495-done@debbugs.gnu.org; Tue, 30 Mar 2021 15:41:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tobias.gr; s=2018; bh=RvdyVCf95Ju1dME3rrCA9CtbRMBaf4GdyFL7xsEly/I=; h=date:in-reply-to: subject:cc:to:from:references; b=Me9ZGOpYSeuIQzYMS7vE/iclhwIFZBzcloSBx G4KWedY7YBWJtW4cVFbO33fp+93jxtxN9ecFISvzVUBa10P2YxJdjXUs8iXLtCDUSOMN6W DYMEx/xlhRx1UZGi+Zm0OF8lYlaOU5sGrzqePamxLq2pQkSmeautFORq2vfj51Rlu172f7 BwNRL0LdGYiFarLRsPv/XjV8OQI8GlgetpLdq2PWs2z80LB4Zjd2Ho1oyEoUy9EedPQ8Cc N+D4IYY07PtYkUn+83oM4ujfYlyGnOVGPPYX1Ojnpg7DPd+uanofI0MZ/i/Kh2hRWd54MJ 2CIHR+11bcBh/vh6PwVH86hrg== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id 4decfeb8 (TLSv1.2:ECDHE-ECDSA-AES256-GCM-SHA384:256:NO); Tue, 30 Mar 2021 19:43:05 +0000 (UTC) References: <14748028ccd69b0d3a767a70b5832a79@selfhosted.xyz> <08d5f3aefaeff390aa73a1e88bd64e13@selfhosted.xyz> <87y2e4hd2z.fsf@nckx> From: Tobias Geerinckx-Rice To: david larsson Subject: Re: [bug#47495] [PATCH] gnu: vsftpd: Use CentOS version and patches. In-reply-to: BIMI-Selector: v=BIMI1; s=default; Date: Tue, 30 Mar 2021 21:41:56 +0200 Message-ID: <87sg4ch1iz.fsf@nckx> MIME-Version: 1.0 Content-Type: text/plain; format=flowed X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47495-done Cc: 47495-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) David, > + (native-inputs `(("openssl" ,openssl) Not sure how I missed this -- actually I do, considering the three empty champagne bottles now adorning our wall -- but the first three should be regular inputs, not native, as they are legitimate references of the resulting package ($ guix gc --references). Native inputs run only during the build. The distinction matters during cross-compilation, when the build-time native-inputs may be a different (say, x86_64) architecture from the output package and its inputs (both identical: say, aarch64). > It looks great! Especially nice to see that you separated the > patch > and unpack phases - it looks much better now. Thank you :-) Pushed as 634d9845a6b4e362f32ba369ae42851719455ba3. Kind regards, T G-R ------------=_1617133321-10516-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 30 Mar 2021 07:52:37 +0000 Received: from localhost ([127.0.0.1]:50318 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lR9Av-0003HX-Dh for submit@debbugs.gnu.org; Tue, 30 Mar 2021 03:52:37 -0400 Received: from lists.gnu.org ([209.51.188.17]:52688) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lR9At-0003HP-F1 for submit@debbugs.gnu.org; Tue, 30 Mar 2021 03:52:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39744) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lR9As-00068C-RI for guix-patches@gnu.org; Tue, 30 Mar 2021 03:52:31 -0400 Received: from server0.selfhosted.xyz ([217.64.149.7]:49728) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lR9Ap-0002Et-Kf for guix-patches@gnu.org; Tue, 30 Mar 2021 03:52:30 -0400 Received: from server0.selfhosted.xyz (localhost [127.0.0.1]) by server0.selfhosted.xyz (Postfix) with ESMTP id 976901CC20B3 for ; Tue, 30 Mar 2021 09:52:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=selfhosted.xyz; s=dkim; t=1617090739; bh=yZKctYrPl35HLblEPb4XbYshdFHRWjKZUzGpIK2qRa8=; h=Date:From:To:Subject; b=NDJFUCghlwhQEcE6CeZ/40kj7zWyxghK7l9eAAQUGY+Y1PEGDoJBPBA5eq8r7KWhh Neist2jGqNdfUcDunsDCJt+NXK4MLw+sZp7gZUbLZylgzGkbmdDlF59cWR1zb0YpgZ CveanYeO8tlnOpmm2fzZU7itNuZuiGOE6bNoTBvAzs9TVgY1c3dKKDm5x68Uiv0bip z8+4wbInxnT+cffVix1agzMvS5mapOcrKRPnxAgwU5EIX7E1Jme8+Qxotv1ibVE4vm JAQiX8X60dMXEsoQGt5uIvYrbT+uRqt1q+GHe/ChtpVQJOaXTehJWnjO0OazXXID44 wRqemwVbZJEuA== X-Fuglu-Suspect: 9af56d6e4c5b424cbc0ed11e75e56835 X-Fuglu-Spamstatus: NO Received: from webmail.selfhosted.xyz (office.selfhosted.xyz [192.168.1.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: mail@selfhosted.xyz) by server0.selfhosted.xyz (Postfix) with ESMTPSA for ; Tue, 30 Mar 2021 09:52:12 +0200 (CEST) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=_62e48f7bb1b8b1216d33a61217f702be" Date: Tue, 30 Mar 2021 09:52:12 +0200 From: david larsson To: guix-patches@gnu.org Subject: [PATCH] gnu: vsftpd: Use CentOS version and patches. Message-ID: <14748028ccd69b0d3a767a70b5832a79@selfhosted.xyz> X-Sender: david.larsson@selfhosted.xyz Received-SPF: pass client-ip=217.64.149.7; envelope-from=david.larsson@selfhosted.xyz; helo=server0.selfhosted.xyz X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 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, FROM_SUSPICIOUS_NTLD=0.499, FROM_SUSPICIOUS_NTLD_FP=0.001, PDS_OTHER_BAD_TLD=1.999, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi, the attached patch updates vsftpd so it can use tlsv1.2 etc. //David From 4f11b0960610e2afe670630bb1b93150714ce516 Mon Sep 17 00:00:00 2001 From: methuselah-0 Date: Tue, 30 Mar 2021 09:45:41 +0200 Subject: [PATCH] gnu: vsftpd: Use [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.9 SPF_FAIL SPF: sender does not match SPF record (fail) [SPF failed: Please see http://www.openspf.org/Why?s=mfrom; id=david.larsson%40selfhosted.xyz; ip=209.51.188.17; r=debbugs.gnu.org] 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: selfhosted.xyz (xyz)] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [209.51.188.17 listed in list.dnswl.org] 0.0 RCVD_IN_MSPIKE_H4 RBL: Very Good reputation (+4) [209.51.188.17 listed in wl.mailspike.net] 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders 0.0 FROM_SUSPICIOUS_NTLD_FP From abused NTLD 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.4 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi, the attached patch updates vsftpd so it can use tlsv1.2 etc. //David From 4f11b0960610e2afe670630bb1b93150714ce516 Mon Sep 17 00:00:00 2001 From: methuselah-0 Date: Tue, 30 Mar 2021 09:45:41 +0200 Subject: [PATCH] gnu: vsftpd: Use [...] Content analysis details: (2.4 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H4 RBL: Very Good reputation (+4) [209.51.188.17 listed in wl.mailspike.net] 0.9 SPF_FAIL SPF: sender does not match SPF record (fail) [SPF failed: Please see http://www.openspf.org/Why?s=mfrom;id=david.larsson%40selfhosted.xyz;ip=209.51.188.17;r=debbugs.gnu.org] 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: selfhosted.xyz (xyz)] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager --=_62e48f7bb1b8b1216d33a61217f702be Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; format=flowed Hi, the attached patch updates vsftpd so it can use tlsv1.2 etc. //David --=_62e48f7bb1b8b1216d33a61217f702be Content-Transfer-Encoding: base64 Content-Type: text/x-diff; charset=us-ascii; name=0001-gnu-vsftpd-Use-CentOS-version-and-patches.patch Content-Disposition: attachment; filename=0001-gnu-vsftpd-Use-CentOS-version-and-patches.patch; size=13092 RnJvbSA0ZjExYjA5NjA2MTBlMmFmZTY3MDYzMGJiMWI5MzE1MDcxNGNlNTE2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBtZXRodXNlbGFoLTAgPGRhdmlkLmxhcnNzb25Ac2VsZmhvc3Rl ZC54eXo+CkRhdGU6IFR1ZSwgMzAgTWFyIDIwMjEgMDk6NDU6NDEgKzAyMDAKU3ViamVjdDogW1BB VENIXSBnbnU6IHZzZnRwZDogVXNlIENlbnRPUyB2ZXJzaW9uIGFuZCBwYXRjaGVzLgoKICAgICog Z251L3BhY2thZ2VzL2Z0cC5zY20gKHZmdHBkKTogVXNlIENlbnRPUyB2ZXJzaW9uIGFuZCBwYXRj aGVzLgotLS0KIGdudS9wYWNrYWdlcy9mdHAuc2NtIHwgMTM4ICsrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKy0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxMTggaW5zZXJ0aW9ucygr KSwgMjAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZ251L3BhY2thZ2VzL2Z0cC5zY20gYi9n bnUvcGFja2FnZXMvZnRwLnNjbQppbmRleCBiMTc4MDYzNTU2Li45ZDcwNGFhYTNmIDEwMDY0NAot LS0gYS9nbnUvcGFja2FnZXMvZnRwLnNjbQorKysgYi9nbnUvcGFja2FnZXMvZnRwLnNjbQpAQCAt MjgsMTggKzI4LDIxIEBACiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzKQogICAjOnVzZS1t b2R1bGUgKGdudSBwYWNrYWdlcyBhdXRvdG9vbHMpCiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2th Z2VzIGNoZWNrKQorICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBjcGlvKQogICAjOnVzZS1t b2R1bGUgKGdudSBwYWNrYWdlcyBjb21wcmVzc2lvbikKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFj a2FnZXMgZnJlZWRlc2t0b3ApCiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIGdldHRleHQp CiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIGdsaWIpCiAgICM6dXNlLW1vZHVsZSAoZ251 IHBhY2thZ2VzIGd0aykKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgbGliaWRuKQorICAj OnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBsaW51eCkKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFj a2FnZXMgbmN1cnNlcykKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgbmV0dGxlKQogICAj OnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBwa2ctY29uZmlnKQogICAjOnVzZS1tb2R1bGUgKGdu dSBwYWNrYWdlcyByZWFkbGluZSkKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgc3FsaXRl KQogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyB0bHMpCisgICM6dXNlLW1vZHVsZSAoZ251 IHBhY2thZ2VzIHZlcnNpb24tY29udHJvbCkKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMg d3h3aWRnZXRzKQogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyB4bWwpKQogCkBAIC0yNTYs MzIgKzI1OSwxMjcgQEAgZGlyZWN0b3J5IGNvbXBhcmlzb24gYW5kIG1vcmUuIikKICAgICAodmVy c2lvbiAiMy4wLjMiKQogICAgIChzb3VyY2UgKG9yaWdpbgogICAgICAgICAgICAgICAobWV0aG9k IHVybC1mZXRjaCkKLSAgICAgICAgICAgICAgKHVyaSAoc3RyaW5nLWFwcGVuZCAiaHR0cHM6Ly9z ZWN1cml0eS5hcHBzcG90LmNvbS9kb3dubG9hZHMvIgotICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIG5hbWUgIi0iIHZlcnNpb24gIi50YXIuZ3oiKSkKKyAgICAgICAgICAgICAgKHVy aSAiaHR0cHM6Ly92YXVsdC5jZW50b3Mub3JnL2NlbnRvcy84LjMuMjAxMS9BcHBTdHJlYW0vU291 cmNlL1NQYWNrYWdlcy92c2Z0cGQtMy4wLjMtMzIuZWw4LnNyYy5ycG0iKQogICAgICAgICAgICAg ICAoc2hhMjU2CiAgICAgICAgICAgICAgICAoYmFzZTMyCi0gICAgICAgICAgICAgICAgIjF4c3lq bjY4azNmZ20yaW5jcGIzbHoybmlrZmZsOWJ5MnNhZnA5OTRpMjcyd3Z2Mm5rY3giKSkpKQorICAg ICAgICAgICAgICAgICIxeGwwa3FjaXNtZjgyaGw5OWtscWJ2dnB5bHB5azF5cjFxank1aGQ4Zjgw Y2o0bHlsMGY0IikpKSkKICAgICAoYnVpbGQtc3lzdGVtIGdudS1idWlsZC1zeXN0ZW0pCiAgICAg KGFyZ3VtZW50cwotICAgICBgKCM6bWFrZS1mbGFncyAnKCJMREZMQUdTPS1sY3J5cHQiKQotICAg ICAgICM6dGVzdHM/ICNmICAgICAgICAgICAgICAgICAgICAgIDsgTm8gdGVzdHMgZXhpc3QuCisg ICAgIGAoIzptYWtlLWZsYWdzICcoIkxERkxBR1M9LWxjcnlwdCAtbHNzbCAtcGllIikKKyAgICAg ICAjOnRlc3RzPyAjZiA7IE5vIHRlc3RzIGV4aXN0LgogICAgICAgICM6cGhhc2VzCiAgICAgICAg KG1vZGlmeS1waGFzZXMgJXN0YW5kYXJkLXBoYXNlcwotICAgICAgICAgKGFkZC1hZnRlciAndW5w YWNrICdwYXRjaC1pbnN0YWxsYXRpb24tZGlyZWN0b3J5Ci0gICAgICAgICAgIChsYW1iZGEqICgj OmtleSBvdXRwdXRzICM6YWxsb3ctb3RoZXIta2V5cykKLSAgICAgICAgICAgICAoc3Vic3RpdHV0 ZSogIk1ha2VmaWxlIgotICAgICAgICAgICAgICAgKCgiL3VzciIpIChhc3NvYy1yZWYgb3V0cHV0 cyAib3V0IikpKQotICAgICAgICAgICAgICN0KSkKLSAgICAgICAgIChhZGQtYmVmb3JlICdpbnN0 YWxsICdta2RpcgotICAgICAgICAgICAobGFtYmRhKiAoIzprZXkgb3V0cHV0cyAjOmFsbG93LW90 aGVyLWtleXMpCi0gICAgICAgICAgICAgKGxldCAoKG91dCAoYXNzb2MtcmVmIG91dHB1dHMgIm91 dCIpKSkKLSAgICAgICAgICAgICAgIChta2Rpci1wIG91dCkKLSAgICAgICAgICAgICAgIChta2Rp ciAoc3RyaW5nLWFwcGVuZCBvdXQgIi9zYmluIikpCi0gICAgICAgICAgICAgICAobWtkaXIgKHN0 cmluZy1hcHBlbmQgb3V0ICIvbWFuIikpCi0gICAgICAgICAgICAgICAobWtkaXIgKHN0cmluZy1h cHBlbmQgb3V0ICIvbWFuL21hbjUiKSkKLSAgICAgICAgICAgICAgIChta2RpciAoc3RyaW5nLWFw cGVuZCBvdXQgIi9tYW4vbWFuOCIpKQotICAgICAgICAgICAgICAgI3QpKSkKLSAgICAgICAgIChk ZWxldGUgJ2NvbmZpZ3VyZSkpKSkKKyAgICAgICAgICAgICAgICAgICAgICAoYWRkLWFmdGVyICd1 bnBhY2sgJ3BhdGNoLWluc3RhbGxhdGlvbi1kaXJlY3RvcnkKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIChsYW1iZGEqICgjOmtleSBvdXRwdXRzICM6YWxsb3ctb3RoZXIta2V5cykK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHN1YnN0aXR1dGUqICJNYWtlZmls ZSIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICgoIi91 c3IiKSAoYXNzb2MtcmVmIG91dHB1dHMgIm91dCIpKSkKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgI3QpKQorICAgICAgICAgICAgICAgICAgICAgIChyZXBsYWNlICd1bnBhY2sK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAobGFtYmRhKiAoIzprZXkgc291cmNlICM6 YWxsb3ctb3RoZXIta2V5cykKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChpbnZv a2UgIjd6IiAiZSIgc291cmNlIChzdHJpbmctYXBwZW5kICItbyIgIi4vIiAidnNmdHBkLTMuMC4z LTMyLmVsOC5zcmMuY3BpbyIpKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGNo ZGlyICIuL3ZzZnRwZC0zLjAuMy0zMi5lbDguc3JjLmNwaW8iKQorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgKGludm9rZSAiY3BpbyIgIi1pZG12IiAoc3RyaW5nLWFwcGVuZCAiLS1m aWxlPS4vdnNmdHBkLTMuMC4zLTMyLmVsOC5zcmMuY3BpbyIpKQorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgKGludm9rZSAidGFyIiAieHZmIiAiLi92c2Z0cGQtMy4wLjMudGFyLmd6 IikKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChsZXQgKChwYXRjaGVzICcoIjAw MDEtRG9uLXQtdXNlLXRoZS1wcm92aWRlZC1zY3JpcHQtdG8tbG9jYXRlLWxpYnJhcmllcy5wYXRj aCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIjAw MDItRW5hYmxlLWJ1aWxkLXdpdGgtU1NMLnBhdGNoIgorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAiMDAwMy1FbmFibGUtYnVpbGQtd2l0aC1UQ1AtV3Jh cHBlci5wYXRjaCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIjAwMDQtVXNlLWV0Yy12c2Z0cGQtZGlyLWZvci1jb25maWctZmlsZXMtaW5zdGVhZC1v Zi1ldGMucGF0Y2giCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICIwMDA1LVVzZS1ob3N0bmFtZS13aGVuLWNhbGxpbmctUEFNLWF1dGhlbnRpY2F0aW9u LW1vZHVsZS5wYXRjaCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIjAwMDYtQ2xvc2Utc3RkaW4tb3V0LWVyci1iZWZvcmUtbGlzdGVuaW5nLWZvci1p bmNvbWluZy1jby5wYXRjaCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIjAwMDctTWFrZS1maWxlbmFtZS1maWx0ZXJzLXNtYXJ0ZXIucGF0Y2giCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICIwMDA4LVdy aXRlLWRlbmllZC1sb2dpbnMtaW50by10aGUtbG9nLnBhdGNoIgorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiMDAwOS1UcmltLXdoaXRlc3BhY2VzLXdo ZW4tcmVhZGluZy1jb25maWd1cmF0aW9uLnBhdGNoIgorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAiMDAxMC1JbXByb3ZlLWRhZW1vbml6aW5nLnBhdGNo IgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiMDAx MS1GaXgtbGlzdGluZy13aXRoLW1vcmUtdGhhbi1vbmUtc3Rhci5wYXRjaCIKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIjAwMTItUmVwbGFjZS1zeXNj YWxsLV9fTlJfY2xvbmUtLi13aXRoLWNsb25lLnBhdGNoIgorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiMDAxMy1FeHRlbmQtbWFuLXBhZ2VzLXdpdGgt c3lzdGVtZC1pbmZvLnBhdGNoIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAiMDAxNC1BZGQtc3VwcG9ydC1mb3Itc3F1YXJlLWJyYWNrZXRzLWluLWxz LnBhdGNoIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAiMDAxNS1MaXN0ZW4tb24tSVB2Ni1ieS1kZWZhdWx0LnBhdGNoIgorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiMDAxNi1JbmNyZWFzZS1WU0ZUUF9B U19MSU1JVC1mcm9tLTIwMFVMLXRvLTQwMFVMLnBhdGNoIgorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiMDAxNy1GaXgtYW4taXNzdWUtd2l0aC10aW1l c3RhbXBzLWR1cmluZy1EU1QucGF0Y2giCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICIwMDE4LUNoYW5nZS10aGUtZGVmYXVsdC1sb2ctZmlsZS1pbi1j b25maWd1cmF0aW9uLnBhdGNoIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAiMDAxOS1JbnRyb2R1Y2UtcmV2ZXJzZV9sb29rdXBfZW5hYmxlLW9wdGlv bi5wYXRjaCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIjAwMjAtVXNlLXVuc2lnbmVkLWludC1mb3ItdWlkLWFuZC1naWQtcmVwcmVzZW50YXRpb24u cGF0Y2giCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICIwMDIxLUludHJvZHVjZS1zdXBwb3J0LWZvci1ESEUtYmFzZWQtY2lwaGVyLXN1aXRlcy5wYXRj aCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIjAw MjItSW50cm9kdWNlLXN1cHBvcnQtZm9yLUVEREhFLWJhc2VkLWNpcGhlci1zdWl0ZXMucGF0Y2gi CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICIwMDIz LUFkZC1kb2N1bWVudGF0aW9uLWZvci1pc29sYXRlXy1vcHRpb25zLi1Db3JyZWN0LWRlZmEucGF0 Y2giCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICIw MDI0LUludHJvZHVjZS1uZXctcmV0dXJuLXZhbHVlLTQ1MC5wYXRjaCIKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIjAwMjUtSW1wcm92ZS1sb2NhbF9t YXhfcmF0ZS1vcHRpb24ucGF0Y2giCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICIwMDI2LVByZXZlbnQtaGFuZ2luZy1pbi1TSUdDSExELWhhbmRsZXIu cGF0Y2giCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICIwMDI3LURlbGV0ZS1maWxlcy13aGVuLXVwbG9hZC1mYWlscy5wYXRjaCIKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIjAwMjgtRml4LW1hbi1wYWdl LXJlbmRlcmluZy5wYXRjaCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIjAwMjktRml4LXNlZ2ZhdWx0LWluLWNvbmZpZy1maWxlLXBhcnNlci5wYXRj aCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIjAw MzAtRml4LWxvZ2dpbmctaW50by1zeXNsb2ctd2hlbi1lbmFibGVkLWluLWNvbmZpZy5wYXRjaCIK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIjAwMzEt Rml4LXF1ZXN0aW9uLW1hcmstd2lsZGNhcmQtd2l0aGluZy1hLWZpbGUtbmFtZS5wYXRjaCIKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIjAwMzItUHJv cGFnYXRlLWVycm9ycy1mcm9tLW5mcy13aXRoLXF1b3RhLXRvLWNsaWVudC5wYXRjaCIKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIjAwMzMtSW50cm9k dWNlLVRMU3YxLjEtYW5kLVRMU3YxLjItb3B0aW9ucy5wYXRjaCIKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIjAwMzQtVHVybi1vZmYtc2VjY29tcC1z YW5kYm94LWJlY2F1c2UtaXQtaXMtdG9vLXN0cmljdC5wYXRjaCIKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIjAwMzUtTW9kaWZ5LURILWVuYWJsZW1l bnQtcGF0Y2gtdG8tYnVpbGQtd2l0aC1PcGVuU1NMLTEuMS5wYXRjaCIKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIjAwMzYtUmVkZWZpbmUtVlNGVFBf Q09NTUFORF9GRC10by0xLnBhdGNoIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAiMDAzNy1Eb2N1bWVudC10aGUtcmVsYXRpb25zaGlwLW9mLXRleHRf dXNlcmRiX25hbWVzLWFuZC1jLnBhdGNoIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAiMDAzOC1Eb2N1bWVudC1hbGxvd193cml0ZWFibGVfY2hyb290 LWluLXRoZS1tYW4tcGFnZS5wYXRjaCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIjAwMzktSW1wcm92ZS1kb2N1bWVudGF0aW9uLW9mLUFTQ0lJLW1v ZGUtaW4tdGhlLW1hbi1wYWdlLnBhdGNoIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAiMDA0MC1Vc2Utc3lzdGVtLXdpZGUtY3J5cHRvLXBvbGljeS5w YXRjaCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IjAwNDEtRG9jdW1lbnQtdGhlLW5ldy1kZWZhdWx0LWZvci1zc2xfY2lwaGVycy1pbi10aGUtbWFu LS5wYXRjaCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIjAwNDItV2hlbi1oYW5kbGluZy1GRUFULWNvbW1hbmQtY2hlY2stc3NsX3Rsc3YxXzEtYW5k LXNzbC5wYXRjaCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIjAwNDMtRW5hYmxlLW9ubHktVExTdjEuMi1ieS1kZWZhdWx0LnBhdGNoIgorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiMDA0NC1EaXNhYmxl LWFub255bW91c19lbmFibGUtaW4tZGVmYXVsdC1jb25maWctZmlsZS5wYXRjaCIKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIjAwNDUtRXhwYW5kLWV4 cGxhbmF0aW9uLW9mLWFzY2lpXy1vcHRpb25zLWJlaGF2aW91ci1pbi1tYS5wYXRjaCIKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIjAwNDYtdnNmdHBk LmNvbmYtUmVmZXItdG8tdGhlLW1hbi1wYWdlLXJlZ2FyZGluZy10aGUtYXNjaS5wYXRjaCIKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIjAwNDctRGlz YWJsZS10Y3Bfd3JhcHBlcnMtc3VwcG9ydC5wYXRjaCIKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIjAwNDgtRml4LWRlZmF1bHQtdmFsdWUtb2Ytc3Ry aWN0X3NzbF9yZWFkX2VvZi1pbi1tYW4tcGFnZS5wYXRjaCIKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIjAwNDktQWRkLW5ldy1maWxlbmFtZS1nZW5l cmF0aW9uLWFsZ29yaXRobS1mb3ItU1RPVS1jb21tYS5wYXRjaCIKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIjAwNTAtRG9uLXQtbGluay13aXRoLWxp Ym5zbC5wYXRjaCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIjAwNTEtSW1wcm92ZS1kb2N1bWVudGF0aW9uLW9mLWJldHRlcl9zdG91LWluLXRoZS1t YW4tcGFnZS5wYXRjaCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIjAwNTItRml4LXJETlMtd2l0aC1JUHY2LnBhdGNoIgorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiMDA1My1BbHdheXMtZG8tY2hkaXIt YWZ0ZXItY2hyb290LnBhdGNoIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAiMDA1NC12c2Zfc3lzdXRpbF9yY3Z0aW1lby1DaGVjay1yZXR1cm4tdmFs dWUtb2Ytc2V0c29ja29wLnBhdGNoIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAiMDA1NS12c2Zfc3lzdXRpbF9nZXRfdHotQ2hlY2stdGhlLXJldHVy bi12YWx1ZS1vZi1zeXNjYWxsLnBhdGNoIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAiMDA1Ni1Mb2ctZGllLWNhbGxzLXRvLXN5c2xvZy5wYXRjaCIK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIjAwNTct SW1wcm92ZS1lcnJvci1tZXNzYWdlLXdoZW4tbWF4LW51bWJlci1vZi1iaW5kLWF0dGVtcC5wYXRj aCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIjAw NTgtTWFrZS10aGUtbWF4LW51bWJlci1vZi1iaW5kLXJldHJpZXMtdHVuYWJsZS5wYXRjaCIKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIjAwNTktRml4 LVNFR0ZBVUxULXdoZW4tcnVubmluZy1pbi1hLWNvbnRhaW5lci1hcy1QSUQtMS5wYXRjaCIKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIjAwMDEtTW92 ZS1jbG9zaW5nLXN0YW5kYXJkLUZEcy1hZnRlci1saXN0ZW4ucGF0Y2giCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICIwMDAyLVByZXZlbnQtcmVjdXJz aW9uLWluLWJ1Zy5wYXRjaCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIjAwMDEtU2V0LXNfdXd0bXBfaW5zZXJ0ZWQtb25seS1hZnRlci1yZWNvcmQt aW5zZXJ0aW9uLXJlbS5wYXRjaCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIjAwMDItUmVwZWF0LXB1dHV0eGxpbmUtaWYtaXQtZmFpbHMtd2l0aC1F SU5UUi5wYXRjaCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIjAwMDMtUmVwZWF0LXB1dHV0eGxpbmUtdW50aWwtaXQtc3VjY2VlZHMtaWYtaXQtZmFp bHMtd2l0aC5wYXRjaCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIjAwMDEtRml4LXRpbWVzdGFtcC1oYW5kbGluZy1pbi1NRFRNLnBhdGNoIgorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiMDAwMS1SZW1v dmUtYS1oaW50LWFib3V0LXRoZS1mdHBfaG9tZV9kaXItU0VMaW51eC1ib29sZWFuLnBhdGNoIgor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICApKSkKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKG1hcCAobGFtYmRhICh4KSAoaW52b2tl ICJtdiIgKHN0cmluZy1hcHBlbmQgIi4vIiB4KSAidnNmdHBkLTMuMC4zLyIpKSBwYXRjaGVzKQor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoY2hkaXIgIi4vdnNmdHBkLTMuMC4z IikKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGludm9rZSAiZ2l0IiAiaW5p dCIgIi4iKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoaW52b2tlICJnaXQi ICJjb25maWciICJ1c2VyLmVtYWlsIiAieW91QGV4YW1wbGUuY29tIikKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgKGludm9rZSAiZ2l0IiAiY29uZmlnIiAidXNlci5uYW1lIiAi WW91ciBOYW1lIiApCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChpbnZva2Ug ImdpdCIgImFkZCIgIi4iKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoaW52 b2tlICJnaXQiICJjb21taXQiICItbSIgImZpcnN0IikKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgKG1hcCAobGFtYmRhICh4KSAoaW52b2tlICJnaXQiICJhbSIgKHN0cmluZy1h cHBlbmQgIi4vIiB4KSkpIHBhdGNoZXMpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIChtYXAgKGxhbWJkYSAoeCkgKGludm9rZSAicm0iIChzdHJpbmctYXBwZW5kICIuLyIgeCkp KSBwYXRjaGVzKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoaW52b2tlICJy bSIgIi1yZiIgIi4vLmdpdCIpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChj aGRpciAiLi4vIikKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGludm9rZSAi bXYiICIuL3ZzZnRwZC0zLjAuMyIgIi4uLyIpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIChjaGRpciAiLi4vIikKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg KGludm9rZSAicm0iICItcmYiICIuL3ZzZnRwZC0zLjAuMy0zMi5lbDguc3JjLmNwaW8iKQorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoY2hkaXIgIi4vdnNmdHBkLTMuMC4zIikK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKQorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgI3QpKQorICAgICAgICAgICAgICAgICAgICAgIChhZGQtYmVmb3JlICdp bnN0YWxsICdta2RpcgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChsYW1iZGEq ICgjOmtleSBvdXRwdXRzICM6YWxsb3ctb3RoZXIta2V5cykKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIChsZXQgKChvdXQgKGFzc29jLXJlZiBvdXRwdXRzICJvdXQiKSkpCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChta2Rpci1wIG91dCkKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKG1rZGlyIChzdHJpbmctYXBwZW5kIG91 dCAiL3NiaW4iKSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKG1rZGly IChzdHJpbmctYXBwZW5kIG91dCAiL21hbiIpKQorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAobWtkaXIgKHN0cmluZy1hcHBlbmQgb3V0ICIvbWFuL21hbjUiKSkKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKG1rZGlyIChzdHJpbmctYXBwZW5kIG91 dCAiL21hbi9tYW44IikpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICN0 KSkpCisgICAgICAgICAgICAgICAgICAgICAgKGRlbGV0ZSAnY29uZmlndXJlKSkpKQorICAgIChu YXRpdmUtaW5wdXRzIGAoKCJvcGVuc3NsIiAsb3BlbnNzbCkKKyAgICAgICAgICAgICAgICAgICAg ICgibGludXgtcGFtIiAsbGludXgtcGFtKQorICAgICAgICAgICAgICAgICAgICAgKCJwN3ppcCIg LHA3emlwKQorICAgICAgICAgICAgICAgICAgICAgKCJjcGlvIiAsY3BpbykKKyAgICAgICAgICAg ICAgICAgICAgICgiZ2l0IiAsZ2l0LW1pbmltYWwpCisgICAgICAgICAgICAgICAgICAgICAoImxp YmNhcCIgLGxpYmNhcCkpKQogICAgIChzeW5vcHNpcyAidnNmdHBkIEZUUCBkYWVtb24iKQogICAg IChkZXNjcmlwdGlvbiAiQGNvbW1hbmR7dnNmdHBkfSBpcyBhIGRhZW1vbiB0aGF0IGxpc3RlbnMg b24gYSBUQ1Agc29ja2V0CiBmb3IgY2xpZW50cyBhbmQgZ2l2ZXMgdGhlbSBhY2Nlc3MgdG8gbG9j YWwgZmlsZXMgdmlhIEZpbGUgVHJhbnNmZXIKLS0gCjIuMzAuMgoK --=_62e48f7bb1b8b1216d33a61217f702be-- ------------=_1617133321-10516-1--