From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id VpR1DHOQEGB9MAAA0tVLHw (envelope-from ) for ; Tue, 26 Jan 2021 21:58:11 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id GIA9B3OQEGBAAwAAbx9fmQ (envelope-from ) for ; Tue, 26 Jan 2021 21:58:11 +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 AA9BC9402B5 for ; Tue, 26 Jan 2021 21:58:10 +0000 (UTC) Received: from localhost ([::1]:46594 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l4WLh-0006KW-JS for larch@yhetil.org; Tue, 26 Jan 2021 16:58:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33486) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l4WLa-0006KN-Cy for guix-patches@gnu.org; Tue, 26 Jan 2021 16:58:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59533) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l4WLa-0002jz-54 for guix-patches@gnu.org; Tue, 26 Jan 2021 16:58:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l4WLa-0006Ir-4H for guix-patches@gnu.org; Tue, 26 Jan 2021 16:58:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45727] [PATCH] gnu: folly: Update to 2021.01.04.00. Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 26 Jan 2021 21:58:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45727 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 45727-submit@debbugs.gnu.org id=B45727.161169825824199 (code B ref 45727); Tue, 26 Jan 2021 21:58:02 +0000 Received: (at 45727) by debbugs.gnu.org; 26 Jan 2021 21:57:38 +0000 Received: from localhost ([127.0.0.1]:42846 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l4WL6-0006I9-NW for submit@debbugs.gnu.org; Tue, 26 Jan 2021 16:57:38 -0500 Received: from mail-wr1-f42.google.com ([209.85.221.42]:36153) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l4WL4-0006Hu-UC for 45727@debbugs.gnu.org; Tue, 26 Jan 2021 16:57:31 -0500 Received: by mail-wr1-f42.google.com with SMTP id 6so18081656wri.3 for <45727@debbugs.gnu.org>; Tue, 26 Jan 2021 13:57:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=swaCpRFhAIhxMip2S3B+VqNkxjLvC2o2dWheELY9v68=; b=RJu8Y5wSyg8GSRP/M3GmXrlgsn4K/m0akPaqFaHyj2qgbp/peb8IvoUpIy9ZvuaEyn Smqg9173JM3Wx6DEmDWurAwnf1Gpt4/kNO2rDlt7tf/zGMmd0FvLc0CggSsHmQjbVaox 3/rY79IvQ6z+gsv6tPUH1ZoQLeDxHltX3DF+dBYvook8OENWqu5Fqy5hSNPEkebULEoK IPOgU7AB39dJqVpN+SZd61L0/e0unuPnHKABltuuZqBde4a7SUb/UgiQGQQNj2ziRDhr DONVfh2beBsGb2c7oQjc9MD3os32NG3zcep0uwUxG1xF2cv6Jcd4Y1aH0vNmXSx38cCO 8hvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=swaCpRFhAIhxMip2S3B+VqNkxjLvC2o2dWheELY9v68=; b=b4Z2GKjppoNnDEoUDU6aVAjXwbdhcDljv9sRMlmYI1sMXJuHWMyZ6jlFGt+Sjup7CQ iRcj9UqRG9GxA0I/cJl6rm2gSGR9hIZrp2WprncpaX5WIWOH3/CQPlRzO8NKfeLwFUMI Pv8+ZIhUQUqhM+MULdI64CvpraMn/1Fq4a4gbsQBFfJ00W2IWrpE6aQIcR6oQW5LO9jS 3ICdz/2u8l3tG71QUmqsuCwox1uP/V572GN48n9vguF5hRWYc7DmLYpF2VUfVDT+Kyy8 n8DfaoOIApkYCszR+FXsCflO/r95eAwjUBNC91/QybGhM05aAkIoNpUIJsqGxV8I7UGF 6SfA== X-Gm-Message-State: AOAM532lkj8iVFEEFQZC3iTPAgD5nq+Yotv4sLSj4xUVWTZND0GWyUSd aB6siHVVGGGumuKl+PtDXyR0zIBP8EC37HkTeieQXSat3oSTHW8dO4I= X-Google-Smtp-Source: ABdhPJx/xt4/oA2VbaknUpAJk3k9uSqQ7YrugKm4gu+BTeA4CxgTOkSHp49bExB7cY/8WLaxUJ7oQZtCslrVwlMzv+Y= X-Received: by 2002:adf:f687:: with SMTP id v7mr8091449wrp.182.1611698245217; Tue, 26 Jan 2021 13:57:25 -0800 (PST) MIME-Version: 1.0 References: <87a6t5ht12.fsf@gnu.org> In-Reply-To: <87a6t5ht12.fsf@gnu.org> From: Greg Hogan Date: Tue, 26 Jan 2021 16:57:13 -0500 Message-ID: Content-Type: multipart/mixed; boundary="000000000000645dcc05b9d4bd42" 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: , Cc: 45727@debbugs.gnu.org Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -1.35 Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=greghogan-com.20150623.gappssmtp.com header.s=20150623 header.b=RJu8Y5wS; 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: AA9BC9402B5 X-Spam-Score: -1.35 X-Migadu-Scanner: scn1.migadu.com X-TUID: hXmFtcpEMvjS --000000000000645dcc05b9d4bd42 Content-Type: multipart/alternative; boundary="000000000000645dcb05b9d4bd40" --000000000000645dcb05b9d4bd40 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable For core-updates. >From 03030191d82469532048f7a900291713e8208106 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Mon, 25 Jan 2021 17:35:27 +0000 Subject: [PATCH] gnu: boost: Patch transitive linking bug. * gnu/packages/patches/boost-fix-transitive-linking.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/boost.scm (boost)[source]: Use it. --- gnu/local.mk | 2 ++ gnu/packages/boost.scm | 3 +++ .../patches/boost-fix-transitive-linking.patch | 16 ++++++++++++++++ 3 files changed, 21 insertions(+) create mode 100644 gnu/packages/patches/boost-fix-transitive-linking.patch diff --git a/gnu/local.mk b/gnu/local.mk index f84f859bdf..0e8e9c37b9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -40,6 +40,7 @@ # Copyright =C2=A9 2020 Malte Frank Gerdes # Copyright =C2=A9 2020 Vinicius Monego # Copyright =C2=A9 2021 Bj=C3=B6rn H=C3=B6fling +# Copyright =C2=A9 2021 Greg Hogan # # This file is part of GNU Guix. # @@ -866,6 +867,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/blender-2.79-oiio2.patch \ %D%/packages/patches/blender-2.79-python-3.7-fix.patch \ %D%/packages/patches/blender-2.79-python-3.8-fix.patch \ + %D%/packages/patches/boost-fix-transitive-linking.patch \ %D%/packages/patches/bpftrace-disable-bfd-disasm.patch \ %D%/packages/patches/byobu-writable-status.patch \ %D%/packages/patches/calibre-no-updates-dialog.patch \ diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index 1db173bd16..bc0e95b1ba 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -15,6 +15,7 @@ ;;; Copyright =C2=A9 2020 Marius Bakke ;;; Copyright =C2=A9 2020 Jonathan Brielmaier ;;; Copyright =C2=A9 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright =C2=A9 2021 Greg Hogan ;;; ;;; This file is part of GNU Guix. ;;; @@ -68,6 +69,8 @@ (uri (string-append "https://dl.bintray.com/boostorg/release= / " version "/source/boost_" (version-with-underscores version) ".tar.bz2")) + ; Should be included in next Boost update + (patches (search-patches "boost-fix-transitive-linking.patch")) (sha256 (base32 "1js9zpij58l60kx46s3lxdp5207igppjnhqigwhbpdvd04gb6gcm")))) diff --git a/gnu/packages/patches/boost-fix-transitive-linking.patch b/gnu/packages/patches/boost-fix-transitive-linking.patch new file mode 100644 index 0000000000..a42feab109 --- /dev/null +++ b/gnu/packages/patches/boost-fix-transitive-linking.patch @@ -0,0 +1,16 @@ +Patch from https://github.com/boostorg/boost_install/issues/47 +which should be included in the Boost 1.76 release. + +This patch prevents CMake from explicitly linking against Boost dependencies +when building against the shared Boost libraries. +--- a/tools/boost_install/boost-install.jam ++++ b/tools/boost_install/boost-install.jam +@@ -483,7 +483,7 @@ rule generate-cmake-variant- ( target : sources * : properties * ) + + .info " deps3=3D" $(deps3) ; + +- if $(deps3) ++ if $(deps3) && $(link) =3D static + { + print.text + --=20 2.30.0 On Tue, Jan 19, 2021 at 9:59 AM Ludovic Court=C3=A8s wrote: > Hi Greg, > > Greg Hogan skribis: > > > I went to build folly against core-updates and the link failed due to > > missing dependencies on libicu*. This patch also updates the folly > version. > > > > > >>From e710c98a2f5beef9d8640bf3618ae20bd12c12f7 Mon Sep 17 00:00:00 2001 > > From: Greg Hogan > > Date: Thu, 7 Jan 2021 21:54:37 +0000 > > Subject: [PATCH] gnu: folly: Update to 2021.01.04.00. > > > > * gnu/packages/cpp.scm (folly): Update to 2021.01.04.00. > > [propagated-inputs]: Add icu4c. > > If there=E2=80=99s a reason to propagate ICU4C, could you state it in a c= omment? > Otherwise, can we just move it to =E2=80=98inputs=E2=80=99? > > Apart from that it LGTM, and it=E2=80=99s applicable to =E2=80=98master= =E2=80=99. > > Could you send an updated patch? > > Thanks, > Ludo=E2=80=99. > --000000000000645dcb05b9d4bd40 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
For core-updates.

From 03030191d82469532048f7a900291713e8208106 Mon Sep 17 00:00:00 20= 01
From: Greg Hogan <cod= e@greghogan.com>
Date: Mon, 25 Jan 2021 17:35:27 +0000
Subject: [PATCH] gnu: boost: Patch transitive linking bug.

* gnu/packages/patches/boost-fix-transitive-linking.patch: = New file.
* gnu/local.mk (dist_pa= tch_DATA): Add it.
* gnu/packages/boost.scm (boost)[source]: Use = it.
---
<= div>=C2=A0gnu/packages/boost.scm =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=A03 +++
=C2=A0cr= eate mode 100644 gnu/packages/patches/boost-fix-transitive-linking.patch

index f84f85= 9bdf..0e8e9c37b9 100644
--- a/gnu/loc= al.mk
+++ b/gnu/local.mk
@@ -40,6 +40,7 @@
=C2=A0# Copyright =C2=A9 2020 Malte Frank= Gerdes <mate.f.gerdes@gmail.= com>
=C2=A0# Copyright =C2=A9 2020 Vinicius Monego <monego@posteo.net>
=C2= =A0# Copyright =C2=A9 2021 Bj=C3=B6rn H=C3=B6fling <bjoern.hoefling@bjoernhoefling.de><= /div>
+# Copyright =C2=A9 2021 Greg Hogan <code@greghogan.com>
=C2=A0#
=C2=A0#= This file is part of GNU Guix.
=C2=A0#
@@ -866,6 +867,= 7 @@ dist_patch_DATA =3D \
=C2=A0 =C2=A0%D%/packages/patches/blen= der-2.79-oiio2.patch \
=C2=A0 =C2=A0%D%/packages/patches/blender-2.7= 9-python-3.7-fix.patch \
=C2=A0 =C2=A0%D%/packages/patches/blender-2.7= 9-python-3.8-fix.patch \
+ =C2=A0%D%/packages/patches/boost-fix-transi= tive-linking.patch \
=C2=A0 =C2=A0%D%/packages/patches/bpftrace-disabl= e-bfd-disasm.patch \
=C2=A0 =C2=A0%D%/packages/patches/byobu-writable-= status.patch= \
=C2=A0 =C2=A0%D%/packages/patches/calibre-no-updates-d= ialog.patch = \
diff --git a/gnu/packages/boost.scm b/gnu/packages/boos= t.scm
index 1db173bd16..bc0e95b1ba 100644
--- a/gnu/pac= kages/boost.scm
+++ b/gnu/packages/boost.scm
@@ -15,6 += 15,7 @@
=C2=A0;;; Copyright =C2=A9 2020 Marius Bakke <mbakke@fastmail.com>
=C2= =A0;;; Copyright =C2=A9 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de>
=C2=A0= ;;; Copyright =C2=A9 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright =C2=A9 2= 021 Greg Hogan <code@greghogan.com= >
=C2=A0;;;
=C2=A0;;; This file is part of GNU G= uix.
=C2=A0;;;
@@ -68,6 +69,8 @@
=C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(uri (string-append "https://dl.bintray.com/boo= storg/release/"
=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=A0version "/source/boost_"
=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(version-with-underscores version) "= .tar.bz2"))
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0; Should be included in next Boost update
+ =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(patches (search-patches "boost-fix-tra= nsitive-linking.patch"))
=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 =C2=A0"1js9zpij58l60kx46s3lxdp5207igppjnhqigwhbpd= vd04gb6gcm"))))
diff --git a/gnu/packages/patches/boost-fix-= transitive-linking.patch b/gnu/packages/patches/boost-fix-transitive-linkin= g.patch
new file mode 100644
index 0000000000..a42feab1= 09
--- /dev/null
+++ b/gnu/packages/patches/boost-fix-t= ransitive-linking.patch
@@ -0,0 +1,16 @@
+Patch from https://githu= b.com/boostorg/boost_install/issues/47
+which should be inclu= ded in the Boost 1.76 release.
+
+This patch prevents C= Make from explicitly linking against Boost dependencies
+when bui= lding against the shared Boost libraries.
+--- a/tools/boost_inst= all/boost-install.jam
++++ b/tools/boost_install/boost-install.ja= m
+@@ -483,7 +483,7 @@ rule generate-cmake-variant- ( target : so= urces * : properties * )
+=C2=A0
+ =C2=A0 =C2=A0 .info = " =C2=A0deps3=3D" $(deps3) ;
+=C2=A0
+- =C2= =A0 =C2=A0if $(deps3)
++ =C2=A0 =C2=A0if $(deps3) && $(li= nk) =3D static
+ =C2=A0 =C2=A0 {
+ =C2=A0 =C2=A0 =C2=A0= =C2=A0 print.text
+=C2=A0
--=C2=A0
2.30.0

On Tue, Jan 19, 2021 at 9:59 AM Ludovic Court=C3=A8s <ludo@gnu.org> wrote:
Hi Greg,

Greg Hogan <code= @greghogan.com> skribis:

> I went to build folly against core-updates and the link failed due to<= br> > missing dependencies on libicu*. This patch also updates the folly ver= sion.
>
>
>>From e710c98a2f5beef9d8640bf3618ae20bd12c12f7 Mon Sep 17 00:00:00 2= 001
> From: Greg Hogan <code@greghogan.com>
> Date: Thu, 7 Jan 2021 21:54:37 +0000
> Subject: [PATCH] gnu: folly: Update to 2021.01.04.00.
>
> * gnu/packages/cpp.scm (folly): Update to 2021.01.04.00.
> [propagated-inputs]: Add icu4c.

If there=E2=80=99s a reason to propagate ICU4C, could you state it in a com= ment?
Otherwise, can we just move it to =E2=80=98inputs=E2=80=99?

Apart from that it LGTM, and it=E2=80=99s applicable to =E2=80=98master=E2= =80=99.

Could you send an updated patch?

Thanks,
Ludo=E2=80=99.
--000000000000645dcb05b9d4bd40-- --000000000000645dcc05b9d4bd42 Content-Type: application/octet-stream; name="0001-gnu-boost-Patch-transitive-linking-bug.patch" Content-Disposition: attachment; filename="0001-gnu-boost-Patch-transitive-linking-bug.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_kkejgshm0 RnJvbSAwMzAzMDE5MWQ4MjQ2OTUzMjA0OGY3YTkwMDI5MTcxM2U4MjA4MTA2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBHcmVnIEhvZ2FuIDxjb2RlQGdyZWdob2dhbi5jb20+CkRhdGU6 IE1vbiwgMjUgSmFuIDIwMjEgMTc6MzU6MjcgKzAwMDAKU3ViamVjdDogW1BBVENIXSBnbnU6IGJv b3N0OiBQYXRjaCB0cmFuc2l0aXZlIGxpbmtpbmcgYnVnLgoKKiBnbnUvcGFja2FnZXMvcGF0Y2hl cy9ib29zdC1maXgtdHJhbnNpdGl2ZS1saW5raW5nLnBhdGNoOiBOZXcgZmlsZS4KKiBnbnUvbG9j YWwubWsgKGRpc3RfcGF0Y2hfREFUQSk6IEFkZCBpdC4KKiBnbnUvcGFja2FnZXMvYm9vc3Quc2Nt IChib29zdClbc291cmNlXTogVXNlIGl0LgotLS0KIGdudS9sb2NhbC5tayAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICB8ICAyICsrCiBnbnUvcGFja2FnZXMvYm9vc3Quc2NtICAg ICAgICAgICAgICAgICAgICAgICAgICAgfCAgMyArKysKIC4uLi9wYXRjaGVzL2Jvb3N0LWZpeC10 cmFuc2l0aXZlLWxpbmtpbmcucGF0Y2ggICB8IDE2ICsrKysrKysrKysrKysrKysKIDMgZmlsZXMg Y2hhbmdlZCwgMjEgaW5zZXJ0aW9ucygrKQogY3JlYXRlIG1vZGUgMTAwNjQ0IGdudS9wYWNrYWdl cy9wYXRjaGVzL2Jvb3N0LWZpeC10cmFuc2l0aXZlLWxpbmtpbmcucGF0Y2gKCmRpZmYgLS1naXQg YS9nbnUvbG9jYWwubWsgYi9nbnUvbG9jYWwubWsKaW5kZXggZjg0Zjg1OWJkZi4uMGU4ZTljMzdi OSAxMDA2NDQKLS0tIGEvZ251L2xvY2FsLm1rCisrKyBiL2dudS9sb2NhbC5tawpAQCAtNDAsNiAr NDAsNyBAQAogIyBDb3B5cmlnaHQgwqkgMjAyMCBNYWx0ZSBGcmFuayBHZXJkZXMgPG1hdGUuZi5n ZXJkZXNAZ21haWwuY29tPgogIyBDb3B5cmlnaHQgwqkgMjAyMCBWaW5pY2l1cyBNb25lZ28gPG1v bmVnb0Bwb3N0ZW8ubmV0PgogIyBDb3B5cmlnaHQgwqkgMjAyMSBCasO2cm4gSMO2ZmxpbmcgPGJq b2Vybi5ob2VmbGluZ0Biam9lcm5ob2VmbGluZy5kZT4KKyMgQ29weXJpZ2h0IMKpIDIwMjEgR3Jl ZyBIb2dhbiA8Y29kZUBncmVnaG9nYW4uY29tPgogIwogIyBUaGlzIGZpbGUgaXMgcGFydCBvZiBH TlUgR3VpeC4KICMKQEAgLTg2Niw2ICs4NjcsNyBAQCBkaXN0X3BhdGNoX0RBVEEgPQkJCQkJCVwK ICAgJUQlL3BhY2thZ2VzL3BhdGNoZXMvYmxlbmRlci0yLjc5LW9paW8yLnBhdGNoCQkJXAogICAl RCUvcGFja2FnZXMvcGF0Y2hlcy9ibGVuZGVyLTIuNzktcHl0aG9uLTMuNy1maXgucGF0Y2gJXAog ICAlRCUvcGFja2FnZXMvcGF0Y2hlcy9ibGVuZGVyLTIuNzktcHl0aG9uLTMuOC1maXgucGF0Y2gJ XAorICAlRCUvcGFja2FnZXMvcGF0Y2hlcy9ib29zdC1maXgtdHJhbnNpdGl2ZS1saW5raW5nLnBh dGNoCVwKICAgJUQlL3BhY2thZ2VzL3BhdGNoZXMvYnBmdHJhY2UtZGlzYWJsZS1iZmQtZGlzYXNt LnBhdGNoCVwKICAgJUQlL3BhY2thZ2VzL3BhdGNoZXMvYnlvYnUtd3JpdGFibGUtc3RhdHVzLnBh dGNoCQlcCiAgICVEJS9wYWNrYWdlcy9wYXRjaGVzL2NhbGlicmUtbm8tdXBkYXRlcy1kaWFsb2cu cGF0Y2gJCVwKZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy9ib29zdC5zY20gYi9nbnUvcGFja2Fn ZXMvYm9vc3Quc2NtCmluZGV4IDFkYjE3M2JkMTYuLmJjMGU5NWIxYmEgMTAwNjQ0Ci0tLSBhL2du dS9wYWNrYWdlcy9ib29zdC5zY20KKysrIGIvZ251L3BhY2thZ2VzL2Jvb3N0LnNjbQpAQCAtMTUs NiArMTUsNyBAQAogOzs7IENvcHlyaWdodCDCqSAyMDIwIE1hcml1cyBCYWtrZSA8bWJha2tlQGZh c3RtYWlsLmNvbT4KIDs7OyBDb3B5cmlnaHQgwqkgMjAyMCBKb25hdGhhbiBCcmllbG1haWVyIDxq b25hdGhhbi5icmllbG1haWVyQHdlYi5kZT4KIDs7OyBDb3B5cmlnaHQgwqkgMjAyMCBKYW4gKGph bm5la2UpIE5pZXV3ZW5odWl6ZW4gPGphbm5la2VAZ251Lm9yZz4KKzs7OyBDb3B5cmlnaHQgwqkg MjAyMSBHcmVnIEhvZ2FuIDxjb2RlQGdyZWdob2dhbi5jb20+CiA7OzsKIDs7OyBUaGlzIGZpbGUg aXMgcGFydCBvZiBHTlUgR3VpeC4KIDs7OwpAQCAtNjgsNiArNjksOCBAQAogICAgICAgICAgICAg ICAodXJpIChzdHJpbmctYXBwZW5kICJodHRwczovL2RsLmJpbnRyYXkuY29tL2Jvb3N0b3JnL3Jl bGVhc2UvIgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHZlcnNpb24gIi9zb3Vy Y2UvYm9vc3RfIgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICh2ZXJzaW9uLXdp dGgtdW5kZXJzY29yZXMgdmVyc2lvbikgIi50YXIuYnoyIikpCisgICAgICAgICAgICAgIDsgU2hv dWxkIGJlIGluY2x1ZGVkIGluIG5leHQgQm9vc3QgdXBkYXRlCisgICAgICAgICAgICAgIChwYXRj aGVzIChzZWFyY2gtcGF0Y2hlcyAiYm9vc3QtZml4LXRyYW5zaXRpdmUtbGlua2luZy5wYXRjaCIp KQogICAgICAgICAgICAgICAoc2hhMjU2CiAgICAgICAgICAgICAgICAoYmFzZTMyCiAgICAgICAg ICAgICAgICAgIjFqczl6cGlqNThsNjBreDQ2czNseGRwNTIwN2lncHBqbmhxaWd3aGJwZHZkMDRn YjZnY20iKSkpKQpkaWZmIC0tZ2l0IGEvZ251L3BhY2thZ2VzL3BhdGNoZXMvYm9vc3QtZml4LXRy YW5zaXRpdmUtbGlua2luZy5wYXRjaCBiL2dudS9wYWNrYWdlcy9wYXRjaGVzL2Jvb3N0LWZpeC10 cmFuc2l0aXZlLWxpbmtpbmcucGF0Y2gKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAw MDAwMC4uYTQyZmVhYjEwOQotLS0gL2Rldi9udWxsCisrKyBiL2dudS9wYWNrYWdlcy9wYXRjaGVz L2Jvb3N0LWZpeC10cmFuc2l0aXZlLWxpbmtpbmcucGF0Y2gKQEAgLTAsMCArMSwxNiBAQAorUGF0 Y2ggZnJvbSBodHRwczovL2dpdGh1Yi5jb20vYm9vc3RvcmcvYm9vc3RfaW5zdGFsbC9pc3N1ZXMv NDcKK3doaWNoIHNob3VsZCBiZSBpbmNsdWRlZCBpbiB0aGUgQm9vc3QgMS43NiByZWxlYXNlLgor CitUaGlzIHBhdGNoIHByZXZlbnRzIENNYWtlIGZyb20gZXhwbGljaXRseSBsaW5raW5nIGFnYWlu c3QgQm9vc3QgZGVwZW5kZW5jaWVzCit3aGVuIGJ1aWxkaW5nIGFnYWluc3QgdGhlIHNoYXJlZCBC b29zdCBsaWJyYXJpZXMuCistLS0gYS90b29scy9ib29zdF9pbnN0YWxsL2Jvb3N0LWluc3RhbGwu amFtCisrKysgYi90b29scy9ib29zdF9pbnN0YWxsL2Jvb3N0LWluc3RhbGwuamFtCitAQCAtNDgz LDcgKzQ4Myw3IEBAIHJ1bGUgZ2VuZXJhdGUtY21ha2UtdmFyaWFudC0gKCB0YXJnZXQgOiBzb3Vy Y2VzICogOiBwcm9wZXJ0aWVzICogKQorIAorICAgICAuaW5mbyAiICBkZXBzMz0iICQoZGVwczMp IDsKKyAKKy0gICAgaWYgJChkZXBzMykKKysgICAgaWYgJChkZXBzMykgJiYgJChsaW5rKSA9IHN0 YXRpYworICAgICB7CisgICAgICAgICBwcmludC50ZXh0CisgCi0tIAoyLjMwLjAKCg== --000000000000645dcc05b9d4bd42--