Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1uhve6-005bvk-LL for pgsql-hackers@arkaria.postgresql.org; Fri, 01 Aug 2025 19:42:27 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.94.2) (envelope-from ) id 1uhve4-009B8r-32 for pgsql-hackers@arkaria.postgresql.org; Fri, 01 Aug 2025 19:42:24 +0000 Received: from makus.postgresql.org ([2001:4800:3e1:1::229]) by malur.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1uhve3-009B8i-9R for pgsql-hackers@lists.postgresql.org; Fri, 01 Aug 2025 19:42:23 +0000 Received: from mail-pf1-x435.google.com ([2607:f8b0:4864:20::435]) by makus.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.96) (envelope-from ) id 1uhvdy-000EzI-38 for pgsql-hackers@postgresql.org; Fri, 01 Aug 2025 19:42:22 +0000 Received: by mail-pf1-x435.google.com with SMTP id d2e1a72fcca58-73c17c770a7so1557159b3a.2 for ; Fri, 01 Aug 2025 12:42:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=j-davis-com.20230601.gappssmtp.com; s=20230601; t=1754077339; x=1754682139; darn=postgresql.org; h=mime-version:user-agent:references:in-reply-to:date:cc:to:from :subject:message-id:from:to:cc:subject:date:message-id:reply-to; bh=xawMreK3E8/WTXsrzcq5FJUOabhGWFHoYMOTo6wDhA0=; b=rRq0Sdb+YFg7hXznMsenMBp7ObTj6DiGCMQZvdPW88bfHsWkRt8zJp/vQC3rzRO5dw losDKT6QlXlVGN7Z9arpZDcY2U4hHAKSyqefQ6LY2iVnyjkLos1bMtG3INFO0JkylQsJ E3YZJYjZeen9En6J74/ckSvtrfb9Vb0kuHyPGD81oM08abRZdyKDd/1lBzd0ms3Ya61B TThHjnUP7wVJMgjM0GbEH/XtGUS03xfRyJDIi3Z9vesMTjKHwK97vZ5qc71C04bBsZ6y futuZFFA5kf96+XGj5Gj8T6sLEcC7iMD9+ef9NACV2ACqJ460jZrlqJ37+nlctJFN1V2 pbUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754077339; x=1754682139; h=mime-version:user-agent:references:in-reply-to:date:cc:to:from :subject:message-id:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=xawMreK3E8/WTXsrzcq5FJUOabhGWFHoYMOTo6wDhA0=; b=frZgqZpiKBAV+H3nmkyd1qd5Mhivtu8CeYf5BOshXbgjMzVc4iqCPrv1HYZ9RmWXIi AVo2LgDR/bN0oNmNRvGSJogTv/lvs1TUUUCr6sMZdH93AMxII9Q08ovHNKcfuhiU+90D OScs3ADZI++y9YdehKpiOQB33PgZmy1d+L/Bk81nrPbahyvu7GCRj5pdz3eLFrtAxsMN i+wrgnpkm6YxkTRcYIxvRhhl8cNjhnVTARYyQSfWgfEoV9H8YlznM7Q8kasco21R914u 9DfJ7EDHenzILEVLyuuyRB8+sXguWcKnL848DbYrdgRBHF+ptziT7ufeqgjoh/Fsih/B piQQ== X-Forwarded-Encrypted: i=1; AJvYcCXPrz3RAmvYbfnb2y9P4j9FEkk8+qY2+6nFhmTD2aOm6VwXwTOZxbwePkM4WxEeDdxnjK9dq/ltJN1efCWg@postgresql.org X-Gm-Message-State: AOJu0YxihgpKNPWIM1v8DuKNLevcu6IeBHhKExgxpTTGaCpvRbzUtOgx DiTm5hGLWj2OUleOe2tshmqOwHqLrYZmU2JowwnGxbHXse3AUb6hs1mZG1r0ri4VtQ== X-Gm-Gg: ASbGncvchLsN9XOaiSgLVScVeEZXm5OaJNrD23+fBtiOM1LeqZxbwegllM1DNltPLoZ 8/E3kQpN9mTsAwqg/KJp0rJkZp3E33QBclQnAhHsv+4GILjo9V7J3RJbvNpyWs5les2Is3OVFm6 VCQ9TKzqnNiogWu17FStFKmUhawTgoR19At5Qq+0rpTWXvb+WqwO0xoOmNjB+Uv/rBQVJeNzM5F M5pDD9PHTgjRXHlgS6LnStpONPmnxy0jGwhj2xhq0Bn85pWDH/xm7zqqxHl244xIEH6dB39VuzT YSboBQulY5peoPgOs56vZYgZjVLrOBPHq1pNBrZsaj35dVE/1ys3pHqwvY1ip3FBrEitYvcOWpM 43nJTCaTr8pVbjvBesYqDoQjfHBNivIql//YcKw== X-Google-Smtp-Source: AGHT+IE/qXmEwn/UaxLV4dSa19XMqmRbQhyCjSfIzBk6bVPt/lNsyvJYxE9UpLnFOC4lC9ERn3UbqA== X-Received: by 2002:a05:6a20:3d26:b0:23d:8af5:13b9 with SMTP id adf61e73a8af0-23df8f9ebf8mr1237021637.2.1754077338829; Fri, 01 Aug 2025 12:42:18 -0700 (PDT) Received: from [192.168.122.112] ([50.229.252.243]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-76bccfbd156sm4787125b3a.84.2025.08.01.12.42.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Aug 2025 12:42:17 -0700 (PDT) Message-ID: <40cedfc22da152928a74d472708aaadb8855d8d9.camel@j-davis.com> Subject: Re: pg_dump --with-* options From: Jeff Davis To: Nathan Bossart Cc: Robert Haas , Peter Eisentraut , pgsql-hackers Date: Fri, 01 Aug 2025 12:42:16 -0700 In-Reply-To: References: <7cc52488-f876-4ad3-affd-6e4b0ef0cb09@eisentraut.org> <7bf0246542713d80f12c738c1d365d1365750c18.camel@j-davis.com> <5e398522803da9bf3f9fc33ca43084ec21ab0fcd.camel@j-davis.com> <031558c60e84362898922caa6a90587e7fdf2a57.camel@j-davis.com> Content-Type: multipart/mixed; boundary="=-rl/r3914TSywKFHvIf7A" User-Agent: Evolution 3.52.3-0ubuntu1 MIME-Version: 1.0 List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Archived-At: Precedence: bulk --=-rl/r3914TSywKFHvIf7A Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Tue, 2025-07-29 at 11:24 -0700, Jeff Davis wrote: > On Wed, 2025-06-18 at 10:21 -0700, Jeff Davis wrote: > > On Wed, 2025-06-18 at 10:43 -0500, Nathan Bossart wrote: > > > IIUC the current proposal is to: > > >=20 > > > * Dump/restore stats by default. >=20 > We don't have a consensus for that, so unless a few people make an > abrupt turnaround, this will remain off for v18. >=20 > > > * Keep the --no-statistics, --no-schema, and --no-data options. > > > * Keep the --statistics-only, --schema-only, and --data-only > > > options. > > > * Remove the --with-statistics, --with-schema, and --with-data > > > options. >=20 > The other parts of the proposal are very similar with mine below: >=20 > > =C2=A0 * delete the --with-data and --with-schema options as unnecessar= y > > =C2=A0 * (maybe?) rename --with-statistics to --statistics > > =C2=A0 * keep --no-statistics, --no-data, --no-schema (or use "without" > > instead?) > > =C2=A0 * (maybe?) keep --statistics-only > > =C2=A0 * reject the combination of an "only" option and a "with" option Patch attached. * removes --with-data and --with-schema (redundant) * renames --with-statistics to just --statistics I kept --statistics and --no-statistics for both pg_dump and pg_restore, because: (a) I think it's good to have consistent options between those two programs; and (b) it allows us to potentially change the default to include statistics in the future. That leaves some redundancy of the options, which some have expressed annoyance over, but it doesn't seem like a major point of objection. Regards, Jeff Davis --=-rl/r3914TSywKFHvIf7A Content-Disposition: attachment; filename="v3-0001-Simplify-options-in-pg_dump-and-pg_restore.patch" Content-Type: text/x-patch; name="v3-0001-Simplify-options-in-pg_dump-and-pg_restore.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbSAwMWVjYTgwMDFmMTNhZjk2ODRhMjExY2NmNWY2MWRmZDgyNWZkY2E5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKZWZmIERhdmlzIDxqZWZmQGotZGF2aXMuY29tPgpEYXRlOiBG cmksIDEgQXVnIDIwMjUgMTI6Mjc6NTMgLTA3MDAKU3ViamVjdDogW1BBVENIIHYzXSBTaW1wbGlm eSBvcHRpb25zIGluIHBnX2R1bXAgYW5kIHBnX3Jlc3RvcmUuCgpSZW1vdmUgcmVkdW5kYW50IG9w dGlvbnMgLS13aXRoLWRhdGEgYW5kIC0td2l0aC1zY2hlbWEsIGFuZCByZW5hbWUKLS13aXRoLXN0 YXRpc3RpY3MgdG8ganVzdCAtLXN0YXRpc3RpY3MuCgpEaXNjdXNzaW9uOiBodHRwczovL3Bvc3Rn ci5lcy9tL2YzNzlkMGFlZWZlOGVmZmUxMzMwMmE0MzZiYzI4ZjU0OWYwOWU5MjQuY2FtZWxAai1k YXZpcy5jb20KQmFja3BhdGNoLXRocm91Z2g6IDE4Ci0tLQogZG9jL3NyYy9zZ21sL3JlZi9wZ19k dW1wLnNnbWwgICAgfCAgMjIgKy0tLS0tCiBkb2Mvc3JjL3NnbWwvcmVmL3BnX2R1bXBhbGwuc2dt bCB8ICAyMiArLS0tLS0KIGRvYy9zcmMvc2dtbC9yZWYvcGdfcmVzdG9yZS5zZ21sIHwgIDIyICst LS0tLQogc3JjL2Jpbi9wZ19kdW1wL3BnX2R1bXAuYyAgICAgICAgfCAgNDMgKysrLS0tLS0tLS0K IHNyYy9iaW4vcGdfZHVtcC9wZ19kdW1wYWxsLmMgICAgIHwgIDE2ICstLS0KIHNyYy9iaW4vcGdf ZHVtcC9wZ19yZXN0b3JlLmMgICAgIHwgIDM1ICsrKy0tLS0tLQogc3JjL2Jpbi9wZ19kdW1wL3Qv MDAyX3BnX2R1bXAucGwgfCAxMjQgKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLQogc3Jj L2Jpbi9wZ191cGdyYWRlL2R1bXAuYyAgICAgICAgfCAgIDIgKy0KIDggZmlsZXMgY2hhbmdlZCwg OTMgaW5zZXJ0aW9ucygrKSwgMTkzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RvYy9zcmMv c2dtbC9yZWYvcGdfZHVtcC5zZ21sIGIvZG9jL3NyYy9zZ21sL3JlZi9wZ19kdW1wLnNnbWwKaW5k ZXggMmFlMDg0YjVmYTYuLmQ1ZjU2ZDJmODJmIDEwMDY0NAotLS0gYS9kb2Mvc3JjL3NnbWwvcmVm L3BnX2R1bXAuc2dtbAorKysgYi9kb2Mvc3JjL3NnbWwvcmVmL3BnX2R1bXAuc2dtbApAQCAtMTQ0 MSwyNSArMTQ0MSw3IEBAIFBvc3RncmVTUUwgZG9jdW1lbnRhdGlvbgogICAgICA8L3Zhcmxpc3Rl bnRyeT4KIAogICAgICA8dmFybGlzdGVudHJ5PgotICAgICAgPHRlcm0+PG9wdGlvbj4tLXdpdGgt ZGF0YTwvb3B0aW9uPjwvdGVybT4KLSAgICAgIDxsaXN0aXRlbT4KLSAgICAgICA8cGFyYT4KLSAg ICAgICAgRHVtcCBkYXRhLiBUaGlzIGlzIHRoZSBkZWZhdWx0LgotICAgICAgIDwvcGFyYT4KLSAg ICAgIDwvbGlzdGl0ZW0+Ci0gICAgIDwvdmFybGlzdGVudHJ5PgotCi0gICAgIDx2YXJsaXN0ZW50 cnk+Ci0gICAgICA8dGVybT48b3B0aW9uPi0td2l0aC1zY2hlbWE8L29wdGlvbj48L3Rlcm0+Ci0g ICAgICA8bGlzdGl0ZW0+Ci0gICAgICAgPHBhcmE+Ci0gICAgICAgIER1bXAgc2NoZW1hIChkYXRh IGRlZmluaXRpb25zKS4gVGhpcyBpcyB0aGUgZGVmYXVsdC4KLSAgICAgICA8L3BhcmE+Ci0gICAg ICA8L2xpc3RpdGVtPgotICAgICA8L3Zhcmxpc3RlbnRyeT4KLQotICAgICA8dmFybGlzdGVudHJ5 PgotICAgICAgPHRlcm0+PG9wdGlvbj4tLXdpdGgtc3RhdGlzdGljczwvb3B0aW9uPjwvdGVybT4K KyAgICAgIDx0ZXJtPjxvcHRpb24+LS1zdGF0aXN0aWNzPC9vcHRpb24+PC90ZXJtPgogICAgICAg PGxpc3RpdGVtPgogICAgICAgIDxwYXJhPgogICAgICAgICBEdW1wIHN0YXRpc3RpY3MuCkBAIC0x NjgyLDcgKzE2NjQsNyBAQCBDUkVBVEUgREFUQUJBU0UgZm9vIFdJVEggVEVNUExBVEUgdGVtcGxh dGUwOwogICA8L3BhcmE+CiAKICAgPHBhcmE+Ci0gICBJZiA8b3B0aW9uPi0td2l0aC1zdGF0aXN0 aWNzPC9vcHRpb24+IGlzIHNwZWNpZmllZCwKKyAgIElmIDxvcHRpb24+LS1zdGF0aXN0aWNzPC9v cHRpb24+IGlzIHNwZWNpZmllZCwKICAgIDxjb21tYW5kPnBnX2R1bXA8L2NvbW1hbmQ+IHdpbGwg aW5jbHVkZSBtb3N0IG9wdGltaXplciBzdGF0aXN0aWNzIGluIHRoZQogICAgcmVzdWx0aW5nIGR1 bXAgZmlsZS4gIEhvd2V2ZXIsIHNvbWUgc3RhdGlzdGljcyBtYXkgbm90IGJlIGluY2x1ZGVkLCBz dWNoIGFzCiAgICB0aG9zZSBjcmVhdGVkIGV4cGxpY2l0bHkgd2l0aCA8eHJlZiBsaW5rZW5kPSJz cWwtY3JlYXRlc3RhdGlzdGljcyIvPiBvcgpkaWZmIC0tZ2l0IGEvZG9jL3NyYy9zZ21sL3JlZi9w Z19kdW1wYWxsLnNnbWwgYi9kb2Mvc3JjL3NnbWwvcmVmL3BnX2R1bXBhbGwuc2dtbAppbmRleCBm NGNiYzgyODhlMy4uODdhZjQ4MmI0YjIgMTAwNjQ0Ci0tLSBhL2RvYy9zcmMvc2dtbC9yZWYvcGdf ZHVtcGFsbC5zZ21sCisrKyBiL2RvYy9zcmMvc2dtbC9yZWYvcGdfZHVtcGFsbC5zZ21sCkBAIC02 NDEsMjUgKzY0MSw3IEBAIGV4Y2x1ZGUgZGF0YWJhc2UgPHJlcGxhY2VhYmxlIGNsYXNzPSJwYXJh bWV0ZXIiPlBBVFRFUk48L3JlcGxhY2VhYmxlPgogICAgICA8L3Zhcmxpc3RlbnRyeT4KIAogICAg ICA8dmFybGlzdGVudHJ5PgotICAgICAgPHRlcm0+PG9wdGlvbj4tLXdpdGgtZGF0YTwvb3B0aW9u PjwvdGVybT4KLSAgICAgIDxsaXN0aXRlbT4KLSAgICAgICA8cGFyYT4KLSAgICAgICAgRHVtcCBk YXRhLiBUaGlzIGlzIHRoZSBkZWZhdWx0LgotICAgICAgIDwvcGFyYT4KLSAgICAgIDwvbGlzdGl0 ZW0+Ci0gICAgIDwvdmFybGlzdGVudHJ5PgotCi0gICAgIDx2YXJsaXN0ZW50cnk+Ci0gICAgICA8 dGVybT48b3B0aW9uPi0td2l0aC1zY2hlbWE8L29wdGlvbj48L3Rlcm0+Ci0gICAgICA8bGlzdGl0 ZW0+Ci0gICAgICAgPHBhcmE+Ci0gICAgICAgIER1bXAgc2NoZW1hIChkYXRhIGRlZmluaXRpb25z KS4gVGhpcyBpcyB0aGUgZGVmYXVsdC4KLSAgICAgICA8L3BhcmE+Ci0gICAgICA8L2xpc3RpdGVt PgotICAgICA8L3Zhcmxpc3RlbnRyeT4KLQotICAgICA8dmFybGlzdGVudHJ5PgotICAgICAgPHRl cm0+PG9wdGlvbj4tLXdpdGgtc3RhdGlzdGljczwvb3B0aW9uPjwvdGVybT4KKyAgICAgIDx0ZXJt PjxvcHRpb24+LS1zdGF0aXN0aWNzPC9vcHRpb24+PC90ZXJtPgogICAgICAgPGxpc3RpdGVtPgog ICAgICAgIDxwYXJhPgogICAgICAgICBEdW1wIHN0YXRpc3RpY3MuCkBAIC04NzgsNyArODYwLDcg QEAgZXhjbHVkZSBkYXRhYmFzZSA8cmVwbGFjZWFibGUgY2xhc3M9InBhcmFtZXRlciI+UEFUVEVS TjwvcmVwbGFjZWFibGU+CiAgIDwvcGFyYT4KIAogICA8cGFyYT4KLSAgIElmIDxvcHRpb24+LS13 aXRoLXN0YXRpc3RpY3M8L29wdGlvbj4gaXMgc3BlY2lmaWVkLAorICAgSWYgPG9wdGlvbj4tLXN0 YXRpc3RpY3M8L29wdGlvbj4gaXMgc3BlY2lmaWVkLAogICAgPGNvbW1hbmQ+cGdfZHVtcGFsbDwv Y29tbWFuZD4gd2lsbCBpbmNsdWRlIG1vc3Qgb3B0aW1pemVyIHN0YXRpc3RpY3MgaW4gdGhlCiAg ICByZXN1bHRpbmcgZHVtcCBmaWxlLiAgSG93ZXZlciwgc29tZSBzdGF0aXN0aWNzIG1heSBub3Qg YmUgaW5jbHVkZWQsIHN1Y2ggYXMKICAgIHRob3NlIGNyZWF0ZWQgZXhwbGljaXRseSB3aXRoIDx4 cmVmIGxpbmtlbmQ9InNxbC1jcmVhdGVzdGF0aXN0aWNzIi8+IG9yCmRpZmYgLS1naXQgYS9kb2Mv c3JjL3NnbWwvcmVmL3BnX3Jlc3RvcmUuc2dtbCBiL2RvYy9zcmMvc2dtbC9yZWYvcGdfcmVzdG9y ZS5zZ21sCmluZGV4IDJhYmUwNWQ0N2U5Li44MDg3NDAwNzAzYSAxMDA2NDQKLS0tIGEvZG9jL3Ny Yy9zZ21sL3JlZi9wZ19yZXN0b3JlLnNnbWwKKysrIGIvZG9jL3NyYy9zZ21sL3JlZi9wZ19yZXN0 b3JlLnNnbWwKQEAgLTg3NCwyNyArODc0LDcgQEAgUG9zdGdyZVNRTCBkb2N1bWVudGF0aW9uCiAg ICAgIDwvdmFybGlzdGVudHJ5PgogCiAgICAgIDx2YXJsaXN0ZW50cnk+Ci0gICAgICA8dGVybT48 b3B0aW9uPi0td2l0aC1kYXRhPC9vcHRpb24+PC90ZXJtPgotICAgICAgPGxpc3RpdGVtPgotICAg ICAgIDxwYXJhPgotICAgICAgICBPdXRwdXQgY29tbWFuZHMgdG8gcmVzdG9yZSBkYXRhLCBpZiB0 aGUgYXJjaGl2ZSBjb250YWlucyB0aGVtLgotICAgICAgICBUaGlzIGlzIHRoZSBkZWZhdWx0Lgot ICAgICAgIDwvcGFyYT4KLSAgICAgIDwvbGlzdGl0ZW0+Ci0gICAgIDwvdmFybGlzdGVudHJ5Pgot Ci0gICAgIDx2YXJsaXN0ZW50cnk+Ci0gICAgICA8dGVybT48b3B0aW9uPi0td2l0aC1zY2hlbWE8 L29wdGlvbj48L3Rlcm0+Ci0gICAgICA8bGlzdGl0ZW0+Ci0gICAgICAgPHBhcmE+Ci0gICAgICAg IE91dHB1dCBjb21tYW5kcyB0byByZXN0b3JlIHNjaGVtYSAoZGF0YSBkZWZpbml0aW9ucyksIGlm IHRoZSBhcmNoaXZlCi0gICAgICAgIGNvbnRhaW5zIHRoZW0uIFRoaXMgaXMgdGhlIGRlZmF1bHQu Ci0gICAgICAgPC9wYXJhPgotICAgICAgPC9saXN0aXRlbT4KLSAgICAgPC92YXJsaXN0ZW50cnk+ Ci0KLSAgICAgPHZhcmxpc3RlbnRyeT4KLSAgICAgIDx0ZXJtPjxvcHRpb24+LS13aXRoLXN0YXRp c3RpY3M8L29wdGlvbj48L3Rlcm0+CisgICAgICA8dGVybT48b3B0aW9uPi0tc3RhdGlzdGljczwv b3B0aW9uPjwvdGVybT4KICAgICAgIDxsaXN0aXRlbT4KICAgICAgICA8cGFyYT4KICAgICAgICAg T3V0cHV0IGNvbW1hbmRzIHRvIHJlc3RvcmUgc3RhdGlzdGljcywgaWYgdGhlIGFyY2hpdmUgY29u dGFpbnMgdGhlbS4KZGlmZiAtLWdpdCBhL3NyYy9iaW4vcGdfZHVtcC9wZ19kdW1wLmMgYi9zcmMv YmluL3BnX2R1bXAvcGdfZHVtcC5jCmluZGV4IGIxYWM4ZDdiNTA5Li5mM2EzNTNhNjFhNSAxMDA2 NDQKLS0tIGEvc3JjL2Jpbi9wZ19kdW1wL3BnX2R1bXAuYworKysgYi9zcmMvYmluL3BnX2R1bXAv cGdfZHVtcC5jCkBAIC00NDksOCArNDQ5LDYgQEAgbWFpbihpbnQgYXJnYywgY2hhciAqKmFyZ3Yp CiAJYm9vbAkJZGF0YV9vbmx5ID0gZmFsc2U7CiAJYm9vbAkJc2NoZW1hX29ubHkgPSBmYWxzZTsK IAlib29sCQlzdGF0aXN0aWNzX29ubHkgPSBmYWxzZTsKLQlib29sCQl3aXRoX2RhdGEgPSBmYWxz ZTsKLQlib29sCQl3aXRoX3NjaGVtYSA9IGZhbHNlOwogCWJvb2wJCXdpdGhfc3RhdGlzdGljcyA9 IGZhbHNlOwogCWJvb2wJCW5vX2RhdGEgPSBmYWxzZTsKIAlib29sCQlub19zY2hlbWEgPSBmYWxz ZTsKQEAgLTUxNCw2ICs1MTIsNyBAQCBtYWluKGludCBhcmdjLCBjaGFyICoqYXJndikKIAkJeyJz ZWN0aW9uIiwgcmVxdWlyZWRfYXJndW1lbnQsIE5VTEwsIDV9LAogCQl7InNlcmlhbGl6YWJsZS1k ZWZlcnJhYmxlIiwgbm9fYXJndW1lbnQsICZkb3B0LnNlcmlhbGl6YWJsZV9kZWZlcnJhYmxlLCAx fSwKIAkJeyJzbmFwc2hvdCIsIHJlcXVpcmVkX2FyZ3VtZW50LCBOVUxMLCA2fSwKKwkJeyJzdGF0 aXN0aWNzIiwgbm9fYXJndW1lbnQsIE5VTEwsIDIyfSwKIAkJeyJzdGF0aXN0aWNzLW9ubHkiLCBu b19hcmd1bWVudCwgTlVMTCwgMTh9LAogCQl7InN0cmljdC1uYW1lcyIsIG5vX2FyZ3VtZW50LCAm c3RyaWN0X25hbWVzLCAxfSwKIAkJeyJ1c2Utc2V0LXNlc3Npb24tYXV0aG9yaXphdGlvbiIsIG5v X2FyZ3VtZW50LCAmZG9wdC51c2Vfc2V0c2Vzc2F1dGgsIDF9LApAQCAtNTI4LDkgKzUyNyw2IEBA IG1haW4oaW50IGFyZ2MsIGNoYXIgKiphcmd2KQogCQl7Im5vLXRvYXN0LWNvbXByZXNzaW9uIiwg bm9fYXJndW1lbnQsICZkb3B0Lm5vX3RvYXN0X2NvbXByZXNzaW9uLCAxfSwKIAkJeyJuby11bmxv Z2dlZC10YWJsZS1kYXRhIiwgbm9fYXJndW1lbnQsICZkb3B0Lm5vX3VubG9nZ2VkX3RhYmxlX2Rh dGEsIDF9LAogCQl7Im5vLXN5bmMiLCBub19hcmd1bWVudCwgTlVMTCwgN30sCi0JCXsid2l0aC1k YXRhIiwgbm9fYXJndW1lbnQsIE5VTEwsIDIyfSwKLQkJeyJ3aXRoLXNjaGVtYSIsIG5vX2FyZ3Vt ZW50LCBOVUxMLCAyM30sCi0JCXsid2l0aC1zdGF0aXN0aWNzIiwgbm9fYXJndW1lbnQsIE5VTEws IDI0fSwKIAkJeyJvbi1jb25mbGljdC1kby1ub3RoaW5nIiwgbm9fYXJndW1lbnQsICZkb3B0LmRv X25vdGhpbmcsIDF9LAogCQl7InJvd3MtcGVyLWluc2VydCIsIHJlcXVpcmVkX2FyZ3VtZW50LCBO VUxMLCAxMH0sCiAJCXsiaW5jbHVkZS1mb3JlaWduLWRhdGEiLCByZXF1aXJlZF9hcmd1bWVudCwg TlVMTCwgMTF9LApAQCAtNzk4LDE0ICs3OTQsNiBAQCBtYWluKGludCBhcmdjLCBjaGFyICoqYXJn dikKIAkJCQlicmVhazsKIAogCQkJY2FzZSAyMjoKLQkJCQl3aXRoX2RhdGEgPSB0cnVlOwotCQkJ CWJyZWFrOwotCi0JCQljYXNlIDIzOgotCQkJCXdpdGhfc2NoZW1hID0gdHJ1ZTsKLQkJCQlicmVh azsKLQotCQkJY2FzZSAyNDoKIAkJCQl3aXRoX3N0YXRpc3RpY3MgPSB0cnVlOwogCQkJCWJyZWFr OwogCkBAIC04NTIsMjQgKzg0MCwxNyBAQCBtYWluKGludCBhcmdjLCBjaGFyICoqYXJndikKIAlp ZiAoc3RhdGlzdGljc19vbmx5ICYmIG5vX3N0YXRpc3RpY3MpCiAJCXBnX2ZhdGFsKCJvcHRpb25z IC0tc3RhdGlzdGljcy1vbmx5IGFuZCAtLW5vLXN0YXRpc3RpY3MgY2Fubm90IGJlIHVzZWQgdG9n ZXRoZXIiKTsKIAotCS8qIHJlamVjdCBjb25mbGljdGluZyAid2l0aC0iIGFuZCAibm8tIiBvcHRp b25zICovCi0JaWYgKHdpdGhfZGF0YSAmJiBub19kYXRhKQotCQlwZ19mYXRhbCgib3B0aW9ucyAt LXdpdGgtZGF0YSBhbmQgLS1uby1kYXRhIGNhbm5vdCBiZSB1c2VkIHRvZ2V0aGVyIik7Ci0JaWYg KHdpdGhfc2NoZW1hICYmIG5vX3NjaGVtYSkKLQkJcGdfZmF0YWwoIm9wdGlvbnMgLS13aXRoLXNj aGVtYSBhbmQgLS1uby1zY2hlbWEgY2Fubm90IGJlIHVzZWQgdG9nZXRoZXIiKTsKKwkvKiByZWpl Y3QgY29uZmxpY3RpbmcgIm5vLSIgb3B0aW9ucyAqLwogCWlmICh3aXRoX3N0YXRpc3RpY3MgJiYg bm9fc3RhdGlzdGljcykKLQkJcGdfZmF0YWwoIm9wdGlvbnMgLS13aXRoLXN0YXRpc3RpY3MgYW5k IC0tbm8tc3RhdGlzdGljcyBjYW5ub3QgYmUgdXNlZCB0b2dldGhlciIpOworCQlwZ19mYXRhbCgi b3B0aW9ucyAtLXN0YXRpc3RpY3MgYW5kIC0tbm8tc3RhdGlzdGljcyBjYW5ub3QgYmUgdXNlZCB0 b2dldGhlciIpOwogCi0JLyogcmVqZWN0IGNvbmZsaWN0aW5nICItb25seSIgYW5kICJ3aXRoLSIg b3B0aW9ucyAqLwotCWlmIChkYXRhX29ubHkgJiYgKHdpdGhfc2NoZW1hIHx8IHdpdGhfc3RhdGlz dGljcykpCi0JCXBnX2ZhdGFsKCJvcHRpb25zICVzIGFuZCAlcyBjYW5ub3QgYmUgdXNlZCB0b2dl dGhlciIsCi0JCQkJICItYS8tLWRhdGEtb25seSIsIHdpdGhfc2NoZW1hID8gIi0td2l0aC1zY2hl bWEiIDogIi0td2l0aC1zdGF0aXN0aWNzIik7Ci0JaWYgKHNjaGVtYV9vbmx5ICYmICh3aXRoX2Rh dGEgfHwgd2l0aF9zdGF0aXN0aWNzKSkKKwkvKiByZWplY3QgY29uZmxpY3RpbmcgIi1vbmx5IiBv cHRpb25zICovCisJaWYgKGRhdGFfb25seSAmJiB3aXRoX3N0YXRpc3RpY3MpCiAJCXBnX2ZhdGFs KCJvcHRpb25zICVzIGFuZCAlcyBjYW5ub3QgYmUgdXNlZCB0b2dldGhlciIsCi0JCQkJICItcy8t LXNjaGVtYS1vbmx5Iiwgd2l0aF9kYXRhID8gIi0td2l0aC1kYXRhIiA6ICItLXdpdGgtc3RhdGlz dGljcyIpOwotCWlmIChzdGF0aXN0aWNzX29ubHkgJiYgKHdpdGhfZGF0YSB8fCB3aXRoX3NjaGVt YSkpCisJCQkJICItYS8tLWRhdGEtb25seSIsICItLXN0YXRpc3RpY3MiKTsKKwlpZiAoc2NoZW1h X29ubHkgJiYgd2l0aF9zdGF0aXN0aWNzKQogCQlwZ19mYXRhbCgib3B0aW9ucyAlcyBhbmQgJXMg Y2Fubm90IGJlIHVzZWQgdG9nZXRoZXIiLAotCQkJCSAiLS1zdGF0aXN0aWNzLW9ubHkiLCB3aXRo X2RhdGEgPyAiLS13aXRoLWRhdGEiIDogIi0td2l0aC1zY2hlbWEiKTsKKwkJCQkgIi1zLy0tc2No ZW1hLW9ubHkiLCAiLS1zdGF0aXN0aWNzIik7CiAKIAlpZiAoc2NoZW1hX29ubHkgJiYgZm9yZWln bl9zZXJ2ZXJzX2luY2x1ZGVfcGF0dGVybnMuaGVhZCAhPSBOVUxMKQogCQlwZ19mYXRhbCgib3B0 aW9ucyAtcy8tLXNjaGVtYS1vbmx5IGFuZCAtLWluY2x1ZGUtZm9yZWlnbi1kYXRhIGNhbm5vdCBi ZSB1c2VkIHRvZ2V0aGVyIik7CkBAIC04ODksOSArODcwLDkgQEAgbWFpbihpbnQgYXJnYywgY2hh ciAqKmFyZ3YpCiAJICogb2YgdGhlIGNoZWNrcyBhYm92ZS4KIAkgKi8KIAlkb3B0LmR1bXBEYXRh ID0gKChkb3B0LmR1bXBEYXRhICYmICFzY2hlbWFfb25seSAmJiAhc3RhdGlzdGljc19vbmx5KSB8 fAotCQkJCQkgKGRhdGFfb25seSB8fCB3aXRoX2RhdGEpKSAmJiAhbm9fZGF0YTsKKwkJCQkJIGRh dGFfb25seSkgJiYgIW5vX2RhdGE7CiAJZG9wdC5kdW1wU2NoZW1hID0gKChkb3B0LmR1bXBTY2hl bWEgJiYgIWRhdGFfb25seSAmJiAhc3RhdGlzdGljc19vbmx5KSB8fAotCQkJCQkgICAoc2NoZW1h X29ubHkgfHwgd2l0aF9zY2hlbWEpKSAmJiAhbm9fc2NoZW1hOworCQkJCQkgICBzY2hlbWFfb25s eSkgJiYgIW5vX3NjaGVtYTsKIAlkb3B0LmR1bXBTdGF0aXN0aWNzID0gKChkb3B0LmR1bXBTdGF0 aXN0aWNzICYmICFzY2hlbWFfb25seSAmJiAhZGF0YV9vbmx5KSB8fAogCQkJCQkJICAgKHN0YXRp c3RpY3Nfb25seSB8fCB3aXRoX3N0YXRpc3RpY3MpKSAmJiAhbm9fc3RhdGlzdGljczsKIApAQCAt MTM2NCw2ICsxMzQ1LDcgQEAgaGVscChjb25zdCBjaGFyICpwcm9nbmFtZSkKIAlwcmludGYoXygi ICAtLXNlcXVlbmNlLWRhdGEgICAgICAgICAgICAgIGluY2x1ZGUgc2VxdWVuY2UgZGF0YSBpbiBk dW1wXG4iKSk7CiAJcHJpbnRmKF8oIiAgLS1zZXJpYWxpemFibGUtZGVmZXJyYWJsZSAgICB3YWl0 IHVudGlsIHRoZSBkdW1wIGNhbiBydW4gd2l0aG91dCBhbm9tYWxpZXNcbiIpKTsKIAlwcmludGYo XygiICAtLXNuYXBzaG90PVNOQVBTSE9UICAgICAgICAgIHVzZSBnaXZlbiBzbmFwc2hvdCBmb3Ig dGhlIGR1bXBcbiIpKTsKKwlwcmludGYoXygiICAtLXN0YXRpc3RpY3MgICAgICAgICAgICAgICAg IGR1bXAgdGhlIHN0YXRpc3RpY3NcbiIpKTsKIAlwcmludGYoXygiICAtLXN0YXRpc3RpY3Mtb25s eSAgICAgICAgICAgIGR1bXAgb25seSB0aGUgc3RhdGlzdGljcywgbm90IHNjaGVtYSBvciBkYXRh XG4iKSk7CiAJcHJpbnRmKF8oIiAgLS1zdHJpY3QtbmFtZXMgICAgICAgICAgICAgICByZXF1aXJl IHRhYmxlIGFuZC9vciBzY2hlbWEgaW5jbHVkZSBwYXR0ZXJucyB0b1xuIgogCQkJICIgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgbWF0Y2ggYXQgbGVhc3Qgb25lIGVudGl0eSBlYWNoXG4i KSk7CkBAIC0xMzcyLDkgKzEzNTQsNiBAQCBoZWxwKGNvbnN0IGNoYXIgKnByb2duYW1lKQogCXBy aW50ZihfKCIgIC0tdXNlLXNldC1zZXNzaW9uLWF1dGhvcml6YXRpb25cbiIKIAkJCSAiICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHVzZSBTRVQgU0VTU0lPTiBBVVRIT1JJWkFUSU9OIGNv bW1hbmRzIGluc3RlYWQgb2ZcbiIKIAkJCSAiICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IEFMVEVSIE9XTkVSIGNvbW1hbmRzIHRvIHNldCBvd25lcnNoaXBcbiIpKTsKLQlwcmludGYoXygi ICAtLXdpdGgtZGF0YSAgICAgICAgICAgICAgICAgIGR1bXAgdGhlIGRhdGFcbiIpKTsKLQlwcmlu dGYoXygiICAtLXdpdGgtc2NoZW1hICAgICAgICAgICAgICAgIGR1bXAgdGhlIHNjaGVtYVxuIikp OwotCXByaW50ZihfKCIgIC0td2l0aC1zdGF0aXN0aWNzICAgICAgICAgICAgZHVtcCB0aGUgc3Rh dGlzdGljc1xuIikpOwogCiAJcHJpbnRmKF8oIlxuQ29ubmVjdGlvbiBvcHRpb25zOlxuIikpOwog CXByaW50ZihfKCIgIC1kLCAtLWRibmFtZT1EQk5BTUUgICAgICBkYXRhYmFzZSB0byBkdW1wXG4i KSk7CmRpZmYgLS1naXQgYS9zcmMvYmluL3BnX2R1bXAvcGdfZHVtcGFsbC5jIGIvc3JjL2Jpbi9w Z19kdW1wL3BnX2R1bXBhbGwuYwppbmRleCA4N2QxMGRmMDdjNC4uMjdhYTFiNjU2OTggMTAwNjQ0 Ci0tLSBhL3NyYy9iaW4vcGdfZHVtcC9wZ19kdW1wYWxsLmMKKysrIGIvc3JjL2Jpbi9wZ19kdW1w L3BnX2R1bXBhbGwuYwpAQCAtMTA1LDggKzEwNSw2IEBAIHN0YXRpYyBpbnQJbm9fc3Vic2NyaXB0 aW9ucyA9IDA7CiBzdGF0aWMgaW50CW5vX3RvYXN0X2NvbXByZXNzaW9uID0gMDsKIHN0YXRpYyBp bnQJbm9fdW5sb2dnZWRfdGFibGVfZGF0YSA9IDA7CiBzdGF0aWMgaW50CW5vX3JvbGVfcGFzc3dv cmRzID0gMDsKLXN0YXRpYyBpbnQJd2l0aF9kYXRhID0gMDsKLXN0YXRpYyBpbnQJd2l0aF9zY2hl bWEgPSAwOwogc3RhdGljIGludAl3aXRoX3N0YXRpc3RpY3MgPSAwOwogc3RhdGljIGludAlzZXJ2 ZXJfdmVyc2lvbjsKIHN0YXRpYyBpbnQJbG9hZF92aWFfcGFydGl0aW9uX3Jvb3QgPSAwOwpAQCAt MTgwLDExICsxNzgsOSBAQCBtYWluKGludCBhcmdjLCBjaGFyICphcmd2W10pCiAJCXsibm8tc3lu YyIsIG5vX2FyZ3VtZW50LCBOVUxMLCA0fSwKIAkJeyJuby10b2FzdC1jb21wcmVzc2lvbiIsIG5v X2FyZ3VtZW50LCAmbm9fdG9hc3RfY29tcHJlc3Npb24sIDF9LAogCQl7Im5vLXVubG9nZ2VkLXRh YmxlLWRhdGEiLCBub19hcmd1bWVudCwgJm5vX3VubG9nZ2VkX3RhYmxlX2RhdGEsIDF9LAotCQl7 IndpdGgtZGF0YSIsIG5vX2FyZ3VtZW50LCAmd2l0aF9kYXRhLCAxfSwKLQkJeyJ3aXRoLXNjaGVt YSIsIG5vX2FyZ3VtZW50LCAmd2l0aF9zY2hlbWEsIDF9LAotCQl7IndpdGgtc3RhdGlzdGljcyIs IG5vX2FyZ3VtZW50LCAmd2l0aF9zdGF0aXN0aWNzLCAxfSwKIAkJeyJvbi1jb25mbGljdC1kby1u b3RoaW5nIiwgbm9fYXJndW1lbnQsICZvbl9jb25mbGljdF9kb19ub3RoaW5nLCAxfSwKIAkJeyJy b3dzLXBlci1pbnNlcnQiLCByZXF1aXJlZF9hcmd1bWVudCwgTlVMTCwgN30sCisJCXsic3RhdGlz dGljcyIsIG5vX2FyZ3VtZW50LCAmd2l0aF9zdGF0aXN0aWNzLCAxfSwKIAkJeyJzdGF0aXN0aWNz LW9ubHkiLCBub19hcmd1bWVudCwgJnN0YXRpc3RpY3Nfb25seSwgMX0sCiAJCXsiZmlsdGVyIiwg cmVxdWlyZWRfYXJndW1lbnQsIE5VTEwsIDh9LAogCQl7InNlcXVlbmNlLWRhdGEiLCBub19hcmd1 bWVudCwgJnNlcXVlbmNlX2RhdGEsIDF9LApAQCAtNDc1LDEyICs0NzEsOCBAQCBtYWluKGludCBh cmdjLCBjaGFyICphcmd2W10pCiAJCWFwcGVuZFBRRXhwQnVmZmVyU3RyKHBnZHVtcG9wdHMsICIg LS1uby10b2FzdC1jb21wcmVzc2lvbiIpOwogCWlmIChub191bmxvZ2dlZF90YWJsZV9kYXRhKQog CQlhcHBlbmRQUUV4cEJ1ZmZlclN0cihwZ2R1bXBvcHRzLCAiIC0tbm8tdW5sb2dnZWQtdGFibGUt ZGF0YSIpOwotCWlmICh3aXRoX2RhdGEpCi0JCWFwcGVuZFBRRXhwQnVmZmVyU3RyKHBnZHVtcG9w dHMsICIgLS13aXRoLWRhdGEiKTsKLQlpZiAod2l0aF9zY2hlbWEpCi0JCWFwcGVuZFBRRXhwQnVm ZmVyU3RyKHBnZHVtcG9wdHMsICIgLS13aXRoLXNjaGVtYSIpOwogCWlmICh3aXRoX3N0YXRpc3Rp Y3MpCi0JCWFwcGVuZFBRRXhwQnVmZmVyU3RyKHBnZHVtcG9wdHMsICIgLS13aXRoLXN0YXRpc3Rp Y3MiKTsKKwkJYXBwZW5kUFFFeHBCdWZmZXJTdHIocGdkdW1wb3B0cywgIiAtLXN0YXRpc3RpY3Mi KTsKIAlpZiAob25fY29uZmxpY3RfZG9fbm90aGluZykKIAkJYXBwZW5kUFFFeHBCdWZmZXJTdHIo cGdkdW1wb3B0cywgIiAtLW9uLWNvbmZsaWN0LWRvLW5vdGhpbmciKTsKIAlpZiAoc3RhdGlzdGlj c19vbmx5KQpAQCAtNzEyLDEzICs3MDQsMTEgQEAgaGVscCh2b2lkKQogCXByaW50ZihfKCIgIC0t cXVvdGUtYWxsLWlkZW50aWZpZXJzICAgICAgcXVvdGUgYWxsIGlkZW50aWZpZXJzLCBldmVuIGlm IG5vdCBrZXkgd29yZHNcbiIpKTsKIAlwcmludGYoXygiICAtLXJvd3MtcGVyLWluc2VydD1OUk9X UyAgICAgIG51bWJlciBvZiByb3dzIHBlciBJTlNFUlQ7IGltcGxpZXMgLS1pbnNlcnRzXG4iKSk7 CiAJcHJpbnRmKF8oIiAgLS1zZXF1ZW5jZS1kYXRhICAgICAgICAgICAgICBpbmNsdWRlIHNlcXVl bmNlIGRhdGEgaW4gZHVtcFxuIikpOworCXByaW50ZihfKCIgIC0tc3RhdGlzdGljcyAgICAgICAg ICAgICAgICAgZHVtcCB0aGUgc3RhdGlzdGljc1xuIikpOwogCXByaW50ZihfKCIgIC0tc3RhdGlz dGljcy1vbmx5ICAgICAgICAgICAgZHVtcCBvbmx5IHRoZSBzdGF0aXN0aWNzLCBub3Qgc2NoZW1h IG9yIGRhdGFcbiIpKTsKIAlwcmludGYoXygiICAtLXVzZS1zZXQtc2Vzc2lvbi1hdXRob3JpemF0 aW9uXG4iCiAJCQkgIiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1c2UgU0VUIFNFU1NJ T04gQVVUSE9SSVpBVElPTiBjb21tYW5kcyBpbnN0ZWFkIG9mXG4iCiAJCQkgIiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBBTFRFUiBPV05FUiBjb21tYW5kcyB0byBzZXQgb3duZXJzaGlw XG4iKSk7Ci0JcHJpbnRmKF8oIiAgLS13aXRoLWRhdGEgICAgICAgICAgICAgICAgICBkdW1wIHRo ZSBkYXRhXG4iKSk7Ci0JcHJpbnRmKF8oIiAgLS13aXRoLXNjaGVtYSAgICAgICAgICAgICAgICBk dW1wIHRoZSBzY2hlbWFcbiIpKTsKLQlwcmludGYoXygiICAtLXdpdGgtc3RhdGlzdGljcyAgICAg ICAgICAgIGR1bXAgdGhlIHN0YXRpc3RpY3NcbiIpKTsKIAogCXByaW50ZihfKCJcbkNvbm5lY3Rp b24gb3B0aW9uczpcbiIpKTsKIAlwcmludGYoXygiICAtZCwgLS1kYm5hbWU9Q09OTlNUUiAgICAg Y29ubmVjdCB1c2luZyBjb25uZWN0aW9uIHN0cmluZ1xuIikpOwpkaWZmIC0tZ2l0IGEvc3JjL2Jp bi9wZ19kdW1wL3BnX3Jlc3RvcmUuYyBiL3NyYy9iaW4vcGdfZHVtcC9wZ19yZXN0b3JlLmMKaW5k ZXggMmM3MjdiOWYxNTYuLjZjMTI5Mjc4YmM1IDEwMDY0NAotLS0gYS9zcmMvYmluL3BnX2R1bXAv cGdfcmVzdG9yZS5jCisrKyBiL3NyYy9iaW4vcGdfZHVtcC9wZ19yZXN0b3JlLmMKQEAgLTgyLDgg KzgyLDYgQEAgbWFpbihpbnQgYXJnYywgY2hhciAqKmFyZ3YpCiAJc3RhdGljIGludAlub19zdWJz Y3JpcHRpb25zID0gMDsKIAlzdGF0aWMgaW50CXN0cmljdF9uYW1lcyA9IDA7CiAJc3RhdGljIGlu dAlzdGF0aXN0aWNzX29ubHkgPSAwOwotCXN0YXRpYyBpbnQJd2l0aF9kYXRhID0gMDsKLQlzdGF0 aWMgaW50CXdpdGhfc2NoZW1hID0gMDsKIAlzdGF0aWMgaW50CXdpdGhfc3RhdGlzdGljcyA9IDA7 CiAKIAlzdHJ1Y3Qgb3B0aW9uIGNtZG9wdHNbXSA9IHsKQEAgLTEzOSw5ICsxMzcsNyBAQCBtYWlu KGludCBhcmdjLCBjaGFyICoqYXJndikKIAkJeyJuby1zZWN1cml0eS1sYWJlbHMiLCBub19hcmd1 bWVudCwgJm5vX3NlY3VyaXR5X2xhYmVscywgMX0sCiAJCXsibm8tc3Vic2NyaXB0aW9ucyIsIG5v X2FyZ3VtZW50LCAmbm9fc3Vic2NyaXB0aW9ucywgMX0sCiAJCXsibm8tc3RhdGlzdGljcyIsIG5v X2FyZ3VtZW50LCAmbm9fc3RhdGlzdGljcywgMX0sCi0JCXsid2l0aC1kYXRhIiwgbm9fYXJndW1l bnQsICZ3aXRoX2RhdGEsIDF9LAotCQl7IndpdGgtc2NoZW1hIiwgbm9fYXJndW1lbnQsICZ3aXRo X3NjaGVtYSwgMX0sCi0JCXsid2l0aC1zdGF0aXN0aWNzIiwgbm9fYXJndW1lbnQsICZ3aXRoX3N0 YXRpc3RpY3MsIDF9LAorCQl7InN0YXRpc3RpY3MiLCBub19hcmd1bWVudCwgJndpdGhfc3RhdGlz dGljcywgMX0sCiAJCXsic3RhdGlzdGljcy1vbmx5Iiwgbm9fYXJndW1lbnQsICZzdGF0aXN0aWNz X29ubHksIDF9LAogCQl7ImZpbHRlciIsIHJlcXVpcmVkX2FyZ3VtZW50LCBOVUxMLCA0fSwKIApA QCAtMzczLDI0ICszNjksMTcgQEAgbWFpbihpbnQgYXJnYywgY2hhciAqKmFyZ3YpCiAJaWYgKHN0 YXRpc3RpY3Nfb25seSAmJiBub19zdGF0aXN0aWNzKQogCQlwZ19mYXRhbCgib3B0aW9ucyAtLXN0 YXRpc3RpY3Mtb25seSBhbmQgLS1uby1zdGF0aXN0aWNzIGNhbm5vdCBiZSB1c2VkIHRvZ2V0aGVy Iik7CiAKLQkvKiByZWplY3QgY29uZmxpY3RpbmcgIndpdGgtIiBhbmQgIm5vLSIgb3B0aW9ucyAq LwotCWlmICh3aXRoX2RhdGEgJiYgbm9fZGF0YSkKLQkJcGdfZmF0YWwoIm9wdGlvbnMgLS13aXRo LWRhdGEgYW5kIC0tbm8tZGF0YSBjYW5ub3QgYmUgdXNlZCB0b2dldGhlciIpOwotCWlmICh3aXRo X3NjaGVtYSAmJiBub19zY2hlbWEpCi0JCXBnX2ZhdGFsKCJvcHRpb25zIC0td2l0aC1zY2hlbWEg YW5kIC0tbm8tc2NoZW1hIGNhbm5vdCBiZSB1c2VkIHRvZ2V0aGVyIik7CisJLyogcmVqZWN0IGNv bmZsaWN0aW5nICJuby0iIG9wdGlvbnMgKi8KIAlpZiAod2l0aF9zdGF0aXN0aWNzICYmIG5vX3N0 YXRpc3RpY3MpCi0JCXBnX2ZhdGFsKCJvcHRpb25zIC0td2l0aC1zdGF0aXN0aWNzIGFuZCAtLW5v LXN0YXRpc3RpY3MgY2Fubm90IGJlIHVzZWQgdG9nZXRoZXIiKTsKKwkJcGdfZmF0YWwoIm9wdGlv bnMgLS1zdGF0aXN0aWNzIGFuZCAtLW5vLXN0YXRpc3RpY3MgY2Fubm90IGJlIHVzZWQgdG9nZXRo ZXIiKTsKIAotCS8qIHJlamVjdCBjb25mbGljdGluZyAib25seS0iIGFuZCAid2l0aC0iIG9wdGlv bnMgKi8KLQlpZiAoZGF0YV9vbmx5ICYmICh3aXRoX3NjaGVtYSB8fCB3aXRoX3N0YXRpc3RpY3Mp KQorCS8qIHJlamVjdCBjb25mbGljdGluZyAib25seS0iIG9wdGlvbnMgKi8KKwlpZiAoZGF0YV9v bmx5ICYmIHdpdGhfc3RhdGlzdGljcykKIAkJcGdfZmF0YWwoIm9wdGlvbnMgJXMgYW5kICVzIGNh bm5vdCBiZSB1c2VkIHRvZ2V0aGVyIiwKLQkJCQkgIi1hLy0tZGF0YS1vbmx5Iiwgd2l0aF9zY2hl bWEgPyAiLS13aXRoLXNjaGVtYSIgOiAiLS13aXRoLXN0YXRpc3RpY3MiKTsKLQlpZiAoc2NoZW1h X29ubHkgJiYgKHdpdGhfZGF0YSB8fCB3aXRoX3N0YXRpc3RpY3MpKQorCQkJCSAiLWEvLS1kYXRh LW9ubHkiLCAiLS1zdGF0aXN0aWNzIik7CisJaWYgKHNjaGVtYV9vbmx5ICYmIHdpdGhfc3RhdGlz dGljcykKIAkJcGdfZmF0YWwoIm9wdGlvbnMgJXMgYW5kICVzIGNhbm5vdCBiZSB1c2VkIHRvZ2V0 aGVyIiwKLQkJCQkgIi1zLy0tc2NoZW1hLW9ubHkiLCB3aXRoX2RhdGEgPyAiLS13aXRoLWRhdGEi IDogIi0td2l0aC1zdGF0aXN0aWNzIik7Ci0JaWYgKHN0YXRpc3RpY3Nfb25seSAmJiAod2l0aF9k YXRhIHx8IHdpdGhfc2NoZW1hKSkKLQkJcGdfZmF0YWwoIm9wdGlvbnMgJXMgYW5kICVzIGNhbm5v dCBiZSB1c2VkIHRvZ2V0aGVyIiwKLQkJCQkgIi0tc3RhdGlzdGljcy1vbmx5Iiwgd2l0aF9kYXRh ID8gIi0td2l0aC1kYXRhIiA6ICItLXdpdGgtc2NoZW1hIik7CisJCQkJICItcy8tLXNjaGVtYS1v bmx5IiwgIi0tc3RhdGlzdGljcyIpOwogCiAJaWYgKGRhdGFfb25seSAmJiBvcHRzLT5kcm9wU2No ZW1hKQogCQlwZ19mYXRhbCgib3B0aW9ucyAtYy8tLWNsZWFuIGFuZCAtYS8tLWRhdGEtb25seSBj YW5ub3QgYmUgdXNlZCB0b2dldGhlciIpOwpAQCAtNDE1LDkgKzQwNCw5IEBAIG1haW4oaW50IGFy Z2MsIGNoYXIgKiphcmd2KQogCSAqIG9mIHRoZSBjaGVja3MgYWJvdmUuCiAJICovCiAJb3B0cy0+ ZHVtcERhdGEgPSAoKG9wdHMtPmR1bXBEYXRhICYmICFzY2hlbWFfb25seSAmJiAhc3RhdGlzdGlj c19vbmx5KSB8fAotCQkJCQkgIChkYXRhX29ubHkgfHwgd2l0aF9kYXRhKSkgJiYgIW5vX2RhdGE7 CisJCQkJCSAgZGF0YV9vbmx5KSAmJiAhbm9fZGF0YTsKIAlvcHRzLT5kdW1wU2NoZW1hID0gKChv cHRzLT5kdW1wU2NoZW1hICYmICFkYXRhX29ubHkgJiYgIXN0YXRpc3RpY3Nfb25seSkgfHwKLQkJ CQkJCShzY2hlbWFfb25seSB8fCB3aXRoX3NjaGVtYSkpICYmICFub19zY2hlbWE7CisJCQkJCQlz Y2hlbWFfb25seSkgJiYgIW5vX3NjaGVtYTsKIAlvcHRzLT5kdW1wU3RhdGlzdGljcyA9ICgob3B0 cy0+ZHVtcFN0YXRpc3RpY3MgJiYgIXNjaGVtYV9vbmx5ICYmICFkYXRhX29ubHkpIHx8CiAJCQkJ CQkJKHN0YXRpc3RpY3Nfb25seSB8fCB3aXRoX3N0YXRpc3RpY3MpKSAmJiAhbm9fc3RhdGlzdGlj czsKIApAQCAtNTU4LDYgKzU0Nyw3IEBAIHVzYWdlKGNvbnN0IGNoYXIgKnByb2duYW1lKQogCXBy aW50ZihfKCIgIC0tbm8tdGFibGUtYWNjZXNzLW1ldGhvZCAgICAgZG8gbm90IHJlc3RvcmUgdGFi bGUgYWNjZXNzIG1ldGhvZHNcbiIpKTsKIAlwcmludGYoXygiICAtLW5vLXRhYmxlc3BhY2VzICAg ICAgICAgICAgIGRvIG5vdCByZXN0b3JlIHRhYmxlc3BhY2UgYXNzaWdubWVudHNcbiIpKTsKIAlw cmludGYoXygiICAtLXNlY3Rpb249U0VDVElPTiAgICAgICAgICAgIHJlc3RvcmUgbmFtZWQgc2Vj dGlvbiAocHJlLWRhdGEsIGRhdGEsIG9yIHBvc3QtZGF0YSlcbiIpKTsKKwlwcmludGYoXygiICAt LXN0YXRpc3RpY3MgICAgICAgICAgICAgICAgIHJlc3RvcmUgdGhlIHN0YXRpc3RpY3NcbiIpKTsK IAlwcmludGYoXygiICAtLXN0YXRpc3RpY3Mtb25seSAgICAgICAgICAgIHJlc3RvcmUgb25seSB0 aGUgc3RhdGlzdGljcywgbm90IHNjaGVtYSBvciBkYXRhXG4iKSk7CiAJcHJpbnRmKF8oIiAgLS1z dHJpY3QtbmFtZXMgICAgICAgICAgICAgICByZXF1aXJlIHRhYmxlIGFuZC9vciBzY2hlbWEgaW5j bHVkZSBwYXR0ZXJucyB0b1xuIgogCQkJICIgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg bWF0Y2ggYXQgbGVhc3Qgb25lIGVudGl0eSBlYWNoXG4iKSk7CkBAIC01NjUsOSArNTU1LDYgQEAg dXNhZ2UoY29uc3QgY2hhciAqcHJvZ25hbWUpCiAJcHJpbnRmKF8oIiAgLS11c2Utc2V0LXNlc3Np b24tYXV0aG9yaXphdGlvblxuIgogCQkJICIgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg dXNlIFNFVCBTRVNTSU9OIEFVVEhPUklaQVRJT04gY29tbWFuZHMgaW5zdGVhZCBvZlxuIgogCQkJ ICIgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgQUxURVIgT1dORVIgY29tbWFuZHMgdG8g c2V0IG93bmVyc2hpcFxuIikpOwotCXByaW50ZihfKCIgIC0td2l0aC1kYXRhICAgICAgICAgICAg ICAgICAgcmVzdG9yZSB0aGUgZGF0YVxuIikpOwotCXByaW50ZihfKCIgIC0td2l0aC1zY2hlbWEg ICAgICAgICAgICAgICAgcmVzdG9yZSB0aGUgc2NoZW1hXG4iKSk7Ci0JcHJpbnRmKF8oIiAgLS13 aXRoLXN0YXRpc3RpY3MgICAgICAgICAgICByZXN0b3JlIHRoZSBzdGF0aXN0aWNzXG4iKSk7CiAK IAlwcmludGYoXygiXG5Db25uZWN0aW9uIG9wdGlvbnM6XG4iKSk7CiAJcHJpbnRmKF8oIiAgLWgs IC0taG9zdD1IT1NUTkFNRSAgICAgIGRhdGFiYXNlIHNlcnZlciBob3N0IG9yIHNvY2tldCBkaXJl Y3RvcnlcbiIpKTsKZGlmZiAtLWdpdCBhL3NyYy9iaW4vcGdfZHVtcC90LzAwMl9wZ19kdW1wLnBs IGIvc3JjL2Jpbi9wZ19kdW1wL3QvMDAyX3BnX2R1bXAucGwKaW5kZXggZDU5Nzg0MjkwOGUuLmE4 NmIzODQ2NmRlIDEwMDY0NAotLS0gYS9zcmMvYmluL3BnX2R1bXAvdC8wMDJfcGdfZHVtcC5wbAor KysgYi9zcmMvYmluL3BnX2R1bXAvdC8wMDJfcGdfZHVtcC5wbApAQCAtNjgsNyArNjgsNyBAQCBt eSAlcGdkdW1wX3J1bnMgPSAoCiAJCQknLS1uby1kYXRhJywKIAkJCSctLXNlcXVlbmNlLWRhdGEn LAogCQkJJy0tYmluYXJ5LXVwZ3JhZGUnLAotCQkJJy0td2l0aC1zdGF0aXN0aWNzJywKKwkJCSct LXN0YXRpc3RpY3MnLAogCQkJJy0tZGJuYW1lJyA9PiAncG9zdGdyZXMnLCAgICAjIGFsdGVybmF0 aXZlIHdheSB0byBzcGVjaWZ5IGRhdGFiYXNlCiAJCV0sCiAJCXJlc3RvcmVfY21kID0+IFsKQEAg LTc2LDcgKzc2LDcgQEAgbXkgJXBnZHVtcF9ydW5zID0gKAogCQkJJy0tZm9ybWF0JyA9PiAnY3Vz dG9tJywKIAkJCSctLXZlcmJvc2UnLAogCQkJJy0tZmlsZScgPT4gIiR0ZW1wZGlyL2JpbmFyeV91 cGdyYWRlLnNxbCIsCi0JCQknLS13aXRoLXN0YXRpc3RpY3MnLAorCQkJJy0tc3RhdGlzdGljcycs CiAJCQkiJHRlbXBkaXIvYmluYXJ5X3VwZ3JhZGUuZHVtcCIsCiAJCV0sCiAJfSwKQEAgLTkwLDEz ICs5MCwxMyBAQCBteSAlcGdkdW1wX3J1bnMgPSAoCiAJCQknLS1mb3JtYXQnID0+ICdjdXN0b20n LAogCQkJJy0tY29tcHJlc3MnID0+ICcxJywKIAkJCSctLWZpbGUnID0+ICIkdGVtcGRpci9jb21w cmVzc2lvbl9nemlwX2N1c3RvbS5kdW1wIiwKLQkJCSctLXdpdGgtc3RhdGlzdGljcycsCisJCQkn LS1zdGF0aXN0aWNzJywKIAkJCSdwb3N0Z3JlcycsCiAJCV0sCiAJCXJlc3RvcmVfY21kID0+IFsK IAkJCSdwZ19yZXN0b3JlJywKIAkJCSctLWZpbGUnID0+ICIkdGVtcGRpci9jb21wcmVzc2lvbl9n emlwX2N1c3RvbS5zcWwiLAotCQkJJy0td2l0aC1zdGF0aXN0aWNzJywKKwkJCSctLXN0YXRpc3Rp Y3MnLAogCQkJIiR0ZW1wZGlyL2NvbXByZXNzaW9uX2d6aXBfY3VzdG9tLmR1bXAiLAogCQldLAog CQljb21tYW5kX2xpa2UgPT4gewpAQCAtMTE5LDcgKzExOSw3IEBAIG15ICVwZ2R1bXBfcnVucyA9 ICgKIAkJCSctLWZvcm1hdCcgPT4gJ2RpcmVjdG9yeScsCiAJCQknLS1jb21wcmVzcycgPT4gJ2d6 aXA6MScsCiAJCQknLS1maWxlJyA9PiAiJHRlbXBkaXIvY29tcHJlc3Npb25fZ3ppcF9kaXIiLAot CQkJJy0td2l0aC1zdGF0aXN0aWNzJywKKwkJCSctLXN0YXRpc3RpY3MnLAogCQkJJ3Bvc3RncmVz JywKIAkJXSwKIAkJIyBHaXZlIGNvdmVyYWdlIGZvciBtYW51YWxseSBjb21wcmVzc2VkIGJsb2Jz LnRvYyBmaWxlcyBkdXJpbmcKQEAgLTEzNyw3ICsxMzcsNyBAQCBteSAlcGdkdW1wX3J1bnMgPSAo CiAJCQkncGdfcmVzdG9yZScsCiAJCQknLS1qb2JzJyA9PiAnMicsCiAJCQknLS1maWxlJyA9PiAi JHRlbXBkaXIvY29tcHJlc3Npb25fZ3ppcF9kaXIuc3FsIiwKLQkJCSctLXdpdGgtc3RhdGlzdGlj cycsCisJCQknLS1zdGF0aXN0aWNzJywKIAkJCSIkdGVtcGRpci9jb21wcmVzc2lvbl9nemlwX2Rp ciIsCiAJCV0sCiAJfSwKQEAgLTE1MCw3ICsxNTAsNyBAQCBteSAlcGdkdW1wX3J1bnMgPSAoCiAJ CQknLS1mb3JtYXQnID0+ICdwbGFpbicsCiAJCQknLS1jb21wcmVzcycgPT4gJzEnLAogCQkJJy0t ZmlsZScgPT4gIiR0ZW1wZGlyL2NvbXByZXNzaW9uX2d6aXBfcGxhaW4uc3FsLmd6IiwKLQkJCSct LXdpdGgtc3RhdGlzdGljcycsCisJCQknLS1zdGF0aXN0aWNzJywKIAkJCSdwb3N0Z3JlcycsCiAJ CV0sCiAJCSMgRGVjb21wcmVzcyB0aGUgZ2VuZXJhdGVkIGZpbGUgdG8gcnVuIHRocm91Z2ggdGhl IHRlc3RzLgpAQCAtMTY5LDEzICsxNjksMTMgQEAgbXkgJXBnZHVtcF9ydW5zID0gKAogCQkJJy0t Zm9ybWF0JyA9PiAnY3VzdG9tJywKIAkJCSctLWNvbXByZXNzJyA9PiAnbHo0JywKIAkJCSctLWZp bGUnID0+ICIkdGVtcGRpci9jb21wcmVzc2lvbl9sejRfY3VzdG9tLmR1bXAiLAotCQkJJy0td2l0 aC1zdGF0aXN0aWNzJywKKwkJCSctLXN0YXRpc3RpY3MnLAogCQkJJ3Bvc3RncmVzJywKIAkJXSwK IAkJcmVzdG9yZV9jbWQgPT4gWwogCQkJJ3BnX3Jlc3RvcmUnLAogCQkJJy0tZmlsZScgPT4gIiR0 ZW1wZGlyL2NvbXByZXNzaW9uX2x6NF9jdXN0b20uc3FsIiwKLQkJCSctLXdpdGgtc3RhdGlzdGlj cycsCisJCQknLS1zdGF0aXN0aWNzJywKIAkJCSIkdGVtcGRpci9jb21wcmVzc2lvbl9sejRfY3Vz dG9tLmR1bXAiLAogCQldLAogCQljb21tYW5kX2xpa2UgPT4gewpAQCAtMTk4LDcgKzE5OCw3IEBA IG15ICVwZ2R1bXBfcnVucyA9ICgKIAkJCSctLWZvcm1hdCcgPT4gJ2RpcmVjdG9yeScsCiAJCQkn LS1jb21wcmVzcycgPT4gJ2x6NDoxJywKIAkJCSctLWZpbGUnID0+ICIkdGVtcGRpci9jb21wcmVz c2lvbl9sejRfZGlyIiwKLQkJCSctLXdpdGgtc3RhdGlzdGljcycsCisJCQknLS1zdGF0aXN0aWNz JywKIAkJCSdwb3N0Z3JlcycsCiAJCV0sCiAJCSMgVmVyaWZ5IHRoYXQgZGF0YSBmaWxlcyB3ZXJl IGNvbXByZXNzZWQKQEAgLTIxMCw3ICsyMTAsNyBAQCBteSAlcGdkdW1wX3J1bnMgPSAoCiAJCQkn cGdfcmVzdG9yZScsCiAJCQknLS1qb2JzJyA9PiAnMicsCiAJCQknLS1maWxlJyA9PiAiJHRlbXBk aXIvY29tcHJlc3Npb25fbHo0X2Rpci5zcWwiLAotCQkJJy0td2l0aC1zdGF0aXN0aWNzJywKKwkJ CSctLXN0YXRpc3RpY3MnLAogCQkJIiR0ZW1wZGlyL2NvbXByZXNzaW9uX2x6NF9kaXIiLAogCQld LAogCX0sCkBAIC0yMjMsNyArMjIzLDcgQEAgbXkgJXBnZHVtcF9ydW5zID0gKAogCQkJJy0tZm9y bWF0JyA9PiAncGxhaW4nLAogCQkJJy0tY29tcHJlc3MnID0+ICdsejQnLAogCQkJJy0tZmlsZScg PT4gIiR0ZW1wZGlyL2NvbXByZXNzaW9uX2x6NF9wbGFpbi5zcWwubHo0IiwKLQkJCSctLXdpdGgt c3RhdGlzdGljcycsCisJCQknLS1zdGF0aXN0aWNzJywKIAkJCSdwb3N0Z3JlcycsCiAJCV0sCiAJ CSMgRGVjb21wcmVzcyB0aGUgZ2VuZXJhdGVkIGZpbGUgdG8gcnVuIHRocm91Z2ggdGhlIHRlc3Rz LgpAQCAtMjQ1LDEzICsyNDUsMTMgQEAgbXkgJXBnZHVtcF9ydW5zID0gKAogCQkJJy0tZm9ybWF0 JyA9PiAnY3VzdG9tJywKIAkJCSctLWNvbXByZXNzJyA9PiAnenN0ZCcsCiAJCQknLS1maWxlJyA9 PiAiJHRlbXBkaXIvY29tcHJlc3Npb25fenN0ZF9jdXN0b20uZHVtcCIsCi0JCQknLS13aXRoLXN0 YXRpc3RpY3MnLAorCQkJJy0tc3RhdGlzdGljcycsCiAJCQkncG9zdGdyZXMnLAogCQldLAogCQly ZXN0b3JlX2NtZCA9PiBbCiAJCQkncGdfcmVzdG9yZScsCiAJCQknLS1maWxlJyA9PiAiJHRlbXBk aXIvY29tcHJlc3Npb25fenN0ZF9jdXN0b20uc3FsIiwKLQkJCSctLXdpdGgtc3RhdGlzdGljcycs CisJCQknLS1zdGF0aXN0aWNzJywKIAkJCSIkdGVtcGRpci9jb21wcmVzc2lvbl96c3RkX2N1c3Rv bS5kdW1wIiwKIAkJXSwKIAkJY29tbWFuZF9saWtlID0+IHsKQEAgLTI3Myw3ICsyNzMsNyBAQCBt eSAlcGdkdW1wX3J1bnMgPSAoCiAJCQknLS1mb3JtYXQnID0+ICdkaXJlY3RvcnknLAogCQkJJy0t Y29tcHJlc3MnID0+ICd6c3RkOjEnLAogCQkJJy0tZmlsZScgPT4gIiR0ZW1wZGlyL2NvbXByZXNz aW9uX3pzdGRfZGlyIiwKLQkJCSctLXdpdGgtc3RhdGlzdGljcycsCisJCQknLS1zdGF0aXN0aWNz JywKIAkJCSdwb3N0Z3JlcycsCiAJCV0sCiAJCSMgR2l2ZSBjb3ZlcmFnZSBmb3IgbWFudWFsbHkg Y29tcHJlc3NlZCBibG9icy50b2MgZmlsZXMgZHVyaW5nCkBAIC0yOTQsNyArMjk0LDcgQEAgbXkg JXBnZHVtcF9ydW5zID0gKAogCQkJJ3BnX3Jlc3RvcmUnLAogCQkJJy0tam9icycgPT4gJzInLAog CQkJJy0tZmlsZScgPT4gIiR0ZW1wZGlyL2NvbXByZXNzaW9uX3pzdGRfZGlyLnNxbCIsCi0JCQkn LS13aXRoLXN0YXRpc3RpY3MnLAorCQkJJy0tc3RhdGlzdGljcycsCiAJCQkiJHRlbXBkaXIvY29t cHJlc3Npb25fenN0ZF9kaXIiLAogCQldLAogCX0sCkBAIC0zMDgsNyArMzA4LDcgQEAgbXkgJXBn ZHVtcF9ydW5zID0gKAogCQkJJy0tZm9ybWF0JyA9PiAncGxhaW4nLAogCQkJJy0tY29tcHJlc3Mn ID0+ICd6c3RkOmxvbmcnLAogCQkJJy0tZmlsZScgPT4gIiR0ZW1wZGlyL2NvbXByZXNzaW9uX3pz dGRfcGxhaW4uc3FsLnpzdCIsCi0JCQknLS13aXRoLXN0YXRpc3RpY3MnLAorCQkJJy0tc3RhdGlz dGljcycsCiAJCQkncG9zdGdyZXMnLAogCQldLAogCQkjIERlY29tcHJlc3MgdGhlIGdlbmVyYXRl ZCBmaWxlIHRvIHJ1biB0aHJvdWdoIHRoZSB0ZXN0cy4KQEAgLTMyNyw3ICszMjcsNyBAQCBteSAl cGdkdW1wX3J1bnMgPSAoCiAJCQkncGdfZHVtcCcsICctLW5vLXN5bmMnLAogCQkJJy0tZmlsZScg PT4gIiR0ZW1wZGlyL2NsZWFuLnNxbCIsCiAJCQknLS1jbGVhbicsCi0JCQknLS13aXRoLXN0YXRp c3RpY3MnLAorCQkJJy0tc3RhdGlzdGljcycsCiAJCQknLS1kYm5hbWUnID0+ICdwb3N0Z3Jlcycs ICAgICMgYWx0ZXJuYXRpdmUgd2F5IHRvIHNwZWNpZnkgZGF0YWJhc2UKIAkJXSwKIAl9LApAQCAt MzM4LDcgKzMzOCw3IEBAIG15ICVwZ2R1bXBfcnVucyA9ICgKIAkJCSctLWNsZWFuJywKIAkJCSct LWlmLWV4aXN0cycsCiAJCQknLS1lbmNvZGluZycgPT4gJ1VURjgnLCAgICAgICMgbm8tb3AsIGp1 c3QgZm9yIHRlc3RpbmcKLQkJCSctLXdpdGgtc3RhdGlzdGljcycsCisJCQknLS1zdGF0aXN0aWNz JywKIAkJCSdwb3N0Z3JlcycsCiAJCV0sCiAJfSwKQEAgLTM1Nyw3ICszNTcsNyBAQCBteSAlcGdk dW1wX3J1bnMgPSAoCiAJCQknLS1jcmVhdGUnLAogCQkJJy0tbm8tcmVjb25uZWN0JywgICAgIyBu by1vcCwganVzdCBmb3IgdGVzdGluZwogCQkJJy0tdmVyYm9zZScsCi0JCQknLS13aXRoLXN0YXRp c3RpY3MnLAorCQkJJy0tc3RhdGlzdGljcycsCiAJCQkncG9zdGdyZXMnLAogCQldLAogCX0sCkBA IC0zNzYsNyArMzc2LDcgQEAgbXkgJXBnZHVtcF9ydW5zID0gKAogCQlkdW1wX2NtZCA9PiBbCiAJ CQkncGdfZHVtcCcsICctLW5vLXN5bmMnLAogCQkJJy0tZmlsZScgPT4gIiR0ZW1wZGlyL2RlZmF1 bHRzLnNxbCIsCi0JCQknLS13aXRoLXN0YXRpc3RpY3MnLAorCQkJJy0tc3RhdGlzdGljcycsCiAJ CQkncG9zdGdyZXMnLAogCQldLAogCX0sCkBAIC0zODUsNyArMzg1LDcgQEAgbXkgJXBnZHVtcF9y dW5zID0gKAogCQlkdW1wX2NtZCA9PiBbCiAJCQkncGdfZHVtcCcsICctLW5vLXN5bmMnLAogCQkJ Jy0tZmlsZScgPT4gIiR0ZW1wZGlyL2RlZmF1bHRzX25vX3B1YmxpYy5zcWwiLAotCQkJJy0td2l0 aC1zdGF0aXN0aWNzJywKKwkJCSctLXN0YXRpc3RpY3MnLAogCQkJJ3JlZ3Jlc3NfcGdfZHVtcF90 ZXN0JywKIAkJXSwKIAl9LApAQCAtMzk1LDcgKzM5NSw3IEBAIG15ICVwZ2R1bXBfcnVucyA9ICgK IAkJCSdwZ19kdW1wJywgJy0tbm8tc3luYycsCiAJCQknLS1jbGVhbicsCiAJCQknLS1maWxlJyA9 PiAiJHRlbXBkaXIvZGVmYXVsdHNfbm9fcHVibGljX2NsZWFuLnNxbCIsCi0JCQknLS13aXRoLXN0 YXRpc3RpY3MnLAorCQkJJy0tc3RhdGlzdGljcycsCiAJCQkncmVncmVzc19wZ19kdW1wX3Rlc3Qn LAogCQldLAogCX0sCkBAIC00MDQsNyArNDA0LDcgQEAgbXkgJXBnZHVtcF9ydW5zID0gKAogCQlk dW1wX2NtZCA9PiBbCiAJCQkncGdfZHVtcCcsICctLW5vLXN5bmMnLAogCQkJJy0tZmlsZScgPT4g IiR0ZW1wZGlyL2RlZmF1bHRzX3B1YmxpY19vd25lci5zcWwiLAotCQkJJy0td2l0aC1zdGF0aXN0 aWNzJywKKwkJCSctLXN0YXRpc3RpY3MnLAogCQkJJ3JlZ3Jlc3NfcHVibGljX293bmVyJywKIAkJ XSwKIAl9LApAQCAtNDE5LDE0ICs0MTksMTQgQEAgbXkgJXBnZHVtcF9ydW5zID0gKAogCQkJJ3Bn X2R1bXAnLAogCQkJJy0tZm9ybWF0JyA9PiAnY3VzdG9tJywKIAkJCSctLWZpbGUnID0+ICIkdGVt cGRpci9kZWZhdWx0c19jdXN0b21fZm9ybWF0LmR1bXAiLAotCQkJJy0td2l0aC1zdGF0aXN0aWNz JywKKwkJCSctLXN0YXRpc3RpY3MnLAogCQkJJ3Bvc3RncmVzJywKIAkJXSwKIAkJcmVzdG9yZV9j bWQgPT4gWwogCQkJJ3BnX3Jlc3RvcmUnLAogCQkJJy0tZm9ybWF0JyA9PiAnY3VzdG9tJywKIAkJ CSctLWZpbGUnID0+ICIkdGVtcGRpci9kZWZhdWx0c19jdXN0b21fZm9ybWF0LnNxbCIsCi0JCQkn LS13aXRoLXN0YXRpc3RpY3MnLAorCQkJJy0tc3RhdGlzdGljcycsCiAJCQkiJHRlbXBkaXIvZGVm YXVsdHNfY3VzdG9tX2Zvcm1hdC5kdW1wIiwKIAkJXSwKIAkJY29tbWFuZF9saWtlID0+IHsKQEAg LTQ1MSwxNCArNDUxLDE0IEBAIG15ICVwZ2R1bXBfcnVucyA9ICgKIAkJCSdwZ19kdW1wJywKIAkJ CSctLWZvcm1hdCcgPT4gJ2RpcmVjdG9yeScsCiAJCQknLS1maWxlJyA9PiAiJHRlbXBkaXIvZGVm YXVsdHNfZGlyX2Zvcm1hdCIsCi0JCQknLS13aXRoLXN0YXRpc3RpY3MnLAorCQkJJy0tc3RhdGlz dGljcycsCiAJCQkncG9zdGdyZXMnLAogCQldLAogCQlyZXN0b3JlX2NtZCA9PiBbCiAJCQkncGdf cmVzdG9yZScsCiAJCQknLS1mb3JtYXQnID0+ICdkaXJlY3RvcnknLAogCQkJJy0tZmlsZScgPT4g IiR0ZW1wZGlyL2RlZmF1bHRzX2Rpcl9mb3JtYXQuc3FsIiwKLQkJCSctLXdpdGgtc3RhdGlzdGlj cycsCisJCQknLS1zdGF0aXN0aWNzJywKIAkJCSIkdGVtcGRpci9kZWZhdWx0c19kaXJfZm9ybWF0 IiwKIAkJXSwKIAkJY29tbWFuZF9saWtlID0+IHsKQEAgLTQ4NCwxMyArNDg0LDEzIEBAIG15ICVw Z2R1bXBfcnVucyA9ICgKIAkJCSctLWZvcm1hdCcgPT4gJ2RpcmVjdG9yeScsCiAJCQknLS1qb2Jz JyA9PiAyLAogCQkJJy0tZmlsZScgPT4gIiR0ZW1wZGlyL2RlZmF1bHRzX3BhcmFsbGVsIiwKLQkJ CSctLXdpdGgtc3RhdGlzdGljcycsCisJCQknLS1zdGF0aXN0aWNzJywKIAkJCSdwb3N0Z3Jlcycs CiAJCV0sCiAJCXJlc3RvcmVfY21kID0+IFsKIAkJCSdwZ19yZXN0b3JlJywKIAkJCSctLWZpbGUn ID0+ICIkdGVtcGRpci9kZWZhdWx0c19wYXJhbGxlbC5zcWwiLAotCQkJJy0td2l0aC1zdGF0aXN0 aWNzJywKKwkJCSctLXN0YXRpc3RpY3MnLAogCQkJIiR0ZW1wZGlyL2RlZmF1bHRzX3BhcmFsbGVs IiwKIAkJXSwKIAl9LApAQCAtNTAyLDE0ICs1MDIsMTQgQEAgbXkgJXBnZHVtcF9ydW5zID0gKAog CQkJJ3BnX2R1bXAnLAogCQkJJy0tZm9ybWF0JyA9PiAndGFyJywKIAkJCSctLWZpbGUnID0+ICIk dGVtcGRpci9kZWZhdWx0c190YXJfZm9ybWF0LnRhciIsCi0JCQknLS13aXRoLXN0YXRpc3RpY3Mn LAorCQkJJy0tc3RhdGlzdGljcycsCiAJCQkncG9zdGdyZXMnLAogCQldLAogCQlyZXN0b3JlX2Nt ZCA9PiBbCiAJCQkncGdfcmVzdG9yZScsCiAJCQknLS1mb3JtYXQnID0+ICd0YXInLAogCQkJJy0t ZmlsZScgPT4gIiR0ZW1wZGlyL2RlZmF1bHRzX3Rhcl9mb3JtYXQuc3FsIiwKLQkJCSctLXdpdGgt c3RhdGlzdGljcycsCisJCQknLS1zdGF0aXN0aWNzJywKIAkJCSIkdGVtcGRpci9kZWZhdWx0c190 YXJfZm9ybWF0LnRhciIsCiAJCV0sCiAJfSwKQEAgLTUxOCw3ICs1MTgsNyBAQCBteSAlcGdkdW1w X3J1bnMgPSAoCiAJCQkncGdfZHVtcCcsICctLW5vLXN5bmMnLAogCQkJJy0tZmlsZScgPT4gIiR0 ZW1wZGlyL2V4Y2x1ZGVfZHVtcF90ZXN0X3NjaGVtYS5zcWwiLAogCQkJJy0tZXhjbHVkZS1zY2hl bWEnID0+ICdkdW1wX3Rlc3QnLAotCQkJJy0td2l0aC1zdGF0aXN0aWNzJywKKwkJCSctLXN0YXRp c3RpY3MnLAogCQkJJ3Bvc3RncmVzJywKIAkJXSwKIAl9LApAQCAtNTI3LDcgKzUyNyw3IEBAIG15 ICVwZ2R1bXBfcnVucyA9ICgKIAkJCSdwZ19kdW1wJywgJy0tbm8tc3luYycsCiAJCQknLS1maWxl JyA9PiAiJHRlbXBkaXIvZXhjbHVkZV90ZXN0X3RhYmxlLnNxbCIsCiAJCQknLS1leGNsdWRlLXRh YmxlJyA9PiAnZHVtcF90ZXN0LnRlc3RfdGFibGUnLAotCQkJJy0td2l0aC1zdGF0aXN0aWNzJywK KwkJCSctLXN0YXRpc3RpY3MnLAogCQkJJ3Bvc3RncmVzJywKIAkJXSwKIAl9LApAQCAtNTM2LDcg KzUzNiw3IEBAIG15ICVwZ2R1bXBfcnVucyA9ICgKIAkJCSdwZ19kdW1wJywgJy0tbm8tc3luYycs CiAJCQknLS1maWxlJyA9PiAiJHRlbXBkaXIvZXhjbHVkZV9tZWFzdXJlbWVudC5zcWwiLAogCQkJ Jy0tZXhjbHVkZS10YWJsZS1hbmQtY2hpbGRyZW4nID0+ICdkdW1wX3Rlc3QubWVhc3VyZW1lbnQn LAotCQkJJy0td2l0aC1zdGF0aXN0aWNzJywKKwkJCSctLXN0YXRpc3RpY3MnLAogCQkJJ3Bvc3Rn cmVzJywKIAkJXSwKIAl9LApAQCAtNTQ2LDcgKzU0Niw3IEBAIG15ICVwZ2R1bXBfcnVucyA9ICgK IAkJCSctLWZpbGUnID0+ICIkdGVtcGRpci9leGNsdWRlX21lYXN1cmVtZW50X2RhdGEuc3FsIiwK IAkJCSctLWV4Y2x1ZGUtdGFibGUtZGF0YS1hbmQtY2hpbGRyZW4nID0+ICdkdW1wX3Rlc3QubWVh c3VyZW1lbnQnLAogCQkJJy0tbm8tdW5sb2dnZWQtdGFibGUtZGF0YScsCi0JCQknLS13aXRoLXN0 YXRpc3RpY3MnLAorCQkJJy0tc3RhdGlzdGljcycsCiAJCQkncG9zdGdyZXMnLAogCQldLAogCX0s CkBAIC01NTYsNyArNTU2LDcgQEAgbXkgJXBnZHVtcF9ydW5zID0gKAogCQkJJy0tZmlsZScgPT4g IiR0ZW1wZGlyL2V4Y2x1ZGVfdGVzdF90YWJsZV9kYXRhLnNxbCIsCiAJCQknLS1leGNsdWRlLXRh YmxlLWRhdGEnID0+ICdkdW1wX3Rlc3QudGVzdF90YWJsZScsCiAJCQknLS1uby11bmxvZ2dlZC10 YWJsZS1kYXRhJywKLQkJCSctLXdpdGgtc3RhdGlzdGljcycsCisJCQknLS1zdGF0aXN0aWNzJywK IAkJCSdwb3N0Z3JlcycsCiAJCV0sCiAJfSwKQEAgLTU3NSw3ICs1NzUsNyBAQCBteSAlcGdkdW1w X3J1bnMgPSAoCiAJCQknLS1maWxlJyA9PiAiJHRlbXBkaXIvcGdfZHVtcGFsbF9nbG9iYWxzLnNx bCIsCiAJCQknLS1nbG9iYWxzLW9ubHknLAogCQkJJy0tbm8tc3luYycsCi0JCQknLS13aXRoLXN0 YXRpc3RpY3MnLAorCQkJJy0tc3RhdGlzdGljcycsCiAJCV0sCiAJfSwKIAlwZ19kdW1wYWxsX2ds b2JhbHNfY2xlYW4gPT4gewpAQCAtNTg1LDE0ICs1ODUsMTQgQEAgbXkgJXBnZHVtcF9ydW5zID0g KAogCQkJJy0tZ2xvYmFscy1vbmx5JywKIAkJCSctLWNsZWFuJywKIAkJCSctLW5vLXN5bmMnLAot CQkJJy0td2l0aC1zdGF0aXN0aWNzJywKKwkJCSctLXN0YXRpc3RpY3MnLAogCQldLAogCX0sCiAJ cGdfZHVtcGFsbF9kYnByaXZzID0+IHsKIAkJZHVtcF9jbWQgPT4gWwogCQkJJ3BnX2R1bXBhbGwn LCAnLS1uby1zeW5jJywKIAkJCSctLWZpbGUnID0+ICIkdGVtcGRpci9wZ19kdW1wYWxsX2RicHJp dnMuc3FsIiwKLQkJCSctLXdpdGgtc3RhdGlzdGljcycsCisJCQknLS1zdGF0aXN0aWNzJywKIAkJ XSwKIAl9LAogCXBnX2R1bXBhbGxfZXhjbHVkZSA9PiB7CkBAIC02MDIsNyArNjAyLDcgQEAgbXkg JXBnZHVtcF9ydW5zID0gKAogCQkJJy0tZmlsZScgPT4gIiR0ZW1wZGlyL3BnX2R1bXBhbGxfZXhj bHVkZS5zcWwiLAogCQkJJy0tZXhjbHVkZS1kYXRhYmFzZScgPT4gJypkdW1wX3Rlc3QqJywKIAkJ CSctLW5vLXN5bmMnLAotCQkJJy0td2l0aC1zdGF0aXN0aWNzJywKKwkJCSctLXN0YXRpc3RpY3Mn LAogCQldLAogCX0sCiAJbm9fdG9hc3RfY29tcHJlc3Npb24gPT4gewpAQCAtNjEwLDcgKzYxMCw3 IEBAIG15ICVwZ2R1bXBfcnVucyA9ICgKIAkJCSdwZ19kdW1wJywgJy0tbm8tc3luYycsCiAJCQkn LS1maWxlJyA9PiAiJHRlbXBkaXIvbm9fdG9hc3RfY29tcHJlc3Npb24uc3FsIiwKIAkJCSctLW5v LXRvYXN0LWNvbXByZXNzaW9uJywKLQkJCSctLXdpdGgtc3RhdGlzdGljcycsCisJCQknLS1zdGF0 aXN0aWNzJywKIAkJCSdwb3N0Z3JlcycsCiAJCV0sCiAJfSwKQEAgLTYxOSw3ICs2MTksNyBAQCBt eSAlcGdkdW1wX3J1bnMgPSAoCiAJCQkncGdfZHVtcCcsICctLW5vLXN5bmMnLAogCQkJJy0tZmls ZScgPT4gIiR0ZW1wZGlyL25vX2xhcmdlX29iamVjdHMuc3FsIiwKIAkJCSctLW5vLWxhcmdlLW9i amVjdHMnLAotCQkJJy0td2l0aC1zdGF0aXN0aWNzJywKKwkJCSctLXN0YXRpc3RpY3MnLAogCQkJ J3Bvc3RncmVzJywKIAkJXSwKIAl9LApAQCAtNjI4LDcgKzYyOCw3IEBAIG15ICVwZ2R1bXBfcnVu cyA9ICgKIAkJCSdwZ19kdW1wJywgJy0tbm8tc3luYycsCiAJCQknLS1maWxlJyA9PiAiJHRlbXBk aXIvbm9fcG9saWNpZXMuc3FsIiwKIAkJCSctLW5vLXBvbGljaWVzJywKLQkJCSctLXdpdGgtc3Rh dGlzdGljcycsCisJCQknLS1zdGF0aXN0aWNzJywKIAkJCSdwb3N0Z3JlcycsCiAJCV0sCiAJfSwK QEAgLTYzNyw3ICs2MzcsNyBAQCBteSAlcGdkdW1wX3J1bnMgPSAoCiAJCQkncGdfZHVtcCcsICct LW5vLXN5bmMnLAogCQkJJy0tZmlsZScgPT4gIiR0ZW1wZGlyL25vX3ByaXZzLnNxbCIsCiAJCQkn LS1uby1wcml2aWxlZ2VzJywKLQkJCSctLXdpdGgtc3RhdGlzdGljcycsCisJCQknLS1zdGF0aXN0 aWNzJywKIAkJCSdwb3N0Z3JlcycsCiAJCV0sCiAJfSwKQEAgLTY0Niw3ICs2NDYsNyBAQCBteSAl cGdkdW1wX3J1bnMgPSAoCiAJCQkncGdfZHVtcCcsICctLW5vLXN5bmMnLAogCQkJJy0tZmlsZScg PT4gIiR0ZW1wZGlyL25vX293bmVyLnNxbCIsCiAJCQknLS1uby1vd25lcicsCi0JCQknLS13aXRo LXN0YXRpc3RpY3MnLAorCQkJJy0tc3RhdGlzdGljcycsCiAJCQkncG9zdGdyZXMnLAogCQldLAog CX0sCkBAIC02NTUsNyArNjU1LDcgQEAgbXkgJXBnZHVtcF9ydW5zID0gKAogCQkJJ3BnX2R1bXAn LCAnLS1uby1zeW5jJywKIAkJCSctLWZpbGUnID0+ICIkdGVtcGRpci9ub190YWJsZV9hY2Nlc3Nf bWV0aG9kLnNxbCIsCiAJCQknLS1uby10YWJsZS1hY2Nlc3MtbWV0aG9kJywKLQkJCSctLXdpdGgt c3RhdGlzdGljcycsCisJCQknLS1zdGF0aXN0aWNzJywKIAkJCSdwb3N0Z3JlcycsCiAJCV0sCiAJ fSwKQEAgLTY2NCw3ICs2NjQsNyBAQCBteSAlcGdkdW1wX3J1bnMgPSAoCiAJCQkncGdfZHVtcCcs ICctLW5vLXN5bmMnLAogCQkJJy0tZmlsZScgPT4gIiR0ZW1wZGlyL29ubHlfZHVtcF90ZXN0X3Nj aGVtYS5zcWwiLAogCQkJJy0tc2NoZW1hJyA9PiAnZHVtcF90ZXN0JywKLQkJCSctLXdpdGgtc3Rh dGlzdGljcycsCisJCQknLS1zdGF0aXN0aWNzJywKIAkJCSdwb3N0Z3JlcycsCiAJCV0sCiAJfSwK QEAgLTY3NSw3ICs2NzUsNyBAQCBteSAlcGdkdW1wX3J1bnMgPSAoCiAJCQknLS10YWJsZScgPT4g J2R1bXBfdGVzdC50ZXN0X3RhYmxlJywKIAkJCSctLWxvY2std2FpdC10aW1lb3V0JyA9PgogCQkJ ICAoMTAwMCAqICRQb3N0Z3JlU1FMOjpUZXN0OjpVdGlsczo6dGltZW91dF9kZWZhdWx0KSwKLQkJ CSctLXdpdGgtc3RhdGlzdGljcycsCisJCQknLS1zdGF0aXN0aWNzJywKIAkJCSdwb3N0Z3Jlcycs CiAJCV0sCiAJfSwKQEAgLTY4Niw3ICs2ODYsNyBAQCBteSAlcGdkdW1wX3J1bnMgPSAoCiAJCQkn LS10YWJsZS1hbmQtY2hpbGRyZW4nID0+ICdkdW1wX3Rlc3QubWVhc3VyZW1lbnQnLAogCQkJJy0t bG9jay13YWl0LXRpbWVvdXQnID0+CiAJCQkgICgxMDAwICogJFBvc3RncmVTUUw6OlRlc3Q6OlV0 aWxzOjp0aW1lb3V0X2RlZmF1bHQpLAotCQkJJy0td2l0aC1zdGF0aXN0aWNzJywKKwkJCSctLXN0 YXRpc3RpY3MnLAogCQkJJ3Bvc3RncmVzJywKIAkJXSwKIAl9LApAQCAtNjk2LDcgKzY5Niw3IEBA IG15ICVwZ2R1bXBfcnVucyA9ICgKIAkJCSctLWZpbGUnID0+ICIkdGVtcGRpci9yb2xlLnNxbCIs CiAJCQknLS1yb2xlJyA9PiAncmVncmVzc19kdW1wX3Rlc3Rfcm9sZScsCiAJCQknLS1zY2hlbWEn ID0+ICdkdW1wX3Rlc3Rfc2Vjb25kX3NjaGVtYScsCi0JCQknLS13aXRoLXN0YXRpc3RpY3MnLAor CQkJJy0tc3RhdGlzdGljcycsCiAJCQkncG9zdGdyZXMnLAogCQldLAogCX0sCkBAIC03MDksMTMg KzcwOSwxMyBAQCBteSAlcGdkdW1wX3J1bnMgPSAoCiAJCQknLS1maWxlJyA9PiAiJHRlbXBkaXIv cm9sZV9wYXJhbGxlbCIsCiAJCQknLS1yb2xlJyA9PiAncmVncmVzc19kdW1wX3Rlc3Rfcm9sZScs CiAJCQknLS1zY2hlbWEnID0+ICdkdW1wX3Rlc3Rfc2Vjb25kX3NjaGVtYScsCi0JCQknLS13aXRo LXN0YXRpc3RpY3MnLAorCQkJJy0tc3RhdGlzdGljcycsCiAJCQkncG9zdGdyZXMnLAogCQldLAog CQlyZXN0b3JlX2NtZCA9PiBbCiAJCQkncGdfcmVzdG9yZScsCiAJCQknLS1maWxlJyA9PiAiJHRl bXBkaXIvcm9sZV9wYXJhbGxlbC5zcWwiLAotCQkJJy0td2l0aC1zdGF0aXN0aWNzJywKKwkJCSct LXN0YXRpc3RpY3MnLAogCQkJIiR0ZW1wZGlyL3JvbGVfcGFyYWxsZWwiLAogCQldLAogCX0sCkBA IC03NDQsNyArNzQ0LDcgQEAgbXkgJXBnZHVtcF9ydW5zID0gKAogCQkJJ3BnX2R1bXAnLCAnLS1u by1zeW5jJywKIAkJCSctLWZpbGUnID0+ICIkdGVtcGRpci9zZWN0aW9uX3ByZV9kYXRhLnNxbCIs CiAJCQknLS1zZWN0aW9uJyA9PiAncHJlLWRhdGEnLAotCQkJJy0td2l0aC1zdGF0aXN0aWNzJywK KwkJCSctLXN0YXRpc3RpY3MnLAogCQkJJ3Bvc3RncmVzJywKIAkJXSwKIAl9LApAQCAtNzUzLDcg Kzc1Myw3IEBAIG15ICVwZ2R1bXBfcnVucyA9ICgKIAkJCSdwZ19kdW1wJywgJy0tbm8tc3luYycs CiAJCQknLS1maWxlJyA9PiAiJHRlbXBkaXIvc2VjdGlvbl9kYXRhLnNxbCIsCiAJCQknLS1zZWN0 aW9uJyA9PiAnZGF0YScsCi0JCQknLS13aXRoLXN0YXRpc3RpY3MnLAorCQkJJy0tc3RhdGlzdGlj cycsCiAJCQkncG9zdGdyZXMnLAogCQldLAogCX0sCkBAIC03NjIsNyArNzYyLDcgQEAgbXkgJXBn ZHVtcF9ydW5zID0gKAogCQkJJ3BnX2R1bXAnLCAnLS1uby1zeW5jJywKIAkJCSctLWZpbGUnID0+ ICIkdGVtcGRpci9zZWN0aW9uX3Bvc3RfZGF0YS5zcWwiLAogCQkJJy0tc2VjdGlvbicgPT4gJ3Bv c3QtZGF0YScsCi0JCQknLS13aXRoLXN0YXRpc3RpY3MnLAorCQkJJy0tc3RhdGlzdGljcycsCiAJ CQkncG9zdGdyZXMnLAogCQldLAogCX0sCkBAIC03NzMsNyArNzczLDcgQEAgbXkgJXBnZHVtcF9y dW5zID0gKAogCQkJJy0tc2NoZW1hJyA9PiAnZHVtcF90ZXN0JywKIAkJCSctLWxhcmdlLW9iamVj dHMnLAogCQkJJy0tbm8tbGFyZ2Utb2JqZWN0cycsCi0JCQknLS13aXRoLXN0YXRpc3RpY3MnLAor CQkJJy0tc3RhdGlzdGljcycsCiAJCQkncG9zdGdyZXMnLAogCQldLAogCX0sCkBAIC03ODksNyAr Nzg5LDcgQEAgbXkgJXBnZHVtcF9ydW5zID0gKAogCQkJJ3BnX2R1bXAnLCAnLS1uby1zeW5jJywK IAkJCSItLWZpbGU9JHRlbXBkaXIvbm9fZGF0YV9ub19zY2hlbWEuc3FsIiwgJy0tbm8tZGF0YScs CiAJCQknLS1uby1zY2hlbWEnLCAncG9zdGdyZXMnLAotCQkJJy0td2l0aC1zdGF0aXN0aWNzJywK KwkJCSctLXN0YXRpc3RpY3MnLAogCQldLAogCX0sCiAJc3RhdGlzdGljc19vbmx5ID0+IHsKQEAg LTgwMyw3ICs4MDMsNyBAQCBteSAlcGdkdW1wX3J1bnMgPSAoCiAJCWR1bXBfY21kID0+IFsKIAkJ CSdwZ19kdW1wJywgJy0tbm8tc3luYycsCiAJCQkiLS1maWxlPSR0ZW1wZGlyL25vX3NjaGVtYS5z cWwiLCAnLS1uby1zY2hlbWEnLAotCQkJJy0td2l0aC1zdGF0aXN0aWNzJywgJ3Bvc3RncmVzJywK KwkJCSctLXN0YXRpc3RpY3MnLCAncG9zdGdyZXMnLAogCQldLAogCX0sKTsKIApAQCAtNTIwNiwx MCArNTIwNiwxMCBAQCBjb21tYW5kX2ZhaWxzX2xpa2UoCiAJCSctLXBvcnQnID0+ICRwb3J0LAog CQknLS1zdHJpY3QtbmFtZXMnLAogCQknLS1zY2hlbWEtb25seScsCi0JCSctLXdpdGgtc3RhdGlz dGljcycsCisJCSctLXN0YXRpc3RpY3MnLAogCV0sCi0JcXIvXFFwZ19kdW1wOiBlcnJvcjogb3B0 aW9ucyAtc1wvLS1zY2hlbWEtb25seSBhbmQgLS13aXRoLXN0YXRpc3RpY3MgY2Fubm90IGJlIHVz ZWQgdG9nZXRoZXJcRS8sCi0JJ2Nhbm5vdCB1c2UgLS1zY2hlbWEtb25seSBhbmQgLS13aXRoLXN0 YXRpc3RpY3MgdG9nZXRoZXInKTsKKwlxci9cUXBnX2R1bXA6IGVycm9yOiBvcHRpb25zIC1zXC8t LXNjaGVtYS1vbmx5IGFuZCAtLXN0YXRpc3RpY3MgY2Fubm90IGJlIHVzZWQgdG9nZXRoZXJcRS8s CisJJ2Nhbm5vdCB1c2UgLS1zY2hlbWEtb25seSBhbmQgLS1zdGF0aXN0aWNzIHRvZ2V0aGVyJyk7 CiAKIGNvbW1hbmRfZmFpbHNfbGlrZSgKIAlbCmRpZmYgLS1naXQgYS9zcmMvYmluL3BnX3VwZ3Jh ZGUvZHVtcC5jIGIvc3JjL2Jpbi9wZ191cGdyYWRlL2R1bXAuYwppbmRleCAxODNmMDhjZTFlOC4u NTVmNmU3YjRkOWMgMTAwNjQ0Ci0tLSBhL3NyYy9iaW4vcGdfdXBncmFkZS9kdW1wLmMKKysrIGIv c3JjL2Jpbi9wZ191cGdyYWRlL2R1bXAuYwpAQCAtNTgsNyArNTgsNyBAQCBnZW5lcmF0ZV9vbGRf ZHVtcCh2b2lkKQogCQkJCQkJICAgKHVzZXJfb3B0cy50cmFuc2Zlcl9tb2RlID09IFRSQU5TRkVS X01PREVfU1dBUCkgPwogCQkJCQkJICAgIiIgOiAiLS1zZXF1ZW5jZS1kYXRhIiwKIAkJCQkJCSAg IGxvZ19vcHRzLnZlcmJvc2UgPyAiLS12ZXJib3NlIiA6ICIiLAotCQkJCQkJICAgdXNlcl9vcHRz LmRvX3N0YXRpc3RpY3MgPyAiLS13aXRoLXN0YXRpc3RpY3MiIDogIi0tbm8tc3RhdGlzdGljcyIs CisJCQkJCQkgICB1c2VyX29wdHMuZG9fc3RhdGlzdGljcyA/ICItLXN0YXRpc3RpY3MiIDogIi0t bm8tc3RhdGlzdGljcyIsCiAJCQkJCQkgICBsb2dfb3B0cy5kdW1wZGlyLAogCQkJCQkJICAgc3Fs X2ZpbGVfbmFtZSwgZXNjYXBlZF9jb25uc3RyLmRhdGEpOwogCi0tIAoyLjQzLjAKCg== --=-rl/r3914TSywKFHvIf7A--