From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Kangas Newsgroups: gmane.emacs.bugs Subject: bug#72453: 29.4; "use-package" macro does not load all expected related files Date: Sun, 18 Aug 2024 11:21:40 +0000 Message-ID: References: <87plqp9slr.fsf@priss.frightenedpiglet.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="0000000000009158ab061ff3653d" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="36723"; mail-complaints-to="usenet@ciao.gmane.io" To: Derek Upham , 72453@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Aug 18 13:23:52 2024 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1sfe0l-0009QZ-Q6 for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 18 Aug 2024 13:23:51 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sfe0K-0007ec-3L; Sun, 18 Aug 2024 07:23:24 -0400 Original-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 1sfe0I-0007eP-KF for bug-gnu-emacs@gnu.org; Sun, 18 Aug 2024 07:23:23 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sfe0I-0006w2-26 for bug-gnu-emacs@gnu.org; Sun, 18 Aug 2024 07:23:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=Date:MIME-Version:References:In-Reply-To:From:To:Subject; bh=jceeZFJDCuuLMZ8ED3ULdQM7n7ZXgEBPQWsuUw/6jT0=; b=NamqXiAO2CljAhpFy7apMADisyUkAR/eYJdhUM00oPCIINBGbNdawPQfZoDlEbSMM1M52fzZPsQqWdDZ3evRvNhycRmVFb5lCV43yNGQjPTA6a6zWgT+UcneL1stxR7IS2aNKb2ahvBCTOI53to99GZ6aUQx3t5XyXXIBdimERk7NmODLKRY6xMpUEItsEOicNwFKWaJJHRnr7o7qyFuf49XXMW9Epydz7EEvX53tnhgqPX3q7kSHmFK+6hl3qRgzN1ZoDkmcl0Btf/z0qlHqfTQZeyQjpYjrvwEArZsqUk2YsV2ID9JrGDMhrLm2aZQHolvvhwDZ6fHY+p05SbTXQ==; Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sfe0v-00033C-Mk for bug-gnu-emacs@gnu.org; Sun, 18 Aug 2024 07:24:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Kangas Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 18 Aug 2024 11:24:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72453 X-GNU-PR-Package: emacs Original-Received: via spool by 72453-submit@debbugs.gnu.org id=B72453.172398021111662 (code B ref 72453); Sun, 18 Aug 2024 11:24:01 +0000 Original-Received: (at 72453) by debbugs.gnu.org; 18 Aug 2024 11:23:31 +0000 Original-Received: from localhost ([127.0.0.1]:55508 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sfe0Q-000321-QH for submit@debbugs.gnu.org; Sun, 18 Aug 2024 07:23:31 -0400 Original-Received: from mail-wm1-f47.google.com ([209.85.128.47]:45443) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sfe0O-00031j-8z for 72453@debbugs.gnu.org; Sun, 18 Aug 2024 07:23:29 -0400 Original-Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-42809d6e719so27576195e9.3 for <72453@debbugs.gnu.org>; Sun, 18 Aug 2024 04:22:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723980102; x=1724584902; darn=debbugs.gnu.org; h=to:subject:message-id:date:mime-version:references:in-reply-to:from :from:to:cc:subject:date:message-id:reply-to; bh=jceeZFJDCuuLMZ8ED3ULdQM7n7ZXgEBPQWsuUw/6jT0=; b=B2rF7sKSfw9YxZe1std2eT4tRwTwx7rz18ZKlx1WsDNEHHObni1o+acFuBFvPtlgKR JSWN4GCe0b8YP/X+214Ue77Bvt4D8hv1J9V0uIitUTd17DvDmQaPAeMgzTskxemMO01G aiqAuSQPEKMfcsdtXP49m6vaJUr4EpnaF1x2dHj9me+V1M1M9H+ZLmKNFyoWS5HpBa7E KamQwTADCvEddDdy+7VK2bLUdnEoacd66cw0dCRij1Sl/4AJbRlwy+PicB+4FwoH434M uTivmTz9htqIm/5BQLSyFsHoDwOhBhXSguKOq8wm0PjJ8SORf9i8FwVwjGCZS9IzacKN u46g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723980102; x=1724584902; h=to:subject:message-id:date:mime-version:references:in-reply-to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=jceeZFJDCuuLMZ8ED3ULdQM7n7ZXgEBPQWsuUw/6jT0=; b=O3jXq2UdhvEAdqa3GgMuocuzSeUh6eb4WCxMjDwMSH4Ui5A8foX75J34UD5kEjzbWm yqMcSbLKRGzQYtOavpMLI/7DtIo3IZAIFYgt3hFcVaBj9kYl5FxRUaQG8KiSS78R5my/ n69AznSWJTXN2ZNs5z+2k/5C8Q59ZHWDBncMLyZ+BLQOTZoQaT9GtBjRPRU1nwJcmnvF JsVNDfHU0cMEMLqjmw70+yGoxJFRzRjBhmsqQ4yCvYClHY+u/8muLgn+llA5pfr2l0r/ yR/BHXugjtXW3RMK4OJAYCWhfU+SCQuayc1s7ILZbHrwpYD+nyK97xSyTywVTtqFh5Og eOhw== X-Forwarded-Encrypted: i=1; AJvYcCX4JGnzddNfoQ7hEjNazfWyPXqRnh+Pa4C6s89mkwI/VbriHzu3DU95TYKYbUGuIDt6u0FGh9578194jQX7D49mpGVAS2M= X-Gm-Message-State: AOJu0YzFPZvSFasVi6rmeqq+8PnrdCChupbNIzzNnxztRcwJiejw9riJ XVjiSTVe1wYfgz2TJgY+zaUJlPFNr6SagFHtZL5uB9muTTg1HMzTsf1ph2YiHLiv6K3HF+J/1Oc 7OHIrv5uegjufnRcH+o2HzWpcXgc= X-Google-Smtp-Source: AGHT+IFQGv1KRSYbUHQWMTLtYDVpdo43Wk9zyao0hEgNIRpVbRZcilec2cIAFJN7LjPgsZ7QfHQR/giIKTH9rrUmmKQ= X-Received: by 2002:adf:ea06:0:b0:369:b7e3:497c with SMTP id ffacd0b85a97d-371a73dbc11mr2618711f8f.1.1723980101776; Sun, 18 Aug 2024 04:21:41 -0700 (PDT) Original-Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Sun, 18 Aug 2024 11:21:40 +0000 In-Reply-To: <87plqp9slr.fsf@priss.frightenedpiglet.com> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:290313 Archived-At: --0000000000009158ab061ff3653d Content-Type: text/plain; charset="UTF-8" Derek Upham via "Bug reports for GNU Emacs, the Swiss army knife of text editors" writes: > emacs --init-directory use-package-ensure-test > > The init file sets use-package-always-ensure to true, and we expect > trace warnings to show up for each use-package invocation. In fact, we > only see them for the third and beyond. > > Warning (emacs): use-package-ensure-trace files (t) nil > Warning (emacs): use-package-ensure-trace rx (t) nil > Warning (emacs): use-package-ensure-trace avoid (t) nil Thanks for the bug report and the clear recipe to reproduce it. I can reproduce this bug here also. > Moving the "use-package" macro into the top-level "use-package" file > should fix the problem. The "use-package" file explicitly loads the > other files, which sets up all of the defaults. The attached less intrusive patch fixes it here. Could you please test that it fixes the problem for you? The patch just moves the relevant definitions to use-package-core.el. If Eli and Andrea see no problem with this approach, I think we could install it on emacs-30, after the first pre-release, and otherwise on master. Unrelatedly, I also noticed that the defcustoms in use-package-core.el are all missing :version tags. I'll fix that on emacs-30 after the first pre-release is out. --0000000000009158ab061ff3653d Content-Type: text/x-patch; charset="US-ASCII"; name="0001-Fix-early-use-of-use-package-always-ensure.patch" Content-Disposition: attachment; filename="0001-Fix-early-use-of-use-package-always-ensure.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: 9f2aa65ab5cd02cd_0.1 RnJvbSAwMGRjMTQ2ZTliOGU0MWM1MzRjMTlmNzg5ODZmOGU5NDQ2ODFhYTA3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBTdGVmYW4gS2FuZ2FzIDxzdGVmYW5rYW5nYXNAZ21haWwuY29t PgpEYXRlOiBTdW4sIDE4IEF1ZyAyMDI0IDEzOjEwOjE5ICswMjAwClN1YmplY3Q6IFtQQVRDSF0g Rml4IGVhcmx5IHVzZSBvZiB1c2UtcGFja2FnZS1hbHdheXMtZW5zdXJlCgoqIGxpc3AvdXNlLXBh Y2thZ2UvdXNlLXBhY2thZ2UtY29yZS5lbDoKKiBsaXNwL3VzZS1wYWNrYWdlL3VzZS1wYWNrYWdl LWRlbGlnaHQuZWw6CiogbGlzcC91c2UtcGFja2FnZS91c2UtcGFja2FnZS1kaW1pbmlzaC5lbDoK KiBsaXNwL3VzZS1wYWNrYWdlL3VzZS1wYWNrYWdlLWVuc3VyZS5lbDogTW92ZSBhZGQtdG8tbGlz dCBmb3IKdXNlLXBhY2thZ2Uta2V5d29yZHMgYW5kIHVzZS1wYWNrYWdlLWRlZmF1bHRzIGZyb20g aGVyZS4uLgoqIGxpc3AvdXNlLXBhY2thZ2UvdXNlLXBhY2thZ2UtY29yZS5lbCAodXNlLXBhY2th Z2UtZW5zdXJlKQoodXNlLXBhY2thZ2Uta2V5d29yZHMpOiAuLi50byB0aGUgZGVmYXVsdCBkZWZp bml0aW9uIGhlcmUuCgoqIGxpc3AvdXNlLXBhY2thZ2UvdXNlLXBhY2thZ2UtZW5zdXJlLmVsCih1 c2UtcGFja2FnZS1lbnN1cmUpOiBNb3ZlIHRoaXMgZGVmZ3JvdXAuLi4KKHVzZS1wYWNrYWdlLWFs d2F5cy1lbnN1cmUpCih1c2UtcGFja2FnZS1hbHdheXMtcGluLCB1c2UtcGFja2FnZS1lbnN1cmUt ZnVuY3Rpb24pOiAuLi5hbmQKdGhlc2UgZGVmY3VzdG9tcyBmcm9tIGhlcmUuLi4KKiBsaXNwL3Vz ZS1wYWNrYWdlL3VzZS1wYWNrYWdlLWNvcmUuZWwgKHVzZS1wYWNrYWdlLWVuc3VyZSkKKHVzZS1w YWNrYWdlLWFsd2F5cy1lbnN1cmUsIHVzZS1wYWNrYWdlLWFsd2F5cy1waW4pCih1c2UtcGFja2Fn ZS1lbnN1cmUtZnVuY3Rpb24pOiAuLi50byBoZXJlLiAgKEJ1ZyM3MjQ1MykKLS0tCiBsaXNwL3Vz ZS1wYWNrYWdlL3VzZS1wYWNrYWdlLWNvcmUuZWwgICAgIHwgNTQgKysrKysrKysrKysrKysrKysr KysrKy0tCiBsaXNwL3VzZS1wYWNrYWdlL3VzZS1wYWNrYWdlLWRlbGlnaHQuZWwgIHwgIDIgLQog bGlzcC91c2UtcGFja2FnZS91c2UtcGFja2FnZS1kaW1pbmlzaC5lbCB8ICAyIC0KIGxpc3AvdXNl LXBhY2thZ2UvdXNlLXBhY2thZ2UtZW5zdXJlLmVsICAgfCA0OCAtLS0tLS0tLS0tLS0tLS0tLS0t LS0KIDQgZmlsZXMgY2hhbmdlZCwgNTEgaW5zZXJ0aW9ucygrKSwgNTUgZGVsZXRpb25zKC0pCgpk aWZmIC0tZ2l0IGEvbGlzcC91c2UtcGFja2FnZS91c2UtcGFja2FnZS1jb3JlLmVsIGIvbGlzcC91 c2UtcGFja2FnZS91c2UtcGFja2FnZS1jb3JlLmVsCmluZGV4IDhjMzI0MWQ1ZWUwLi5jNDIwMDdh MmQxMCAxMDA2NDQKLS0tIGEvbGlzcC91c2UtcGFja2FnZS91c2UtcGFja2FnZS1jb3JlLmVsCisr KyBiL2xpc3AvdXNlLXBhY2thZ2UvdXNlLXBhY2thZ2UtY29yZS5lbApAQCAtNjUsNiArNjUsMTMg QEAgdXNlLXBhY2thZ2UKICAgOmxpbmsgJyhjdXN0b20tbWFudWFsICIodXNlLXBhY2thZ2UpIFRv cCIpCiAgIDp2ZXJzaW9uICIyOS4xIikKIAorOzsgVE9ETzogSSBkb24ndCB0aGluayB0aGlzIHBh Y2thZ2UgZ3JvdXAgaXMgcmVxdWlyZWQuICBEZWxldGUgaXQuCisoZGVmZ3JvdXAgdXNlLXBhY2th Z2UtZW5zdXJlIG5pbAorICAiU3VwcG9ydCBmb3IgOmVuc3VyZSBhbmQgOnBpbiBrZXl3b3JkcyBp biBgdXNlLXBhY2thZ2UnIGRlY2xhcmF0aW9ucy4iCisgIDpncm91cCAndXNlLXBhY2thZ2UKKyAg OmxpbmsgJyhjdXN0b20tbWFudWFsICIodXNlLXBhY2thZ2UpIEluc3RhbGxpbmcgcGFja2FnZXMi KQorICA6dmVyc2lvbiAiMjkuMSIpCisKIChkZWZjb25zdCB1c2UtcGFja2FnZS12ZXJzaW9uICIy LjQuNSIKICAgIlRoaXMgdmVyc2lvbiBvZiBgdXNlLXBhY2thZ2UnLiIpCiAKQEAgLTc2LDYgKzgz LDEwIEBAIHVzZS1wYWNrYWdlLWtleXdvcmRzCiAgICAgOmZ1bmN0aW9ucwogICAgIDpwcmVmYWNl CiAgICAgOmlmIDp3aGVuIDp1bmxlc3MKKyAgICA6ZW5zdXJlCisgICAgOnBpbgorICAgIDpkZWxp Z2h0CisgICAgOmRpbWluaXNoCiAgICAgOnZjCiAgICAgOm5vLXJlcXVpcmUKICAgICA6Y2F0Y2gK QEAgLTExNCw3ICsxMjUsOCBAQCB1c2UtcGFja2FnZS1rZXl3b3Jkcwogbm90aGluZyBhdCBhbGwg dG8gaGFwcGVuLCBldmVuIGlmIHRoZSByZXN0IG9mIHRoZSBgdXNlLXBhY2thZ2UnCiBkZWNsYXJh dGlvbiBpcyBpbmNvcnJlY3QuIgogICA6dHlwZSAnKHJlcGVhdCBzeW1ib2wpCi0gIDpncm91cCAn dXNlLXBhY2thZ2UpCisgIDpncm91cCAndXNlLXBhY2thZ2UKKyAgOnZlcnNpb24gIjMwLjEiKQog CiAoZGVmY3VzdG9tIHVzZS1wYWNrYWdlLWRlZmVycmluZy1rZXl3b3JkcwogICAnKDpiaW5kLWtl eW1hcApAQCAtMTg5LDcgKzIwMSwxMiBAQCB1c2UtcGFja2FnZS1kZWZhdWx0cwogICAgICAgICAg ICAgIChsYW1iZGEgKG5hbWUgYXJncykKICAgICAgICAgICAgICAgIChhbmQgdXNlLXBhY2thZ2Ut YWx3YXlzLWRlbWFuZAogICAgICAgICAgICAgICAgICAgICAobm90IChwbGlzdC1tZW1iZXIgYXJn cyA6ZGVmZXIpKQotICAgICAgICAgICAgICAgICAgICAobm90IChwbGlzdC1tZW1iZXIgYXJncyA6 ZGVtYW5kKSkpKSkpCisgICAgICAgICAgICAgICAgICAgIChub3QgKHBsaXN0LW1lbWJlciBhcmdz IDpkZW1hbmQpKSkpKQorICAgICg6ZW5zdXJlIChsaXN0IHVzZS1wYWNrYWdlLWFsd2F5cy1lbnN1 cmUpCisgICAgICAgICAgICAgKGxhbWJkYSAobmFtZSBhcmdzKQorICAgICAgICAgICAgICAgKGFu ZCB1c2UtcGFja2FnZS1hbHdheXMtZW5zdXJlCisgICAgICAgICAgICAgICAgICAgIChub3QgKHBs aXN0LW1lbWJlciBhcmdzIDpsb2FkLXBhdGgpKSkpKQorICAgICg6cGluIHVzZS1wYWNrYWdlLWFs d2F5cy1waW4gdXNlLXBhY2thZ2UtYWx3YXlzLXBpbikpCiAgICJEZWZhdWx0IHZhbHVlcyBmb3Ig c3BlY2lmaWVkIGB1c2UtcGFja2FnZScga2V5d29yZHMuCiBFYWNoIGVudHJ5IGluIHRoZSBhbGlz dCBpcyBhIGxpc3Qgb2YgdGhyZWUgZWxlbWVudHM6CiBUaGUgZmlyc3QgZWxlbWVudCBpcyB0aGUg YHVzZS1wYWNrYWdlJyBrZXl3b3JkLgpAQCAtMjE0LDcgKzIzMSw4IEBAIHVzZS1wYWNrYWdlLWRl ZmF1bHRzCiAgICAgICAgICAgKGxpc3QgKHN5bWJvbCA6dGFnICJLZXl3b3JkIikKICAgICAgICAg ICAgICAgICAoY2hvaWNlIDp0YWcgIkRlZmF1bHQgdmFsdWUiIHNleHAgZnVuY3Rpb24pCiAgICAg ICAgICAgICAgICAgKGNob2ljZSA6dGFnICJFbmFibGUgaWYgbm9uLW5pbCIgc2V4cCBmdW5jdGlv bikpKQotICA6Z3JvdXAgJ3VzZS1wYWNrYWdlKQorICA6Z3JvdXAgJ3VzZS1wYWNrYWdlCisgIDp2 ZXJzaW9uICIzMC4xIikKIAogKGRlZmN1c3RvbSB1c2UtcGFja2FnZS1tZXJnZS1rZXktYWxpc3QK ICAgJygoOmlmICAgIC4gKGxhbWJkYSAobmV3IG9sZCkgYChhbmQgLG5ldyAsb2xkKSkpCkBAIC0z NjAsNiArMzc4LDM2IEBAIHVzZS1wYWNrYWdlLXZjLXByZWZlci1uZXdlc3QKICAgOnZlcnNpb24g IjMwLjEiCiAgIDpncm91cCAndXNlLXBhY2thZ2UpCiAKKyhkZWZjdXN0b20gdXNlLXBhY2thZ2Ut YWx3YXlzLWVuc3VyZSBuaWwKKyAgIlRyZWF0IGV2ZXJ5IHBhY2thZ2UgYXMgdGhvdWdoIGl0IGhh ZCBzcGVjaWZpZWQgdXNpbmcgYDplbnN1cmUgU0VYUCcuCitTZWUgYWxzbyBgdXNlLXBhY2thZ2Ut ZGVmYXVsdHMnLCB3aGljaCB1c2VzIHRoaXMgdmFsdWUuIgorICA6dHlwZSAnc2V4cAorICA6Z3Jv dXAgJ3VzZS1wYWNrYWdlLWVuc3VyZSkKKworKGRlZmN1c3RvbSB1c2UtcGFja2FnZS1hbHdheXMt cGluIG5pbAorICAiVHJlYXQgZXZlcnkgcGFja2FnZSBhcyB0aG91Z2ggaXQgaGFkIHNwZWNpZmll ZCB1c2luZyBgOnBpbiBTWU0nLgorU2VlIGFsc28gYHVzZS1wYWNrYWdlLWRlZmF1bHRzJywgd2hp Y2ggdXNlcyB0aGlzIHZhbHVlLiIKKyAgOnR5cGUgJ3N5bWJvbAorICA6Z3JvdXAgJ3VzZS1wYWNr YWdlLWVuc3VyZSkKKworKGRlZmN1c3RvbSB1c2UtcGFja2FnZS1lbnN1cmUtZnVuY3Rpb24gJ3Vz ZS1wYWNrYWdlLWVuc3VyZS1lbHBhCisgICJGdW5jdGlvbiB0aGF0IGVuc3VyZXMgYSBwYWNrYWdl IGlzIGluc3RhbGxlZC4KK1RoaXMgZnVuY3Rpb24gaXMgY2FsbGVkIHdpdGggdGhyZWUgYXJndW1l bnRzOiB0aGUgbmFtZSBvZiB0aGUKK3BhY2thZ2UgZGVjbGFyZWQgaW4gdGhlIGB1c2UtcGFja2Fn ZScgZm9ybTsgdGhlIGFyZ3VtZW50cyBwYXNzZWQKK3RvIGFsbCBgOmVuc3VyZScga2V5d29yZHMg KGFsd2F5cyBhIGxpc3QsIGV2ZW4gaWYgb25seSBvbmUpOyBhbmQKK3RoZSBjdXJyZW50IGBzdGF0 ZScgcGxpc3QgY3JlYXRlZCBieSBwcmV2aW91cyBoYW5kbGVycy4KKworTm90ZSB0aGF0IHRoaXMg ZnVuY3Rpb24gaXMgY2FsbGVkIHdoZW5ldmVyIGA6ZW5zdXJlJyBpcyBwcm92aWRlZCwKK2V2ZW4g aWYgaXQgaXMgbmlsLiAgSXQgaXMgdXAgdG8gdGhlIGZ1bmN0aW9uIHRvIGRlY2lkZSBvbiB0aGUK K3NlbWFudGljcyBvZiB0aGUgdmFyaW91cyB2YWx1ZXMgZm9yIGA6ZW5zdXJlJy4KKworVGhpcyBm dW5jdGlvbiBzaG91bGQgcmV0dXJuIG5vbi1uaWwgaWYgdGhlIHBhY2thZ2UgaXMgaW5zdGFsbGVk LgorCitUaGUgZGVmYXVsdCB2YWx1ZSB1c2VzIHBhY2thZ2UuZWwgdG8gaW5zdGFsbCB0aGUgcGFj a2FnZS4iCisgIDp0eXBlICcoY2hvaWNlIChjb25zdCA6dGFnICJwYWNrYWdlLmVsIiB1c2UtcGFj a2FnZS1lbnN1cmUtZWxwYSkKKyAgICAgICAgICAgICAgICAgKGZ1bmN0aW9uIDp0YWcgIkN1c3Rv bSIpKQorICA6Z3JvdXAgJ3VzZS1wYWNrYWdlLWVuc3VyZSkKKwogKGRlZnZhciB1c2UtcGFja2Fn ZS1zdGF0aXN0aWNzIChtYWtlLWhhc2gtdGFibGUpKQogCiA7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7 Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OzsK ZGlmZiAtLWdpdCBhL2xpc3AvdXNlLXBhY2thZ2UvdXNlLXBhY2thZ2UtZGVsaWdodC5lbCBiL2xp c3AvdXNlLXBhY2thZ2UvdXNlLXBhY2thZ2UtZGVsaWdodC5lbAppbmRleCBjNDU4ZDI2M2NmMC4u YzY3ZTJhYTYzMjAgMTAwNjQ0Ci0tLSBhL2xpc3AvdXNlLXBhY2thZ2UvdXNlLXBhY2thZ2UtZGVs aWdodC5lbAorKysgYi9saXNwL3VzZS1wYWNrYWdlL3VzZS1wYWNrYWdlLWRlbGlnaHQuZWwKQEAg LTgxLDggKzgxLDYgQEAgdXNlLXBhY2thZ2UtaGFuZGxlci86ZGVsaWdodAogICAgICBgKChpZiAo ZmJvdW5kcCAnZGVsaWdodCkKICAgICAgICAgICAgKGRlbGlnaHQgJygsQGFyZ3MpKSkpKSkpCiAK LShhZGQtdG8tbGlzdCAndXNlLXBhY2thZ2Uta2V5d29yZHMgOmRlbGlnaHQgdCkKLQogKHByb3Zp ZGUgJ3VzZS1wYWNrYWdlLWRlbGlnaHQpCiAKIDs7OyB1c2UtcGFja2FnZS1kZWxpZ2h0LmVsIGVu ZHMgaGVyZQpkaWZmIC0tZ2l0IGEvbGlzcC91c2UtcGFja2FnZS91c2UtcGFja2FnZS1kaW1pbmlz aC5lbCBiL2xpc3AvdXNlLXBhY2thZ2UvdXNlLXBhY2thZ2UtZGltaW5pc2guZWwKaW5kZXggNzk0 MjFhMGUyNzMuLjBiZTJiYTY4OGEwIDEwMDY0NAotLS0gYS9saXNwL3VzZS1wYWNrYWdlL3VzZS1w YWNrYWdlLWRpbWluaXNoLmVsCisrKyBiL2xpc3AvdXNlLXBhY2thZ2UvdXNlLXBhY2thZ2UtZGlt aW5pc2guZWwKQEAgLTcwLDggKzcwLDYgQEAgdXNlLXBhY2thZ2UtaGFuZGxlci86ZGltaW5pc2gK ICAgICAgICAgICAgICBhcmcpCiAgICAgIGJvZHkpKSkKIAotKGFkZC10by1saXN0ICd1c2UtcGFj a2FnZS1rZXl3b3JkcyA6ZGltaW5pc2ggdCkKLQogKHByb3ZpZGUgJ3VzZS1wYWNrYWdlLWRpbWlu aXNoKQogCiA7OzsgdXNlLXBhY2thZ2UtZGltaW5pc2guZWwgZW5kcyBoZXJlCmRpZmYgLS1naXQg YS9saXNwL3VzZS1wYWNrYWdlL3VzZS1wYWNrYWdlLWVuc3VyZS5lbCBiL2xpc3AvdXNlLXBhY2th Z2UvdXNlLXBhY2thZ2UtZW5zdXJlLmVsCmluZGV4IDVmNzViNmI1OWVhLi44MmFiMzI1NmVmMCAx MDA2NDQKLS0tIGEvbGlzcC91c2UtcGFja2FnZS91c2UtcGFja2FnZS1lbnN1cmUuZWwKKysrIGIv bGlzcC91c2UtcGFja2FnZS91c2UtcGFja2FnZS1lbnN1cmUuZWwKQEAgLTMyLDQ2ICszMiwxMCBA QAogKHJlcXVpcmUgJ2NsLWxpYikKIChyZXF1aXJlICd1c2UtcGFja2FnZS1jb3JlKQogCi0oZGVm Z3JvdXAgdXNlLXBhY2thZ2UtZW5zdXJlIG5pbAotICAiU3VwcG9ydCBmb3IgOmVuc3VyZSBhbmQg OnBpbiBrZXl3b3JkcyBpbiBgdXNlLXBhY2thZ2UnIGRlY2xhcmF0aW9ucy4iCi0gIDpncm91cCAn dXNlLXBhY2thZ2UKLSAgOmxpbmsgJyhjdXN0b20tbWFudWFsICIodXNlLXBhY2thZ2UpIEluc3Rh bGxpbmcgcGFja2FnZXMiKQotICA6dmVyc2lvbiAiMjkuMSIpCi0KIChldmFsLXdoZW4tY29tcGls ZQogICAoZGVjbGFyZS1mdW5jdGlvbiBwYWNrYWdlLWluc3RhbGxlZC1wICJwYWNrYWdlIikKICAg KGRlY2xhcmUtZnVuY3Rpb24gcGFja2FnZS1yZWFkLWFsbC1hcmNoaXZlLWNvbnRlbnRzICJwYWNr YWdlIiAoKSkpCiAKLShkZWZjdXN0b20gdXNlLXBhY2thZ2UtYWx3YXlzLWVuc3VyZSBuaWwKLSAg IlRyZWF0IGV2ZXJ5IHBhY2thZ2UgYXMgdGhvdWdoIGl0IGhhZCBzcGVjaWZpZWQgdXNpbmcgYDpl bnN1cmUgU0VYUCcuCi1TZWUgYWxzbyBgdXNlLXBhY2thZ2UtZGVmYXVsdHMnLCB3aGljaCB1c2Vz IHRoaXMgdmFsdWUuIgotICA6dHlwZSAnc2V4cAotICA6Z3JvdXAgJ3VzZS1wYWNrYWdlLWVuc3Vy ZSkKLQotKGRlZmN1c3RvbSB1c2UtcGFja2FnZS1hbHdheXMtcGluIG5pbAotICAiVHJlYXQgZXZl cnkgcGFja2FnZSBhcyB0aG91Z2ggaXQgaGFkIHNwZWNpZmllZCB1c2luZyBgOnBpbiBTWU0nLgot U2VlIGFsc28gYHVzZS1wYWNrYWdlLWRlZmF1bHRzJywgd2hpY2ggdXNlcyB0aGlzIHZhbHVlLiIK LSAgOnR5cGUgJ3N5bWJvbAotICA6Z3JvdXAgJ3VzZS1wYWNrYWdlLWVuc3VyZSkKLQotKGRlZmN1 c3RvbSB1c2UtcGFja2FnZS1lbnN1cmUtZnVuY3Rpb24gJ3VzZS1wYWNrYWdlLWVuc3VyZS1lbHBh Ci0gICJGdW5jdGlvbiB0aGF0IGVuc3VyZXMgYSBwYWNrYWdlIGlzIGluc3RhbGxlZC4KLVRoaXMg ZnVuY3Rpb24gaXMgY2FsbGVkIHdpdGggdGhyZWUgYXJndW1lbnRzOiB0aGUgbmFtZSBvZiB0aGUK LXBhY2thZ2UgZGVjbGFyZWQgaW4gdGhlIGB1c2UtcGFja2FnZScgZm9ybTsgdGhlIGFyZ3VtZW50 cyBwYXNzZWQKLXRvIGFsbCBgOmVuc3VyZScga2V5d29yZHMgKGFsd2F5cyBhIGxpc3QsIGV2ZW4g aWYgb25seSBvbmUpOyBhbmQKLXRoZSBjdXJyZW50IGBzdGF0ZScgcGxpc3QgY3JlYXRlZCBieSBw cmV2aW91cyBoYW5kbGVycy4KLQotTm90ZSB0aGF0IHRoaXMgZnVuY3Rpb24gaXMgY2FsbGVkIHdo ZW5ldmVyIGA6ZW5zdXJlJyBpcyBwcm92aWRlZCwKLWV2ZW4gaWYgaXQgaXMgbmlsLiAgSXQgaXMg dXAgdG8gdGhlIGZ1bmN0aW9uIHRvIGRlY2lkZSBvbiB0aGUKLXNlbWFudGljcyBvZiB0aGUgdmFy aW91cyB2YWx1ZXMgZm9yIGA6ZW5zdXJlJy4KLQotVGhpcyBmdW5jdGlvbiBzaG91bGQgcmV0dXJu IG5vbi1uaWwgaWYgdGhlIHBhY2thZ2UgaXMgaW5zdGFsbGVkLgotCi1UaGUgZGVmYXVsdCB2YWx1 ZSB1c2VzIHBhY2thZ2UuZWwgdG8gaW5zdGFsbCB0aGUgcGFja2FnZS4iCi0gIDp0eXBlICcoY2hv aWNlIChjb25zdCA6dGFnICJwYWNrYWdlLmVsIiB1c2UtcGFja2FnZS1lbnN1cmUtZWxwYSkKLSAg ICAgICAgICAgICAgICAgKGZ1bmN0aW9uIDp0YWcgIkN1c3RvbSIpKQotICA6Z3JvdXAgJ3VzZS1w YWNrYWdlLWVuc3VyZSkKLQogOzs7OyA6cGluCiAKIChkZWZ1biB1c2UtcGFja2FnZS1ub3JtYWxp emUvOnBpbiAoX25hbWUga2V5d29yZCBhcmdzKQpAQCAtMTk2LDE4ICsxNjAsNiBAQCB1c2UtcGFj a2FnZS1oYW5kbGVyLzplbnN1cmUKICAgICAgICAgICAgIGJvZHkpKQogICAgIGJvZHkpKQogCi0o YWRkLXRvLWxpc3QgJ3VzZS1wYWNrYWdlLWRlZmF1bHRzCi0gICAgICAgICAgICAgJyg6ZW5zdXJl IChsaXN0IHVzZS1wYWNrYWdlLWFsd2F5cy1lbnN1cmUpCi0gICAgICAgICAgICAgICAgICAgICAg IChsYW1iZGEgKG5hbWUgYXJncykKLSAgICAgICAgICAgICAgICAgICAgICAgICAoYW5kIHVzZS1w YWNrYWdlLWFsd2F5cy1lbnN1cmUKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChub3Qg KHBsaXN0LW1lbWJlciBhcmdzIDpsb2FkLXBhdGgpKSkpKSB0KQotCi0oYWRkLXRvLWxpc3QgJ3Vz ZS1wYWNrYWdlLWRlZmF1bHRzCi0gICAgICAgICAgICAgJyg6cGluIHVzZS1wYWNrYWdlLWFsd2F5 cy1waW4gdXNlLXBhY2thZ2UtYWx3YXlzLXBpbikgdCkKLQotKGFkZC10by1saXN0ICd1c2UtcGFj a2FnZS1rZXl3b3JkcyA6ZW5zdXJlKQotKGFkZC10by1saXN0ICd1c2UtcGFja2FnZS1rZXl3b3Jk cyA6cGluKQotCiAocHJvdmlkZSAndXNlLXBhY2thZ2UtZW5zdXJlKQogCiA7OzsgdXNlLXBhY2th Z2UtZW5zdXJlLmVsIGVuZHMgaGVyZQotLSAKMi40NS4yCgo= --0000000000009158ab061ff3653d--