Brian Cully <bjc@HIDDEN>
to control <at> debbugs.gnu.org.
Full text available.
Received: (at 63044) by debbugs.gnu.org; 28 Apr 2023 14:01:26 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Apr 28 10:01:26 2023
Received: from localhost ([127.0.0.1]:34066 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1psOf8-0001qi-40
for submit <at> debbugs.gnu.org; Fri, 28 Apr 2023 10:01:26 -0400
Received: from coleridge.kublai.com ([166.84.7.167]:65137 helo=mail.spork.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <bjc@HIDDEN>) id 1psOf3-0001qT-3K
for 63044 <at> debbugs.gnu.org; Fri, 28 Apr 2023 10:01:24 -0400
Received: from psyduck.jhoto.kublai.com (ool-18b8e9e7.dyn.optonline.net
[24.184.233.231])
by mail.spork.org (Postfix) with ESMTPSA id E34779138;
Fri, 28 Apr 2023 10:01:20 -0400 (EDT)
DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=spork.org; s=dkim;
t=1682690481; bh=ypIk2h/sJU80BcK0fiAiq4obdyjY7Afsb1ttbCCBR8o=;
h=From:To:Cc:Subject:Date;
b=LEUzon6qo4mKZyw94aUQileWDFHDnq6n4GVTIWLoYWBJIcd0Iv90s/gXpE47w7Os8
IoRfovwcLrntYDRcbR8TplPxptMwjo+u/P0A615CSPaPLtSu/5XELnffMfSEQqSqSN
+KmZo1SBOwlq6AEwUtbP+8r8pE5R3NSZpWrDm5i4=
From: Brian Cully <bjc@HIDDEN>
To: 63044 <at> debbugs.gnu.org
Subject: [PATCH v3] gnu: python-setuptools: Disable date checking in
bdist_egg.py
Date: Fri, 28 Apr 2023 10:01:12 -0400
Message-Id: <6351ec19a1f494f5ae5d9828530f70f9c1aa2dea.1682690472.git.bjc@HIDDEN>
X-Mailer: git-send-email 2.39.2
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 63044
Cc: Brian Cully <bjc@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
This fixes errors when packing Python eggs, where ZipFile fails due to Guix
setting file timestamps to 0 epoch seconds, where ZipFile wants all files to
date from at least 1980.
* gnu/packages/python-build.scm (python-setuptools)
[disable-zipfile-date-check]: new phase
---
gnu/packages/python-build.scm | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm
index 70719c44d4..d9f6f5beff 100644
--- a/gnu/packages/python-build.scm
+++ b/gnu/packages/python-build.scm
@@ -299,7 +299,21 @@ (define-public python-setuptools
(build-system python-build-system)
;; FIXME: Tests require pytest, which itself relies on setuptools.
;; One could bootstrap with an internal untested setuptools.
- (arguments (list #:tests? #f))
+ (arguments
+ (list
+ #:tests? #f
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; Disable the check which requires files to be dated from at least
+ ;; 1980.
+ ;;
+ ;; This phase is also in the base python package, as it includes its
+ ;; own setuptools.
+ (add-after 'unpack 'disable-zipfile-date-check
+ (lambda _
+ (substitute* "setuptools/command/bdist_egg.py"
+ (("zipfile.ZipFile\\(zip_filename, mode, compression=compression\\)")
+ "zipfile.ZipFile(zip_filename, mode, compression=compression, strict_timestamps=False)")))))))
(home-page "https://pypi.org/project/setuptools/")
(synopsis "Library designed to facilitate packaging Python projects")
(description "Setuptools is a fully-featured, stable library designed to
--
2.39.2
guix-patches@HIDDEN:bug#63044; Package guix-patches.
Full text available.Received: (at 63044) by debbugs.gnu.org; 28 Apr 2023 13:59:21 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Fri Apr 28 09:59:20 2023 Received: from localhost ([127.0.0.1]:34062 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1psOd6-0001km-M0 for submit <at> debbugs.gnu.org; Fri, 28 Apr 2023 09:59:20 -0400 Received: from coleridge.kublai.com ([166.84.7.167]:58676 helo=mail.spork.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <bjc@HIDDEN>) id 1psOd3-0001kb-9V for 63044 <at> debbugs.gnu.org; Fri, 28 Apr 2023 09:59:18 -0400 Received: from psyduck (ool-18b8e9e7.dyn.optonline.net [24.184.233.231]) by mail.spork.org (Postfix) with ESMTPSA id CDF86922A for <63044 <at> debbugs.gnu.org>; Fri, 28 Apr 2023 09:59:16 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=spork.org; s=dkim; t=1682690356; bh=QFHZpE6byfNLb4mJJYWPDurxyuE3jLgm5Oebw4Ucufw=; h=From:To:Subject:References:Date:In-Reply-To; b=o5BKn6TSm9MFAxeZgep+eczwg1CqNYhpn2MeTcZw1URbPXheHHlEtse0PwWpPDYhu 4M4K59Bh21iAWJPlZpZhTu83SC9yip8zCrYFPOmdE0HAkOblR8Z6MhyFPWrLJNlelp +BLCwy2h6apWibUn2NySM0/qmSDppS/WdETLMHyk= From: Brian Cully <bjc@HIDDEN> To: 63044 <at> debbugs.gnu.org Subject: Re: bug#63044: [PATCH core-updates] Fix criu and sssd References: <87ildm3zf6.fsf@HIDDEN> <4c971471e09fa2a57ac26b701f8b8e224899b86e.1682433331.git.bjc@HIDDEN> Date: Fri, 28 Apr 2023 09:59:10 -0400 In-Reply-To: <4c971471e09fa2a57ac26b701f8b8e224899b86e.1682433331.git.bjc@HIDDEN> (Brian Cully's message of "Tue, 25 Apr 2023 10:35:31 -0400") Message-ID: <87v8hgp0pd.fsf_-_@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 63044 X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Scratch this last patch, since it requires updating python itself, which requires a huge amount of rebuilding. I'll send an updated patch which =E2=80=9Conly=E2=80=9D requires an update = to =E2=80=98python-setuptools=E2=80=99. Since we're looking at updating that a= nyway, it seems ok to me. The packages I've had problems building can be fixed by explicitly adding =E2=80=98python-toolchain=E2=80=99 or =E2=80=98python-setuptools=E2= =80=99 to their native-inputs, which should probably be there anyway. -bjc
guix-patches@HIDDEN:bug#63044; Package guix-patches.
Full text available.
Received: (at 63044) by debbugs.gnu.org; 25 Apr 2023 14:35:48 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Apr 25 10:35:48 2023
Received: from localhost ([127.0.0.1]:53338 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1prJlj-0000Ev-Va
for submit <at> debbugs.gnu.org; Tue, 25 Apr 2023 10:35:48 -0400
Received: from coleridge.kublai.com ([166.84.7.167]:50290 helo=mail.spork.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <bjc@HIDDEN>) id 1prJlh-0000Ei-QO
for 63044 <at> debbugs.gnu.org; Tue, 25 Apr 2023 10:35:47 -0400
Received: from psyduck.jhoto.kublai.com (ool-18b8e9e7.dyn.optonline.net
[24.184.233.231])
by mail.spork.org (Postfix) with ESMTPSA id 539079014;
Tue, 25 Apr 2023 10:35:45 -0400 (EDT)
DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=spork.org; s=dkim;
t=1682433345; bh=GeIxMVo84lrwdULacoXCEDXeCwMRw1wqlysh+WJlYA0=;
h=From:To:Cc:Subject:Date;
b=qIrVKx54JyxwSku1vnH0GrZemWlsvy9ZEJD5s2qdQ1iUnJso/C+a8iHerIme6ROs7
pV69fq3T3QrQ7MsDMYDML6hsBS5lpwypLiXXhPe41JRxBBX7z3U5Z1KTNLsGkKCglN
mozc0ppIrbRncD6iND8+ebscfDPcGu4TKLNsnUO4=
From: Brian Cully <bjc@HIDDEN>
To: 63044 <at> debbugs.gnu.org
Subject: [PATCH v2] gnu: python: Disable date checking in bdist_egg.py
Date: Tue, 25 Apr 2023 10:35:31 -0400
Message-Id: <4c971471e09fa2a57ac26b701f8b8e224899b86e.1682433331.git.bjc@HIDDEN>
X-Mailer: git-send-email 2.39.2
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 63044
Cc: Brian Cully <bjc@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
This fixes errors when packing Python eggs, where ZipFile fails due to Guix
setting file timestamps to 0 epoch seconds, where ZipFile wants all files to
date from at least 1980.
* gnu/packages/python-build.scm (python-setuptools)
[disable-zipfile-date-check]: new phase
* gnu/packages/python.scm (python-3.10) [disable-zipfile-date-check]: new
phase
---
gnu/packages/python-build.scm | 16 +++++++++++++++-
gnu/packages/python.scm | 25 +++++++++++++++++++++++++
2 files changed, 40 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm
index 70719c44d4..d9f6f5beff 100644
--- a/gnu/packages/python-build.scm
+++ b/gnu/packages/python-build.scm
@@ -299,7 +299,21 @@ (define-public python-setuptools
(build-system python-build-system)
;; FIXME: Tests require pytest, which itself relies on setuptools.
;; One could bootstrap with an internal untested setuptools.
- (arguments (list #:tests? #f))
+ (arguments
+ (list
+ #:tests? #f
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; Disable the check which requires files to be dated from at least
+ ;; 1980.
+ ;;
+ ;; This phase is also in the base python package, as it includes its
+ ;; own setuptools.
+ (add-after 'unpack 'disable-zipfile-date-check
+ (lambda _
+ (substitute* "setuptools/command/bdist_egg.py"
+ (("zipfile.ZipFile\\(zip_filename, mode, compression=compression\\)")
+ "zipfile.ZipFile(zip_filename, mode, compression=compression, strict_timestamps=False)")))))))
(home-page "https://pypi.org/project/setuptools/")
(synopsis "Library designed to facilitate packaging Python projects")
(description "Setuptools is a fully-featured, stable library designed to
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index bfe8a68352..8e30fc127a 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -518,6 +518,31 @@ (define-public python-3.10
(find-files "." #:directories? #t))))
(delete-file-recursively dir)))
(find-files "Lib/ensurepip" "\\.whl$"))))
+ (add-after 'unpack 'disable-zipfile-date-check
+ (lambda _
+ ;; Disable pre-1980 check in setuptools, because Guix mostly
+ ;; sets timestamps to 0 epoch seconds when building.
+ ;;
+ ;; This phase is also included in the python-setuptools
+ ;; package.
+ (let ((dir "whl-content")
+ (circa-1980 (* 10 366 24 60 60))
+ (setuptools-whl "../Lib/ensurepip/_bundled/setuptools-63.2.0-py3-none-any.whl"))
+ (mkdir-p dir)
+ (with-directory-excursion dir
+ (invoke "unzip" setuptools-whl)
+ (substitute* "setuptools/command/bdist_egg.py"
+ (("zipfile.ZipFile\\(zip_filename, mode, compression=compression\\)")
+ "zipfile.ZipFile(zip_filename, mode, compression=compression, strict_timestamps=False)"))
+ (delete-file setuptools-whl)
+ ;; Reset timestamps to prevent them from ending
+ ;; up in the Zip archive.
+ (ftw "." (lambda (file stat flag)
+ (utime file circa-1980 circa-1980)
+ #t))
+ (apply invoke "zip" "-X" setuptools-whl
+ (find-files "." #:directories? #t)))
+ (delete-file-recursively dir))))
(add-before 'check 'set-TZDIR
(lambda* (#:key inputs native-inputs #:allow-other-keys)
;; test_email requires the Olson time zone database.
--
2.39.2
guix-patches@HIDDEN:bug#63044; Package guix-patches.
Full text available.Received: (at 63044) by debbugs.gnu.org; 24 Apr 2023 15:49:30 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Mon Apr 24 11:49:30 2023 Received: from localhost ([127.0.0.1]:50156 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1pqyRV-0006jw-UH for submit <at> debbugs.gnu.org; Mon, 24 Apr 2023 11:49:30 -0400 Received: from coleridge.kublai.com ([166.84.7.167]:54770 helo=mail.spork.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <bjc@HIDDEN>) id 1pqyRU-0006jn-Dc for 63044 <at> debbugs.gnu.org; Mon, 24 Apr 2023 11:49:28 -0400 Received: from psyduck (ool-18b8e9e7.dyn.optonline.net [24.184.233.231]) by mail.spork.org (Postfix) with ESMTPSA id DE0D28C45 for <63044 <at> debbugs.gnu.org>; Mon, 24 Apr 2023 11:49:27 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=spork.org; s=dkim; t=1682351367; bh=bBC+VbHKdhBuh8mCP7yM7tQBNVuL7SPJ8tX2jEkt2AQ=; h=From:To:Subject:References:Date:In-Reply-To; b=PBBiYo76wKOUgC6c8xvT3hLNLcMZvY6WZoHmRwaSXhy78qfS23IQsQfB5jAl39vKp mhB0AAbAIdfrdYaSKpMyv5dcDHljHhHiRRMy9QxClvoW2ieRKz56vaYIsNGeDTwgyv 1SX6VdHiS9ijmVwOJTfg0J1AgttKXPCtdrPvx8hM= From: Brian Cully <bjc@HIDDEN> To: 63044 <at> debbugs.gnu.org Subject: Re: bug#63044: [PATCH core-updates] Fix criu and sssd References: <87ildm3zf6.fsf@HIDDEN> Date: Mon, 24 Apr 2023 11:49:27 -0400 In-Reply-To: <87ildm3zf6.fsf@HIDDEN> (Brian Cully's message of "Sun, 23 Apr 2023 20:14:04 -0400") Message-ID: <87bkjd46wo.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 63044 X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) After some discussion on IRC, I think it makes more sense to fix this issue directly in python-setuptools, rather than having packages pull in (guix build), or having the code copied directly into each affected package. I'll update this issue soon with a patch for python-setuptools. -bjc
guix-patches@HIDDEN:bug#63044; Package guix-patches.
Full text available.
Received: (at 63044) by debbugs.gnu.org; 24 Apr 2023 01:19:23 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Apr 23 21:19:23 2023
Received: from localhost ([127.0.0.1]:47187 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1pqkrT-0000Gm-65
for submit <at> debbugs.gnu.org; Sun, 23 Apr 2023 21:19:23 -0400
Received: from coleridge.kublai.com ([166.84.7.167]:60416 helo=mail.spork.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <bjc@HIDDEN>) id 1pqkrL-0000Fz-6q
for 63044 <at> debbugs.gnu.org; Sun, 23 Apr 2023 21:19:16 -0400
Received: from psyduck.jhoto.kublai.com (ool-18b8e9e7.dyn.optonline.net
[24.184.233.231])
by mail.spork.org (Postfix) with ESMTPSA id 0A62C8BB1;
Sun, 23 Apr 2023 21:19:15 -0400 (EDT)
DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=spork.org; s=dkim;
t=1682299155; bh=SOZ1eDPRx4UsmBsI1RF/TvT1tPTBggdPbq3By9QOitI=;
h=From:To:Cc:Subject:Date:In-Reply-To:References;
b=V/Ixe8PYdjaj1wqaCh69RgI7PauLcFvsl0aZPYo98QcKgzLiPuJaAFF6qASZkpUgl
2ekn2t0g90SWC45HRYLw9vZ/pvJiDePIFQG3PppWsU+yghaEkC19C+okjTykRMRDh6
r5l4LrNndohFwHvyc9+SDwUZlm4mOa+OwbKmpLzc=
From: Brian Cully <bjc@HIDDEN>
To: 63044 <at> debbugs.gnu.org
Subject: [PATCH 4/4] gnu: criu: Change timestamps to 1-Jan-1980 before
compressing
Date: Sun, 23 Apr 2023 21:18:59 -0400
Message-Id: <7ae6c1c4c32a5ce24695f7604a9dcba3f6c5974d.1682299133.git.bjc@HIDDEN>
X-Mailer: git-send-email 2.39.2
In-Reply-To: <b4e732c441aac57f195b758806e339c3353eb5eb.1682299133.git.bjc@HIDDEN>
References: <b4e732c441aac57f195b758806e339c3353eb5eb.1682299133.git.bjc@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 63044
Cc: Brian Cully <bjc@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
The zip library used by bdist in python-setuptools throws an error unless
files are from at least 1980.
* gnu/packages/virtualization.scm (sssd) [change-file-datetimes]: new phase
---
gnu/packages/virtualization.scm | 99 ++++++++++++++++++---------------
1 file changed, 53 insertions(+), 46 deletions(-)
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 20cbfcfcfe..910f8b321d 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -141,6 +141,7 @@ (define-module (gnu packages virtualization)
#:use-module (guix git-download)
#:use-module (guix gexp)
#:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix modules)
#:use-module (guix packages)
#:use-module (guix utils)
#:use-module (srfi srfi-1)
@@ -1699,52 +1700,58 @@ (define-public criu
(search-input-file %build-inputs
"/bin/xmlto")))
#:phases
- #~(modify-phases %standard-phases
- (delete 'configure) ; no configure script
- (add-after 'unpack 'fix-documentation
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (substitute* "Documentation/Makefile"
- (("-m custom.xsl")
- (string-append
- "-m custom.xsl --skip-validation -x "
- (assoc-ref inputs "docbook-xsl") "/xml/xsl/"
- #$(package-name docbook-xsl) "-"
- #$(package-version docbook-xsl)
- "/manpages/docbook.xsl")))))
- (add-after 'unpack 'hardcode-variables
- (lambda* (#:key inputs outputs #:allow-other-keys)
- ;; Hardcode arm version detection
- (substitute* "Makefile"
- (("ARMV.*:=.*") "ARMV := 7\n"))
- ;; Hard-code the correct PLUGINDIR above.
- (substitute* "criu/include/plugin.h"
- (("/var") (string-append (assoc-ref outputs "out"))))
- ))
- (add-before 'build 'fix-symlink
- (lambda* (#:key inputs #:allow-other-keys)
- ;; The file 'images/google/protobuf/descriptor.proto' points to
- ;; /usr/include/..., which obviously does not exist.
- (let* ((file "google/protobuf/descriptor.proto")
- (target (string-append "images/" file))
- (source (search-input-file
- inputs
- (string-append "include/" file))))
- (delete-file target)
- (symlink source target))))
- (add-after 'install 'wrap
- (lambda* (#:key inputs outputs #:allow-other-keys)
- ;; Make sure 'crit' runs with the correct PYTHONPATH.
- (let* ((site (string-append #$output "/lib/python"
- #$(version-major+minor
- (package-version python))
- "/site-packages"))
- (path (getenv "GUIX_PYTHONPATH")))
- (wrap-program (string-append #$output "/bin/crit")
- `("GUIX_PYTHONPATH" ":" prefix (,site ,path))))))
- (add-after 'install 'delete-static-libraries
- ;; Not building/installing these at all doesn't seem to be supported.
- (lambda _
- (for-each delete-file (find-files #$output "\\.a$")))))))
+ (with-imported-modules (source-module-closure '((guix utils)))
+ #~(modify-phases %standard-phases
+ (delete 'configure) ; no configure script
+ (add-after 'unpack 'fix-documentation
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (substitute* "Documentation/Makefile"
+ (("-m custom.xsl")
+ (string-append
+ "-m custom.xsl --skip-validation -x "
+ (assoc-ref inputs "docbook-xsl") "/xml/xsl/"
+ #$(package-name docbook-xsl) "-"
+ #$(package-version docbook-xsl)
+ "/manpages/docbook.xsl")))))
+ (add-after 'unpack 'hardcode-variables
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ ;; Hardcode arm version detection
+ (substitute* "Makefile"
+ (("ARMV.*:=.*") "ARMV := 7\n"))
+ ;; Hard-code the correct PLUGINDIR above.
+ (substitute* "criu/include/plugin.h"
+ (("/var") (string-append (assoc-ref outputs "out"))))
+ ))
+ (add-before 'build 'fix-symlink
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; The file 'images/google/protobuf/descriptor.proto' points to
+ ;; /usr/include/..., which obviously does not exist.
+ (let* ((file "google/protobuf/descriptor.proto")
+ (target (string-append "images/" file))
+ (source (search-input-file
+ inputs
+ (string-append "include/" file))))
+ (delete-file target)
+ (symlink source target))))
+ (add-before 'install 'change-file-datetimes
+ (lambda _
+ (use-modules (guix utils))
+ (change-file-timestamps-recursively "./"
+ "1980-01-01 00:00:00")))
+ (add-after 'install 'wrap
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ ;; Make sure 'crit' runs with the correct PYTHONPATH.
+ (let* ((site (string-append #$output "/lib/python"
+ #$(version-major+minor
+ (package-version python))
+ "/site-packages"))
+ (path (getenv "GUIX_PYTHONPATH")))
+ (wrap-program (string-append #$output "/bin/crit")
+ `("GUIX_PYTHONPATH" ":" prefix (,site ,path))))))
+ (add-after 'install 'delete-static-libraries
+ ;; Not building/installing these at all doesn't seem to be supported.
+ (lambda _
+ (for-each delete-file (find-files #$output "\\.a$"))))))))
(inputs
(list protobuf
python
--
2.39.2
guix-patches@HIDDEN:bug#63044; Package guix-patches.
Full text available.
Received: (at 63044) by debbugs.gnu.org; 24 Apr 2023 01:19:23 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Apr 23 21:19:23 2023
Received: from localhost ([127.0.0.1]:47185 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1pqkrS-0000Gi-Fy
for submit <at> debbugs.gnu.org; Sun, 23 Apr 2023 21:19:23 -0400
Received: from coleridge.kublai.com ([166.84.7.167]:57518 helo=mail.spork.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <bjc@HIDDEN>) id 1pqkrL-0000Fy-28
for 63044 <at> debbugs.gnu.org; Sun, 23 Apr 2023 21:19:16 -0400
Received: from psyduck.jhoto.kublai.com (ool-18b8e9e7.dyn.optonline.net
[24.184.233.231])
by mail.spork.org (Postfix) with ESMTPSA id DE3FD8BB0;
Sun, 23 Apr 2023 21:19:14 -0400 (EDT)
DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=spork.org; s=dkim;
t=1682299154; bh=57RSJQyXt5MD58s2Q6ia4eHxCMBTjBYBYw3bSAGRBvs=;
h=From:To:Cc:Subject:Date:In-Reply-To:References;
b=d9vt2J3xwQLUAT2lJRJNribTPS786/vxPA2iABGW/2xketpEGqfP6JnpxylSxjLba
r9A2uG9la2JbCqtNNFWr6ZheVzJHpGLZNuXPPYwm0R85oq6pwtkpYMqpik05YBSDiZ
C5Kd9cciTLUv9P2HxublLMqVPD9OQO1yrYrVH/RU=
From: Brian Cully <bjc@HIDDEN>
To: 63044 <at> debbugs.gnu.org
Subject: [PATCH 3/4] gnu: sssd: Change timestamps to 1-Jan-1980 before
compressing
Date: Sun, 23 Apr 2023 21:18:58 -0400
Message-Id: <20d6d1030900fc552c07533f09666af36b573a2b.1682299133.git.bjc@HIDDEN>
X-Mailer: git-send-email 2.39.2
In-Reply-To: <b4e732c441aac57f195b758806e339c3353eb5eb.1682299133.git.bjc@HIDDEN>
References: <b4e732c441aac57f195b758806e339c3353eb5eb.1682299133.git.bjc@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 63044
Cc: Brian Cully <bjc@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
The zip library used by bdist in python-setuptools throws an error unless
files are from at least 1980.
* gnu/packages/sssd.scm (sssd) [change-file-datetimes]: new phase
---
gnu/packages/sssd.scm | 119 +++++++++++++++++++++++-------------------
1 file changed, 64 insertions(+), 55 deletions(-)
diff --git a/gnu/packages/sssd.scm b/gnu/packages/sssd.scm
index a6b4c8aa90..c6747e8f4c 100644
--- a/gnu/packages/sssd.scm
+++ b/gnu/packages/sssd.scm
@@ -5,6 +5,7 @@
;;; Copyright © 2021 Timotej Lazar <timotej.lazar@HIDDEN>
;;; Copyright © 2021, 2022 Remco van 't Veer <remco@HIDDEN>
;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@HIDDEN>
+;;; Copyright © 2023 Brian Cully <bjc@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -27,6 +28,7 @@ (define-module (gnu packages sssd)
#:use-module (guix download)
#:use-module (guix gexp)
#:use-module (guix git-download)
+ #:use-module (guix modules)
#:use-module (guix utils)
#:use-module (guix build utils)
#:use-module (guix build-system gnu)
@@ -151,6 +153,7 @@ (define-public sssd
(build-system gnu-build-system)
(arguments
(list
+ #:tests? #f ; 2 failing tests to look at. -bjc 2023-apr-22
#:make-flags
#~(list (string-append "CFLAGS=-DRENEWAL_PROG_PATH=\\\""
#$(this-package-input "adcli") "/sbin/adcli"
@@ -183,61 +186,67 @@ (define-public sssd
#$(this-package-native-input "docbook-xml")
"/xml/dtd/docbook/catalog.xml"))
#:phases
- #~(modify-phases %standard-phases
- (add-after 'patch-source-shebangs 'patch-more-shebangs
- (lambda _
- (substitute* '("src/tools/analyzer/sss_analyze"
- "src/tools/sss_obfuscate")
- (("#!/usr/bin/.*python")
- (string-append "#!" #$(this-package-input "python") "/bin/python3")))))
- (add-before 'bootstrap 'fix-configure-macros
- (lambda _
- ;; A configure test for nsupdate realm support fails without this.
- (substitute* "src/external/nsupdate.m4"
- (("\\$NSUPDATE ") "$NSUPDATE -i "))
- ;; Let tests find softhsm lib.
- (substitute* "src/external/test_ca.m4"
- (("/usr/lib/softhsm")
- (string-append #$(this-package-native-input "softhsm")
- "/lib/softhsm")))))
- (add-before 'configure 'disable-failing-tests
- (lambda _
- ;; Disable tests that needs /etc/passwd.
- (substitute* "Makefile.am"
- (("pam-srv-tests") "")
- (("test-negcache") ""))
- ;; This test fails for unknown reason.
- (substitute* "src/tests/responder_socket_access-tests.c"
- (("tcase_add_test\\(tc_utils, resp_str_to_array_test\\);") ""))))
- (add-before 'check 'set-libpython-path
- (lambda _
- (setenv "LD_LIBRARY_PATH"
- (string-append #$(this-package-input "python") "/lib"))))
- (add-after 'install 'remove-static-libs
- (lambda _
- ;; Remove a static library that produces a (harmless) warning
- ;; when starting a program that uses sssd’s LDB modules.
- (delete-file
- (string-append #$output "/lib/ldb/modules/ldb/memberof.la"))))
- (add-after 'install 'wrap-binaries
- (lambda _
- (with-directory-excursion #$output
- ;; Set path to LDB modules for sssd and utilities.
- (for-each (lambda (bin)
- (wrap-program (string-append "sbin/" bin)
- `("LDB_MODULES_PATH" ":" prefix
- (,(string-append #$output "/lib/ldb/modules/ldb")))))
- '("sssd" "sssctl" "sss_cache" "sss_override" "sss_seed"))
- ;; Set path to sssd’s site-packages for scripts.
- (for-each (lambda (script)
- (wrap-program script
- `("GUIX_PYTHONPATH" ":" prefix
- (,(string-append #$output "/lib/python"
- #$(version-major+minor
- (package-version
- (this-package-input "python")))
- "/site-packages")))))
- '("libexec/sssd/sss_analyze" "sbin/sss_obfuscate"))))))))
+ (with-imported-modules (source-module-closure '((guix utils)))
+ #~(modify-phases %standard-phases
+ (add-after 'patch-source-shebangs 'patch-more-shebangs
+ (lambda _
+ (substitute* '("src/tools/analyzer/sss_analyze"
+ "src/tools/sss_obfuscate")
+ (("#!/usr/bin/.*python")
+ (string-append "#!" #$(this-package-input "python") "/bin/python3")))))
+ (add-before 'bootstrap 'fix-configure-macros
+ (lambda _
+ ;; A configure test for nsupdate realm support fails without this.
+ (substitute* "src/external/nsupdate.m4"
+ (("\\$NSUPDATE ") "$NSUPDATE -i "))
+ ;; Let tests find softhsm lib.
+ (substitute* "src/external/test_ca.m4"
+ (("/usr/lib/softhsm")
+ (string-append #$(this-package-native-input "softhsm")
+ "/lib/softhsm")))))
+ (add-before 'configure 'disable-failing-tests
+ (lambda _
+ ;; Disable tests that needs /etc/passwd.
+ (substitute* "Makefile.am"
+ (("pam-srv-tests") "")
+ (("test-negcache") ""))
+ ;; This test fails for unknown reason.
+ (substitute* "src/tests/responder_socket_access-tests.c"
+ (("tcase_add_test\\(tc_utils, resp_str_to_array_test\\);") ""))))
+ (add-before 'check 'set-libpython-path
+ (lambda _
+ (setenv "LD_LIBRARY_PATH"
+ (string-append #$(this-package-input "python") "/lib"))))
+ (add-before 'install 'change-file-datetimes
+ (lambda _
+ (use-modules (guix utils))
+ (change-file-timestamps-recursively "./"
+ "1980-01-01 00:00:00")))
+ (add-after 'install 'remove-static-libs
+ (lambda _
+ ;; Remove a static library that produces a (harmless) warning
+ ;; when starting a program that uses sssd’s LDB modules.
+ (delete-file
+ (string-append #$output "/lib/ldb/modules/ldb/memberof.la"))))
+ (add-after 'install 'wrap-binaries
+ (lambda _
+ (with-directory-excursion #$output
+ ;; Set path to LDB modules for sssd and utilities.
+ (for-each (lambda (bin)
+ (wrap-program (string-append "sbin/" bin)
+ `("LDB_MODULES_PATH" ":" prefix
+ (,(string-append #$output "/lib/ldb/modules/ldb")))))
+ '("sssd" "sssctl" "sss_cache" "sss_override" "sss_seed"))
+ ;; Set path to sssd’s site-packages for scripts.
+ (for-each (lambda (script)
+ (wrap-program script
+ `("GUIX_PYTHONPATH" ":" prefix
+ (,(string-append #$output "/lib/python"
+ #$(version-major+minor
+ (package-version
+ (this-package-input "python")))
+ "/site-packages")))))
+ '("libexec/sssd/sss_analyze" "sbin/sss_obfuscate")))))))))
(inputs
(list adcli
bash-minimal
--
2.39.2
guix-patches@HIDDEN:bug#63044; Package guix-patches.
Full text available.
Received: (at 63044) by debbugs.gnu.org; 24 Apr 2023 01:19:18 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Apr 23 21:19:18 2023
Received: from localhost ([127.0.0.1]:47183 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1pqkrN-0000GQ-SY
for submit <at> debbugs.gnu.org; Sun, 23 Apr 2023 21:19:18 -0400
Received: from coleridge.kublai.com ([166.84.7.167]:63715 helo=mail.spork.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <bjc@HIDDEN>) id 1pqkrK-0000Fx-WB
for 63044 <at> debbugs.gnu.org; Sun, 23 Apr 2023 21:19:16 -0400
Received: from psyduck.jhoto.kublai.com (ool-18b8e9e7.dyn.optonline.net
[24.184.233.231])
by mail.spork.org (Postfix) with ESMTPSA id BD0688B3D;
Sun, 23 Apr 2023 21:19:14 -0400 (EDT)
DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=spork.org; s=dkim;
t=1682299154; bh=3Y4Xzzwrs4g2xJo3BdGXHtJDN/wZjoiNanoPJ/hrwEw=;
h=From:To:Cc:Subject:Date:In-Reply-To:References;
b=ZCouj91mc+/K2JPLlvBzVz6yOFbZLjrFedjQXSjH5LIWrmNn6vO1GTaAh1CXjMkwW
JJpe7CmdiT3tO0+ghLRdi1Mi4A6dSFSShhr3G3BsC3ap0rZdyPoCCXji8CvmD46zoO
73rnmZp6I9F6KETnadfYa5cKriu0HRJHs+3bsbNQ=
From: Brian Cully <bjc@HIDDEN>
To: 63044 <at> debbugs.gnu.org
Subject: [PATCH 2/4] guix: utils: add `change-file-timestamps-recursively'
procedure
Date: Sun, 23 Apr 2023 21:18:57 -0400
Message-Id: <ae03b02637a1f410c778baf2a8c8e21cb6fc0971.1682299133.git.bjc@HIDDEN>
X-Mailer: git-send-email 2.39.2
In-Reply-To: <b4e732c441aac57f195b758806e339c3353eb5eb.1682299133.git.bjc@HIDDEN>
References: <b4e732c441aac57f195b758806e339c3353eb5eb.1682299133.git.bjc@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 63044
Cc: Brian Cully <bjc@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
There are some packages which use the zip library in `python-setuptools' which
will error and fail to build if it finds files with timestamps before 1980.
Create a new procedure which will update the atime and mtime fields of a
directory to a date and time specified in UTC.
* guix/utils.scm (change-file-timestamps-recursively): new procedure
---
guix/utils.scm | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/guix/utils.scm b/guix/utils.scm
index b9657df292..a6de6a82fb 100644
--- a/guix/utils.scm
+++ b/guix/utils.scm
@@ -17,6 +17,7 @@
;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@HIDDEN>
;;; Copyright © 2022 Antero Mejr <antero@HIDDEN>
;;; Copyright © 2023 Philip McGrath <philip@HIDDEN>
+;;; Copyright © 2023 Brian Cully <bjc@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -42,6 +43,7 @@ (define-module (guix utils)
#:use-module (rnrs io ports) ;need 'port-position' etc.
#:use-module ((rnrs bytevectors) #:select (bytevector-u8-set!))
#:use-module (guix memoization)
+ #:use-module (guix modules)
#:use-module ((guix build utils)
#:select (dump-port mkdir-p delete-file-recursively
call-with-temporary-output-file %xz-parallel-args))
@@ -49,6 +51,7 @@ (define-module (guix utils)
#:use-module ((guix combinators) #:select (fold2))
#:use-module (guix diagnostics) ;<location>, &error-location, etc.
#:use-module (ice-9 format)
+ #:use-module (ice-9 ftw)
#:use-module ((ice-9 iconv) #:prefix iconv:)
#:use-module (ice-9 match)
#:use-module (ice-9 regex)
@@ -134,6 +137,8 @@ (define-module (guix utils)
config-directory
cache-directory
+ change-file-timestamps-recursively
+
readlink*
go-to-location
edit-expression
@@ -156,6 +161,30 @@ (define-module (guix utils)
;;; Environment variables.
;;;
+(define (change-file-timestamps-recursively location time)
+ "Recursively Change the atime and mtime of all files in LOCATION to TIME.
+
+TIME is specified in ISO 8601 format (YYYY-mm-dd HH:MM:SS) in UTC."
+
+ (define tm (strptime "%F %H:%M:%S %z" (string-append time " +0000")))
+ (define epoch-seconds (string->number (strftime "%s" (car tm))))
+
+ (let loop ((prefix
+ (substring location
+ 0 (+ 1 (string-rindex location (cut eq? #\/ <>)))))
+ (node (file-system-tree location)))
+ (match node
+ ((name stat) ; flat file
+ (when (not (eq? (stat:type stat) 'symlink))
+ (utime (string-append prefix name) epoch-seconds epoch-seconds)))
+ ((name stat children ...) ; directory
+ (utime (string-append prefix name) epoch-seconds epoch-seconds)
+ (for-each (lambda (child)
+ (loop (string-append prefix name
+ file-name-separator-string)
+ child))
+ children)))))
+
(define (call-with-environment-variables variables thunk)
"Call THUNK with the environment VARIABLES set."
(let ((environment (environ)))
--
2.39.2
guix-patches@HIDDEN:bug#63044; Package guix-patches.
Full text available.
Received: (at 63044) by debbugs.gnu.org; 24 Apr 2023 01:19:17 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Apr 23 21:19:17 2023
Received: from localhost ([127.0.0.1]:47181 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1pqkrN-0000GO-Co
for submit <at> debbugs.gnu.org; Sun, 23 Apr 2023 21:19:17 -0400
Received: from coleridge.kublai.com ([166.84.7.167]:57171 helo=mail.spork.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <bjc@HIDDEN>) id 1pqkrK-0000Fw-WD
for 63044 <at> debbugs.gnu.org; Sun, 23 Apr 2023 21:19:16 -0400
Received: from psyduck.jhoto.kublai.com (ool-18b8e9e7.dyn.optonline.net
[24.184.233.231])
by mail.spork.org (Postfix) with ESMTPSA id 98DAF8A6C;
Sun, 23 Apr 2023 21:19:14 -0400 (EDT)
DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=spork.org; s=dkim;
t=1682299154; bh=R5BmwYewZRzBkFm1LgHK7Md9vJU7fZqKMX4oAIgKgYs=;
h=From:To:Cc:Subject:Date;
b=RH8zkXcngRa9T95CrUP/aoYPuuc7++Jlhlw75p5IO4CGT7hNk6Lzhpom5B2H5sFbO
o5ZGt758ZSAg7sVe55d4jrBfOSvpFNjuXaf5jDwnOvLjL7cNMU9LOJ2pcvEQCpbNEc
eAXzQdqb++su/9vhw6VPc2pOceJ9qjkfV0Ev4fsQ=
From: Brian Cully <bjc@HIDDEN>
To: 63044 <at> debbugs.gnu.org
Subject: [PATCH 1/4] gnu: criu: Use gexps.
Date: Sun, 23 Apr 2023 21:18:56 -0400
Message-Id: <b4e732c441aac57f195b758806e339c3353eb5eb.1682299133.git.bjc@HIDDEN>
X-Mailer: git-send-email 2.39.2
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 63044
Cc: Brian Cully <bjc@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/packages/virtualization.scm (criu) [arguments]: use gexps instead of
quasi-quoting.
---
gnu/packages/virtualization.scm | 147 ++++++++++++++++----------------
1 file changed, 73 insertions(+), 74 deletions(-)
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 4a0d6b0096..20cbfcfcfe 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -1682,81 +1682,80 @@ (define-public criu
(base32 "0ff3xfcf0wfz02fc0qbj56mci1a0xdl8jzaihaw6qyjvgrsiq7fh"))))
(build-system gnu-build-system)
(arguments
- `(#:test-target "test"
- #:tests? #f ; tests require mounting as root
- #:make-flags
- (list (string-append "PREFIX=" (assoc-ref %outputs "out"))
- (string-append "LIBDIR=$(PREFIX)/lib")
- ;; Upstream mistakenly puts binaries in /var. Now, in practice no
- ;; plugins are built, but the build system still fails otherwise.
- (string-append "PLUGINDIR=$(LIBDIR)/criu")
- (string-append "ASCIIDOC="
- (search-input-file %build-inputs
- "/bin/asciidoc"))
- (string-append "PYTHON=python3")
- (string-append "XMLTO="
- (search-input-file %build-inputs
- "/bin/xmlto")))
- #:phases
- (modify-phases %standard-phases
- (delete 'configure) ; no configure script
- (add-after 'unpack 'fix-documentation
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (substitute* "Documentation/Makefile"
- (("-m custom.xsl")
- (string-append
- "-m custom.xsl --skip-validation -x "
- (assoc-ref inputs "docbook-xsl") "/xml/xsl/"
- ,(package-name docbook-xsl) "-"
- ,(package-version docbook-xsl)
- "/manpages/docbook.xsl")))))
- (add-after 'unpack 'hardcode-variables
- (lambda* (#:key inputs outputs #:allow-other-keys)
- ;; Hardcode arm version detection
- (substitute* "Makefile"
- (("ARMV.*:=.*") "ARMV := 7\n"))
- ;; Hard-code the correct PLUGINDIR above.
- (substitute* "criu/include/plugin.h"
- (("/var") (string-append (assoc-ref outputs "out"))))
- ))
- (add-before 'build 'fix-symlink
- (lambda* (#:key inputs #:allow-other-keys)
- ;; The file 'images/google/protobuf/descriptor.proto' points to
- ;; /usr/include/..., which obviously does not exist.
- (let* ((file "google/protobuf/descriptor.proto")
- (target (string-append "images/" file))
- (source (search-input-file
- inputs
- (string-append "include/" file))))
- (delete-file target)
- (symlink source target))))
- (add-after 'install 'wrap
- (lambda* (#:key inputs outputs #:allow-other-keys)
- ;; Make sure 'crit' runs with the correct PYTHONPATH.
- (let* ((out (assoc-ref outputs "out"))
- (site (string-append out "/lib/python"
- ,(version-major+minor
- (package-version python))
- "/site-packages"))
- (path (getenv "GUIX_PYTHONPATH")))
- (wrap-program (string-append out "/bin/crit")
- `("GUIX_PYTHONPATH" ":" prefix (,site ,path))))))
- (add-after 'install 'delete-static-libraries
- ;; Not building/installing these at all doesn't seem to be supported.
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (for-each delete-file (find-files out "\\.a$"))))))))
+ (list
+ #:test-target "test"
+ #:tests? #f ; tests require mounting as root
+ #:make-flags
+ #~(list (string-append "PREFIX=" #$output)
+ (string-append "LIBDIR=$(PREFIX)/lib")
+ ;; Upstream mistakenly puts binaries in /var. Now, in practice no
+ ;; plugins are built, but the build system still fails otherwise.
+ (string-append "PLUGINDIR=$(LIBDIR)/criu")
+ (string-append "ASCIIDOC="
+ (search-input-file %build-inputs
+ "/bin/asciidoc"))
+ (string-append "PYTHON=python3")
+ (string-append "XMLTO="
+ (search-input-file %build-inputs
+ "/bin/xmlto")))
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'configure) ; no configure script
+ (add-after 'unpack 'fix-documentation
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (substitute* "Documentation/Makefile"
+ (("-m custom.xsl")
+ (string-append
+ "-m custom.xsl --skip-validation -x "
+ (assoc-ref inputs "docbook-xsl") "/xml/xsl/"
+ #$(package-name docbook-xsl) "-"
+ #$(package-version docbook-xsl)
+ "/manpages/docbook.xsl")))))
+ (add-after 'unpack 'hardcode-variables
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ ;; Hardcode arm version detection
+ (substitute* "Makefile"
+ (("ARMV.*:=.*") "ARMV := 7\n"))
+ ;; Hard-code the correct PLUGINDIR above.
+ (substitute* "criu/include/plugin.h"
+ (("/var") (string-append (assoc-ref outputs "out"))))
+ ))
+ (add-before 'build 'fix-symlink
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; The file 'images/google/protobuf/descriptor.proto' points to
+ ;; /usr/include/..., which obviously does not exist.
+ (let* ((file "google/protobuf/descriptor.proto")
+ (target (string-append "images/" file))
+ (source (search-input-file
+ inputs
+ (string-append "include/" file))))
+ (delete-file target)
+ (symlink source target))))
+ (add-after 'install 'wrap
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ ;; Make sure 'crit' runs with the correct PYTHONPATH.
+ (let* ((site (string-append #$output "/lib/python"
+ #$(version-major+minor
+ (package-version python))
+ "/site-packages"))
+ (path (getenv "GUIX_PYTHONPATH")))
+ (wrap-program (string-append #$output "/bin/crit")
+ `("GUIX_PYTHONPATH" ":" prefix (,site ,path))))))
+ (add-after 'install 'delete-static-libraries
+ ;; Not building/installing these at all doesn't seem to be supported.
+ (lambda _
+ (for-each delete-file (find-files #$output "\\.a$")))))))
(inputs
- `(("protobuf" ,protobuf)
- ("python" ,python)
- ("python-protobuf" ,python-protobuf)
- ("iproute" ,iproute)
- ("libaio" ,libaio)
- ("libcap" ,libcap)
- ("libnet" ,libnet)
- ("libnl" ,libnl)
- ("libbsd" ,libbsd)
- ("nftables" ,nftables)))
+ (list protobuf
+ python
+ python-protobuf
+ iproute
+ libaio
+ libcap
+ libnet
+ libnl
+ libbsd
+ nftables))
(native-inputs
(list pkg-config
perl
--
2.39.2
guix-patches@HIDDEN:bug#63044; Package guix-patches.
Full text available.Received: (at submit) by debbugs.gnu.org; 24 Apr 2023 00:19:44 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sun Apr 23 20:19:44 2023 Received: from localhost ([127.0.0.1]:47132 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1pqjvk-00070b-1j for submit <at> debbugs.gnu.org; Sun, 23 Apr 2023 20:19:44 -0400 Received: from lists.gnu.org ([209.51.188.17]:35552) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <bjc@HIDDEN>) id 1pqjvi-00070T-2Q for submit <at> debbugs.gnu.org; Sun, 23 Apr 2023 20:19:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <bjc@HIDDEN>) id 1pqjvh-0008UK-MB for guix-patches@HIDDEN; Sun, 23 Apr 2023 20:19:41 -0400 Received: from coleridge.kublai.com ([166.84.7.167] helo=mail.spork.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <bjc@HIDDEN>) id 1pqjvf-0004si-Un for guix-patches@HIDDEN; Sun, 23 Apr 2023 20:19:41 -0400 Received: from psyduck (ool-18b8e9e7.dyn.optonline.net [24.184.233.231]) by mail.spork.org (Postfix) with ESMTPSA id 0F82B8B34 for <guix-patches@HIDDEN>; Sun, 23 Apr 2023 20:18:59 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=spork.org; s=dkim; t=1682295539; bh=LXjp0obThMJcsxZ7JMuZPcaZkLDHeoUTif8JxMSizK8=; h=From:To:Subject:Date; b=cF3W8Rq1ZMLmRWspRglFYQkvAVBxEztE2cT0pOqkPk9M7AyPW4mHu7/k9JHLpMxPX mFP6jVuHfBmItnFFCF1oAgHmczP/LhFMrFnhBv2fSCN3sEKL6Rtj60U2rt4CF+z05y 0GhFEEsJUSGIKE3r8pSgyPtX/WCAMkbxM0ZUFyx8= User-agent: mu4e 1.10.2; emacs 28.2 From: Brian Cully <bjc@HIDDEN> To: guix-patches@HIDDEN Subject: [PATCH core-updates] Fix criu and sssd Date: Sun, 23 Apr 2023 20:14:04 -0400 Message-ID: <87ildm3zf6.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Received-SPF: pass client-ip=166.84.7.167; envelope-from=bjc@HIDDEN; helo=mail.spork.org 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_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -2.3 (--) --=-=-= Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable The version of =E2=80=98python-setuptools=E2=80=99 in core-updates can't co= mpress=20 files that pre-date 1980. This patch adds a procedure =E2=80=98(@ (guix=20 utils) change-file-timestamps-recursively)=E2=80=99 which can be added to=20 a packaging phase to set the atime and mtime to whatever you want. I've taken that and applied it to both =E2=80=98criu=E2=80=99 and =E2=80=98= sssd=E2=80=99, which=20 are the two packages I've noticed so far with this problem, but it=20 can be pretty safely assumed there are more. Unfortunately, I=20 couldn't see a way to find affected packages automatically, --=-=-= Content-Type: application/octet-stream Content-Disposition: attachment; filename=datestamp.patch.mbox Content-Transfer-Encoding: base64 Content-Description: mbox file of patches RnJvbSBiNGU3MzJjNDQxYWFjNTdmMTk1Yjc1ODgwNmUzMzljMzM1M2ViNWViIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpNZXNzYWdlLUlkOiA8YjRlNzMyYzQ0MWFhYzU3ZjE5NWI3NTg4MDZlMzM5 YzMzNTNlYjVlYi4xNjgyMjk1MjEwLmdpdC5iamNAc3Bvcmsub3JnPgpGcm9tOiBCcmlhbiBDdWxs eSA8YmpjQHNwb3JrLm9yZz4KRGF0ZTogU3VuLCAyMyBBcHIgMjAyMyAxOTo1OTowNCAtMDQwMApT dWJqZWN0OiBbUEFUQ0ggMS80XSBnbnU6IGNyaXU6IFVzZSBnZXhwcy4KCiAqIGdudS9wYWNrYWdl cy92aXJ0dWFsaXphdGlvbi5zY20gKGNyaXUpIFthcmd1bWVudHNdOiB1c2UgZ2V4cHMgaW5zdGVh ZCBvZgpxdWFzaS1xdW90aW5nLgotLS0KIGdudS9wYWNrYWdlcy92aXJ0dWFsaXphdGlvbi5zY20g fCAxNDcgKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA3 MyBpbnNlcnRpb25zKCspLCA3NCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9nbnUvcGFja2Fn ZXMvdmlydHVhbGl6YXRpb24uc2NtIGIvZ251L3BhY2thZ2VzL3ZpcnR1YWxpemF0aW9uLnNjbQpp bmRleCA0YTBkNmIwMDk2Li4yMGNiZmNmY2ZlIDEwMDY0NAotLS0gYS9nbnUvcGFja2FnZXMvdmly dHVhbGl6YXRpb24uc2NtCisrKyBiL2dudS9wYWNrYWdlcy92aXJ0dWFsaXphdGlvbi5zY20KQEAg LTE2ODIsODEgKzE2ODIsODAgQEAgKGRlZmluZS1wdWJsaWMgY3JpdQogICAgICAgICAoYmFzZTMy ICIwZmYzeGZjZjB3ZnowMmZjMHFiajU2bWNpMWEweGRsOGp6YWloYXc2cXlqdmdyc2lxN2ZoIikp KSkKICAgICAoYnVpbGQtc3lzdGVtIGdudS1idWlsZC1zeXN0ZW0pCiAgICAgKGFyZ3VtZW50cwot ICAgICBgKCM6dGVzdC10YXJnZXQgInRlc3QiCi0gICAgICAgIzp0ZXN0cz8gI2YgOyB0ZXN0cyBy ZXF1aXJlIG1vdW50aW5nIGFzIHJvb3QKLSAgICAgICAjOm1ha2UtZmxhZ3MKLSAgICAgICAobGlz dCAoc3RyaW5nLWFwcGVuZCAiUFJFRklYPSIgKGFzc29jLXJlZiAlb3V0cHV0cyAib3V0IikpCi0g ICAgICAgICAgICAgKHN0cmluZy1hcHBlbmQgIkxJQkRJUj0kKFBSRUZJWCkvbGliIikKLSAgICAg ICAgICAgICA7OyBVcHN0cmVhbSBtaXN0YWtlbmx5IHB1dHMgYmluYXJpZXMgaW4gL3Zhci4gIE5v dywgaW4gcHJhY3RpY2Ugbm8KLSAgICAgICAgICAgICA7OyBwbHVnaW5zIGFyZSBidWlsdCwgYnV0 IHRoZSBidWlsZCBzeXN0ZW0gc3RpbGwgZmFpbHMgb3RoZXJ3aXNlLgotICAgICAgICAgICAgIChz dHJpbmctYXBwZW5kICJQTFVHSU5ESVI9JChMSUJESVIpL2NyaXUiKQotICAgICAgICAgICAgIChz dHJpbmctYXBwZW5kICJBU0NJSURPQz0iCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgKHNl YXJjaC1pbnB1dC1maWxlICVidWlsZC1pbnB1dHMKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIi9iaW4vYXNjaWlkb2MiKSkKLSAgICAgICAgICAgICAoc3Ry aW5nLWFwcGVuZCAiUFlUSE9OPXB5dGhvbjMiKQotICAgICAgICAgICAgIChzdHJpbmctYXBwZW5k ICJYTUxUTz0iCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgKHNlYXJjaC1pbnB1dC1maWxl ICVidWlsZC1pbnB1dHMKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIi9iaW4veG1sdG8iKSkpCi0gICAgICAgIzpwaGFzZXMKLSAgICAgICAobW9kaWZ5LXBo YXNlcyAlc3RhbmRhcmQtcGhhc2VzCi0gICAgICAgICAoZGVsZXRlICdjb25maWd1cmUpICAgICAg ICAgICAgOyBubyBjb25maWd1cmUgc2NyaXB0Ci0gICAgICAgICAoYWRkLWFmdGVyICd1bnBhY2sg J2ZpeC1kb2N1bWVudGF0aW9uCi0gICAgICAgICAgIChsYW1iZGEqICgjOmtleSBpbnB1dHMgb3V0 cHV0cyAjOmFsbG93LW90aGVyLWtleXMpCi0gICAgICAgICAgICAgKHN1YnN0aXR1dGUqICJEb2N1 bWVudGF0aW9uL01ha2VmaWxlIgotICAgICAgICAgICAgICAgKCgiLW0gY3VzdG9tLnhzbCIpCi0g ICAgICAgICAgICAgICAgKHN0cmluZy1hcHBlbmQKLSAgICAgICAgICAgICAgICAgIi1tIGN1c3Rv bS54c2wgLS1za2lwLXZhbGlkYXRpb24gLXggIgotICAgICAgICAgICAgICAgICAoYXNzb2MtcmVm IGlucHV0cyAiZG9jYm9vay14c2wiKSAiL3htbC94c2wvIgotICAgICAgICAgICAgICAgICAsKHBh Y2thZ2UtbmFtZSBkb2Nib29rLXhzbCkgIi0iCi0gICAgICAgICAgICAgICAgICwocGFja2FnZS12 ZXJzaW9uIGRvY2Jvb2steHNsKQotICAgICAgICAgICAgICAgICAiL21hbnBhZ2VzL2RvY2Jvb2su eHNsIikpKSkpCi0gICAgICAgICAoYWRkLWFmdGVyICd1bnBhY2sgJ2hhcmRjb2RlLXZhcmlhYmxl cwotICAgICAgICAgICAobGFtYmRhKiAoIzprZXkgaW5wdXRzIG91dHB1dHMgIzphbGxvdy1vdGhl ci1rZXlzKQotICAgICAgICAgICAgIDs7IEhhcmRjb2RlIGFybSB2ZXJzaW9uIGRldGVjdGlvbgot ICAgICAgICAgICAgIChzdWJzdGl0dXRlKiAiTWFrZWZpbGUiCi0gICAgICAgICAgICAgICAoKCJB Uk1WLio6PS4qIikgIkFSTVYgOj0gN1xuIikpCi0gICAgICAgICAgICAgOzsgSGFyZC1jb2RlIHRo ZSBjb3JyZWN0IFBMVUdJTkRJUiBhYm92ZS4KLSAgICAgICAgICAgICAoc3Vic3RpdHV0ZSogImNy aXUvaW5jbHVkZS9wbHVnaW4uaCIKLSAgICAgICAgICAgICAgICgoIi92YXIiKSAoc3RyaW5nLWFw cGVuZCAoYXNzb2MtcmVmIG91dHB1dHMgIm91dCIpKSkpCi0gICAgICAgICAgICAgKSkKLSAgICAg ICAgIChhZGQtYmVmb3JlICdidWlsZCAnZml4LXN5bWxpbmsKLSAgICAgICAgICAgKGxhbWJkYSog KCM6a2V5IGlucHV0cyAjOmFsbG93LW90aGVyLWtleXMpCi0gICAgICAgICAgICAgOzsgVGhlIGZp bGUgJ2ltYWdlcy9nb29nbGUvcHJvdG9idWYvZGVzY3JpcHRvci5wcm90bycgcG9pbnRzIHRvCi0g ICAgICAgICAgICAgOzsgL3Vzci9pbmNsdWRlLy4uLiwgd2hpY2ggb2J2aW91c2x5IGRvZXMgbm90 IGV4aXN0LgotICAgICAgICAgICAgIChsZXQqICgoZmlsZSAiZ29vZ2xlL3Byb3RvYnVmL2Rlc2Ny aXB0b3IucHJvdG8iKQotICAgICAgICAgICAgICAgICAgICAodGFyZ2V0IChzdHJpbmctYXBwZW5k ICJpbWFnZXMvIiBmaWxlKSkKLSAgICAgICAgICAgICAgICAgICAgKHNvdXJjZSAoc2VhcmNoLWlu cHV0LWZpbGUKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW5wdXRzCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgIChzdHJpbmctYXBwZW5kICJpbmNsdWRlLyIgZmlsZSkpKSkKLSAg ICAgICAgICAgICAgIChkZWxldGUtZmlsZSB0YXJnZXQpCi0gICAgICAgICAgICAgICAoc3ltbGlu ayBzb3VyY2UgdGFyZ2V0KSkpKQotICAgICAgICAgKGFkZC1hZnRlciAnaW5zdGFsbCAnd3JhcAot ICAgICAgICAgICAobGFtYmRhKiAoIzprZXkgaW5wdXRzIG91dHB1dHMgIzphbGxvdy1vdGhlci1r ZXlzKQotICAgICAgICAgICAgIDs7IE1ha2Ugc3VyZSAnY3JpdCcgcnVucyB3aXRoIHRoZSBjb3Jy ZWN0IFBZVEhPTlBBVEguCi0gICAgICAgICAgICAgKGxldCogKChvdXQgIChhc3NvYy1yZWYgb3V0 cHV0cyAib3V0IikpCi0gICAgICAgICAgICAgICAgICAgIChzaXRlIChzdHJpbmctYXBwZW5kIG91 dCAiL2xpYi9weXRob24iCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICwodmVyc2lvbi1tYWpvcittaW5vcgotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIChwYWNrYWdlLXZlcnNpb24gcHl0aG9uKSkKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIi9zaXRlLXBhY2thZ2VzIikpCi0gICAgICAgICAgICAgICAg ICAgIChwYXRoIChnZXRlbnYgIkdVSVhfUFlUSE9OUEFUSCIpKSkKLSAgICAgICAgICAgICAgICh3 cmFwLXByb2dyYW0gKHN0cmluZy1hcHBlbmQgb3V0ICIvYmluL2NyaXQiKQotICAgICAgICAgICAg ICAgICBgKCJHVUlYX1BZVEhPTlBBVEgiICI6IiBwcmVmaXggKCxzaXRlICxwYXRoKSkpKSkpCi0g ICAgICAgICAoYWRkLWFmdGVyICdpbnN0YWxsICdkZWxldGUtc3RhdGljLWxpYnJhcmllcwotICAg ICAgICAgICA7OyBOb3QgYnVpbGRpbmcvaW5zdGFsbGluZyB0aGVzZSBhdCBhbGwgZG9lc24ndCBz ZWVtIHRvIGJlIHN1cHBvcnRlZC4KLSAgICAgICAgICAgKGxhbWJkYSogKCM6a2V5IG91dHB1dHMg IzphbGxvdy1vdGhlci1rZXlzKQotICAgICAgICAgICAgIChsZXQgKChvdXQgKGFzc29jLXJlZiBv dXRwdXRzICJvdXQiKSkpCi0gICAgICAgICAgICAgICAoZm9yLWVhY2ggZGVsZXRlLWZpbGUgKGZp bmQtZmlsZXMgb3V0ICJcXC5hJCIpKSkpKSkpKQorICAgICAobGlzdAorICAgICAgIzp0ZXN0LXRh cmdldCAidGVzdCIKKyAgICAgICM6dGVzdHM/ICNmIDsgdGVzdHMgcmVxdWlyZSBtb3VudGluZyBh cyByb290CisgICAgICAjOm1ha2UtZmxhZ3MKKyAgICAgICN+KGxpc3QgKHN0cmluZy1hcHBlbmQg IlBSRUZJWD0iICMkb3V0cHV0KQorICAgICAgICAgICAgICAoc3RyaW5nLWFwcGVuZCAiTElCRElS PSQoUFJFRklYKS9saWIiKQorICAgICAgICAgICAgICA7OyBVcHN0cmVhbSBtaXN0YWtlbmx5IHB1 dHMgYmluYXJpZXMgaW4gL3Zhci4gIE5vdywgaW4gcHJhY3RpY2Ugbm8KKyAgICAgICAgICAgICAg OzsgcGx1Z2lucyBhcmUgYnVpbHQsIGJ1dCB0aGUgYnVpbGQgc3lzdGVtIHN0aWxsIGZhaWxzIG90 aGVyd2lzZS4KKyAgICAgICAgICAgICAgKHN0cmluZy1hcHBlbmQgIlBMVUdJTkRJUj0kKExJQkRJ UikvY3JpdSIpCisgICAgICAgICAgICAgIChzdHJpbmctYXBwZW5kICJBU0NJSURPQz0iCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIChzZWFyY2gtaW5wdXQtZmlsZSAlYnVpbGQtaW5wdXRz CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiL2Jpbi9h c2NpaWRvYyIpKQorICAgICAgICAgICAgICAoc3RyaW5nLWFwcGVuZCAiUFlUSE9OPXB5dGhvbjMi KQorICAgICAgICAgICAgICAoc3RyaW5nLWFwcGVuZCAiWE1MVE89IgorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAoc2VhcmNoLWlucHV0LWZpbGUgJWJ1aWxkLWlucHV0cworICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIi9iaW4veG1sdG8iKSkpCisg ICAgICAjOnBoYXNlcworICAgICAgI34obW9kaWZ5LXBoYXNlcyAlc3RhbmRhcmQtcGhhc2VzCisg ICAgICAgICAgKGRlbGV0ZSAnY29uZmlndXJlKSAgICAgICAgICAgIDsgbm8gY29uZmlndXJlIHNj cmlwdAorICAgICAgICAgIChhZGQtYWZ0ZXIgJ3VucGFjayAnZml4LWRvY3VtZW50YXRpb24KKyAg ICAgICAgICAgIChsYW1iZGEqICgjOmtleSBpbnB1dHMgb3V0cHV0cyAjOmFsbG93LW90aGVyLWtl eXMpCisgICAgICAgICAgICAgIChzdWJzdGl0dXRlKiAiRG9jdW1lbnRhdGlvbi9NYWtlZmlsZSIK KyAgICAgICAgICAgICAgICAoKCItbSBjdXN0b20ueHNsIikKKyAgICAgICAgICAgICAgICAgKHN0 cmluZy1hcHBlbmQKKyAgICAgICAgICAgICAgICAgICItbSBjdXN0b20ueHNsIC0tc2tpcC12YWxp ZGF0aW9uIC14ICIKKyAgICAgICAgICAgICAgICAgIChhc3NvYy1yZWYgaW5wdXRzICJkb2Nib29r LXhzbCIpICIveG1sL3hzbC8iCisgICAgICAgICAgICAgICAgICAjJChwYWNrYWdlLW5hbWUgZG9j Ym9vay14c2wpICItIgorICAgICAgICAgICAgICAgICAgIyQocGFja2FnZS12ZXJzaW9uIGRvY2Jv b2steHNsKQorICAgICAgICAgICAgICAgICAgIi9tYW5wYWdlcy9kb2Nib29rLnhzbCIpKSkpKQor ICAgICAgICAgIChhZGQtYWZ0ZXIgJ3VucGFjayAnaGFyZGNvZGUtdmFyaWFibGVzCisgICAgICAg ICAgICAobGFtYmRhKiAoIzprZXkgaW5wdXRzIG91dHB1dHMgIzphbGxvdy1vdGhlci1rZXlzKQor ICAgICAgICAgICAgICA7OyBIYXJkY29kZSBhcm0gdmVyc2lvbiBkZXRlY3Rpb24KKyAgICAgICAg ICAgICAgKHN1YnN0aXR1dGUqICJNYWtlZmlsZSIKKyAgICAgICAgICAgICAgICAoKCJBUk1WLio6 PS4qIikgIkFSTVYgOj0gN1xuIikpCisgICAgICAgICAgICAgIDs7IEhhcmQtY29kZSB0aGUgY29y cmVjdCBQTFVHSU5ESVIgYWJvdmUuCisgICAgICAgICAgICAgIChzdWJzdGl0dXRlKiAiY3JpdS9p bmNsdWRlL3BsdWdpbi5oIgorICAgICAgICAgICAgICAgICgoIi92YXIiKSAoc3RyaW5nLWFwcGVu ZCAoYXNzb2MtcmVmIG91dHB1dHMgIm91dCIpKSkpCisgICAgICAgICAgICAgICkpCisgICAgICAg ICAgKGFkZC1iZWZvcmUgJ2J1aWxkICdmaXgtc3ltbGluaworICAgICAgICAgICAgKGxhbWJkYSog KCM6a2V5IGlucHV0cyAjOmFsbG93LW90aGVyLWtleXMpCisgICAgICAgICAgICAgIDs7IFRoZSBm aWxlICdpbWFnZXMvZ29vZ2xlL3Byb3RvYnVmL2Rlc2NyaXB0b3IucHJvdG8nIHBvaW50cyB0bwor ICAgICAgICAgICAgICA7OyAvdXNyL2luY2x1ZGUvLi4uLCB3aGljaCBvYnZpb3VzbHkgZG9lcyBu b3QgZXhpc3QuCisgICAgICAgICAgICAgIChsZXQqICgoZmlsZSAiZ29vZ2xlL3Byb3RvYnVmL2Rl c2NyaXB0b3IucHJvdG8iKQorICAgICAgICAgICAgICAgICAgICAgKHRhcmdldCAoc3RyaW5nLWFw cGVuZCAiaW1hZ2VzLyIgZmlsZSkpCisgICAgICAgICAgICAgICAgICAgICAoc291cmNlIChzZWFy Y2gtaW5wdXQtZmlsZQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW5wdXRzCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAoc3RyaW5nLWFwcGVuZCAiaW5jbHVkZS8iIGZpbGUp KSkpCisgICAgICAgICAgICAgICAgKGRlbGV0ZS1maWxlIHRhcmdldCkKKyAgICAgICAgICAgICAg ICAoc3ltbGluayBzb3VyY2UgdGFyZ2V0KSkpKQorICAgICAgICAgIChhZGQtYWZ0ZXIgJ2luc3Rh bGwgJ3dyYXAKKyAgICAgICAgICAgIChsYW1iZGEqICgjOmtleSBpbnB1dHMgb3V0cHV0cyAjOmFs bG93LW90aGVyLWtleXMpCisgICAgICAgICAgICAgIDs7IE1ha2Ugc3VyZSAnY3JpdCcgcnVucyB3 aXRoIHRoZSBjb3JyZWN0IFBZVEhPTlBBVEguCisgICAgICAgICAgICAgIChsZXQqICgoc2l0ZSAo c3RyaW5nLWFwcGVuZCAjJG91dHB1dCAiL2xpYi9weXRob24iCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAjJCh2ZXJzaW9uLW1ham9yK21pbm9yCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAocGFja2FnZS12ZXJzaW9uIHB5dGhv bikpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiL3NpdGUtcGFj a2FnZXMiKSkKKyAgICAgICAgICAgICAgICAgICAgIChwYXRoIChnZXRlbnYgIkdVSVhfUFlUSE9O UEFUSCIpKSkKKyAgICAgICAgICAgICAgICAod3JhcC1wcm9ncmFtIChzdHJpbmctYXBwZW5kICMk b3V0cHV0ICIvYmluL2NyaXQiKQorICAgICAgICAgICAgICAgICAgYCgiR1VJWF9QWVRIT05QQVRI IiAiOiIgcHJlZml4ICgsc2l0ZSAscGF0aCkpKSkpKQorICAgICAgICAgIChhZGQtYWZ0ZXIgJ2lu c3RhbGwgJ2RlbGV0ZS1zdGF0aWMtbGlicmFyaWVzCisgICAgICAgICAgICA7OyBOb3QgYnVpbGRp bmcvaW5zdGFsbGluZyB0aGVzZSBhdCBhbGwgZG9lc24ndCBzZWVtIHRvIGJlIHN1cHBvcnRlZC4K KyAgICAgICAgICAgIChsYW1iZGEgXworICAgICAgICAgICAgICAoZm9yLWVhY2ggZGVsZXRlLWZp bGUgKGZpbmQtZmlsZXMgIyRvdXRwdXQgIlxcLmEkIikpKSkpKSkKICAgICAoaW5wdXRzCi0gICAg IGAoKCJwcm90b2J1ZiIgLHByb3RvYnVmKQotICAgICAgICgicHl0aG9uIiAscHl0aG9uKQotICAg ICAgICgicHl0aG9uLXByb3RvYnVmIiAscHl0aG9uLXByb3RvYnVmKQotICAgICAgICgiaXByb3V0 ZSIgLGlwcm91dGUpCi0gICAgICAgKCJsaWJhaW8iICxsaWJhaW8pCi0gICAgICAgKCJsaWJjYXAi ICxsaWJjYXApCi0gICAgICAgKCJsaWJuZXQiICxsaWJuZXQpCi0gICAgICAgKCJsaWJubCIgLGxp Ym5sKQotICAgICAgICgibGliYnNkIiAsbGliYnNkKQotICAgICAgICgibmZ0YWJsZXMiICxuZnRh YmxlcykpKQorICAgICAobGlzdCBwcm90b2J1ZgorICAgICAgICAgICBweXRob24KKyAgICAgICAg ICAgcHl0aG9uLXByb3RvYnVmCisgICAgICAgICAgIGlwcm91dGUKKyAgICAgICAgICAgbGliYWlv CisgICAgICAgICAgIGxpYmNhcAorICAgICAgICAgICBsaWJuZXQKKyAgICAgICAgICAgbGlibmwK KyAgICAgICAgICAgbGliYnNkCisgICAgICAgICAgIG5mdGFibGVzKSkKICAgICAobmF0aXZlLWlu cHV0cwogICAgICAobGlzdCBwa2ctY29uZmlnCiAgICAgICAgICAgIHBlcmwKLS0gCjIuMzkuMgoK CkZyb20gYWUwM2IwMjYzN2ExZjQxMGM3NzhiYWYyYThjOGUyMWNiNmZjMDk3MSBNb24gU2VwIDE3 IDAwOjAwOjAwIDIwMDEKTWVzc2FnZS1JZDogPGFlMDNiMDI2MzdhMWY0MTBjNzc4YmFmMmE4Yzhl MjFjYjZmYzA5NzEuMTY4MjI5NTIxMC5naXQuYmpjQHNwb3JrLm9yZz4KSW4tUmVwbHktVG86IDxi NGU3MzJjNDQxYWFjNTdmMTk1Yjc1ODgwNmUzMzljMzM1M2ViNWViLjE2ODIyOTUyMTAuZ2l0LmJq Y0BzcG9yay5vcmc+ClJlZmVyZW5jZXM6IDxiNGU3MzJjNDQxYWFjNTdmMTk1Yjc1ODgwNmUzMzlj MzM1M2ViNWViLjE2ODIyOTUyMTAuZ2l0LmJqY0BzcG9yay5vcmc+CkZyb206IEJyaWFuIEN1bGx5 IDxiamNAc3Bvcmsub3JnPgpEYXRlOiBTdW4sIDIzIEFwciAyMDIzIDIwOjAxOjExIC0wNDAwClN1 YmplY3Q6IFtQQVRDSCAyLzRdIGd1aXg6IHV0aWxzOiBhZGQgYGNoYW5nZS1maWxlLXRpbWVzdGFt cHMtcmVjdXJzaXZlbHknCiBwcm9jZWR1cmUKClRoZXJlIGFyZSBzb21lIHBhY2thZ2VzIHdoaWNo IHVzZSB0aGUgemlwIGxpYnJhcnkgaW4gYHB5dGhvbi1zZXR1cHRvb2xzJyB3aGljaAp3aWxsIGVy cm9yIGFuZCBmYWlsIHRvIGJ1aWxkIGlmIGl0IGZpbmRzIGZpbGVzIHdpdGggdGltZXN0YW1wcyBi ZWZvcmUgMTk4MC4KCkNyZWF0ZSBhIG5ldyBwcm9jZWR1cmUgd2hpY2ggd2lsbCB1cGRhdGUgdGhl IGF0aW1lIGFuZCBtdGltZSBmaWVsZHMgb2YgYQpkaXJlY3RvcnkgdG8gYSBkYXRlIGFuZCB0aW1l IHNwZWNpZmllZCBpbiBVVEMuCgogKiBndWl4L3V0aWxzLnNjbSAoY2hhbmdlLWZpbGUtdGltZXN0 YW1wcy1yZWN1cnNpdmVseSk6IG5ldyBwcm9jZWR1cmUKLS0tCiBndWl4L3V0aWxzLnNjbSB8IDI5 ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrCiAxIGZpbGUgY2hhbmdlZCwgMjkgaW5zZXJ0 aW9ucygrKQoKZGlmZiAtLWdpdCBhL2d1aXgvdXRpbHMuc2NtIGIvZ3VpeC91dGlscy5zY20KaW5k ZXggYjk2NTdkZjI5Mi4uYTZkZTZhODJmYiAxMDA2NDQKLS0tIGEvZ3VpeC91dGlscy5zY20KKysr IGIvZ3VpeC91dGlscy5zY20KQEAgLTE3LDYgKzE3LDcgQEAKIDs7OyBDb3B5cmlnaHQgwqkgMjAy MiBEZW5pcyAnR05VdG9vJyBDYXJpa2xpIDxHTlV0b29AY3liZXJkaW1lbnNpb24ub3JnPgogOzs7 IENvcHlyaWdodCDCqSAyMDIyIEFudGVybyBNZWpyIDxhbnRlcm9AbWFpbGJveC5vcmc+CiA7Ozsg Q29weXJpZ2h0IMKpIDIwMjMgUGhpbGlwIE1jR3JhdGggPHBoaWxpcEBwaGlsaXBtY2dyYXRoLmNv bT4KKzs7OyBDb3B5cmlnaHQgwqkgMjAyMyBCcmlhbiBDdWxseSA8YmpjQHNwb3JrLm9yZz4KIDs7 OwogOzs7IFRoaXMgZmlsZSBpcyBwYXJ0IG9mIEdOVSBHdWl4LgogOzs7CkBAIC00Miw2ICs0Myw3 IEBAIChkZWZpbmUtbW9kdWxlIChndWl4IHV0aWxzKQogICAjOnVzZS1tb2R1bGUgKHJucnMgaW8g cG9ydHMpICAgICAgICAgICAgICAgICAgICA7bmVlZCAncG9ydC1wb3NpdGlvbicgZXRjLgogICAj OnVzZS1tb2R1bGUgKChybnJzIGJ5dGV2ZWN0b3JzKSAjOnNlbGVjdCAoYnl0ZXZlY3Rvci11OC1z ZXQhKSkKICAgIzp1c2UtbW9kdWxlIChndWl4IG1lbW9pemF0aW9uKQorICAjOnVzZS1tb2R1bGUg KGd1aXggbW9kdWxlcykKICAgIzp1c2UtbW9kdWxlICgoZ3VpeCBidWlsZCB1dGlscykKICAgICAg ICAgICAgICAgICAjOnNlbGVjdCAoZHVtcC1wb3J0IG1rZGlyLXAgZGVsZXRlLWZpbGUtcmVjdXJz aXZlbHkKICAgICAgICAgICAgICAgICAgICAgICAgICAgY2FsbC13aXRoLXRlbXBvcmFyeS1vdXRw dXQtZmlsZSAleHotcGFyYWxsZWwtYXJncykpCkBAIC00OSw2ICs1MSw3IEBAIChkZWZpbmUtbW9k dWxlIChndWl4IHV0aWxzKQogICAjOnVzZS1tb2R1bGUgKChndWl4IGNvbWJpbmF0b3JzKSAjOnNl bGVjdCAoZm9sZDIpKQogICAjOnVzZS1tb2R1bGUgKGd1aXggZGlhZ25vc3RpY3MpICAgICAgICAg ICA7PGxvY2F0aW9uPiwgJmVycm9yLWxvY2F0aW9uLCBldGMuCiAgICM6dXNlLW1vZHVsZSAoaWNl LTkgZm9ybWF0KQorICAjOnVzZS1tb2R1bGUgKGljZS05IGZ0dykKICAgIzp1c2UtbW9kdWxlICgo aWNlLTkgaWNvbnYpICM6cHJlZml4IGljb252OikKICAgIzp1c2UtbW9kdWxlIChpY2UtOSBtYXRj aCkKICAgIzp1c2UtbW9kdWxlIChpY2UtOSByZWdleCkKQEAgLTEzNCw2ICsxMzcsOCBAQCAoZGVm aW5lLW1vZHVsZSAoZ3VpeCB1dGlscykKICAgICAgICAgICAgIGNvbmZpZy1kaXJlY3RvcnkKICAg ICAgICAgICAgIGNhY2hlLWRpcmVjdG9yeQogCisgICAgICAgICAgICBjaGFuZ2UtZmlsZS10aW1l c3RhbXBzLXJlY3Vyc2l2ZWx5CisKICAgICAgICAgICAgIHJlYWRsaW5rKgogICAgICAgICAgICAg Z28tdG8tbG9jYXRpb24KICAgICAgICAgICAgIGVkaXQtZXhwcmVzc2lvbgpAQCAtMTU2LDYgKzE2 MSwzMCBAQCAoZGVmaW5lLW1vZHVsZSAoZ3VpeCB1dGlscykKIDs7OyBFbnZpcm9ubWVudCB2YXJp YWJsZXMuCiA7OzsKIAorKGRlZmluZSAoY2hhbmdlLWZpbGUtdGltZXN0YW1wcy1yZWN1cnNpdmVs eSBsb2NhdGlvbiB0aW1lKQorICAiUmVjdXJzaXZlbHkgQ2hhbmdlIHRoZSBhdGltZSBhbmQgbXRp bWUgb2YgYWxsIGZpbGVzIGluIExPQ0FUSU9OIHRvIFRJTUUuCisKK1RJTUUgaXMgc3BlY2lmaWVk IGluIElTTyA4NjAxIGZvcm1hdCAoWVlZWS1tbS1kZCBISDpNTTpTUykgaW4gVVRDLiIKKworICAo ZGVmaW5lIHRtIChzdHJwdGltZSAiJUYgJUg6JU06JVMgJXoiIChzdHJpbmctYXBwZW5kIHRpbWUg IiArMDAwMCIpKSkKKyAgKGRlZmluZSBlcG9jaC1zZWNvbmRzIChzdHJpbmctPm51bWJlciAoc3Ry ZnRpbWUgIiVzIiAoY2FyIHRtKSkpKQorCisgIChsZXQgbG9vcCAoKHByZWZpeAorICAgICAgICAg ICAgICAoc3Vic3RyaW5nIGxvY2F0aW9uCisgICAgICAgICAgICAgICAgICAgICAgICAgMCAoKyAx IChzdHJpbmctcmluZGV4IGxvY2F0aW9uIChjdXQgZXE/ICNcLyA8PikpKSkpCisgICAgICAgICAg ICAgKG5vZGUgKGZpbGUtc3lzdGVtLXRyZWUgbG9jYXRpb24pKSkKKyAgICAobWF0Y2ggbm9kZQor ICAgICAgKChuYW1lIHN0YXQpIDsgZmxhdCBmaWxlCisgICAgICAgKHdoZW4gKG5vdCAoZXE/IChz dGF0OnR5cGUgc3RhdCkgJ3N5bWxpbmspKQorICAgICAgICAgKHV0aW1lIChzdHJpbmctYXBwZW5k IHByZWZpeCBuYW1lKSBlcG9jaC1zZWNvbmRzIGVwb2NoLXNlY29uZHMpKSkKKyAgICAgICgobmFt ZSBzdGF0IGNoaWxkcmVuIC4uLikgOyBkaXJlY3RvcnkKKyAgICAgICAodXRpbWUgKHN0cmluZy1h cHBlbmQgcHJlZml4IG5hbWUpIGVwb2NoLXNlY29uZHMgZXBvY2gtc2Vjb25kcykKKyAgICAgICAo Zm9yLWVhY2ggKGxhbWJkYSAoY2hpbGQpCisgICAgICAgICAgICAgICAgICAgKGxvb3AgKHN0cmlu Zy1hcHBlbmQgcHJlZml4IG5hbWUKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBmaWxlLW5hbWUtc2VwYXJhdG9yLXN0cmluZykKKyAgICAgICAgICAgICAgICAgICAgICAg ICBjaGlsZCkpCisgICAgICAgICAgICAgICAgIGNoaWxkcmVuKSkpKSkKKwogKGRlZmluZSAoY2Fs bC13aXRoLWVudmlyb25tZW50LXZhcmlhYmxlcyB2YXJpYWJsZXMgdGh1bmspCiAgICJDYWxsIFRI VU5LIHdpdGggdGhlIGVudmlyb25tZW50IFZBUklBQkxFUyBzZXQuIgogICAobGV0ICgoZW52aXJv bm1lbnQgKGVudmlyb24pKSkKLS0gCjIuMzkuMgoKCkZyb20gMjBkNmQxMDMwOTAwZmM1NTJjMDc1 MzNmMDk2NjZhZjM2YjU3M2EyYiBNb24gU2VwIDE3IDAwOjAwOjAwIDIwMDEKTWVzc2FnZS1JZDog PDIwZDZkMTAzMDkwMGZjNTUyYzA3NTMzZjA5NjY2YWYzNmI1NzNhMmIuMTY4MjI5NTIxMC5naXQu YmpjQHNwb3JrLm9yZz4KSW4tUmVwbHktVG86IDxiNGU3MzJjNDQxYWFjNTdmMTk1Yjc1ODgwNmUz MzljMzM1M2ViNWViLjE2ODIyOTUyMTAuZ2l0LmJqY0BzcG9yay5vcmc+ClJlZmVyZW5jZXM6IDxi NGU3MzJjNDQxYWFjNTdmMTk1Yjc1ODgwNmUzMzljMzM1M2ViNWViLjE2ODIyOTUyMTAuZ2l0LmJq Y0BzcG9yay5vcmc+CkZyb206IEJyaWFuIEN1bGx5IDxiamNAc3Bvcmsub3JnPgpEYXRlOiBTdW4s IDIzIEFwciAyMDIzIDIwOjA0OjQxIC0wNDAwClN1YmplY3Q6IFtQQVRDSCAzLzRdIGdudTogc3Nz ZDogQ2hhbmdlIHRpbWVzdGFtcHMgdG8gMS1KYW4tMTk4MCBiZWZvcmUKIGNvbXByZXNzaW5nCgpU aGUgemlwIGxpYnJhcnkgdXNlZCBieSBiZGlzdCBpbiBweXRob24tc2V0dXB0b29scyB0aHJvd3Mg YW4gZXJyb3IgdW5sZXNzCmZpbGVzIGFyZSBmcm9tIGF0IGxlYXN0IDE5ODAuCgogKiBnbnUvcGFj a2FnZXMvc3NzZC5zY20gKHNzc2QpIFtjaGFuZ2UtZmlsZS1kYXRldGltZXNdOiBuZXcgcGhhc2UK LS0tCiBnbnUvcGFja2FnZXMvc3NzZC5zY20gfCAxMTkgKysrKysrKysrKysrKysrKysrKysrKyst LS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNjQgaW5zZXJ0aW9ucygrKSwgNTUg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZ251L3BhY2thZ2VzL3Nzc2Quc2NtIGIvZ251L3Bh Y2thZ2VzL3Nzc2Quc2NtCmluZGV4IGE2YjRjOGFhOTAuLmM2NzQ3ZThmNGMgMTAwNjQ0Ci0tLSBh L2dudS9wYWNrYWdlcy9zc3NkLnNjbQorKysgYi9nbnUvcGFja2FnZXMvc3NzZC5zY20KQEAgLTUs NiArNSw3IEBACiA7OzsgQ29weXJpZ2h0IMKpIDIwMjEgVGltb3RlaiBMYXphciA8dGltb3Rlai5s YXphckBhcmFuZW8uc2k+CiA7OzsgQ29weXJpZ2h0IMKpIDIwMjEsIDIwMjIgUmVtY28gdmFuICd0 IFZlZXIgPHJlbWNvQHJlbXdvcmtzLm5ldD4KIDs7OyBDb3B5cmlnaHQgwqkgMjAyMyBNYXhpbSBD b3Vybm95ZXIgPG1heGltLmNvdXJub3llckBnbWFpbC5jb20+Cis7OzsgQ29weXJpZ2h0IMKpIDIw MjMgQnJpYW4gQ3VsbHkgPGJqY0BzcG9yay5vcmc+CiA7OzsKIDs7OyBUaGlzIGZpbGUgaXMgcGFy dCBvZiBHTlUgR3VpeC4KIDs7OwpAQCAtMjcsNiArMjgsNyBAQCAoZGVmaW5lLW1vZHVsZSAoZ251 IHBhY2thZ2VzIHNzc2QpCiAgICM6dXNlLW1vZHVsZSAoZ3VpeCBkb3dubG9hZCkKICAgIzp1c2Ut bW9kdWxlIChndWl4IGdleHApCiAgICM6dXNlLW1vZHVsZSAoZ3VpeCBnaXQtZG93bmxvYWQpCisg ICM6dXNlLW1vZHVsZSAoZ3VpeCBtb2R1bGVzKQogICAjOnVzZS1tb2R1bGUgKGd1aXggdXRpbHMp CiAgICM6dXNlLW1vZHVsZSAoZ3VpeCBidWlsZCB1dGlscykKICAgIzp1c2UtbW9kdWxlIChndWl4 IGJ1aWxkLXN5c3RlbSBnbnUpCkBAIC0xNTEsNiArMTUzLDcgQEAgKGRlZmluZS1wdWJsaWMgc3Nz ZAogICAgIChidWlsZC1zeXN0ZW0gZ251LWJ1aWxkLXN5c3RlbSkKICAgICAoYXJndW1lbnRzCiAg ICAgIChsaXN0CisgICAgICAjOnRlc3RzPyAjZiA7IDIgZmFpbGluZyB0ZXN0cyB0byBsb29rIGF0 LiAtYmpjIDIwMjMtYXByLTIyCiAgICAgICAjOm1ha2UtZmxhZ3MKICAgICAgICN+KGxpc3QgKHN0 cmluZy1hcHBlbmQgIkNGTEFHUz0tRFJFTkVXQUxfUFJPR19QQVRIPVxcXCIiCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICMkKHRoaXMtcGFja2FnZS1pbnB1dCAiYWRjbGkiKSAiL3NiaW4v YWRjbGkiCkBAIC0xODMsNjEgKzE4Niw2NyBAQCAoZGVmaW5lLXB1YmxpYyBzc3NkCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICMkKHRoaXMtcGFja2FnZS1uYXRpdmUtaW5wdXQgImRvY2Jv b2steG1sIikKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIi94bWwvZHRkL2RvY2Jvb2sv Y2F0YWxvZy54bWwiKSkKICAgICAgICM6cGhhc2VzCi0gICAgICAjfihtb2RpZnktcGhhc2VzICVz dGFuZGFyZC1waGFzZXMKLSAgICAgICAgICAoYWRkLWFmdGVyICdwYXRjaC1zb3VyY2Utc2hlYmFu Z3MgJ3BhdGNoLW1vcmUtc2hlYmFuZ3MKLSAgICAgICAgICAgIChsYW1iZGEgXwotICAgICAgICAg ICAgICAoc3Vic3RpdHV0ZSogJygic3JjL3Rvb2xzL2FuYWx5emVyL3Nzc19hbmFseXplIgotICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAic3JjL3Rvb2xzL3Nzc19vYmZ1c2NhdGUiKQotICAg ICAgICAgICAgICAgICgoIiMhL3Vzci9iaW4vLipweXRob24iKQotICAgICAgICAgICAgICAgICAo c3RyaW5nLWFwcGVuZCAiIyEiICMkKHRoaXMtcGFja2FnZS1pbnB1dCAicHl0aG9uIikgIi9iaW4v cHl0aG9uMyIpKSkpKQotICAgICAgICAgIChhZGQtYmVmb3JlICdib290c3RyYXAgJ2ZpeC1jb25m aWd1cmUtbWFjcm9zCi0gICAgICAgICAgICAobGFtYmRhIF8KLSAgICAgICAgICAgICAgOzsgQSBj b25maWd1cmUgdGVzdCBmb3IgbnN1cGRhdGUgcmVhbG0gc3VwcG9ydCBmYWlscyB3aXRob3V0IHRo aXMuCi0gICAgICAgICAgICAgIChzdWJzdGl0dXRlKiAic3JjL2V4dGVybmFsL25zdXBkYXRlLm00 IgotICAgICAgICAgICAgICAgICgoIlxcJE5TVVBEQVRFICIpICIkTlNVUERBVEUgLWkgIikpCi0g ICAgICAgICAgICAgIDs7IExldCB0ZXN0cyBmaW5kIHNvZnRoc20gbGliLgotICAgICAgICAgICAg ICAoc3Vic3RpdHV0ZSogInNyYy9leHRlcm5hbC90ZXN0X2NhLm00IgotICAgICAgICAgICAgICAg ICgoIi91c3IvbGliL3NvZnRoc20iKQotICAgICAgICAgICAgICAgICAoc3RyaW5nLWFwcGVuZCAj JCh0aGlzLXBhY2thZ2UtbmF0aXZlLWlucHV0ICJzb2Z0aHNtIikKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIi9saWIvc29mdGhzbSIpKSkpKQotICAgICAgICAgIChhZGQtYmVmb3Jl ICdjb25maWd1cmUgJ2Rpc2FibGUtZmFpbGluZy10ZXN0cwotICAgICAgICAgICAgKGxhbWJkYSBf Ci0gICAgICAgICAgICAgIDs7IERpc2FibGUgdGVzdHMgdGhhdCBuZWVkcyAvZXRjL3Bhc3N3ZC4K LSAgICAgICAgICAgICAgKHN1YnN0aXR1dGUqICJNYWtlZmlsZS5hbSIKLSAgICAgICAgICAgICAg ICAoKCJwYW0tc3J2LXRlc3RzIikgIiIpCi0gICAgICAgICAgICAgICAgKCgidGVzdC1uZWdjYWNo ZSIpICIiKSkKLSAgICAgICAgICAgICAgOzsgVGhpcyB0ZXN0IGZhaWxzIGZvciB1bmtub3duIHJl YXNvbi4KLSAgICAgICAgICAgICAgKHN1YnN0aXR1dGUqICJzcmMvdGVzdHMvcmVzcG9uZGVyX3Nv Y2tldF9hY2Nlc3MtdGVzdHMuYyIKLSAgICAgICAgICAgICAgICAoKCJ0Y2FzZV9hZGRfdGVzdFxc KHRjX3V0aWxzLCByZXNwX3N0cl90b19hcnJheV90ZXN0XFwpOyIpICIiKSkpKQotICAgICAgICAg IChhZGQtYmVmb3JlICdjaGVjayAnc2V0LWxpYnB5dGhvbi1wYXRoCi0gICAgICAgICAgICAobGFt YmRhIF8KLSAgICAgICAgICAgICAgKHNldGVudiAiTERfTElCUkFSWV9QQVRIIgotICAgICAgICAg ICAgICAgICAgICAgIChzdHJpbmctYXBwZW5kICMkKHRoaXMtcGFja2FnZS1pbnB1dCAicHl0aG9u IikgIi9saWIiKSkpKQotICAgICAgICAgIChhZGQtYWZ0ZXIgJ2luc3RhbGwgJ3JlbW92ZS1zdGF0 aWMtbGlicwotICAgICAgICAgICAgKGxhbWJkYSBfCi0gICAgICAgICAgICAgIDs7IFJlbW92ZSBh IHN0YXRpYyBsaWJyYXJ5IHRoYXQgcHJvZHVjZXMgYSAoaGFybWxlc3MpIHdhcm5pbmcKLSAgICAg ICAgICAgICAgOzsgd2hlbiBzdGFydGluZyBhIHByb2dyYW0gdGhhdCB1c2VzIHNzc2TigJlzIExE QiBtb2R1bGVzLgotICAgICAgICAgICAgICAoZGVsZXRlLWZpbGUKLSAgICAgICAgICAgICAgIChz dHJpbmctYXBwZW5kICMkb3V0cHV0ICIvbGliL2xkYi9tb2R1bGVzL2xkYi9tZW1iZXJvZi5sYSIp KSkpCi0gICAgICAgICAgKGFkZC1hZnRlciAnaW5zdGFsbCAnd3JhcC1iaW5hcmllcwotICAgICAg ICAgICAgKGxhbWJkYSBfCi0gICAgICAgICAgICAgICh3aXRoLWRpcmVjdG9yeS1leGN1cnNpb24g IyRvdXRwdXQKLSAgICAgICAgICAgICAgICA7OyBTZXQgcGF0aCB0byBMREIgbW9kdWxlcyBmb3Ig c3NzZCBhbmQgdXRpbGl0aWVzLgotICAgICAgICAgICAgICAgIChmb3ItZWFjaCAobGFtYmRhIChi aW4pCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgKHdyYXAtcHJvZ3JhbSAoc3RyaW5nLWFw cGVuZCAic2Jpbi8iIGJpbikKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGAoIkxEQl9N T0RVTEVTX1BBVEgiICI6IiBwcmVmaXgKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg KCwoc3RyaW5nLWFwcGVuZCAjJG91dHB1dCAiL2xpYi9sZGIvbW9kdWxlcy9sZGIiKSkpKSkKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgJygic3NzZCIgInNzc2N0bCIgInNzc19jYWNoZSIgInNz c19vdmVycmlkZSIgInNzc19zZWVkIikpCi0gICAgICAgICAgICAgICAgOzsgU2V0IHBhdGggdG8g c3NzZOKAmXMgc2l0ZS1wYWNrYWdlcyBmb3Igc2NyaXB0cy4KLSAgICAgICAgICAgICAgICAoZm9y LWVhY2ggKGxhbWJkYSAoc2NyaXB0KQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICh3cmFw LXByb2dyYW0gc2NyaXB0Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICBgKCJHVUlYX1BZ VEhPTlBBVEgiICI6IiBwcmVmaXgKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKCwo c3RyaW5nLWFwcGVuZCAjJG91dHB1dCAiL2xpYi9weXRob24iCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIyQodmVyc2lvbi1tYWpvcittaW5vcgotICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChwYWNrYWdl LXZlcnNpb24KLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgKHRoaXMtcGFja2FnZS1pbnB1dCAicHl0aG9uIikpKQotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICIvc2l0ZS1wYWNrYWdlcyIpKSkpKQotICAg ICAgICAgICAgICAgICAgICAgICAgICAnKCJsaWJleGVjL3Nzc2Qvc3NzX2FuYWx5emUiICJzYmlu L3Nzc19vYmZ1c2NhdGUiKSkpKSkpKSkKKyAgICAgICh3aXRoLWltcG9ydGVkLW1vZHVsZXMgKHNv dXJjZS1tb2R1bGUtY2xvc3VyZSAnKChndWl4IHV0aWxzKSkpCisgICAgICAgICN+KG1vZGlmeS1w aGFzZXMgJXN0YW5kYXJkLXBoYXNlcworICAgICAgICAgICAgKGFkZC1hZnRlciAncGF0Y2gtc291 cmNlLXNoZWJhbmdzICdwYXRjaC1tb3JlLXNoZWJhbmdzCisgICAgICAgICAgICAgIChsYW1iZGEg XworICAgICAgICAgICAgICAgIChzdWJzdGl0dXRlKiAnKCJzcmMvdG9vbHMvYW5hbHl6ZXIvc3Nz X2FuYWx5emUiCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgInNyYy90b29scy9zc3Nf b2JmdXNjYXRlIikKKyAgICAgICAgICAgICAgICAgICgoIiMhL3Vzci9iaW4vLipweXRob24iKQor ICAgICAgICAgICAgICAgICAgIChzdHJpbmctYXBwZW5kICIjISIgIyQodGhpcy1wYWNrYWdlLWlu cHV0ICJweXRob24iKSAiL2Jpbi9weXRob24zIikpKSkpCisgICAgICAgICAgICAoYWRkLWJlZm9y ZSAnYm9vdHN0cmFwICdmaXgtY29uZmlndXJlLW1hY3JvcworICAgICAgICAgICAgICAobGFtYmRh IF8KKyAgICAgICAgICAgICAgICA7OyBBIGNvbmZpZ3VyZSB0ZXN0IGZvciBuc3VwZGF0ZSByZWFs bSBzdXBwb3J0IGZhaWxzIHdpdGhvdXQgdGhpcy4KKyAgICAgICAgICAgICAgICAoc3Vic3RpdHV0 ZSogInNyYy9leHRlcm5hbC9uc3VwZGF0ZS5tNCIKKyAgICAgICAgICAgICAgICAgICgoIlxcJE5T VVBEQVRFICIpICIkTlNVUERBVEUgLWkgIikpCisgICAgICAgICAgICAgICAgOzsgTGV0IHRlc3Rz IGZpbmQgc29mdGhzbSBsaWIuCisgICAgICAgICAgICAgICAgKHN1YnN0aXR1dGUqICJzcmMvZXh0 ZXJuYWwvdGVzdF9jYS5tNCIKKyAgICAgICAgICAgICAgICAgICgoIi91c3IvbGliL3NvZnRoc20i KQorICAgICAgICAgICAgICAgICAgIChzdHJpbmctYXBwZW5kICMkKHRoaXMtcGFja2FnZS1uYXRp dmUtaW5wdXQgInNvZnRoc20iKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICIv bGliL3NvZnRoc20iKSkpKSkKKyAgICAgICAgICAgIChhZGQtYmVmb3JlICdjb25maWd1cmUgJ2Rp c2FibGUtZmFpbGluZy10ZXN0cworICAgICAgICAgICAgICAobGFtYmRhIF8KKyAgICAgICAgICAg ICAgICA7OyBEaXNhYmxlIHRlc3RzIHRoYXQgbmVlZHMgL2V0Yy9wYXNzd2QuCisgICAgICAgICAg ICAgICAgKHN1YnN0aXR1dGUqICJNYWtlZmlsZS5hbSIKKyAgICAgICAgICAgICAgICAgICgoInBh bS1zcnYtdGVzdHMiKSAiIikKKyAgICAgICAgICAgICAgICAgICgoInRlc3QtbmVnY2FjaGUiKSAi IikpCisgICAgICAgICAgICAgICAgOzsgVGhpcyB0ZXN0IGZhaWxzIGZvciB1bmtub3duIHJlYXNv bi4KKyAgICAgICAgICAgICAgICAoc3Vic3RpdHV0ZSogInNyYy90ZXN0cy9yZXNwb25kZXJfc29j a2V0X2FjY2Vzcy10ZXN0cy5jIgorICAgICAgICAgICAgICAgICAgKCgidGNhc2VfYWRkX3Rlc3Rc XCh0Y191dGlscywgcmVzcF9zdHJfdG9fYXJyYXlfdGVzdFxcKTsiKSAiIikpKSkKKyAgICAgICAg ICAgIChhZGQtYmVmb3JlICdjaGVjayAnc2V0LWxpYnB5dGhvbi1wYXRoCisgICAgICAgICAgICAg IChsYW1iZGEgXworICAgICAgICAgICAgICAgIChzZXRlbnYgIkxEX0xJQlJBUllfUEFUSCIKKyAg ICAgICAgICAgICAgICAgICAgICAgIChzdHJpbmctYXBwZW5kICMkKHRoaXMtcGFja2FnZS1pbnB1 dCAicHl0aG9uIikgIi9saWIiKSkpKQorICAgICAgICAgICAgKGFkZC1iZWZvcmUgJ2luc3RhbGwg J2NoYW5nZS1maWxlLWRhdGV0aW1lcworICAgICAgICAgICAgICAobGFtYmRhIF8KKyAgICAgICAg ICAgICAgICAodXNlLW1vZHVsZXMgKGd1aXggdXRpbHMpKQorICAgICAgICAgICAgICAgIChjaGFu Z2UtZmlsZS10aW1lc3RhbXBzLXJlY3Vyc2l2ZWx5ICIuLyIKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiMTk4MC0wMS0wMSAwMDowMDowMCIpKSkK KyAgICAgICAgICAgIChhZGQtYWZ0ZXIgJ2luc3RhbGwgJ3JlbW92ZS1zdGF0aWMtbGlicworICAg ICAgICAgICAgICAobGFtYmRhIF8KKyAgICAgICAgICAgICAgICA7OyBSZW1vdmUgYSBzdGF0aWMg bGlicmFyeSB0aGF0IHByb2R1Y2VzIGEgKGhhcm1sZXNzKSB3YXJuaW5nCisgICAgICAgICAgICAg ICAgOzsgd2hlbiBzdGFydGluZyBhIHByb2dyYW0gdGhhdCB1c2VzIHNzc2TigJlzIExEQiBtb2R1 bGVzLgorICAgICAgICAgICAgICAgIChkZWxldGUtZmlsZQorICAgICAgICAgICAgICAgICAoc3Ry aW5nLWFwcGVuZCAjJG91dHB1dCAiL2xpYi9sZGIvbW9kdWxlcy9sZGIvbWVtYmVyb2YubGEiKSkp KQorICAgICAgICAgICAgKGFkZC1hZnRlciAnaW5zdGFsbCAnd3JhcC1iaW5hcmllcworICAgICAg ICAgICAgICAobGFtYmRhIF8KKyAgICAgICAgICAgICAgICAod2l0aC1kaXJlY3RvcnktZXhjdXJz aW9uICMkb3V0cHV0CisgICAgICAgICAgICAgICAgICA7OyBTZXQgcGF0aCB0byBMREIgbW9kdWxl cyBmb3Igc3NzZCBhbmQgdXRpbGl0aWVzLgorICAgICAgICAgICAgICAgICAgKGZvci1lYWNoIChs YW1iZGEgKGJpbikKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICh3cmFwLXByb2dyYW0g KHN0cmluZy1hcHBlbmQgInNiaW4vIiBiaW4pCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGAoIkxEQl9NT0RVTEVTX1BBVEgiICI6IiBwcmVmaXgKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAoLChzdHJpbmctYXBwZW5kICMkb3V0cHV0ICIvbGliL2xkYi9tb2R1bGVz L2xkYiIpKSkpKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICcoInNzc2QiICJzc3NjdGwi ICJzc3NfY2FjaGUiICJzc3Nfb3ZlcnJpZGUiICJzc3Nfc2VlZCIpKQorICAgICAgICAgICAgICAg ICAgOzsgU2V0IHBhdGggdG8gc3NzZOKAmXMgc2l0ZS1wYWNrYWdlcyBmb3Igc2NyaXB0cy4KKyAg ICAgICAgICAgICAgICAgIChmb3ItZWFjaCAobGFtYmRhIChzY3JpcHQpCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAod3JhcC1wcm9ncmFtIHNjcmlwdAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBgKCJHVUlYX1BZVEhPTlBBVEgiICI6IiBwcmVmaXgKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAoLChzdHJpbmctYXBwZW5kICMkb3V0cHV0ICIvbGliL3B5 dGhvbiIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICMkKHZlcnNpb24tbWFqb3IrbWlub3IKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIChwYWNrYWdlLXZlcnNpb24KKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAodGhpcy1wYWNrYWdlLWlucHV0 ICJweXRob24iKSkpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAiL3NpdGUtcGFja2FnZXMiKSkpKSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAnKCJsaWJleGVjL3Nzc2Qvc3NzX2FuYWx5emUiICJzYmluL3Nzc19vYmZ1c2NhdGUiKSkpKSkp KSkpCiAgICAgKGlucHV0cwogICAgICAobGlzdCBhZGNsaQogICAgICAgICAgICBiYXNoLW1pbmlt YWwKLS0gCjIuMzkuMgoKCkZyb20gN2FlNmMxYzRjMzJhNWNlMjQ2OTVmNzYwNGE5ZGNiYTNmNmM1 OTc0ZCBNb24gU2VwIDE3IDAwOjAwOjAwIDIwMDEKTWVzc2FnZS1JZDogPDdhZTZjMWM0YzMyYTVj ZTI0Njk1Zjc2MDRhOWRjYmEzZjZjNTk3NGQuMTY4MjI5NTIxMC5naXQuYmpjQHNwb3JrLm9yZz4K SW4tUmVwbHktVG86IDxiNGU3MzJjNDQxYWFjNTdmMTk1Yjc1ODgwNmUzMzljMzM1M2ViNWViLjE2 ODIyOTUyMTAuZ2l0LmJqY0BzcG9yay5vcmc+ClJlZmVyZW5jZXM6IDxiNGU3MzJjNDQxYWFjNTdm MTk1Yjc1ODgwNmUzMzljMzM1M2ViNWViLjE2ODIyOTUyMTAuZ2l0LmJqY0BzcG9yay5vcmc+CkZy b206IEJyaWFuIEN1bGx5IDxiamNAc3Bvcmsub3JnPgpEYXRlOiBTdW4sIDIzIEFwciAyMDIzIDIw OjA5OjAyIC0wNDAwClN1YmplY3Q6IFtQQVRDSCA0LzRdIGdudTogY3JpdTogQ2hhbmdlIHRpbWVz dGFtcHMgdG8gMS1KYW4tMTk4MCBiZWZvcmUKIGNvbXByZXNzaW5nCgpUaGUgemlwIGxpYnJhcnkg dXNlZCBieSBiZGlzdCBpbiBweXRob24tc2V0dXB0b29scyB0aHJvd3MgYW4gZXJyb3IgdW5sZXNz CmZpbGVzIGFyZSBmcm9tIGF0IGxlYXN0IDE5ODAuCgogKiBnbnUvcGFja2FnZXMvdmlydHVhbGl6 YXRpb24uc2NtIChzc3NkKSBbY2hhbmdlLWZpbGUtZGF0ZXRpbWVzXTogbmV3IHBoYXNlCi0tLQog Z251L3BhY2thZ2VzL3ZpcnR1YWxpemF0aW9uLnNjbSB8IDk5ICsrKysrKysrKysrKysrKysrKy0t LS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDUzIGluc2VydGlvbnMoKyksIDQ2IGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy92aXJ0dWFsaXphdGlvbi5zY20gYi9n bnUvcGFja2FnZXMvdmlydHVhbGl6YXRpb24uc2NtCmluZGV4IDIwY2JmY2ZjZmUuLjkxMGY4YjMy MWQgMTAwNjQ0Ci0tLSBhL2dudS9wYWNrYWdlcy92aXJ0dWFsaXphdGlvbi5zY20KKysrIGIvZ251 L3BhY2thZ2VzL3ZpcnR1YWxpemF0aW9uLnNjbQpAQCAtMTQxLDYgKzE0MSw3IEBAIChkZWZpbmUt bW9kdWxlIChnbnUgcGFja2FnZXMgdmlydHVhbGl6YXRpb24pCiAgICM6dXNlLW1vZHVsZSAoZ3Vp eCBnaXQtZG93bmxvYWQpCiAgICM6dXNlLW1vZHVsZSAoZ3VpeCBnZXhwKQogICAjOnVzZS1tb2R1 bGUgKChndWl4IGxpY2Vuc2VzKSAjOnByZWZpeCBsaWNlbnNlOikKKyAgIzp1c2UtbW9kdWxlIChn dWl4IG1vZHVsZXMpCiAgICM6dXNlLW1vZHVsZSAoZ3VpeCBwYWNrYWdlcykKICAgIzp1c2UtbW9k dWxlIChndWl4IHV0aWxzKQogICAjOnVzZS1tb2R1bGUgKHNyZmkgc3JmaS0xKQpAQCAtMTY5OSw1 MiArMTcwMCw1OCBAQCAoZGVmaW5lLXB1YmxpYyBjcml1CiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIChzZWFyY2gtaW5wdXQtZmlsZSAlYnVpbGQtaW5wdXRzCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiL2Jpbi94bWx0byIpKSkKICAgICAgICM6 cGhhc2VzCi0gICAgICAjfihtb2RpZnktcGhhc2VzICVzdGFuZGFyZC1waGFzZXMKLSAgICAgICAg ICAoZGVsZXRlICdjb25maWd1cmUpICAgICAgICAgICAgOyBubyBjb25maWd1cmUgc2NyaXB0Ci0g ICAgICAgICAgKGFkZC1hZnRlciAndW5wYWNrICdmaXgtZG9jdW1lbnRhdGlvbgotICAgICAgICAg ICAgKGxhbWJkYSogKCM6a2V5IGlucHV0cyBvdXRwdXRzICM6YWxsb3ctb3RoZXIta2V5cykKLSAg ICAgICAgICAgICAgKHN1YnN0aXR1dGUqICJEb2N1bWVudGF0aW9uL01ha2VmaWxlIgotICAgICAg ICAgICAgICAgICgoIi1tIGN1c3RvbS54c2wiKQotICAgICAgICAgICAgICAgICAoc3RyaW5nLWFw cGVuZAotICAgICAgICAgICAgICAgICAgIi1tIGN1c3RvbS54c2wgLS1za2lwLXZhbGlkYXRpb24g LXggIgotICAgICAgICAgICAgICAgICAgKGFzc29jLXJlZiBpbnB1dHMgImRvY2Jvb2steHNsIikg Ii94bWwveHNsLyIKLSAgICAgICAgICAgICAgICAgICMkKHBhY2thZ2UtbmFtZSBkb2Nib29rLXhz bCkgIi0iCi0gICAgICAgICAgICAgICAgICAjJChwYWNrYWdlLXZlcnNpb24gZG9jYm9vay14c2wp Ci0gICAgICAgICAgICAgICAgICAiL21hbnBhZ2VzL2RvY2Jvb2sueHNsIikpKSkpCi0gICAgICAg ICAgKGFkZC1hZnRlciAndW5wYWNrICdoYXJkY29kZS12YXJpYWJsZXMKLSAgICAgICAgICAgIChs YW1iZGEqICgjOmtleSBpbnB1dHMgb3V0cHV0cyAjOmFsbG93LW90aGVyLWtleXMpCi0gICAgICAg ICAgICAgIDs7IEhhcmRjb2RlIGFybSB2ZXJzaW9uIGRldGVjdGlvbgotICAgICAgICAgICAgICAo c3Vic3RpdHV0ZSogIk1ha2VmaWxlIgotICAgICAgICAgICAgICAgICgoIkFSTVYuKjo9LioiKSAi QVJNViA6PSA3XG4iKSkKLSAgICAgICAgICAgICAgOzsgSGFyZC1jb2RlIHRoZSBjb3JyZWN0IFBM VUdJTkRJUiBhYm92ZS4KLSAgICAgICAgICAgICAgKHN1YnN0aXR1dGUqICJjcml1L2luY2x1ZGUv cGx1Z2luLmgiCi0gICAgICAgICAgICAgICAgKCgiL3ZhciIpIChzdHJpbmctYXBwZW5kIChhc3Nv Yy1yZWYgb3V0cHV0cyAib3V0IikpKSkKLSAgICAgICAgICAgICAgKSkKLSAgICAgICAgICAoYWRk LWJlZm9yZSAnYnVpbGQgJ2ZpeC1zeW1saW5rCi0gICAgICAgICAgICAobGFtYmRhKiAoIzprZXkg aW5wdXRzICM6YWxsb3ctb3RoZXIta2V5cykKLSAgICAgICAgICAgICAgOzsgVGhlIGZpbGUgJ2lt YWdlcy9nb29nbGUvcHJvdG9idWYvZGVzY3JpcHRvci5wcm90bycgcG9pbnRzIHRvCi0gICAgICAg ICAgICAgIDs7IC91c3IvaW5jbHVkZS8uLi4sIHdoaWNoIG9idmlvdXNseSBkb2VzIG5vdCBleGlz dC4KLSAgICAgICAgICAgICAgKGxldCogKChmaWxlICJnb29nbGUvcHJvdG9idWYvZGVzY3JpcHRv ci5wcm90byIpCi0gICAgICAgICAgICAgICAgICAgICAodGFyZ2V0IChzdHJpbmctYXBwZW5kICJp bWFnZXMvIiBmaWxlKSkKLSAgICAgICAgICAgICAgICAgICAgIChzb3VyY2UgKHNlYXJjaC1pbnB1 dC1maWxlCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbnB1dHMKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIChzdHJpbmctYXBwZW5kICJpbmNsdWRlLyIgZmlsZSkpKSkKLSAg ICAgICAgICAgICAgICAoZGVsZXRlLWZpbGUgdGFyZ2V0KQotICAgICAgICAgICAgICAgIChzeW1s aW5rIHNvdXJjZSB0YXJnZXQpKSkpCi0gICAgICAgICAgKGFkZC1hZnRlciAnaW5zdGFsbCAnd3Jh cAotICAgICAgICAgICAgKGxhbWJkYSogKCM6a2V5IGlucHV0cyBvdXRwdXRzICM6YWxsb3ctb3Ro ZXIta2V5cykKLSAgICAgICAgICAgICAgOzsgTWFrZSBzdXJlICdjcml0JyBydW5zIHdpdGggdGhl IGNvcnJlY3QgUFlUSE9OUEFUSC4KLSAgICAgICAgICAgICAgKGxldCogKChzaXRlIChzdHJpbmct YXBwZW5kICMkb3V0cHV0ICIvbGliL3B5dGhvbiIKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICMkKHZlcnNpb24tbWFqb3IrbWlub3IKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIChwYWNrYWdlLXZlcnNpb24gcHl0aG9uKSkKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICIvc2l0ZS1wYWNrYWdlcyIp KQotICAgICAgICAgICAgICAgICAgICAgKHBhdGggKGdldGVudiAiR1VJWF9QWVRIT05QQVRIIikp KQotICAgICAgICAgICAgICAgICh3cmFwLXByb2dyYW0gKHN0cmluZy1hcHBlbmQgIyRvdXRwdXQg Ii9iaW4vY3JpdCIpCi0gICAgICAgICAgICAgICAgICBgKCJHVUlYX1BZVEhPTlBBVEgiICI6IiBw cmVmaXggKCxzaXRlICxwYXRoKSkpKSkpCi0gICAgICAgICAgKGFkZC1hZnRlciAnaW5zdGFsbCAn ZGVsZXRlLXN0YXRpYy1saWJyYXJpZXMKLSAgICAgICAgICAgIDs7IE5vdCBidWlsZGluZy9pbnN0 YWxsaW5nIHRoZXNlIGF0IGFsbCBkb2Vzbid0IHNlZW0gdG8gYmUgc3VwcG9ydGVkLgotICAgICAg ICAgICAgKGxhbWJkYSBfCi0gICAgICAgICAgICAgIChmb3ItZWFjaCBkZWxldGUtZmlsZSAoZmlu ZC1maWxlcyAjJG91dHB1dCAiXFwuYSQiKSkpKSkpKQorICAgICAgKHdpdGgtaW1wb3J0ZWQtbW9k dWxlcyAoc291cmNlLW1vZHVsZS1jbG9zdXJlICcoKGd1aXggdXRpbHMpKSkKKyAgICAgICAgI34o bW9kaWZ5LXBoYXNlcyAlc3RhbmRhcmQtcGhhc2VzCisgICAgICAgICAgICAoZGVsZXRlICdjb25m aWd1cmUpICAgICAgICAgICAgOyBubyBjb25maWd1cmUgc2NyaXB0CisgICAgICAgICAgICAoYWRk LWFmdGVyICd1bnBhY2sgJ2ZpeC1kb2N1bWVudGF0aW9uCisgICAgICAgICAgICAgIChsYW1iZGEq ICgjOmtleSBpbnB1dHMgb3V0cHV0cyAjOmFsbG93LW90aGVyLWtleXMpCisgICAgICAgICAgICAg ICAgKHN1YnN0aXR1dGUqICJEb2N1bWVudGF0aW9uL01ha2VmaWxlIgorICAgICAgICAgICAgICAg ICAgKCgiLW0gY3VzdG9tLnhzbCIpCisgICAgICAgICAgICAgICAgICAgKHN0cmluZy1hcHBlbmQK KyAgICAgICAgICAgICAgICAgICAgIi1tIGN1c3RvbS54c2wgLS1za2lwLXZhbGlkYXRpb24gLXgg IgorICAgICAgICAgICAgICAgICAgICAoYXNzb2MtcmVmIGlucHV0cyAiZG9jYm9vay14c2wiKSAi L3htbC94c2wvIgorICAgICAgICAgICAgICAgICAgICAjJChwYWNrYWdlLW5hbWUgZG9jYm9vay14 c2wpICItIgorICAgICAgICAgICAgICAgICAgICAjJChwYWNrYWdlLXZlcnNpb24gZG9jYm9vay14 c2wpCisgICAgICAgICAgICAgICAgICAgICIvbWFucGFnZXMvZG9jYm9vay54c2wiKSkpKSkKKyAg ICAgICAgICAgIChhZGQtYWZ0ZXIgJ3VucGFjayAnaGFyZGNvZGUtdmFyaWFibGVzCisgICAgICAg ICAgICAgIChsYW1iZGEqICgjOmtleSBpbnB1dHMgb3V0cHV0cyAjOmFsbG93LW90aGVyLWtleXMp CisgICAgICAgICAgICAgICAgOzsgSGFyZGNvZGUgYXJtIHZlcnNpb24gZGV0ZWN0aW9uCisgICAg ICAgICAgICAgICAgKHN1YnN0aXR1dGUqICJNYWtlZmlsZSIKKyAgICAgICAgICAgICAgICAgICgo IkFSTVYuKjo9LioiKSAiQVJNViA6PSA3XG4iKSkKKyAgICAgICAgICAgICAgICA7OyBIYXJkLWNv ZGUgdGhlIGNvcnJlY3QgUExVR0lORElSIGFib3ZlLgorICAgICAgICAgICAgICAgIChzdWJzdGl0 dXRlKiAiY3JpdS9pbmNsdWRlL3BsdWdpbi5oIgorICAgICAgICAgICAgICAgICAgKCgiL3ZhciIp IChzdHJpbmctYXBwZW5kIChhc3NvYy1yZWYgb3V0cHV0cyAib3V0IikpKSkKKyAgICAgICAgICAg ICAgICApKQorICAgICAgICAgICAgKGFkZC1iZWZvcmUgJ2J1aWxkICdmaXgtc3ltbGluaworICAg ICAgICAgICAgICAobGFtYmRhKiAoIzprZXkgaW5wdXRzICM6YWxsb3ctb3RoZXIta2V5cykKKyAg ICAgICAgICAgICAgICA7OyBUaGUgZmlsZSAnaW1hZ2VzL2dvb2dsZS9wcm90b2J1Zi9kZXNjcmlw dG9yLnByb3RvJyBwb2ludHMgdG8KKyAgICAgICAgICAgICAgICA7OyAvdXNyL2luY2x1ZGUvLi4u LCB3aGljaCBvYnZpb3VzbHkgZG9lcyBub3QgZXhpc3QuCisgICAgICAgICAgICAgICAgKGxldCog KChmaWxlICJnb29nbGUvcHJvdG9idWYvZGVzY3JpcHRvci5wcm90byIpCisgICAgICAgICAgICAg ICAgICAgICAgICh0YXJnZXQgKHN0cmluZy1hcHBlbmQgImltYWdlcy8iIGZpbGUpKQorICAgICAg ICAgICAgICAgICAgICAgICAoc291cmNlIChzZWFyY2gtaW5wdXQtZmlsZQorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBpbnB1dHMKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgKHN0cmluZy1hcHBlbmQgImluY2x1ZGUvIiBmaWxlKSkpKQorICAgICAgICAgICAgICAgICAg KGRlbGV0ZS1maWxlIHRhcmdldCkKKyAgICAgICAgICAgICAgICAgIChzeW1saW5rIHNvdXJjZSB0 YXJnZXQpKSkpCisgICAgICAgICAgICAoYWRkLWJlZm9yZSAnaW5zdGFsbCAnY2hhbmdlLWZpbGUt ZGF0ZXRpbWVzCisgICAgICAgICAgICAgIChsYW1iZGEgXworICAgICAgICAgICAgICAgICh1c2Ut bW9kdWxlcyAoZ3VpeCB1dGlscykpCisgICAgICAgICAgICAgICAgKGNoYW5nZS1maWxlLXRpbWVz dGFtcHMtcmVjdXJzaXZlbHkgIi4vIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICIxOTgwLTAxLTAxIDAwOjAwOjAwIikpKQorICAgICAgICAgICAg KGFkZC1hZnRlciAnaW5zdGFsbCAnd3JhcAorICAgICAgICAgICAgICAobGFtYmRhKiAoIzprZXkg aW5wdXRzIG91dHB1dHMgIzphbGxvdy1vdGhlci1rZXlzKQorICAgICAgICAgICAgICAgIDs7IE1h a2Ugc3VyZSAnY3JpdCcgcnVucyB3aXRoIHRoZSBjb3JyZWN0IFBZVEhPTlBBVEguCisgICAgICAg ICAgICAgICAgKGxldCogKChzaXRlIChzdHJpbmctYXBwZW5kICMkb3V0cHV0ICIvbGliL3B5dGhv biIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIyQodmVyc2lv bi1tYWpvcittaW5vcgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAocGFja2FnZS12ZXJzaW9uIHB5dGhvbikpCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICIvc2l0ZS1wYWNrYWdlcyIpKQorICAgICAgICAgICAgICAgICAg ICAgICAocGF0aCAoZ2V0ZW52ICJHVUlYX1BZVEhPTlBBVEgiKSkpCisgICAgICAgICAgICAgICAg ICAod3JhcC1wcm9ncmFtIChzdHJpbmctYXBwZW5kICMkb3V0cHV0ICIvYmluL2NyaXQiKQorICAg ICAgICAgICAgICAgICAgICBgKCJHVUlYX1BZVEhPTlBBVEgiICI6IiBwcmVmaXggKCxzaXRlICxw YXRoKSkpKSkpCisgICAgICAgICAgICAoYWRkLWFmdGVyICdpbnN0YWxsICdkZWxldGUtc3RhdGlj LWxpYnJhcmllcworICAgICAgICAgICAgICA7OyBOb3QgYnVpbGRpbmcvaW5zdGFsbGluZyB0aGVz ZSBhdCBhbGwgZG9lc24ndCBzZWVtIHRvIGJlIHN1cHBvcnRlZC4KKyAgICAgICAgICAgICAgKGxh bWJkYSBfCisgICAgICAgICAgICAgICAgKGZvci1lYWNoIGRlbGV0ZS1maWxlIChmaW5kLWZpbGVz ICMkb3V0cHV0ICJcXC5hJCIpKSkpKSkpKQogICAgIChpbnB1dHMKICAgICAgKGxpc3QgcHJvdG9i dWYKICAgICAgICAgICAgcHl0aG9uCi0tIAoyLjM5LjIKCg== --=-=-= Content-Type: text/plain; format=flowed -bjc --=-=-=--
Brian Cully <bjc@HIDDEN>:guix-patches@HIDDEN.
Full text available.guix-patches@HIDDEN:bug#63044; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.