From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id GO16IHtHbGSmdQEASxT56A (envelope-from ) for ; Tue, 23 May 2023 06:56:27 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id MJ+2H3tHbGRenQAAG6o9tA (envelope-from ) for ; Tue, 23 May 2023 06:56:27 +0200 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 1956227782 for ; Tue, 23 May 2023 06:56:26 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q1K46-0007AT-NW; Tue, 23 May 2023 00:56:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q1K42-000784-96 for guix-patches@gnu.org; Tue, 23 May 2023 00:56:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q1K42-0005gf-1G for guix-patches@gnu.org; Tue, 23 May 2023 00:56:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q1K41-0006h3-TP for guix-patches@gnu.org; Tue, 23 May 2023 00:56:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51512] [PATCH v6 2/3]: gnu: Add guile-bash-for-bash-coding-utils Resent-From: david larsson Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 23 May 2023 04:56:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51512 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51512@debbugs.gnu.org Cc: Guix-patches Received: via spool by 51512-submit@debbugs.gnu.org id=B51512.168481773725587 (code B ref 51512); Tue, 23 May 2023 04:56:01 +0000 Received: (at 51512) by debbugs.gnu.org; 23 May 2023 04:55:37 +0000 Received: from localhost ([127.0.0.1]:37859 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1K3c-0006eW-Ft for submit@debbugs.gnu.org; Tue, 23 May 2023 00:55:37 -0400 Received: from server0.selfhosted.xyz ([217.64.149.7]:57360) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1K3a-0006da-AH for 51512@debbugs.gnu.org; Tue, 23 May 2023 00:55:35 -0400 Received: from server0.selfhosted.xyz (localhost [127.0.0.1]) by server0.selfhosted.xyz (Postfix) with ESMTP id A07C830F86C8; Tue, 23 May 2023 06:55:22 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=selfhosted.xyz; s=dkim; t=1684817728; bh=TqaoM/wXK5PVSZghVaLfAwBJYDKNb+CxnGiowDbWRfE=; h=Date:From:To:Cc:Subject:In-Reply-To:References; b=A7lb0pg4zfLS9DI3DIVE1qM2xUiCnj37deaEbwD14NhXrvuzJzJLFSuwVQz0MKP48 50KaRaoiJxUqobxfjTvSP3ovXH2/DorsXhBUfQ5G1mEspzY1L0e6o/dIdbeRQrtd2Y s2ihbsCGwrCognmWuXZHZmRAKbTRqFu7Pz61+momLdxIk1WYxWOVYSQajDAWDe83DK 1dXHKAfKa6aRJBuvfINloQ88qb+ir2WmIEgTpCCnQufoOduXr+QpYkuBNWaNtxWw5J k/7W9tYlXaRf7n6tkfzX0k5aW2JoixxhPZW0BaOtqZDBgDHKn6nIr0lbvBjPLimnVp BV/fEEmYuEULg== X-Fuglu-Suspect: d4af105c0b03435dbedbbfbe74ffab31 X-Fuglu-Spamstatus: NO Received: from webmail.selfhosted.xyz (office.selfhosted.xyz [192.168.1.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: mail@selfhosted.xyz) by server0.selfhosted.xyz (Postfix) with ESMTPSA; Tue, 23 May 2023 06:55:22 +0200 (CEST) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=_01654cc7d55441bb2d5484f056a01023" Date: Tue, 23 May 2023 06:55:22 +0200 From: david larsson In-Reply-To: <3add15b77522d6e9ebd715a19d966666@selfhosted.xyz> References: <3add15b77522d6e9ebd715a19d966666@selfhosted.xyz> Message-ID: X-Sender: david.larsson@selfhosted.xyz 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-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1684817787; a=rsa-sha256; cv=none; b=f603m0Ui9sCtPmV7CYfn4Uc1Ot8faakacWyrv3nySLQ7tMLS4S5/97oMQxxxhrnTJ5AQdw EwQ3ws8QrKc/9Sy5ALEw8I8mvnUFECAwGiCpzVII3dOU9igmAlA5ulmpS1cPz5OVWYbrNL B05AKhfIhLi3khKWzRTyhaFag4UhJJseHKPP4ELmhT9B6RsvFB4M6DHA/VH5vE0ela9SyE LD8XLdxBiWZhh4Fy5+phOAZETswbBtvpLA0vFqMYG/fHm7iD2c5DDHYXiFvIxoJmN2pvfU kcMxy/9NB9xcIU+iFUYdwQ2YnJeBfbhxMpNs0oXI62f1qnaVLIdZJi7oCY/KnA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=selfhosted.xyz header.s=dkim header.b=A7lb0pg4; dmarc=fail reason="SPF not aligned (relaxed)" header.from=selfhosted.xyz (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1684817787; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=TqaoM/wXK5PVSZghVaLfAwBJYDKNb+CxnGiowDbWRfE=; b=D2GNCDALShF4/U4jivNDqmJ5wnr7+8ESMJWBtzpnVZe0B7UBh+6U/KuWu1Ta6oZon/g3ta nFJg8S0/mNCcc9S9jUyc9xLby9QsDcyW/WwUWjaPt3ApsVyM7l26TyTrwoKohnpnNJ/MCC SD354Sxg0JTaiYJf52uHIycHaAvZAY4lHf+IdzzLoFRnouhKDUnqJTsFOqOL6cnFcwAvY2 tOpbkjaVa5aciYqpYuMX4KkndDencsAgRV6dYCx4KLrjl+20uTrD7FS9aXvnVUTFLE9XOU V+RgJ0m2GPTNUE/YHUBgvxGAPqxx7ICHpuCik86q7ffC1XNIuf/RDEvh4MVHjg== X-Migadu-Spam-Score: -2.57 X-Spam-Score: -2.57 X-Migadu-Queue-Id: 1956227782 X-Migadu-Scanner: scn0.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=selfhosted.xyz header.s=dkim header.b=A7lb0pg4; dmarc=fail reason="SPF not aligned (relaxed)" header.from=selfhosted.xyz (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-TUID: 6RLOiREhxK/P --=_01654cc7d55441bb2d5484f056a01023 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; format=flowed From 7f2df5fd5b6ec44170b44ac74cae554405d939b6 Mon Sep 17 00:00:00 2001 From: David Larsson Date: Tue, 23 May 2023 05:38:36 +0200 Subject: [PATCH 2/3] gnu: Add guile-bash-for-bash-coding-utils * gnu/packages/bash.scm (guile-bash-for-bash-coding-utils): New variable. --- gnu/local.mk | 1 + gnu/packages/bash.scm | 34 +++++++++++++++ .../patches/guile-bash-args-from-stdin.patch | 42 +++++++++++++++++++ 3 files changed, 77 insertions(+) create mode 100644 gnu/packages/patches/guile-bash-args-from-stdin.patch diff --git a/gnu/local.mk b/gnu/local.mk index c10fb01bb3..1db38d093c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1302,6 +1302,7 @@ dist_patch_DATA = \ %D%/packages/patches/guile-1.8-cpp-4.5.patch \ %D%/packages/patches/guile-2.2-skip-oom-test.patch \ %D%/packages/patches/guile-2.2-skip-so-test.patch \ + %D%/packages/patches/guile-bash-args-from-stdin.patch \ %D%/packages/patches/guile-default-utf8.patch \ %D%/packages/patches/guile-2.2-default-utf8.patch \ %D%/packages/patches/guile-relocatable.patch \ diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index 1650fdeb72..64d6e8d65e 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm @@ -40,6 +40,7 @@ (define-module (gnu packages bash) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages guile) + #:use-module (gnu packages guile-xyz) #:use-module (gnu packages version-control) #:use-module (gnu packages less) #:use-module (guix packages) @@ -540,3 +541,36 @@ (define-public pydaemon back as strings. Can be used over either of a unix or tcp socket.") (home-page "https://gitlab.com/methuselah-0/pydaemon") (license license:gpl3)))) + +(define-public guile-bash-for-bash-coding-utils + (let ((commit "1eabc563ca5692b3e08d84f1f0e6fd2283284469") + (revision "0")) + (package + (inherit guile2.0-bash) + (version (string-append "0.1.6-" revision "." (string-take commit 7))) + (name "guile-bash-for-bash-coding-utils") + (home-page (package-home-page guile2.0-bash)) + (source (origin + (method git-fetch) + (uri (git-reference + (commit commit) + (url home-page))) + (sha256 + (base32 + "097vny990wp2qpjij6a5a5gwc6fxzg5wk56inhy18iki5v6pif1p")) + (file-name (string-append name "-" version "-checkout")) + (patches (search-patches "guile-bash-args-from-stdin.patch")))) + (arguments (substitute-keyword-arguments (package-arguments guile2.0-bash) + ((#:tests? _ #f) #f) + ((#:phases phases #~%standard-phases) + #~(modify-phases #$phases + (add-after 'install 'install-guile + (lambda* (#:key inputs outputs #:allow-other-keys) + (copy-recursively + (string-append (assoc-ref outputs "out") + (assoc-ref inputs "guile") "/share") + (string-append (assoc-ref outputs "out") "/share")) + #t)))))) + (inputs (modify-inputs (package-inputs guile2.0-bash) + (replace "guile" guile-3.0-latest))) + (propagated-inputs (list bash))))) diff --git a/gnu/packages/patches/guile-bash-args-from-stdin.patch b/gnu/packages/patches/guile-bash-args-from-stdin.patch new file mode 100644 index 0000000000..ad42616c70 --- /dev/null +++ b/gnu/packages/patches/guile-bash-args-from-stdin.patch @@ -0,0 +1,42 @@ +From a124921666a16cb4e93f59a653f98b99c78eb2ca Mon Sep 17 00:00:00 2001 +From: David Larsson +Date: Thu, 11 Nov 2021 14:07:04 +0100 +Subject: [PATCH] Enable reading arguments from bash via stdin + +* lisp/gnu/bash.scm(define-bash-function): read from stdin +to SCM_ARGS array when it is open, and separate args by null +instead of newline if -z option is passed as $1. +--- + lisp/gnu/bash.scm | 16 ++++++++++++---- + 1 file changed, 12 insertions(+), 4 deletions(-) + +diff --git a/lisp/gnu/bash.scm b/lisp/gnu/bash.scm +index 199ebc0..e9dcea5 100644 +--- a/lisp/gnu/bash.scm ++++ b/lisp/gnu/bash.scm +@@ -326,10 +326,18 @@ + (hashq-set! *funcs* symbol thunk) + (unsafe-format/eval + "function ~a { +- SCM_ARGS=($@) ; +- local retval=$~a ; +- unset SCM_ARGS ; +- return $retval ; ++ local -a Input SCM_ARGS ; ++ [[ ! -t 0 ]] && mapfile -d '' Input ; ++ if [[ -n \"${Input[@]}\" ]]; then ++ if [[ \"$1\" == -z ]]; then ++ local -a SCM_ARGS=\"(${Input[*]@Q})\" ; ++ else ++ mapfile -t SCM_ARGS < <(printf '%s' \"${Input[@]}\"); fi ; ++ else ++ SCM_ARGS=(\"$@\"); fi ; ++ local retval=$~a ; ++ unset SCM_ARGS ; ++ return $retval ; + }" + symbol special-varname)))) + +-- +2.31.0 + -- 2.39.1 --=_01654cc7d55441bb2d5484f056a01023 Content-Transfer-Encoding: base64 Content-Type: text/x-diff; name=0002-gnu-Add-guile-bash-for-bash-coding-utils.patch Content-Disposition: attachment; filename=0002-gnu-Add-guile-bash-for-bash-coding-utils.patch; size=5533 RnJvbSA3ZjJkZjVmZDViNmVjNDQxNzBiNDRhYzc0Y2FlNTU0NDA1ZDkzOWI2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEYXZpZCBMYXJzc29uIDxkYXZpZC5sYXJzc29uQHNlbGZob3N0 ZWQueHl6PgpEYXRlOiBUdWUsIDIzIE1heSAyMDIzIDA1OjM4OjM2ICswMjAwClN1YmplY3Q6IFtQ QVRDSCAyLzNdIGdudTogQWRkIGd1aWxlLWJhc2gtZm9yLWJhc2gtY29kaW5nLXV0aWxzCgoqIGdu dS9wYWNrYWdlcy9iYXNoLnNjbSAoZ3VpbGUtYmFzaC1mb3ItYmFzaC1jb2RpbmctdXRpbHMpOiBO ZXcgdmFyaWFibGUuCi0tLQogZ251L2xvY2FsLm1rICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHwgIDEgKwogZ251L3BhY2thZ2VzL2Jhc2guc2NtICAgICAgICAgICAgICAgICAgICAg ICAgIHwgMzQgKysrKysrKysrKysrKysrCiAuLi4vcGF0Y2hlcy9ndWlsZS1iYXNoLWFyZ3MtZnJv bS1zdGRpbi5wYXRjaCAgfCA0MiArKysrKysrKysrKysrKysrKysrCiAzIGZpbGVzIGNoYW5nZWQs IDc3IGluc2VydGlvbnMoKykKIGNyZWF0ZSBtb2RlIDEwMDY0NCBnbnUvcGFja2FnZXMvcGF0Y2hl cy9ndWlsZS1iYXNoLWFyZ3MtZnJvbS1zdGRpbi5wYXRjaAoKZGlmZiAtLWdpdCBhL2dudS9sb2Nh bC5tayBiL2dudS9sb2NhbC5tawppbmRleCBjMTBmYjAxYmIzLi4xZGIzOGQwOTNjIDEwMDY0NAot LS0gYS9nbnUvbG9jYWwubWsKKysrIGIvZ251L2xvY2FsLm1rCkBAIC0xMzAyLDYgKzEzMDIsNyBA QCBkaXN0X3BhdGNoX0RBVEEgPQkJCQkJCVwKICAgJUQlL3BhY2thZ2VzL3BhdGNoZXMvZ3VpbGUt MS44LWNwcC00LjUucGF0Y2gJCQlcCiAgICVEJS9wYWNrYWdlcy9wYXRjaGVzL2d1aWxlLTIuMi1z a2lwLW9vbS10ZXN0LnBhdGNoICAgICAgICAgICAgXAogICAlRCUvcGFja2FnZXMvcGF0Y2hlcy9n dWlsZS0yLjItc2tpcC1zby10ZXN0LnBhdGNoICAgICAgICAgICAgIFwKKyAgJUQlL3BhY2thZ2Vz L3BhdGNoZXMvZ3VpbGUtYmFzaC1hcmdzLWZyb20tc3RkaW4ucGF0Y2gJCVwKICAgJUQlL3BhY2th Z2VzL3BhdGNoZXMvZ3VpbGUtZGVmYXVsdC11dGY4LnBhdGNoCQkJXAogICAlRCUvcGFja2FnZXMv cGF0Y2hlcy9ndWlsZS0yLjItZGVmYXVsdC11dGY4LnBhdGNoCQlcCiAgICVEJS9wYWNrYWdlcy9w YXRjaGVzL2d1aWxlLXJlbG9jYXRhYmxlLnBhdGNoCQkJXApkaWZmIC0tZ2l0IGEvZ251L3BhY2th Z2VzL2Jhc2guc2NtIGIvZ251L3BhY2thZ2VzL2Jhc2guc2NtCmluZGV4IDE2NTBmZGViNzIuLjY0 ZDZlOGQ2NWUgMTAwNjQ0Ci0tLSBhL2dudS9wYWNrYWdlcy9iYXNoLnNjbQorKysgYi9nbnUvcGFj a2FnZXMvYmFzaC5zY20KQEAgLTQwLDYgKzQwLDcgQEAgKGRlZmluZS1tb2R1bGUgKGdudSBwYWNr YWdlcyBiYXNoKQogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBwa2ctY29uZmlnKQogICAj OnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBweXRob24pCiAgICM6dXNlLW1vZHVsZSAoZ251IHBh Y2thZ2VzIGd1aWxlKQorICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBndWlsZS14eXopCiAg ICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIHZlcnNpb24tY29udHJvbCkKICAgIzp1c2UtbW9k dWxlIChnbnUgcGFja2FnZXMgbGVzcykKICAgIzp1c2UtbW9kdWxlIChndWl4IHBhY2thZ2VzKQpA QCAtNTQwLDMgKzU0MSwzNiBAQCAoZGVmaW5lLXB1YmxpYyBweWRhZW1vbgogYmFjayBhcyBzdHJp bmdzLiAgQ2FuIGJlIHVzZWQgb3ZlciBlaXRoZXIgb2YgYSB1bml4IG9yIHRjcCBzb2NrZXQuIikK ICAgICAgIChob21lLXBhZ2UgImh0dHBzOi8vZ2l0bGFiLmNvbS9tZXRodXNlbGFoLTAvcHlkYWVt b24iKQogICAgICAgKGxpY2Vuc2UgbGljZW5zZTpncGwzKSkpKQorCisoZGVmaW5lLXB1YmxpYyBn dWlsZS1iYXNoLWZvci1iYXNoLWNvZGluZy11dGlscworICAobGV0ICgoY29tbWl0ICIxZWFiYzU2 M2NhNTY5MmIzZTA4ZDg0ZjFmMGU2ZmQyMjgzMjg0NDY5IikKKyAgICAgICAgKHJldmlzaW9uICIw IikpCisgICAgKHBhY2thZ2UKKyAgICAgIChpbmhlcml0IGd1aWxlMi4wLWJhc2gpCisgICAgICAo dmVyc2lvbiAoc3RyaW5nLWFwcGVuZCAiMC4xLjYtIiByZXZpc2lvbiAiLiIgKHN0cmluZy10YWtl IGNvbW1pdCA3KSkpCisgICAgICAobmFtZSAiZ3VpbGUtYmFzaC1mb3ItYmFzaC1jb2RpbmctdXRp bHMiKQorICAgICAgKGhvbWUtcGFnZSAocGFja2FnZS1ob21lLXBhZ2UgZ3VpbGUyLjAtYmFzaCkp CisgICAgICAoc291cmNlIChvcmlnaW4KKyAgICAgICAgICAgICAgICAobWV0aG9kIGdpdC1mZXRj aCkKKyAgICAgICAgICAgICAgICAodXJpIChnaXQtcmVmZXJlbmNlCisgICAgICAgICAgICAgICAg ICAgICAgKGNvbW1pdCBjb21taXQpCisgICAgICAgICAgICAgICAgICAgICAgKHVybCBob21lLXBh Z2UpKSkKKyAgICAgICAgICAgICAgICAoc2hhMjU2CisgICAgICAgICAgICAgICAgIChiYXNlMzIK KyAgICAgICAgICAgICAgICAgICIwOTd2bnk5OTB3cDJxcGppajZhNWE1Z3djNmZ4emc1d2s1Nmlu aHkxOGlraTV2NnBpZjFwIikpCisgICAgICAgICAgICAgICAgKGZpbGUtbmFtZSAoc3RyaW5nLWFw cGVuZCBuYW1lICItIiB2ZXJzaW9uICItY2hlY2tvdXQiKSkKKyAgICAgICAgICAgICAgICAocGF0 Y2hlcyAoc2VhcmNoLXBhdGNoZXMgImd1aWxlLWJhc2gtYXJncy1mcm9tLXN0ZGluLnBhdGNoIikp KSkKKyAgICAgIChhcmd1bWVudHMgKHN1YnN0aXR1dGUta2V5d29yZC1hcmd1bWVudHMgKHBhY2th Z2UtYXJndW1lbnRzIGd1aWxlMi4wLWJhc2gpCisgICAgICAgICAgICAgICAgICAgKCgjOnRlc3Rz PyBfICNmKSAjZikKKyAgICAgICAgICAgICAgICAgICAoKCM6cGhhc2VzIHBoYXNlcyAjfiVzdGFu ZGFyZC1waGFzZXMpCisgICAgICAgICAgICAgICAgICAgICN+KG1vZGlmeS1waGFzZXMgIyRwaGFz ZXMKKyAgICAgICAgICAgICAgICAgICAgICAgIChhZGQtYWZ0ZXIgJ2luc3RhbGwgJ2luc3RhbGwt Z3VpbGUKKyAgICAgICAgICAgICAgICAgICAgICAgICAgKGxhbWJkYSogKCM6a2V5IGlucHV0cyBv dXRwdXRzICM6YWxsb3ctb3RoZXIta2V5cykKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAo Y29weS1yZWN1cnNpdmVseQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoc3RyaW5nLWFw cGVuZCAoYXNzb2MtcmVmIG91dHB1dHMgIm91dCIpCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIChhc3NvYy1yZWYgaW5wdXRzICJndWlsZSIpICIvc2hhcmUiKQor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoc3RyaW5nLWFwcGVuZCAoYXNzb2MtcmVmIG91 dHB1dHMgIm91dCIpICIvc2hhcmUiKSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAjdCkp KSkpKQorICAgICAgKGlucHV0cyAobW9kaWZ5LWlucHV0cyAocGFja2FnZS1pbnB1dHMgZ3VpbGUy LjAtYmFzaCkKKyAgICAgICAgICAgICAgICAocmVwbGFjZSAiZ3VpbGUiIGd1aWxlLTMuMC1sYXRl c3QpKSkKKyAgICAgIChwcm9wYWdhdGVkLWlucHV0cyAobGlzdCBiYXNoKSkpKSkKZGlmZiAtLWdp dCBhL2dudS9wYWNrYWdlcy9wYXRjaGVzL2d1aWxlLWJhc2gtYXJncy1mcm9tLXN0ZGluLnBhdGNo IGIvZ251L3BhY2thZ2VzL3BhdGNoZXMvZ3VpbGUtYmFzaC1hcmdzLWZyb20tc3RkaW4ucGF0Y2gK bmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMC4uYWQ0MjYxNmM3MAotLS0gL2Rl di9udWxsCisrKyBiL2dudS9wYWNrYWdlcy9wYXRjaGVzL2d1aWxlLWJhc2gtYXJncy1mcm9tLXN0 ZGluLnBhdGNoCkBAIC0wLDAgKzEsNDIgQEAKK0Zyb20gYTEyNDkyMTY2NmExNmNiNGU5M2Y1OWE2 NTNmOThiOTljNzhlYjJjYSBNb24gU2VwIDE3IDAwOjAwOjAwIDIwMDEKK0Zyb206IERhdmlkIExh cnNzb24gPGRhdmlkLmxhcnNzb25Ac2VsZmhvc3RlZC54eXo+CitEYXRlOiBUaHUsIDExIE5vdiAy MDIxIDE0OjA3OjA0ICswMTAwCitTdWJqZWN0OiBbUEFUQ0hdIEVuYWJsZSByZWFkaW5nIGFyZ3Vt ZW50cyBmcm9tIGJhc2ggdmlhIHN0ZGluCisKKyogbGlzcC9nbnUvYmFzaC5zY20oZGVmaW5lLWJh c2gtZnVuY3Rpb24pOiByZWFkIGZyb20gc3RkaW4KK3RvIFNDTV9BUkdTIGFycmF5IHdoZW4gaXQg aXMgb3BlbiwgYW5kIHNlcGFyYXRlIGFyZ3MgYnkgbnVsbAoraW5zdGVhZCBvZiBuZXdsaW5lIGlm IC16IG9wdGlvbiBpcyBwYXNzZWQgYXMgJDEuCistLS0KKyBsaXNwL2dudS9iYXNoLnNjbSB8IDE2 ICsrKysrKysrKysrKy0tLS0KKyAxIGZpbGUgY2hhbmdlZCwgMTIgaW5zZXJ0aW9ucygrKSwgNCBk ZWxldGlvbnMoLSkKKworZGlmZiAtLWdpdCBhL2xpc3AvZ251L2Jhc2guc2NtIGIvbGlzcC9nbnUv YmFzaC5zY20KK2luZGV4IDE5OWViYzAuLmU5ZGNlYTUgMTAwNjQ0CistLS0gYS9saXNwL2dudS9i YXNoLnNjbQorKysrIGIvbGlzcC9nbnUvYmFzaC5zY20KK0BAIC0zMjYsMTAgKzMyNiwxOCBAQAor ICAgICAgIChoYXNocS1zZXQhICpmdW5jcyogc3ltYm9sIHRodW5rKQorICAgICAgICh1bnNhZmUt Zm9ybWF0L2V2YWwKKyAgICAgICAgImZ1bmN0aW9uIH5hIHsKKy0gICAgICAgICAgICBTQ01fQVJH Uz0oJEApICAgIDsKKy0gICAgICAgICAgICBsb2NhbCByZXR2YWw9JH5hIDsKKy0gICAgICAgICAg ICB1bnNldCBTQ01fQVJHUyAgIDsKKy0gICAgICAgICAgICByZXR1cm4gJHJldHZhbCAgIDsKKysg ICAgICAgICAgICBsb2NhbCAtYSBJbnB1dCBTQ01fQVJHUyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIDsKKysgICAgICAgICAgICBbWyAhIC10IDAgXV0gJiYgbWFwZmls ZSAtZCAnJyBJbnB1dCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDsKKysgICAgICAgICAg ICBpZiBbWyAtbiBcIiR7SW5wdXRbQF19XCIgXV07IHRoZW4KKysgICAgICAgICAgICAgICAgaWYg W1sgXCIkMVwiID09IC16IF1dOyB0aGVuCisrICAgICAgICAgICAgICAgICAgICBsb2NhbCAtYSBT Q01fQVJHUz1cIigke0lucHV0WypdQFF9KVwiICAgICAgICAgICAgICAgICAgICA7CisrICAgICAg ICAgICAgICAgIGVsc2UKKysgICAgICAgICAgICAgICAgICAgIG1hcGZpbGUgLXQgU0NNX0FSR1Mg PCA8KHByaW50ZiAnJXMnIFwiJHtJbnB1dFtAXX1cIik7IGZpIDsKKysgICAgICAgICAgICBlbHNl CisrICAgICAgICAgICAgICAgIFNDTV9BUkdTPShcIiRAXCIpOyBmaSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICA7CisrICAgICAgICAgICAgbG9jYWwgcmV0dmFsPSR+YSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA7CisrICAgICAg ICAgICAgdW5zZXQgU0NNX0FSR1MgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICA7CisrICAgICAgICAgICAgcmV0dXJuICRyZXR2YWwgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA7CisgICAgICAgIH0iCisgICAg ICAgIHN5bWJvbCBzcGVjaWFsLXZhcm5hbWUpKSkpCisgCistLSAKKzIuMzEuMAorCi0tIAoyLjM5 LjEKCg== --=_01654cc7d55441bb2d5484f056a01023--