144280 2006-08-18 00:12 0000 games-engines/gargoyle-20060703 (version bump) 2006-08-23 08:27:41 0000 1 1 1 Unclassified Gentoo Linux Ebuilds unspecified All Linux RESOLVED FIXED P2 enhancement --- 1 Pflugerama@Yahoo.com s4t4n@gentoo.org games@gentoo.org Pflugerama@Yahoo.com 2006-08-18 00:12:39 0000 Gargoyle was nearly a year out of date. Latest version in portage tree is 20051002 Latest available source release is 20060703 Also, the homepage has changed. Reproducible: Always Steps to Reproduce: 1. 2. 3. Pflugerama@Yahoo.com 2006-08-18 00:16:31 0000 Created an attachment (id=94508) gargoyle-20060703.ebuild My first shot at an ebuild. Also, I feel this description better explains what the package is and does. brebs@sent.com 2006-08-18 01:21:42 0000 Please edit the attachment and change its type to "text", so it can easily be viewed. Pflugerama@Yahoo.com 2006-08-18 12:04:02 0000 After further testing, the current ebuild conflicts with games-engines/frotz. Included in the package is a form of frotz modified to take advantage of the library included. However, it's conceivable that someone might want both versions (one for the beautified graphical interface and one for a console interface). It also conflicts with games-emulation/hugo, installing a binary of the same name (though a different program). What would be the preferred fix? Create a patch that renames the binaries to gargoyle-foo and has gargoyle use those instead, then submit it upstream? Unfortunately, I'm no programmer, but this is as good an excuse as any to learn. I'll see if I can figure something out. Pflugerama@Yahoo.com 2006-08-18 20:13:05 0000 Created an attachment (id=94578) New ebuild This ebuild installs the modified binaries. Pflugerama@Yahoo.com 2006-08-18 20:14:43 0000 Created an attachment (id=94579) filename-friendliness.patch Patch that modifies package to install to and use new binaries. s4t4n@gentoo.org 2006-08-21 01:49:19 0000 Gargoyle is but a front-ent to several other interpreters, and the package includes a bundle of them. These should be stripped out from the package, which should in turn depend on the stand-alone frotz and hugo. Pflugerama@Yahoo.com 2006-08-21 08:00:09 0000 (In reply to comment #6) > Gargoyle is but a front-ent to several other interpreters, and the package > includes a bundle of them. Based on the website and source, these included interpreters are modified to make use of the features the included library provides (gamma-correction, sub-pixel rendering, anti-aliasing, etc). The website says they've been "glk-enabled" and in the source, each interpreter's subdir has new files for glk compatibility. Using the stand-alone frotz would require a patch and then would cease to be stand-alone, I think. Adding a "glk" or "gargoyle" USE flag to frotz and adding gargoyle as a requirement may be possible. Also, the stand-alone hugo in portage is a different program than that included here. s4t4n@gentoo.org 2006-08-23 01:00:38 0000 Uhm, understood. I think I'll follow your patch, then... s4t4n@gentoo.org 2006-08-23 06:12:20 0000 In Portage, thanks for the submission! Pflugerama@Yahoo.com 2006-08-23 08:27:41 0000 Thanks for the help. 94508 2006-08-18 00:16 0000 gargoyle-20060703.ebuild gargoyle-20060703.ebuild text/plain IyBDb3B5cmlnaHQgMTk5OS0yMDA2IEdlbnRvbyBGb3VuZGF0aW9uCiMgRGlzdHJpYnV0ZWQgdW5k ZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2MgojICRIZWFk ZXI6ICQKCk1ZX1BWPSIyMDA2LTA3LTAzIgpNWV9QPSR7UE59LSR7TVlfUFZ9ClM9IiR7V09SS0RJ Un0vJHtNWV9QfS1zb3VyY2UvIgpERVNDUklQVElPTj0iQmVhdXRpZmllZCBHbGsgbGlicmFyeSBh bmQgaW50ZXJhY3RpdmUgZmljdGlvbiBtdWx0aS1pbnRlcnByZXRlciIKSE9NRVBBR0U9Imh0dHA6 Ly9jY3h2aWkubmV0L2dhcmdveWxlLyIKU1JDX1VSST0iaHR0cDovL2NjeHZpaS5uZXQvZ2FyZ295 bGUvZG93bmxvYWQvJHtNWV9QfS1zb3VyY2UuemlwIgpMSUNFTlNFPSJCU0QiClNMT1Q9IjAiCktF WVdPUkRTPSJ+eDg2IgpJVVNFPSIiClJERVBFTkQ9Ij49bWVkaWEtbGlicy9mcmVldHlwZS0yLjEu OS1yMQoJPj14MTEtbGlicy9ndGsrLTIuOC44Cgk+PWRldi1saWJzL2dsaWItMi44LjUKCT49bWVk aWEtbGlicy9qcGVnLTZiLXI1Cgk+PW1lZGlhLWxpYnMvbGlicG5nLTEuMi44Cgk+PXN5cy1saWJz L3psaWItMS4yLjMKCT49bWVkaWEtbGlicy9mbW9kLTMuNzQiCgpERVBFTkQ9IiR7UkRFUEVORH0K CT49ZGV2LXV0aWwvamFtLTIuNS1yMwoJYXBwLWFyY2gvdW56aXAiCgpzcmNfY29tcGlsZSgpCnsK CWphbQp9CgpzcmNfaW5zdGFsbCgpCnsKCWRvZG9jIFJlYWRtZS50eHQgZ2FyZ2xrL1RPRE8gbGlj ZW5zZXMvKgoJY2QgYnVpbGQvdGVtcC5saW51eC5yZWxlYXNlCglkb2xpYiBnYXJnbGsvbGliZ2Fy Z2xrLnNvCglkb2JpbiBhZHZzeXMvYWR2c3lzIGFnaWxpdHkvYWdpbGl0eSBhbGFuMi9hbGFuMiBh bGFuMy9hbGFuMyBmcm90ei9mcm90egoJZG9iaW4gZ2FyZ2xrL2dhcmdveWxlIGdpdC9naXQgaHVn by9odWdvIGxldmVsOS9sZXZlbDkgbWFnbmV0aWMvbWFnbmV0aWMKCWRvYmluIHNjYXJlL3NjYXJl IHRhZHMvdGFkc3IKfQo= 94578 2006-08-18 20:13 0000 New ebuild gargoyle-20060703.ebuild text/plain IyBDb3B5cmlnaHQgMTk5OS0yMDA2IEdlbnRvbyBGb3VuZGF0aW9uCiMgRGlzdHJpYnV0ZWQgdW5k ZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2MgojICRIZWFk ZXI6ICQKCk1ZX1BWPSIyMDA2LTA3LTAzIgpNWV9QPSR7UE59LSR7TVlfUFZ9ClM9IiR7V09SS0RJ Un0vJHtNWV9QfS1zb3VyY2UvIgpERVNDUklQVElPTj0iQmVhdXRpZmllZCBHbGsgbGlicmFyeSBh bmQgaW50ZXJhY3RpdmUgZmljdGlvbiBtdWx0aS1pbnRlcnByZXRlciIKSE9NRVBBR0U9Imh0dHA6 Ly9jY3h2aWkubmV0L2dhcmdveWxlLyIKU1JDX1VSST0iaHR0cDovL2NjeHZpaS5uZXQvZ2FyZ295 bGUvZG93bmxvYWQvJHtNWV9QfS1zb3VyY2UuemlwIgpMSUNFTlNFPSJCU0QiClNMT1Q9IjAiCktF WVdPUkRTPSJ+eDg2IgpJVVNFPSIiClJERVBFTkQ9Ij49bWVkaWEtbGlicy9mcmVldHlwZS0yLjEu OS1yMQoJPj14MTEtbGlicy9ndGsrLTIuOC44Cgk+PWRldi1saWJzL2dsaWItMi44LjUKCT49bWVk aWEtbGlicy9qcGVnLTZiLXI1Cgk+PW1lZGlhLWxpYnMvbGlicG5nLTEuMi44Cgk+PXN5cy1saWJz L3psaWItMS4yLjMKCT49bWVkaWEtbGlicy9mbW9kLTMuNzQiCgpERVBFTkQ9IiR7UkRFUEVORH0K CT49ZGV2LXV0aWwvamFtLTIuNS1yMwoJYXBwLWFyY2gvdW56aXAiCgppbmhlcml0IGV1dGlscwoK c3JjX3VucGFjaygpCnsKCXVucGFjayAke0F9CgljZCAke1N9CgllcGF0Y2ggJHtGSUxFU0RJUn0v ZmlsZW5hbWUtZnJpZW5kbGluZXNzLnBhdGNoCn0KCnNyY19jb21waWxlKCkKewoJamFtCn0KCnNy Y19pbnN0YWxsKCkKewoJZG9kb2MgUmVhZG1lLnR4dCBnYXJnbGsvVE9ETyBsaWNlbnNlcy8qCiNT aG91bGQgdG8gY29weSBnYXJnbGsvZ2FyZ2xrLmluaSB0byAvZXRjLywgYnV0IEkgZG9uJ3Qga25v dyB0aGUgc3ludGF4CgljZCBidWlsZC90ZW1wLmxpbnV4LnJlbGVhc2UKCWRvbGliIGdhcmdsay9s aWJnYXJnbGsuc28KCWRvYmluIGFkdnN5cy9nYXJnb3lsZS1hZHZzeXMgYWdpbGl0eS9nYXJnb3ls ZS1hZ2lsaXR5IGFsYW4yL2dhcmdveWxlLWFsYW4yCglkb2JpbiBhbGFuMy9nYXJnb3lsZS1hbGFu MyBnYXJnbGsvZ2FyZ295bGUgZ2l0L2dhcmdveWxlLWdpdAoJZG9iaW4gaHVnby9nYXJnb3lsZS1o dWdvIGxldmVsOS9nYXJnb3lsZS1sZXZlbDkgc2NhcmUvZ2FyZ295bGUtc2NhcmUKCWRvYmluIHRh ZHMvZ2FyZ295bGUtdGFkc3IgZnJvdHovZ2FyZ295bGUtZnJvdHogbWFnbmV0aWMvZ2FyZ295bGUt bWFnbmV0aWMKfQo= 94579 2006-08-18 20:14 0000 filename-friendliness.patch filename-friendliness.patch text/plain ZGlmZiAtclUgMiBnYXJnb3lsZS0yMDA2LTA3LTAzLXNvdXJjZS1wcmUvZ2FyZ2xrL2xhdW5jaGVy LnNoIGdhcmdveWxlLTIwMDYtMDctMDMtc291cmNlL2dhcmdsay9sYXVuY2hlci5zaAotLS0gZ2Fy Z295bGUtMjAwNi0wNy0wMy1zb3VyY2UtcHJlL2dhcmdsay9sYXVuY2hlci5zaAkyMDA2LTA3LTAy IDEzOjIxOjEwLjAwMDAwMDAwMCAtMDQwMAorKysgZ2FyZ295bGUtMjAwNi0wNy0wMy1zb3VyY2Uv Z2FyZ2xrL2xhdW5jaGVyLnNoCTIwMDYtMDgtMTggMTc6MDg6NDMuMDAwMDAwMDAwIC0wNDAwCkBA IC00NSwyNSArNDUsMjUgQEAKIAogY2FzZSAiJGxvd3BhdGgiIGluCi0gICAgKi50YWYgKSAkZGly cGF0aC9zY2FyZSAiJDEiIDs7Ci0gICAgKi5kYXQgKSAkZGlycGF0aC9hZHZzeXMgIiQxIiA7Owot ICAgICouYWd4ICkgJGRpcnBhdGgvYWdpbGl0eSAiJDEiIDs7Ci0gICAgKi5kXCRcJCApICRkaXJw YXRoL2FnaWxpdHkgIiQxIiA7OwotICAgICouYWNkICkgJGRpcnBhdGgvYWxhbjIgIiQxIiA7Owot ICAgICouYTNjICkgJGRpcnBhdGgvYWxhbjMgIiQxIiA7OwotICAgICoudWx4ICkgJGRpcnBhdGgv Z2l0ICIkMSIgOzsKLSAgICAqLmhleCApICRkaXJwYXRoL2h1Z28gIiQxIiA7OwotICAgICoubDkg ICkgJGRpcnBhdGgvbGV2ZWw5ICIkMSIgOzsKLSAgICAqLnNuYSApICRkaXJwYXRoL2xldmVsOSAi JDEiIDs7Ci0gICAgKi5tYWcgKSAkZGlycGF0aC9tYWduZXRpYyAiJDEiIDs7Ci0gICAgKi5nYW0g KSAkZGlycGF0aC90YWRzciAiJDEiIDs7Ci0gICAgKi50MyAgKSAkZGlycGF0aC90YWRzciAiJDEi IDs7Ci0gICAgKi56PyAgKSAkZGlycGF0aC9mcm90eiAiJDEiIDs7CisgICAgKi50YWYgKSAkZGly cGF0aC9nYXJnb3lsZS1zY2FyZSAiJDEiIDs7CisgICAgKi5kYXQgKSAkZGlycGF0aC9nYXJnb3ls ZS1hZHZzeXMgIiQxIiA7OworICAgICouYWd4ICkgJGRpcnBhdGgvZ2FyZ295bGUtYWdpbGl0eSAi JDEiIDs7CisgICAgKi5kXCRcJCApICRkaXJwYXRoL2dhcmdveWxlLWFnaWxpdHkgIiQxIiA7Owor ICAgICouYWNkICkgJGRpcnBhdGgvZ2FyZ295bGUtYWxhbjIgIiQxIiA7OworICAgICouYTNjICkg JGRpcnBhdGgvZ2FyZ295bGUtYWxhbjMgIiQxIiA7OworICAgICoudWx4ICkgJGRpcnBhdGgvZ2Fy Z295bGUtZ2l0ICIkMSIgOzsKKyAgICAqLmhleCApICRkaXJwYXRoL2dhcmdveWxlLWh1Z28gIiQx IiA7OworICAgICoubDkgICkgJGRpcnBhdGgvZ2FyZ295bGUtbGV2ZWw5ICIkMSIgOzsKKyAgICAq LnNuYSApICRkaXJwYXRoL2dhcmdveWxlLWxldmVsOSAiJDEiIDs7CisgICAgKi5tYWcgKSAkZGly cGF0aC9nYXJnb3lsZS1tYWduZXRpYyAiJDEiIDs7CisgICAgKi5nYW0gKSAkZGlycGF0aC9nYXJn b3lsZS10YWRzciAiJDEiIDs7CisgICAgKi50MyAgKSAkZGlycGF0aC9nYXJnb3lsZS10YWRzciAi JDEiIDs7CisgICAgKi56PyAgKSAkZGlycGF0aC9nYXJnb3lsZS1mcm90eiAiJDEiIDs7CiAKLSAg ICAqLmJsYiAgICApICRkaXJwYXRoL2dpdCAiJDEiIDs7Ci0gICAgKi5ibG9yYiAgKSAkZGlycGF0 aC9naXQgIiQxIiA7OwotICAgICouZ2xiICAgICkgJGRpcnBhdGgvZ2l0ICIkMSIgOzsKLSAgICAq LmdibG9yYiApICRkaXJwYXRoL2dpdCAiJDEiIDs7Ci0gICAgKi56bGIgICAgKSAkZGlycGF0aC9m cm90eiAiJDEiIDs7Ci0gICAgKi56YmxvcmIgKSAkZGlycGF0aC9mcm90eiAiJDEiIDs7CisgICAg Ki5ibGIgICAgKSAkZGlycGF0aC9nYXJnb3lsZS1naXQgIiQxIiA7OworICAgICouYmxvcmIgICkg JGRpcnBhdGgvZ2FyZ295bGUtZ2l0ICIkMSIgOzsKKyAgICAqLmdsYiAgICApICRkaXJwYXRoL2dh cmdveWxlLWdpdCAiJDEiIDs7CisgICAgKi5nYmxvcmIgKSAkZGlycGF0aC9nYXJnb3lsZS1naXQg IiQxIiA7OworICAgICouemxiICAgICkgJGRpcnBhdGgvZ2FyZ295bGUtZnJvdHogIiQxIiA7Owor ICAgICouemJsb3JiICkgJGRpcnBhdGgvZ2FyZ295bGUtZnJvdHogIiQxIiA7OwogCiAgICAgKiAp IGVjaG8gImdhcmdveWxlOiBVbmtub3duIGZpbGUgdHlwZTogJDEiIDs7CmRpZmYgLXJVIDIgZ2Fy Z295bGUtMjAwNi0wNy0wMy1zb3VyY2UtcHJlL3RhZHMvSmFtZmlsZSBnYXJnb3lsZS0yMDA2LTA3 LTAzLXNvdXJjZS90YWRzL0phbWZpbGUKLS0tIGdhcmdveWxlLTIwMDYtMDctMDMtc291cmNlLXBy ZS90YWRzL0phbWZpbGUJMjAwNi0wNC0yOCAxNTo1ODowOC4wMDAwMDAwMDAgLTA0MDAKKysrIGdh cmdveWxlLTIwMDYtMDctMDMtc291cmNlL3RhZHMvSmFtZmlsZQkyMDA2LTA4LTE4IDE3OjU3OjUz LjAwMDAwMDAwMCAtMDQwMApAQCAtNjEsNSArNjEsNSBAQAogU0VBUkNIX1NPVVJDRSA9ICQoU1VC RElSKSA7CiAKLU1haW4gdGFkc3IgOgorTWFpbiBnYXJnb3lsZS10YWRzciA6CiAJdDIzcnVuLmNw cAogCW9zYW5zaTEuYyBvc2Fuc2kyLmMgb3NhbnNpMy5jCkBAIC03NCw4ICs3NCw4IEBACiAJOwog Ci1MaW5rTGlicmFyaWVzIHRhZHNyIDogbGlidGFkczIgbGlidGFkczMgOworTGlua0xpYnJhcmll cyBnYXJnb3lsZS10YWRzciA6IGxpYnRhZHMyIGxpYnRhZHMzIDsKIAotTElOSyBvbiB0YWRzciQo U1VGRVhFKSA9ICQoQysrKSA7CitMSU5LIG9uIGdhcmdveWxlLXRhZHNyJChTVUZFWEUpID0gJChD KyspIDsKIAotQVBQUyArPSB0YWRzciA7CitBUFBTICs9IGdhcmdveWxlLXRhZHNyIDsKIApkaWZm IC1yVSAyIGdhcmdveWxlLTIwMDYtMDctMDMtc291cmNlLXByZS90ZXJwcy9KYW1maWxlIGdhcmdv eWxlLTIwMDYtMDctMDMtc291cmNlL3RlcnBzL0phbWZpbGUKLS0tIGdhcmdveWxlLTIwMDYtMDct MDMtc291cmNlLXByZS90ZXJwcy9KYW1maWxlCTIwMDYtMDctMDIgMTM6MjA6MzIuMDAwMDAwMDAw IC0wNDAwCisrKyBnYXJnb3lsZS0yMDA2LTA3LTAzLXNvdXJjZS90ZXJwcy9KYW1maWxlCTIwMDYt MDgtMTggMTY6NTE6NTkuMDAwMDAwMDAwIC0wNDAwCkBAIC0zMiw5ICszMiw5IEBACiAgICAgU3Vi RGlyQ2NGbGFncyAtdyA7CiAKLSAgICBNYWluIGFkdnN5cyA6CisgICAgTWFpbiBnYXJnb3lsZS1h ZHZzeXMgOgogICAgICAgICBhZHZtc2cuYyBhZHZ0cm0uYyBhZHZwcnMuYyBhZHZkYnMuYyBhZHZp bnQuYyBhZHZqdW5rLmMgYWR2ZXhlLmMKICAgICAgICAgZ2xrc3RhcnQuYyA7CiAKLSAgICBBUFBT ICs9IGFkdnN5cyA7CisgICAgQVBQUyArPSBnYXJnb3lsZS1hZHZzeXMgOwogfQogCkBAIC01OCw1 ICs1OCw1IEBACiAgICAgU3ViRGlyQ2NGbGFncyAtREdMS19BTlNJX09OTFkgOwogCi0gICAgTWFp biBhZ2lsaXR5IDoKKyAgICBNYWluIGdhcmdveWxlLWFnaWxpdHkgOgogICAgICAgICBhZ3RyZWFk LmMgZ2FtZWRhdGEuYyB1dGlsLmMgYWd4ZmlsZS5jIGF1eGZpbGUuYyBmaWxlbmFtZS5jCiAgICAg ICAgIHBhcnNlci5jIGV4ZWMuYyBydW52ZXJiLmMgbWV0YWNvbW1hbmQuYyBzYXZlZ2FtZS5jIGRl YnVnY21kLmMKQEAgLTY1LDUgKzY1LDUgQEAKICAgICAgICAgOwogCi0gICAgQVBQUyArPSBhZ2ls aXR5IDsKKyAgICBBUFBTICs9IGdhcmdveWxlLWFnaWxpdHkgOwogfQogCkBAIC04Myw1ICs4Myw1 IEBACiAgICAgU3ViRGlyQ2NGbGFncyAtZnVuc2lnbmVkLWNoYXIgLVduby1wYXJlbnRoZXNlcyAt REdMSyAtRFJFVkVSU0VEIDsKIAotICAgIE1haW4gYWxhbjIgOgorICAgIE1haW4gZ2FyZ295bGUt YWxhbjIgOgogICAgICAgICBhcnVuLmMgbWFpbi5jIGRlYnVnLmMgYXJncy5jIGV4ZS5jIGludGVy LmMgcGFyc2UuYyBydWxlcy5jIHN0YWNrLmMKICAgICAgICAgZGVjb2RlLmMgdGVybS5jIHJldmVy c2UuYyByZWFkbGluZS5jIHBhcmFtcy5jIHN5c2RlcC5jCkBAIC04OSw1ICs4OSw1IEBACiAgICAg ICAgIDsKIAotICAgIEFQUFMgKz0gYWxhbjIgOworICAgIEFQUFMgKz0gZ2FyZ295bGUtYWxhbjIg OwogfQogCkBAIC0xMDYsNSArMTA2LDUgQEAKICAgICBTdWJEaXJDY0ZsYWdzIC1mdW5zaWduZWQt Y2hhciAtREdMSyA7CiAKLSAgICBNYWluIGFsYW4zIDoKKyAgICBNYWluIGdhcmdveWxlLWFsYW4z IDoKICAgICAgICAgYXJ1bi5jIG1haW4uYyBkZWJ1Zy5jIGFyZ3MuYyBleGUuYyBpbnRlci5jIHBh cnNlLmMgcnVsZXMuYyBzdGFjay5jCiAgICAgICAgIGRlY29kZS5jIHRlcm0uYyByZXZlcnNlLmMg cmVhZGxpbmUuYyBwYXJhbXMuYyBzeXNkZXAuYwpAQCAtMTEzLDUgKzExMyw1IEBACiAgICAgICAg IDsKIAotICAgIEFQUFMgKz0gYWxhbjMgOworICAgIEFQUFMgKz0gZ2FyZ295bGUtYWxhbjMgOwog fQogCkBAIC0xMjYsNSArMTI2LDUgQEAKICAgICBPYmpEaXIgZnJvdHogOwogCi0gICAgTWFpbiBm cm90eiA6CisgICAgTWFpbiBnYXJnb3lsZS1mcm90eiA6CiAgICAgICAgIGJ1ZmZlci5jIGVyci5j IGZhc3RtZW0uYyBmaWxlcy5jCiAgICAgICAgIGlucHV0LmMgbWFpbi5jIG1hdGguYyBvYmplY3Qu YyBwcm9jZXNzLmMgcXVldHphbC5jIHJhbmRvbS5jCkBAIC0xMzMsNSArMTMzLDUgQEAKICAgICAg ICAgOwogCi0gICAgQVBQUyArPSBmcm90eiA7CisgICAgQVBQUyArPSBnYXJnb3lsZS1mcm90eiA7 CiB9CiAKQEAgLTE1MCw1ICsxNTAsNSBAQAogICAgIFN1YkRpckNjRmxhZ3MgLURVU0VfSU5MSU5F IDsKIAotICAgIE1haW4gZ2l0IDoKKyAgICBNYWluIGdhcmdveWxlLWdpdCA6CiAgICAgICAgIGdp dC5jIG1lbW9yeS5jIGNvbXBpbGVyLmMgb3Bjb2Rlcy5jIG9wZXJhbmRzLmMKICAgICAgICAgcGVl cGhvbGUuYyB0ZXJwLmMgZ2xrb3AuYyBzZWFyY2guYyBnaXRfdW5peC5jCkBAIC0xNTYsNSArMTU2 LDUgQEAKICAgICAgICAgOwogCi0gICAgQVBQUyArPSBnaXQgOworICAgIEFQUFMgKz0gZ2FyZ295 bGUtZ2l0IDsKIH0KIApAQCAtMTcxLDEwICsxNzEsMTAgQEAKICAgICBpZiAkKE9TKSAhPSBNSU5H VyB7IFN1YkRpckNjRmxhZ3MgLURPU19VTklYIDsgfQogCi0gICAgTWFpbiBnbHVseGUgOgorICAg IE1haW4gZ2FyZ295bGUtZ2x1bHhlIDoKICAgICAgICAgbWFpbi5jIGZpbGVzLmMgdm0uYyBleGVj LmMgZnVuY3MuYyBvcGVyYW5kLmMgc3RyaW5nLmMgZ2xrb3AuYwogICAgICAgICBzZXJpYWwuYyBz ZWFyY2guYyBnZXN0YWx0LmMgb3NkZXBlbmQuYyB1bml4c3RydC5jCiAgICAgICAgIDsKIAotICAg IEFQUFMgKz0gZ2x1bHhlIDsKKyAgICBBUFBTICs9IGdhcmdveWxlLWdsdWx4ZSA7CiB9CiAKQEAg LTIwNiwxMCArMjA2LDEwIEBACiAgICAgICAgIFsgRkRpck5hbWUgJChTVUJESVIpIGhlZ2xrIF0g OwogCi0gICAgTWFpbiBodWdvIDoKKyAgICBNYWluIGdhcmdveWxlLWh1Z28gOgogICAgICAgICBo ZS5jIGhlZXhwci5jIGhlbWlzYy5jIGhlb2JqZWN0LmMgaGVwYXJzZS5jIGhlcmVzLmMgaGVydW4u YyBoZXNldC5jIAogICAgICAgICBzdHJpbmdmbi5jIGhlZ2xrLmMgaGVnbGt1bml4LmMKICAgICAg ICAgOwogCi0gICAgQVBQUyArPSBodWdvIDsKKyAgICBBUFBTICs9IGdhcmdveWxlLWh1Z28gOwog fQogCkBAIC0yMzcsNyArMjM3LDcgQEAKICAgICAgICAgWyBGRGlyTmFtZSAkKFNVQkRJUikgR2xr IF0gOwogCi0gICAgTWFpbiBsZXZlbDkgOiBsZXZlbDkuYyBnbGsuYyA7CisgICAgTWFpbiBnYXJn b3lsZS1sZXZlbDkgOiBsZXZlbDkuYyBnbGsuYyA7CiAKLSAgICBBUFBTICs9IGxldmVsOSA7Cisg ICAgQVBQUyArPSBnYXJnb3lsZS1sZXZlbDkgOwogfQogCkBAIC0yNjgsNyArMjY4LDcgQEAKICAg ICAjIFN1YkRpckNjRmxhZ3MgLUROT0JPUkRFUiA7CiAKLSAgICBNYWluIG1hZ25ldGljIDogZW11 LmMgZ2xrLmMgOworICAgIE1haW4gZ2FyZ295bGUtbWFnbmV0aWMgOiBlbXUuYyBnbGsuYyA7CiAK LSAgICBBUFBTICs9IG1hZ25ldGljIDsKKyAgICBBUFBTICs9IGdhcmdveWxlLW1hZ25ldGljIDsK IH0KIApAQCAtMzE1LDggKzMxNSw4IEBACiAgICAgICAgIHNvdW5kLmMgZ3JhcGhpY3MuYyBibG9y Yi5jIAogICAgICAgICA7Ci0gICAgTWFpbiBuaXRmb2wgOiBtYWluLmMgc3RhcnR1bml4LmMgOwot ICAgIExpbmtMaWJyYXJpZXMgbml0Zm9sIDogbGlibml0Zm9sIDsKKyAgICBNYWluIGdhcmdveWxl LW5pdGZvbCA6IG1haW4uYyBzdGFydHVuaXguYyA7CisgICAgTGlua0xpYnJhcmllcyBnYXJnb3ls ZS1uaXRmb2wgOiBsaWJuaXRmb2wgOwogCi0gICAgQVBQUyArPSBuaXRmb2wgOworICAgIEFQUFMg Kz0gZ2FyZ295bGUtbml0Zm9sIDsKIH0KIApAQCAtMzM2LDUgKzMzNiw1IEBACiAgICAgfQogCi0g ICAgTWFpbiBzY2FyZSA6CisgICAgTWFpbiBnYXJnb3lsZS1zY2FyZSA6CiAgICAgICAgIHNjdGFm cGFyLmMgc2N0YWZmaWwuYyBzY3Byb3BzLmMgc2N2YXJzLmMgc2NleHByLmMgc2NwcmludGYuYwog ICAgICAgICBzY2ludGVyZi5jIHNjcGFyc2VyLmMgc2NsaWJyYXIuYyBzY3J1bi5jIHNjZXZlbnRz LmMgc2NucGNzLmMKQEAgLTM0Myw1ICszNDMsNSBAQAogICAgICAgICA7CiAKLSAgICBBUFBTICs9 IHNjYXJlIDsKKyAgICBBUFBTICs9IGdhcmdveWxlLXNjYXJlIDsKIH0KIAo=