136048 2006-06-08 03:29 0000 [PATCH] gentoolkit-dev: subversion support for echangelog 2007-06-04 22:34:56 0000 1 1 1 Unclassified Portage Development Tools unspecified All Linux RESOLVED FIXED http://overlays.gentoo.org/svn/proj/sunrise/app-portage/gentoolkit-dev InOverlay, InSVN P2 normal --- 176337 1 genstef@gentoo.org tools-portage@gentoo.org dertobi123@gentoo.org mcummings@gentoo.org nelchael@gentoo.org pclouds@gentoo.org tcort@gentoo.org genstef@gentoo.org 2006-06-08 03:29:23 0000 Hi, I have made a patch for echangelog to support subversion in echangelog. Would be nice to find it in gentoolkit-dev so we can have decent changelogs in overlays :) genstef@gentoo.org 2006-06-08 03:29:41 0000 Created an attachment (id=88661) echangelog-svn.diff antarus@gentoo.org 2006-06-08 03:56:01 0000 tools, give a few days (slaughtered at work at the moment) and I'll have a patch for git and possibly mercurial along with a new gentoolkit-dev ebuild with correct deps. genstef@gentoo.org 2006-06-08 05:45:12 0000 I have added this to the sunrise overlay so we can use a working echangelog while we are waiting :) antarus@gentoo.org 2006-12-08 12:34:02 0000 Created an attachment (id=103643) hopefully a bit more agnostic patch please please please test this ;) fuzzyray@gentoo.org 2007-02-12 17:27:51 0000 I need assistance with this one. I don't have the resources or time to test this one. So I need someone to test and let me know which patch is better suited for inclusion. genstef@gentoo.org 2007-02-12 17:45:29 0000 http://www.gentoo-sunrise.org/svn-sunrise-commit/trunk/echangelog-tng this one has been working perfectly for sunrise for several months now nelchael@gentoo.org 2007-02-12 17:59:09 0000 It works fine for me - I've tested Alec's one, it needed the one change: system("$vcs{$vcs}{add} ChangeLog > /dev/null 2>&1") line #439 genstef@gentoo.org 2007-02-16 11:37:03 0000 What is up Paul? 4 days and no reaction, seems your interest has ceased again :/ fuzzyray@gentoo.org 2007-02-16 16:09:33 0000 Close but not quite. I've been busy with work and sick with the flu. I plan on updating subversion this weekend. fuzzyray@gentoo.org 2007-02-19 18:09:28 0000 $ svn commit -m "Update echangelog to support Subversion and git. Bug #136048" Sending echangelog/echangelog Transmitting file data . Committed revision 348. antarus@gentoo.org 2007-02-19 20:51:11 0000 (In reply to comment #10) > $ svn commit -m "Update echangelog to support Subversion and git. Bug #136048" > Sending echangelog/echangelog > Transmitting file data . > Committed revision 348. oh snap, genstef can't cut my nuts off now! genstef@gentoo.org 2007-02-19 21:10:42 0000 (In reply to comment #11) > oh snap, genstef can't cut my nuts off now! heh, I still can for repoman now. Is there a bug open about that one? I dont think anyone besides me and the prefix people cares. Sunrise has its own replacement. Hopefully we will soon have paludis/pkgcore replacements that allow committing to svn/git. fuzzyray@gentoo.org 2007-03-21 13:50:22 0000 The patch is not working correctly with CVS and the gentoo-x86 tree. I received the following when going to update gentoolkit-dev: $ cvs update M Manifest A gentoolkit-dev-0.2.6.3.ebuild A files/digest-gentoolkit-dev-0.2.6.3 $ echangelog ** ** NOTE: No non-trivial changed files found. Normally echangelog ** should be run after all affected files have been added and/or ** modified. Did you forget to cvs add? ** Use of uninitialized value in concatenation (.) or string at /usr/bin/echangelog line 326. --- ChangeLog 2007-03-21 08:31:11.000000000 -0500 +++ ChangeLog.new 2007-03-21 08:32:39.000000000 -0500 @@ -2,6 +2,9 @@ # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit-dev/ChangeLog,v 1.48 2007/01/20 16:29:14 fuzzyray Exp $ + 21 Mar 2007; Paul Varner <fuzzyray@gentoo.org> ChangeLog: + Revbump to add subversion support to echangelog (Bug #136048) + 20 Jan 2007; Paul Varner <fuzzyray@gentoo.org> -gentoolkit-dev-0.2.5.ebuild, -gentoolkit-dev-0.2.6.1.ebuild: Removed older ebuilds which install epkgmove So I need to get this figured out before releasing. For any developer who wants to help, the source is available at: svn+ssh://svn.gentoo.org/var/svnroot/gentoolkit/trunk/ fuzzyray@gentoo.org 2007-03-21 15:55:41 0000 Nevermind on the previous comment. It was apparently a PEBKAC problem since I re-applied the patch and it seems to be working correctly. fuzzyray@gentoo.org 2007-03-21 19:15:54 0000 Released in gentoolkit-dev-0.2.6.3 fuzzyray@gentoo.org 2007-03-25 05:34:39 0000 gentoolkit-dev-0.2.6.3 removed from tree due to too much breakage caused by the patch. I am reverting back to the original code prior to the patch. mcummings@gentoo.org 2007-03-26 21:54:39 0000 are there any examples of the breakages? (curious :) fuzzyray@gentoo.org 2007-03-26 22:22:01 0000 Bug# 172017 was the big one. Additionaly, the patch was prefixing removed files with a comma instead of a dash. Due to the fact that Changelogs in the tree were getting broken, I chose to revert it, rather than keep troubleshooting and testing. I'm willing to put this patch back in, but we need to ensure that it is highly tested and debugged prior to doing so. genstef@gentoo.org 2007-04-16 09:39:52 0000 can you attach your current version here please and deprecate the other attachments? Maybe we can then collectively work towards solving the problem. And it would be cool if you could mask broken versions instead of bringing out new versions with exactly the same content as in a lower version number. Saves us all a lot of download and makes sure that the problem is not forgotten, and that we can still emerge the version to test it. Also looked kinda as if you wanted to drop this for good how you handled it and have no intentions to fix or let others fix this, disappointing :/ I hope I am wrong there. Removed the now no longer applicable inSVN keyword. fuzzyray@gentoo.org 2007-04-16 20:42:53 0000 (In reply to comment #19) > can you attach your current version here please and deprecate the other > attachments? The version that was patched can be found at: http://sources.gentoo.org/viewcvs.py/gentoolkit/trunk/src/echangelog/echangelog?rev=363 > Also looked kinda as if you wanted to drop this for good how you handled it > and have no intentions to fix or let others fix this, disappointing :/ > I hope I am wrong there. I'm confused here, my previous comment stated "I'm willing to put this patch back in" with the caveat that we need to test it fully. Finally, the reason it was yanked was because I was asked to yank it due the ChangeLog breakage that it caused. betelgeuse@gentoo.org 2007-04-16 21:05:19 0000 (In reply to comment #20) > > Finally, the reason it was yanked was because I was asked to yank it due the > ChangeLog breakage that it caused. > The normal procedure in these cases is package.mask which was already done. Not a version bump with the same stuff as the previous version. fuzzyray@gentoo.org 2007-04-16 23:02:50 0000 The version bump was mainly to fix another bug and was unrelated to this. However, upon re-reading my Changelog message it didn't come across that way. So I apologize about that. genstef@gentoo.org 2007-04-25 11:07:06 0000 $ diff -u echangelog.orig echangelog.fixed --- echangelog.orig 2007-04-25 13:05:14.000000000 +0200 +++ echangelog.fixed 2007-04-25 13:05:55.000000000 +0200 @@ -121,7 +121,7 @@ next; } push @files, $filename; - ($actions{$filename} = $status) =~ tr/ARDM/+--/d; + ($actions{$filename} = $status) =~ tr/DARM/-+-/d; } } That fixes the prefixed with "," bug. I wonder where you got this borken version of the echangelog svn support .. Looking at another issue atm, changed ebuilds are omitted :/ Please apply this patch :) genstef@gentoo.org 2007-04-25 11:48:07 0000 --- echangelog.orig 2007-04-25 13:05:14.000000000 +0200 +++ echangelog.fixed 2007-04-25 13:49:17.000000000 +0200 @@ -261,7 +261,7 @@ # We assume GNU diff output format here. # git format: diff --git a/app-doc/repodoc/metadata.xml b/app-doc/repodoc/metadata.xml elsif (/$vcs{$vcs}{regex}/) { - my ($f) = ($1); + my ($f) = ($2); # file was removed from git if (/^deleted file mode/) { $_ = <C>; # just eat the line Fixes the bug with modified files not being diplayed. fuzzyray@gentoo.org 2007-04-25 15:21:58 0000 $ svn commit -m "Re-added subversion/git support with fixes from genstef. (Bug #136048)" Sending ChangeLog Sending src/echangelog/echangelog Transmitting file data .. Committed revision 395. http://sources.gentoo.org/viewcvs.py/gentoolkit/trunk/src/echangelog/echangelog?rev=395 genstef@gentoo.org 2007-04-26 06:49:40 0000 *** Bug 89827 has been marked as a duplicate of this bug. *** genstef@gentoo.org 2007-06-04 22:34:56 0000 finally unmasked and fixed, thanks 88661 2006-06-08 03:29 0000 echangelog-svn.diff echangelog-svn.diff text/plain LS0tIC9maWxlcy9lY2hhbmdlbG9nCTIwMDYtMDYtMDggMTI6MTI6MzQuMDAwMDAwMDAwICswMjAw CisrKyAvdXNyL2Jpbi9lY2hhbmdlbG9nCTIwMDYtMDYtMDggMTI6MjM6MjEuMDAwMDAwMDAwICsw MjAwCkBAIC00Nyw3ICs0NywxMiBAQAogfQogCiAjIEZpZ3VyZSBvdXQgd2hhdCBoYXMgY2hhbmdl ZCBhcm91bmQgaGVyZQoraWYgKC1lICJDVlMvRW50cmllcyIpIHsKIG9wZW4gQywgJ2N2cyAtZm4g dXAgMj4mMSB8JyBvciBkaWUgIkNhbid0IHJ1biBjdnMgLWZuIHVwOiAkIVxuIjsKK30gZWxzaWYg KC1lICIuc3ZuL2VudHJpZXMiKSB7CitvcGVuIEMsICdzdm4gc3QgMj4mMSB8JyBvciBkaWUgIkNh bid0IHJ1biBzdm4gc3Q6ICQhXG4iOworfQorCiB3aGlsZSAoPEM+KSB7CiAgICAgaWYgKC9eQyAo XFMrKS8pIHsKICAgICAgICAgcHVzaCBAY29uZmxpY3RzLCAkMTsgCkBAIC01Niw3ICs2MSw3IEBA CiAgICAgICAgIHB1c2ggQHVua25vd24sICQxOwogICAgICAgICAkYWN0aW9uc3skMX0gPSAnKyc7 CiAgICAgICAgIG5leHQ7Ci0gICAgfSBlbHNpZiAoL14oW0FSTV0pIChcUyspLykgeworICAgIH0g ZWxzaWYgKC9eKFtBUk1dKSAqKFxTKykvKSB7CiAgICAgICAgIHB1c2ggQGZpbGVzLCAkMjsKICAg ICAgICAgKCRhY3Rpb25zeyQyfSA9ICQxKSA9fiB0ci9BUk0vKy0vZDsKICAgICB9CkBAIC04NCw3 ICs4OSw3IEBACiAjIG91dCBhYm92ZSkKIGlmIChAdW5rbm93bikgewogICAgIHByaW50IFNUREVS UiA8PEVPVDsKLUN2cyByZXBvcnRzIHRoZSBmb2xsb3dpbmcgdW5rbm93biBmaWxlcy4gIFBsZWFz ZSB1c2UgImN2cyBhZGQiIGJlZm9yZQorQ3ZzIHJlcG9ydHMgdGhlIGZvbGxvd2luZyB1bmtub3du IGZpbGVzLiAgUGxlYXNlIHVzZSAiY3ZzL3N2biBhZGQiIGJlZm9yZQogcnVubmluZyBlY2hhbmdl bG9nLCBvciByZW1vdmUgdGhlIGZpbGVzIGluIHF1ZXN0aW9uLgogRU9UCiAgICAgcHJpbnQgU1RE RVJSIG1hcCAiPyAkX1xuIiwgQHVua25vd247CkBAIC0xODAsMTAgKzE4NSwxNSBAQAogQGVidWls ZHMgPSBncmVwIC9cLmVidWlsZCQvLCBAZmlsZXM7CiBAZmlsZXMgPSBncmVwICEvXC5lYnVpbGQk LywgQGZpbGVzOwogaWYgKEBlYnVpbGRzKSB7CisgICAgaWYgKC1lICJDVlMvRW50cmllcyIpIHsK ICAgICBvcGVuIEMsICJjdnMgLWYgZGlmZiAtVTAgQGVidWlsZHMgMj4mMSB8IiBvciBkaWUgIkNh bid0IHJ1biBjdnMgZGlmZjogJCFcbiI7CisgICAgfSBlbHNpZiAoLWUgIi5zdm4vZW50cmllcyIp IHsKKyAgICBvcGVuIEMsICdzdm4gLS1mb3JjZSBkaWZmIEBlYnVpbGRzIDI+JjEgfCcgb3IgZGll ICJDYW4ndCBydW4gc3ZuIGRpZmY6ICQhXG4iOworICAgIH0KKwogICAgICRfID0gPEM+OwogICAg IHdoaWxlIChkZWZpbmVkICRfKSB7Ci0gICAgICAgIGlmICgvXmN2cyBkaWZmOiAoKFteXC9dKj8p XC5lYnVpbGQpIHdhcyByZW1vdmVkLykgeyAKKyAgICAgICAgaWYgKC9eY3ZzXC9zdm4gZGlmZjog KChbXlwvXSo/KVwuZWJ1aWxkKSB3YXMgcmVtb3ZlZC8pIHsgCiAgICAgICAgICAgICBwdXNoIEBm aWxlcywgJDE7CiAgICAgICAgIH0KICAgICAgICAgZWxzaWYgKC9eSW5kZXg6ICgoW15cL10qPylc LmVidWlsZClccyokLykgeyAKQEAgLTIwNywxMSArMjE3LDExIEBACiAgICAgICAgICAgICAjIGFu ZCB3ZSBoYXZlIHRoZSBuZXh0IGxpbmUgaW4gJF8gZm9yIHByb2Nlc3NpbmcKICAgICAgICAgICAg IG5leHQ7CiAgICAgICAgIH0KLSAgICAgICAgZWxzaWYgKC9eY3ZzLio/OiAoKFteXC9dKj8pXC5l YnVpbGQpIGlzIGEgbmV3IGVudHJ5LykgeyAKKyAgICAgICAgZWxzaWYgKC9eY3ZzXC9zdm4uKj86 ICgoW15cL10qPylcLmVidWlsZCkgaXMgYSBuZXcgZW50cnkvKSB7IAogICAgICAgICAgICAgcHVz aCBAZmlsZXMsICQxOwogICAgICAgICAgICAgcHVzaCBAbmV3X3ZlcnNpb25zLCAkMjsgICMgbmV3 IGVidWlsZCwgd2lsbCBjcmVhdGUgYSBuZXcgZW50cnkKICAgICAgICAgfQotICAgICAgICAjIG90 aGVyIGN2cyBvdXRwdXQgaXMgaWdub3JlZAorICAgICAgICAjIG90aGVyIGN2cy9zdm4gb3V0cHV0 IGlzIGlnbm9yZWQKICAgICAgICAgJF8gPSA8Qz47CiAgICAgfQogfQpAQCAtMjMwLDcgKzI0MCw3 IEBACiAgICAgcHJpbnQgU1RERVJSICIqKlxuIjsKICAgICBwcmludCBTVERFUlIgIioqIE5PVEU6 IE5vIG5vbi10cml2aWFsIGNoYW5nZWQgZmlsZXMgZm91bmQuICBOb3JtYWxseSBlY2hhbmdlbG9n XG4iOwogICAgIHByaW50IFNUREVSUiAiKiogc2hvdWxkIGJlIHJ1biBhZnRlciBhbGwgYWZmZWN0 ZWQgZmlsZXMgaGF2ZSBiZWVuIGFkZGVkIGFuZC9vclxuIjsKLSAgICBwcmludCBTVERFUlIgIioq IG1vZGlmaWVkLiAgRGlkIHlvdSBmb3JnZXQgdG8gY3ZzIGFkZD9cbiI7CisgICAgcHJpbnQgU1RE RVJSICIqKiBtb2RpZmllZC4gIERpZCB5b3UgZm9yZ2V0IHRvIGN2cy9zdm4gYWRkP1xuIjsKICAg ICBwcmludCBTVERFUlIgIioqXG4iOwogICAgIEBmaWxlcyA9IHNvcnQgc29ydGZ1bmMgQHRyaXZp YWw7CiAgICAgQGZpbGVzID0gcXcvQ2hhbmdlTG9nLyB1bmxlc3MgQGZpbGVzOyAgIyBsYXN0IHJl c29ydCB0byBwdXQgc29tZXRoaW5nIGluIHRoZSBsaXN0CkBAIC0zNjIsNyArMzcyLDkgQEAKICMg VGhlIHRleHQgd2lsbCBiZSBhZGRlZCBqdXN0IGxpa2Ugd2l0aCBhbnkgb3RoZXIgQ2hhbmdlTG9n IGJlbG93LiAgCiAjIEFkZCB0aGUgbmV3IENoYW5nZUxvZyB0byBjdnMgYmVmb3JlIGNvbnRpbnVp bmcuCiBpZiAob3BlbiBGLCAiQ1ZTL0VudHJpZXMiKSB7Ci0gICAgc3lzdGVtKCJjdnMgLWYgYWRk IENoYW5nZUxvZyIpIHVubGVzcyAoc2NhbGFyIGdyZXAgL15cL0NoYW5nZUxvZ1wvLywgPEY+KTsK KyAgICBzeXN0ZW0oImN2cyAtZiBhZGQgQ2hhbmdlTGNnIikgdW5sZXNzIChzY2FsYXIgZ3JlcCAv XlwvQ2hhbmdlTG9nXC8vLCA8Rj4pOworfSBlbHNpZiAob3BlbiBGLCAiLnN2bi9lbnRyaWVzIikg eworICAgIHN5c3RlbSgic3ZuIC0tZm9yY2UgYWRkIENoYW5nZUxvZyIpIHVubGVzcyAoc2NhbGFy IGdyZXAgL15cL0NoYW5nZUxvZ1wvLywgPEY+KTsKIH0KIAogIyB2aW06c3c9NCB0cz04IGV4cGFu ZHRhYgo= 103643 2006-12-08 12:34 0000 hopefully a bit more agnostic patch echangelog-svn.patch text/plain LS0tIGVjaGFuZ2Vsb2cJMjAwNi0xMi0wOCAxNToyMjo1OS40ODk2OTQyODUgLTA1MDAKKysrIC9o b21lL2FudGFydXMvY3ZzbWlncmF0aW9uL3NyYy90b29scy9lY2hhbmdlbG9nL2VjaGFuZ2Vsb2cJ MjAwNi0xMi0wOCAxNTo0MDoxNi42NTk2OTQyODUgLTA1MDAKQEAgLTIwLDcgKzIwLDM4IEBACiAK ICMgR2xvYmFsIHZhcmlhYmxlcwogbXkgKEBmaWxlcywgQGVidWlsZHMsIEBjb25mbGljdHMsIEB0 cml2aWFsLCBAdW5rbm93biwgQG5ld192ZXJzaW9ucywgJWFjdGlvbnMpOwotbXkgKCRpbnB1dCwg JGVkaXRvciwgJGVudHJ5LCAkdXNlciwgJGRhdGUsICR0ZXh0LCAkdmVyc2lvbiwgJHllYXIpOwor bXkgKCRpbnB1dCwgJGVkaXRvciwgJGVudHJ5LCAkdXNlciwgJGRhdGUsICR0ZXh0LCAkdmVyc2lv biwgJHllYXIsICR2Y3MpOworCitteSAldmNzID0gICAgICggY3ZzID0+IHsgZGlmZiA9PiAiY3Zz IC1mIC1VMCBkaWZmIiwKKwkJCSBzdGF0dXMgPT4gImN2cyAtZm4gdXAiLAorCQkJIGFkZCA9PiAi Y3ZzIC1mIGFkZCIsCisJCQkgc2tpcCA9PiA2LAorCQkJIHJlZ2V4ID0+IHFyL15JbmRleDogKCko KFteXC9dKj8pXC5lYnVpbGQpXHMqJC8gfSwKKwkJc3ZuID0+IHsgZGlmZiA9PiAic3ZuIGRpZmYg LU4iLAorCQkJIHN0YXR1cyA9PiAic3ZuIHN0YXR1cyIsCisJCQkgYWRkID0+ICJzdm4gYWRkIiwK KwkJCSBza2lwID0+IDYsCisJCQkgcmVnZXggPT4gcXIvXkluZGV4OiAoKSgoW15cL10qPylcLmVi dWlsZClccyokLyB9LAorCQlnaXQgPT4geyBkaWZmID0+ICJnaXQgZGlmZiIsCisJCQkgc3RhdHVz ID0+ICJnaXQgZGlmZi1pbmRleCBIRUFEIC0tbmFtZS1zdGF0dXMiLAorCQkJIGFkZCA9PiAiZ2l0 IGFkZCIsCisJCQkgc2tpcCA9PiA0LAorCQkJIHJlZ2V4ID0+IHFyL15kaWZmIFwtXC1naXQgXFMq XC8oKFxTKilcLmVidWlsZCkvIH0KKworKTsKKworIyBGaWd1cmUgb3V0IHdoYXQga2luZCBvZiBy ZXBvIHdlIGFyZSBpbi4KKworaWYgKCAtZCAiQ1ZTIiApIHsKKyAgICR2Y3MgPSAiY3ZzIjsKK30g ZWxzaWYgKCAtZCAnLnN2bicgKSB7CisgICAgJHZjcyA9ICJzdm4iOworfSBlbHNpZiAoIG9wZW4g R0lULCAiZ2l0IHJldi1wYXJzZSAtLWdpdC1kaXIgfCIgKSB7CisgICAgJHZjcyA9ICJnaXQiOwor ICAgIGNsb3NlIEdJVDsKK30gZWxzZSB7CisgICAgZGllICJObyBDVlMsIC5naXQsIC5zdm4gZGly ZWN0b3JpZXMgZm91bmQsIHdoYXQga2luZCBvZiByZXBvIGlzIHRoaXM/IjsKK30KIAogIyBSZWFk IHRoZSBjdXJyZW50IENoYW5nZUxvZwogaWYgKC1mICdDaGFuZ2VMb2cnKSB7CkBAIC0zMCw4ICs2 MSwxMiBAQAogfSBlbHNlIHsKICAgICAjIE5vIENoYW5nZUxvZyBoZXJlLCBtYXliZSB3ZSBzaG91 bGQgbWFrZSBvbmUuLi4KICAgICBpZiAoPCouZWJ1aWxkPikgewotICAgICAgICBvcGVuIEksICc8 Li4vLi4vc2tlbC5DaGFuZ2VMb2cnIAotICAgICAgICAgICAgb3IgZGllICJDYW4ndCBvcGVuIC4u Ly4uL3NrZWwuQ2hhbmdlTG9nIGZvciBpbnB1dDogJCFcbiI7CisJb3BlbiBDLCAicG9ydGFnZXEg ZW52dmFyIFBPUlRESVIgfCIgb3IgZGllICJDYW4ndCBmaW5kIFBPUlRESVIiOworCW15ICgkbmV3 KSA9IDxDPjsKKwljbG9zZSBDOworCSRuZXcgPX4gcy9ccyskLy87CisgICAgICAgIG9wZW4gSSwg IjwgJG5ldy9za2VsLkNoYW5nZUxvZyIgCisgICAgICAgICAgICBvciBkaWUgIkNhbid0IG9wZW4g JG5ldy9za2VsLkNoYW5nZUxvZyBmb3IgaW5wdXQ6ICQhXG4iOwogICAgICAgICB7IGxvY2FsICQv ID0gdW5kZWY7ICR0ZXh0ID0gPEk+OyB9CiAgICAgICAgIGNsb3NlIEk7CiAgICAgICAgIG15ICgk Y3dkKSA9IGdldGN3ZCgpOwpAQCAtNDYsMTkgKzgxLDQ3IEBACiAgICAgfQogfQogCisKICMgRmln dXJlIG91dCB3aGF0IGhhcyBjaGFuZ2VkIGFyb3VuZCBoZXJlCi1vcGVuIEMsICdjdnMgLWZuIHVw IDI+JjEgfCcgb3IgZGllICJDYW4ndCBydW4gY3ZzIC1mbiB1cDogJCFcbiI7CitvcGVuIEMsICR2 Y3N7JHZjc317c3RhdHVzfS4nIDI+JjEgfCcgb3IgZGllICJDYW4ndCBydW4gIi4kdmNzeyR2Y3N9 e3N0YXR1c30uIjogJCFcbiI7CiB3aGlsZSAoPEM+KSB7Ci0gICAgaWYgKC9eQyAoXFMrKS8pIHsK LSAgICAgICAgcHVzaCBAY29uZmxpY3RzLCAkMTsgCisgICAgaWYgKC9eQ1xzKyhcUyspLykgewor ICAgICAgICBpZigkdmNzIGVxICJnaXQiKSB7CisgICAgICAgICAgICBteSAkZmlsZW5hbWUgPSAk MjsKKyAgICAgICAgICAgICRmaWxlbmFtZSA9fiAvXFMqXC8oXFMqKS87CisJICAgIGlmKCAtZCAk MSApIHsKKwkJbmV4dDsKKwkgICAgfQorICAgICAgICAgICAgcHVzaCBAY29uZmxpY3RzLCAkMTsK KyAgICAgICAgICAgIG5leHQ7IAorICAgICAgICB9CisgICAgICAgIHB1c2ggQGNvbmZsaWN0cywg JDE7CiAgICAgICAgIG5leHQ7Ci0gICAgfSBlbHNpZiAoL15cPyAoXFMrKS8pIHsKLSAgICAgICAg cHVzaCBAdW5rbm93biwgJDE7CisgICAgfSBlbHNpZiAoL15cP1xzKyhcUyspLykgeworICAgICAg ICBpZigkdmNzIGVxICJnaXQiKSB7CisgICAgICAgICAgICBteSAkZmlsZW5hbWUgPSAkMjsKKyAg ICAgICAgICAgICRmaWxlbmFtZSA9fiAvXFMqXC8oXFMqKS87CisJICAgIGlmKCAtZCAkMSApIHsK KwkJbmV4dDsKKwkgICAgfQorICAgICAgICAgICAgcHVzaCBAdW5rbm93biwgJDE7CisgICAgICAg ICAgICBuZXh0OyAKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIHB1c2ggQHVua25vd24s ICQxOworICAgICAgICB9CiAgICAgICAgICRhY3Rpb25zeyQxfSA9ICcrJzsKICAgICAgICAgbmV4 dDsKLSAgICB9IGVsc2lmICgvXihbQVJNXSkgKFxTKykvKSB7Ci0gICAgICAgIHB1c2ggQGZpbGVz LCAkMjsKLSAgICAgICAgKCRhY3Rpb25zeyQyfSA9ICQxKSA9fiB0ci9BUk0vKy0vZDsKKyAgICB9 IGVsc2lmICgvXihbQVJNRF0pXHMrKFxTKykvKSB7ICAgICAgICAKKyAgICAgICAgbXkgKCRzdGF0 dXMsICRmaWxlbmFtZSkgPSAoJDEsJDIpOworICAgICAgICBpZigkdmNzIGVxICJnaXQiKSB7Cisg ICAgICAgICAgICAkZmlsZW5hbWUgPX4gL1xTKlwvKFxTKikvOworCSAgICAkZmlsZW5hbWUgPSAk MTsKKyAgICAgICAgfQorCWlmKCAtZCAkZmlsZW5hbWUgKSB7CisJICAgIG5leHQ7CisJfQorICAg ICAgICBwdXNoIEBmaWxlcywgJGZpbGVuYW1lOworICAgICAgICAoJGFjdGlvbnN7JGZpbGVuYW1l fSA9ICRzdGF0dXMpID1+IHRyL0FSRE0vKy0tL2Q7CiAgICAgfQogfQogCkBAIC02Niw2ICsxMjks NyBAQAogQGZpbGVzID0gZ3JlcCB7IAogICAgICEvZmlsZXMuZGlnZXN0fE1hbmlmZXN0fENoYW5n ZUxvZy8gb3IgZG8geyBwdXNoIEB0cml2aWFsLCAkXzsgMDsgfQogfSBAZmlsZXM7CisKIEB1bmtu b3duID0gZ3JlcCB7IAogICAgICEvZmlsZXMuZGlnZXN0fE1hbmlmZXN0fENoYW5nZUxvZy8gb3Ig ZG8geyBwdXNoIEB0cml2aWFsLCAkXzsgMDsgfQogfSBAdW5rbm93bjsKQEAgLTczLDcgKzEzNyw3 IEBACiAjIERvbid0IGFsbG93IGFueSBjb25mbGljdHMKIGlmIChAY29uZmxpY3RzKSB7CiAgICAg cHJpbnQgU1RERVJSIDw8RU9UOwotQ3ZzIHJlcG9ydHMgdGhlIGZvbGxvd2luZyBjb25mbGljdHMu ICBQbGVhc2UgcmVzb2x2ZSB0aGVtIGJlZm9yZQorJHZjcyByZXBvcnRzIHRoZSBmb2xsb3dpbmcg Y29uZmxpY3RzLiAgUGxlYXNlIHJlc29sdmUgdGhlbSBiZWZvcmUKIHJ1bm5pbmcgZWNoYW5nZWxv Zy4KIEVPVAogICAgIHByaW50IFNUREVSUiBtYXAgIkMgJF9cbiIsIEBjb25mbGljdHM7CkBAIC04 NCw3ICsxNDgsNyBAQAogIyBvdXQgYWJvdmUpCiBpZiAoQHVua25vd24pIHsKICAgICBwcmludCBT VERFUlIgPDxFT1Q7Ci1DdnMgcmVwb3J0cyB0aGUgZm9sbG93aW5nIHVua25vd24gZmlsZXMuICBQ bGVhc2UgdXNlICJjdnMgYWRkIiBiZWZvcmUKKyR2Y3MgcmVwb3J0cyB0aGUgZm9sbG93aW5nIHVu a25vd24gZmlsZXMuICBQbGVhc2UgdXNlICIkdmNzIGFkZCIgYmVmb3JlCiBydW5uaW5nIGVjaGFu Z2Vsb2csIG9yIHJlbW92ZSB0aGUgZmlsZXMgaW4gcXVlc3Rpb24uCiBFT1QKICAgICBwcmludCBT VERFUlIgbWFwICI/ICRfXG4iLCBAdW5rbm93bjsKQEAgLTE3NywyNSArMjQxLDM2IEBACiAKICMg Rm9yZ2V0IGVidWlsZHMgdGhhdCBvbmx5IGhhdmUgY2hhbmdlZCBjb3B5cmlnaHRzLCB1bmxlc3Mg dGhhdCdzIGFsbAogIyB0aGUgY2hhbmdlZCBmaWxlcyB3ZSBoYXZlCisKIEBlYnVpbGRzID0gZ3Jl cCAvXC5lYnVpbGQkLywgQGZpbGVzOwogQGZpbGVzID0gZ3JlcCAhL1wuZWJ1aWxkJC8sIEBmaWxl czsKKwogaWYgKEBlYnVpbGRzKSB7Ci0gICAgb3BlbiBDLCAiY3ZzIC1mIGRpZmYgLVUwIEBlYnVp bGRzIDI+JjEgfCIgb3IgZGllICJDYW4ndCBydW4gY3ZzIGRpZmY6ICQhXG4iOworICAgIGlmICgk dmNzIGVxICJnaXQiKSB7CisgICAgCW9wZW4gQywgJHZjc3skdmNzfXtkaWZmfS4iIDI+JjEgfCIg b3IgZGllICJDYW4ndCBydW46ICIuJHZjc3skdmNzfXtkaWZmfS4iJCFcbiI7CisgICAgfSBlbHNl IHsgCisgICAgICAgIG9wZW4gQywgJHZjc3skdmNzfXtkaWZmfS4iQGVidWlsZHMgMj4mMSB8IiBv ciBkaWUgIkNhbid0IHJ1bjogIi4kdmNzeyR2Y3N9e2RpZmZ9LiIkIVxuIjsKKyAgICB9CiAgICAg JF8gPSA8Qz47CiAgICAgd2hpbGUgKGRlZmluZWQgJF8pIHsKLSAgICAgICAgaWYgKC9eY3ZzIGRp ZmY6ICgoW15cL10qPylcLmVidWlsZCkgd2FzIHJlbW92ZWQvKSB7IAorCSMgb25seSBwb3NzaWJs ZSB3aXRoIGN2cworICAgICAgICBpZiAoL14kdmNzIGRpZmY6ICgoW15cL10qPylcLmVidWlsZCkg d2FzIHJlbW92ZWQvKSB7IAogICAgICAgICAgICAgcHVzaCBAZmlsZXMsICQxOwogICAgICAgICB9 Ci0gICAgICAgIGVsc2lmICgvXkluZGV4OiAoKFteXC9dKj8pXC5lYnVpbGQpXHMqJC8pIHsgCi0g ICAgICAgICAgICBteSAoJGYsICR2KSA9ICgkMSwgJDIpOworCisJIyBXZSBhc3N1bWUgR05VIGRp ZmYgb3V0cHV0IGZvcm1hdCBoZXJlLgorCSMgZ2l0IGZvcm1hdDogZGlmZiAtLWdpdCBhL2FwcC1k b2MvcmVwb2RvYy9tZXRhZGF0YS54bWwgYi9hcHAtZG9jL3JlcG9kb2MvbWV0YWRhdGEueG1sCisJ ZWxzaWYgKC8kdmNzeyR2Y3N9e3JlZ2V4fS8pIHsKKyAgICAgICAgICAgIG15ICgkZikgPSAoJDEp OworICAgICAgICAgICAgIyBmaWxlIHdhcyByZW1vdmVkIGZyb20gZ2l0IAorCSAgICBpZiAoL15k ZWxldGVkIGZpbGUgbW9kZS8pIHsKKwkJICAgICRfID0gPEM+OyAjIGp1c3QgZWF0IHRoZSBsaW5l CisgICAgICAgICAgICB9CiAgICAgICAgICAgICAjIGNoZWNrIGlmIG1vcmUgdGhhbiBqdXN0IGNv cHlyaWdodCBkYXRlIGNoYW5nZWQuCi0gICAgICAgICAgICAjIHNraXAgc29tZSBsaW5lcwotICAg ICAgICAgICAgJF8gPSA8Qz47CSMgPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0gICAgICAgICAgICAkXyA9IDxDPjsJIyBSQ1MgZmlsZTogLi4uCi0gICAgICAgICAgICAkXyA9 IDxDPjsJIyByZXRyaWV2aW5nIHJldmlzaW9uCi0gICAgICAgICAgICAkXyA9IDxDPjsJIyBkaWZm IC11IC4uLgotICAgICAgICAgICAgJF8gPSA8Qz47CSMgLS0tIHZpbS02LjItcjYuZWJ1aWxkCi0g ICAgICAgICAgICAkXyA9IDxDPjsJIyArKysgdmltLTYuMi1yNi5lYnVpbGQKKyAgICAgICAgICAg ICMgc2tpcCBzb21lIGxpbmVzICh2Y3MgZGVwZW5kZW50KQorCSAgICBmb3JlYWNoKDEuLiR2Y3N7 JHZjc317c2tpcH0peworCSAgICAgICAgICAgICRfID0gPEM+OworCSAgICB9CiAgICAgICAgICAg ICB3aGlsZSAoPEM+KSB7CiAgICAgICAgICAgICAgICAgbGFzdCBpZiAvXltBLVphLXpdLzsKICAg ICAgICAgICAgICAgICBpZiAoL15bLStdKD8hIyBDb3B5cmlnaHQpLykgewpAQCAtMjA3LDcgKzI4 Miw3IEBACiAgICAgICAgICAgICAjIGFuZCB3ZSBoYXZlIHRoZSBuZXh0IGxpbmUgaW4gJF8gZm9y IHByb2Nlc3NpbmcKICAgICAgICAgICAgIG5leHQ7CiAgICAgICAgIH0KLSAgICAgICAgZWxzaWYg KC9eY3ZzLio/OiAoKFteXC9dKj8pXC5lYnVpbGQpIGlzIGEgbmV3IGVudHJ5LykgeyAKKyAgICAg ICAgZWxzaWYgKC9eJHZjcyo/OiAoKFteXC9dKj8pXC5lYnVpbGQpIGlzIGEgbmV3IGVudHJ5Lykg eyAKICAgICAgICAgICAgIHB1c2ggQGZpbGVzLCAkMTsKICAgICAgICAgICAgIHB1c2ggQG5ld192 ZXJzaW9ucywgJDI7ICAjIG5ldyBlYnVpbGQsIHdpbGwgY3JlYXRlIGEgbmV3IGVudHJ5CiAgICAg ICAgIH0KQEAgLTMzNCw3ICs0MDksNyBAQAogIyBVcGRhdGUgYWZmZWN0ZWQgZWJ1aWxkIGNvcHly aWdodCBkYXRlcy4gIFRoZXJlIGlzIG5vIHJlYXNvbiB0byB1cGRhdGUgdGhlCiAjIGNvcHlyaWdo dCBsaW5lcyBvbiBlYnVpbGRzIHRoYXQgaGF2ZW4ndCBjaGFuZ2VkLiAgSSB2ZXJpZmllZCB0aGlz IHdpdGggYW4gSVAKICMgbGF3eWVyLgotZm9yIG15ICRlIChncmVwIHsgL1wuZWJ1aWxkJC8gJiYg LWUgfSBAZmlsZXMpIHsKK2ZvciBteSAkZSAoZ3JlcCAvXC5lYnVpbGQkLywgQGZpbGVzKSB7CiAg ICAgbXkgKCRldGV4dCwgJG5ldGV4dCk7CiAgICAgb3BlbiBFLCAiPCRlIiBvciB3YXJuKCJDYW4n dCByZWFkICRlIHRvIHVwZGF0ZSBjb3B5cmlnaHQgeWVhclxuIiksIG5leHQ7CiAgICAgeyBsb2Nh bCAkLyA9IHVuZGVmOyAkZXRleHQgPSA8RT47IH0KQEAgLTM2MCw5ICs0MzUsNyBAQAogCiAjIE9r YXksIG5vdyB3ZSBoYXZlIGEgc3RhcnRlciBDaGFuZ2VMb2cgdG8gd29yayB3aXRoLgogIyBUaGUg dGV4dCB3aWxsIGJlIGFkZGVkIGp1c3QgbGlrZSB3aXRoIGFueSBvdGhlciBDaGFuZ2VMb2cgYmVs b3cuICAKLSMgQWRkIHRoZSBuZXcgQ2hhbmdlTG9nIHRvIGN2cyBiZWZvcmUgY29udGludWluZy4K LWlmIChvcGVuIEYsICJDVlMvRW50cmllcyIpIHsKLSAgICBzeXN0ZW0oImN2cyAtZiBhZGQgQ2hh bmdlTG9nIikgdW5sZXNzIChzY2FsYXIgZ3JlcCAvXlwvQ2hhbmdlTG9nXC8vLCA8Rj4pOwotfQor IyBBZGQgdGhlIG5ldyBjaGFuZ2Vsb2cgdG8gdmNzLCBtYXliZSBpdCBhbHJlYWR5IGlzIGFkZGVk LCBidXQgd2hvIGNhcmVzIHJpZ2h0Pworc3lzdGVtKCIkdmNzeyR2Y3N9e2FkZH0gQ2hhbmdlTG9n IDI+JjEgPj4gL2Rldi9udWxsIikKIAogIyB2aW06c3c9NCB0cz04IGV4cGFuZHRhYgo=