From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id eMkuAnndWWCfGgAA0tVLHw (envelope-from ) for ; Tue, 23 Mar 2021 12:22:17 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id uHAlOXjdWWCGegAAbx9fmQ (envelope-from ) for ; Tue, 23 Mar 2021 12:22:16 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 9668722DCC for ; Tue, 23 Mar 2021 13:22:15 +0100 (CET) Received: from localhost ([::1]:41978 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOg34-00061d-MH for larch@yhetil.org; Tue, 23 Mar 2021 08:22:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40508) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOg2t-00061M-KC for guix-patches@gnu.org; Tue, 23 Mar 2021 08:22:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48198) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lOg2s-0002sC-B4 for guix-patches@gnu.org; Tue, 23 Mar 2021 08:22:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lOg2s-0003E6-6t for guix-patches@gnu.org; Tue, 23 Mar 2021 08:22:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47340] [PATCH] gnu: ccache: Update to 4.2. Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 23 Mar 2021 12:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 47340 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47340@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.161650210012372 (code B ref -1); Tue, 23 Mar 2021 12:22:02 +0000 Received: (at submit) by debbugs.gnu.org; 23 Mar 2021 12:21:40 +0000 Received: from localhost ([127.0.0.1]:59744 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lOg2S-0003DQ-VR for submit@debbugs.gnu.org; Tue, 23 Mar 2021 08:21:40 -0400 Received: from lists.gnu.org ([209.51.188.17]:43544) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lOg2Q-0003DI-L7 for submit@debbugs.gnu.org; Tue, 23 Mar 2021 08:21:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40396) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOg2Q-0005m2-8E for guix-patches@gnu.org; Tue, 23 Mar 2021 08:21:34 -0400 Received: from mail-il1-x12e.google.com ([2607:f8b0:4864:20::12e]:44597) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lOg2N-0002Um-TR for guix-patches@gnu.org; Tue, 23 Mar 2021 08:21:34 -0400 Received: by mail-il1-x12e.google.com with SMTP id t6so17947109ilp.11 for ; Tue, 23 Mar 2021 05:21:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20150623.gappssmtp.com; s=20150623; h=mime-version:from:date:message-id:subject:to; bh=PNioY7WyOpSjCOVyGaBD4m4lsn5gXClqs3fBEg+p1fw=; b=kywQx6j8/RzeWgzUvwVO0kUhqOUAGJh9flhoiYH27phsWtZwXoTU/7E/Eotp+4dS95 AU70+ifKsToKqII+/I9P5r9h4iM1B+AfSqxsv1eWgokWmbYal5HzcMKl5Yw3ANmZcJgt jYw8kW/N6HQo/Cv5AUHAw7qYxFPlwmD4unTO1CKiyVrw1WVmgOhW+32StSdeCMFndlDd S9ElVIZto12d967IqzT3iz5Q57jwDkWXpgm3bKQxX9EVtFhcM0lwkhRvfo8mIbGJZlZ/ M+6voD/dy2WCcZvwErewSFmWu5F8105EmbjXyCqU1BxmtB+xqr7QhVlP6vuU7G3bmBND 2dJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=PNioY7WyOpSjCOVyGaBD4m4lsn5gXClqs3fBEg+p1fw=; b=aa3jJHVvdUrYgUa9ZkjLIEKod2SCJPc63UUg4Tm92xgU8vJ1U7NZBplMxdweq8DFBG E9E960fsWnnTfdKWvsQJ2zXwx3rBS9miP8/r1gvQoRpIQdx+zohGAuq/b0PozrODiIc0 umlKWuDHIECoSe1PvCVY7jgylsblb+ExJ6f97fFxRws04OiiyxWq9XpCG9gKdJW4i23u MDVpfcL0hDA8jU4/j6M2hl0JVq963kdC8rRGNR9tlCbiUEV1rGJFsaGTQAFDgpYLUwfT zY5dYqRXKlwy0zguKP6WSEGpxNHeHoWDOsLAOKCfe2Pvx1PqpUy1ABV8D5L2OhzBfSgw w38w== X-Gm-Message-State: AOAM532j1pyw4q+tx1M7OGnEvVMqXUT9j8OztrPzXh+ebbtJpEFdy0Vc fXL5mDeJND1HpiuJpQ1ZVR1zfJsmHoLC+TTkis4RD00iS91Y9Y995n8= X-Google-Smtp-Source: ABdhPJyY250xIJ3+qwMwKv+B60cxoinJelg+2VW2q6vhE58C8X4u8nrDadShvNovTFSldJ2F9EhVeusKnuHTAxy8y/g= X-Received: by 2002:a92:540d:: with SMTP id i13mr4545781ilb.8.1616502089730; Tue, 23 Mar 2021 05:21:29 -0700 (PDT) MIME-Version: 1.0 From: Greg Hogan Date: Tue, 23 Mar 2021 08:21:17 -0400 Message-ID: Content-Type: multipart/mixed; boundary="000000000000d6887f05be333820" Received-SPF: none client-ip=2607:f8b0:4864:20::12e; envelope-from=code@greghogan.com; helo=mail-il1-x12e.google.com 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, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1616502136; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:list-id:list-help:list-unsubscribe:list-subscribe: list-post:dkim-signature; bh=HiSKbCuZaCKuJ45FoDGLILxSxYsijyn8QCdTecY8xc4=; b=hylNroIk8B7hjEvEbxCc2xOZDS9hL8Jxnjq+nMWJ5/vO/9Z/T36qrIMrEUPQDJcJJTAMcJ bXj8fcS/9jsOnBE87VHpH6UgdB52TVCbvUDr07nKJYkvJbo8cKa56np9lIlyh9YhLyokOf 4s25uAFuFjOF5OKs6ixKJHq1LW7V9LWfI1GFCCrFmONqWTV3yzP1DL7F4mThEetUccWvGL SFRbAhG2OKAbKu4geoTvC9MeyIPYEFesUlmqB0htrFQr6GZdyvnJxkMRyIIVBu683UxMqQ V4MMyw2jOl4JELhd/jpl+izCtRbNugBfQFqkR+oTXu6NXJmnB5ywn4J1af7pcg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1616502136; a=rsa-sha256; cv=none; b=CEFv8OGK+yNRA0v5keBRtvt5YxEKRGW16QLGFUUqW20bx3Pv5z2ppTjwpKy3qjpVEVciKY 0f3PvsJ6Zpvt8WMxGJl4ZWKHKFbPldtqwVT5TWBpo+ACdzWMWjnlAizVO5XoDWyQFTkimN aKz1o9IS1yGokug4sxHo3Xl/gDFSn5zEc8dDHWiqJM1p2D8NuRpG6exlMPU3P3VW49D25V k6EfiKCvs9dHcU70hHNfaeUjqQ/X/2x28xVF53bW/HwFvi4jdqfjOYrgX0tYyJTKRw4VbI mGSNRGWBCx3cKS/gU5r69PZ7pwepe1PEyVWFtAPniFthiVrzcsThKsOJBtS/gQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=greghogan-com.20150623.gappssmtp.com header.s=20150623 header.b=kywQx6j8; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -1.98 Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=greghogan-com.20150623.gappssmtp.com header.s=20150623 header.b=kywQx6j8; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 9668722DCC X-Spam-Score: -1.98 X-Migadu-Scanner: scn0.migadu.com X-TUID: pUAR1TgOvVrz --000000000000d6887f05be333820 Content-Type: multipart/alternative; boundary="000000000000d6887d05be33381e" --000000000000d6887d05be33381e Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable >From 5a1aeefefb1ed289a4358dff0b8719e0b4c44d9c Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Mon, 22 Mar 2021 19:52:23 +0000 Subject: [PATCH] gnu: ccache: Update to 4.2. * gnu/packages/ccache.scm (ccache): Update to 4.2. [build-system]: Switch to cmake-build-system. [inputs]: Add zstd:lib. [arguments]: Move substitution before change of directory and add phase to set HOME variable. --- gnu/packages/ccache.scm | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/gnu/packages/ccache.scm b/gnu/packages/ccache.scm index c5b9790f27..112f613c88 100644 --- a/gnu/packages/ccache.scm +++ b/gnu/packages/ccache.scm @@ -2,6 +2,7 @@ ;;; Copyright =C2=A9 2014, 2015, 2016, 2018 Eric Bavier ;;; Copyright =C2=A9 2016, 2017 Efraim Flashner ;;; Copyright =C2=A9 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright =C2=A9 2021 Greg Hogan ;;; ;;; This file is part of GNU Guix. ;;; @@ -22,7 +23,7 @@ #:use-module (guix packages) #:use-module ((guix licenses) #:select (gpl3+)) #:use-module (guix download) - #:use-module (guix build-system gnu) + #:use-module (guix build-system cmake) #:use-module (gnu packages) #:use-module (gnu packages perl) #:use-module (gnu packages compression)) @@ -30,25 +31,32 @@ (define-public ccache (package (name "ccache") - (version "3.7.12") + (version "4.2") (source (origin (method url-fetch) (uri (string-append " https://github.com/ccache/ccache/releases/download/v" version "/ccache-" version ".tar.xz")) (sha256 - (base32 "005liq8csgxdn7m9hj2ah07hishww855p8sc96y1hrnwc21lwbx0")))) - (build-system gnu-build-system) + (base32 "0kx9ggbbm899zwyyxvm4dgzn1b95zi1niz0l734pi5y3i0cb251g")))) + (build-system cmake-build-system) (native-inputs `(("perl" ,perl) ; for test/run ("which" ,(@ (gnu packages base) which)))) - (inputs `(("zlib" ,zlib))) + (inputs `(("zlib" ,zlib) + ("zstd" ,zstd "lib"))) (arguments - '(#:phases (modify-phases %standard-phases - (add-before 'check 'setup-tests - (lambda _ - (substitute* '("unittest/test_hashutil.c" "test/suites/base.bash") - (("#!/bin/sh") (string-append "#!" (which "sh")))) - #t))))) + '(#:phases + (modify-phases %standard-phases + (add-before 'configure 'setup-tests + (lambda _ + (substitute* '("unittest/test_hashutil.cpp" "test/suites/base.bash") + (("#!/bin/sh") (string-append "#!" (which "sh")))) + #t)) + ;; tests require a writable HOME + (add-before 'check 'set-home + (lambda _ + (setenv "HOME" (getenv "TMPDIR")) + #t))))) (home-page "https://ccache.dev/") (synopsis "Compiler cache") (description -- 2.31.0 --000000000000d6887d05be33381e Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
From 5a1aeefefb1ed289a4358dff0b8719e= 0b4c44d9c Mon Sep 17 00:00:00 2001
From: Greg Hogan <code@greghogan.com>
Date: M= on, 22 Mar 2021 19:52:23 +0000
Subject: [PATCH] gnu: ccache: Upda= te to 4.2.

* gnu/packages/ccache.scm (ccache): Upd= ate to 4.2.
[build-system]: Switch to cmake-build-system.
[inputs]: Add zstd:lib.
[arguments]: Move substitution before = change of directory and add phase
to set HOME variable.
---
=C2=A0gnu/packages/ccache.scm | 30 +++++++++++++++++++------= -----
=C2=A01 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/ccache.scm b/gnu/packages/c= cache.scm
index c5b9790f27..112f613c88 100644
--- a/gnu= /packages/ccache.scm
+++ b/gnu/packages/ccache.scm
@@ -= 2,6 +2,7 @@
=C2=A0;;; Copyright =C2=A9 2014, 2015, 2016, 2018 Eri= c Bavier <bavier@member.fsf.org= >
=C2=A0;;; Copyright =C2=A9 2016, 2017 Efraim Flashner &l= t;efraim@flashner.co.il>
=C2=A0;;; Copyright =C2=A9 2018, 2019, 2020 Tobias Geerinckx-Rice &= lt;me@tobias.gr>
+;;; Copy= right =C2=A9 2021 Greg Hogan <code= @greghogan.com>
=C2=A0;;;
=C2=A0;;; This file is= part of GNU Guix.
=C2=A0;;;
@@ -22,7 +23,7 @@
=C2=A0 =C2=A0#:use-module (guix packages)
=C2=A0 =C2=A0#:use-mo= dule ((guix licenses) #:select (gpl3+))
=C2=A0 =C2=A0#:use-module= (guix download)
- =C2=A0#:use-module (guix build-system gnu)
+ =C2=A0#:use-module (guix build-system cmake)
=C2=A0 =C2= =A0#:use-module (gnu packages)
=C2=A0 =C2=A0#:use-module (gnu pac= kages perl)
=C2=A0 =C2=A0#:use-module (gnu packages compression))=
@@ -30,25 +31,32 @@
=C2=A0(define-public ccache
<= div>=C2=A0 =C2=A0(package
=C2=A0 =C2=A0 =C2=A0(name "ccache&= quot;)
- =C2=A0 =C2=A0(version "3.7.12")
+ = =C2=A0 =C2=A0(version "4.2")
=C2=A0 =C2=A0 =C2=A0(sourc= e
=C2=A0 =C2=A0 =C2=A0 (origin
=C2=A0 =C2=A0 =C2=A0 =C2= =A0 (method url-fetch)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 (uri (string-a= ppend "https://github.com/ccache/ccache/releases/download/v"
= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 version "/ccache-" version ".tar.xz= "))
=C2=A0 =C2=A0 =C2=A0 =C2=A0 (sha256
- =C2=A0 = =C2=A0 =C2=A0 =C2=A0(base32 "005liq8csgxdn7m9hj2ah07hishww855p8sc96y1h= rnwc21lwbx0"))))
- =C2=A0 =C2=A0(build-system gnu-build-syst= em)
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0(base32 "0kx9ggbbm899zwyyxv= m4dgzn1b95zi1niz0l734pi5y3i0cb251g"))))
+ =C2=A0 =C2=A0(buil= d-system cmake-build-system)
=C2=A0 =C2=A0 =C2=A0(native-inputs `= (("perl" ,perl) =C2=A0 =C2=A0 ; for test/run
=C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ("w= hich" ,(@ (gnu packages base) which))))
- =C2=A0 =C2=A0(inpu= ts `(("zlib" ,zlib)))
+ =C2=A0 =C2=A0(inputs `(("z= lib" ,zlib)
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0("zstd" ,zstd "lib")))
=C2=A0 =C2=A0 =C2= =A0(arguments
- =C2=A0 =C2=A0 '(#:phases (modify-phases %stan= dard-phases
- =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0(add-before 'check 'setup-tests
- =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(lambda _
<= div>- =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0(substitute* '("unittest/test_hashutil.c" "test/s= uites/base.bash")
- =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(("#!/bin/sh") (stri= ng-append "#!" (which "sh"))))
- =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0#t)))))
+ =C2=A0 =C2=A0 '(#:phases
+ =C2=A0 =C2=A0 =C2=A0 (m= odify-phases %standard-phases
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 (add-= before 'configure 'setup-tests
+ =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 (lambda _
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = (substitute* '("unittest/test_hashutil.cpp" "test/suites= /base.bash")
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 (("#!/bin/sh") (string-append "#!" (which "sh&= quot;))))
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 #t))
<= div>+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 ;; tests require a writable HOME
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 (add-before 'check 'set-home<= div>+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (lambda _
+ =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (setenv "HOME" (getenv "TMPD= IR"))
+ =C2=A0 =C2=A0 #t)))))
=C2=A0 =C2=A0 =C2=A0(hom= e-page "https://ccache.dev/")=
=C2=A0 =C2=A0 =C2=A0(synopsis "Compiler cache")
<= div>=C2=A0 =C2=A0 =C2=A0(description
--
2.31.0
--000000000000d6887d05be33381e-- --000000000000d6887f05be333820 Content-Type: application/octet-stream; name="0001-gnu-ccache-Update-to-4.2.patch" Content-Disposition: attachment; filename="0001-gnu-ccache-Update-to-4.2.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_kmlzl4ic0 RnJvbSA1YTFhZWVmZWZiMWVkMjg5YTQzNThkZmYwYjg3MTllMGI0YzQ0ZDljIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBHcmVnIEhvZ2FuIDxjb2RlQGdyZWdob2dhbi5jb20+CkRhdGU6 IE1vbiwgMjIgTWFyIDIwMjEgMTk6NTI6MjMgKzAwMDAKU3ViamVjdDogW1BBVENIXSBnbnU6IGNj YWNoZTogVXBkYXRlIHRvIDQuMi4KCiogZ251L3BhY2thZ2VzL2NjYWNoZS5zY20gKGNjYWNoZSk6 IFVwZGF0ZSB0byA0LjIuCltidWlsZC1zeXN0ZW1dOiBTd2l0Y2ggdG8gY21ha2UtYnVpbGQtc3lz dGVtLgpbaW5wdXRzXTogQWRkIHpzdGQ6bGliLgpbYXJndW1lbnRzXTogTW92ZSBzdWJzdGl0dXRp b24gYmVmb3JlIGNoYW5nZSBvZiBkaXJlY3RvcnkgYW5kIGFkZCBwaGFzZQp0byBzZXQgSE9NRSB2 YXJpYWJsZS4KLS0tCiBnbnUvcGFja2FnZXMvY2NhY2hlLnNjbSB8IDMwICsrKysrKysrKysrKysr KysrKystLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDE5IGluc2VydGlvbnMoKyksIDExIGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy9jY2FjaGUuc2NtIGIvZ251L3Bh Y2thZ2VzL2NjYWNoZS5zY20KaW5kZXggYzViOTc5MGYyNy4uMTEyZjYxM2M4OCAxMDA2NDQKLS0t IGEvZ251L3BhY2thZ2VzL2NjYWNoZS5zY20KKysrIGIvZ251L3BhY2thZ2VzL2NjYWNoZS5zY20K QEAgLTIsNiArMiw3IEBACiA7OzsgQ29weXJpZ2h0IMKpIDIwMTQsIDIwMTUsIDIwMTYsIDIwMTgg RXJpYyBCYXZpZXIgPGJhdmllckBtZW1iZXIuZnNmLm9yZz4KIDs7OyBDb3B5cmlnaHQgwqkgMjAx NiwgMjAxNyBFZnJhaW0gRmxhc2huZXIgPGVmcmFpbUBmbGFzaG5lci5jby5pbD4KIDs7OyBDb3B5 cmlnaHQgwqkgMjAxOCwgMjAxOSwgMjAyMCBUb2JpYXMgR2VlcmluY2t4LVJpY2UgPG1lQHRvYmlh cy5ncj4KKzs7OyBDb3B5cmlnaHQgwqkgMjAyMSBHcmVnIEhvZ2FuIDxjb2RlQGdyZWdob2dhbi5j b20+CiA7OzsKIDs7OyBUaGlzIGZpbGUgaXMgcGFydCBvZiBHTlUgR3VpeC4KIDs7OwpAQCAtMjIs NyArMjMsNyBAQAogICAjOnVzZS1tb2R1bGUgKGd1aXggcGFja2FnZXMpCiAgICM6dXNlLW1vZHVs ZSAoKGd1aXggbGljZW5zZXMpICM6c2VsZWN0IChncGwzKykpCiAgICM6dXNlLW1vZHVsZSAoZ3Vp eCBkb3dubG9hZCkKLSAgIzp1c2UtbW9kdWxlIChndWl4IGJ1aWxkLXN5c3RlbSBnbnUpCisgICM6 dXNlLW1vZHVsZSAoZ3VpeCBidWlsZC1zeXN0ZW0gY21ha2UpCiAgICM6dXNlLW1vZHVsZSAoZ251 IHBhY2thZ2VzKQogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBwZXJsKQogICAjOnVzZS1t b2R1bGUgKGdudSBwYWNrYWdlcyBjb21wcmVzc2lvbikpCkBAIC0zMCwyNSArMzEsMzIgQEAKIChk ZWZpbmUtcHVibGljIGNjYWNoZQogICAocGFja2FnZQogICAgIChuYW1lICJjY2FjaGUiKQotICAg ICh2ZXJzaW9uICIzLjcuMTIiKQorICAgICh2ZXJzaW9uICI0LjIiKQogICAgIChzb3VyY2UKICAg ICAgKG9yaWdpbgogICAgICAgIChtZXRob2QgdXJsLWZldGNoKQogICAgICAgICh1cmkgKHN0cmlu Zy1hcHBlbmQgImh0dHBzOi8vZ2l0aHViLmNvbS9jY2FjaGUvY2NhY2hlL3JlbGVhc2VzL2Rvd25s b2FkL3YiCiAgICAgICAgICAgICAgICAgICAgICAgICAgICB2ZXJzaW9uICIvY2NhY2hlLSIgdmVy c2lvbiAiLnRhci54eiIpKQogICAgICAgIChzaGEyNTYKLSAgICAgICAgKGJhc2UzMiAiMDA1bGlx OGNzZ3hkbjdtOWhqMmFoMDdoaXNod3c4NTVwOHNjOTZ5MWhybndjMjFsd2J4MCIpKSkpCi0gICAg KGJ1aWxkLXN5c3RlbSBnbnUtYnVpbGQtc3lzdGVtKQorICAgICAgICAoYmFzZTMyICIwa3g5Z2di Ym04OTl6d3l5eHZtNGRnem4xYjk1emkxbml6MGw3MzRwaTV5M2kwY2IyNTFnIikpKSkKKyAgICAo YnVpbGQtc3lzdGVtIGNtYWtlLWJ1aWxkLXN5c3RlbSkKICAgICAobmF0aXZlLWlucHV0cyBgKCgi cGVybCIgLHBlcmwpICAgICA7IGZvciB0ZXN0L3J1bgogICAgICAgICAgICAgICAgICAgICAgKCJ3 aGljaCIgLChAIChnbnUgcGFja2FnZXMgYmFzZSkgd2hpY2gpKSkpCi0gICAgKGlucHV0cyBgKCgi emxpYiIgLHpsaWIpKSkKKyAgICAoaW5wdXRzIGAoKCJ6bGliIiAsemxpYikKKyAgICAgICAgICAg ICAgKCJ6c3RkIiAsenN0ZCAibGliIikpKQogICAgIChhcmd1bWVudHMKLSAgICAgJygjOnBoYXNl cyAobW9kaWZ5LXBoYXNlcyAlc3RhbmRhcmQtcGhhc2VzCi0gICAgICAgICAgICAgICAgICAoYWRk LWJlZm9yZSAnY2hlY2sgJ3NldHVwLXRlc3RzCi0gICAgICAgICAgICAgICAgICAgIChsYW1iZGEg XwotICAgICAgICAgICAgICAgICAgICAgIChzdWJzdGl0dXRlKiAnKCJ1bml0dGVzdC90ZXN0X2hh c2h1dGlsLmMiICJ0ZXN0L3N1aXRlcy9iYXNlLmJhc2giKQotICAgICAgICAgICAgICAgICAgICAg ICAgKCgiIyEvYmluL3NoIikgKHN0cmluZy1hcHBlbmQgIiMhIiAod2hpY2ggInNoIikpKSkKLSAg ICAgICAgICAgICAgICAgICAgICAjdCkpKSkpCisgICAgICcoIzpwaGFzZXMKKyAgICAgICAobW9k aWZ5LXBoYXNlcyAlc3RhbmRhcmQtcGhhc2VzCisgICAgICAgICAoYWRkLWJlZm9yZSAnY29uZmln dXJlICdzZXR1cC10ZXN0cworICAgICAgICAgICAobGFtYmRhIF8KKyAgICAgICAgICAgICAoc3Vi c3RpdHV0ZSogJygidW5pdHRlc3QvdGVzdF9oYXNodXRpbC5jcHAiICJ0ZXN0L3N1aXRlcy9iYXNl LmJhc2giKQorICAgICAgICAgICAgICAgKCgiIyEvYmluL3NoIikgKHN0cmluZy1hcHBlbmQgIiMh IiAod2hpY2ggInNoIikpKSkKKyAgICAgICAgICAgICAjdCkpCisgICAgICAgICA7OyB0ZXN0cyBy ZXF1aXJlIGEgd3JpdGFibGUgSE9NRQorICAgICAgICAgKGFkZC1iZWZvcmUgJ2NoZWNrICdzZXQt aG9tZQorICAgICAgICAgICAobGFtYmRhIF8KKyAgICAgICAgICAgICAoc2V0ZW52ICJIT01FIiAo Z2V0ZW52ICJUTVBESVIiKSkKKwkgICAgICN0KSkpKSkKICAgICAoaG9tZS1wYWdlICJodHRwczov L2NjYWNoZS5kZXYvIikKICAgICAoc3lub3BzaXMgIkNvbXBpbGVyIGNhY2hlIikKICAgICAoZGVz Y3JpcHRpb24KLS0gCjIuMzEuMAoK --000000000000d6887f05be333820--