132389 2006-05-05 14:38 0000 games-fps/avp fails - gcc-4.1 2006-10-13 10:01:17 0000 1 1 1 Unclassified Gentoo Linux Games unspecified All Linux RESOLVED FIXED P2 normal --- 117482 1 tupone@gentoo.org games@gentoo.org msylwester@gmail.com tupone@gentoo.org 2006-05-05 14:38:53 0000 emerging avp-cvs fails compiling with gcc-4.1 I'm attaching my tentative fix ebuild/patch file tupone@gentoo.org 2006-05-05 14:39:49 0000 Created an attachment (id=86229) avp-cvs-20031110-gcc41.patch vapier@gentoo.org 2006-05-05 16:57:16 0000 go bug zakk on #gentoo-games to fix this upstream halcy0n@gentoo.org 2006-05-10 20:51:55 0000 Looks fine to me. tupone@gentoo.org 2006-06-06 02:58:36 0000 Patch is not complete, need more patching. Sorry if I mis-explained wolf31o2@gentoo.org 2006-06-06 07:16:31 0000 Once we get a good and working upstream patch, I'll roll up a new snapshot. The last patch that was applied upstream is the GCC 3.4 patch from us, so upstream really is pretty dead. msylwester@gmail.com 2006-09-12 10:17:23 0000 Created an attachment (id=96807) Extended version of previous patch I was able to compile with this patch. I just noticed, that the change I made to Makefile may be already fixed by bug #132389 (with a better fix) nyhm@gentoo.org 2006-09-18 11:14:43 0000 would this work? $(shell openal-config --libdir)/libopenal.a wolf31o2@gentoo.org 2006-09-18 13:43:14 0000 That might work... can someone try it? nyhm@gentoo.org 2006-09-18 15:55:55 0000 Created an attachment (id=97369) avp-gentoo.patch Patch works for me, thanks. Can this go upstream then? Maybe this one as well http://dev.gentoo.org/~vapier/patches/avp-cleanup.patch wolf31o2@gentoo.org 2006-10-06 09:30:04 0000 Tristan, you have this game? If so, please work this bug. Also, if these need to be pushed upstream, I can do so, just let me know. nyhm@gentoo.org 2006-10-06 11:28:00 0000 Works for me with those two patches. They remove the need for the sed stuff in the ebuild. wolf31o2@gentoo.org 2006-10-13 10:01:17 0000 Fixed and patches submitted upstream 86229 2006-05-05 14:39 0000 avp-cvs-20031110-gcc41.patch avp-cvs-20031110-gcc41.patch text/plain LS0tIGF2cC93aW45NS9nYWRnZXRzL3RyZXBnYWRnLmhwcC5vbGQJMjAwNi0wNS0wNSAyMzowNjow My4wMDAwMDAwMDAgKzAyMDAKKysrIGF2cC93aW45NS9nYWRnZXRzL3RyZXBnYWRnLmhwcAkyMDA2 LTA1LTA1IDIzOjA2OjQwLjAwMDAwMDAwMCArMDIwMApAQCAtNTYsMTIgKzU2LDEyIEBACiAJCQlp bnQgRml4UF9BbHBoYQogCQkpOwogCi0JCXN0cnVjdCByMnBvcyBUZXh0UmVwb3J0R2FkZ2V0IDo6 IEdldFBvc19SZWwKKwkJc3RydWN0IHIycG9zIEdldFBvc19SZWwKIAkJKAogCQkJY29uc3Qgc3Ry dWN0IHIycmVjdCYgUjJSZWN0X1BhcmVudAogCQkpIGNvbnN0OwogCi0JCXIyc2l6ZSBUZXh0UmVw b3J0R2FkZ2V0IDo6IEdldFNpemUKKwkJcjJzaXplIEdldFNpemUKIAkJKAogCQkJY29uc3Qgc3Ry dWN0IHIycmVjdCYgUjJSZWN0X1BhcmVudAogCQkpIGNvbnN0OwotLS0gd2luOTUvY2h1bmsuaHBw Lm9sZAkyMDA2LTA1LTA1IDIzOjE4OjQ4LjAwMDAwMDAwMCArMDIwMAorKysgd2luOTUvY2h1bmsu aHBwCTIwMDYtMDUtMDUgMjM6MTk6MDcuMDAwMDAwMDAwICswMjAwCkBAIC0zNjUsNyArMzY1LDcg QEAKIAl2aXJ0dWFsIHZvaWQgZmlsbF9kYXRhX2Jsb2NrX2Zvcl9wcm9jZXNzKGNoYXIgKiBkYXRh X3N0YXJ0KTsJCiAKIAotCUNodW5rKiBDaHVua19XaXRoX0NoaWxkcmVuOjpEeW5DcmVhdGUoY29u c3QgY2hhciogZGF0YSk7CisJQ2h1bmsqIER5bkNyZWF0ZShjb25zdCBjaGFyKiBkYXRhKTsKIAog cHJvdGVjdGVkOgogCi0tLSB3aW45NS9jaG5rbG9hZC5ocHAub2xkCTIwMDYtMDUtMDUgMjM6MjE6 NDcuMDAwMDAwMDAwICswMjAwCisrKyB3aW45NS9jaG5rbG9hZC5ocHAJMjAwNi0wNS0wNSAyMzoy Mjo1Ny4wMDAwMDAwMDAgKzAyMDAKQEAgLTQxLDYgKzQxLDcgQEAKIAkJCQkJCQljb25zdCBDaHVu a09iamVjdCogb2JqZWN0PTAJICAvL29iamVjdCB1c2VkIHNvIHRoYXQgY29udmVyc2lvbiBmcm9t IGZsb2F0IHRvIGludCBjYW4gYmUgZG9uZSBpbiB3b3JsZCBjb29yZGluYXRlcwogCQkJCQkJCSk7 CiAJCQkJCQkJCitjbGFzcyBTcHJpdGVfSGVhZGVyX0NodW5rOwogZXh0ZXJuIEJPT0wgY29weV9z cHJpdGVfdG9fc2hhcGVoZWFkZXIgKFJJRkZIQU5ETEUsIFNIQVBFSEVBREVSIComIHNocGhkLFNw cml0ZV9IZWFkZXJfQ2h1bmsqIHNoYywgaW50IGxpc3Rwb3MgPSBHTFNfTk9USU5MSVNUKTsKIAog Ci0tLSBhdnAvd2luOTUvcHJvamxvYWQuaHBwLm9sZAkyMDA2LTA1LTA1IDIzOjI1OjQ5LjAwMDAw MDAwMCArMDIwMAorKysgYXZwL3dpbjk1L3Byb2psb2FkLmhwcAkyMDA2LTA1LTA1IDIzOjI2OjIx LjAwMDAwMDAwMCArMDIwMApAQCAtNTQsNiArNTQsNyBAQAogc3RydWN0IGhpZXJhcmNoeV92YXJp YW50X2RhdGE7CiB9OwogCitjbGFzcyBGaWxlX0NodW5rOwogY2xhc3MgR2xvYmFsX0hpZXJhcmNo eV9TdG9yZQogewogCi0tLSB3aW45NS9jaHVua3BhbC5ocHAub2xkCTIwMDYtMDUtMDUgMjM6Mjg6 MjQuMDAwMDAwMDAwICswMjAwCisrKyB3aW45NS9jaHVua3BhbC5ocHAJMjAwNi0wNS0wNSAyMzoy OTowMC4wMDAwMDAwMDAgKzAyMDAKQEAgLTU0OSw3ICs1NDksNyBAQAogY2xhc3MgRW52aXJvbm1l bnRfR2FtZV9Nb2RlX0NodW5rOwogY2xhc3MgRW52aXJvbm1lbnRfR2FtZV9Nb2RlX0hlYWRlcl9D aHVuazsKIAotCitjbGFzcyBFbnZpcm9ubWVudF9EYXRhX0NodW5rOwogCiBjbGFzcyBFbnZpcm9u bWVudF9HYW1lX01vZGVfQ2h1bmsgOiBwdWJsaWMgQ2h1bmtfV2l0aF9DaGlsZHJlbgogewo= 96807 2006-09-12 10:17 0000 Extended version of previous patch avp.diff text/plain ZGlmZiAtTnVyQiAtTnVyYiBhdnAub3JpZy9hdnAvd2luOTUvZ2FkZ2V0cy90cmVwZ2FkZy5ocHAg YXZwL2F2cC93aW45NS9nYWRnZXRzL3RyZXBnYWRnLmhwcAotLS0gYXZwLm9yaWcvYXZwL3dpbjk1 L2dhZGdldHMvdHJlcGdhZGcuaHBwCTIwMDEtMTItMDkgMDI6MjE6NDkuMDAwMDAwMDAwICswMTAw CisrKyBhdnAvYXZwL3dpbjk1L2dhZGdldHMvdHJlcGdhZGcuaHBwCTIwMDYtMDktMDQgMjI6MDE6 MzguMjA2NTE5NjI5ICswMjAwCkBAIC01NiwxMiArNTYsMTIgQEAKIAkJCWludCBGaXhQX0FscGhh CiAJCSk7CiAKLQkJc3RydWN0IHIycG9zIFRleHRSZXBvcnRHYWRnZXQgOjogR2V0UG9zX1JlbAor CQlzdHJ1Y3QgcjJwb3MgR2V0UG9zX1JlbAogCQkoCiAJCQljb25zdCBzdHJ1Y3QgcjJyZWN0JiBS MlJlY3RfUGFyZW50CiAJCSkgY29uc3Q7CiAKLQkJcjJzaXplIFRleHRSZXBvcnRHYWRnZXQgOjog R2V0U2l6ZQorCQlyMnNpemUgR2V0U2l6ZQogCQkoCiAJCQljb25zdCBzdHJ1Y3QgcjJyZWN0JiBS MlJlY3RfUGFyZW50CiAJCSkgY29uc3Q7CmRpZmYgLU51ckIgLU51cmIgYXZwLm9yaWcvYXZwL3dp bjk1L3Byb2psb2FkLmhwcCBhdnAvYXZwL3dpbjk1L3Byb2psb2FkLmhwcAotLS0gYXZwLm9yaWcv YXZwL3dpbjk1L3Byb2psb2FkLmhwcAkyMDAxLTA4LTAzIDA3OjMwOjQwLjAwMDAwMDAwMCArMDIw MAorKysgYXZwL2F2cC93aW45NS9wcm9qbG9hZC5ocHAJMjAwNi0wOS0wNCAyMjowMzo1MC44NTU2 MDcwMjMgKzAyMDAKQEAgLTU0LDYgKzU0LDggQEAKIHN0cnVjdCBoaWVyYXJjaHlfdmFyaWFudF9k YXRhOwogfTsKIAorY2xhc3MgRmlsZV9DaHVuazsKKwogY2xhc3MgR2xvYmFsX0hpZXJhcmNoeV9T dG9yZQogewogCmRpZmYgLU51ckIgLU51cmIgYXZwLm9yaWcvTWFrZWZpbGUgYXZwL01ha2VmaWxl Ci0tLSBhdnAub3JpZy9NYWtlZmlsZQkyMDAzLTEwLTE1IDA4OjEwOjQyLjAwMDAwMDAwMCArMDIw MAorKysgYXZwL01ha2VmaWxlCTIwMDYtMDktMDUgMDk6MzI6NTQuODE1NDc0MjY0ICswMjAwCkBA IC0xMiw3ICsxMiw4IEBACiBDRkxBR1MgKz0gJChzaGVsbCBzZGwtY29uZmlnIC0tY2ZsYWdzKQog Q1hYRkxBR1MgPSAkKENGTEFHUykKIAotTERMSUJTID0gJChzaGVsbCBzZGwtY29uZmlnIC0tbGli cykgLWxvcGVuYWwKKyNMRExJQlMgPSAkKHNoZWxsIHNkbC1jb25maWcgLS1saWJzKSAkKHNoZWxs IG9wZW5hbC1jb25maWcgLS1saWJzKQorTERMSUJTID0gJChzaGVsbCBzZGwtY29uZmlnIC0tbGli cykgL3Vzci9saWIvbGlib3BlbmFsLmEKIAogQUZMQUdTID0gLWcgLXcrbWFjcm8tcGFyYW1zIC13 K29ycGhhbi1sYWJlbHMgLXcrbnVtYmVyLW92ZXJmbG93CiAKZGlmZiAtTnVyQiAtTnVyYiBhdnAu b3JpZy93aW45NS9jaG5rbG9hZC5ocHAgYXZwL3dpbjk1L2Nobmtsb2FkLmhwcAotLS0gYXZwLm9y aWcvd2luOTUvY2hua2xvYWQuaHBwCTIwMDEtMDgtMDcgMDQ6Mzg6NDMuMDAwMDAwMDAwICswMjAw CisrKyBhdnAvd2luOTUvY2hua2xvYWQuaHBwCTIwMDYtMDktMDQgMjI6MDM6MTMuMzk4MjE3NTc3 ICswMjAwCkBAIC00MSw2ICs0MSw4IEBACiAJCQkJCQkJY29uc3QgQ2h1bmtPYmplY3QqIG9iamVj dD0wCSAgLy9vYmplY3QgdXNlZCBzbyB0aGF0IGNvbnZlcnNpb24gZnJvbSBmbG9hdCB0byBpbnQg Y2FuIGJlIGRvbmUgaW4gd29ybGQgY29vcmRpbmF0ZXMKIAkJCQkJCQkpOwogCQkJCQkJCQorY2xh c3MgU3ByaXRlX0hlYWRlcl9DaHVuazsKKwogZXh0ZXJuIEJPT0wgY29weV9zcHJpdGVfdG9fc2hh cGVoZWFkZXIgKFJJRkZIQU5ETEUsIFNIQVBFSEVBREVSIComIHNocGhkLFNwcml0ZV9IZWFkZXJf Q2h1bmsqIHNoYywgaW50IGxpc3Rwb3MgPSBHTFNfTk9USU5MSVNUKTsKIAogCmRpZmYgLU51ckIg LU51cmIgYXZwLm9yaWcvd2luOTUvY2h1bmsuaHBwIGF2cC93aW45NS9jaHVuay5ocHAKLS0tIGF2 cC5vcmlnL3dpbjk1L2NodW5rLmhwcAkyMDAxLTA3LTI4IDA2OjQ0OjI3LjAwMDAwMDAwMCArMDIw MAorKysgYXZwL3dpbjk1L2NodW5rLmhwcAkyMDA2LTA5LTA0IDIyOjAyOjQwLjkyMDk4NTMyOSAr MDIwMApAQCAtMzY1LDcgKzM2NSw3IEBACiAJdmlydHVhbCB2b2lkIGZpbGxfZGF0YV9ibG9ja19m b3JfcHJvY2VzcyhjaGFyICogZGF0YV9zdGFydCk7CQogCiAKLQlDaHVuayogQ2h1bmtfV2l0aF9D aGlsZHJlbjo6RHluQ3JlYXRlKGNvbnN0IGNoYXIqIGRhdGEpOworCUNodW5rKiBEeW5DcmVhdGUo Y29uc3QgY2hhciogZGF0YSk7CiAKIHByb3RlY3RlZDoKIApkaWZmIC1OdXJCIC1OdXJiIGF2cC5v cmlnL3dpbjk1L2NodW5rcGFsLmhwcCBhdnAvd2luOTUvY2h1bmtwYWwuaHBwCi0tLSBhdnAub3Jp Zy93aW45NS9jaHVua3BhbC5ocHAJMjAwMS0xMi0xOCAwMzoyMzo0MS4wMDAwMDAwMDAgKzAxMDAK KysrIGF2cC93aW45NS9jaHVua3BhbC5ocHAJMjAwNi0wOS0wNCAyMjowNDoyNC41ODA4NDM3NTEg KzAyMDAKQEAgLTU0OSw3ICs1NDksNyBAQAogY2xhc3MgRW52aXJvbm1lbnRfR2FtZV9Nb2RlX0No dW5rOwogY2xhc3MgRW52aXJvbm1lbnRfR2FtZV9Nb2RlX0hlYWRlcl9DaHVuazsKIAotCitjbGFz cyBFbnZpcm9ubWVudF9EYXRhX0NodW5rOwogCiBjbGFzcyBFbnZpcm9ubWVudF9HYW1lX01vZGVf Q2h1bmsgOiBwdWJsaWMgQ2h1bmtfV2l0aF9DaGlsZHJlbgogewpkaWZmIC1OdXJCIC1OdXJiIGF2 cC5vcmlnL3dpbjk1L2hhc2hfdGVtLmhwcCBhdnAvd2luOTUvaGFzaF90ZW0uaHBwCi0tLSBhdnAu b3JpZy93aW45NS9oYXNoX3RlbS5ocHAJMjAwMy0wMS0xNCAwNjo0MzozOC4wMDAwMDAwMDAgKzAx MDAKKysrIGF2cC93aW45NS9oYXNoX3RlbS5ocHAJMjAwNi0wOS0wNSAwNjozNzoxNS4zMjc0Mjg5 ODQgKzAyMDAKQEAgLTIzMSw4ICsyMzEsMTMgQEAKIC8vIEhhc2hGdW5jdGlvbih1bnNpZ25lZCks IEhhc2hGdW5jdGlvbih2b2lkIGNvbnN0ICopLCBIYXNoRnVuY3Rpb24oY2hhciBjb25zdCAqKQog Ly8geW91IGNhbiBkaXNhYmxlIHRoZSBkZWZhdWx0IGhhc2ggZnVuY3Rpb25zIGJ5IGRlZmluaW5n IEhUX05PREVGQVVMVEZOUwogCituYW1lc3BhY2UgSUZGIHsKK2NsYXNzIFJlZ0VudHJ5OworfTsK KwogI2lmbmRlZiBIVF9OT0RFRkFVTFRGTlMKIAkvLyBhIGhhc2ggZnVuY3Rpb24gZm9yIGludGVn cmFsICh1bnNpZ25lZCkgdmFsdWVzCisgICAgaW5saW5lIHVuc2lnbmVkIGludCBIYXNoRnVuY3Rp b24oY29uc3QgSUZGOjpSZWdFbnRyeSYgckVudHJ5KTsKIAlpbmxpbmUgdW5zaWduZWQgSGFzaEZ1 bmN0aW9uKHVuc2lnbmVkIGNvbnN0IF9pKQogCXsKIAkJcmV0dXJuIF9pIF4gX2k+PjQgXiBfaT4+ OSBeIF9pPj4xNSBeIF9pPj4yMjsKQEAgLTQxOCw3ICs0MjMsNyBAQAogCQl9OwogCiAJCS8vIGEg X2Jhc2VfSGFzaFRhYmxlIG5vbi1jb25zdCBpdGVyYXRvciAtIGNhbiByZW1vdmUgZW50cnkgcG9p bnRlZCB0bwotCQljbGFzcyBJdGVyYXRvciA6IHB1YmxpYyBDb25zdEl0ZXJhdG9yCisJCWNsYXNz IEl0ZXJhdG9yIDogcHVibGljIF9iYXNlX0hhc2hUYWJsZTo6Q29uc3RJdGVyYXRvcgogCQl7CiAJ CQkJLy8gTmVzdGVkIGNsYXNzIGZ1bmN0aW9ucyBhcHBhcmVudGx5IGhhdmUgdG8gYmUgZGVjbGFy ZWQgaGVyZSBmb3IgTVNWQyBjb21wYXRhYmlsaXR5CiAJCQlwdWJsaWM6CkBAIC00MzIsMjQgKzQz NywyNCBAQAogCQkJCS8vIHJlbW92ZSB0aGUgY3VycmVudCBlbnRyeSBwb2ludGVkIHRvLCBhZHZh bmNpbmcgdG8gdGhlIG5leHQKIAkJCQl2b2lkIFJlbW92ZSgpCiAJCQkJewotCQkJCQlpZiAoIW5F bnRyaWVzUmVtYWluaW5nKQorCQkJCQlpZiAoIUNvbnN0SXRlcmF0b3I6Om5FbnRyaWVzUmVtYWlu aW5nKQogCQkJCQl7CiAJCQkJCQlIVF9GQUlMKCJIVFQ6IFRyaWVkIHRvIFJlbW92ZSgpIHZpYSBh biBpdGVyYXRvciB3aGljaCB3YXMgRG9uZSgpIik7CiAJCQkJCX0KLQkJCQkJTm9kZSAqIG9sZFAg PSAqbm9kZVBQOwotCQkJCQkqbm9kZVBQID0gb2xkUC0+bmV4dFA7CisJCQkJCU5vZGUgKiBvbGRQ ID0gKkNvbnN0SXRlcmF0b3I6Om5vZGVQUDsKKwkJCQkJKkNvbnN0SXRlcmF0b3I6Om5vZGVQUCA9 IG9sZFAtPm5leHRQOwogCQkJCQlkZWxldGUgb2xkUDsKLQkJCQkJaWYgKCEqbm9kZVBQKQorCQkJ CQlpZiAoISpDb25zdEl0ZXJhdG9yOjpub2RlUFApCiAJCQkJCXsKIAkJCQkJCWRvCiAJCQkJCQl7 Ci0JCQkJCQkJKysgY2hhaW5QUDsKLQkJCQkJCQktLSBuQ2hhaW5zUmVtYWluaW5nOworCQkJCQkJ CSsrIENvbnN0SXRlcmF0b3I6OmNoYWluUFA7CisJCQkJCQkJLS0gQ29uc3RJdGVyYXRvcjo6bkNo YWluc1JlbWFpbmluZzsKIAkJCQkJCX0KLQkJCQkJCXdoaWxlIChuQ2hhaW5zUmVtYWluaW5nICYm ICEqY2hhaW5QUCk7Ci0JCQkJCQlub2RlUFAgPSBjaGFpblBQOworCQkJCQkJd2hpbGUgKENvbnN0 SXRlcmF0b3I6Om5DaGFpbnNSZW1haW5pbmcgJiYgISpDb25zdEl0ZXJhdG9yOjpjaGFpblBQKTsK KwkJCQkJCUNvbnN0SXRlcmF0b3I6Om5vZGVQUCA9IENvbnN0SXRlcmF0b3I6OmNoYWluUFA7CiAJ CQkJCX0KLQkJCQkJLS0gbkVudHJpZXNSZW1haW5pbmc7CisJCQkJCS0tIENvbnN0SXRlcmF0b3I6 Om5FbnRyaWVzUmVtYWluaW5nOwogCQkJCQktLSAqdGFibGVORW50cmllc1A7CiAJCQkJfQogCkBA IC03MDIsNyArNzA3LDcgQEAKIAogCQogLy8JZm9yKEhhc2hUYWJsZTxUWVBFPjo6Q29uc3RJdGVy YXRvciBpdChodCk7ICFpdC5Eb25lKCk7IGl0Lk5leHQoKSApCi0JZm9yIChfYmFzZV9IYXNoVGFi bGU6OkNvbnN0SXRlcmF0b3IgaXQoaHQpOyAhaXQuRG9uZSgpOyBpdC5OZXh0KCkgKQorCWZvciAo Y2xhc3MgX2Jhc2VfSGFzaFRhYmxlOjpDb25zdEl0ZXJhdG9yIGl0KGh0KTsgIWl0LkRvbmUoKTsg aXQuTmV4dCgpICkKIAl7CiAJCUFkZFJlZ2FyZGxlc3MoIGl0LkdldCgpICk7CiAJfQpkaWZmIC1O dXJCIC1OdXJiIGF2cC5vcmlnL3dpbjk1L2lmZi5jcHAgYXZwL3dpbjk1L2lmZi5jcHAKLS0tIGF2 cC5vcmlnL3dpbjk1L2lmZi5jcHAJMjAwMS0xMi0wNiAwMToyMjo0OS4wMDAwMDAwMDAgKzAxMDAK KysrIGF2cC93aW45NS9pZmYuY3BwCTIwMDYtMDktMDQgMjI6MTY6NTguODk3NzM0Njk2ICswMjAw CkBAIC0yMTksNyArMjE5LDcgQEAKIAogfSAvLyBuYW1lc3BhY2UgSUZGCiAKLWlubGluZSB1bnNp Z25lZCBIYXNoRnVuY3Rpb24oSUZGOjpSZWdFbnRyeSBjb25zdCAmIHJFbnRyeSkKK2lubGluZSB1 bnNpZ25lZCBpbnQgSGFzaEZ1bmN0aW9uKGNvbnN0IElGRjo6UmVnRW50cnkmIHJFbnRyeSkKIHsK IAlyZXR1cm4gSGFzaEZ1bmN0aW9uKHJFbnRyeS5tX2lkQ2h1bmsubV9uSUQpOwogfQo= 97369 2006-09-18 15:55 0000 avp-gentoo.patch avp-gentoo.patch text/plain ZGlmZiAtdXIgYXZwLm9yaWcvYXZwL3dpbjk1L2dhZGdldHMvdHJlcGdhZGcuaHBwIGF2cC9hdnAv d2luOTUvZ2FkZ2V0cy90cmVwZ2FkZy5ocHAKLS0tIGF2cC5vcmlnL2F2cC93aW45NS9nYWRnZXRz L3RyZXBnYWRnLmhwcAkyMDAxLTEyLTA5IDAxOjIxOjQ5LjAwMDAwMDAwMCArMDAwMAorKysgYXZw L2F2cC93aW45NS9nYWRnZXRzL3RyZXBnYWRnLmhwcAkyMDA2LTA5LTE4IDIzOjM4OjAxLjAwMDAw MDAwMCArMDEwMApAQCAtNTYsMTIgKzU2LDEyIEBACiAJCQlpbnQgRml4UF9BbHBoYQogCQkpOwog Ci0JCXN0cnVjdCByMnBvcyBUZXh0UmVwb3J0R2FkZ2V0IDo6IEdldFBvc19SZWwKKwkJc3RydWN0 IHIycG9zIEdldFBvc19SZWwKIAkJKAogCQkJY29uc3Qgc3RydWN0IHIycmVjdCYgUjJSZWN0X1Bh cmVudAogCQkpIGNvbnN0OwogCi0JCXIyc2l6ZSBUZXh0UmVwb3J0R2FkZ2V0IDo6IEdldFNpemUK KwkJcjJzaXplIEdldFNpemUKIAkJKAogCQkJY29uc3Qgc3RydWN0IHIycmVjdCYgUjJSZWN0X1Bh cmVudAogCQkpIGNvbnN0OwpkaWZmIC11ciBhdnAub3JpZy9hdnAvd2luOTUvcHJvamxvYWQuaHBw IGF2cC9hdnAvd2luOTUvcHJvamxvYWQuaHBwCi0tLSBhdnAub3JpZy9hdnAvd2luOTUvcHJvamxv YWQuaHBwCTIwMDEtMDgtMDMgMDY6MzA6NDAuMDAwMDAwMDAwICswMTAwCisrKyBhdnAvYXZwL3dp bjk1L3Byb2psb2FkLmhwcAkyMDA2LTA5LTE4IDIzOjM4OjAxLjAwMDAwMDAwMCArMDEwMApAQCAt NTQsNiArNTQsOCBAQAogc3RydWN0IGhpZXJhcmNoeV92YXJpYW50X2RhdGE7CiB9OwogCitjbGFz cyBGaWxlX0NodW5rOworCiBjbGFzcyBHbG9iYWxfSGllcmFyY2h5X1N0b3JlCiB7CiAKZGlmZiAt dXIgYXZwLm9yaWcvTWFrZWZpbGUgYXZwL01ha2VmaWxlCi0tLSBhdnAub3JpZy9NYWtlZmlsZQky MDAzLTEwLTE1IDA3OjEwOjQyLjAwMDAwMDAwMCArMDEwMAorKysgYXZwL01ha2VmaWxlCTIwMDYt MDktMTggMjI6NDU6NDkuMDAwMDAwMDAwICswMTAwCkBAIC0yLDggKzIsOCBAQAogQ1hYID0gZysr CiBOQVNNID0gbmFzbQogCi0jQ0ZMQUdTID0gLWcgLVdhbGwgLXBpcGUKLUNGTEFHUyA9IC1nIC1X YWxsIC1waXBlIC1PMgorQ0ZMQUdTID89IC1nIC1waXBlIC1PMgorQ0ZMQUdTICs9IC1XYWxsCiAj Q0ZMQUdTID0gLUROREVCVUcgLVdhbGwgLXBpcGUgLU82IC1mZmFzdC1tYXRoIC1mb21pdC1mcmFt ZS1wb2ludGVyIC1tYXJjaD1wZW50aXVtIC1tY3B1PXBlbnRpdW1wcm8KIAogQ0ZMQUdTICs9IC1E TElOVVgKQEAgLTEyLDcgKzEyLDcgQEAKIENGTEFHUyArPSAkKHNoZWxsIHNkbC1jb25maWcgLS1j ZmxhZ3MpCiBDWFhGTEFHUyA9ICQoQ0ZMQUdTKQogCi1MRExJQlMgPSAkKHNoZWxsIHNkbC1jb25m aWcgLS1saWJzKSAtbG9wZW5hbAorTERGTEFHUyArPSAkKHNoZWxsIHNkbC1jb25maWcgLS1saWJz KSAkKHNoZWxsIG9wZW5hbC1jb25maWcgLS1saWJkaXIpL2xpYm9wZW5hbC5hCiAKIEFGTEFHUyA9 IC1nIC13K21hY3JvLXBhcmFtcyAtdytvcnBoYW4tbGFiZWxzIC13K251bWJlci1vdmVyZmxvdwog CkBAIC01Niw3ICs1Niw3IEBACiBhbGw6IEF2UAogCiBBdlA6ICQoT0JKKSAjIGRlcGVuZCAkKE9C SikKLQkkKENYWCkgLW8gQXZQICQoT0JKKSAkKExETElCUykKKwkkKENYWCkgLW8gQXZQICQoT0JK KSAkKExERkxBR1MpCiAKIGNvbXBpbGU6ICQoT0JKKQogCmRpZmYgLXVyIGF2cC5vcmlnL29wZW5h bC5jIGF2cC9vcGVuYWwuYwotLS0gYXZwLm9yaWcvb3BlbmFsLmMJMjAwMy0wOC0xMCAwMzozODow OC4wMDAwMDAwMDAgKzAxMDAKKysrIGF2cC9vcGVuYWwuYwkyMDA2LTA5LTE4IDIzOjUwOjIzLjAw MDAwMDAwMCArMDEwMApAQCAtNSw3ICs1LDYgQEAKIAogI2luY2x1ZGUgPEFML2FsLmg+CiAjaW5j bHVkZSA8QUwvYWxjLmg+Ci0jaW5jbHVkZSA8QUwvYWx1dC5oPgogCiAjaW5jbHVkZSA8U0RML1NE TF9hdWRpby5oPiAvLyBGb3IgYSBmZXcgZGVmaW5lcyAoQVVESU9fKikKIApkaWZmIC11ciBhdnAu b3JpZy93aW45NS9jaG5rbG9hZC5ocHAgYXZwL3dpbjk1L2Nobmtsb2FkLmhwcAotLS0gYXZwLm9y aWcvd2luOTUvY2hua2xvYWQuaHBwCTIwMDEtMDgtMDcgMDM6Mzg6NDMuMDAwMDAwMDAwICswMTAw CisrKyBhdnAvd2luOTUvY2hua2xvYWQuaHBwCTIwMDYtMDktMTggMjM6Mzg6MDEuMDAwMDAwMDAw ICswMTAwCkBAIC00MSw2ICs0MSw4IEBACiAJCQkJCQkJY29uc3QgQ2h1bmtPYmplY3QqIG9iamVj dD0wCSAgLy9vYmplY3QgdXNlZCBzbyB0aGF0IGNvbnZlcnNpb24gZnJvbSBmbG9hdCB0byBpbnQg Y2FuIGJlIGRvbmUgaW4gd29ybGQgY29vcmRpbmF0ZXMKIAkJCQkJCQkpOwogCQkJCQkJCQorY2xh c3MgU3ByaXRlX0hlYWRlcl9DaHVuazsKKwogZXh0ZXJuIEJPT0wgY29weV9zcHJpdGVfdG9fc2hh cGVoZWFkZXIgKFJJRkZIQU5ETEUsIFNIQVBFSEVBREVSIComIHNocGhkLFNwcml0ZV9IZWFkZXJf Q2h1bmsqIHNoYywgaW50IGxpc3Rwb3MgPSBHTFNfTk9USU5MSVNUKTsKIAogCmRpZmYgLXVyIGF2 cC5vcmlnL3dpbjk1L2NodW5rLmhwcCBhdnAvd2luOTUvY2h1bmsuaHBwCi0tLSBhdnAub3JpZy93 aW45NS9jaHVuay5ocHAJMjAwMS0wNy0yOCAwNTo0NDoyNy4wMDAwMDAwMDAgKzAxMDAKKysrIGF2 cC93aW45NS9jaHVuay5ocHAJMjAwNi0wOS0xOCAyMzozODowMS4wMDAwMDAwMDAgKzAxMDAKQEAg LTM2NSw3ICszNjUsNyBAQAogCXZpcnR1YWwgdm9pZCBmaWxsX2RhdGFfYmxvY2tfZm9yX3Byb2Nl c3MoY2hhciAqIGRhdGFfc3RhcnQpOwkKIAogCi0JQ2h1bmsqIENodW5rX1dpdGhfQ2hpbGRyZW46 OkR5bkNyZWF0ZShjb25zdCBjaGFyKiBkYXRhKTsKKwlDaHVuayogRHluQ3JlYXRlKGNvbnN0IGNo YXIqIGRhdGEpOwogCiBwcm90ZWN0ZWQ6CiAKZGlmZiAtdXIgYXZwLm9yaWcvd2luOTUvY2h1bmtw YWwuaHBwIGF2cC93aW45NS9jaHVua3BhbC5ocHAKLS0tIGF2cC5vcmlnL3dpbjk1L2NodW5rcGFs LmhwcAkyMDAxLTEyLTE4IDAyOjIzOjQxLjAwMDAwMDAwMCArMDAwMAorKysgYXZwL3dpbjk1L2No dW5rcGFsLmhwcAkyMDA2LTA5LTE4IDIzOjM4OjAxLjAwMDAwMDAwMCArMDEwMApAQCAtNTQ5LDcg KzU0OSw3IEBACiBjbGFzcyBFbnZpcm9ubWVudF9HYW1lX01vZGVfQ2h1bms7CiBjbGFzcyBFbnZp cm9ubWVudF9HYW1lX01vZGVfSGVhZGVyX0NodW5rOwogCi0KK2NsYXNzIEVudmlyb25tZW50X0Rh dGFfQ2h1bms7CiAKIGNsYXNzIEVudmlyb25tZW50X0dhbWVfTW9kZV9DaHVuayA6IHB1YmxpYyBD aHVua19XaXRoX0NoaWxkcmVuCiB7CmRpZmYgLXVyIGF2cC5vcmlnL3dpbjk1L2hhc2hfdGVtLmhw cCBhdnAvd2luOTUvaGFzaF90ZW0uaHBwCi0tLSBhdnAub3JpZy93aW45NS9oYXNoX3RlbS5ocHAJ MjAwMy0wMS0xNCAwNTo0MzozOC4wMDAwMDAwMDAgKzAwMDAKKysrIGF2cC93aW45NS9oYXNoX3Rl bS5ocHAJMjAwNi0wOS0xOCAyMzozODowMS4wMDAwMDAwMDAgKzAxMDAKQEAgLTIzMSw4ICsyMzEs MTMgQEAKIC8vIEhhc2hGdW5jdGlvbih1bnNpZ25lZCksIEhhc2hGdW5jdGlvbih2b2lkIGNvbnN0 ICopLCBIYXNoRnVuY3Rpb24oY2hhciBjb25zdCAqKQogLy8geW91IGNhbiBkaXNhYmxlIHRoZSBk ZWZhdWx0IGhhc2ggZnVuY3Rpb25zIGJ5IGRlZmluaW5nIEhUX05PREVGQVVMVEZOUwogCituYW1l c3BhY2UgSUZGIHsKK2NsYXNzIFJlZ0VudHJ5OworfTsKKwogI2lmbmRlZiBIVF9OT0RFRkFVTFRG TlMKIAkvLyBhIGhhc2ggZnVuY3Rpb24gZm9yIGludGVncmFsICh1bnNpZ25lZCkgdmFsdWVzCisg ICAgaW5saW5lIHVuc2lnbmVkIGludCBIYXNoRnVuY3Rpb24oY29uc3QgSUZGOjpSZWdFbnRyeSYg ckVudHJ5KTsKIAlpbmxpbmUgdW5zaWduZWQgSGFzaEZ1bmN0aW9uKHVuc2lnbmVkIGNvbnN0IF9p KQogCXsKIAkJcmV0dXJuIF9pIF4gX2k+PjQgXiBfaT4+OSBeIF9pPj4xNSBeIF9pPj4yMjsKQEAg LTQxOCw3ICs0MjMsNyBAQAogCQl9OwogCiAJCS8vIGEgX2Jhc2VfSGFzaFRhYmxlIG5vbi1jb25z dCBpdGVyYXRvciAtIGNhbiByZW1vdmUgZW50cnkgcG9pbnRlZCB0bwotCQljbGFzcyBJdGVyYXRv ciA6IHB1YmxpYyBDb25zdEl0ZXJhdG9yCisJCWNsYXNzIEl0ZXJhdG9yIDogcHVibGljIF9iYXNl X0hhc2hUYWJsZTo6Q29uc3RJdGVyYXRvcgogCQl7CiAJCQkJLy8gTmVzdGVkIGNsYXNzIGZ1bmN0 aW9ucyBhcHBhcmVudGx5IGhhdmUgdG8gYmUgZGVjbGFyZWQgaGVyZSBmb3IgTVNWQyBjb21wYXRh YmlsaXR5CiAJCQlwdWJsaWM6CmRpZmYgLXVyIGF2cC5vcmlnL3dpbjk1L2lmZi5jcHAgYXZwL3dp bjk1L2lmZi5jcHAKLS0tIGF2cC5vcmlnL3dpbjk1L2lmZi5jcHAJMjAwMS0xMi0wNiAwMDoyMjo0 OS4wMDAwMDAwMDAgKzAwMDAKKysrIGF2cC93aW45NS9pZmYuY3BwCTIwMDYtMDktMTggMjM6Mzg6 MDEuMDAwMDAwMDAwICswMTAwCkBAIC0yMTksNyArMjE5LDcgQEAKIAogfSAvLyBuYW1lc3BhY2Ug SUZGCiAKLWlubGluZSB1bnNpZ25lZCBIYXNoRnVuY3Rpb24oSUZGOjpSZWdFbnRyeSBjb25zdCAm IHJFbnRyeSkKK2lubGluZSB1bnNpZ25lZCBpbnQgSGFzaEZ1bmN0aW9uKGNvbnN0IElGRjo6UmVn RW50cnkmIHJFbnRyeSkKIHsKIAlyZXR1cm4gSGFzaEZ1bmN0aW9uKHJFbnRyeS5tX2lkQ2h1bmsu bV9uSUQpOwogfQo=