28369 2003-09-10 10:49 0000 cdrtools-2.01.01_alpha01-r1 (Update; cjk patch) 2005-03-16 17:13:39 0000 1 1 1 Unclassified Gentoo Linux Ebuilds unspecified All Linux RESOLVED FIXED http://www.momonga-linux.org/cvsweb/cvsweb.cgi/pkgs/cdrtools/ EBUILD P2 enhancement --- 80053 1 matsuu@gentoo.org media-optical@gentoo.org brad@gentoo.org matsuu@gentoo.org media-optical@gentoo.org obz@gentoo.org suka@gentoo.org matsuu@gentoo.org 2003-09-10 10:49:38 0000 Hi. Added cjk patch. This patch also supports cdrtools-2.01_alpha16 and cdrtools-2.01_alpha18. Fixed S(=${WORKDIR}/${P%_*}) matsuu@gentoo.org 2003-09-10 10:50:22 0000 Created an attachment (id=17450) cdrtools-2.01_alpha14-r1.patch matsuu@gentoo.org 2003-09-10 11:21:55 0000 Created an attachment (id=17454) cdrtools-2.01_alpha14-r1.patch khsongdr@yahoo.com 2004-04-20 04:55:32 0000 Your patch file looks so good. But It doesn't seem to support utf8 charset. Can you fix it? obz@gentoo.org 2005-01-27 02:13:04 0000 There's a current, updated patch that is being used by FreeBSD to add CJK support, especially UTF-8 support to cdrtools. The patch is available at ftp://ftp.zeist.de/pub/distfiles/noboru_nls_patch_20041227.txt.gz. It's 538Kb gzipped, so I'm not attaching it here, and we should probably mirror it on our distfiles. Here's a diff against the current cdrtools-2.01.01_alpha01.ebuild ebuild, to a -r1 which includes the utf-8 support. obz@gentoo.org 2005-01-27 02:13:54 0000 Created an attachment (id=49638) Patch for -r1 calchan@gentoo.org 2005-01-30 09:11:37 0000 Mike, I tested the patch and ebuild you proposed. I had to copy the scsi patch to my overlay to make it work (this won't be needed when the ebuild is in portage), but besides this everything went OK. I could burn a CD using nautilus-cd-burner-2.8.6, and it worked. Thanks. cayennes@gmail.com 2005-02-02 14:09:08 0000 Reporting that this patch works for me, fixing the nautilus-cd-burner problems. cayennes@gmail.com 2005-02-02 14:21:41 0000 er, I spoke too soon. nautilus-cd-burner now burns CDs instead of hanging, but I end up with file names like "???????????????????? (invalid unicode)". obz@gentoo.org 2005-02-24 23:50:48 0000 Confirmed Cayenne's problem, I've found the correct patch, one that's also applied by Fedora for nls/utf8 support. obz@gentoo.org 2005-02-24 23:51:43 0000 Created an attachment (id=52097) The patch to support nls/utf8 character sets in cdrtools/mkisofs obz@gentoo.org 2005-02-24 23:52:32 0000 Created an attachment (id=52098) A diff for cdrtools-2.0.01_alpha01-r1 pylon@gentoo.org 2005-03-01 07:07:50 0000 Patch added with the unicode-USE-flag to app-cdr/cdrtools-2.01-r2 and app-cdr/cdrtools-2.01.01_alpha-r1 brad@gentoo.org 2005-03-16 17:13:39 0000 I vote we mark one of these stable on x86 pronto 17450 2003-09-10 10:50 0000 cdrtools-2.01_alpha14-r1.patch cdrtools-2.01_alpha14-r1.patch text/plain LS0tIGNkcnRvb2xzLTIuMDFfYWxwaGExNC5lYnVpbGQJMjAwMy0wOS0xMSAwMjo0MjozNC4wMDAw MDAwMDAgKzA5MDAKKysrIGNkcnRvb2xzLTIuMDFfYWxwaGExNC1yMS5lYnVpbGQJMjAwMy0wOS0x MSAwMjo0NDo1NS4wMDAwMDAwMDAgKzA5MDAKQEAgLTExLDE2ICsxMSwyMSBAQAogTElDRU5TRT0i R1BMLTIiCiBTTE9UPSIwIgogS0VZV09SRFM9Ing4NiBwcGMgaHBwYSBhbWQ2NCIKK0lVU0U9ImNq ayIKIAogREVQRU5EPSJ2aXJ0dWFsL2dsaWJjIgogUFJPVklERT0idmlydHVhbC9jZHJ0b29scyIK IAotUz0iJHtXT1JLRElSfS8ke1BOfS0yLjAxIgorUz0iJHtXT1JLRElSfS8ke1AlXyp9IgogCiBz cmNfdW5wYWNrKCkgewogCXVucGFjayAke0F9CiAKIAljZCAke1N9CisJIyBUaGlzIE5MUyBQYXRj aCBmcm9tIE1vbW9uZ2EgTGludXggQ1ZTIHJlcG9zaXRvcnkuCisJIyBodHRwOi8vd3d3Lm1vbW9u Z2EtbGludXgub3JnCisJdXNlIGNqayAmJiBlcGF0Y2ggJHtGSUxFU0RJUn0vJHtQTn0tTkxTLTJi eXRlcy5wYXRjaCB8fCBkaWUKKwogCSMgQWRkIHN1cHBvcnQgZm9yIDIuNSBrZXJuZWxzCiAJIyA8 YXphcmFoQGdlbnRvby5vcmc+ICgwNSBGZWIgMjAwMykKIAllcGF0Y2ggJHtGSUxFU0RJUn0vJHtQ Tn0tMi4wMS1rZXJuZWwyNS1zdXBwb3J0LnBhdGNoIHx8IGRpZQo= 17454 2003-09-10 11:21 0000 cdrtools-2.01_alpha14-r1.patch cdrtools-2.01_alpha14-r1.patch text/plain LS0tIGNkcnRvb2xzLTIuMDFfYWxwaGExNC5lYnVpbGQJMjAwMy0wOS0xMSAwMjo0MjozNC4wMDAw MDAwMDAgKzA5MDAKKysrIGNkcnRvb2xzLTIuMDFfYWxwaGExNC1yMS5lYnVpbGQJMjAwMy0wOS0x MSAwMzoxOTozNy4wMDAwMDAwMDAgKzA5MDAKQEAgLTYsMjEgKzYsMjcgQEAKIAogREVTQ1JJUFRJ T049IkEgc2V0IG9mIHRvb2xzIGZvciBDRFIgZHJpdmVzLCBpbmNsdWRpbmcgY2RyZWNvcmQuIgog SE9NRVBBR0U9Imh0dHA6Ly93d3cuZm9rdXMuZ21kLmRlL3Jlc2VhcmNoL2NjL2dsb25lL2VtcGxv eWVlcy9qb2VyZy5zY2hpbGxpbmcvcHJpdmF0ZS9jZHJlY29yZC5odG1sIgotU1JDX1VSST0iZnRw Oi8vZnRwLmJlcmxpb3MuZGUvcHViL2NkcmVjb3JkL2FscGhhLyR7UC9fYWxwaGEvYX0udGFyLmd6 IgorU1JDX1VSST0iZnRwOi8vZnRwLmJlcmxpb3MuZGUvcHViL2NkcmVjb3JkL2FscGhhLyR7UC9f YWxwaGEvYX0udGFyLmd6CisJY2prPyAoIG1pcnJvcjovL2dlbnRvby8ke1BOfS1OTFMtMmJ5dGVz LnBhdGNoLmd6ICkiCiAKIExJQ0VOU0U9IkdQTC0yIgogU0xPVD0iMCIKIEtFWVdPUkRTPSJ4ODYg cHBjIGhwcGEgYW1kNjQiCitJVVNFPSJjamsiCiAKIERFUEVORD0idmlydHVhbC9nbGliYyIKIFBS T1ZJREU9InZpcnR1YWwvY2RydG9vbHMiCiAKLVM9IiR7V09SS0RJUn0vJHtQTn0tMi4wMSIKK1M9 IiR7V09SS0RJUn0vJHtQJV8qfSIKIAogc3JjX3VucGFjaygpIHsKIAl1bnBhY2sgJHtBfQogCiAJ Y2QgJHtTfQorCSMgVGhpcyBOTFMgUGF0Y2ggZnJvbSBNb21vbmdhIExpbnV4IENWUyByZXBvc2l0 b3J5LgorCSMgaHR0cDovL3d3dy5tb21vbmdhLWxpbnV4Lm9yZworCXVzZSBjamsgJiYgZXBhdGNo ICR7V09SS0RJUn0vJHtQTn0tTkxTLTJieXRlcy5wYXRjaCB8fCBkaWUKKwogCSMgQWRkIHN1cHBv cnQgZm9yIDIuNSBrZXJuZWxzCiAJIyA8YXphcmFoQGdlbnRvby5vcmc+ICgwNSBGZWIgMjAwMykK IAllcGF0Y2ggJHtGSUxFU0RJUn0vJHtQTn0tMi4wMS1rZXJuZWwyNS1zdXBwb3J0LnBhdGNoIHx8 IGRpZQo= 49638 2005-01-27 02:13 0000 Patch for -r1 cdrtools-utf-8.patch text/plain LS0tIGNkcnRvb2xzLTIuMDEuMDFfYWxwaGEwMS5lYnVpbGQJMjAwNS0wMS0yNyAxNzo1OTo0MS45 ODA1NjE2MzIgKzA4MDAKKysrIGNkcnRvb2xzLTIuMDEuMDFfYWxwaGEwMS1yMS5lYnVpbGQJMjAw NS0wMS0yNyAxODowNToxMS45ODMzOTM1NzYgKzA4MDAKQEAgLTEsMTIgKzEsMTMgQEAKICMgQ29w eXJpZ2h0IDE5OTktMjAwNSBHZW50b28gRm91bmRhdGlvbgogIyBEaXN0cmlidXRlZCB1bmRlciB0 aGUgdGVybXMgb2YgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIHYyCi0jICRIZWFkZXI6 IC92YXIvY3Zzcm9vdC9nZW50b28teDg2L2FwcC1jZHIvY2RydG9vbHMvY2RydG9vbHMtMi4wMS4w MV9hbHBoYTAxLmVidWlsZCx2IDEuMiAyMDA1LzAxLzAxIDEyOjEwOjU1IGVyYWRpY2F0b3IgRXhw ICQKKyMgJEhlYWRlcjogJAogCiBpbmhlcml0IGV1dGlscyBnY2MgZ251Y29uZmlnCiAKIERFU0NS SVBUSU9OPSJBIHNldCBvZiB0b29scyBmb3IgQ0QgcmVjb3JkaW5nLCBpbmNsdWRpbmcgY2RyZWNv cmQiCiBIT01FUEFHRT0iaHR0cDovL3d3dy5mb2t1cy5nbWQuZGUvcmVzZWFyY2gvY2MvZ2xvbmUv ZW1wbG95ZWVzL2pvZXJnLnNjaGlsbGluZy9wcml2YXRlL2NkcmVjb3JkLmh0bWwiCi1TUkNfVVJJ PSJmdHA6Ly9mdHAuYmVybGlvcy5kZS9wdWIvY2RyZWNvcmQvYWxwaGEvJHtQL19hbHBoYS9hfS50 YXIuYnoyIgorU1JDX1VSST0iZnRwOi8vZnRwLmJlcmxpb3MuZGUvcHViL2NkcmVjb3JkL2FscGhh LyR7UC9fYWxwaGEvYX0udGFyLmJ6MiBcCisJICAgICBmdHA6Ly9mdHAuemVpc3QuZGUvcHViL2Rp c3RmaWxlcy9ub2JvcnVfbmxzX3BhdGNoXzIwMDQxMjI3LnR4dC5neiIKIAogTElDRU5TRT0iR1BM LTIgZnJlZWRpc3QiCiBTTE9UPSIwIgpAQCAtMjYsNiArMjcsOSBAQAogCSMgQ0FOLTIwMDQtMDgw NiAtIEJ1ZyA2MzE4NwogCWVwYXRjaCAke0ZJTEVTRElSfS8ke1BOfS0yLjAxLXNjc2ktcmVtb3Rl LnBhdGNoCiAKKwkjIENKSy9VVEYtOCBwYXRjaCAtIEJ1ZyAyODM2OQorCWVwYXRjaCAke1dPUktE SVJ9L25vYm9ydV9ubHNfcGF0Y2hfMjAwNDEyMjcudHh0CisKIAljZCAke1N9L0RFRkFVTFRTCiAJ dXNlIHBwYy1tYWNvcyAmJiBNWUFSQ0g9Im1hYy1vczEwIiB8fCBNWUFSQ0g9ImxpbnV4IgogCXNl ZCAtaSAiczovb3B0L3NjaGlseTovdXNyOmciIERlZmF1bHRzLiR7TVlBUkNIfQo= 52097 2005-02-24 23:51 0000 The patch to support nls/utf8 character sets in cdrtools/mkisofs mkisofs-iconv-10.patch text/plain ZGlmZiAtdXJOIC0tZXhjbHVkZS1mcm9tPS0gY2RydG9vbHMtMi4wMS9pbmNsdWRlL3VubHMuaCBj ZHJ0b29scy0yLjAxLWpoL2luY2x1ZGUvdW5scy5oCi0tLSBjZHJ0b29scy0yLjAxL2luY2x1ZGUv dW5scy5oCTIwMDMtMDYtMTYgMDA6NDE6MjMuMDAwMDAwMDAwICswMzAwCisrKyBjZHJ0b29scy0y LjAxLWpoL2luY2x1ZGUvdW5scy5oCTIwMDQtMDItMDIgMTg6MzE6MjIuMDAwMDAwMDAwICswMjAw CkBAIC0zMCw2ICszMCwxMCBAQAogI2luY2x1ZGUgPHByb3RvdHlwLmg+CiAjZW5kaWYKIAorI2lm ZGVmIFVTRV9JQ09OVgorI2luY2x1ZGUgPGljb252Lmg+CisjZW5kaWYKKwogI2lmZGVmCV9fY3Bs dXNwbHVzCiBleHRlcm4gIkMiIHsKICNlbmRpZgpAQCAtNDMsNiArNDcsOSBAQAogCWNoYXIgKmNo YXJzZXQ7CiAJdW5zaWduZWQgY2hhciAqKnBhZ2VfdW5pMmNoYXJzZXQ7CiAJc3RydWN0IG5sc191 bmljb2RlICpjaGFyc2V0MnVuaTsKKyNpZmRlZiBVU0VfSUNPTlYKKwlpY29udl90IGljb252X2Q7 CisjZW5kaWYKIAogCXZvaWQgKCppbmNfdXNlX2NvdW50KSAJX19QUigodm9pZCkpOwogCXZvaWQg KCpkZWNfdXNlX2NvdW50KSAJX19QUigodm9pZCkpOwpAQCAtNTgsNiArNjUsOSBAQAogZXh0ZXJu IHZvaWQgCQl1bmxvYWRfbmxzCQlfX1BSKChzdHJ1Y3QgbmxzX3RhYmxlICopKTsKIGV4dGVybiBz dHJ1Y3QgbmxzX3RhYmxlICpsb2FkX25sc19kZWZhdWx0CV9fUFIoKHZvaWQpKTsKIGV4dGVybiBp bnQJCWluaXRfbmxzX2ZpbGUJCV9fUFIoKGNoYXIgKiBuYW1lKSk7CisjaWZkZWYgVVNFX0lDT05W CitleHRlcm4gaW50CQlpbml0X25sc19pY29udgkJX19QUigoY2hhciAqIG5hbWUpKTsKKyNlbmRp ZgogCiAjaWZkZWYJX19jcGx1c3BsdXMKIH0KZGlmZiAtdXJOIC0tZXhjbHVkZS1mcm9tPS0gY2Ry dG9vbHMtMi4wMS9saWJ1bmxzL2xpYnVubHMubWsgY2RydG9vbHMtMi4wMS1qaC9saWJ1bmxzL2xp YnVubHMubWsKLS0tIGNkcnRvb2xzLTIuMDEvbGlidW5scy9saWJ1bmxzLm1rCTIwMDAtMDMtMjUg MTQ6NTE6NTYuMDAwMDAwMDAwICswMjAwCisrKyBjZHJ0b29scy0yLjAxLWpoL2xpYnVubHMvbGli dW5scy5tawkyMDA0LTAyLTAyIDE4OjMxOjIyLjAwMDAwMDAwMCArMDIwMApAQCAtOCw2ICs4LDcg QEAKIElOU0RJUj0JCWxpYgogVEFSR0VUTElCPQl1bmxzCiAjQ1BQT1BUUyArPQktSXN0ZGlvCitD UFBPUFRTICs9CS1EVVNFX0lDT05WCiBpbmNsdWRlCQlUYXJnZXRzCiBMSUJTPQkJCiAKZGlmZiAt dXJOIC0tZXhjbHVkZS1mcm9tPS0gY2RydG9vbHMtMi4wMS9saWJ1bmxzL25scy5oIGNkcnRvb2xz LTIuMDEtamgvbGlidW5scy9ubHMuaAotLS0gY2RydG9vbHMtMi4wMS9saWJ1bmxzL25scy5oCTIw MDItMTItMDMgMDI6MzQ6MjcuMDAwMDAwMDAwICswMjAwCisrKyBjZHJ0b29scy0yLjAxLWpoL2xp YnVubHMvbmxzLmgJMjAwNC0wMi0wMiAxODozMToyMi4wMDAwMDAwMDAgKzAyMDAKQEAgLTExMSw1 ICsxMTEsOCBAQAogZXh0ZXJuIGludCBpbml0X25sc19jcDEwMDc5CV9fUFIoKHZvaWQpKTsKIGV4 dGVybiBpbnQgaW5pdF9ubHNfY3AxMDA4MQlfX1BSKCh2b2lkKSk7CiBleHRlcm4gaW50IGluaXRf bmxzX2ZpbGUJX19QUigoY2hhciAqIG5hbWUpKTsKKyNpZmRlZiBVU0VfSUNPTlYKK2V4dGVybiBp bnQgaW5pdF9ubHNfaWNvbnYJX19QUigoY2hhciAqIG5hbWUpKTsKKyNlbmRpZgogCiAjZW5kaWYJ LyogX05MU19IICovCmRpZmYgLXVyTiAtLWV4Y2x1ZGUtZnJvbT0tIGNkcnRvb2xzLTIuMDEvbGli dW5scy9ubHNfaWNvbnYuYyBjZHJ0b29scy0yLjAxLWpoL2xpYnVubHMvbmxzX2ljb252LmMKLS0t IGNkcnRvb2xzLTIuMDEvbGlidW5scy9ubHNfaWNvbnYuYwkxOTcwLTAxLTAxIDAyOjAwOjAwLjAw MDAwMDAwMCArMDIwMAorKysgY2RydG9vbHMtMi4wMS1qaC9saWJ1bmxzL25sc19pY29udi5jCTIw MDQtMDItMDIgMTg6MzE6MjIuMDAwMDAwMDAwICswMjAwCkBAIC0wLDAgKzEsOTYgQEAKKy8qIEAo IylubHNfaWNvbnYuYwkxLjAgMDIvMDQvMjAgMjAwMiBKLiBTY2hpbGxpbmcgICovCisjaWZuZGVm IGxpbnQKK3N0YXRpYwljaGFyIHNjY3NpZFtdID0KKwkiQCgjKW5sc19pY29udi5jCTEuMCAwMi8w MS8yMCAyMDAyIEouIFNjaGlsbGluZyI7CisjZW5kaWYKKy8qCisgKiBUaGlzIHByb2dyYW0gaXMg ZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yIG1vZGlmeQorICog aXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBhcyBw dWJsaXNoZWQgYnkKKyAqIHRoZSBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb247IGVpdGhlciB2ZXJz aW9uIDIsIG9yIChhdCB5b3VyIG9wdGlvbikKKyAqIGFueSBsYXRlciB2ZXJzaW9uLgorICoKKyAq IFRoaXMgcHJvZ3JhbSBpcyBkaXN0cmlidXRlZCBpbiB0aGUgaG9wZSB0aGF0IGl0IHdpbGwgYmUg dXNlZnVsLAorICogYnV0IFdJVEhPVVQgQU5ZIFdBUlJBTlRZOyB3aXRob3V0IGV2ZW4gdGhlIGlt cGxpZWQgd2FycmFudHkgb2YKKyAqIE1FUkNIQU5UQUJJTElUWSBvciBGSVRORVNTIEZPUiBBIFBB UlRJQ1VMQVIgUFVSUE9TRS4gIFNlZSB0aGUKKyAqIEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNl IGZvciBtb3JlIGRldGFpbHMuCisgKgorICogWW91IHNob3VsZCBoYXZlIHJlY2VpdmVkIGEgY29w eSBvZiB0aGUgR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UKKyAqIGFsb25nIHdpdGggdGhpcyBw cm9ncmFtOyBzZWUgdGhlIGZpbGUgQ09QWUlORy4gIElmIG5vdCwgd3JpdGUgdG8KKyAqIHRoZSBG cmVlIFNvZnR3YXJlIEZvdW5kYXRpb24sIDY3NSBNYXNzIEF2ZSwgQ2FtYnJpZGdlLCBNQSAwMjEz OSwgVVNBLgorICovCisvKgorICoJTW9kaWZpY2F0aW9ucyB0byBtYWtlIHRoZSBjb2RlIHBvcnRh YmxlIENvcHlyaWdodCAoYykgMjAwMCBKLiBTY2hpbGxpbmcKKyAqCisgKiBubHNfaWNvbnY6IGNy ZWF0ZSBhIHBzZXVkby1jaGFyc2V0IHRhYmxlIHRvIHVzZSBpY29udigpIHByb3ZpZGVkIGJ5IEMK KyAqIGxpYnJhcnkgb3IgbGliaWNvbnYgYnkgQnJ1bm8gSGFpYmxlCisgKiBUaGUgVW5pY29kZSB0 byBjaGFyc2V0IHRhYmxlIGhhcyBvbmx5IGV4YWN0IG1hcHBpbmdzLgorICoKKyAqCisgKiBKdW5n c2hpayBTaGluIChqc2hpbkBtYWlsYXBzLm9yZykgMDQtRmViLTIwMDIKKyAqLworCisjaWZkZWYg VVNFX0lDT05WCisjaW5jbHVkZSA8bWNvbmZpZy5oPgorI2luY2x1ZGUgPHN0ZGlvLmg+CisjaW5j bHVkZSA8c3RkeGxpYi5oPgorI2luY2x1ZGUgPHN0cmRlZnMuaD4KKyNpbmNsdWRlICJubHMuaCIK KyNpbmNsdWRlIDxpY29udi5oPgorCitzdGF0aWMgdm9pZAlpbmNfdXNlX2NvdW50CV9fUFIoKHZv aWQpKTsKK3N0YXRpYyB2b2lkCWRlY191c2VfY291bnQJX19QUigodm9pZCkpOworCisKK3N0YXRp YyB2b2lkCitpbmNfdXNlX2NvdW50KCkKK3sKKwlNT0RfSU5DX1VTRV9DT1VOVDsKK30KKworc3Rh dGljIHZvaWQKK2RlY191c2VfY291bnQoKQoreworCU1PRF9ERUNfVVNFX0NPVU5UOworfQorCitp bnQKK2luaXRfbmxzX2ljb252KGNoYXJzZXQpCisJY2hhcgkqY2hhcnNldDsKK3sKKwlpY29udl90 IGljb252X2Q7ICAvKiBpY29udiBjb252ZXJzaW9uIGRlc2NyaXB0b3IgKi8KKwlzdHJ1Y3Qgbmxz X3RhYmxlICp0YWJsZTsKKworCS8qIGdpdmUgdXAgaWYgbm8gY2hhcnNldCBpcyBnaXZlbiAqLwor CWlmIChjaGFyc2V0ID09IE5VTEwpCisJCXJldHVybiAtMTsKKworCS8qIHNlZSBpZiB3ZSBhbHJl YWR5IGhhdmUgYSB0YWJsZSB3aXRoIHRoaXMgbmFtZSAtIGJ1aWx0IGluIHRhYmxlcworCSAgIGhh dmUgcHJlY2VkZW5jZSBvdmVyIGljb252KCkgLSBpLmUuIGNhbid0IGhhdmUgdGhlIG5hbWUgb2Yg YW4KKwkgICBleGlzdGluZyB0YWJsZS4gQWxzbywgd2UgbWF5IGhhdmUgYWxyZWFkeSByZWdpc3Rl cmVkIHRoaXMgZmlsZQorCSAgIHRhYmxlICovCisJaWYgKGZpbmRfbmxzKGNoYXJzZXQpICE9IE5V TEwpCisJCXJldHVybiAtMTsKKworCWlmICgoaWNvbnZfZCA9IGljb252X29wZW4oIlVDUy0yQkUi LCBjaGFyc2V0KSkgPT0gKGljb252X3QpIC0xKQorCQlyZXR1cm4gLTE7CisKKworCS8qIHNldCB1 cCB0aGUgdGFibGUgKi8KKwlpZiAoKHRhYmxlID0gKHN0cnVjdCBubHNfdGFibGUgKiltYWxsb2Mo c2l6ZW9mIChzdHJ1Y3QgbmxzX3RhYmxlKSkpCisJCQkJCQkJPT0gTlVMTCkgeworCQlyZXR1cm4g LTE7CisJfQorCisJLyogZ2l2ZSB0aGUgdGFibGUgdGhlIGZpbGUgbmFtZSwgc28gd2UgY2FuIGZp bmQgaXQgYWdhaW4gaWYgbmVlZGVkICovCisJdGFibGUtPmNoYXJzZXQgPSBzdHJkdXAoY2hhcnNl dCk7CisJdGFibGUtPmljb252X2QgPSBpY29udl9kOworCXRhYmxlLT5wYWdlX3VuaTJjaGFyc2V0 ID0gTlVMTDsKKwl0YWJsZS0+Y2hhcnNldDJ1bmkgPSBOVUxMOworCXRhYmxlLT5pbmNfdXNlX2Nv dW50ID0gaW5jX3VzZV9jb3VudDsKKwl0YWJsZS0+ZGVjX3VzZV9jb3VudCA9IGRlY191c2VfY291 bnQ7CisJdGFibGUtPm5leHQgPSBOVUxMOworCisJLyogcmVnaXN0ZXIgdGhlIHRhYmxlICovCisJ cmV0dXJuIHJlZ2lzdGVyX25scyh0YWJsZSk7Cit9CisjZW5kaWYKZGlmZiAtdXJOIC0tZXhjbHVk ZS1mcm9tPS0gY2RydG9vbHMtMi4wMS9saWJ1bmxzL1RhcmdldHMgY2RydG9vbHMtMi4wMS1qaC9s aWJ1bmxzL1RhcmdldHMKLS0tIGNkcnRvb2xzLTIuMDEvbGlidW5scy9UYXJnZXRzCTIwMDItMTIt MDMgMDI6MzQ6MjcuMDAwMDAwMDAwICswMjAwCisrKyBjZHJ0b29scy0yLjAxLWpoL2xpYnVubHMv VGFyZ2V0cwkyMDA0LTAyLTAyIDE4OjMxOjIyLjAwMDAwMDAwMCArMDIwMApAQCAtMzksNCArMzks NSBAQAogCW5sc19jcDEwMDI5LmMgXAogCW5sc19jcDEwMDc5LmMgXAogCW5sc19jcDEwMDgxLmMg XAotCW5sc19maWxlLmMKKwlubHNfZmlsZS5jIFwKKwlubHNfaWNvbnYuYwpkaWZmIC11ck4gLS1l eGNsdWRlLWZyb209LSBjZHJ0b29scy0yLjAxL21raXNvZnMvam9saWV0LmMgY2RydG9vbHMtMi4w MS1qaC9ta2lzb2ZzL2pvbGlldC5jCi0tLSBjZHJ0b29scy0yLjAxL21raXNvZnMvam9saWV0LmMJ MjAwMy0wNC0yOCAwMTozNjowOC4wMDAwMDAwMDAgKzAzMDAKKysrIGNkcnRvb2xzLTIuMDEtamgv bWtpc29mcy9qb2xpZXQuYwkyMDA0LTAyLTAzIDE0OjE1OjE3LjAwMDAwMDAwMCArMDIwMApAQCAt OTAsNiArOTAsMTEgQEAKICNpbmNsdWRlIDx1bmxzLmg+CS8qIEZvciBVTklDT0RFIHRyYW5zbGF0 aW9uICovCiAjaW5jbHVkZSA8c2NoaWx5Lmg+CiAKKyNpZmRlZiBVU0VfSUNPTlYKKyNpbmNsdWRl IDxpY29udi5oPgorI2luY2x1ZGUgPGVycm5vLmg+CisjZW5kaWYKKwogc3RhdGljIFVpbnQJanBh dGhfdGFibGVfaW5kZXg7CiBzdGF0aWMgc3RydWN0IGRpcmVjdG9yeSAqKmpwYXRobGlzdDsKIHN0 YXRpYyBpbnQJbmV4dF9qcGF0aF9pbmRleCA9IDE7CkBAIC0xMDMsMTMgKzEwOCwyMyBAQAogfTsK IAogI2lmZGVmCVVERgotCXZvaWQJY29udmVydF90b191bmljb2RlCV9fUFIoKHVuc2lnbmVkIGNo YXIgKmJ1ZmZlciwKKyMJaWZkZWYgVVNFX0lDT05WCisJc2l6ZV90CisjCWVsc2UKKwl2b2lkCisj CWVuZGlmCisJCWNvbnZlcnRfdG9fdW5pY29kZQlfX1BSKCh1bnNpZ25lZCBjaGFyICpidWZmZXIs CiAJCWludCBzaXplLCBjaGFyICpzb3VyY2UsIHN0cnVjdCBubHNfdGFibGUgKmlubHMpKTsKLQlp bnQJam9saWV0X3N0cmxlbgkJX19QUigoY29uc3QgY2hhciAqc3RyaW5nKSk7CisJaW50CWpvbGll dF9zdHJsZW4JCV9fUFIoKGNvbnN0IGNoYXIgKnN0cmluZywgc3RydWN0IG5sc190YWJsZSAqaW5s cykpOwogI2Vsc2UKLXN0YXRpYyB2b2lkCWNvbnZlcnRfdG9fdW5pY29kZQlfX1BSKCh1bnNpZ25l ZCBjaGFyICpidWZmZXIsCisjCWlmZGVmIFVTRV9JQ09OVgorCXN0YXRpYyBzaXplX3QKKyMJZWxz ZQorCXN0YXRpYyB2b2lkCisjZW5kaWYKKwkJY29udmVydF90b191bmljb2RlCV9fUFIoKHVuc2ln bmVkIGNoYXIgKmJ1ZmZlciwKIAkJaW50IHNpemUsIGNoYXIgKnNvdXJjZSwgc3RydWN0IG5sc190 YWJsZSAqaW5scykpOwotc3RhdGljIGludAlqb2xpZXRfc3RybGVuCQlfX1BSKChjb25zdCBjaGFy ICpzdHJpbmcpKTsKK3N0YXRpYyBpbnQJam9saWV0X3N0cmxlbgkJX19QUigoY29uc3QgY2hhciAq c3RyaW5nLCBzdHJ1Y3QgbmxzX3RhYmxlICppbmxzKSk7CiAjZW5kaWYKIHN0YXRpYyB2b2lkCWdl dF9qb2xpZXRfdm9sX2Rlc2MJX19QUigoc3RydWN0IGlzb19wcmltYXJ5X2Rlc2NyaXB0b3IgKmp2 b2xfZGVzYykpOwogc3RhdGljIHZvaWQJYXNzaWduX2pvbGlldF9kaXJlY3RvcnlfYWRkcmVzc2Vz IF9fUFIoKHN0cnVjdCBkaXJlY3RvcnkgKm5vZGUpKTsKQEAgLTE2MSw2ICsxNzYsMjAgQEAKIAlp ZiAoaW5scyA9PSBvbmxzKQogCQlyZXR1cm4gKGMpOwogCisjaWZkZWYgVVNFX0lDT05WCisJaWYo aW5scy0+Y2hhcnNldDJ1bmkgPT0gTlVMTCB8fCBvbmxzLT5wYWdlX3VuaTJjaGFyc2V0ID09IE5V TEwpIHsKKwkJLyoKKwkJICogVGhpcyBzaG91bGRuJ3QgYmUgcmVhY2hlZAorCQkgKi8KKwkJc3Rh dGljIEJPT0wgaWNvbnZfd2FybmVkID0gRkFMU0U7CisJCWlmKCFpY29udl93YXJuZWQpIHsKKwkJ CWVycm9yKCJXYXJuaW5nOiBJY29udiBjb252ZXJzaW9uIG5vdCBzdXBwb3J0ZWQgaW4gY29udl9j aGFyc2V0LlxuIik7CisJCQlpY29udl93YXJuZWQgPSBUUlVFOworCQl9CisJCXJldHVybiAoYyk7 CisJfQorI2VuZGlmCisKIAkvKiBnZXQgaGlnaCBhbmQgbG93IFVOSUNPREUgYnl0ZXMgKi8KIAl1 aCA9IGlubHMtPmNoYXJzZXQydW5pW2NdLnVuaTI7CiAJdWwgPSBpbmxzLT5jaGFyc2V0MnVuaVtj XS51bmkxOwpAQCAtMTg2LDEwICsyMTUsMTggQEAKICAqCiAgKiBOb3RlczoKICAqLwotI2lmZGVm CVVERgotdm9pZAorI2lmZGVmIFVTRV9JQ09OVgorIwlpZglVREYKK3NpemVfdAorIwllbHNlCitz dGF0aWMgc2l6ZV90CisjCWVuZGlmCiAjZWxzZQorIwlpZglVREYKK3ZvaWQKKyMJZWxzZQogc3Rh dGljIHZvaWQKKyMJZW5kaWYKICNlbmRpZgogY29udmVydF90b191bmljb2RlKGJ1ZmZlciwgc2l6 ZSwgc291cmNlLCBpbmxzKQogCXVuc2lnbmVkIGNoYXIJKmJ1ZmZlcjsKQEAgLTIxNiw2ICsyNTMs NTEgQEAKIAkJdG1wYnVmID0gKFVjaGFyICopIHNvdXJjZTsKIAl9CiAKKyNpZmRlZiBVU0VfSUNP TlYKKwlpZiAoaW5scy0+aWNvbnZfZCAmJiBpbmxzLT5jaGFyc2V0MnVuaT09TlVMTCAmJgorCQkJ aW5scy0+cGFnZV91bmkyY2hhcnNldD09TlVMTCkgeworCQljaGFyICppbnB0ciA9IHRtcGJ1ZjsK KwkJY2hhciAqb3V0cHRyID0gYnVmZmVyOworCQlzaXplX3QgaW5sZWZ0ID0gc3RybGVuKHRtcGJ1 Zik7CisJCXNpemVfdCBpbmxlbiA9IGlubGVmdDsKKwkJc2l6ZV90IG91dGxlZnQgPSBzaXplOwor CisJCWljb252KGlubHMtPmljb252X2QsIE5VTEwsIE5VTEwsIE5VTEwsIE5VTEwpOworCQlpZihp Y29udihpbmxzLT5pY29udl9kLCAmaW5wdHIsICZpbmxlZnQsICZvdXRwdHIsICZvdXRsZWZ0KSA9 PQorCQkJCShzaXplX3QpLTEgJiYgZXJybm8gPT0gRUlMU0VRKSB7CisJCQlmcHJpbnRmKHN0ZGVy ciwgIkluY29ycmVjdGx5IGVuY29kZWQgc3RyaW5nICglcykgIgorCQkJCSJlbmNvdW50ZXJlZC5c blBvc3NpYmx5IGNyZWF0aW5nIGFuIGludmFsaWQgIgorCQkJCSJKb2xpZXQgZXh0ZW5zaW9uLiBB Ym9ydGluZy5cbiIsIHNvdXJjZSk7CisJCQlleGl0KDEpOworCQl9CisKKwkgIAlmb3IgKGkgPSAw OyAoaSArIDEpIDwgc2l6ZSAtIG91dGxlZnQ7IGkgKz0gMikgewkvKiBTaXplIG1heSBiZSBvZGQh ISEqLworCQkJaWYgKGJ1ZmZlcltpXT09J1wwJykgeworCQkJCXN3aXRjaCAoYnVmZmVyW2krMV0p IHsgICAvKiBJbnZhbGlkIGNoYXJhY3RlcnMgZm9yIEpvbGlldCAqLworCQkJCQljYXNlICcqJzoK KwkJCQkJY2FzZSAnLyc6CisJCQkJCWNhc2UgJzonOgorCQkJCQljYXNlICc7JzoKKwkJCQkJY2Fz ZSAnPyc6CisJCQkJCWNhc2UgJ1xcJzoKKwkJCQkJCWJ1ZmZlcltpKzFdPSdfJzsKKwkJCQkJZGVm YXVsdDoKKwkJCQkJCWlmIChidWZmZXJbaSsxXSA9PSAweDdmIHx8CisJCQkJCQkJICAgIGJ1ZmZl cltpKzFdIDwgMHgyMCkKKwkJCQkJCQlidWZmZXJbaSsxXT0nXyc7CisJCQkJfQorCQkJfQorCQl9 CisJCWlmIChzaXplICYgMSkgewkvKiBiZWF1dGlmaWNhdGlvbiAqLworCSAgCQlidWZmZXJbc2l6 ZSAtIDFdID0gMDsKKwkJfQorCQlpZiAoc291cmNlID09IE5VTEwpIHsKKwkJCWZyZWUodG1wYnVm KTsKKwkJfQorCQlyZXR1cm4gKGlubGVuIC0gaW5sZWZ0KTsKKwl9CisjZW5kaWYKKwogCS8qCiAJ ICogTm93IHN0YXJ0IGNvcHlpbmcgY2hhcmFjdGVycy4gIElmIHRoZSBzaXplIHdhcyBzcGVjaWZp ZWQgdG8gYmUgMCwKIAkgKiB0aGVuIGFzc3VtZSB0aGUgaW5wdXQgd2FzIDAgdGVybWluYXRlZC4K QEAgLTI3MSw2ICszNTMsOSBAQAogCWlmIChzb3VyY2UgPT0gTlVMTCkgewogCQlmcmVlKHRtcGJ1 Zik7CiAJfQorI2lmZGVmIFVTRV9JQ09OVgorCXJldHVybiBqOworI2VuZGlmCiB9CiAKIC8qCkBA IC0yODcsMTIgKzM3Miw1MCBAQAogI2Vsc2UKIHN0YXRpYyBpbnQKICNlbmRpZgotam9saWV0X3N0 cmxlbihzdHJpbmcpCitqb2xpZXRfc3RybGVuKHN0cmluZywgaW5scykKIAljb25zdCBjaGFyCSpz dHJpbmc7CisJc3RydWN0IG5sc190YWJsZSAqaW5sczsKIHsKIAlpbnQJCXJ0bjsKIAorI2lmZGVm IFVTRV9JQ09OVgorCWlmIChpbmxzLT5pY29udl9kICYmIGlubHMtPmNoYXJzZXQydW5pPT1OVUxM ICYmCisJCQlpbmxzLT5wYWdlX3VuaTJjaGFyc2V0PT1OVUxMKSB7CisJCS8qCisJCSAqIHdlIGNv bnN0LWNhc3Qgc2luY2Ugd2UncmUgc3VyZSBpY29udiB3b24ndCBjaGFuZ2UKKwkJICogdGhlIHN0 cmluZyBpdHNlbGYKKwkJICovCisJCWNoYXIgKnN0cmluZ19wdHIgPSAoY2hhciAqKXN0cmluZzsK KwkJc2l6ZV90IHN0cmluZ19sZW4gPSBzdHJsZW4oc3RyaW5nKTsKKworCQkvKgorCQkgKiBpY29u diBoYXMgbm8gd2F5IG9mIGZpbmRpbmcgb3V0IHRoZSByZXF1aXJlZCBzaXplCisJCSAqIGluIHRo ZSB0YXJnZXQKKwkJICovCisKKwkJY2hhciAqdG1wLCAqdG1wX3B0cjsKKwkJLyogd2UgYXNzdW1l IHRoYXQgdGhlIG1heGltdW0gbGVuZ3RoIGlzIDIgKiBqbGVuICovCisJCXNpemVfdCB0bXBfbGVu ID0gKHNpemVfdClqbGVuICogMiArIDE7CisJCXRtcCA9IGVfbWFsbG9jKHRtcF9sZW4pOworCQl0 bXBfcHRyID0gdG1wOworCisJCWljb252KGlubHMtPmljb252X2QsIE5VTEwsIE5VTEwsIE5VTEws IE5VTEwpOworCQlpY29udihpbmxzLT5pY29udl9kLCAmc3RyaW5nX3B0ciwgJnN0cmluZ19sZW4s ICZ0bXBfcHRyLAorCQkJJnRtcF9sZW4pOworCisJCS8qCisJCSAqIGljb252IGFkdmFuY2VkIHRo ZSB0bXAgcG9pbnRlciB3aXRoIGFzIG1hbnkgY2hhcnMKKwkJICogYXMgaXQgaGFzIHdyaXR0ZW4g dG8gaXQsIHNvIHdlIGFkZCB1cCB0aGUgZGVsdGEKKwkJICovCisJCXJ0biA9ICh0bXBfcHRyIC0g dG1wKTsKKworCQlmcmVlKHRtcCk7CisJfSBlbHNlIHsKKwkJcnRuID0gc3RybGVuKHN0cmluZykg PDwgMTsKKwl9CisjZWxzZQogCXJ0biA9IHN0cmxlbihzdHJpbmcpIDw8IDE7CisjZW5kaWYKIAog CS8qCiAJICogV2UgZG8gY2xhbXAgdGhlIG1heGltdW0gbGVuZ3RoIG9mIGEgSm9saWV0IHN0cmlu ZyB0byBiZSB0aGUKQEAgLTQ4MCwxNiArNjAzLDMzIEBACiAJLyogY29tcGFyZSB0aGUgVW5pY29k ZSBuYW1lcyAqLwogCiAJd2hpbGUgKCpycG50ICYmICpscG50KSB7CisjaWZkZWYgVVNFX0lDT05W CisJCXNpemVfdCByaSwgbGk7CisKKwkJcmkgPSBjb252ZXJ0X3RvX3VuaWNvZGUocnRtcCwgMiwg cnBudCwgcmlubHMpOworCQlsaSA9IGNvbnZlcnRfdG9fdW5pY29kZShsdG1wLCAyLCBscG50LCBs aW5scyk7CisJCXJwbnQgKz0gcmk7CisJCWxwbnQgKz0gbGk7CisJCWlmKCFyaSAmJiAhbGkpCisJ CQlyZXR1cm4gKDApOworCQllbHNlIGlmKHJpICYmICFsaSkKKwkJCXJldHVybiAoMSk7CisJCWVs c2UgaWYoIXJpICYmIGxpKQorCQkJcmV0dXJuICgtMSk7CisjZWxzZQogCQljb252ZXJ0X3RvX3Vu aWNvZGUocnRtcCwgMiwgcnBudCwgcmlubHMpOwogCQljb252ZXJ0X3RvX3VuaWNvZGUobHRtcCwg MiwgbHBudCwgbGlubHMpOworI2VuZGlmCiAKIAkJaWYgKGFfdG9fdV8yX2J5dGUocnRtcCkgPCBh X3RvX3VfMl9ieXRlKGx0bXApKQogCQkJcmV0dXJuICgtMSk7CiAJCWlmIChhX3RvX3VfMl9ieXRl KHJ0bXApID4gYV90b191XzJfYnl0ZShsdG1wKSkKIAkJCXJldHVybiAoMSk7CiAKKyNpZm5kZWYg VVNFX0lDT05WCiAJCXJwbnQrKzsKIAkJbHBudCsrOworI2VuZGlmCiAJfQogCiAJaWYgKCpycG50 KQpAQCAtNTc0LDEwICs3MTQsMTAgQEAKIAkJfQogI2lmZGVmIEFQUExFX0hZQgogCQlpZiAoVVNF X01BQ19OQU1FKGRlKSkKLQkJCW5hbWVsZW4gPSBqb2xpZXRfc3RybGVuKGRlLT5oZnNfZW50LT5u YW1lKTsKKwkJCW5hbWVsZW4gPSBqb2xpZXRfc3RybGVuKGRlLT5oZnNfZW50LT5uYW1lLCBoZnNf aW5scyk7CiAJCWVsc2UKICNlbmRpZgkvKiBBUFBMRV9IWUIgKi8KLQkJCW5hbWVsZW4gPSBqb2xp ZXRfc3RybGVuKGRlLT5uYW1lKTsKKwkJCW5hbWVsZW4gPSBqb2xpZXRfc3RybGVuKGRlLT5uYW1l LCBpbl9ubHMpOwogCiAJCWlmIChkcG50ID09IHJvb3QpIHsKIAkJCWpwYXRoX3RhYmxlX2xbanBh dGhfdGFibGVfaW5kZXhdID0gMTsKQEAgLTc0MiwxMCArODgyLDEwIEBACiAjaWZkZWYgQVBQTEVf SFlCCiAJCS8qIFVzZSB0aGUgSEZTIG5hbWUgaWYgaXQgZXhpc3RzICovCiAJCWlmIChVU0VfTUFD X05BTUUoc19lbnRyeTEpKQotCQkJY3Z0X2xlbiA9IGpvbGlldF9zdHJsZW4oc19lbnRyeTEtPmhm c19lbnQtPm5hbWUpOworCQkJY3Z0X2xlbiA9IGpvbGlldF9zdHJsZW4oc19lbnRyeTEtPmhmc19l bnQtPm5hbWUsIGhmc19pbmxzKTsKIAkJZWxzZQogI2VuZGlmCS8qIEFQUExFX0hZQiAqLwotCQkJ Y3Z0X2xlbiA9IGpvbGlldF9zdHJsZW4oc19lbnRyeTEtPm5hbWUpOworCQkJY3Z0X2xlbiA9IGpv bGlldF9zdHJsZW4oc19lbnRyeTEtPm5hbWUsIGluX25scyk7CiAKIAkJLyoKIAkJICogRml4IHRo ZSByZWNvcmQgbGVuZ3RoCkBAIC04OTEsMTIgKzEwMzEsMTIgQEAKIAkJCQlpZiAoVVNFX01BQ19O QU1FKHNfZW50cnkpKQogCQkJCQkvKiBVc2UgdGhlIEhGUyBuYW1lIGlmIGl0IGV4aXN0cyAqLwog CQkJCQlqcGF0aF90YWJsZV9zaXplICs9Ci0JCQkJCQlqb2xpZXRfc3RybGVuKHNfZW50cnktPmhm c19lbnQtPm5hbWUpICsKKwkJCQkJCWpvbGlldF9zdHJsZW4oc19lbnRyeS0+aGZzX2VudC0+bmFt ZSwgaGZzX2lubHMpICsKIAkJCQkJCW9mZnNldG9mKHN0cnVjdCBpc29fcGF0aF90YWJsZSwgbmFt ZVswXSk7CiAJCQkJZWxzZQogI2VuZGlmCS8qIEFQUExFX0hZQiAqLwogCQkJCQlqcGF0aF90YWJs ZV9zaXplICs9Ci0JCQkJCQlqb2xpZXRfc3RybGVuKHNfZW50cnktPm5hbWUpICsKKwkJCQkJCWpv bGlldF9zdHJsZW4oc19lbnRyeS0+bmFtZSwgaW5fbmxzKSArCiAJCQkJCQlvZmZzZXRvZihzdHJ1 Y3QgaXNvX3BhdGhfdGFibGUsIG5hbWVbMF0pOwogCQkJCWlmIChqcGF0aF90YWJsZV9zaXplICYg MSkgewogCQkJCQlqcGF0aF90YWJsZV9zaXplKys7CkBAIC05MTgsMTMgKzEwNTgsMTMgQEAKIAkJ CQkvKiBVc2UgdGhlIEhGUyBuYW1lIGlmIGl0IGV4aXN0cyAqLwogCQkJCXNfZW50cnktPmpyZWNs ZW4gPQogCQkJCW9mZnNldG9mKHN0cnVjdCBpc29fZGlyZWN0b3J5X3JlY29yZCwgbmFtZVswXSkK LQkJCQkJKyBqb2xpZXRfc3RybGVuKHNfZW50cnktPmhmc19lbnQtPm5hbWUpCisJCQkJCSsgam9s aWV0X3N0cmxlbihzX2VudHJ5LT5oZnNfZW50LT5uYW1lLCBoZnNfaW5scykKIAkJCQkJKyAxOwog CQkJZWxzZQogI2VuZGlmCS8qIEFQUExFX0hZQiAqLwogCQkJCXNfZW50cnktPmpyZWNsZW4gPQog CQkJCW9mZnNldG9mKHN0cnVjdCBpc29fZGlyZWN0b3J5X3JlY29yZCwgbmFtZVswXSkKLQkJCQkJ KyBqb2xpZXRfc3RybGVuKHNfZW50cnktPm5hbWUpCisJCQkJCSsgam9saWV0X3N0cmxlbihzX2Vu dHJ5LT5uYW1lLCBpbl9ubHMpCiAJCQkJCSsgMTsKIAkJfSBlbHNlIHsKIAkJCS8qCkBAIC0xMDcy LDYgKzEyMTIsOSBAQAogI2VuZGlmCiAKIAl3aGlsZSAoKnJwbnQgJiYgKmxwbnQpIHsKKyNpZmRl ZiBVU0VfSUNPTlYKKwkJc2l6ZV90IHJpLCBsaTsKKyNlbmRpZgogCQlpZiAoKnJwbnQgPT0gJzsn ICYmICpscG50ICE9ICc7JykKIAkJCXJldHVybiAoLTEpOwogCQlpZiAoKnJwbnQgIT0gJzsnICYm ICpscG50ID09ICc7JykKQEAgLTEwOTIsMTYgKzEyMzUsMzIgQEAKIAkJCXJldHVybiAoMSk7CiAj ZW5kaWYKIAorI2lmZGVmIFVTRV9JQ09OVgorCisJCXJpID0gY29udmVydF90b191bmljb2RlKHJ0 bXAsIDIsIHJwbnQsIHJpbmxzKTsKKwkJbGkgPSBjb252ZXJ0X3RvX3VuaWNvZGUobHRtcCwgMiwg bHBudCwgbGlubHMpOworCQlycG50ICs9IHJpOworCQlscG50ICs9IGxpOworCQlpZighcmkgJiYg IWxpKQorCQkJcmV0dXJuICgwKTsKKwkJZWxzZSBpZihyaSAmJiAhbGkpCisJCQlyZXR1cm4gKDEp OworCQllbHNlIGlmKCFyaSAmJiBsaSkKKwkJCXJldHVybiAoLTEpOworI2Vsc2UKIAkJY29udmVy dF90b191bmljb2RlKHJ0bXAsIDIsIHJwbnQsIHJpbmxzKTsKIAkJY29udmVydF90b191bmljb2Rl KGx0bXAsIDIsIGxwbnQsIGxpbmxzKTsKKyNlbmRpZgogCiAJCWlmIChhX3RvX3VfMl9ieXRlKHJ0 bXApIDwgYV90b191XzJfYnl0ZShsdG1wKSkKIAkJCXJldHVybiAoLTEpOwogCQlpZiAoYV90b191 XzJfYnl0ZShydG1wKSA+IGFfdG9fdV8yX2J5dGUobHRtcCkpCiAJCQlyZXR1cm4gKDEpOwogCisj aWZuZGVmIFVTRV9JQ09OVgogCQlycG50Kys7CiAJCWxwbnQrKzsKKyNlbmRpZgogCX0KIAlpZiAo KnJwbnQpCiAJCXJldHVybiAoMSk7CmRpZmYgLXVyTiAtLWV4Y2x1ZGUtZnJvbT0tIGNkcnRvb2xz LTIuMDEvbWtpc29mcy9NYWtlZmlsZSBjZHJ0b29scy0yLjAxLWpoL21raXNvZnMvTWFrZWZpbGUK LS0tIGNkcnRvb2xzLTIuMDEvbWtpc29mcy9NYWtlZmlsZQkyMDA0LTAxLTAyIDE3OjIzOjMyLjAw MDAwMDAwMCArMDIwMAorKysgY2RydG9vbHMtMi4wMS1qaC9ta2lzb2ZzL01ha2VmaWxlCTIwMDQt MDItMDIgMTg6MzE6MjIuMDAwMDAwMDAwICswMjAwCkBAIC0zMiw2ICszMiw3IEBACiBDUFBPUFRT ICs9CS1EVURGCiBDUFBPUFRTICs9CS1ERFZEX1ZJREVPCiBDUFBPUFRTICs9CS1EU09SVElORwor Q1BQT1BUUyArPQktRFVTRV9JQ09OVgogQ1BQT1BUUyArPQktSS4uL2xpYmhmc19pc28vCiBDUFBP UFRTCSs9CS1ESEFWRV9DT05GSUdfSCAtRFVTRV9MSUJTQ0hJTFkgLURVU0VfU0NHIFwKIAkJJy1E QVBQSURfREVGQVVMVD0iTUtJU09GUyBJU08gOTY2MC9IRlMgRklMRVNZU1RFTSBCVUlMREVSICYg Q0RSRUNPUkQgQ0QtUi9EVkQgQ1JFQVRPUiAoQykgMTk5MyBFLllPVU5HREFMRSAoQykgMTk5NyBK LlBFQVJTT04vSi5TQ0hJTExJTkciJyBcCmRpZmYgLXVyTiAtLWV4Y2x1ZGUtZnJvbT0tIGNkcnRv b2xzLTIuMDEvbWtpc29mcy9ta2lzb2ZzLmMgY2RydG9vbHMtMi4wMS1qaC9ta2lzb2ZzL21raXNv ZnMuYwotLS0gY2RydG9vbHMtMi4wMS9ta2lzb2ZzL21raXNvZnMuYwkyMDA0LTAxLTA3IDAxOjIz OjQ2LjAwMDAwMDAwMCArMDIwMAorKysgY2RydG9vbHMtMi4wMS1qaC9ta2lzb2ZzL21raXNvZnMu YwkyMDA0LTAyLTAyIDE4OjMxOjIyLjAwMDAwMDAwMCArMDIwMApAQCAtNTksNiArNTksMTEgQEAK ICNlbmRpZgogI2VuZGlmCS8qIG5vX21vcmVfbmVlZGVkICovCiAKKyNpZmRlZiBVU0VfSUNPTlYK KyNpbmNsdWRlIDxsb2NhbGUuaD4KKyNpbmNsdWRlIDxsYW5naW5mby5oPgorI2VuZGlmCisKIHN0 cnVjdCBkaXJlY3RvcnkgKnJvb3QgPSBOVUxMOwogaW50CQlwYXRoX2luZDsKIApAQCAtMjIzLDYg KzIyOCwxMCBAQAogaW50CWRvX3NvcnQgPSAwOwkJLyogc29ydCBmaWxlIGRhdGEgKi8KICNlbmRp ZiAvKiBTT1JUSU5HICovCiAKKyNpZmRlZiBVU0VfSUNPTlYKK2ludAlpY29udl9wb3NzaWJsZTsK KyNlbmRpZgorCiBzdHJ1Y3QgbmxzX3RhYmxlICppbl9ubHMgPSBOVUxMOyAgLyogaW5wdXQgVU5J Q09ERSBjb252ZXJzaW9uIHRhYmxlICovCiBzdHJ1Y3QgbmxzX3RhYmxlICpvdXRfbmxzID0gTlVM TDsgLyogb3V0cHV0IFVOSUNPREUgY29udmVyc2lvbiB0YWJsZSAqLwogI2lmZGVmIEFQUExFX0hZ QgpAQCAtMjIzNSw2ICsyMjQ0LDM3IEBACiAJaW5pdF9ubHNfZmlsZShoZnNfb2NoYXJzZXQpOwog I2VuZGlmIC8qIEFQUExFX0hZQiAqLwogCisjaWZkZWYgVVNFX0lDT05WCisJaWNvbnZfcG9zc2li bGUgPSAhKGlzbzk2NjBfbGV2ZWwgPj0gNCB8fCAoKG9jaGFyc2V0ICYmCisJCXN0cmNtcChvY2hh cnNldCwgaWNoYXJzZXQgPyBpY2hhcnNldCA6ICIiKSkgJiYKKwkJdXNlX1JvY2tSaWRnZSkgfHwg YXBwbGVfZXh0IHx8IGFwcGxlX2h5Yik7CisKKwlzZXRsb2NhbGUoTENfQ1RZUEUsICIiKTsKKwkK KyAgCWlmIChpY2hhcnNldCA9PSBOVUxMICYmIGljb252X3Bvc3NpYmxlKSB7CisJCWNoYXIgKmNo YXJzZXQgPSBubF9sYW5naW5mbyhDT0RFU0VUKTsKKwkJLyogc2V0IHRvIGRldGVjdGVkIHZhbHVl IGJ1dCBvbmx5IGlmIGl0IGlzIG5vdCBwdXJlIFVTLUFTQ0lJICovCisJCWlmKHN0cmNtcChjaGFy c2V0LCAiQU5TSV9YMy40LTE5NjgiKSAhPSAwKQorCQkJaWNoYXJzZXQgPSBjaGFyc2V0OworCisJ CWlmKGljaGFyc2V0ICYmIHZlcmJvc2UgPiAwKQorCQkJZnByaW50ZihzdGRlcnIsICJJTkZPOlx0 IgorCQkJIiVzIGNoYXJhY3RlciBlbmNvZGluZyBkZXRlY3RlZCBieSBsb2NhbGUgc2V0dGluZ3Mu IgorCQkJIlxuXHRBc3N1bWluZyAlcyBlbmNvZGVkIGZpbGVuYW1lcyBvbiBzb3VyY2UgIgorCQkJ ImZpbGVzeXN0ZW0sXG4iCisJCQkiXHR1c2UgLWlucHV0LWNoYXJzZXQgdG8gb3ZlcnJpZGUuXG4i LAorCQkJaWNoYXJzZXQsIGljaGFyc2V0KTsKKwl9CisKKwlpZihpY29udl9wb3NzaWJsZSkgewor CQkvKgorCQkgKiBkb24ndCBjYXJlIGlmIGluaXRpYWxpemF0aW9uIGZhaWxzCisJCSAqLworCQlp bml0X25sc19pY29udihpY2hhcnNldCk7CisJCWluaXRfbmxzX2ljb252KG9jaGFyc2V0KTsKKwl9 CisjZW5kaWYKKwogCWlmIChpY2hhcnNldCA9PSBOVUxMKSB7CiAjaWYJKGRlZmluZWQoX19DWUdX SU4zMl9fKSB8fCBkZWZpbmVkKF9fQ1lHV0lOX18pKSAmJiAhZGVmaW5lZChJU19DWUdXSU5fMSkK IAkJaW5fbmxzID0gbG9hZF9ubHMoImNwNDM3Iik7CkBAIC0yMjYyLDYgKzIzMDIsMTIgQEAKIAlp ZiAoaW5fbmxzID09IE5VTEwgfHwgb3V0X25scyA9PSBOVUxMKSB7IC8qIFVua25vd24gY2hhcnNl dCBzcGVjaWZpZWQgKi8KIAkJZnByaW50ZihzdGRlcnIsICJVbmtub3duIGNoYXJzZXRcbktub3du IGNoYXJzZXRzIGFyZTpcbiIpOwogCQlsaXN0X25scygpOwkvKiBMaXN0IGFsbCBrbm93biBjaGFy c2V0IG5hbWVzICovCisjaWZkZWYgVVNFX0lDT05WCisJCWlmKCFpY29udl9wb3NzaWJsZSkKKwkJ CWZwcmludGYoc3RkZXJyLCAiSWNvbnYgY2hhcnNldHMgY2Fubm90IGJlIHVzZWQgd2l0aCAiCisJ CQkJIkFwcGxlIGV4dGVuc2lvbiwgSEZTLCBJU085NjYwIHZlcnNpb24gMiBvclxuIgorCQkJCSJS b2NrIFJpZGdlLlxuIik7CisjZW5kaWYKIAkJZXhpdCgxKTsKIAl9CiAKZGlmZiAtdXJOIC0tZXhj bHVkZS1mcm9tPS0gY2RydG9vbHMtMi4wMS9ta2lzb2ZzL21raXNvZnMuaCBjZHJ0b29scy0yLjAx LWpoL21raXNvZnMvbWtpc29mcy5oCi0tLSBjZHJ0b29scy0yLjAxL21raXNvZnMvbWtpc29mcy5o CTIwMDMtMTItMjggMTU6Mzg6NTEuMDAwMDAwMDAwICswMjAwCisrKyBjZHJ0b29scy0yLjAxLWpo L21raXNvZnMvbWtpc29mcy5oCTIwMDQtMDItMDIgMTg6MzE6MjIuMDAwMDAwMDAwICswMjAwCkBA IC01MDEsOSArNTAxLDE0IEBACiAKIC8qIGpvbGlldC5jICovCiAjaWZkZWYJVURGCisjCWlmZGVm IFVTRV9JQ09OVgorZXh0ZXJuCXNpemVfdAljb252ZXJ0X3RvX3VuaWNvZGUJX19QUigodW5zaWdu ZWQgY2hhciAqYnVmZmVyLAorCQkJaW50IHNpemUsIGNoYXIgKnNvdXJjZSwgc3RydWN0IG5sc190 YWJsZSAqaW5scykpOworIwllbHNlCiBleHRlcm4Jdm9pZAljb252ZXJ0X3RvX3VuaWNvZGUJX19Q UigodW5zaWduZWQgY2hhciAqYnVmZmVyLAogCQkJaW50IHNpemUsIGNoYXIgKnNvdXJjZSwgc3Ry dWN0IG5sc190YWJsZSAqaW5scykpOwotZXh0ZXJuCWludAlqb2xpZXRfc3RybGVuCQlfX1BSKChj b25zdCBjaGFyICpzdHJpbmcpKTsKKyMJZW5kaWYKK2V4dGVybglpbnQJam9saWV0X3N0cmxlbgkJ X19QUigoY29uc3QgY2hhciAqc3RyaW5nLCBzdHJ1Y3QgbmxzX3RhYmxlICppbmxzKSk7CiAjZW5k aWYKIGV4dGVybiB1bnNpZ25lZCBjaGFyIGNvbnZfY2hhcnNldCBfX1BSKCh1bnNpZ25lZCBjaGFy LCBzdHJ1Y3QgbmxzX3RhYmxlICosCiAJCQkJc3RydWN0IG5sc190YWJsZSAqKSk7CmRpZmYgLXVy TiAtLWV4Y2x1ZGUtZnJvbT0tIGNkcnRvb2xzLTIuMDEvbWtpc29mcy91ZGYuYyBjZHJ0b29scy0y LjAxLWpoL21raXNvZnMvdWRmLmMKLS0tIGNkcnRvb2xzLTIuMDEvbWtpc29mcy91ZGYuYwkyMDAz LTA0LTI4IDAxOjM0OjUyLjAwMDAwMDAwMCArMDMwMAorKysgY2RydG9vbHMtMi4wMS1qaC9ta2lz b2ZzL3VkZi5jCTIwMDQtMDItMDIgMTg6MzE6MjIuMDAwMDAwMDAwICswMjAwCkBAIC00NDIsNyAr NDQyLDcgQEAKIAlpbnQgaTsKIAlpbnQgZXhwYW5kZWRfbGVuZ3RoOwogCi0JZXhwYW5kZWRfbGVu Z3RoID0gam9saWV0X3N0cmxlbihzcmMpOworCWV4cGFuZGVkX2xlbmd0aCA9IGpvbGlldF9zdHJs ZW4oc3JjLCBpbl9ubHMpOwogCWlmIChleHBhbmRlZF9sZW5ndGggPiAxMDI0KQogCQlleHBhbmRl ZF9sZW5ndGggPSAxMDI0OwogCWlmIChleHBhbmRlZF9sZW5ndGggPiAoZHN0X3NpemUtMSkqMikK 52098 2005-02-24 23:52 0000 A diff for cdrtools-2.01.01_alpha01-r1 cdrtools-2.01.01_alpha01-r1.patch text/plain M2MzCjwgIyAkSGVhZGVyOiAvdmFyL2N2c3Jvb3QvZ2VudG9vLXg4Ni9hcHAtY2RyL2NkcnRvb2xz L2NkcnRvb2xzLTIuMDEuMDFfYWxwaGEwMS5lYnVpbGQsdiAxLjIgMjAwNS8wMS8wMSAxMjoxMDo1 NSBlcmFkaWNhdG9yIEV4cCAkCi0tLQo+ICMgJEhlYWRlcjogJAoyN2EyOCwyOQo+IAkjIFVURi04 IHN1cHBvcnQsIHNlZSBCdWcgIzI4MzY5Cj4gCXVzZSBubHMgJiYgZXBhdGNoICR7RklMRVNESVJ9 L21raXNvZnMtaWNvbnYtMTAucGF0Y2gK