From unknown Mon Aug 18 15:39:52 2025 X-Loop: help-debbugs@gnu.org Subject: bug#37844: [PATCH] cmp -x/--verbose-hex Resent-From: "dmo2118@gmail.com" Original-Sender: "Debbugs-submit" Resent-CC: bug-diffutils@gnu.org Resent-Date: Mon, 21 Oct 2019 04:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 37844 X-GNU-PR-Package: diffutils X-GNU-PR-Keywords: patch To: 37844@debbugs.gnu.org X-Debbugs-Original-To: bug-diffutils@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15716327774961 (code B ref -1); Mon, 21 Oct 2019 04:40:02 +0000 Received: (at submit) by debbugs.gnu.org; 21 Oct 2019 04:39:37 +0000 Received: from localhost ([127.0.0.1]:55579 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iMPTh-0001Ht-6f for submit@debbugs.gnu.org; Mon, 21 Oct 2019 00:39:37 -0400 Received: from lists.gnu.org ([209.51.188.17]:44857) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iMHsT-0004ON-PI for submit@debbugs.gnu.org; Sun, 20 Oct 2019 16:32:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51370) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMHsP-0005Fp-Oy for bug-diffutils@gnu.org; Sun, 20 Oct 2019 16:32:37 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: * X-Spam-Status: No, score=1.1 required=5.0 tests=BAYES_50, FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iMHsL-0004PR-VY for bug-diffutils@gnu.org; Sun, 20 Oct 2019 16:32:33 -0400 Received: from mail-il1-x132.google.com ([2607:f8b0:4864:20::132]:42759) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iMHsL-0004Os-JA for bug-diffutils@gnu.org; Sun, 20 Oct 2019 16:32:29 -0400 Received: by mail-il1-x132.google.com with SMTP id o16so2076311ilq.9 for ; Sun, 20 Oct 2019 13:32:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:subject:message-id:date:mime-version:content-language; bh=V9FizjFXF1KQJQhnx6zToRsFVAk7/MESrKmIQ/2wbbY=; b=l16Vg/2yg2JKDVLqLpTrI/70IWJH5FQNDGFlsaDFwNCMH9/ynPCrrm0ANCN+tU/ffa qMqNXwlUiSOx4CXvZeT+q4CCKCd2lYfaPUA5jLSiRm5S+ptvVDclLKTbW9OpFBa0H1VE pUoBpkC+E2yxTb/ULeDbK51YOwpwiypD4NMvTTWpy+qcHe0pJapn5JO9I+ik0Xkfrh9K l82Llkji57nn7YuTMqzFQq5BhBRThzXV5LPBBSWkc1F+aFIQrg2u6YxjmVArIanqulep SmuQy4YwXXNkHKxnXM6wcqDquKhhyXKMgrebkVexS0xVqOMS2eORByMjDe0e7HYzE3GO fZDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:mime-version :content-language; bh=V9FizjFXF1KQJQhnx6zToRsFVAk7/MESrKmIQ/2wbbY=; b=Vef+t5hrGpw+4J+PWkwMdNOXLzXuudwluNbgl+YEEe4r/FxqdvzkA4y2A4wKrBgETf soo0GNxLcHQdiuKHUF58n3172cg9oYRMjG9Vhrt3PBdj6riVormbWkXtj6q17uUVBkKt I27vKr0RE07YpNb34aZ0XoOGg8h1645CXsWV2jqJQNz+ICopYcoPg0JokowwMYYswcab E4MDhWvwPdHXPio04yjhDZ1zh1ZplD+GLOyYksO1JxaK55NZbUjdyubOmcGIIggG5sc9 m9J6sza2XiDA/AKDZ8JDdfb/GySUbKHWXuZkCz9SOC26syJG3I8CgMdsxkMwJwcZFheQ UbnA== X-Gm-Message-State: APjAAAV0Nv2egkqEY76enUREF/9TbuJT+s0ZXCph8WW/KJEckAC/NL6Q wZGALtKdFTNUOi2VrvwEPdYOyOj/ X-Google-Smtp-Source: APXvYqzwraYcJ7m+QZf6yLO1+5jL2Aa9FK4FAAt2A1hJ/BOKHQRSl8TUsbjZRQS1LWSJ8FiuDLa3jQ== X-Received: by 2002:a92:380e:: with SMTP id f14mr22673036ila.47.1571603547744; Sun, 20 Oct 2019 13:32:27 -0700 (PDT) Received: from [192.168.42.64] (34.sub-174-230-134.myvzw.com. [174.230.134.34]) by smtp.googlemail.com with ESMTPSA id t86sm5274201ila.21.2019.10.20.13.32.25 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 20 Oct 2019 13:32:26 -0700 (PDT) From: "dmo2118@gmail.com" Message-ID: <69a49a9f-eaf6-b9d1-4bac-d6a000461561@gmail.com> Date: Sun, 20 Oct 2019 16:32:20 -0400 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------ED1EBD49A7A454B9D5AE2336" Content-Language: en-US X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::132 X-Spam-Score: 0.9 (/) X-Mailman-Approved-At: Mon, 21 Oct 2019 00:39:31 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.1 (--) This is a multi-part message in MIME format. --------------ED1EBD49A7A454B9D5AE2336 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit This adds a `-x`/`--verbose-hex` option to `cmp`, similar to what FreeBSD has in its own `cmp`. From `doc/diffutils.texi`: '-x' '--verbose-hex' Like '--verbose', but with hexadecimal numbers, and byte numbers starting at 0. A few assorted points: * `cmp -x` always displays a minimum of eight hex digits, just like FreeBSD's implementation. * `offtostr` only does decimal, so it was removed in a few places where hexadecimal was called for. * Some of the format strings had `%s` replaced with `%"PRIuMAX"`, in part because of GCC's new `-Wformat-overflow` feature. These strings are translated, and because it was a simple fix, I updated the `.po` files. * For `-x`, I replaced "EOF on FILE after byte 511" to "EOF on FILE at byte 0x200". I think it's a bit more useful this way. * I believe the Malay (`ms.po`) translation needs a bit of attention at this spot regarding the printf format string: ``` #: src/cmp.c:592 #, fuzzy, c-format #| msgid "cmp: EOF on %s\n" msgid "cmp: EOF on %s after byte %s\n" msgstr "%s: EOF tidak dijangka selepas membaca %d/%d bins\n" ``` This is a bit more than the 15-or-so lines of code that are "not legally significant for copyright", so let me know if there's paperwork that needs to be filled out. Dave Odell --------------ED1EBD49A7A454B9D5AE2336 Content-Type: text/x-patch; name="cmp-x-translations.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="cmp-x-translations.patch" LS0tIGEvYmcucG8KKysrIGIvYmcucG8KQEAgLTY1NCwxOCArNjU0LDE4IEBAIG1zZ3N0ciAi Y21wOiDigJ5FT0bigJwg0LIg0L/RgNCw0LfQvdC40Y8g4oCeJXPigJxcbiIKIAogIzogc3Jj L2NtcC5jOjU4NQogIywgYy1mb3JtYXQKLW1zZ2lkICJjbXA6IEVPRiBvbiAlcyBhZnRlciBi eXRlICVzLCBsaW5lICVzXG4iCi1tc2dzdHIgImNtcDog4oCeRU9G4oCcINCyIOKAniVz4oCc INGB0LvQtdC0INCx0LDQudGCICVzLCDRgNC10LQgJXNcbiIKK21zZ2lkICJjbXA6IEVPRiBv biAlcyBhZnRlciBieXRlICU8UFJJdU1BWD4sIGxpbmUgJTxQUkl1TUFYPlxuIgorbXNnc3Ry ICJjbXA6IOKAnkVPRuKAnCDQsiDigJ4lc+KAnCDRgdC70LXQtCDQsdCw0LnRgiAlPFBSSXVN QVg+LCDRgNC10LQgJTxQUkl1TUFYPlxuIgogCiAjOiBzcmMvY21wLmM6NTg2CiAjLCBjLWZv cm1hdAotbXNnaWQgImNtcDogRU9GIG9uICVzIGFmdGVyIGJ5dGUgJXMsIGluIGxpbmUgJXNc biIKLW1zZ3N0ciAiY21wOiDigJ5FT0bigJwg0LIg4oCeJXPigJwg0YHQu9C10LQg0LHQsNC5 0YIgJXMsINC90LAg0YDQtdC0ICVzXG4iCittc2dpZCAiY21wOiBFT0Ygb24gJXMgYWZ0ZXIg Ynl0ZSAlPFBSSXVNQVg+LCBpbiBsaW5lICU8UFJJdU1BWD5cbiIKK21zZ3N0ciAiY21wOiDi gJ5FT0bigJwg0LIg4oCeJXPigJwg0YHQu9C10LQg0LHQsNC50YIgJTxQUkl1TUFYPiwg0L3Q sCDRgNC10LQgJTxQUkl1TUFYPlxuIgogCiAjOiBzcmMvY21wLmM6NTkyCiAjLCBjLWZvcm1h dAotbXNnaWQgImNtcDogRU9GIG9uICVzIGFmdGVyIGJ5dGUgJXNcbiIKLW1zZ3N0ciAiY21w OiDigJ5FT0bigJwg0LIg4oCeJXPigJwg0YHQu9C10LQg0LHQsNC50YIgJXNcbiIKK21zZ2lk ICJjbXA6IEVPRiBvbiAlcyBhZnRlciBieXRlICU8UFJJdU1BWD5cbiIKK21zZ3N0ciAiY21w OiDigJ5FT0bigJwg0LIg4oCeJXPigJwg0YHQu9C10LQg0LHQsNC50YIgJTxQUkl1TUFYPlxu IgogCiAjLiBUaGlzIGlzIGEgcHJvcGVyIG5hbWUuIFNlZSB0aGUgZ2V0dGV4dCBtYW51YWws IHNlY3Rpb24gTmFtZXMuCiAjOiBzcmMvZGlmZi5jOjUwCi0tLSBhL2NzLnBvCisrKyBiL2Nz LnBvCkBAIC02NDksMTggKzY0OSwxOCBAQCBtc2dzdHIgImNtcDoga29uZWMgc291Ym9ydSB2 wqAlcywga3RlcsO9IGplIHByw6F6ZG7DvVxuIgogCiAjOiBzcmMvY21wLmM6NTg1CiAjLCBj LWZvcm1hdAotbXNnaWQgImNtcDogRU9GIG9uICVzIGFmdGVyIGJ5dGUgJXMsIGxpbmUgJXNc biIKLW1zZ3N0ciAiY21wOiBrb25lYyBzb3Vib3J1IHbCoCVzIHBvIGJhanR1ICVzLCDFmcOh ZGVrICVzXG4iCittc2dpZCAiY21wOiBFT0Ygb24gJXMgYWZ0ZXIgYnl0ZSAlPFBSSXVNQVg+ LCBsaW5lICU8UFJJdU1BWD5cbiIKK21zZ3N0ciAiY21wOiBrb25lYyBzb3Vib3J1IHbCoCVz IHBvIGJhanR1ICU8UFJJdU1BWD4sIMWZw6FkZWsgJTxQUkl1TUFYPlxuIgogCiAjOiBzcmMv Y21wLmM6NTg2CiAjLCBjLWZvcm1hdAotbXNnaWQgImNtcDogRU9GIG9uICVzIGFmdGVyIGJ5 dGUgJXMsIGluIGxpbmUgJXNcbiIKLW1zZ3N0ciAiY21wOiBrb25lYyBzb3Vib3J1IHbCoCVz IHBvIGJhanR1ICVzIG5hwqDFmcOhZGt1ICVzXG4iCittc2dpZCAiY21wOiBFT0Ygb24gJXMg YWZ0ZXIgYnl0ZSAlPFBSSXVNQVg+LCBpbiBsaW5lICU8UFJJdU1BWD5cbiIKK21zZ3N0ciAi Y21wOiBrb25lYyBzb3Vib3J1IHbCoCVzIHBvIGJhanR1ICU8UFJJdU1BWD4gbmHCoMWZw6Fk a3UgJTxQUkl1TUFYPlxuIgogCiAjOiBzcmMvY21wLmM6NTkyCiAjLCBjLWZvcm1hdAotbXNn aWQgImNtcDogRU9GIG9uICVzIGFmdGVyIGJ5dGUgJXNcbiIKLW1zZ3N0ciAiY21wOiBrb25l YyBzb3Vib3J1IHbCoCVzIHBvIGJhanR1ICVzXG4iCittc2dpZCAiY21wOiBFT0Ygb24gJXMg YWZ0ZXIgYnl0ZSAlPFBSSXVNQVg+XG4iCittc2dzdHIgImNtcDoga29uZWMgc291Ym9ydSB2 wqAlcyBwbyBiYWp0dSAlPFBSSXVNQVg+XG4iCiAKICMuIFRoaXMgaXMgYSBwcm9wZXIgbmFt ZS4gU2VlIHRoZSBnZXR0ZXh0IG1hbnVhbCwgc2VjdGlvbiBOYW1lcy4KICM6IHNyYy9kaWZm LmM6NTAKLS0tIGEvZGEucG8KKysrIGIvZGEucG8KQEAgLTY1MCwxOCArNjUwLDE4IEBAIG1z Z3N0ciAiY21wOiBmaWxhZnNsdXRuaW5nIHDDpSAlcyBzb20gZXIgdG9tXG4iCiAKICM6IHNy Yy9jbXAuYzo1ODUKICMsIGMtZm9ybWF0Ci1tc2dpZCAiY21wOiBFT0Ygb24gJXMgYWZ0ZXIg Ynl0ZSAlcywgbGluZSAlc1xuIgotbXNnc3RyICJjbXA6IGZpbGFmc2x1dG5pbmcgcMOlICVz IGVmdGVyIGJ5dGUgJXMsIGxpbmplICVzXG4iCittc2dpZCAiY21wOiBFT0Ygb24gJXMgYWZ0 ZXIgYnl0ZSAlPFBSSXVNQVg+LCBsaW5lICU8UFJJdU1BWD5cbiIKK21zZ3N0ciAiY21wOiBm aWxhZnNsdXRuaW5nIHDDpSAlcyBlZnRlciBieXRlICU8UFJJdU1BWD4sIGxpbmplICU8UFJJ dU1BWD5cbiIKIAogIzogc3JjL2NtcC5jOjU4NgogIywgYy1mb3JtYXQKLW1zZ2lkICJjbXA6 IEVPRiBvbiAlcyBhZnRlciBieXRlICVzLCBpbiBsaW5lICVzXG4iCi1tc2dzdHIgImNtcDog ZmlsYWZzbHV0bmluZyBww6UgJXMgZWZ0ZXIgYnl0ZSAlcyBpIGxpbmplICVzXG4iCittc2dp ZCAiY21wOiBFT0Ygb24gJXMgYWZ0ZXIgYnl0ZSAlPFBSSXVNQVg+LCBpbiBsaW5lICU8UFJJ dU1BWD5cbiIKK21zZ3N0ciAiY21wOiBmaWxhZnNsdXRuaW5nIHDDpSAlcyBlZnRlciBieXRl ICU8UFJJdU1BWD4gaSBsaW5qZSAlPFBSSXVNQVg+XG4iCiAKICM6IHNyYy9jbXAuYzo1OTIK ICMsIGMtZm9ybWF0Ci1tc2dpZCAiY21wOiBFT0Ygb24gJXMgYWZ0ZXIgYnl0ZSAlc1xuIgot bXNnc3RyICJjbXA6IGZpbGFmc2x1dG5pbmcgcMOlICVzIGVmdGVyIGJ5dGUgJXNcbiIKK21z Z2lkICJjbXA6IEVPRiBvbiAlcyBhZnRlciBieXRlICU8UFJJdU1BWD5cbiIKK21zZ3N0ciAi Y21wOiBmaWxhZnNsdXRuaW5nIHDDpSAlcyBlZnRlciBieXRlICU8UFJJdU1BWD5cbiIKIAog Iy4gVGhpcyBpcyBhIHByb3BlciBuYW1lLiBTZWUgdGhlIGdldHRleHQgbWFudWFsLCBzZWN0 aW9uIE5hbWVzLgogIzogc3JjL2RpZmYuYzo1MAotLS0gYS9kZS5wbworKysgYi9kZS5wbwpA QCAtNjU4LDE4ICs2NTgsMTggQEAgbXNnc3RyICJjbXA6IERhdGVpZW5kZSBpbiAlcywgd2Vs Y2hlIGxlZXIgaXN0LlxuIgogCiAjOiBzcmMvY21wLmM6NTg1CiAjLCBjLWZvcm1hdAotbXNn aWQgImNtcDogRU9GIG9uICVzIGFmdGVyIGJ5dGUgJXMsIGxpbmUgJXNcbiIKLW1zZ3N0ciAi Y21wOiBEYXRlaWVuZGUgaW4gJXMgbmFjaCBCeXRlICVzLCBaZWlsZSAlc1xuIgorbXNnaWQg ImNtcDogRU9GIG9uICVzIGFmdGVyIGJ5dGUgJTxQUkl1TUFYPiwgbGluZSAlPFBSSXVNQVg+ XG4iCittc2dzdHIgImNtcDogRGF0ZWllbmRlIGluICVzIG5hY2ggQnl0ZSAlPFBSSXVNQVg+ LCBaZWlsZSAlPFBSSXVNQVg+XG4iCiAKICM6IHNyYy9jbXAuYzo1ODYKICMsIGMtZm9ybWF0 Ci1tc2dpZCAiY21wOiBFT0Ygb24gJXMgYWZ0ZXIgYnl0ZSAlcywgaW4gbGluZSAlc1xuIgot bXNnc3RyICJjbXA6IERhdGVpZW5kZSBpbiAlcyBuYWNoIEJ5dGUgJXMsIFplaWxlICVzXG4i Cittc2dpZCAiY21wOiBFT0Ygb24gJXMgYWZ0ZXIgYnl0ZSAlPFBSSXVNQVg+LCBpbiBsaW5l ICU8UFJJdU1BWD5cbiIKK21zZ3N0ciAiY21wOiBEYXRlaWVuZGUgaW4gJXMgbmFjaCBCeXRl ICU8UFJJdU1BWD4sIFplaWxlICU8UFJJdU1BWD5cbiIKIAogIzogc3JjL2NtcC5jOjU5Mgog IywgYy1mb3JtYXQKLW1zZ2lkICJjbXA6IEVPRiBvbiAlcyBhZnRlciBieXRlICVzXG4iCi1t c2dzdHIgImNtcDogRGF0ZWllbmRlIGluICVzIG5hY2ggQnl0ZSAlc1xuIgorbXNnaWQgImNt cDogRU9GIG9uICVzIGFmdGVyIGJ5dGUgJTxQUkl1TUFYPlxuIgorbXNnc3RyICJjbXA6IERh dGVpZW5kZSBpbiAlcyBuYWNoIEJ5dGUgJTxQUkl1TUFYPlxuIgogCiAjLiBUaGlzIGlzIGEg cHJvcGVyIG5hbWUuIFNlZSB0aGUgZ2V0dGV4dCBtYW51YWwsIHNlY3Rpb24gTmFtZXMuCiAj OiBzcmMvZGlmZi5jOjUwCi0tLSBhL2VsLnBvCisrKyBiL2VsLnBvCkBAIC02NTEsMTggKzY1 MSwxOCBAQCBtc2dzdHIgImNtcDogRU9GIM+Dz4TOvyAlcyDPgM6/z4UgzrXOr869zrHOuSDO us61zr3PjFxuIgogCiAjOiBzcmMvY21wLmM6NTg1CiAjLCBjLWZvcm1hdAotbXNnaWQgImNt cDogRU9GIG9uICVzIGFmdGVyIGJ5dGUgJXMsIGxpbmUgJXNcbiIKLW1zZ3N0ciAiY21wOiBF T0Ygz4PPhM6/ICVzIM68zrXPhM6sIM+Ezr8gYnl0ZSAlcywgzrPPgc6xzrzOvM6uICVzXG4i Cittc2dpZCAiY21wOiBFT0Ygb24gJXMgYWZ0ZXIgYnl0ZSAlPFBSSXVNQVg+LCBsaW5lICU8 UFJJdU1BWD5cbiIKK21zZ3N0ciAiY21wOiBFT0Ygz4PPhM6/ICVzIM68zrXPhM6sIM+Ezr8g Ynl0ZSAlPFBSSXVNQVg+LCDOs8+BzrHOvM68zq4gJTxQUkl1TUFYPlxuIgogCiAjOiBzcmMv Y21wLmM6NTg2CiAjLCBjLWZvcm1hdAotbXNnaWQgImNtcDogRU9GIG9uICVzIGFmdGVyIGJ5 dGUgJXMsIGluIGxpbmUgJXNcbiIKLW1zZ3N0ciAiY21wOiBFT0Ygz4PPhM6/ICVzIM68zrXP hM6sIM+Ezr8gYnl0ZSAlcywgz4PPhM63IM6zz4HOsc68zrzOriAlc1xuIgorbXNnaWQgImNt cDogRU9GIG9uICVzIGFmdGVyIGJ5dGUgJTxQUkl1TUFYPiwgaW4gbGluZSAlPFBSSXVNQVg+ XG4iCittc2dzdHIgImNtcDogRU9GIM+Dz4TOvyAlcyDOvM61z4TOrCDPhM6/IGJ5dGUgJTxQ Ukl1TUFYPiwgz4PPhM63IM6zz4HOsc68zrzOriAlPFBSSXVNQVg+XG4iCiAKICM6IHNyYy9j bXAuYzo1OTIKICMsIGMtZm9ybWF0Ci1tc2dpZCAiY21wOiBFT0Ygb24gJXMgYWZ0ZXIgYnl0 ZSAlc1xuIgotbXNnc3RyICJjbXA6IEVPRiDPg8+Ezr8gJXMgzrzOtc+Ezqwgz4TOvyBieXRl ICVzXG4iCittc2dpZCAiY21wOiBFT0Ygb24gJXMgYWZ0ZXIgYnl0ZSAlPFBSSXVNQVg+XG4i Cittc2dzdHIgImNtcDogRU9GIM+Dz4TOvyAlcyDOvM61z4TOrCDPhM6/IGJ5dGUgJTxQUkl1 TUFYPlxuIgogCiAjLiBUaGlzIGlzIGEgcHJvcGVyIG5hbWUuIFNlZSB0aGUgZ2V0dGV4dCBt YW51YWwsIHNlY3Rpb24gTmFtZXMuCiAjOiBzcmMvZGlmZi5jOjUwCi0tLSBhL2VvLnBvCisr KyBiL2VvLnBvCkBAIC02NDgsMTggKzY0OCwxOCBAQCBtc2dzdHIgImNtcDogRU9GIMSJZSAl cywga2l1IG1hbHBsZW5hc1xuIgogCiAjOiBzcmMvY21wLmM6NTg1CiAjLCBjLWZvcm1hdAot bXNnaWQgImNtcDogRU9GIG9uICVzIGFmdGVyIGJ5dGUgJXMsIGxpbmUgJXNcbiIKLW1zZ3N0 ciAiY21wOiBFT0YgxIllICVzIHBvc3QgYmFqdG8gJXMsIGxpbmlvICVzXG4iCittc2dpZCAi Y21wOiBFT0Ygb24gJXMgYWZ0ZXIgYnl0ZSAlPFBSSXVNQVg+LCBsaW5lICU8UFJJdU1BWD5c biIKK21zZ3N0ciAiY21wOiBFT0YgxIllICVzIHBvc3QgYmFqdG8gJTxQUkl1TUFYPiwgbGlu aW8gJTxQUkl1TUFYPlxuIgogCiAjOiBzcmMvY21wLmM6NTg2CiAjLCBjLWZvcm1hdAotbXNn aWQgImNtcDogRU9GIG9uICVzIGFmdGVyIGJ5dGUgJXMsIGluIGxpbmUgJXNcbiIKLW1zZ3N0 ciAiY21wOiBFT0YgxIllICVzIHBvc3QgYmFqdG8gJXMsIGVuIGxpbmlvICVzXG4iCittc2dp ZCAiY21wOiBFT0Ygb24gJXMgYWZ0ZXIgYnl0ZSAlPFBSSXVNQVg+LCBpbiBsaW5lICU8UFJJ dU1BWD5cbiIKK21zZ3N0ciAiY21wOiBFT0YgxIllICVzIHBvc3QgYmFqdG8gJTxQUkl1TUFY PiwgZW4gbGluaW8gJTxQUkl1TUFYPlxuIgogCiAjOiBzcmMvY21wLmM6NTkyCiAjLCBjLWZv cm1hdAotbXNnaWQgImNtcDogRU9GIG9uICVzIGFmdGVyIGJ5dGUgJXNcbiIKLW1zZ3N0ciAi Y21wOiBFT0YgxIllICVzIHBvc3QgYmFqdG8gJXNcbiIKK21zZ2lkICJjbXA6IEVPRiBvbiAl cyBhZnRlciBieXRlICU8UFJJdU1BWD5cbiIKK21zZ3N0ciAiY21wOiBFT0YgxIllICVzIHBv c3QgYmFqdG8gJTxQUkl1TUFYPlxuIgogCiAjLiBUaGlzIGlzIGEgcHJvcGVyIG5hbWUuIFNl ZSB0aGUgZ2V0dGV4dCBtYW51YWwsIHNlY3Rpb24gTmFtZXMuCiAjOiBzcmMvZGlmZi5jOjUw Ci0tLSBhL2ZyLnBvCisrKyBiL2ZyLnBvCkBAIC02NDYsMTggKzY0NiwxOCBAQCBtc2dzdHIg ImNtcDogRmluLWRlLWZpY2hpZXIgKEVPRikgc3VyICVzIHF1aSBlc3QgdmlkZVxuIgogCiAj OiBzcmMvY21wLmM6NTg1CiAjLCBjLWZvcm1hdAotbXNnaWQgImNtcDogRU9GIG9uICVzIGFm dGVyIGJ5dGUgJXMsIGxpbmUgJXNcbiIKLW1zZ3N0ciAiY21wOiBGaW4tZGUtZmljaGllciAo RU9GKSBzdXIgJXMgYXByw6hzIGwnb2N0ZXQgJXMsIGxpZ25lICVzXG4iCittc2dpZCAiY21w OiBFT0Ygb24gJXMgYWZ0ZXIgYnl0ZSAlPFBSSXVNQVg+LCBsaW5lICU8UFJJdU1BWD5cbiIK K21zZ3N0ciAiY21wOiBGaW4tZGUtZmljaGllciAoRU9GKSBzdXIgJXMgYXByw6hzIGwnb2N0 ZXQgJTxQUkl1TUFYPiwgbGlnbmUgJTxQUkl1TUFYPlxuIgogCiAjOiBzcmMvY21wLmM6NTg2 CiAjLCBjLWZvcm1hdAotbXNnaWQgImNtcDogRU9GIG9uICVzIGFmdGVyIGJ5dGUgJXMsIGlu IGxpbmUgJXNcbiIKLW1zZ3N0ciAiY21wOiBGaW4tZGUtZmljaGllciAoRU9GKSBzdXIgJXMg YXByw6hzIGwnb2N0ZXQgJXMsIGxpZ25lICVzXG4iCittc2dpZCAiY21wOiBFT0Ygb24gJXMg YWZ0ZXIgYnl0ZSAlPFBSSXVNQVg+LCBpbiBsaW5lICU8UFJJdU1BWD5cbiIKK21zZ3N0ciAi Y21wOiBGaW4tZGUtZmljaGllciAoRU9GKSBzdXIgJXMgYXByw6hzIGwnb2N0ZXQgJTxQUkl1 TUFYPiwgbGlnbmUgJTxQUkl1TUFYPlxuIgogCiAjOiBzcmMvY21wLmM6NTkyCiAjLCBjLWZv cm1hdAotbXNnaWQgImNtcDogRU9GIG9uICVzIGFmdGVyIGJ5dGUgJXNcbiIKLW1zZ3N0ciAi Y21wOiBGaW4tZGUtZmljaGllciAoRU9GKSBzdXIgJXMgYXByw6hzIGwnb2N0ZXQgJXNcbiIK K21zZ2lkICJjbXA6IEVPRiBvbiAlcyBhZnRlciBieXRlICU8UFJJdU1BWD5cbiIKK21zZ3N0 ciAiY21wOiBGaW4tZGUtZmljaGllciAoRU9GKSBzdXIgJXMgYXByw6hzIGwnb2N0ZXQgJTxQ Ukl1TUFYPlxuIgogCiAjLiBUaGlzIGlzIGEgcHJvcGVyIG5hbWUuIFNlZSB0aGUgZ2V0dGV4 dCBtYW51YWwsIHNlY3Rpb24gTmFtZXMuCiAjOiBzcmMvZGlmZi5jOjUwCi0tLSBhL2hyLnBv CisrKyBiL2hyLnBvCkBAIC02NDgsMTggKzY0OCwxOCBAQCBtc2dzdHIgImNtcDoga3JhaiBk YXRvdGVrZSAoRU9GKSB1ICVzIGtvamkgamUgcHJhemFuXG4iCiAKICM6IHNyYy9jbXAuYzo1 ODUKICMsIGMtZm9ybWF0Ci1tc2dpZCAiY21wOiBFT0Ygb24gJXMgYWZ0ZXIgYnl0ZSAlcywg bGluZSAlc1xuIgotbXNnc3RyICJjbXA6IGtyYWogZGF0b3Rla2UgKEVPRikgdSAlcyBpemEg YmFqdGEgJXMsIHJlZGFrICVzXG4iCittc2dpZCAiY21wOiBFT0Ygb24gJXMgYWZ0ZXIgYnl0 ZSAlPFBSSXVNQVg+LCBsaW5lICU8UFJJdU1BWD5cbiIKK21zZ3N0ciAiY21wOiBrcmFqIGRh dG90ZWtlIChFT0YpIHUgJXMgaXphIGJhanRhICU8UFJJdU1BWD4sIHJlZGFrICU8UFJJdU1B WD5cbiIKIAogIzogc3JjL2NtcC5jOjU4NgogIywgYy1mb3JtYXQKLW1zZ2lkICJjbXA6IEVP RiBvbiAlcyBhZnRlciBieXRlICVzLCBpbiBsaW5lICVzXG4iCi1tc2dzdHIgImNtcDoga3Jh aiBkYXRvdGVrZSAoRU9GKSB1ICVzIGl6YSBiYWp0YSAlcywgdSByZXRrdSAlc1xuIgorbXNn aWQgImNtcDogRU9GIG9uICVzIGFmdGVyIGJ5dGUgJTxQUkl1TUFYPiwgaW4gbGluZSAlPFBS SXVNQVg+XG4iCittc2dzdHIgImNtcDoga3JhaiBkYXRvdGVrZSAoRU9GKSB1ICVzIGl6YSBi YWp0YSAlPFBSSXVNQVg+LCB1IHJldGt1ICU8UFJJdU1BWD5cbiIKIAogIzogc3JjL2NtcC5j OjU5MgogIywgYy1mb3JtYXQKLW1zZ2lkICJjbXA6IEVPRiBvbiAlcyBhZnRlciBieXRlICVz XG4iCi1tc2dzdHIgImNtcDoga3JhaiBkYXRvdGVrZSAoRU9GKSB1ICVzIGl6YSBiYWp0YSAl c1xuIgorbXNnaWQgImNtcDogRU9GIG9uICVzIGFmdGVyIGJ5dGUgJTxQUkl1TUFYPlxuIgor bXNnc3RyICJjbXA6IGtyYWogZGF0b3Rla2UgKEVPRikgdSAlcyBpemEgYmFqdGEgJTxQUkl1 TUFYPlxuIgogCiAjLiBUaGlzIGlzIGEgcHJvcGVyIG5hbWUuIFNlZSB0aGUgZ2V0dGV4dCBt YW51YWwsIHNlY3Rpb24gTmFtZXMuCiAjOiBzcmMvZGlmZi5jOjUwCi0tLSBhL2h1LnBvCisr KyBiL2h1LnBvCkBAIC02NDcsMTggKzY0NywxOCBAQCBtc2dzdHIgImNtcDogRU9GIGVubsOp bDogJXMsIGFtZWx5IMO8cmVzXG4iCiAKICM6IHNyYy9jbXAuYzo1ODUKICMsIGMtZm9ybWF0 Ci1tc2dpZCAiY21wOiBFT0Ygb24gJXMgYWZ0ZXIgYnl0ZSAlcywgbGluZSAlc1xuIgotbXNn c3RyICJjbXA6IEVPRiBlbm7DqWw6ICVzLCAlcyBiw6FqdCDDqXMgJXMgc29yIHV0w6FuXG4i Cittc2dpZCAiY21wOiBFT0Ygb24gJXMgYWZ0ZXIgYnl0ZSAlPFBSSXVNQVg+LCBsaW5lICU8 UFJJdU1BWD5cbiIKK21zZ3N0ciAiY21wOiBFT0YgZW5uw6lsOiAlcywgJTxQUkl1TUFYPiBi w6FqdCDDqXMgJTxQUkl1TUFYPiBzb3IgdXTDoW5cbiIKIAogIzogc3JjL2NtcC5jOjU4Ngog IywgYy1mb3JtYXQKLW1zZ2lkICJjbXA6IEVPRiBvbiAlcyBhZnRlciBieXRlICVzLCBpbiBs aW5lICVzXG4iCi1tc2dzdHIgImNtcDogRU9GIGVubsOpbDogJXMsICVzIGLDoWp0IHV0w6Fu IGEoeikgJXMuIHNvcmJhblxuIgorbXNnaWQgImNtcDogRU9GIG9uICVzIGFmdGVyIGJ5dGUg JTxQUkl1TUFYPiwgaW4gbGluZSAlPFBSSXVNQVg+XG4iCittc2dzdHIgImNtcDogRU9GIGVu bsOpbDogJXMsICU8UFJJdU1BWD4gYsOhanQgdXTDoW4gYSh6KSAlPFBSSXVNQVg+LiBzb3Ji YW5cbiIKIAogIzogc3JjL2NtcC5jOjU5MgogIywgYy1mb3JtYXQKLW1zZ2lkICJjbXA6IEVP RiBvbiAlcyBhZnRlciBieXRlICVzXG4iCi1tc2dzdHIgImNtcDogRU9GIGVubsOpbDogJXMs ICVzIGLDoWp0IHV0w6FuXG4iCittc2dpZCAiY21wOiBFT0Ygb24gJXMgYWZ0ZXIgYnl0ZSAl PFBSSXVNQVg+XG4iCittc2dzdHIgImNtcDogRU9GIGVubsOpbDogJXMsICU8UFJJdU1BWD4g YsOhanQgdXTDoW5cbiIKIAogIy4gVGhpcyBpcyBhIHByb3BlciBuYW1lLiBTZWUgdGhlIGdl dHRleHQgbWFudWFsLCBzZWN0aW9uIE5hbWVzLgogIzogc3JjL2RpZmYuYzo1MAotLS0gYS9t cy5wbworKysgYi9tcy5wbwpAQCAtNjc3LDE0ICs2NzcsMTQgQEAgbXNnc3RyICJjbXA6IEVP RiBwYWRhICVzXG4iCiAjOiBzcmMvY21wLmM6NTg1CiAjLCBmdXp6eSwgYy1mb3JtYXQKICN8 IG1zZ2lkICIlcyAlcyBkaWZmZXI6IGJ5dGUgJXMsIGxpbmUgJXNcbiIKLW1zZ2lkICJjbXA6 IEVPRiBvbiAlcyBhZnRlciBieXRlICVzLCBsaW5lICVzXG4iCi1tc2dzdHIgIiVzICVzIGJl cmJlemE6IGJ5dGUgJXMsIGJhcmlzICVzXG4iCittc2dpZCAiY21wOiBFT0Ygb24gJXMgYWZ0 ZXIgYnl0ZSAlPFBSSXVNQVg+LCBsaW5lICU8UFJJdU1BWD5cbiIKK21zZ3N0ciAiJXMgJXMg YmVyYmV6YTogYnl0ZSAlPFBSSXVNQVg+LCBiYXJpcyAlPFBSSXVNQVg+XG4iCiAKICM6IHNy Yy9jbXAuYzo1ODYKICMsIGZ1enp5LCBjLWZvcm1hdAogI3wgbXNnaWQgIiVzICVzIGRpZmZl cjogYnl0ZSAlcywgbGluZSAlc1xuIgotbXNnaWQgImNtcDogRU9GIG9uICVzIGFmdGVyIGJ5 dGUgJXMsIGluIGxpbmUgJXNcbiIKLW1zZ3N0ciAiJXMgJXMgYmVyYmV6YTogYnl0ZSAlcywg YmFyaXMgJXNcbiIKK21zZ2lkICJjbXA6IEVPRiBvbiAlcyBhZnRlciBieXRlICU8UFJJdU1B WD4sIGluIGxpbmUgJTxQUkl1TUFYPlxuIgorbXNnc3RyICIlcyAlcyBiZXJiZXphOiBieXRl ICU8UFJJdU1BWD4sIGJhcmlzICU8UFJJdU1BWD5cbiIKIAogIzogc3JjL2NtcC5jOjU5Mgog IywgZnV6enksIGMtZm9ybWF0Ci0tLSBhL25iLnBvCisrKyBiL25iLnBvCkBAIC02NDYsMTgg KzY0NiwxOCBAQCBtc2dzdHIgImNtcDogRU9GIHDDpSAlcywgc29tIGVyIHRvbVxuIgogCiAj OiBzcmMvY21wLmM6NTg1CiAjLCBjLWZvcm1hdAotbXNnaWQgImNtcDogRU9GIG9uICVzIGFm dGVyIGJ5dGUgJXMsIGxpbmUgJXNcbiIKLW1zZ3N0ciAiY21wOiBFT0YgcMOlICVzIGV0dGVy IGJ5dGUgJXMsIGxpbmplICVzXG4iCittc2dpZCAiY21wOiBFT0Ygb24gJXMgYWZ0ZXIgYnl0 ZSAlPFBSSXVNQVg+LCBsaW5lICU8UFJJdU1BWD5cbiIKK21zZ3N0ciAiY21wOiBFT0YgcMOl ICVzIGV0dGVyIGJ5dGUgJTxQUkl1TUFYPiwgbGluamUgJTxQUkl1TUFYPlxuIgogCiAjOiBz cmMvY21wLmM6NTg2CiAjLCBjLWZvcm1hdAotbXNnaWQgImNtcDogRU9GIG9uICVzIGFmdGVy IGJ5dGUgJXMsIGluIGxpbmUgJXNcbiIKLW1zZ3N0ciAiY21wOiBFT0YgcMOlICVzIGV0dGVy IGJ5dGUgJXMsIHDDpSBsaW5qZSAlc1xuIgorbXNnaWQgImNtcDogRU9GIG9uICVzIGFmdGVy IGJ5dGUgJTxQUkl1TUFYPiwgaW4gbGluZSAlPFBSSXVNQVg+XG4iCittc2dzdHIgImNtcDog RU9GIHDDpSAlcyBldHRlciBieXRlICU8UFJJdU1BWD4sIHDDpSBsaW5qZSAlPFBSSXVNQVg+ XG4iCiAKICM6IHNyYy9jbXAuYzo1OTIKICMsIGMtZm9ybWF0Ci1tc2dpZCAiY21wOiBFT0Yg b24gJXMgYWZ0ZXIgYnl0ZSAlc1xuIgotbXNnc3RyICJjbXA6IEVPRiBww6UgJXMgZXR0ZXIg Ynl0ZSAlc1xuIgorbXNnaWQgImNtcDogRU9GIG9uICVzIGFmdGVyIGJ5dGUgJTxQUkl1TUFY PlxuIgorbXNnc3RyICJjbXA6IEVPRiBww6UgJXMgZXR0ZXIgYnl0ZSAlPFBSSXVNQVg+XG4i CiAKICMuIFRoaXMgaXMgYSBwcm9wZXIgbmFtZS4gU2VlIHRoZSBnZXR0ZXh0IG1hbnVhbCwg c2VjdGlvbiBOYW1lcy4KICM6IHNyYy9kaWZmLmM6NTAKLS0tIGEvbmwucG8KKysrIGIvbmwu cG8KQEAgLTY2MSwxOCArNjYxLDE4IEBAIG1zZ3N0ciAiY21wOiBlaW5kZS12YW4tYmVzdGFu ZCBpbiAlcyBkYXQgbGVlZyBpc1xuIgogCiAjOiBzcmMvY21wLmM6NTg1CiAjLCBjLWZvcm1h dAotbXNnaWQgImNtcDogRU9GIG9uICVzIGFmdGVyIGJ5dGUgJXMsIGxpbmUgJXNcbiIKLW1z Z3N0ciAiY21wOiBlaW5kZS12YW4tYmVzdGFuZCBpbiAlcyBuYSBieXRlICVzLCByZWdlbCAl c1xuIgorbXNnaWQgImNtcDogRU9GIG9uICVzIGFmdGVyIGJ5dGUgJTxQUkl1TUFYPiwgbGlu ZSAlPFBSSXVNQVg+XG4iCittc2dzdHIgImNtcDogZWluZGUtdmFuLWJlc3RhbmQgaW4gJXMg bmEgYnl0ZSAlPFBSSXVNQVg+LCByZWdlbCAlPFBSSXVNQVg+XG4iCiAKICM6IHNyYy9jbXAu Yzo1ODYKICMsIGMtZm9ybWF0Ci1tc2dpZCAiY21wOiBFT0Ygb24gJXMgYWZ0ZXIgYnl0ZSAl cywgaW4gbGluZSAlc1xuIgotbXNnc3RyICJjbXA6IGVpbmRlLXZhbi1iZXN0YW5kIGluICVz IG5hIGJ5dGUgJXMsIGluIHJlZ2VsICVzXG4iCittc2dpZCAiY21wOiBFT0Ygb24gJXMgYWZ0 ZXIgYnl0ZSAlPFBSSXVNQVg+LCBpbiBsaW5lICU8UFJJdU1BWD5cbiIKK21zZ3N0ciAiY21w OiBlaW5kZS12YW4tYmVzdGFuZCBpbiAlcyBuYSBieXRlICU8UFJJdU1BWD4sIGluIHJlZ2Vs ICU8UFJJdU1BWD5cbiIKIAogIzogc3JjL2NtcC5jOjU5MgogIywgYy1mb3JtYXQKLW1zZ2lk ICJjbXA6IEVPRiBvbiAlcyBhZnRlciBieXRlICVzXG4iCi1tc2dzdHIgImNtcDogZWluZGUt dmFuLWJlc3RhbmQgaW4gJXMgbmEgYnl0ZSAlc1xuIgorbXNnaWQgImNtcDogRU9GIG9uICVz IGFmdGVyIGJ5dGUgJTxQUkl1TUFYPlxuIgorbXNnc3RyICJjbXA6IGVpbmRlLXZhbi1iZXN0 YW5kIGluICVzIG5hIGJ5dGUgJTxQUkl1TUFYPlxuIgogCiAjLiBUaGlzIGlzIGEgcHJvcGVy IG5hbWUuIFNlZSB0aGUgZ2V0dGV4dCBtYW51YWwsIHNlY3Rpb24gTmFtZXMuCiAjOiBzcmMv ZGlmZi5jOjUwCi0tLSBhL3BsLnBvCisrKyBiL3BsLnBvCkBAIC02NDksMTggKzY0OSwxOCBA QCBtc2dzdHIgImNtcDogRU9GIHcgJXMsIGt0w7NyeSBqZXN0IHB1c3R5XG4iCiAKICM6IHNy Yy9jbXAuYzo1ODUKICMsIGMtZm9ybWF0Ci1tc2dpZCAiY21wOiBFT0Ygb24gJXMgYWZ0ZXIg Ynl0ZSAlcywgbGluZSAlc1xuIgotbXNnc3RyICJjbXA6IEVPRiB3ICVzLCBwbyBiYWpjaWUg JXMsIGxpbmlpICVzXG4iCittc2dpZCAiY21wOiBFT0Ygb24gJXMgYWZ0ZXIgYnl0ZSAlPFBS SXVNQVg+LCBsaW5lICU8UFJJdU1BWD5cbiIKK21zZ3N0ciAiY21wOiBFT0YgdyAlcywgcG8g YmFqY2llICU8UFJJdU1BWD4sIGxpbmlpICU8UFJJdU1BWD5cbiIKIAogIzogc3JjL2NtcC5j OjU4NgogIywgYy1mb3JtYXQKLW1zZ2lkICJjbXA6IEVPRiBvbiAlcyBhZnRlciBieXRlICVz LCBpbiBsaW5lICVzXG4iCi1tc2dzdHIgImNtcDogRU9GIHcgJXMsIHBvIGJhamNpZSAlcywg dyBsaW5paSAlc1xuIgorbXNnaWQgImNtcDogRU9GIG9uICVzIGFmdGVyIGJ5dGUgJTxQUkl1 TUFYPiwgaW4gbGluZSAlPFBSSXVNQVg+XG4iCittc2dzdHIgImNtcDogRU9GIHcgJXMsIHBv IGJhamNpZSAlPFBSSXVNQVg+LCB3IGxpbmlpICU8UFJJdU1BWD5cbiIKIAogIzogc3JjL2Nt cC5jOjU5MgogIywgYy1mb3JtYXQKLW1zZ2lkICJjbXA6IEVPRiBvbiAlcyBhZnRlciBieXRl ICVzXG4iCi1tc2dzdHIgImNtcDogRU9GIHcgJXMsIHBvIGJhamNpZSAlc1xuIgorbXNnaWQg ImNtcDogRU9GIG9uICVzIGFmdGVyIGJ5dGUgJTxQUkl1TUFYPlxuIgorbXNnc3RyICJjbXA6 IEVPRiB3ICVzLCBwbyBiYWpjaWUgJTxQUkl1TUFYPlxuIgogCiAjLiBUaGlzIGlzIGEgcHJv cGVyIG5hbWUuIFNlZSB0aGUgZ2V0dGV4dCBtYW51YWwsIHNlY3Rpb24gTmFtZXMuCiAjOiBz cmMvZGlmZi5jOjUwCi0tLSBhL3B0LnBvCisrKyBiL3B0LnBvCkBAIC02NDUsMTggKzY0NSwx OCBAQCBtc2dzdHIgImNtcDogRU9GIGVtICVzIHF1ZSBlc3TDoSB2YXppb1xuIgogCiAjOiBz cmMvY21wLmM6NTg1CiAjLCBjLWZvcm1hdAotbXNnaWQgImNtcDogRU9GIG9uICVzIGFmdGVy IGJ5dGUgJXMsIGxpbmUgJXNcbiIKLW1zZ3N0ciAiY21wOiBFT0YgZW0gJXMgYXDDs3MgbyBi eXRlICVzLCBsaW5oYSAlc1xuIgorbXNnaWQgImNtcDogRU9GIG9uICVzIGFmdGVyIGJ5dGUg JTxQUkl1TUFYPiwgbGluZSAlPFBSSXVNQVg+XG4iCittc2dzdHIgImNtcDogRU9GIGVtICVz IGFww7NzIG8gYnl0ZSAlPFBSSXVNQVg+LCBsaW5oYSAlPFBSSXVNQVg+XG4iCiAKICM6IHNy Yy9jbXAuYzo1ODYKICMsIGMtZm9ybWF0Ci1tc2dpZCAiY21wOiBFT0Ygb24gJXMgYWZ0ZXIg Ynl0ZSAlcywgaW4gbGluZSAlc1xuIgotbXNnc3RyICJjbXA6IEVPRiBlbSAlcyBhcMOzcyBv IGJ5dGUgJXMsIG5hIGxpbmhhICVzXG4iCittc2dpZCAiY21wOiBFT0Ygb24gJXMgYWZ0ZXIg Ynl0ZSAlPFBSSXVNQVg+LCBpbiBsaW5lICU8UFJJdU1BWD5cbiIKK21zZ3N0ciAiY21wOiBF T0YgZW0gJXMgYXDDs3MgbyBieXRlICU8UFJJdU1BWD4sIG5hIGxpbmhhICU8UFJJdU1BWD5c biIKIAogIzogc3JjL2NtcC5jOjU5MgogIywgYy1mb3JtYXQKLW1zZ2lkICJjbXA6IEVPRiBv biAlcyBhZnRlciBieXRlICVzXG4iCi1tc2dzdHIgImNtcDogRU9GIGVtICVzIGFww7NzIG8g Ynl0ZSAlc1xuIgorbXNnaWQgImNtcDogRU9GIG9uICVzIGFmdGVyIGJ5dGUgJTxQUkl1TUFY PlxuIgorbXNnc3RyICJjbXA6IEVPRiBlbSAlcyBhcMOzcyBvIGJ5dGUgJTxQUkl1TUFYPlxu IgogCiAjLiBUaGlzIGlzIGEgcHJvcGVyIG5hbWUuIFNlZSB0aGUgZ2V0dGV4dCBtYW51YWws IHNlY3Rpb24gTmFtZXMuCiAjOiBzcmMvZGlmZi5jOjUwCi0tLSBhL3B0X0JSLnBvCisrKyBi L3B0X0JSLnBvCkBAIC02NTEsMTggKzY1MSwxOCBAQCBtc2dzdHIgImNtcDogRmltIGRlIGFy cXVpdm8gKEVPRikgZW0gJXMgcXVlIGVzdMOhIHZhemlvXG4iCiAKICM6IHNyYy9jbXAuYzo1 ODUKICMsIGMtZm9ybWF0Ci1tc2dpZCAiY21wOiBFT0Ygb24gJXMgYWZ0ZXIgYnl0ZSAlcywg bGluZSAlc1xuIgotbXNnc3RyICJjbXA6IEZpbSBkZSBhcnF1aXZvIChFT0YpIGVtICVzIGFw w7NzIGJ5dGUgJXMsIGxpbmhhICVzXG4iCittc2dpZCAiY21wOiBFT0Ygb24gJXMgYWZ0ZXIg Ynl0ZSAlPFBSSXVNQVg+LCBsaW5lICU8UFJJdU1BWD5cbiIKK21zZ3N0ciAiY21wOiBGaW0g ZGUgYXJxdWl2byAoRU9GKSBlbSAlcyBhcMOzcyBieXRlICU8UFJJdU1BWD4sIGxpbmhhICU8 UFJJdU1BWD5cbiIKIAogIzogc3JjL2NtcC5jOjU4NgogIywgYy1mb3JtYXQKLW1zZ2lkICJj bXA6IEVPRiBvbiAlcyBhZnRlciBieXRlICVzLCBpbiBsaW5lICVzXG4iCi1tc2dzdHIgImNt cDogRmltIGRlIGFycXVpdm8gKEVPRikgZW0gJXMgYXDDs3MgYnl0ZSAlcywgbmEgbGluaGEg JXNcbiIKK21zZ2lkICJjbXA6IEVPRiBvbiAlcyBhZnRlciBieXRlICU8UFJJdU1BWD4sIGlu IGxpbmUgJTxQUkl1TUFYPlxuIgorbXNnc3RyICJjbXA6IEZpbSBkZSBhcnF1aXZvIChFT0Yp IGVtICVzIGFww7NzIGJ5dGUgJTxQUkl1TUFYPiwgbmEgbGluaGEgJTxQUkl1TUFYPlxuIgog CiAjOiBzcmMvY21wLmM6NTkyCiAjLCBjLWZvcm1hdAotbXNnaWQgImNtcDogRU9GIG9uICVz IGFmdGVyIGJ5dGUgJXNcbiIKLW1zZ3N0ciAiY21wOiBGaW0gZGUgYXJxdWl2byAoRU9GKSBl bSAlcyBhcMOzcyBieXRlICVzXG4iCittc2dpZCAiY21wOiBFT0Ygb24gJXMgYWZ0ZXIgYnl0 ZSAlPFBSSXVNQVg+XG4iCittc2dzdHIgImNtcDogRmltIGRlIGFycXVpdm8gKEVPRikgZW0g JXMgYXDDs3MgYnl0ZSAlPFBSSXVNQVg+XG4iCiAKICMuIFRoaXMgaXMgYSBwcm9wZXIgbmFt ZS4gU2VlIHRoZSBnZXR0ZXh0IG1hbnVhbCwgc2VjdGlvbiBOYW1lcy4KICM6IHNyYy9kaWZm LmM6NTAKLS0tIGEvcnUucG8KKysrIGIvcnUucG8KQEAgLTY0OSwxOCArNjQ5LDE4IEBAIG1z Z3N0ciAiY21wOiBFT0Yg0LIgJXMsINC60L7RgtC+0YDRi9C5INC/0YPRgdGCXG4iCiAKICM6 IHNyYy9jbXAuYzo1ODUKICMsIGMtZm9ybWF0Ci1tc2dpZCAiY21wOiBFT0Ygb24gJXMgYWZ0 ZXIgYnl0ZSAlcywgbGluZSAlc1xuIgotbXNnc3RyICJjbXA6IEVPRiDQsiAlcyDQv9C+0YHQ u9C1INCx0LDQudGC0LAgJXMsINGB0YLRgNC+0LrQsCAlc1xuIgorbXNnaWQgImNtcDogRU9G IG9uICVzIGFmdGVyIGJ5dGUgJTxQUkl1TUFYPiwgbGluZSAlPFBSSXVNQVg+XG4iCittc2dz dHIgImNtcDogRU9GINCyICVzINC/0L7RgdC70LUg0LHQsNC50YLQsCAlPFBSSXVNQVg+LCDR gdGC0YDQvtC60LAgJTxQUkl1TUFYPlxuIgogCiAjOiBzcmMvY21wLmM6NTg2CiAjLCBjLWZv cm1hdAotbXNnaWQgImNtcDogRU9GIG9uICVzIGFmdGVyIGJ5dGUgJXMsIGluIGxpbmUgJXNc biIKLW1zZ3N0ciAiY21wOiBFT0Yg0LIgJXMg0L/QvtGB0LvQtSDQsdCw0LnRgtCwICVzINCy INGB0YLRgNC+0LrQtSAlc1xuIgorbXNnaWQgImNtcDogRU9GIG9uICVzIGFmdGVyIGJ5dGUg JTxQUkl1TUFYPiwgaW4gbGluZSAlPFBSSXVNQVg+XG4iCittc2dzdHIgImNtcDogRU9GINCy ICVzINC/0L7RgdC70LUg0LHQsNC50YLQsCAlPFBSSXVNQVg+INCyINGB0YLRgNC+0LrQtSAl PFBSSXVNQVg+XG4iCiAKICM6IHNyYy9jbXAuYzo1OTIKICMsIGMtZm9ybWF0Ci1tc2dpZCAi Y21wOiBFT0Ygb24gJXMgYWZ0ZXIgYnl0ZSAlc1xuIgotbXNnc3RyICJjbXA6IEVPRiDQsiAl cyDQv9C+0YHQu9C1INCx0LDQudGC0LAgJXNcbiIKK21zZ2lkICJjbXA6IEVPRiBvbiAlcyBh ZnRlciBieXRlICU8UFJJdU1BWD5cbiIKK21zZ3N0ciAiY21wOiBFT0Yg0LIgJXMg0L/QvtGB 0LvQtSDQsdCw0LnRgtCwICU8UFJJdU1BWD5cbiIKIAogIy4gVGhpcyBpcyBhIHByb3BlciBu YW1lLiBTZWUgdGhlIGdldHRleHQgbWFudWFsLCBzZWN0aW9uIE5hbWVzLgogIzogc3JjL2Rp ZmYuYzo1MAotLS0gYS9zci5wbworKysgYi9zci5wbwpAQCAtNjQyLDE4ICs2NDIsMTggQEAg bXNnc3RyICJjbXA6INC60YDQsNGYINC00LDRgtC+0YLQtdC60LUg0L3QsCAlcyDQutC+0ZjQ tSDRmNC1INC/0YDQsNC30L3QvlxuIgogCiAjOiBzcmMvY21wLmM6NTg1CiAjLCBjLWZvcm1h dAotbXNnaWQgImNtcDogRU9GIG9uICVzIGFmdGVyIGJ5dGUgJXMsIGxpbmUgJXNcbiIKLW1z Z3N0ciAiY21wOiDQutGA0LDRmCDQtNCw0YLQvtGC0LXQutC1INC90LAgJXMg0L3QsNC60L7Q vSDQsdCw0ZjRgtCwICVzLCAlcy4g0YDQtdC0XG4iCittc2dpZCAiY21wOiBFT0Ygb24gJXMg YWZ0ZXIgYnl0ZSAlPFBSSXVNQVg+LCBsaW5lICU8UFJJdU1BWD5cbiIKK21zZ3N0ciAiY21w OiDQutGA0LDRmCDQtNCw0YLQvtGC0LXQutC1INC90LAgJXMg0L3QsNC60L7QvSDQsdCw0ZjR gtCwICU8UFJJdU1BWD4sICU8UFJJdU1BWD4uINGA0LXQtFxuIgogCiAjOiBzcmMvY21wLmM6 NTg2CiAjLCBjLWZvcm1hdAotbXNnaWQgImNtcDogRU9GIG9uICVzIGFmdGVyIGJ5dGUgJXMs IGluIGxpbmUgJXNcbiIKLW1zZ3N0ciAiY21wOiDQutGA0LDRmCDQtNCw0YLQvtGC0LXQutC1 INC90LAgJXMg0L3QsNC60L7QvSDQsdCw0ZjRgtCwICVzLCDRgyAlcy4g0YDQtdC00YNcbiIK K21zZ2lkICJjbXA6IEVPRiBvbiAlcyBhZnRlciBieXRlICU8UFJJdU1BWD4sIGluIGxpbmUg JTxQUkl1TUFYPlxuIgorbXNnc3RyICJjbXA6INC60YDQsNGYINC00LDRgtC+0YLQtdC60LUg 0L3QsCAlcyDQvdCw0LrQvtC9INCx0LDRmNGC0LAgJTxQUkl1TUFYPiwg0YMgJTxQUkl1TUFY Pi4g0YDQtdC00YNcbiIKIAogIzogc3JjL2NtcC5jOjU5MgogIywgYy1mb3JtYXQKLW1zZ2lk ICJjbXA6IEVPRiBvbiAlcyBhZnRlciBieXRlICVzXG4iCi1tc2dzdHIgImNtcDog0LrRgNCw 0Zgg0LTQsNGC0L7RgtC10LrQtSDQvdCwICVzINC90LDQutC+0L0g0LHQsNGY0YLQsCAlc1xu IgorbXNnaWQgImNtcDogRU9GIG9uICVzIGFmdGVyIGJ5dGUgJTxQUkl1TUFYPlxuIgorbXNn c3RyICJjbXA6INC60YDQsNGYINC00LDRgtC+0YLQtdC60LUg0L3QsCAlcyDQvdCw0LrQvtC9 INCx0LDRmNGC0LAgJTxQUkl1TUFYPlxuIgogCiAjLiBUaGlzIGlzIGEgcHJvcGVyIG5hbWUu IFNlZSB0aGUgZ2V0dGV4dCBtYW51YWwsIHNlY3Rpb24gTmFtZXMuCiAjOiBzcmMvZGlmZi5j OjUwCi0tLSBhL3N2LnBvCisrKyBiL3N2LnBvCkBAIC02NDYsMTggKzY0NiwxOCBAQCBtc2dz dHIgImNtcDogRU9GIGkgJXMgc29tIMOkciB0b21cbiIKIAogIzogc3JjL2NtcC5jOjU4NQog IywgYy1mb3JtYXQKLW1zZ2lkICJjbXA6IEVPRiBvbiAlcyBhZnRlciBieXRlICVzLCBsaW5l ICVzXG4iCi1tc2dzdHIgImNtcDogRU9GIGkgJXMgZWZ0ZXIgYnl0ZSAlcywgcmFkICVzXG4i Cittc2dpZCAiY21wOiBFT0Ygb24gJXMgYWZ0ZXIgYnl0ZSAlPFBSSXVNQVg+LCBsaW5lICU8 UFJJdU1BWD5cbiIKK21zZ3N0ciAiY21wOiBFT0YgaSAlcyBlZnRlciBieXRlICU8UFJJdU1B WD4sIHJhZCAlPFBSSXVNQVg+XG4iCiAKICM6IHNyYy9jbXAuYzo1ODYKICMsIGMtZm9ybWF0 Ci1tc2dpZCAiY21wOiBFT0Ygb24gJXMgYWZ0ZXIgYnl0ZSAlcywgaW4gbGluZSAlc1xuIgot bXNnc3RyICJjbXA6IEVPRiBpICVzIGVmdGVyIGJ5dGUgJXMsIHDDpSByYWQgJXNcbiIKK21z Z2lkICJjbXA6IEVPRiBvbiAlcyBhZnRlciBieXRlICU8UFJJdU1BWD4sIGluIGxpbmUgJTxQ Ukl1TUFYPlxuIgorbXNnc3RyICJjbXA6IEVPRiBpICVzIGVmdGVyIGJ5dGUgJTxQUkl1TUFY PiwgcMOlIHJhZCAlPFBSSXVNQVg+XG4iCiAKICM6IHNyYy9jbXAuYzo1OTIKICMsIGMtZm9y bWF0Ci1tc2dpZCAiY21wOiBFT0Ygb24gJXMgYWZ0ZXIgYnl0ZSAlc1xuIgotbXNnc3RyICJj bXA6IEVPRiBpICVzIGVmdGVyIGJ5dGUgJXNcbiIKK21zZ2lkICJjbXA6IEVPRiBvbiAlcyBh ZnRlciBieXRlICU8UFJJdU1BWD5cbiIKK21zZ3N0ciAiY21wOiBFT0YgaSAlcyBlZnRlciBi eXRlICU8UFJJdU1BWD5cbiIKIAogIy4gVGhpcyBpcyBhIHByb3BlciBuYW1lLiBTZWUgdGhl IGdldHRleHQgbWFudWFsLCBzZWN0aW9uIE5hbWVzLgogIzogc3JjL2RpZmYuYzo1MAotLS0g YS90ci5wbworKysgYi90ci5wbwpAQCAtNjc0LDE4ICs2NzQsMTggQEAgbXNnc3RyICJjbXA6 ICVzJ2RhIEVPRiAoZG9zeWEgc29udSkgYm/Fn1xuIgogCiAjOiBzcmMvY21wLmM6NTg1CiAj LCBjLWZvcm1hdAotbXNnaWQgImNtcDogRU9GIG9uICVzIGFmdGVyIGJ5dGUgJXMsIGxpbmUg JXNcbiIKLW1zZ3N0ciAiY21wOiBFT0Ygw7x6ZXJpbmRlICVzIHNvbnJhc8SxIGJ5dGUgJXMs IHNhdMSxciAlc1xuIgorbXNnaWQgImNtcDogRU9GIG9uICVzIGFmdGVyIGJ5dGUgJTxQUkl1 TUFYPiwgbGluZSAlPFBSSXVNQVg+XG4iCittc2dzdHIgImNtcDogRU9GIMO8emVyaW5kZSAl cyBzb25yYXPEsSBieXRlICU8UFJJdU1BWD4sIHNhdMSxciAlPFBSSXVNQVg+XG4iCiAKICM6 IHNyYy9jbXAuYzo1ODYKICMsIGMtZm9ybWF0Ci1tc2dpZCAiY21wOiBFT0Ygb24gJXMgYWZ0 ZXIgYnl0ZSAlcywgaW4gbGluZSAlc1xuIgotbXNnc3RyICJjbXA6IEVPRiDDvHplcmluZGUg JXMgc29ucmFzxLEgYnl0ZSAlcywgc2F0xLFyICVzXG4iCittc2dpZCAiY21wOiBFT0Ygb24g JXMgYWZ0ZXIgYnl0ZSAlPFBSSXVNQVg+LCBpbiBsaW5lICU8UFJJdU1BWD5cbiIKK21zZ3N0 ciAiY21wOiBFT0Ygw7x6ZXJpbmRlICVzIHNvbnJhc8SxIGJ5dGUgJTxQUkl1TUFYPiwgc2F0 xLFyICU8UFJJdU1BWD5cbiIKIAogIzogc3JjL2NtcC5jOjU5MgogIywgYy1mb3JtYXQKLW1z Z2lkICJjbXA6IEVPRiBvbiAlcyBhZnRlciBieXRlICVzXG4iCi1tc2dzdHIgImNtcDogRU9G IMO8emVyaW5kZSAlcyBzb25yYXPEsSBieXRlICVzXG4iCittc2dpZCAiY21wOiBFT0Ygb24g JXMgYWZ0ZXIgYnl0ZSAlPFBSSXVNQVg+XG4iCittc2dzdHIgImNtcDogRU9GIMO8emVyaW5k ZSAlcyBzb25yYXPEsSBieXRlICU8UFJJdU1BWD5cbiIKIAogIy4gVGhpcyBpcyBhIHByb3Bl ciBuYW1lLiBTZWUgdGhlIGdldHRleHQgbWFudWFsLCBzZWN0aW9uIE5hbWVzLgogIzogc3Jj L2RpZmYuYzo1MAotLS0gYS91ay5wbworKysgYi91ay5wbwpAQCAtNjQ3LDE3ICs2NDcsMTcg QEAgbXNnc3RyICJjbXA6INC60ZbQvdC10YbRjCDRhNCw0LnQu9CwINGDICVzLCDRj9C60LjQ uSDRlCDQv9C+0YDQvtC20L3RltC8XG4iCiAKICM6IHNyYy9jbXAuYzo1ODUKICMsIGMtZm9y bWF0Ci1tc2dpZCAiY21wOiBFT0Ygb24gJXMgYWZ0ZXIgYnl0ZSAlcywgbGluZSAlc1xuIgot bXNnc3RyICJjbXA6INC60ZbQvdC10YbRjCDRhNCw0LnQu9CwINGDICVzINC/0ZbRgdC70Y8g 0LHQsNC50YLQsCAlcywg0YDRj9C00L7QuiAlc1xuIgorbXNnaWQgImNtcDogRU9GIG9uICVz IGFmdGVyIGJ5dGUgJTxQUkl1TUFYPiwgbGluZSAlPFBSSXVNQVg+XG4iCittc2dzdHIgImNt cDog0LrRltC90LXRhtGMINGE0LDQudC70LAg0YMgJXMg0L/RltGB0LvRjyDQsdCw0LnRgtCw ICU8UFJJdU1BWD4sINGA0Y/QtNC+0LogJTxQUkl1TUFYPlxuIgogCiAjOiBzcmMvY21wLmM6 NTg2CiAjLCBjLWZvcm1hdAotbXNnaWQgImNtcDogRU9GIG9uICVzIGFmdGVyIGJ5dGUgJXMs IGluIGxpbmUgJXNcbiIKLW1zZ3N0ciAiY21wOiDQutGW0L3QtdGG0Ywg0YTQsNC50LvQsCDR gyAlcyDQv9GW0YHQu9GPINCx0LDQudGC0LAgJXMsINGDINGA0Y/QtNC60YMgJXNcbiIKK21z Z2lkICJjbXA6IEVPRiBvbiAlcyBhZnRlciBieXRlICU8UFJJdU1BWD4sIGluIGxpbmUgJTxQ Ukl1TUFYPlxuIgorbXNnc3RyICJjbXA6INC60ZbQvdC10YbRjCDRhNCw0LnQu9CwINGDICVz INC/0ZbRgdC70Y8g0LHQsNC50YLQsCAlPFBSSXVNQVg+LCDRgyDRgNGP0LTQutGDICU8UFJJ dU1BWD5cbiIKIAogIzogc3JjL2NtcC5jOjU5MgogIywgYy1mb3JtYXQKLW1zZ2lkICJjbXA6 IEVPRiBvbiAlcyBhZnRlciBieXRlICVzXG4iCittc2dpZCAiY21wOiBFT0Ygb24gJXMgYWZ0 ZXIgYnl0ZSAlPFBSSXVNQVg+XG4iCiBtc2dzdHIgImNtcDog0LrRltC90LXRhtGMINGE0LDQ udC70LAg0YMgJXMg0L/RltGB0LvRjyDQsdCw0LnRgtCwICVzXG4iCiAKICMuIFRoaXMgaXMg YSBwcm9wZXIgbmFtZS4gU2VlIHRoZSBnZXR0ZXh0IG1hbnVhbCwgc2VjdGlvbiBOYW1lcy4K LS0tIGEvdmkucG8KKysrIGIvdmkucG8KQEAgLTY1MiwxOCArNjUyLDE4IEBAIG1zZ3N0ciAi Y21wOiBn4bq3cCBr4bq/dCB0aOG7qWMgdOG6rXAgdGluIHRyw6puICVzIGPDoWkgbcOgIHRy 4buRbmcgcuG7l25nXG4iCiAKICM6IHNyYy9jbXAuYzo1ODUKICMsIGMtZm9ybWF0Ci1tc2dp ZCAiY21wOiBFT0Ygb24gJXMgYWZ0ZXIgYnl0ZSAlcywgbGluZSAlc1xuIgotbXNnc3RyICJj bXA6IGfhurdwIGvhur90IHRo4bupYyB04bqtcCB0aW4gdHLDqm4gJXMgc2F1IGJ5dGUgJXMs IGTDsm5nICVzXG4iCittc2dpZCAiY21wOiBFT0Ygb24gJXMgYWZ0ZXIgYnl0ZSAlPFBSSXVN QVg+LCBsaW5lICU8UFJJdU1BWD5cbiIKK21zZ3N0ciAiY21wOiBn4bq3cCBr4bq/dCB0aOG7 qWMgdOG6rXAgdGluIHRyw6puICVzIHNhdSBieXRlICU8UFJJdU1BWD4sIGTDsm5nICU8UFJJ dU1BWD5cbiIKIAogIzogc3JjL2NtcC5jOjU4NgogIywgYy1mb3JtYXQKLW1zZ2lkICJjbXA6 IEVPRiBvbiAlcyBhZnRlciBieXRlICVzLCBpbiBsaW5lICVzXG4iCi1tc2dzdHIgImNtcDog Z+G6t3Aga+G6v3QgdGjhu6ljIHThuq1wIHRpbiB0csOqbiAlcyBzYXUgYnl0ZSAlcywg4buf IGTDsm5nICVzXG4iCittc2dpZCAiY21wOiBFT0Ygb24gJXMgYWZ0ZXIgYnl0ZSAlPFBSSXVN QVg+LCBpbiBsaW5lICU8UFJJdU1BWD5cbiIKK21zZ3N0ciAiY21wOiBn4bq3cCBr4bq/dCB0 aOG7qWMgdOG6rXAgdGluIHRyw6puICVzIHNhdSBieXRlICU8UFJJdU1BWD4sIOG7nyBkw7Ju ZyAlPFBSSXVNQVg+XG4iCiAKICM6IHNyYy9jbXAuYzo1OTIKICMsIGMtZm9ybWF0Ci1tc2dp ZCAiY21wOiBFT0Ygb24gJXMgYWZ0ZXIgYnl0ZSAlc1xuIgotbXNnc3RyICJjbXA6IGfhurdw IGvhur90IHRo4bupYyB04bqtcCB0aW4gdHLDqm4gJXMgc2F1IGJ5dGUgJXNcbiIKK21zZ2lk ICJjbXA6IEVPRiBvbiAlcyBhZnRlciBieXRlICU8UFJJdU1BWD5cbiIKK21zZ3N0ciAiY21w OiBn4bq3cCBr4bq/dCB0aOG7qWMgdOG6rXAgdGluIHRyw6puICVzIHNhdSBieXRlICU8UFJJ dU1BWD5cbiIKIAogIyBUw6puIGjhu40KICMuIFRoaXMgaXMgYSBwcm9wZXIgbmFtZS4gU2Vl IHRoZSBnZXR0ZXh0IG1hbnVhbCwgc2VjdGlvbiBOYW1lcy4KLS0tIGEvemhfQ04ucG8KKysr IGIvemhfQ04ucG8KQEAgLTY0OCwxOCArNjQ4LDE4IEBAIG1zZ3N0ciAiY21w77yaJXMg5bey 57uT5p2f5LiU5Li656m6XG4iCiAKICM6IHNyYy9jbXAuYzo1ODUKICMsIGMtZm9ybWF0Ci1t c2dpZCAiY21wOiBFT0Ygb24gJXMgYWZ0ZXIgYnl0ZSAlcywgbGluZSAlc1xuIgotbXNnc3Ry ICJjbXDvvJolcyDlnKggJXMg5a2X6IqCICVzIOihjOWQjue7k+adn1xuIgorbXNnaWQgImNt cDogRU9GIG9uICVzIGFmdGVyIGJ5dGUgJTxQUkl1TUFYPiwgbGluZSAlPFBSSXVNQVg+XG4i Cittc2dzdHIgImNtcO+8miVzIOWcqCAlPFBSSXVNQVg+IOWtl+iKgiAlPFBSSXVNQVg+IOih jOWQjue7k+adn1xuIgogCiAjOiBzcmMvY21wLmM6NTg2CiAjLCBjLWZvcm1hdAotbXNnaWQg ImNtcDogRU9GIG9uICVzIGFmdGVyIGJ5dGUgJXMsIGluIGxpbmUgJXNcbiIKLW1zZ3N0ciAi Y21w77yaJXMg5ZyoICVzIOWtl+iKgiAlcyDooYzkuK3nu5PmnZ9cbiIKK21zZ2lkICJjbXA6 IEVPRiBvbiAlcyBhZnRlciBieXRlICU8UFJJdU1BWD4sIGluIGxpbmUgJTxQUkl1TUFYPlxu IgorbXNnc3RyICJjbXDvvJolcyDlnKggJTxQUkl1TUFYPiDlrZfoioIgJTxQUkl1TUFYPiDo oYzkuK3nu5PmnZ9cbiIKIAogIzogc3JjL2NtcC5jOjU5MgogIywgYy1mb3JtYXQKLW1zZ2lk ICJjbXA6IEVPRiBvbiAlcyBhZnRlciBieXRlICVzXG4iCi1tc2dzdHIgImNtcO+8miVzIOWc qCAlcyDlrZfoioLlkI7nu5PmnZ9cbiIKK21zZ2lkICJjbXA6IEVPRiBvbiAlcyBhZnRlciBi eXRlICU8UFJJdU1BWD5cbiIKK21zZ3N0ciAiY21w77yaJXMg5ZyoICU8UFJJdU1BWD4g5a2X 6IqC5ZCO57uT5p2fXG4iCiAKICMuIFRoaXMgaXMgYSBwcm9wZXIgbmFtZS4gU2VlIHRoZSBn ZXR0ZXh0IG1hbnVhbCwgc2VjdGlvbiBOYW1lcy4KICM6IHNyYy9kaWZmLmM6NTAK --------------ED1EBD49A7A454B9D5AE2336 Content-Type: text/x-patch; name="cmp-x.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="cmp-x.patch" ZGlmZiAtLWdpdCBhL05FV1MgYi9ORVdTCmluZGV4IDNlY2QxMTEuLjQyM2MwZWUgMTAwNjQ0 Ci0tLSBhL05FV1MKKysrIGIvTkVXUwpAQCAtMjMsNiArMjMsOSBAQCBHTlUgZGlmZnV0aWxz IE5FV1MgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAtKi0gb3V0bGluZSAt Ki0KICAgb3B0aW9uLWFyZ3VtZW50cyBhcyBpZiB0aGV5IHdlcmUgbGFyZ2UgcG9zaXRpdmUg bnVtYmVycy4KICAgW2J1ZyMzNTI1NiBpbnRyb2R1Y2VkIGluIDIuOF0KIAorKiogSW1wcm92 ZW1lbnRzCisKKyAgTmV3IGNtcCBvcHRpb246IC14IG9yIC0tdmVyYm9zZS1oZXguCiAKICog Tm90ZXdvcnRoeSBjaGFuZ2VzIGluIHJlbGVhc2UgMy43ICgyMDE4LTEyLTMxKSBbc3RhYmxl XQogCmRpZmYgLS1naXQgYS9kb2MvZGlmZnV0aWxzLnRleGkgYi9kb2MvZGlmZnV0aWxzLnRl eGkKaW5kZXggM2E3ODBkYi4uYzVlZjk4NCAxMDA2NDQKLS0tIGEvZG9jL2RpZmZ1dGlscy50 ZXhpCisrKyBiL2RvYy9kaWZmdXRpbHMudGV4aQpAQCAtMzU4MSw2ICszNTgxLDExIEBAIHRo ZSBmaWxlcyBkaWZmZXIuCiBAaXRlbSAtdgogQGl0ZW14IC0tdmVyc2lvbgogT3V0cHV0IHZl cnNpb24gaW5mb3JtYXRpb24gYW5kIHRoZW4gZXhpdC4KKworQGl0ZW0gLXgKK0BpdGVteCAt LXZlcmJvc2UtaGV4CitMaWtlIEBvcHRpb257LS12ZXJib3NlfSwgYnV0IHdpdGggaGV4YWRl Y2ltYWwgbnVtYmVycywgYW5kIGJ5dGUgbnVtYmVycworc3RhcnRpbmcgYXQgMC4KIEBlbmQg dGFibGUKIAogSW4gdGhlIGFib3ZlIHRhYmxlLCBvcGVyYW5kcyB0aGF0IGFyZSBieXRlIGNv dW50cyBhcmUgbm9ybWFsbHkKZGlmZiAtLWdpdCBhL3NyYy9jbXAuYyBiL3NyYy9jbXAuYwpp bmRleCA1MTUyY2EwLi41NTU2NjVjIDEwMDY0NAotLS0gYS9zcmMvY21wLmMKKysrIGIvc3Jj L2NtcC5jCkBAIC05MCw2ICs5MCw5IEBAIHN0YXRpYyBlbnVtIGNvbXBhcmlzb25fdHlwZQog LyogSWYgbm9uemVybywgcHJpbnQgdmFsdWVzIG9mIGJ5dGVzIHF1b3RlZCBsaWtlIGNhdCAt dCBkb2VzLiAqLwogc3RhdGljIGJvb2wgb3B0X3ByaW50X2J5dGVzOwogCisvKiBTaG93IHZl cmJvc2Ugb3V0cHV0IHVzaW5nIGhleGFkZWNpbWFsIG51bWJlcnMuICovCitzdGF0aWMgYm9v bCBvcHRfdmVyYm9zZV9oZXg7CisKIC8qIFZhbHVlcyBmb3IgbG9uZyBvcHRpb25zIHRoYXQg ZG8gbm90IGhhdmUgc2luZ2xlLWxldHRlciBlcXVpdmFsZW50cy4gICovCiBlbnVtCiB7CkBA IC0xMDYsNiArMTA5LDcgQEAgc3RhdGljIHN0cnVjdCBvcHRpb24gY29uc3QgbG9uZ19vcHRp b25zW10gPQogICB7InNpbGVudCIsIDAsIDAsICdzJ30sCiAgIHsicXVpZXQiLCAwLCAwLCAn cyd9LAogICB7InZlcnNpb24iLCAwLCAwLCAndid9LAorICB7InZlcmJvc2UtaGV4IiwgMCwg MCwgJ3gnfSwKICAgeyJoZWxwIiwgMCwgMCwgSEVMUF9PUFRJT059LAogICB7MCwgMCwgMCwg MH0KIH07CkBAIC0xNjgsNiArMTcyLDggQEAgc3RhdGljIGNoYXIgY29uc3QgKiBjb25zdCBv cHRpb25faGVscF9tc2dpZFtdID0gewogICBOXygiLXMsIC0tcXVpZXQsIC0tc2lsZW50ICAg ICAgc3VwcHJlc3MgYWxsIG5vcm1hbCBvdXRwdXQiKSwKICAgTl8oIiAgICAtLWhlbHAgICAg ICAgICAgICAgICAgIGRpc3BsYXkgdGhpcyBoZWxwIGFuZCBleGl0IiksCiAgIE5fKCItdiwg LS12ZXJzaW9uICAgICAgICAgICAgICBvdXRwdXQgdmVyc2lvbiBpbmZvcm1hdGlvbiBhbmQg ZXhpdCIpLAorICBOXygiLXgsIC0tdmVyYm9zZS1oZXggICAgICAgICAgb3V0cHV0IGJ5dGUg bnVtYmVycyBhbmQgZGlmZmVyaW5nIGJ5dGUgdmFsdWVzXG4iCisgICAgICIgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgdXNpbmcgaGV4YWRlY2ltYWwgbnVtYmVycyIpLAogICAw CiB9OwogCkBAIC0yMTQsNyArMjIwLDcgQEAgbWFpbiAoaW50IGFyZ2MsIGNoYXIgKiphcmd2 KQogCiAgIC8qIFBhcnNlIGNvbW1hbmQgbGluZSBvcHRpb25zLiAgKi8KIAotICB3aGlsZSAo KGMgPSBnZXRvcHRfbG9uZyAoYXJnYywgYXJndiwgImJjaTpsbjpzdiIsIGxvbmdfb3B0aW9u cywgMCkpCisgIHdoaWxlICgoYyA9IGdldG9wdF9sb25nIChhcmdjLCBhcmd2LCAiYmNpOmxu OnN2eCIsIGxvbmdfb3B0aW9ucywgMCkpCiAgICAgICAgICAhPSAtMSkKICAgICBzd2l0Y2gg KGMpCiAgICAgICB7CkBAIC0yNTYsNiArMjYyLDExIEBAIG1haW4gKGludCBhcmdjLCBjaGFy ICoqYXJndikKICAgICAgICAgY2hlY2tfc3Rkb3V0ICgpOwogICAgICAgICByZXR1cm4gRVhJ VF9TVUNDRVNTOwogCisgICAgICBjYXNlICd4JzoKKyAgICAgICAgc3BlY2lmeV9jb21wYXJp c29uX3R5cGUgKHR5cGVfYWxsX2RpZmZzKTsKKyAgICAgICAgb3B0X3ZlcmJvc2VfaGV4ID0g dHJ1ZTsKKyAgICAgICAgYnJlYWs7CisKICAgICAgIGNhc2UgSEVMUF9PUFRJT046CiAgICAg ICAgIHVzYWdlICgpOwogICAgICAgICBjaGVja19zdGRvdXQgKCk7CkBAIC0zNzgsOCArMzg5 LDEwIEBAIHN0YXRpYyBpbnQKIGNtcCAodm9pZCkKIHsKICAgYm9vbCBhdF9saW5lX3N0YXJ0 ID0gdHJ1ZTsKKyAgb2ZmX3Qgc3RhcnRfb2Zmc2V0ID0gb3B0X3ZlcmJvc2VfaGV4ID8gMCA6 IDE7CiAgIG9mZl90IGxpbmVfbnVtYmVyID0gMTsJLyogTGluZSBudW1iZXIgKDEuLi4pIG9m IGRpZmZlcmVuY2UuICovCi0gIG9mZl90IGJ5dGVfbnVtYmVyID0gMTsJLyogQnl0ZSBudW1i ZXIgKDEuLi4pIG9mIGRpZmZlcmVuY2UuICovCisgIG9mZl90IGJ5dGVfbnVtYmVyID0gc3Rh cnRfb2Zmc2V0OworCQkJCS8qIEJ5dGUgbnVtYmVyICgwLzEuLi4pIG9mIGRpZmZlcmVuY2Uu ICovCiAgIGludG1heF90IHJlbWFpbmluZyA9IGJ5dGVzOwkvKiBSZW1haW5pbmcgYnl0ZXMg dG8gY29tcGFyZSwgb3IgLTEuICAqLwogICBzaXplX3QgcmVhZDAsIHJlYWQxOwkJLyogTnVt YmVyIG9mIGJ5dGVzIHJlYWQgZnJvbSBlYWNoIGZpbGUuICovCiAgIHNpemVfdCBmaXJzdF9k aWZmOwkJLyogT2Zmc2V0ICgwLi4uKSBpbiBidWZmZXJzIG9mIDFzdCBkaWZmLiAqLwpAQCAt Mzk2LDYgKzQwOSw3IEBAIGNtcCAodm9pZCkKICAgICB7CiAgICAgICBvZmZfdCBieXRlX251 bWJlcl9tYXggPSAoMCA8PSBieXRlcyAmJiBieXRlcyA8PSBUWVBFX01BWElNVU0gKG9mZl90 KQogCQkJICAgICAgID8gYnl0ZXMgOiBUWVBFX01BWElNVU0gKG9mZl90KSk7CisgICAgICBp bnQgYmFzZSA9IG9wdF92ZXJib3NlX2hleCA/IDE2IDogMTA7CiAKICAgICAgIGZvciAoZiA9 IDA7IGYgPCAyOyBmKyspCiAgICAgICAgIGlmIChTX0lTUkVHIChzdGF0X2J1ZltmXS5zdF9t b2RlKSkKQEAgLTQwNSw4ICs0MTksMTMgQEAgY21wICh2b2lkKQogICAgICAgICAgICAgICBi eXRlX251bWJlcl9tYXggPSBmaWxlX2J5dGVzOwogICAgICAgICAgIH0KIAotICAgICAgZm9y IChvZmZzZXRfd2lkdGggPSAxOyAoYnl0ZV9udW1iZXJfbWF4IC89IDEwKSAhPSAwOyBvZmZz ZXRfd2lkdGgrKykKKyAgICAgIGJ5dGVfbnVtYmVyX21heCA9IGJ5dGVfbnVtYmVyX21heCAr IHN0YXJ0X29mZnNldCAtIDE7CisKKyAgICAgIGZvciAob2Zmc2V0X3dpZHRoID0gMTsgKGJ5 dGVfbnVtYmVyX21heCAvPSBiYXNlKSAhPSAwOyBvZmZzZXRfd2lkdGgrKykKICAgICAgICAg Y29udGludWU7CisKKyAgICAgIGlmIChvcHRfdmVyYm9zZV9oZXggJiYgb2Zmc2V0X3dpZHRo IDwgOCkKKyAgICAgICAgb2Zmc2V0X3dpZHRoID0gODsKICAgICB9CiAKICAgZm9yIChmID0g MDsgZiA8IDI7IGYrKykKQEAgLTUyNywxMyArNTQ2LDE0IEBAIGNtcCAodm9pZCkKICAgICAg ICAgICAgICAgICAgIHVuc2lnbmVkIGNoYXIgYzEgPSBidWYxW2ZpcnN0X2RpZmZdOwogICAg ICAgICAgICAgICAgICAgaWYgKGMwICE9IGMxKQogICAgICAgICAgICAgICAgICAgICB7Ci0g ICAgICAgICAgICAgICAgICAgICAgY2hhciBieXRlX2J1ZltJTlRfQlVGU0laRV9CT1VORCAo b2ZmX3QpXTsKLSAgICAgICAgICAgICAgICAgICAgICBjaGFyIGNvbnN0ICpieXRlX251bSA9 IG9mZnRvc3RyIChieXRlX251bWJlciwgYnl0ZV9idWYpOwogICAgICAgICAgICAgICAgICAg ICAgIGlmICghb3B0X3ByaW50X2J5dGVzKQogICAgICAgICAgICAgICAgICAgICAgICAgewog ICAgICAgICAgICAgICAgICAgICAgICAgICAvKiBTZWUgUE9TSVggZm9yIHRoaXMgZm9ybWF0 LiAgKi8KLSAgICAgICAgICAgICAgICAgICAgICAgICAgcHJpbnRmICgiJSpzICUzbyAlM29c biIsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgb2Zmc2V0X3dpZHRoLCBi eXRlX251bSwgYzAsIGMxKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgcHJpbnRmIChv cHRfdmVyYm9zZV9oZXggPworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICIl MCoiUFJJeE1BWCIgJS4yeCAlLjJ4XG4iIDoKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAiJSoiUFJJdU1BWCIgJTNvICUzb1xuIiwKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBvZmZzZXRfd2lkdGgsICh1aW50bWF4X3QpIGJ5dGVfbnVtYmVyLAor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGMwLCBjMSk7CiAgICAgICAgICAg ICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgICAgICAgZWxzZQogICAgICAgICAg ICAgICAgICAgICAgICAgewpAQCAtNTQxLDggKzU2MSwxMSBAQCBjbXAgKHZvaWQpCiAgICAg ICAgICAgICAgICAgICAgICAgICAgIGNoYXIgczFbNV07CiAgICAgICAgICAgICAgICAgICAg ICAgICAgIHNwcmludGMgKHMwLCBjMCk7CiAgICAgICAgICAgICAgICAgICAgICAgICAgIHNw cmludGMgKHMxLCBjMSk7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgIHByaW50ZiAoIiUq cyAlM28gJS00cyAlM28gJXNcbiIsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgb2Zmc2V0X3dpZHRoLCBieXRlX251bSwgYzAsIHMwLCBjMSwgczEpOworICAgICAgICAg ICAgICAgICAgICAgICAgICBwcmludGYgKG9wdF92ZXJib3NlX2hleCA/CisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIiUwKiJQUkl4TUFYIiAlLjJ4ICUtNHMgJS4yeCAl c1xuIiA6CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIiUqIlBSSXVNQVgi ICUzbyAlLTRzICUzbyAlc1xuIiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBvZmZzZXRfd2lkdGgsICh1aW50bWF4X3QpIGJ5dGVfbnVtYmVyLAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGMwLCBzMCwgYzEsIHMxKTsKICAgICAgICAgICAgICAg ICAgICAgICAgIH0KICAgICAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgICAg Ynl0ZV9udW1iZXIrKzsKQEAgLTU2NywzMCArNTkwLDMwIEBAIGNtcCAodm9pZCkKICAgICAg ICAgICAgICAgLyogUE9TSVggc2F5cyB0aGF0IGVhY2ggb2YgdGhlc2UgZm9ybWF0IHN0cmlu Z3MgbXVzdCBiZQogICAgICAgICAgICAgICAgICAiY21wOiBFT0Ygb24gJXMiLCBvcHRpb25h bGx5IGZvbGxvd2VkIGJ5IGEgYmxhbmsgYW5kCiAgICAgICAgICAgICAgICAgIGV4dHJhIHRl eHQgc2FucyBuZXdsaW5lLCB0aGVuIHRlcm1pbmF0ZWQgYnkgIlxuIi4gICovCi0gICAgICAg ICAgICAgIGlmIChieXRlX251bWJlciA9PSAxKQorICAgICAgICAgICAgICBpZiAoYnl0ZV9u dW1iZXIgPT0gc3RhcnRfb2Zmc2V0KQogICAgICAgICAgICAgICAgIGZwcmludGYgKHN0ZGVy ciwgXygiY21wOiBFT0Ygb24gJXMgd2hpY2ggaXMgZW1wdHlcbiIpLAogICAgICAgICAgICAg ICAgICAgICAgICAgIHNob3J0ZXJfZmlsZSk7CiAgICAgICAgICAgICAgIGVsc2UKICAgICAg ICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgICBjaGFyIGJ5dGVfYnVmW0lOVF9CVUZT SVpFX0JPVU5EIChvZmZfdCldOwotICAgICAgICAgICAgICAgICAgY2hhciBjb25zdCAqYnl0 ZV9udW0gPSBvZmZ0b3N0ciAoYnl0ZV9udW1iZXIgLSAxLCBieXRlX2J1Zik7Ci0KICAgICAg ICAgICAgICAgICAgIGlmIChjb21wYXJpc29uX3R5cGUgPT0gdHlwZV9maXJzdF9kaWZmKQog ICAgICAgICAgICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgICAgICAgY2hhciBsaW5l X2J1ZltJTlRfQlVGU0laRV9CT1VORCAob2ZmX3QpXTsKLSAgICAgICAgICAgICAgICAgICAg ICBjaGFyIGNvbnN0ICpsaW5lX251bQotICAgICAgICAgICAgICAgICAgICAgICAgPSBvZmZ0 b3N0ciAobGluZV9udW1iZXIgLSBhdF9saW5lX3N0YXJ0LCBsaW5lX2J1Zik7CiAgICAgICAg ICAgICAgICAgICAgICAgZnByaW50ZiAoc3RkZXJyLAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIChhdF9saW5lX3N0YXJ0Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgID8gXygiY21wOiBFT0Ygb24gJXMgYWZ0ZXIgYnl0ZSAlcywgbGluZSAlc1xuIikKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgOiBfKCJjbXA6IEVPRiBvbiAlcyBhZnRl ciBieXRlICVzLCIKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICIgaW4g bGluZSAlc1xuIikpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNob3J0ZXJf ZmlsZSwgYnl0ZV9udW0sIGxpbmVfbnVtKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgPyBfKCJjbXA6IEVPRiBvbiAlcyBhZnRlciBieXRlICUiUFJJdU1BWCIsIgorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIiBsaW5lICUiUFJJdU1BWCJcbiIp CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDogXygiY21wOiBFT0Ygb24gJXMg YWZ0ZXIgYnl0ZSAlIlBSSXVNQVgiLCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICIgaW4gbGluZSAlIlBSSXVNQVgiXG4iKSksCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgc2hvcnRlcl9maWxlLCAodWludG1heF90KSAoYnl0ZV9udW1iZXIgLSAx KSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAodWludG1heF90KSAobGluZV9u dW1iZXIgLSBhdF9saW5lX3N0YXJ0KSk7CiAgICAgICAgICAgICAgICAgICAgIH0KKyAgICAg ICAgICAgICAgICAgIGVsc2UgaWYgKG9wdF92ZXJib3NlX2hleCkKKyAgICAgICAgICAgICAg ICAgICAgZnByaW50ZiAoc3RkZXJyLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICBf KCJjbXA6IEVPRiBvbiAlcyBhdCBieXRlICUjIlBSSXhNQVgiXG4iKSwKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgc2hvcnRlcl9maWxlLCAodWludG1heF90KSBieXRlX251bWJl cik7CiAgICAgICAgICAgICAgICAgICBlbHNlCiAgICAgICAgICAgICAgICAgICAgIGZwcmlu dGYgKHN0ZGVyciwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXygiY21wOiBFT0Yg b24gJXMgYWZ0ZXIgYnl0ZSAlc1xuIiksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAg IHNob3J0ZXJfZmlsZSwgYnl0ZV9udW0pOworICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBfKCJjbXA6IEVPRiBvbiAlcyBhZnRlciBieXRlICUiUFJJdU1BWCJcbiIpLAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBzaG9ydGVyX2ZpbGUsICh1aW50bWF4X3QpIChieXRl X251bWJlciAtIDEpKTsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9CiAKZGlm ZiAtLWdpdCBhL3Rlc3RzL2NtcCBiL3Rlc3RzL2NtcAppbmRleCBmZjQ5Mzg4Li41Yzk2ZGQy IDEwMDc1NQotLS0gYS90ZXN0cy9jbXAKKysrIGIvdGVzdHMvY21wCkBAIC0xNDMsNiArMTQz LDUxIEBAIGNtcCAtcyBkIGMKIDIKIGNtcCAtcyBkIGQKIDIKK2NtcCAteCBhIGEKKzAKK2Nt cCAteCBhIGIKKzAwMDAwMDAwIDYxIDYyCisxCitjbXAgLXggYSBjCitjbXA6IEVPRiBvbiBj IHdoaWNoIGlzIGVtcHR5CisxCitjbXAgLXggYSBkCitjbXA6IGQ6IE5vIHN1Y2ggZmlsZSBv ciBkaXJlY3RvcnkKKzIKK2NtcCAteCBiIGEKKzAwMDAwMDAwIDYyIDYxCisxCitjbXAgLXgg YiBiCiswCitjbXAgLXggYiBjCitjbXA6IEVPRiBvbiBjIHdoaWNoIGlzIGVtcHR5CisxCitj bXAgLXggYiBkCitjbXA6IGQ6IE5vIHN1Y2ggZmlsZSBvciBkaXJlY3RvcnkKKzIKK2NtcCAt eCBjIGEKK2NtcDogRU9GIG9uIGMgd2hpY2ggaXMgZW1wdHkKKzEKK2NtcCAteCBjIGIKK2Nt cDogRU9GIG9uIGMgd2hpY2ggaXMgZW1wdHkKKzEKK2NtcCAteCBjIGMKKzAKK2NtcCAteCBj IGQKK2NtcDogZDogTm8gc3VjaCBmaWxlIG9yIGRpcmVjdG9yeQorMgorY21wIC14IGQgYQor Y21wOiBkOiBObyBzdWNoIGZpbGUgb3IgZGlyZWN0b3J5CisyCitjbXAgLXggZCBiCitjbXA6 IGQ6IE5vIHN1Y2ggZmlsZSBvciBkaXJlY3RvcnkKKzIKK2NtcCAteCBkIGMKK2NtcDogZDog Tm8gc3VjaCBmaWxlIG9yIGRpcmVjdG9yeQorMgorY21wIC14IGQgZAorY21wOiBkOiBObyBz dWNoIGZpbGUgb3IgZGlyZWN0b3J5CisyCiBFT0YKIAogZWNobyBhID5hCkBAIC0xNTAsNyAr MTk1LDcgQEAgZWNobyBiID5iCiA6ID5jCiBybSAtZiBkCiAKLWZvciBvcHRpb24gaW4gJycg LWwgLXM7IGRvCitmb3Igb3B0aW9uIGluICcnIC1sIC1zIC14OyBkbwogICBmb3IgaSBpbiBh IGIgYyBkOyBkbwogICAgIGZvciBqIGluIGEgYiBjIGQ7IGRvCiAgICAgICBlY2hvIGNtcCAk b3B0aW9uICRpICRqCkBAIC0xODksNiArMjM0LDE1IEBAIGNtcCAtcyBhMSBhMgogMQogY21w IC1zIGEyIGEzCiAxCitjbXAgLXggYTAgYTEKK2NtcDogRU9GIG9uIGEwIHdoaWNoIGlzIGVt cHR5CisxCitjbXAgLXggYTEgYTIKK2NtcDogRU9GIG9uIGExIGF0IGJ5dGUgMHgyCisxCitj bXAgLXggYTIgYTMKK2NtcDogRU9GIG9uIGEyIGF0IGJ5dGUgMHg1CisxCiBFT0YKIAogcHJp bnRmICcnID5hMApAQCAtMTk2LDcgKzI1MCw3IEBAIHByaW50ZiAnMVxuJyA+YTEKIHByaW50 ZiAnMVxuZm9vJyA+YTIKIHByaW50ZiAnMVxuZm9vbGVyeVxuJyA+YTMKIAotZm9yIG9wdGlv biBpbiAnJyAtbCAtczsgZG8KK2ZvciBvcHRpb24gaW4gJycgLWwgLXMgLXg7IGRvCiAgIGZv ciBmaWxlcyBpbiAnYTAgYTEnICdhMSBhMicgJ2EyIGEzJzsgZG8KICAgICBlY2hvIGNtcCAk b3B0aW9uICRmaWxlcwogICAgIGNtcCAkb3B0aW9uICRmaWxlcyA+c3Rkb3V0IDI+c3RkZXJy Cg== --------------ED1EBD49A7A454B9D5AE2336-- From unknown Mon Aug 18 15:39:52 2025 X-Loop: help-debbugs@gnu.org Subject: bug#37844: [bug-diffutils] bug#37844: [PATCH] cmp -x/--verbose-hex References: <69a49a9f-eaf6-b9d1-4bac-d6a000461561@gmail.com> In-Reply-To: <69a49a9f-eaf6-b9d1-4bac-d6a000461561@gmail.com> Resent-From: Dave Brand Original-Sender: "Debbugs-submit" Resent-CC: bug-diffutils@gnu.org Resent-Date: Wed, 09 Jul 2025 03:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 37844 X-GNU-PR-Package: diffutils X-GNU-PR-Keywords: patch To: 37844@debbugs.gnu.org Cc: dmo2118@gmail.com X-Debbugs-Original-To: bug-diffutils@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17520319021947 (code B ref -1); Wed, 09 Jul 2025 03:32:02 +0000 Received: (at submit) by debbugs.gnu.org; 9 Jul 2025 03:31:42 +0000 Received: from localhost ([127.0.0.1]:47244 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uZLX2-0000VD-9r for submit@debbugs.gnu.org; Tue, 08 Jul 2025 23:31:41 -0400 Received: from lists.gnu.org ([2001:470:142::17]:36486) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uYr1N-0004YL-I5 for submit@debbugs.gnu.org; Mon, 07 Jul 2025 14:56:58 -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 1uYr1D-0006U3-NZ for bug-diffutils@gnu.org; Mon, 07 Jul 2025 14:56:48 -0400 Received: from k7.kb8c70eb.use4.send.mailgun.net ([204.220.184.7]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uYr1C-0000jT-0U for bug-diffutils@gnu.org; Mon, 07 Jul 2025 14:56:47 -0400 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=pegas.us; q=dns/txt; s=k1; t=1751914594; x=1751921794; h=Cc: From: From: Subject: Subject: To: To: Mime-Version: Date: Message-ID: Content-Type: Sender: Sender; bh=xKuYDLnAzVa8rnoiut+MQSgV4PmxUA1f/9yrdgwsGrE=; b=B+hwKM/OIsGiiOc1wlqO9VkurtT3i7z3nq1pbN7k8JYPDsMT2qWB+WSXkIZNfuChHfTJ3rlpASbtd+lR+7dJrZRILEiN9bmj3vL5cyIMbZ78OrUh5uKUdAh5qpv9Gtm8gfXpCbCanOvpZu0mrimlm6WaHqlwv73nNveST8ZXyPLPm515vOXAq8Kl3g1a79sw6vXb0IJeV6BzWvGB4STUhkX8cNbfFhAWR/L9C9lRBoHxTThtFrUTImAQvEv27q+BphYXRDBOIGBUVx1KPHfNwy1AI1n9Q8XnDlBhLiymbXKQB2ti6dWeI+0fWYmqQhbUnA0Pt8LwgO5lBZXYjgLIJA== X-Mailgun-Sid: WyI5NTU2YyIsImJ1Zy1kaWZmdXRpbHNAZ251Lm9yZyIsImNhYjY3MiJd Received: from mail22.pegas.us (pool-108-41-198-137.nycmny.fios.verizon.net [108.41.198.137]) by 0bda0d106e2b with SMTP id 686c1862cc6d7e936270c656 (version=TLS1.3, cipher=TLS_AES_128_GCM_SHA256); Mon, 07 Jul 2025 18:56:34 GMT X-Mailgun-Sending-Ip: 204.220.184.7 X-Virus-Scanned: Yes Content-Type: multipart/alternative; boundary="------------Xw1iX6AGpdoZedVzTjXdfdWE" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=pegas.us; s=mail; t=1751914591; bh=ru2rElS5610zHd+yLkn+oOQKWLB9SRVhRNzTs66lx6Y=; h=To:Subject:From:Cc; b=MyPJ6oE7RJ+ighvzDUdDNG4qy2ZMrbY7nQMYgtnWV3CWk8dI3UNYH//dZUWIjTZkP weFsPTuvKDJ430rAHkbHaEoKB66yqzlhwCOul0OjlR/Ks4sqg5qUuK3pkFYj5kQgoB U1zsTmdgrmNu6eDPc6MHmhALxhmqyIyBPgIBYGRc0fBpKf80TKGH+ih6mjgWtXbunX tCCI/7lZj87wH2twZWIWttu+uJGNuoOdy6yDRcX2NaM8/xsHXV5rn6HiXxGFnAdwdZ xi74TdIlMm0ZiUQj1oZRD3/j/VCy4gpahv+lol4sCCuBoG+UuLnogztSSwt1CC1cM1 4oVXIOEw5wUst3GQljLV/2wuHeADOUdCFBs1Z0lEUvVaOEtIQfXK30Q4My7sWxsEpw 318qPLg4Y2p+I3sdqxegPyuQNe69JXch62/aVXZP+MGQJ1gA/4ootSpph+AXUe9xBU f8u1w0aTHNnYfVRNiy4x6XK2mS2eu3NvC/+UmhLtURTKY74kO/zsWVaKpthF5WOaTD PD1NxelS45QbDsYeaDICs++2D3YOueQbsvuqkesI7MtO6XKudMD11aVs9kgKMmFzwv OcmDrI7E6vf7V1zoPnAkWdh3FhgxKoGwbQecjD4hYTywKsG7LSaBUsKBXCraURo4C+ yzevAKbaSx2l7FV5hYBJJjYI= Message-ID: <2f4e5476-c3ec-4309-a272-dbc1a3129231@pegas.us> Date: Mon, 7 Jul 2025 14:56:28 -0400 Mime-Version: 1.0 From: Dave Brand Content-Language: en-US Received-SPF: pass client-ip=204.220.184.7; envelope-from=bounce+173b56.cab672-bug-diffutils=gnu.org@pegas.us; helo=k7.kb8c70eb.use4.send.mailgun.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.0 (/) X-Mailman-Approved-At: Tue, 08 Jul 2025 23:31:38 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is a multi-part message in MIME format. --------------Xw1iX6AGpdoZedVzTjXdfdWE Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit > This adds a `-x`/`--verbose-hex` option to `cmp`, similar to what FreeBSD has in > its own `cmp`. From `doc/diffutils.texi`: > > '-x' > '--verbose-hex' > Like '--verbose', but with hexadecimal numbers, and byte numbers > starting at 0. > > A few assorted points: ... I was looking for the `-x` option today and saw it was still unimplemented 5 years after this patch. What is the proper channel to submit pull requests to this project? --------------Xw1iX6AGpdoZedVzTjXdfdWE Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: 7bit 

This adds a `-x`/`--verbose-hex` option to `cmp`, similar to what FreeBSD has in
its own `cmp`. From `doc/diffutils.texi`:

'-x'
'--verbose-hex'
     Like '--verbose', but with hexadecimal numbers, and byte numbers
     starting at 0.

A few assorted points: ...
I was looking for the `-x` option today and saw it was still unimplemented 5 years after this patch. What is the proper channel to submit pull requests to this project?

--------------Xw1iX6AGpdoZedVzTjXdfdWE-- From unknown Mon Aug 18 15:39:52 2025 X-Loop: help-debbugs@gnu.org Subject: bug#37844: [bug-diffutils] bug#37844: bug#37844: [PATCH] cmp -x/--verbose-hex Resent-From: Paul Eggert Original-Sender: "Debbugs-submit" Resent-CC: bug-diffutils@gnu.org Resent-Date: Wed, 09 Jul 2025 21:09:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 37844 X-GNU-PR-Package: diffutils X-GNU-PR-Keywords: patch To: Dave Brand , 37844@debbugs.gnu.org Cc: dmo2118@gmail.com Received: via spool by 37844-submit@debbugs.gnu.org id=B37844.17520953353725 (code B ref 37844); Wed, 09 Jul 2025 21:09:03 +0000 Received: (at 37844) by debbugs.gnu.org; 9 Jul 2025 21:08:55 +0000 Received: from localhost ([127.0.0.1]:52768 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uZc2A-0000xv-St for submit@debbugs.gnu.org; Wed, 09 Jul 2025 17:08:55 -0400 Received: from mail.cs.ucla.edu ([131.179.128.66]:50356) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uZc27-0000wA-Nb for 37844@debbugs.gnu.org; Wed, 09 Jul 2025 17:08:52 -0400 Received: from localhost (localhost [127.0.0.1]) by mail.cs.ucla.edu (Postfix) with ESMTP id 2BB123C0149CB; Wed, 9 Jul 2025 14:08:45 -0700 (PDT) Received: from mail.cs.ucla.edu ([127.0.0.1]) by localhost (mail.cs.ucla.edu [127.0.0.1]) (amavis, port 10032) with ESMTP id aFz5CnVDyoLX; Wed, 9 Jul 2025 14:08:45 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by mail.cs.ucla.edu (Postfix) with ESMTP id 03F843C0149D1; Wed, 9 Jul 2025 14:08:45 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.10.3 mail.cs.ucla.edu 03F843C0149D1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cs.ucla.edu; s=9D0B346E-2AEB-11ED-9476-E14B719DCE6C; t=1752095325; bh=IjbV6aOhJ2B6zjgnipo7mmPH/tYbUk4eaL56zhMcGNE=; h=Message-ID:Date:MIME-Version:To:From; b=Pdr2hoYikHfqb1oHw3wpV+h04bm+Js0i+trymatLRHCFMjK5DjXwD0Vvcjnmo6lj+ yW4nvt5KII1ZKe68T+R6JnItCU4R6BjowkYIs6sgaiiqO6UcajgW7IHXv3AuKlEP9b yG25hbPINXPFB4aQ6TrG00vSjRHK/mvWaXDyy3FrrHs18Up3GQC9r918m06G3i+qfA WZX+OPEImGxURbP9SvcScCv/1NqwL1XV0Tz7KutE2i2mgr0FA5YMScLQY7BZG4B3lp O+MixJvG9IGtDjdiL23/8r5yBqL6U1krSoDlcStFOdaAfWmwRBcCCzoC4qwFj61gGV 4e23y2cX8j8zg== X-Virus-Scanned: amavis at mail.cs.ucla.edu Received: from mail.cs.ucla.edu ([127.0.0.1]) by localhost (mail.cs.ucla.edu [127.0.0.1]) (amavis, port 10026) with ESMTP id RqQyWpTPxCfb; Wed, 9 Jul 2025 14:08:44 -0700 (PDT) Received: from penguin.cs.ucla.edu (47-154-30-222.fdr01.snmn.ca.ip.frontiernet.net [47.154.30.222]) by mail.cs.ucla.edu (Postfix) with ESMTPSA id D5CCA3C0149CB; Wed, 9 Jul 2025 14:08:44 -0700 (PDT) Message-ID: <8dd8f55c-32b7-4a4d-bd21-85f550d016b0@cs.ucla.edu> Date: Wed, 9 Jul 2025 14:08:44 -0700 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird References: <69a49a9f-eaf6-b9d1-4bac-d6a000461561@gmail.com> <2f4e5476-c3ec-4309-a272-dbc1a3129231@pegas.us> Content-Language: en-US From: Paul Eggert Organization: UCLA Computer Science Department In-Reply-To: <2f4e5476-c3ec-4309-a272-dbc1a3129231@pegas.us> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On 2025-07-07 11:56, Dave Brand wrote: >> This adds a `-x`/`--verbose-hex` option to `cmp`, similar to what=20 >> FreeBSD has in >> its own `cmp`. From `doc/diffutils.texi`: >> >> '-x' >> '--verbose-hex' >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 Like '--verbose', but with hexadecimal = numbers, and byte numbers >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 starting at 0. >> >> A few assorted points: ... > I was looking for the `-x` option today and saw it was still=20 > unimplemented 5 years after this patch. What is the proper channel to=20 > submit pull requests to this project? >=20 I'd use "git format-patch" and "git send-email" to this address. If it's=20 a nontrivial change we'll need to ask you for copyright papers.