From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 13 10:12:25 2021 Received: (at submit) by debbugs.gnu.org; 13 Jan 2021 15:12:25 +0000 Received: from localhost ([127.0.0.1]:36259 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kzhor-0008Lf-16 for submit@debbugs.gnu.org; Wed, 13 Jan 2021 10:12:25 -0500 Received: from lists.gnu.org ([209.51.188.17]:37396) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kzhoo-0008LX-LF for submit@debbugs.gnu.org; Wed, 13 Jan 2021 10:12:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35950) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kzhoo-00054v-GV for guix-patches@gnu.org; Wed, 13 Jan 2021 10:12:18 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:40211) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kzhom-0007Y2-EV for guix-patches@gnu.org; Wed, 13 Jan 2021 10:12:18 -0500 Received: by mail-wr1-x431.google.com with SMTP id 91so2488420wrj.7 for ; Wed, 13 Jan 2021 07:12:15 -0800 (PST) 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=zeWyqnKub0FspJvxSLnM+b1aFB/kkW9khWunys4RYHw=; b=mHANSthOcQ5ZrxRhw+OvPjRJkc5ldNxpQQYqcS/d/ktjCbAt0UHSu3Pcwe1MelDpps 9b4668BTV/tYRJSMHgGmGvO+LtSzZKtROFW9sEHHsWo6gRM8nv1NlLB9XdlC4paF2Iah tcXl3IvhXN2AcJD85zhTLFp9odJHROZBnh2YHSpqatmFYCpaF5cjZbcnMCjSl6kNgHme 1FNd2OCffmW8sagtGt14G37ALbPf5YDI+m45cszCOtc5FgjMV4ff6aGmVE6KshQvPZ+k 6W22QmJtyfr5SixOZ6FFPPbtWUMuLdeYLkfHFv6QHeotXZGOrP/ePJpy7Tj9DHvLkMJs GAqA== 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=zeWyqnKub0FspJvxSLnM+b1aFB/kkW9khWunys4RYHw=; b=RjwsxvbgKKJP73yAwCEAEYWZ9fD+i9IUGYGVoscOXX+jkDPEXN722Qd4Y3vG7dgg1P 41WWqzGCLm1+E9nd0RsMhkGSrCkQVY+hK+ycW69ZCsmLR/Y7N8+R+70qHIljNNs5qYoD EZYuycTlKkS06CHz3TwB8O+xGZMmIjrbsh5M1Vr9BpRTAMLznMTbellCHhoc22PggIG/ U2e6nmawUj6FSLJ87z/8OXyYQm7rTmww9+mPNqb3qSd1inwKocFZ+GeYVuey2Z8Jy7kY nfuIPNoTTaaGsMvIIFp52PfmD0P8bAzDRZdafFWt9+HwnQCTo7H59PR5gKZPIkBEkkDh Zf2A== X-Gm-Message-State: AOAM532CgWNAhQ07oZjxsp48+fFRsF7JC/iEENdPbPH+S1xEB8o99KxD OgTeqJDD7Z9v0Ck/PSJdYGdOmyH27a890mIPGWXRU3x+4K4Y99j+FYw= X-Google-Smtp-Source: ABdhPJyabfscfLSzPJjz8QZcSVD/YbglaxDX3ll1QfnTedcwJnS2ZwNCpxg5jnZGJvcdJTkTtBp9mhDTPAkobNbl3BI= X-Received: by 2002:adf:fd05:: with SMTP id e5mr3104000wrr.225.1610550734304; Wed, 13 Jan 2021 07:12:14 -0800 (PST) MIME-Version: 1.0 From: Greg Hogan Date: Wed, 13 Jan 2021 10:12:03 -0500 Message-ID: Subject: [PATCH] gnu: abseil-cpp: Update to 20200923.2. To: guix-patches@gnu.org Content-Type: multipart/mixed; boundary="000000000000695fd605b8c99094" Received-SPF: none client-ip=2a00:1450:4864:20::431; envelope-from=code@greghogan.com; helo=mail-wr1-x431.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-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) --000000000000695fd605b8c99094 Content-Type: multipart/alternative; boundary="000000000000695fd405b8c99092" --000000000000695fd405b8c99092 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable From 0b40b3dd15d81dd9ad99f2542ff2be5a8706a8cf Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Fri, 8 Jan 2021 19:01:10 +0000 Subject: [PATCH] gnu: abseil-cpp: Update to 20200923.2. * gnu/packages/cpp.scm (abseil-cpp): Update to 20200923.2. [arguments]: Enable external googletest. * gnu/packages/patches/abseil-cpp-fix.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + gnu/packages/cpp.scm | 9 ++++++--- gnu/packages/patches/abseil-cpp-fix.patch | 16 ++++++++++++++++ 3 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/abseil-cpp-fix.patch diff --git a/gnu/local.mk b/gnu/local.mk index bcf7ee0245..b98fa1f106 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -780,6 +780,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/abcl-fix-build-xml.patch \ %D%/packages/patches/ableton-link-system-libraries-debian.patch \ %D%/packages/patches/abiword-explictly-cast-bools.patch \ + %D%/packages/patches/abseil-cpp-fix.patch \ %D%/packages/patches/adb-add-libraries.patch \ %D%/packages/patches/aegis-constness-error.patch \ %D%/packages/patches/aegis-perl-tempdir1.patch \ diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 45d3faeafb..115b8ca1e6 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -14,7 +14,7 @@ ;;; Copyright =C2=A9 2020 Marius Bakke ;;; Copyright =C2=A9 2020 Michael Rohleder ;;; Copyright =C2=A9 2020 Alexandros Theodotou -;;; Copyright =C2=A9 2020 Greg Hogan +;;; Copyright =C2=A9 2020, 2021 Greg Hogan ;;; Copyright =C2=A9 2020 Brett Gilio ;;; ;;; This file is part of GNU Guix. @@ -603,7 +603,7 @@ point and then, after each tween step, plugging back the result.") (define-public abseil-cpp (package (name "abseil-cpp") - (version "20200225.2") + (version "20200923.2") (source (origin (method git-fetch) (uri (git-reference @@ -612,11 +612,14 @@ point and then, after each tween step, plugging back the result.") (file-name (git-file-name name version)) (sha256 (base32 - "0dwxg54pv6ihphbia0iw65r64whd7v8nm4wwhcz219642cgpv54y")))) + "0r98aplfmvvq40hskv2ly6jfkh9r958wk50hzyfdqgh85rl29v0v")) + ;; Remove after next googletest release and update. + (patches (search-patches "abseil-cpp-fix.patch")))) (build-system cmake-build-system) (arguments `(#:configure-flags (list "-DBUILD_SHARED_LIBS=3DON" "-DABSL_RUN_TESTS=3DON" + "-DABSL_USE_EXTERNAL_GOOGLETEST=3DON" ;; Needed, else we get errors like: ;; ;; ld: CMakeFiles/absl_periodic_sampler_test.dir/internal/periodic_sampler_test.cc= .o: diff --git a/gnu/packages/patches/abseil-cpp-fix.patch b/gnu/packages/patches/abseil-cpp-fix.patch new file mode 100644 index 0000000000..86751c227b --- /dev/null +++ b/gnu/packages/patches/abseil-cpp-fix.patch @@ -0,0 +1,16 @@ +The GTEST_ALLOW_UNINSTANTIATED_PARAMTERIZED_TEST macro was added to googletest +in commit 0b024bd9 on master. It has been used in an abseil-cpp release before +a googletest release. + +--- a/absl/container/internal/unordered_map_modifiers_test.h ++++ b/absl/container/internal/unordered_map_modifiers_test.h +@@ -286,7 +286,9 @@ class UniquePtrModifiersTest : public ::testing::Test = { + } + }; + ++#ifdef GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST + GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(UniquePtrModifiersTest); ++#endif + + TYPED_TEST_SUITE_P(UniquePtrModifiersTest); + --=20 2.23.3 --000000000000695fd405b8c99092 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
From 0b40b3dd15d81dd9ad99f2542ff2be5= a8706a8cf Mon Sep 17 00:00:00 2001
From: Greg Hogan <code@greghogan.com>
Date: F= ri, 8 Jan 2021 19:01:10 +0000
Subject: [PATCH] gnu: abseil-cpp: U= pdate to 20200923.2.

* gnu/packages/cpp.scm (absei= l-cpp): Update to 20200923.2.
[arguments]: Enable external google= test.
* gnu/packages/patches/abseil-cpp-fix.patch: New file.
* gnu/local.mk (dist_patch_DATA): Reg= ister it.
---
=C2=A0gnu/loc= al.mk =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 =C2=A0| =C2=A01 +
=C2=A0gnu/pa= ckages/cpp.scm =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0| =C2=A09 ++++++---
=C2=A0gnu/packages/patches/a= bseil-cpp-fix.patch | 16 ++++++++++++++++
=C2=A03 files changed, = 23 insertions(+), 3 deletions(-)
=C2=A0create mode 100644 gnu/pac= kages/patches/abseil-cpp-fix.patch

diff --git a/gn= u/local.mk b/gnu/local.mk
index bcf7ee0245..b98fa1f106 100644
--- = a/gnu/local.mk
+++ b/gnu/local.mk
@@ -780,6 +780,7 @@ dist_patch_= DATA =3D = \
=C2=A0 =C2=A0%D%/packages/patches/abcl-fix-build-xml.p= atch = \
=C2=A0 =C2=A0%D%/packages/patches/ableton-link-system-libraries= -debian.patch \
=C2=A0 =C2=A0%D%/packages/patches/abiword-explictly-ca= st-bools.patch \
+ =C2=A0%D%/packages/patches/abseil-cpp-fix.patch \
<= div>=C2=A0 =C2=A0%D%/packages/patches/adb-add-libraries.patch \
=C2= =A0 =C2=A0%D%/packages/patches/aegis-constness-error.patch =C2=A0 =C2=A0 = =C2=A0 =C2=A0 \
=C2=A0 =C2=A0%D%/packages/patches/aegis-perl-tempdir1= .patch =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 \
diff --git a/gnu/packages= /cpp.scm b/gnu/packages/cpp.scm
index 45d3faeafb..115b8ca1e6 1006= 44
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.sc= m
@@ -14,7 +14,7 @@
=C2=A0;;; Copyright =C2=A9 2020 Mar= ius Bakke <marius@gnu.org>
=C2=A0;;; Copyright =C2=A9 2020 Michael Rohleder <mike@rohleder.de>
=C2=A0;;; Copyright = =C2=A9 2020 Alexandros Theodotou <ale= x@zrythm.org>
-;;; Copyright =C2=A9 2020 Greg Hogan <code@greghogan.com>
+;= ;; Copyright =C2=A9 2020, 2021 Greg Hogan <code@greghogan.com>
=C2=A0;;; Copyright =C2=A9 20= 20 Brett Gilio <brettg@gnu.org>=
=C2=A0;;;
=C2=A0;;; This file is part of GNU Guix.
@@ -603,7 +603,7 @@ point and then, after each tween step, plugging = back the result.")
=C2=A0(define-public abseil-cpp
=C2=A0 =C2=A0(package
=C2=A0 =C2=A0 =C2=A0(name "abseil-cpp= ")
- =C2=A0 =C2=A0(version "20200225.2")
+ =C2=A0 =C2=A0(version "20200923.2")
=C2=A0 =C2=A0 = =C2=A0(source (origin
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0(method git-fetch)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0(uri (git-reference
@@ -612,11 +612,14 @@= point and then, after each tween step, plugging back the result.")
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(file-name (= git-file-name name version))
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0(sha256
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 (base32
- =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0"0dwxg54pv6ihphbia0iw65r64whd7v8nm4wwhcz219642cgp= v54y"))))
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0"0r98aplfmvvq40hskv2ly6jfkh9r958wk50hzyfdqgh85rl29v0v"))
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0;; Remove after = next googletest release and update.
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0(patches (search-patches "abseil-cpp-fix.patch&qu= ot;))))
=C2=A0 =C2=A0 =C2=A0(build-system cmake-build-system)
=C2=A0 =C2=A0 =C2=A0(arguments
=C2=A0 =C2=A0 =C2=A0 `(#:co= nfigure-flags (list "-DBUILD_SHARED_LIBS=3DON"
=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 =C2=A0 =C2=A0 "-DABSL_RUN_TESTS=3DON"
+ =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 =C2=A0 "-DABSL_USE_EXTERNAL_GOOGLETEST=3DO= N"
=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 =C2=A0 =C2=A0 ;; Needed, else we = get errors like:
=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 =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 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ;; ld: CMakeFiles/absl_periodic_samp= ler_test.dir/internal/periodic_sampler_test.cc.o:
diff --git a/gn= u/packages/patches/abseil-cpp-fix.patch b/gnu/packages/patches/abseil-cpp-f= ix.patch
new file mode 100644
index 0000000000..86751c2= 27b
--- /dev/null
+++ b/gnu/packages/patches/abseil-cpp= -fix.patch
@@ -0,0 +1,16 @@
+The GTEST_ALLOW_UNINSTANTI= ATED_PARAMTERIZED_TEST macro was added to googletest
+in commit 0= b024bd9 on master. It has been used in an abseil-cpp release before
+a googletest release.
+
+--- a/absl/container/inter= nal/unordered_map_modifiers_test.h
++++ b/absl/container/internal= /unordered_map_modifiers_test.h
+@@ -286,7 +286,9 @@ class Unique= PtrModifiersTest : public ::testing::Test {
+ =C2=A0 }
= + };
+=C2=A0
++#ifdef GTEST_ALLOW_UNINSTANTIATED_PARAME= TERIZED_TEST
+ GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(Uniq= uePtrModifiersTest);
++#endif
+=C2=A0
+ TYPED= _TEST_SUITE_P(UniquePtrModifiersTest);
+=C2=A0
--=C2=A0=
2.23.3
--000000000000695fd405b8c99092-- --000000000000695fd605b8c99094 Content-Type: application/octet-stream; name="0001-gnu-abseil-cpp-Update-to-20200923.2.patch" Content-Disposition: attachment; filename="0001-gnu-abseil-cpp-Update-to-20200923.2.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_kjvk94vd0 RnJvbSAwYjQwYjNkZDE1ZDgxZGQ5YWQ5OWYyNTQyZmYyYmU1YTg3MDZhOGNmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBHcmVnIEhvZ2FuIDxjb2RlQGdyZWdob2dhbi5jb20+CkRhdGU6 IEZyaSwgOCBKYW4gMjAyMSAxOTowMToxMCArMDAwMApTdWJqZWN0OiBbUEFUQ0hdIGdudTogYWJz ZWlsLWNwcDogVXBkYXRlIHRvIDIwMjAwOTIzLjIuCgoqIGdudS9wYWNrYWdlcy9jcHAuc2NtIChh YnNlaWwtY3BwKTogVXBkYXRlIHRvIDIwMjAwOTIzLjIuClthcmd1bWVudHNdOiBFbmFibGUgZXh0 ZXJuYWwgZ29vZ2xldGVzdC4KKiBnbnUvcGFja2FnZXMvcGF0Y2hlcy9hYnNlaWwtY3BwLWZpeC5w YXRjaDogTmV3IGZpbGUuCiogZ251L2xvY2FsLm1rIChkaXN0X3BhdGNoX0RBVEEpOiBSZWdpc3Rl ciBpdC4KLS0tCiBnbnUvbG9jYWwubWsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAx ICsKIGdudS9wYWNrYWdlcy9jcHAuc2NtICAgICAgICAgICAgICAgICAgICAgIHwgIDkgKysrKysr LS0tCiBnbnUvcGFja2FnZXMvcGF0Y2hlcy9hYnNlaWwtY3BwLWZpeC5wYXRjaCB8IDE2ICsrKysr KysrKysrKysrKysKIDMgZmlsZXMgY2hhbmdlZCwgMjMgaW5zZXJ0aW9ucygrKSwgMyBkZWxldGlv bnMoLSkKIGNyZWF0ZSBtb2RlIDEwMDY0NCBnbnUvcGFja2FnZXMvcGF0Y2hlcy9hYnNlaWwtY3Bw LWZpeC5wYXRjaAoKZGlmZiAtLWdpdCBhL2dudS9sb2NhbC5tayBiL2dudS9sb2NhbC5tawppbmRl eCBiY2Y3ZWUwMjQ1Li5iOThmYTFmMTA2IDEwMDY0NAotLS0gYS9nbnUvbG9jYWwubWsKKysrIGIv Z251L2xvY2FsLm1rCkBAIC03ODAsNiArNzgwLDcgQEAgZGlzdF9wYXRjaF9EQVRBID0JCQkJCQlc CiAgICVEJS9wYWNrYWdlcy9wYXRjaGVzL2FiY2wtZml4LWJ1aWxkLXhtbC5wYXRjaAlcCiAgICVE JS9wYWNrYWdlcy9wYXRjaGVzL2FibGV0b24tbGluay1zeXN0ZW0tbGlicmFyaWVzLWRlYmlhbi5w YXRjaAlcCiAgICVEJS9wYWNrYWdlcy9wYXRjaGVzL2FiaXdvcmQtZXhwbGljdGx5LWNhc3QtYm9v bHMucGF0Y2gJXAorICAlRCUvcGFja2FnZXMvcGF0Y2hlcy9hYnNlaWwtY3BwLWZpeC5wYXRjaAlc CiAgICVEJS9wYWNrYWdlcy9wYXRjaGVzL2FkYi1hZGQtbGlicmFyaWVzLnBhdGNoCQkJXAogICAl RCUvcGFja2FnZXMvcGF0Y2hlcy9hZWdpcy1jb25zdG5lc3MtZXJyb3IucGF0Y2ggICAgICAgICAJ XAogICAlRCUvcGFja2FnZXMvcGF0Y2hlcy9hZWdpcy1wZXJsLXRlbXBkaXIxLnBhdGNoICAgICAg ICAgICAJXApkaWZmIC0tZ2l0IGEvZ251L3BhY2thZ2VzL2NwcC5zY20gYi9nbnUvcGFja2FnZXMv Y3BwLnNjbQppbmRleCA0NWQzZmFlYWZiLi4xMTViOGNhMWU2IDEwMDY0NAotLS0gYS9nbnUvcGFj a2FnZXMvY3BwLnNjbQorKysgYi9nbnUvcGFja2FnZXMvY3BwLnNjbQpAQCAtMTQsNyArMTQsNyBA QAogOzs7IENvcHlyaWdodCDCqSAyMDIwIE1hcml1cyBCYWtrZSA8bWFyaXVzQGdudS5vcmc+CiA7 OzsgQ29weXJpZ2h0IMKpIDIwMjAgTWljaGFlbCBSb2hsZWRlciA8bWlrZUByb2hsZWRlci5kZT4K IDs7OyBDb3B5cmlnaHQgwqkgMjAyMCBBbGV4YW5kcm9zIFRoZW9kb3RvdSA8YWxleEB6cnl0aG0u b3JnPgotOzs7IENvcHlyaWdodCDCqSAyMDIwIEdyZWcgSG9nYW4gPGNvZGVAZ3JlZ2hvZ2FuLmNv bT4KKzs7OyBDb3B5cmlnaHQgwqkgMjAyMCwgMjAyMSBHcmVnIEhvZ2FuIDxjb2RlQGdyZWdob2dh bi5jb20+CiA7OzsgQ29weXJpZ2h0IMKpIDIwMjAgQnJldHQgR2lsaW8gPGJyZXR0Z0BnbnUub3Jn PgogOzs7CiA7OzsgVGhpcyBmaWxlIGlzIHBhcnQgb2YgR05VIEd1aXguCkBAIC02MDMsNyArNjAz LDcgQEAgcG9pbnQgYW5kIHRoZW4sIGFmdGVyIGVhY2ggdHdlZW4gc3RlcCwgcGx1Z2dpbmcgYmFj ayB0aGUgcmVzdWx0LiIpCiAoZGVmaW5lLXB1YmxpYyBhYnNlaWwtY3BwCiAgIChwYWNrYWdlCiAg ICAgKG5hbWUgImFic2VpbC1jcHAiKQotICAgICh2ZXJzaW9uICIyMDIwMDIyNS4yIikKKyAgICAo dmVyc2lvbiAiMjAyMDA5MjMuMiIpCiAgICAgKHNvdXJjZSAob3JpZ2luCiAgICAgICAgICAgICAg IChtZXRob2QgZ2l0LWZldGNoKQogICAgICAgICAgICAgICAodXJpIChnaXQtcmVmZXJlbmNlCkBA IC02MTIsMTEgKzYxMiwxNCBAQCBwb2ludCBhbmQgdGhlbiwgYWZ0ZXIgZWFjaCB0d2VlbiBzdGVw LCBwbHVnZ2luZyBiYWNrIHRoZSByZXN1bHQuIikKICAgICAgICAgICAgICAgKGZpbGUtbmFtZSAo Z2l0LWZpbGUtbmFtZSBuYW1lIHZlcnNpb24pKQogICAgICAgICAgICAgICAoc2hhMjU2CiAgICAg ICAgICAgICAgICAoYmFzZTMyCi0gICAgICAgICAgICAgICAgIjBkd3hnNTRwdjZpaHBoYmlhMGl3 NjVyNjR3aGQ3djhubTR3d2hjejIxOTY0MmNncHY1NHkiKSkpKQorICAgICAgICAgICAgICAgICIw cjk4YXBsZm12dnE0MGhza3YybHk2amZraDlyOTU4d2s1MGh6eWZkcWdoODVybDI5djB2IikpCisg ICAgICAgICAgICAgIDs7IFJlbW92ZSBhZnRlciBuZXh0IGdvb2dsZXRlc3QgcmVsZWFzZSBhbmQg dXBkYXRlLgorICAgICAgICAgICAgICAocGF0Y2hlcyAoc2VhcmNoLXBhdGNoZXMgImFic2VpbC1j cHAtZml4LnBhdGNoIikpKSkKICAgICAoYnVpbGQtc3lzdGVtIGNtYWtlLWJ1aWxkLXN5c3RlbSkK ICAgICAoYXJndW1lbnRzCiAgICAgIGAoIzpjb25maWd1cmUtZmxhZ3MgKGxpc3QgIi1EQlVJTERf U0hBUkVEX0xJQlM9T04iCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIi1EQUJTTF9S VU5fVEVTVFM9T04iCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIi1EQUJTTF9VU0Vf RVhURVJOQUxfR09PR0xFVEVTVD1PTiIKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA7 OyBOZWVkZWQsIGVsc2Ugd2UgZ2V0IGVycm9ycyBsaWtlOgogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIDs7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgOzsgbGQ6IENNYWtl RmlsZXMvYWJzbF9wZXJpb2RpY19zYW1wbGVyX3Rlc3QuZGlyL2ludGVybmFsL3BlcmlvZGljX3Nh bXBsZXJfdGVzdC5jYy5vOgpkaWZmIC0tZ2l0IGEvZ251L3BhY2thZ2VzL3BhdGNoZXMvYWJzZWls LWNwcC1maXgucGF0Y2ggYi9nbnUvcGFja2FnZXMvcGF0Y2hlcy9hYnNlaWwtY3BwLWZpeC5wYXRj aApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwLi44Njc1MWMyMjdiCi0tLSAv ZGV2L251bGwKKysrIGIvZ251L3BhY2thZ2VzL3BhdGNoZXMvYWJzZWlsLWNwcC1maXgucGF0Y2gK QEAgLTAsMCArMSwxNiBAQAorVGhlIEdURVNUX0FMTE9XX1VOSU5TVEFOVElBVEVEX1BBUkFNVEVS SVpFRF9URVNUIG1hY3JvIHdhcyBhZGRlZCB0byBnb29nbGV0ZXN0CitpbiBjb21taXQgMGIwMjRi ZDkgb24gbWFzdGVyLiBJdCBoYXMgYmVlbiB1c2VkIGluIGFuIGFic2VpbC1jcHAgcmVsZWFzZSBi ZWZvcmUKK2EgZ29vZ2xldGVzdCByZWxlYXNlLgorCistLS0gYS9hYnNsL2NvbnRhaW5lci9pbnRl cm5hbC91bm9yZGVyZWRfbWFwX21vZGlmaWVyc190ZXN0LmgKKysrKyBiL2Fic2wvY29udGFpbmVy L2ludGVybmFsL3Vub3JkZXJlZF9tYXBfbW9kaWZpZXJzX3Rlc3QuaAorQEAgLTI4Niw3ICsyODYs OSBAQCBjbGFzcyBVbmlxdWVQdHJNb2RpZmllcnNUZXN0IDogcHVibGljIDo6dGVzdGluZzo6VGVz dCB7CisgICB9CisgfTsKKyAKKysjaWZkZWYgR1RFU1RfQUxMT1dfVU5JTlNUQU5USUFURURfUEFS QU1FVEVSSVpFRF9URVNUCisgR1RFU1RfQUxMT1dfVU5JTlNUQU5USUFURURfUEFSQU1FVEVSSVpF RF9URVNUKFVuaXF1ZVB0ck1vZGlmaWVyc1Rlc3QpOworKyNlbmRpZgorIAorIFRZUEVEX1RFU1Rf U1VJVEVfUChVbmlxdWVQdHJNb2RpZmllcnNUZXN0KTsKKyAKLS0gCjIuMjMuMwoK --000000000000695fd605b8c99094--