173826 2007-04-09 05:45 0000 netboot2 target enhancements 2007-04-12 19:43:03 0000 1 1 1 Unclassified Gentoo Hosted Projects Catalyst unspecified All Linux RESOLVED FIXED InSVN P2 enhancement --- 1 agaffney@gentoo.org catalyst@gentoo.org kumba@gentoo.org agaffney@gentoo.org 2007-04-09 05:45:40 0000 I've been doing a bit of hacking on the netboot2 target. I just used the following patch to build a minimal netboot image containing dropbear for x86. Here's a summary of the changes I made: * netboot2/packages/pkgname/files and netboot2/extra_files replaced with netboot2/packages/files (although, this could just become netboot2/files) * netboot2/{rm,empty} options added * netboot2/overlay added (overlays copied into /tmp/image for inclusion in initramfs * builddate automatically generated for busybox config * general cleanups agaffney@gentoo.org 2007-04-09 05:46:07 0000 Created an attachment (id=115787) patch wolf31o2@gentoo.org 2007-04-10 21:39:42 0000 (In reply to comment #0) > * netboot2/packages/pkgname/files and netboot2/extra_files replaced with > netboot2/packages/files (although, this could just become netboot2/files) I like it, but I don't want it until 2.1 happens. > * netboot2/{rm,empty} options added I think these should be fine since they won't break backwards compatibility. > * netboot2/overlay added (overlays copied into /tmp/image for inclusion in > initramfs Same as above. > * builddate automatically generated for busybox config I'm just curious why this is necessary. > * general cleanups What did you change? I have no problems with general cleanups that don't break backwards compatibility. agaffney@gentoo.org 2007-04-10 23:25:56 0000 General cleanups: * Moved various spec values to valid_values instead of requires_values * Killed use of ${clst_root_path} in pre-kmerge.sh since it didn't make sense and was "" anyway * Killed custom set_dest_path() since settings["destpath"] isn't used in target * Removed extra 'echo ""' at end of netboot2-copyfile.sh agaffney@gentoo.org 2007-04-10 23:27:41 0000 (In reply to comment #2) > > * builddate automatically generated for busybox config > > I'm just curious why this is necessary. There was a comment somewhere in the busybox stuff (don't recall where) that busybox `date` needed a builddate in YYYYMMDD format. agaffney@gentoo.org 2007-04-11 18:14:42 0000 Created an attachment (id=115983) new patch This patch has some more enhancements (automatically creates netbootable image on sparc64) as well as removing the changes that break backwards compatability (netboot2/packages/foo/files+netboot2/extra_files -> netboot2/files). It also relies on System.map-* being present in the kerncache tarball to properly build a sparc64 netboot, but it will not break any other target if using an older genkernel. agaffney@gentoo.org 2007-04-11 20:14:36 0000 Created an attachment (id=115991) new new patch This patch adds the netboot2/busybox_config option. If this option is specified, the file is used to build busybox. If not, the default from ${clst_sharedir}/targets/netboot2/nb-busybox.cf is used. You will need to move x86/nb-busybox.cf from genkernel into targets/netboot2/. agaffney@gentoo.org 2007-04-12 00:57:59 0000 Created an attachment (id=116005) new new new patch This adds a bit of code to netboot2-final.sh to run piggyback for sparc32 and piggyback64 for sparc64 instead of piggyback64 unconditionally. wolf31o2@gentoo.org 2007-04-12 11:57:10 0000 Alright... this patch is now applied to SVN... wolf31o2@gentoo.org 2007-04-12 19:43:03 0000 This is fixed in 2.0.4 which was just released. 115787 2007-04-09 05:46 0000 patch catalyst.patch text/plain SW5kZXg6IG1vZHVsZXMvbmV0Ym9vdDJfdGFyZ2V0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIG1vZHVsZXMv bmV0Ym9vdDJfdGFyZ2V0LnB5CShyZXZpc2lvbiAxMjI0KQorKysgbW9kdWxlcy9uZXRib290Ml90 YXJnZXQucHkJKHdvcmtpbmcgY29weSkKQEAgLTEwLDQyICsxMCwyMCBAQAogY2xhc3MgbmV0Ym9v dDJfdGFyZ2V0KGdlbmVyaWNfc3RhZ2VfdGFyZ2V0KToKIAlkZWYgX19pbml0X18oc2VsZixzcGVj LGFkZGxhcmdzKToKIAkJc2VsZi5yZXF1aXJlZF92YWx1ZXM9WwotCQkJImJvb3Qva2VybmVsIiwK LQkJCSJuZXRib290Mi9idWlsZGRhdGUiLAotCQkJIm5ldGJvb3QyL3BhY2thZ2VzIiwJCQkKLQkJ CSJuZXRib290Mi91c2UiCQkJCisJCQkiYm9vdC9rZXJuZWwiCiAJCV0KIAkJc2VsZi52YWxpZF92 YWx1ZXM9c2VsZi5yZXF1aXJlZF92YWx1ZXNbOl0KLQkJc2VsZi52YWxpZF92YWx1ZXMuZXh0ZW5k KHNlbGYucmVxdWlyZWRfdmFsdWVzKQotCQlzZWxmLnZhbGlkX3ZhbHVlcy5leHRlbmQoWyJuZXRi b290Mi9leHRyYV9maWxlcyJdKQorCQlzZWxmLnZhbGlkX3ZhbHVlcy5leHRlbmQoWworCQkJIm5l dGJvb3QyL3BhY2thZ2VzIiwKKwkJCSJuZXRib290Mi91c2UiLAorCQkJIm5ldGJvb3QyL3BhY2th Z2VzL2ZpbGVzIiwKKwkJCSJuZXRib290Mi9vdmVybGF5IgorCQldKQogCQkJCi0JCXRyeToKLQkJ CWlmIGFkZGxhcmdzLmhhc19rZXkoIm5ldGJvb3QyL3BhY2thZ2VzIik6Ci0JCQkJaWYgdHlwZShh ZGRsYXJnc1sibmV0Ym9vdDIvcGFja2FnZXMiXSkgPT0gdHlwZXMuU3RyaW5nVHlwZToKLQkJCQkJ bG9vcHk9W2FkZGxhcmdzWyJuZXRib290Mi9wYWNrYWdlcyJdXQotCQkJCWVsc2U6Ci0JCQkJCWxv b3B5PWFkZGxhcmdzWyJuZXRib290Mi9wYWNrYWdlcyJdCi0KLQkJCQlmb3IgeCBpbiBsb29weToK LQkJCQkJc2VsZi52YWxpZF92YWx1ZXMuYXBwZW5kKCJuZXRib290Mi9wYWNrYWdlcy8iK3grIi9m aWxlcyIpCi0JCWV4Y2VwdDoKLQkJCXJhaXNlIENhdGFseXN0RXJyb3IsImNvbmZpZ3VyYXRpb24g ZXJyb3IgaW4gbmV0Ym9vdDIvcGFja2FnZXMuIgotCQkKLQkJCi0KIAkJZ2VuZXJpY19zdGFnZV90 YXJnZXQuX19pbml0X18oc2VsZixzcGVjLGFkZGxhcmdzKQogCQlzZWxmLnNldF9idWlsZF9rZXJu ZWxfdmFycygpCisJCXNlbGYuc2V0dGluZ3NbIm1lcmdlX3BhdGgiXT1ub3JtcGF0aCgiL3RtcC9p bWFnZS8iKQogCi0JCSMgTWVyZ2UgcGFja2FnZXMgaW50byB0aGUgYnVpbGRyb290LCBhbmQgcGlj ayBvdXQgY2VydGFpbiBmaWxlcyB0byBwbGFjZSBpbgotCQkjIC90bXAvaW1hZ2UKLQkJc2VsZi5z ZXR0aW5nc1sibWVyZ2VfcGF0aCJdPW5vcm1wYXRoKCIvdG1wL2ltYWdlIikKLQotCWRlZiBzZXRf ZGVzdF9wYXRoKHNlbGYpOgotCQlpZiBzZWxmLnNldHRpbmdzLmhhc19rZXkoIm1lcmdlX3BhdGgi KToKLQkJCXNlbGYuc2V0dGluZ3NbImRlc3RwYXRoIl09bm9ybXBhdGgoc2VsZi5zZXR0aW5nc1si Y2hyb290X3BhdGgiXStzZWxmLnNldHRpbmdzWyJtZXJnZV9wYXRoIl0pCi0JCWVsc2U6Ci0JCQlz ZWxmLnNldHRpbmdzWyJkZXN0cGF0aCJdPW5vcm1wYXRoKHNlbGYuc2V0dGluZ3NbImNocm9vdF9w YXRoIl0pCi0KIAlkZWYgc2V0X3RhcmdldF9wYXRoKHNlbGYpOgogCQlzZWxmLnNldHRpbmdzWyJ0 YXJnZXRfcGF0aCJdPW5vcm1wYXRoKHNlbGYuc2V0dGluZ3NbInN0b3JlZGlyIl0rIi9idWlsZHMv IitcCiAJCQlzZWxmLnNldHRpbmdzWyJ0YXJnZXRfc3VicGF0aCJdKyIvIikKQEAgLTcxLDI1ICs0 OSwxMiBAQAogCQkJYW5kIG9zLnBhdGguZXhpc3RzKHNlbGYuc2V0dGluZ3NbImF1dG9yZXN1bWVf cGF0aCJdKyJjb3B5X2ZpbGVzX3RvX2ltYWdlIik6CiAJCQkJcHJpbnQgIlJlc3VtZSBwb2ludCBk ZXRlY3RlZCwgc2tpcHBpbmcgdGFyZ2V0IHBhdGggc2V0dXAgb3BlcmF0aW9uLi4uIgogCQllbHNl OgotCQkJaWYgc2VsZi5zZXR0aW5ncy5oYXNfa2V5KCJuZXRib290Mi9wYWNrYWdlcyIpOgotCQkJ CWlmIHR5cGUoc2VsZi5zZXR0aW5nc1sibmV0Ym9vdDIvcGFja2FnZXMiXSkgPT0gdHlwZXMuU3Ry aW5nVHlwZToKLQkJCQkJbG9vcHk9W3NlbGYuc2V0dGluZ3NbIm5ldGJvb3QyL3BhY2thZ2VzIl1d CisJCQlpZiBzZWxmLnNldHRpbmdzLmhhc19rZXkoIm5ldGJvb3QyL3BhY2thZ2VzL2ZpbGVzIik6 CisJCQkJaWYgdHlwZShzZWxmLnNldHRpbmdzWyJuZXRib290Mi9wYWNrYWdlcy9maWxlcyJdKSA9 PSB0eXBlcy5MaXN0VHlwZToKKwkJCQkJbXlmaWxlcy5leHRlbmQoc2VsZi5zZXR0aW5nc1sibmV0 Ym9vdDIvcGFja2FnZXMvZmlsZXMiXSkKIAkJCQllbHNlOgotCQkJCQlsb29weT1zZWxmLnNldHRp bmdzWyJuZXRib290Mi9wYWNrYWdlcyJdCi0JCQotCQkJZm9yIHggaW4gbG9vcHk6Ci0JCQkJaWYg c2VsZi5zZXR0aW5ncy5oYXNfa2V5KCJuZXRib290Mi9wYWNrYWdlcy8iK3grIi9maWxlcyIpOgot CQkJCSAgICBpZiB0eXBlKHNlbGYuc2V0dGluZ3NbIm5ldGJvb3QyL3BhY2thZ2VzLyIreCsiL2Zp bGVzIl0pID09IHR5cGVzLkxpc3RUeXBlOgotCQkJCQkgICAgbXlmaWxlcy5leHRlbmQoc2VsZi5z ZXR0aW5nc1sibmV0Ym9vdDIvcGFja2FnZXMvIit4KyIvZmlsZXMiXSkKLQkJCQkgICAgZWxzZToK LQkJCQkJICAgIG15ZmlsZXMuYXBwZW5kKHNlbGYuc2V0dGluZ3NbIm5ldGJvb3QyL3BhY2thZ2Vz LyIreCsiL2ZpbGVzIl0pCisJCQkJCW15ZmlsZXMuYXBwZW5kKFtzZWxmLnNldHRpbmdzWyJuZXRi b290Mi9wYWNrYWdlcy9maWxlcyJdXSkKIAotCQkJaWYgc2VsZi5zZXR0aW5ncy5oYXNfa2V5KCJu ZXRib290Mi9leHRyYV9maWxlcyIpOgotCQkJCWlmIHR5cGUoc2VsZi5zZXR0aW5nc1sibmV0Ym9v dDIvZXh0cmFfZmlsZXMiXSkgPT0gdHlwZXMuTGlzdFR5cGU6Ci0JCQkJCW15ZmlsZXMuZXh0ZW5k KHNlbGYuc2V0dGluZ3NbIm5ldGJvb3QyL2V4dHJhX2ZpbGVzIl0pCi0JCQkJZWxzZToKLQkJCQkJ bXlmaWxlcy5hcHBlbmQoc2VsZi5zZXR0aW5nc1sibmV0Ym9vdDIvZXh0cmFfZmlsZXMiXSkKLQog CQkJdHJ5OgogCQkJCWNtZCgiL2Jpbi9iYXNoICIrc2VsZi5zZXR0aW5nc1siY29udHJvbGxlcl9m aWxlIl0rXAogCQkJCQkiIGltYWdlICIgKyBsaXN0X2Jhc2hpZnkobXlmaWxlcyksZW52PXNlbGYu ZW52KQpAQCAtOTksNiArNjQsMTcgQEAKIAogCQkJdG91Y2goc2VsZi5zZXR0aW5nc1siYXV0b3Jl c3VtZV9wYXRoIl0rImNvcHlfZmlsZXNfdG9faW1hZ2UiKQogCisJZGVmIHNldHVwX292ZXJsYXko c2VsZik6CQorCQlpZiBzZWxmLnNldHRpbmdzLmhhc19rZXkoIkFVVE9SRVNVTUUiKSBcCisJCWFu ZCBvcy5wYXRoLmV4aXN0cyhzZWxmLnNldHRpbmdzWyJhdXRvcmVzdW1lX3BhdGgiXSsic2V0dXBf b3ZlcmxheSIpOgorCQkJcHJpbnQgIlJlc3VtZSBwb2ludCBkZXRlY3RlZCwgc2tpcHBpbmcgc2V0 dXBfb3ZlcmxheSBvcGVyYXRpb24uLi4iCisJCWVsc2U6CisJCQlpZiBzZWxmLnNldHRpbmdzLmhh c19rZXkoIm5ldGJvb3QyL292ZXJsYXkiKToKKwkJCQlmb3IgeCBpbiBzZWxmLnNldHRpbmdzWyJu ZXRib290Mi9vdmVybGF5Il06IAorCQkJCQlpZiBvcy5wYXRoLmV4aXN0cyh4KToKKwkJCQkJCWNt ZCgicnN5bmMgLWEgIit4KyIvICIrXAorCQkJCQkJCXNlbGYuc2V0dGluZ3NbImNocm9vdF9wYXRo Il0sICJuZXRib290Mi9vdmVybGF5OiAiK3grIiBjb3B5IGZhaWxlZC4iLGVudj1zZWxmLmVudikK KwkJCQl0b3VjaChzZWxmLnNldHRpbmdzWyJhdXRvcmVzdW1lX3BhdGgiXSsic2V0dXBfb3Zlcmxh eSIpCiAKIAlkZWYgbW92ZV9rZXJuZWxzKHNlbGYpOgogCQkjIHdlJ3JlIGRvbmUsIG1vdmUgdGhl IGtlcm5lbHMgdG8gYnVpbGRzLyoKQEAgLTExMiwxMyArODgsNDEgQEAKIAkJCXNlbGYudW5iaW5k KCkKIAkJCXJhaXNlIENhdGFseXN0RXJyb3IsIkZhaWxlZCB0byBtb3ZlIGtlcm5lbCBpbWFnZXMh IgogCisJZGVmIHJlbW92ZShzZWxmKToKKwkJaWYgc2VsZi5zZXR0aW5ncy5oYXNfa2V5KCJBVVRP UkVTVU1FIikgXAorCQkJYW5kIG9zLnBhdGguZXhpc3RzKHNlbGYuc2V0dGluZ3NbImF1dG9yZXN1 bWVfcGF0aCJdKyJyZW1vdmUiKToKKwkJCXByaW50ICJSZXN1bWUgcG9pbnQgZGV0ZWN0ZWQsIHNr aXBwaW5nIHJlbW92ZSBvcGVyYXRpb24uLi4iCisJCWVsc2U6CisJCQlpZiBzZWxmLnNldHRpbmdz Lmhhc19rZXkoc2VsZi5zZXR0aW5nc1sic3BlY19wcmVmaXgiXSsiL3JtIik6CisJCQkJZm9yIHgg aW4gc2VsZi5zZXR0aW5nc1tzZWxmLnNldHRpbmdzWyJzcGVjX3ByZWZpeCJdKyIvcm0iXToKKwkJ CQkJIyB3ZSdyZSBnb2luZyB0byBzaGVsbCBvdXQgZm9yIGFsbCB0aGVzZSBjbGVhbmluZyBvcGVy YXRpb25zLAorCQkJCQkjIHNvIHdlIGdldCBlYXN5IGdsb2IgaGFuZGxpbmcKKwkJCQkJcHJpbnQg Im5ldGJvb3QyOiByZW1vdmluZyAiICsgeAorCQkJCQlvcy5zeXN0ZW0oInJtIC1yZiAiICsgc2Vs Zi5zZXR0aW5nc1siY2hyb290X3BhdGgiXSArIHNlbGYuc2V0dGluZ3NbIm1lcmdlX3BhdGgiXSAr IHgpCiAKKwlkZWYgZW1wdHkoc2VsZik6CQkKKwkJaWYgc2VsZi5zZXR0aW5ncy5oYXNfa2V5KCJB VVRPUkVTVU1FIikgXAorCQkJYW5kIG9zLnBhdGguZXhpc3RzKHNlbGYuc2V0dGluZ3NbImF1dG9y ZXN1bWVfcGF0aCJdKyJlbXB0eSIpOgorCQkJcHJpbnQgIlJlc3VtZSBwb2ludCBkZXRlY3RlZCwg c2tpcHBpbmcgZW1wdHkgb3BlcmF0aW9uLi4uIgorCQllbHNlOgorCQkJaWYgc2VsZi5zZXR0aW5n cy5oYXNfa2V5KCJuZXRib290Mi9lbXB0eSIpOgorCQkJCWlmIHR5cGUoc2VsZi5zZXR0aW5nc1si bmV0Ym9vdDIvZW1wdHkiXSk9PXR5cGVzLlN0cmluZ1R5cGU6CisJCQkJCXNlbGYuc2V0dGluZ3Nb Im5ldGJvb3QyL2VtcHR5Il09c2VsZi5zZXR0aW5nc1sibmV0Ym9vdDIvZW1wdHkiXS5zcGxpdCgp CisJCQkJZm9yIHggaW4gc2VsZi5zZXR0aW5nc1sibmV0Ym9vdDIvZW1wdHkiXToKKwkJCQkJbXll bXA9c2VsZi5zZXR0aW5nc1siY2hyb290X3BhdGgiXSArIHNlbGYuc2V0dGluZ3NbIm1lcmdlX3Bh dGgiXSArIHgKKwkJCQkJaWYgbm90IG9zLnBhdGguaXNkaXIobXllbXApOgorCQkJCQkJcHJpbnQg eCwibm90IGEgZGlyZWN0b3J5IG9yIGRvZXMgbm90IGV4aXN0LCBza2lwcGluZyAnZW1wdHknIG9w ZXJhdGlvbi4iCisJCQkJCQljb250aW51ZQorCQkJCQlwcmludCAiRW1wdHlpbmcgZGlyZWN0b3J5 IiwgeAorCQkJCQlvcy5zeXN0ZW0oInJtIC1yZiAiICsgc2VsZi5zZXR0aW5nc1siY2hyb290X3Bh dGgiXSArIHNlbGYuc2V0dGluZ3NbIm1lcmdlX3BhdGgiXSArIHggKyAiLyoiKQorCQl0b3VjaChz ZWxmLnNldHRpbmdzWyJhdXRvcmVzdW1lX3BhdGgiXSsiZW1wdHkiKQorCiAJZGVmIHNldF9hY3Rp b25fc2VxdWVuY2Uoc2VsZik6CiAJICAgIHNlbGYuc2V0dGluZ3NbImFjdGlvbl9zZXF1ZW5jZSJd PVsidW5wYWNrIiwidW5wYWNrX3NuYXBzaG90IiwiY29uZmlnX3Byb2ZpbGVfbGluayIsCiAJICAg IAkJCQkic2V0dXBfY29uZmRpciIsImJpbmQiLCJjaHJvb3Rfc2V0dXAiLFwKIAkJCQkJInNldHVw X2Vudmlyb25tZW50IiwiYnVpbGRfcGFja2FnZXMiLCJyb290X292ZXJsYXkiLFwKLQkJCQkJImNv cHlfZmlsZXNfdG9faW1hZ2UiLCJidWlsZF9rZXJuZWwiLCJtb3ZlX2tlcm5lbHMiLFwKLQkJCQkJ InVuYmluZCIsImNsZWFuIiwiY2xlYXJfYXV0b3Jlc3VtZSJdCisJCQkJCSJjb3B5X2ZpbGVzX3Rv X2ltYWdlIiwic2V0dXBfb3ZlcmxheSIsImJ1aWxkX2tlcm5lbCIsIm1vdmVfa2VybmVscyIsXAor CQkJCQkicmVtb3ZlIiwiZW1wdHkiLCJ1bmJpbmQiLCJjbGVhbiIsImNsZWFyX2F1dG9yZXN1bWUi XQogCiBkZWYgcmVnaXN0ZXIoZm9vKToKIAlmb28udXBkYXRlKHsibmV0Ym9vdDIiOm5ldGJvb3Qy X3RhcmdldH0pCkluZGV4OiB0YXJnZXRzL25ldGJvb3QyL25ldGJvb3QyLWNvcHlmaWxlLnNoCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIHRhcmdldHMvbmV0Ym9vdDIvbmV0Ym9vdDItY29weWZpbGUuc2gJKHJldmlz aW9uIDEyMjQpCisrKyB0YXJnZXRzL25ldGJvb3QyL25ldGJvb3QyLWNvcHlmaWxlLnNoCSh3b3Jr aW5nIGNvcHkpCkBAIC0xOCw0ICsxOCwzIEBACiAJCWZpCiAJZmkKIGRvbmUKLWVjaG8gIiIKSW5k ZXg6IHRhcmdldHMvc3VwcG9ydC9wcmUta21lcmdlLnNoCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHRhcmdldHMv c3VwcG9ydC9wcmUta21lcmdlLnNoCShyZXZpc2lvbiAxMjI0KQorKysgdGFyZ2V0cy9zdXBwb3J0 L3ByZS1rbWVyZ2Uuc2gJKHdvcmtpbmcgY29weSkKQEAgLTI5LDE3ICsyOSwxOSBAQAogCiAJCSMg U2V0IHRoZSBuZXRib290IGJ1aWxkZGF0ZS9ob3N0bmFtZSBpbiBsaW51eHJjIGFuZCBjb3B5IHRv IHByb3BlciBhcmNoCiAJCSMgZGlyZWN0b3J5IGluIGdlbmtlcm5lbAotCQlzZWQgLWUgInMvQEBN WURBVEVAQC8ke2Nsc3RfbmV0Ym9vdDJfYnVpbGRkYXRlfS9nIiBcCisJCXNlZCAtZSAicy9AQE1Z REFURUBALyQoZGF0ZSAnKyVZJW0lZCcpL2ciIFwKIAkJICAgIC1lICJzL0BAUkVMVkVSQEAvJHtj bHN0X3ZlcnNpb25fc3RhbXB9L2ciIFwKLQkJCSR7Y2xzdF9yb290X3BhdGh9dXNyL3NoYXJlL2dl bmtlcm5lbC9uZXRib290L2xpbnV4cmMueCBcCi0JCQkJPiAke2Nsc3Rfcm9vdF9wYXRofXVzci9z aGFyZS9nZW5rZXJuZWwvJHtjbHN0X2hvc3RhcmNofS9saW51eHJjCisJCQkvdXNyL3NoYXJlL2dl bmtlcm5lbC9uZXRib290L2xpbnV4cmMueCBcCisJCQk+IC91c3Ivc2hhcmUvZ2Vua2VybmVsLyR7 Y2xzdF9ob3N0YXJjaH0vbGludXhyYwogCiAJCWVjaG8gIj4+PiBDb3B5aW5nIHN1cHBvcnQgZmls ZXMgdG8gJHtjbHN0X3Jvb3RfcGF0aH0gLi4uIgotCQljcCAtcFBSZiAke2Nsc3Rfcm9vdF9wYXRo fXVzci9zaGFyZS9nZW5rZXJuZWwvbmV0Ym9vdC9taXNjLyogXAorCQljcCAtcFBSZiAvdXNyL3No YXJlL2dlbmtlcm5lbC9uZXRib290L21pc2MvKiBcCiAJCQkke2Nsc3RfbWVyZ2VfcGF0aH0KIAog CQllY2hvICI+Pj4gQ29weWluZyBidXN5Ym94IGNvbmZpZyAuLi4iCi0JCWNwIC1mICR7Y2xzdF9y b290X3BhdGh9dXNyL3NoYXJlL2dlbmtlcm5lbC8ke2Nsc3RfaG9zdGFyY2h9L25iLWJ1c3lib3gu Y2YgXAotCQkJJHtjbHN0X3Jvb3RfcGF0aH11c3Ivc2hhcmUvZ2Vua2VybmVsLyR7Y2xzdF9ob3N0 YXJjaH0vYnVzeS1jb25maWcKKwkJY3AgLWYgL3Vzci9zaGFyZS9nZW5rZXJuZWwvJHtjbHN0X2hv c3RhcmNofS9uYi1idXN5Ym94LmNmIFwKKwkJCS91c3Ivc2hhcmUvZ2Vua2VybmVsLyR7Y2xzdF9o b3N0YXJjaH0vYnVzeS1jb25maWcKIAk7OwogZXNhYwo= 115983 2007-04-11 18:14 0000 new patch catalyst.patch text/plain SW5kZXg6IG1vZHVsZXMvbmV0Ym9vdDJfdGFyZ2V0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIG1vZHVsZXMv bmV0Ym9vdDJfdGFyZ2V0LnB5CShyZXZpc2lvbiAxMjI0KQorKysgbW9kdWxlcy9uZXRib290Ml90 YXJnZXQucHkJKHdvcmtpbmcgY29weSkKQEAgLTEwLDE1ICsxMCwxNiBAQAogY2xhc3MgbmV0Ym9v dDJfdGFyZ2V0KGdlbmVyaWNfc3RhZ2VfdGFyZ2V0KToKIAlkZWYgX19pbml0X18oc2VsZixzcGVj LGFkZGxhcmdzKToKIAkJc2VsZi5yZXF1aXJlZF92YWx1ZXM9WwotCQkJImJvb3Qva2VybmVsIiwK LQkJCSJuZXRib290Mi9idWlsZGRhdGUiLAotCQkJIm5ldGJvb3QyL3BhY2thZ2VzIiwJCQkKLQkJ CSJuZXRib290Mi91c2UiCQkJCisJCQkiYm9vdC9rZXJuZWwiCiAJCV0KIAkJc2VsZi52YWxpZF92 YWx1ZXM9c2VsZi5yZXF1aXJlZF92YWx1ZXNbOl0KLQkJc2VsZi52YWxpZF92YWx1ZXMuZXh0ZW5k KHNlbGYucmVxdWlyZWRfdmFsdWVzKQotCQlzZWxmLnZhbGlkX3ZhbHVlcy5leHRlbmQoWyJuZXRi b290Mi9leHRyYV9maWxlcyJdKQotCQkJCisJCXNlbGYudmFsaWRfdmFsdWVzLmV4dGVuZChbCisJ CQkibmV0Ym9vdDIvcGFja2FnZXMiLAorCQkJIm5ldGJvb3QyL3VzZSIsCisJCQkibmV0Ym9vdDIv ZXh0cmFfZmlsZXMiLAorCQkJIm5ldGJvb3QyL292ZXJsYXkiCisJCV0pCisKIAkJdHJ5OgogCQkJ aWYgYWRkbGFyZ3MuaGFzX2tleSgibmV0Ym9vdDIvcGFja2FnZXMiKToKIAkJCQlpZiB0eXBlKGFk ZGxhcmdzWyJuZXRib290Mi9wYWNrYWdlcyJdKSA9PSB0eXBlcy5TdHJpbmdUeXBlOgpAQCAtMzEs MjEgKzMyLDEwIEBACiAJCWV4Y2VwdDoKIAkJCXJhaXNlIENhdGFseXN0RXJyb3IsImNvbmZpZ3Vy YXRpb24gZXJyb3IgaW4gbmV0Ym9vdDIvcGFja2FnZXMuIgogCQkKLQkJCi0KIAkJZ2VuZXJpY19z dGFnZV90YXJnZXQuX19pbml0X18oc2VsZixzcGVjLGFkZGxhcmdzKQogCQlzZWxmLnNldF9idWls ZF9rZXJuZWxfdmFycygpCisJCXNlbGYuc2V0dGluZ3NbIm1lcmdlX3BhdGgiXT1ub3JtcGF0aCgi L3RtcC9pbWFnZS8iKQogCi0JCSMgTWVyZ2UgcGFja2FnZXMgaW50byB0aGUgYnVpbGRyb290LCBh bmQgcGljayBvdXQgY2VydGFpbiBmaWxlcyB0byBwbGFjZSBpbgotCQkjIC90bXAvaW1hZ2UKLQkJ c2VsZi5zZXR0aW5nc1sibWVyZ2VfcGF0aCJdPW5vcm1wYXRoKCIvdG1wL2ltYWdlIikKLQotCWRl ZiBzZXRfZGVzdF9wYXRoKHNlbGYpOgotCQlpZiBzZWxmLnNldHRpbmdzLmhhc19rZXkoIm1lcmdl X3BhdGgiKToKLQkJCXNlbGYuc2V0dGluZ3NbImRlc3RwYXRoIl09bm9ybXBhdGgoc2VsZi5zZXR0 aW5nc1siY2hyb290X3BhdGgiXStzZWxmLnNldHRpbmdzWyJtZXJnZV9wYXRoIl0pCi0JCWVsc2U6 Ci0JCQlzZWxmLnNldHRpbmdzWyJkZXN0cGF0aCJdPW5vcm1wYXRoKHNlbGYuc2V0dGluZ3NbImNo cm9vdF9wYXRoIl0pCi0KIAlkZWYgc2V0X3RhcmdldF9wYXRoKHNlbGYpOgogCQlzZWxmLnNldHRp bmdzWyJ0YXJnZXRfcGF0aCJdPW5vcm1wYXRoKHNlbGYuc2V0dGluZ3NbInN0b3JlZGlyIl0rIi9i dWlsZHMvIitcCiAJCQlzZWxmLnNldHRpbmdzWyJ0YXJnZXRfc3VicGF0aCJdKyIvIikKQEAgLTk5 LDYgKzg5LDE3IEBACiAKIAkJCXRvdWNoKHNlbGYuc2V0dGluZ3NbImF1dG9yZXN1bWVfcGF0aCJd KyJjb3B5X2ZpbGVzX3RvX2ltYWdlIikKIAorCWRlZiBzZXR1cF9vdmVybGF5KHNlbGYpOgkKKwkJ aWYgc2VsZi5zZXR0aW5ncy5oYXNfa2V5KCJBVVRPUkVTVU1FIikgXAorCQlhbmQgb3MucGF0aC5l eGlzdHMoc2VsZi5zZXR0aW5nc1siYXV0b3Jlc3VtZV9wYXRoIl0rInNldHVwX292ZXJsYXkiKToK KwkJCXByaW50ICJSZXN1bWUgcG9pbnQgZGV0ZWN0ZWQsIHNraXBwaW5nIHNldHVwX292ZXJsYXkg b3BlcmF0aW9uLi4uIgorCQllbHNlOgorCQkJaWYgc2VsZi5zZXR0aW5ncy5oYXNfa2V5KCJuZXRi b290Mi9vdmVybGF5Iik6CisJCQkJZm9yIHggaW4gc2VsZi5zZXR0aW5nc1sibmV0Ym9vdDIvb3Zl cmxheSJdOiAKKwkJCQkJaWYgb3MucGF0aC5leGlzdHMoeCk6CisJCQkJCQljbWQoInJzeW5jIC1h ICIreCsiLyAiK1wKKwkJCQkJCQlzZWxmLnNldHRpbmdzWyJjaHJvb3RfcGF0aCJdLCAibmV0Ym9v dDIvb3ZlcmxheTogIit4KyIgY29weSBmYWlsZWQuIixlbnY9c2VsZi5lbnYpCisJCQkJdG91Y2go c2VsZi5zZXR0aW5nc1siYXV0b3Jlc3VtZV9wYXRoIl0rInNldHVwX292ZXJsYXkiKQogCiAJZGVm IG1vdmVfa2VybmVscyhzZWxmKToKIAkJIyB3ZSdyZSBkb25lLCBtb3ZlIHRoZSBrZXJuZWxzIHRv IGJ1aWxkcy8qCkBAIC0xMTIsMTMgKzExMyw0NyBAQAogCQkJc2VsZi51bmJpbmQoKQogCQkJcmFp c2UgQ2F0YWx5c3RFcnJvciwiRmFpbGVkIHRvIG1vdmUga2VybmVsIGltYWdlcyEiCiAKKwlkZWYg cmVtb3ZlKHNlbGYpOgorCQlpZiBzZWxmLnNldHRpbmdzLmhhc19rZXkoIkFVVE9SRVNVTUUiKSBc CisJCQlhbmQgb3MucGF0aC5leGlzdHMoc2VsZi5zZXR0aW5nc1siYXV0b3Jlc3VtZV9wYXRoIl0r InJlbW92ZSIpOgorCQkJcHJpbnQgIlJlc3VtZSBwb2ludCBkZXRlY3RlZCwgc2tpcHBpbmcgcmVt b3ZlIG9wZXJhdGlvbi4uLiIKKwkJZWxzZToKKwkJCWlmIHNlbGYuc2V0dGluZ3MuaGFzX2tleShz ZWxmLnNldHRpbmdzWyJzcGVjX3ByZWZpeCJdKyIvcm0iKToKKwkJCQlmb3IgeCBpbiBzZWxmLnNl dHRpbmdzW3NlbGYuc2V0dGluZ3NbInNwZWNfcHJlZml4Il0rIi9ybSJdOgorCQkJCQkjIHdlJ3Jl IGdvaW5nIHRvIHNoZWxsIG91dCBmb3IgYWxsIHRoZXNlIGNsZWFuaW5nIG9wZXJhdGlvbnMsCisJ CQkJCSMgc28gd2UgZ2V0IGVhc3kgZ2xvYiBoYW5kbGluZworCQkJCQlwcmludCAibmV0Ym9vdDI6 IHJlbW92aW5nICIgKyB4CisJCQkJCW9zLnN5c3RlbSgicm0gLXJmICIgKyBzZWxmLnNldHRpbmdz WyJjaHJvb3RfcGF0aCJdICsgc2VsZi5zZXR0aW5nc1sibWVyZ2VfcGF0aCJdICsgeCkKIAorCWRl ZiBlbXB0eShzZWxmKToJCQorCQlpZiBzZWxmLnNldHRpbmdzLmhhc19rZXkoIkFVVE9SRVNVTUUi KSBcCisJCQlhbmQgb3MucGF0aC5leGlzdHMoc2VsZi5zZXR0aW5nc1siYXV0b3Jlc3VtZV9wYXRo Il0rImVtcHR5Iik6CisJCQlwcmludCAiUmVzdW1lIHBvaW50IGRldGVjdGVkLCBza2lwcGluZyBl bXB0eSBvcGVyYXRpb24uLi4iCisJCWVsc2U6CisJCQlpZiBzZWxmLnNldHRpbmdzLmhhc19rZXko Im5ldGJvb3QyL2VtcHR5Iik6CisJCQkJaWYgdHlwZShzZWxmLnNldHRpbmdzWyJuZXRib290Mi9l bXB0eSJdKT09dHlwZXMuU3RyaW5nVHlwZToKKwkJCQkJc2VsZi5zZXR0aW5nc1sibmV0Ym9vdDIv ZW1wdHkiXT1zZWxmLnNldHRpbmdzWyJuZXRib290Mi9lbXB0eSJdLnNwbGl0KCkKKwkJCQlmb3Ig eCBpbiBzZWxmLnNldHRpbmdzWyJuZXRib290Mi9lbXB0eSJdOgorCQkJCQlteWVtcD1zZWxmLnNl dHRpbmdzWyJjaHJvb3RfcGF0aCJdICsgc2VsZi5zZXR0aW5nc1sibWVyZ2VfcGF0aCJdICsgeAor CQkJCQlpZiBub3Qgb3MucGF0aC5pc2RpcihteWVtcCk6CisJCQkJCQlwcmludCB4LCJub3QgYSBk aXJlY3Rvcnkgb3IgZG9lcyBub3QgZXhpc3QsIHNraXBwaW5nICdlbXB0eScgb3BlcmF0aW9uLiIK KwkJCQkJCWNvbnRpbnVlCisJCQkJCXByaW50ICJFbXB0eWluZyBkaXJlY3RvcnkiLCB4CisJCQkJ CSMgc3RhdCB0aGUgZGlyLCBkZWxldGUgdGhlIGRpciwgcmVjcmVhdGUgdGhlIGRpciBhbmQgc2V0 CisJCQkJCSMgdGhlIHByb3BlciBwZXJtcyBhbmQgb3duZXJzaGlwCisJCQkJCW15c3RhdD1vcy5z dGF0KG15ZW1wKQorCQkJCQlzaHV0aWwucm10cmVlKG15ZW1wKQorCQkJCQlvcy5tYWtlZGlycyht eWVtcCwwNzU1KQorCQkJCQlvcy5jaG93bihteWVtcCxteXN0YXRbU1RfVUlEXSxteXN0YXRbU1Rf R0lEXSkKKwkJCQkJb3MuY2htb2QobXllbXAsbXlzdGF0W1NUX01PREVdKQorCQl0b3VjaChzZWxm LnNldHRpbmdzWyJhdXRvcmVzdW1lX3BhdGgiXSsiZW1wdHkiKQorCiAJZGVmIHNldF9hY3Rpb25f c2VxdWVuY2Uoc2VsZik6CiAJICAgIHNlbGYuc2V0dGluZ3NbImFjdGlvbl9zZXF1ZW5jZSJdPVsi dW5wYWNrIiwidW5wYWNrX3NuYXBzaG90IiwiY29uZmlnX3Byb2ZpbGVfbGluayIsCiAJICAgIAkJ CQkic2V0dXBfY29uZmRpciIsImJpbmQiLCJjaHJvb3Rfc2V0dXAiLFwKIAkJCQkJInNldHVwX2Vu dmlyb25tZW50IiwiYnVpbGRfcGFja2FnZXMiLCJyb290X292ZXJsYXkiLFwKLQkJCQkJImNvcHlf ZmlsZXNfdG9faW1hZ2UiLCJidWlsZF9rZXJuZWwiLCJtb3ZlX2tlcm5lbHMiLFwKLQkJCQkJInVu YmluZCIsImNsZWFuIiwiY2xlYXJfYXV0b3Jlc3VtZSJdCisJCQkJCSJjb3B5X2ZpbGVzX3RvX2lt YWdlIiwic2V0dXBfb3ZlcmxheSIsImJ1aWxkX2tlcm5lbCIsIm1vdmVfa2VybmVscyIsXAorCQkJ CQkicmVtb3ZlIiwiZW1wdHkiLCJ1bmJpbmQiLCJjbGVhbiIsImNsZWFyX2F1dG9yZXN1bWUiXQog CiBkZWYgcmVnaXN0ZXIoZm9vKToKIAlmb28udXBkYXRlKHsibmV0Ym9vdDIiOm5ldGJvb3QyX3Rh cmdldH0pCkluZGV4OiB0YXJnZXRzL25ldGJvb3QyL25ldGJvb3QyLWNvcHlmaWxlLnNoCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIHRhcmdldHMvbmV0Ym9vdDIvbmV0Ym9vdDItY29weWZpbGUuc2gJKHJldmlzaW9u IDEyMjQpCisrKyB0YXJnZXRzL25ldGJvb3QyL25ldGJvb3QyLWNvcHlmaWxlLnNoCSh3b3JraW5n IGNvcHkpCkBAIC0xOCw0ICsxOCwzIEBACiAJCWZpCiAJZmkKIGRvbmUKLWVjaG8gIiIKSW5kZXg6 IHRhcmdldHMvc3VwcG9ydC9mdW5jdGlvbnMuc2gKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gdGFyZ2V0cy9zdXBw b3J0L2Z1bmN0aW9ucy5zaAkocmV2aXNpb24gMTIyNCkKKysrIHRhcmdldHMvc3VwcG9ydC9mdW5j dGlvbnMuc2gJKHdvcmtpbmcgY29weSkKQEAgLTEyNCw2ICsxMjQsMTEgQEAKIAkJdGhlbiAKIAkJ CW12ICR7MX0vaW5pdHJhbWZzLSogJHsxfS8ke3h9LmlnegogCQlmaQorCisJCWlmIFsgLWUgJHsx fS9TeXN0ZW0ubWFwLSogXTsKKwkJdGhlbgorCQkJbXYgJHsxfS9TeXN0ZW0ubWFwLSogJHsxfS9T eXN0ZW0ubWFwLSR7eH0KKwkJZmkKIAlkb25lCiB9CiAKSW5kZXg6IHRhcmdldHMvc3VwcG9ydC9u ZXRib290Mi1maW5hbC5zaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSB0YXJnZXRzL3N1cHBvcnQvbmV0Ym9vdDIt ZmluYWwuc2gJKHJldmlzaW9uIDEyMjQpCisrKyB0YXJnZXRzL3N1cHBvcnQvbmV0Ym9vdDItZmlu YWwuc2gJKHdvcmtpbmcgY29weSkKQEAgLTE0LDYgKzE0LDcgQEAKIGZvciB4IGluICR7Y2xzdF9i b290X2tlcm5lbH07IGRvCiAJbXYgJHtjbHN0X3RhcmdldF9wYXRofWJvb3QvJHt4fSAke2Nsc3Rf dGFyZ2V0X3BhdGh9a2VybmVscwogCW12ICR7Y2xzdF90YXJnZXRfcGF0aH1ib290LyR7eH0uaWd6 ICR7Y2xzdF90YXJnZXRfcGF0aH1rZXJuZWxzL21pc2MKKwltdiAke2Nsc3RfdGFyZ2V0X3BhdGh9 Ym9vdC9TeXN0ZW0ubWFwLSR7eH0gJHtjbHN0X3RhcmdldF9wYXRofWtlcm5lbHMvbWlzYwogZG9u ZQogCiBybWRpciAke2Nsc3RfdGFyZ2V0X3BhdGh9Ym9vdApAQCAtMzEsNyArMzIsMTAgQEAKIAkJ c2xlZXAgMAogCQk7OwogCXNwYXJjKikKLQkJc2xlZXAgMAorCQlmb3IgeCBpbiAke2Nsc3RfYm9v dF9rZXJuZWx9OyBkbworCQkJZWxmdG9hb3V0ICR7Y2xzdF90YXJnZXRfcGF0aH0va2VybmVscy8k e3h9IC1vICR7Y2xzdF90YXJnZXRfcGF0aH0ke3h9LWEub3V0CisJCQlwaWdneWJhY2s2NCAke2Ns c3RfdGFyZ2V0X3BhdGh9LyR7eH0tYS5vdXQgJHtjbHN0X3RhcmdldF9wYXRofWtlcm5lbHMvbWlz Yy9TeXN0ZW0ubWFwLSR7eH0gJHtjbHN0X3RhcmdldF9wYXRofWtlcm5lbHMvbWlzYy8ke3h9Lmln egorCQlkb25lCiAJCTs7CiAJaWE2NCkKIAkJc2xlZXAgMApJbmRleDogdGFyZ2V0cy9zdXBwb3J0 L3ByZS1rbWVyZ2Uuc2gKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gdGFyZ2V0cy9zdXBwb3J0L3ByZS1rbWVyZ2Uu c2gJKHJldmlzaW9uIDEyMjQpCisrKyB0YXJnZXRzL3N1cHBvcnQvcHJlLWttZXJnZS5zaAkod29y a2luZyBjb3B5KQpAQCAtMjksMTcgKzI5LDE5IEBACiAKIAkJIyBTZXQgdGhlIG5ldGJvb3QgYnVp bGRkYXRlL2hvc3RuYW1lIGluIGxpbnV4cmMgYW5kIGNvcHkgdG8gcHJvcGVyIGFyY2gKIAkJIyBk aXJlY3RvcnkgaW4gZ2Vua2VybmVsCi0JCXNlZCAtZSAicy9AQE1ZREFURUBALyR7Y2xzdF9uZXRi b290Ml9idWlsZGRhdGV9L2ciIFwKKwkJc2VkIC1lICJzL0BATVlEQVRFQEAvJChkYXRlICcrJVkl bSVkJykvZyIgXAogCQkgICAgLWUgInMvQEBSRUxWRVJAQC8ke2Nsc3RfdmVyc2lvbl9zdGFtcH0v ZyIgXAotCQkJJHtjbHN0X3Jvb3RfcGF0aH11c3Ivc2hhcmUvZ2Vua2VybmVsL25ldGJvb3QvbGlu dXhyYy54IFwKLQkJCQk+ICR7Y2xzdF9yb290X3BhdGh9dXNyL3NoYXJlL2dlbmtlcm5lbC8ke2Ns c3RfaG9zdGFyY2h9L2xpbnV4cmMKKwkJCS91c3Ivc2hhcmUvZ2Vua2VybmVsL25ldGJvb3QvbGlu dXhyYy54IFwKKwkJCT4gL3Vzci9zaGFyZS9nZW5rZXJuZWwvJHtjbHN0X2hvc3RhcmNofS9saW51 eHJjCiAKIAkJZWNobyAiPj4+IENvcHlpbmcgc3VwcG9ydCBmaWxlcyB0byAke2Nsc3Rfcm9vdF9w YXRofSAuLi4iCi0JCWNwIC1wUFJmICR7Y2xzdF9yb290X3BhdGh9dXNyL3NoYXJlL2dlbmtlcm5l bC9uZXRib290L21pc2MvKiBcCisJCWNwIC1wUFJmIC91c3Ivc2hhcmUvZ2Vua2VybmVsL25ldGJv b3QvbWlzYy8qIFwKIAkJCSR7Y2xzdF9tZXJnZV9wYXRofQogCiAJCWVjaG8gIj4+PiBDb3B5aW5n IGJ1c3lib3ggY29uZmlnIC4uLiIKLQkJY3AgLWYgJHtjbHN0X3Jvb3RfcGF0aH11c3Ivc2hhcmUv Z2Vua2VybmVsLyR7Y2xzdF9ob3N0YXJjaH0vbmItYnVzeWJveC5jZiBcCi0JCQkke2Nsc3Rfcm9v dF9wYXRofXVzci9zaGFyZS9nZW5rZXJuZWwvJHtjbHN0X2hvc3RhcmNofS9idXN5LWNvbmZpZwor CQljcCAtZiAvdXNyL3NoYXJlL2dlbmtlcm5lbC8ke2Nsc3RfaG9zdGFyY2h9L25iLWJ1c3lib3gu Y2YgXAorCQkJL3Vzci9zaGFyZS9nZW5rZXJuZWwvJHtjbHN0X2hvc3RhcmNofS9idXN5LWNvbmZp ZwogCTs7CiBlc2FjCg== 115991 2007-04-11 20:14 0000 new new patch catalyst.patch text/plain SW5kZXg6IG1vZHVsZXMvbmV0Ym9vdDJfdGFyZ2V0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIG1vZHVsZXMv bmV0Ym9vdDJfdGFyZ2V0LnB5CShyZXZpc2lvbiAxMjI0KQorKysgbW9kdWxlcy9uZXRib290Ml90 YXJnZXQucHkJKHdvcmtpbmcgY29weSkKQEAgLTEwLDE1ICsxMCwxNyBAQAogY2xhc3MgbmV0Ym9v dDJfdGFyZ2V0KGdlbmVyaWNfc3RhZ2VfdGFyZ2V0KToKIAlkZWYgX19pbml0X18oc2VsZixzcGVj LGFkZGxhcmdzKToKIAkJc2VsZi5yZXF1aXJlZF92YWx1ZXM9WwotCQkJImJvb3Qva2VybmVsIiwK LQkJCSJuZXRib290Mi9idWlsZGRhdGUiLAotCQkJIm5ldGJvb3QyL3BhY2thZ2VzIiwJCQkKLQkJ CSJuZXRib290Mi91c2UiCQkJCisJCQkiYm9vdC9rZXJuZWwiCiAJCV0KIAkJc2VsZi52YWxpZF92 YWx1ZXM9c2VsZi5yZXF1aXJlZF92YWx1ZXNbOl0KLQkJc2VsZi52YWxpZF92YWx1ZXMuZXh0ZW5k KHNlbGYucmVxdWlyZWRfdmFsdWVzKQotCQlzZWxmLnZhbGlkX3ZhbHVlcy5leHRlbmQoWyJuZXRi b290Mi9leHRyYV9maWxlcyJdKQotCQkJCisJCXNlbGYudmFsaWRfdmFsdWVzLmV4dGVuZChbCisJ CQkibmV0Ym9vdDIvcGFja2FnZXMiLAorCQkJIm5ldGJvb3QyL3VzZSIsCisJCQkibmV0Ym9vdDIv ZXh0cmFfZmlsZXMiLAorCQkJIm5ldGJvb3QyL292ZXJsYXkiLAorCQkJIm5ldGJvb3QyL2J1c3li b3hfY29uZmlnIgorCQldKQorCiAJCXRyeToKIAkJCWlmIGFkZGxhcmdzLmhhc19rZXkoIm5ldGJv b3QyL3BhY2thZ2VzIik6CiAJCQkJaWYgdHlwZShhZGRsYXJnc1sibmV0Ym9vdDIvcGFja2FnZXMi XSkgPT0gdHlwZXMuU3RyaW5nVHlwZToKQEAgLTMxLDIxICszMywxMCBAQAogCQlleGNlcHQ6CiAJ CQlyYWlzZSBDYXRhbHlzdEVycm9yLCJjb25maWd1cmF0aW9uIGVycm9yIGluIG5ldGJvb3QyL3Bh Y2thZ2VzLiIKIAkJCi0JCQotCiAJCWdlbmVyaWNfc3RhZ2VfdGFyZ2V0Ll9faW5pdF9fKHNlbGYs c3BlYyxhZGRsYXJncykKIAkJc2VsZi5zZXRfYnVpbGRfa2VybmVsX3ZhcnMoKQorCQlzZWxmLnNl dHRpbmdzWyJtZXJnZV9wYXRoIl09bm9ybXBhdGgoIi90bXAvaW1hZ2UvIikKIAotCQkjIE1lcmdl IHBhY2thZ2VzIGludG8gdGhlIGJ1aWxkcm9vdCwgYW5kIHBpY2sgb3V0IGNlcnRhaW4gZmlsZXMg dG8gcGxhY2UgaW4KLQkJIyAvdG1wL2ltYWdlCi0JCXNlbGYuc2V0dGluZ3NbIm1lcmdlX3BhdGgi XT1ub3JtcGF0aCgiL3RtcC9pbWFnZSIpCi0KLQlkZWYgc2V0X2Rlc3RfcGF0aChzZWxmKToKLQkJ aWYgc2VsZi5zZXR0aW5ncy5oYXNfa2V5KCJtZXJnZV9wYXRoIik6Ci0JCQlzZWxmLnNldHRpbmdz WyJkZXN0cGF0aCJdPW5vcm1wYXRoKHNlbGYuc2V0dGluZ3NbImNocm9vdF9wYXRoIl0rc2VsZi5z ZXR0aW5nc1sibWVyZ2VfcGF0aCJdKQotCQllbHNlOgotCQkJc2VsZi5zZXR0aW5nc1siZGVzdHBh dGgiXT1ub3JtcGF0aChzZWxmLnNldHRpbmdzWyJjaHJvb3RfcGF0aCJdKQotCiAJZGVmIHNldF90 YXJnZXRfcGF0aChzZWxmKToKIAkJc2VsZi5zZXR0aW5nc1sidGFyZ2V0X3BhdGgiXT1ub3JtcGF0 aChzZWxmLnNldHRpbmdzWyJzdG9yZWRpciJdKyIvYnVpbGRzLyIrXAogCQkJc2VsZi5zZXR0aW5n c1sidGFyZ2V0X3N1YnBhdGgiXSsiLyIpCkBAIC05OSw2ICs5MCwxNyBAQAogCiAJCQl0b3VjaChz ZWxmLnNldHRpbmdzWyJhdXRvcmVzdW1lX3BhdGgiXSsiY29weV9maWxlc190b19pbWFnZSIpCiAK KwlkZWYgc2V0dXBfb3ZlcmxheShzZWxmKToJCisJCWlmIHNlbGYuc2V0dGluZ3MuaGFzX2tleSgi QVVUT1JFU1VNRSIpIFwKKwkJYW5kIG9zLnBhdGguZXhpc3RzKHNlbGYuc2V0dGluZ3NbImF1dG9y ZXN1bWVfcGF0aCJdKyJzZXR1cF9vdmVybGF5Iik6CisJCQlwcmludCAiUmVzdW1lIHBvaW50IGRl dGVjdGVkLCBza2lwcGluZyBzZXR1cF9vdmVybGF5IG9wZXJhdGlvbi4uLiIKKwkJZWxzZToKKwkJ CWlmIHNlbGYuc2V0dGluZ3MuaGFzX2tleSgibmV0Ym9vdDIvb3ZlcmxheSIpOgorCQkJCWZvciB4 IGluIHNlbGYuc2V0dGluZ3NbIm5ldGJvb3QyL292ZXJsYXkiXTogCisJCQkJCWlmIG9zLnBhdGgu ZXhpc3RzKHgpOgorCQkJCQkJY21kKCJyc3luYyAtYSAiK3grIi8gIitcCisJCQkJCQkJc2VsZi5z ZXR0aW5nc1siY2hyb290X3BhdGgiXSwgIm5ldGJvb3QyL292ZXJsYXk6ICIreCsiIGNvcHkgZmFp bGVkLiIsZW52PXNlbGYuZW52KQorCQkJCXRvdWNoKHNlbGYuc2V0dGluZ3NbImF1dG9yZXN1bWVf cGF0aCJdKyJzZXR1cF9vdmVybGF5IikKIAogCWRlZiBtb3ZlX2tlcm5lbHMoc2VsZik6CiAJCSMg d2UncmUgZG9uZSwgbW92ZSB0aGUga2VybmVscyB0byBidWlsZHMvKgpAQCAtMTEyLDEzICsxMTQs NDcgQEAKIAkJCXNlbGYudW5iaW5kKCkKIAkJCXJhaXNlIENhdGFseXN0RXJyb3IsIkZhaWxlZCB0 byBtb3ZlIGtlcm5lbCBpbWFnZXMhIgogCisJZGVmIHJlbW92ZShzZWxmKToKKwkJaWYgc2VsZi5z ZXR0aW5ncy5oYXNfa2V5KCJBVVRPUkVTVU1FIikgXAorCQkJYW5kIG9zLnBhdGguZXhpc3RzKHNl bGYuc2V0dGluZ3NbImF1dG9yZXN1bWVfcGF0aCJdKyJyZW1vdmUiKToKKwkJCXByaW50ICJSZXN1 bWUgcG9pbnQgZGV0ZWN0ZWQsIHNraXBwaW5nIHJlbW92ZSBvcGVyYXRpb24uLi4iCisJCWVsc2U6 CisJCQlpZiBzZWxmLnNldHRpbmdzLmhhc19rZXkoc2VsZi5zZXR0aW5nc1sic3BlY19wcmVmaXgi XSsiL3JtIik6CisJCQkJZm9yIHggaW4gc2VsZi5zZXR0aW5nc1tzZWxmLnNldHRpbmdzWyJzcGVj X3ByZWZpeCJdKyIvcm0iXToKKwkJCQkJIyB3ZSdyZSBnb2luZyB0byBzaGVsbCBvdXQgZm9yIGFs bCB0aGVzZSBjbGVhbmluZyBvcGVyYXRpb25zLAorCQkJCQkjIHNvIHdlIGdldCBlYXN5IGdsb2Ig aGFuZGxpbmcKKwkJCQkJcHJpbnQgIm5ldGJvb3QyOiByZW1vdmluZyAiICsgeAorCQkJCQlvcy5z eXN0ZW0oInJtIC1yZiAiICsgc2VsZi5zZXR0aW5nc1siY2hyb290X3BhdGgiXSArIHNlbGYuc2V0 dGluZ3NbIm1lcmdlX3BhdGgiXSArIHgpCiAKKwlkZWYgZW1wdHkoc2VsZik6CQkKKwkJaWYgc2Vs Zi5zZXR0aW5ncy5oYXNfa2V5KCJBVVRPUkVTVU1FIikgXAorCQkJYW5kIG9zLnBhdGguZXhpc3Rz KHNlbGYuc2V0dGluZ3NbImF1dG9yZXN1bWVfcGF0aCJdKyJlbXB0eSIpOgorCQkJcHJpbnQgIlJl c3VtZSBwb2ludCBkZXRlY3RlZCwgc2tpcHBpbmcgZW1wdHkgb3BlcmF0aW9uLi4uIgorCQllbHNl OgorCQkJaWYgc2VsZi5zZXR0aW5ncy5oYXNfa2V5KCJuZXRib290Mi9lbXB0eSIpOgorCQkJCWlm IHR5cGUoc2VsZi5zZXR0aW5nc1sibmV0Ym9vdDIvZW1wdHkiXSk9PXR5cGVzLlN0cmluZ1R5cGU6 CisJCQkJCXNlbGYuc2V0dGluZ3NbIm5ldGJvb3QyL2VtcHR5Il09c2VsZi5zZXR0aW5nc1sibmV0 Ym9vdDIvZW1wdHkiXS5zcGxpdCgpCisJCQkJZm9yIHggaW4gc2VsZi5zZXR0aW5nc1sibmV0Ym9v dDIvZW1wdHkiXToKKwkJCQkJbXllbXA9c2VsZi5zZXR0aW5nc1siY2hyb290X3BhdGgiXSArIHNl bGYuc2V0dGluZ3NbIm1lcmdlX3BhdGgiXSArIHgKKwkJCQkJaWYgbm90IG9zLnBhdGguaXNkaXIo bXllbXApOgorCQkJCQkJcHJpbnQgeCwibm90IGEgZGlyZWN0b3J5IG9yIGRvZXMgbm90IGV4aXN0 LCBza2lwcGluZyAnZW1wdHknIG9wZXJhdGlvbi4iCisJCQkJCQljb250aW51ZQorCQkJCQlwcmlu dCAiRW1wdHlpbmcgZGlyZWN0b3J5IiwgeAorCQkJCQkjIHN0YXQgdGhlIGRpciwgZGVsZXRlIHRo ZSBkaXIsIHJlY3JlYXRlIHRoZSBkaXIgYW5kIHNldAorCQkJCQkjIHRoZSBwcm9wZXIgcGVybXMg YW5kIG93bmVyc2hpcAorCQkJCQlteXN0YXQ9b3Muc3RhdChteWVtcCkKKwkJCQkJc2h1dGlsLnJt dHJlZShteWVtcCkKKwkJCQkJb3MubWFrZWRpcnMobXllbXAsMDc1NSkKKwkJCQkJb3MuY2hvd24o bXllbXAsbXlzdGF0W1NUX1VJRF0sbXlzdGF0W1NUX0dJRF0pCisJCQkJCW9zLmNobW9kKG15ZW1w LG15c3RhdFtTVF9NT0RFXSkKKwkJdG91Y2goc2VsZi5zZXR0aW5nc1siYXV0b3Jlc3VtZV9wYXRo Il0rImVtcHR5IikKKwogCWRlZiBzZXRfYWN0aW9uX3NlcXVlbmNlKHNlbGYpOgogCSAgICBzZWxm LnNldHRpbmdzWyJhY3Rpb25fc2VxdWVuY2UiXT1bInVucGFjayIsInVucGFja19zbmFwc2hvdCIs ImNvbmZpZ19wcm9maWxlX2xpbmsiLAogCSAgICAJCQkJInNldHVwX2NvbmZkaXIiLCJiaW5kIiwi Y2hyb290X3NldHVwIixcCiAJCQkJCSJzZXR1cF9lbnZpcm9ubWVudCIsImJ1aWxkX3BhY2thZ2Vz Iiwicm9vdF9vdmVybGF5IixcCi0JCQkJCSJjb3B5X2ZpbGVzX3RvX2ltYWdlIiwiYnVpbGRfa2Vy bmVsIiwibW92ZV9rZXJuZWxzIixcCi0JCQkJCSJ1bmJpbmQiLCJjbGVhbiIsImNsZWFyX2F1dG9y ZXN1bWUiXQorCQkJCQkiY29weV9maWxlc190b19pbWFnZSIsInNldHVwX292ZXJsYXkiLCJidWls ZF9rZXJuZWwiLCJtb3ZlX2tlcm5lbHMiLFwKKwkJCQkJInJlbW92ZSIsImVtcHR5IiwidW5iaW5k IiwiY2xlYW4iLCJjbGVhcl9hdXRvcmVzdW1lIl0KIAogZGVmIHJlZ2lzdGVyKGZvbyk6CiAJZm9v LnVwZGF0ZSh7Im5ldGJvb3QyIjpuZXRib290Ml90YXJnZXR9KQpJbmRleDogdGFyZ2V0cy9uZXRi b290Mi9uZXRib290Mi1jb250cm9sbGVyLnNoCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHRhcmdldHMvbmV0Ym9v dDIvbmV0Ym9vdDItY29udHJvbGxlci5zaAkocmV2aXNpb24gMTIyNCkKKysrIHRhcmdldHMvbmV0 Ym9vdDIvbmV0Ym9vdDItY29udHJvbGxlci5zaAkod29ya2luZyBjb3B5KQpAQCAtMTQsNiArMTQs MTEgQEAKIAk7OwogCXByZS1rbWVyZ2UpCiAJCSMgU2V0cyB1cCB0aGUgYnVpbGQgZW52aXJvbm1l bnQgYmVmb3JlIGFueSBrZXJuZWxzIGFyZSBjb21waWxlZAorCQlpZiBbIC16ICIke2Nsc3RfbmV0 Ym9vdDJfYnVzeWJveF9jb25maWd9IiBdOyB0aGVuCisJCQljcCAke2Nsc3Rfc2hhcmVkaXJ9L3Rh cmdldHMvbmV0Ym9vdDIvbmItYnVzeWJveC5jZiAke2Nsc3RfY2hyb290X3BhdGh9L3RtcC9idXN5 LWNvbmZpZworCQllbHNlCisJCQljcCAke2Nsc3RfbmV0Ym9vdDJfYnVzeWJveF9jb25maWd9ICR7 Y2xzdF9jaHJvb3RfcGF0aH0vdG1wL2J1c3ktY29uZmlnCisJCWZpCiAJCWV4ZWNfaW5fY2hyb290 ICR7Y2xzdF9zaGFyZWRpcn0vdGFyZ2V0cy9zdXBwb3J0L3ByZS1rbWVyZ2Uuc2gKIAk7OwogCXBv c3Qta21lcmdlKQpJbmRleDogdGFyZ2V0cy9uZXRib290Mi9uZXRib290Mi1jb3B5ZmlsZS5zaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSB0YXJnZXRzL25ldGJvb3QyL25ldGJvb3QyLWNvcHlmaWxlLnNoCShyZXZp c2lvbiAxMjI0KQorKysgdGFyZ2V0cy9uZXRib290Mi9uZXRib290Mi1jb3B5ZmlsZS5zaAkod29y a2luZyBjb3B5KQpAQCAtMTgsNCArMTgsMyBAQAogCQlmaQogCWZpCiBkb25lCi1lY2hvICIiCklu ZGV4OiB0YXJnZXRzL3N1cHBvcnQvZnVuY3Rpb25zLnNoCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHRhcmdldHMv c3VwcG9ydC9mdW5jdGlvbnMuc2gJKHJldmlzaW9uIDEyMjQpCisrKyB0YXJnZXRzL3N1cHBvcnQv ZnVuY3Rpb25zLnNoCSh3b3JraW5nIGNvcHkpCkBAIC0xMjQsNiArMTI0LDExIEBACiAJCXRoZW4g CiAJCQltdiAkezF9L2luaXRyYW1mcy0qICR7MX0vJHt4fS5pZ3oKIAkJZmkKKworCQlpZiBbIC1l ICR7MX0vU3lzdGVtLm1hcC0qIF07CisJCXRoZW4KKwkJCW12ICR7MX0vU3lzdGVtLm1hcC0qICR7 MX0vU3lzdGVtLm1hcC0ke3h9CisJCWZpCiAJZG9uZQogfQogCkluZGV4OiB0YXJnZXRzL3N1cHBv cnQvbmV0Ym9vdDItZmluYWwuc2gKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gdGFyZ2V0cy9zdXBwb3J0L25ldGJv b3QyLWZpbmFsLnNoCShyZXZpc2lvbiAxMjI0KQorKysgdGFyZ2V0cy9zdXBwb3J0L25ldGJvb3Qy LWZpbmFsLnNoCSh3b3JraW5nIGNvcHkpCkBAIC0xNCw2ICsxNCw3IEBACiBmb3IgeCBpbiAke2Ns c3RfYm9vdF9rZXJuZWx9OyBkbwogCW12ICR7Y2xzdF90YXJnZXRfcGF0aH1ib290LyR7eH0gJHtj bHN0X3RhcmdldF9wYXRofWtlcm5lbHMKIAltdiAke2Nsc3RfdGFyZ2V0X3BhdGh9Ym9vdC8ke3h9 LmlneiAke2Nsc3RfdGFyZ2V0X3BhdGh9a2VybmVscy9taXNjCisJbXYgJHtjbHN0X3RhcmdldF9w YXRofWJvb3QvU3lzdGVtLm1hcC0ke3h9ICR7Y2xzdF90YXJnZXRfcGF0aH1rZXJuZWxzL21pc2MK IGRvbmUKIAogcm1kaXIgJHtjbHN0X3RhcmdldF9wYXRofWJvb3QKQEAgLTMxLDcgKzMyLDEwIEBA CiAJCXNsZWVwIDAKIAkJOzsKIAlzcGFyYyopCi0JCXNsZWVwIDAKKwkJZm9yIHggaW4gJHtjbHN0 X2Jvb3Rfa2VybmVsfTsgZG8KKwkJCWVsZnRvYW91dCAke2Nsc3RfdGFyZ2V0X3BhdGh9L2tlcm5l bHMvJHt4fSAtbyAke2Nsc3RfdGFyZ2V0X3BhdGh9JHt4fS1hLm91dAorCQkJcGlnZ3liYWNrNjQg JHtjbHN0X3RhcmdldF9wYXRofS8ke3h9LWEub3V0ICR7Y2xzdF90YXJnZXRfcGF0aH1rZXJuZWxz L21pc2MvU3lzdGVtLm1hcC0ke3h9ICR7Y2xzdF90YXJnZXRfcGF0aH1rZXJuZWxzL21pc2MvJHt4 fS5pZ3oKKwkJZG9uZQogCQk7OwogCWlhNjQpCiAJCXNsZWVwIDAKSW5kZXg6IHRhcmdldHMvc3Vw cG9ydC9wcmUta21lcmdlLnNoCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHRhcmdldHMvc3VwcG9ydC9wcmUta21l cmdlLnNoCShyZXZpc2lvbiAxMjI0KQorKysgdGFyZ2V0cy9zdXBwb3J0L3ByZS1rbWVyZ2Uuc2gJ KHdvcmtpbmcgY29weSkKQEAgLTI5LDE3ICsyOSwxNyBAQAogCiAJCSMgU2V0IHRoZSBuZXRib290 IGJ1aWxkZGF0ZS9ob3N0bmFtZSBpbiBsaW51eHJjIGFuZCBjb3B5IHRvIHByb3BlciBhcmNoCiAJ CSMgZGlyZWN0b3J5IGluIGdlbmtlcm5lbAotCQlzZWQgLWUgInMvQEBNWURBVEVAQC8ke2Nsc3Rf bmV0Ym9vdDJfYnVpbGRkYXRlfS9nIiBcCisJCXNlZCAtZSAicy9AQE1ZREFURUBALyQoZGF0ZSAn KyVZJW0lZCcpL2ciIFwKIAkJICAgIC1lICJzL0BAUkVMVkVSQEAvJHtjbHN0X3ZlcnNpb25fc3Rh bXB9L2ciIFwKLQkJCSR7Y2xzdF9yb290X3BhdGh9dXNyL3NoYXJlL2dlbmtlcm5lbC9uZXRib290 L2xpbnV4cmMueCBcCi0JCQkJPiAke2Nsc3Rfcm9vdF9wYXRofXVzci9zaGFyZS9nZW5rZXJuZWwv JHtjbHN0X2hvc3RhcmNofS9saW51eHJjCisJCQkvdXNyL3NoYXJlL2dlbmtlcm5lbC9uZXRib290 L2xpbnV4cmMueCBcCisJCQk+IC91c3Ivc2hhcmUvZ2Vua2VybmVsLyR7Y2xzdF9ob3N0YXJjaH0v bGludXhyYwogCiAJCWVjaG8gIj4+PiBDb3B5aW5nIHN1cHBvcnQgZmlsZXMgdG8gJHtjbHN0X3Jv b3RfcGF0aH0gLi4uIgotCQljcCAtcFBSZiAke2Nsc3Rfcm9vdF9wYXRofXVzci9zaGFyZS9nZW5r ZXJuZWwvbmV0Ym9vdC9taXNjLyogXAorCQljcCAtcFBSZiAvdXNyL3NoYXJlL2dlbmtlcm5lbC9u ZXRib290L21pc2MvKiBcCiAJCQkke2Nsc3RfbWVyZ2VfcGF0aH0KIAogCQllY2hvICI+Pj4gQ29w eWluZyBidXN5Ym94IGNvbmZpZyAuLi4iCi0JCWNwIC1mICR7Y2xzdF9yb290X3BhdGh9dXNyL3No YXJlL2dlbmtlcm5lbC8ke2Nsc3RfaG9zdGFyY2h9L25iLWJ1c3lib3guY2YgXAotCQkJJHtjbHN0 X3Jvb3RfcGF0aH11c3Ivc2hhcmUvZ2Vua2VybmVsLyR7Y2xzdF9ob3N0YXJjaH0vYnVzeS1jb25m aWcKKwkJY3AgLWYgL3RtcC9idXN5LWNvbmZpZyBcCisJCQkvdXNyL3NoYXJlL2dlbmtlcm5lbC8k e2Nsc3RfaG9zdGFyY2h9L2J1c3ktY29uZmlnCiAJOzsKIGVzYWMK 116005 2007-04-12 00:57 0000 new new new patch catalyst.patch text/plain SW5kZXg6IG1vZHVsZXMvbmV0Ym9vdDJfdGFyZ2V0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIG1vZHVsZXMv bmV0Ym9vdDJfdGFyZ2V0LnB5CShyZXZpc2lvbiAxMjI0KQorKysgbW9kdWxlcy9uZXRib290Ml90 YXJnZXQucHkJKHdvcmtpbmcgY29weSkKQEAgLTEwLDE1ICsxMCwxNyBAQAogY2xhc3MgbmV0Ym9v dDJfdGFyZ2V0KGdlbmVyaWNfc3RhZ2VfdGFyZ2V0KToKIAlkZWYgX19pbml0X18oc2VsZixzcGVj LGFkZGxhcmdzKToKIAkJc2VsZi5yZXF1aXJlZF92YWx1ZXM9WwotCQkJImJvb3Qva2VybmVsIiwK LQkJCSJuZXRib290Mi9idWlsZGRhdGUiLAotCQkJIm5ldGJvb3QyL3BhY2thZ2VzIiwJCQkKLQkJ CSJuZXRib290Mi91c2UiCQkJCisJCQkiYm9vdC9rZXJuZWwiCiAJCV0KIAkJc2VsZi52YWxpZF92 YWx1ZXM9c2VsZi5yZXF1aXJlZF92YWx1ZXNbOl0KLQkJc2VsZi52YWxpZF92YWx1ZXMuZXh0ZW5k KHNlbGYucmVxdWlyZWRfdmFsdWVzKQotCQlzZWxmLnZhbGlkX3ZhbHVlcy5leHRlbmQoWyJuZXRi b290Mi9leHRyYV9maWxlcyJdKQotCQkJCisJCXNlbGYudmFsaWRfdmFsdWVzLmV4dGVuZChbCisJ CQkibmV0Ym9vdDIvcGFja2FnZXMiLAorCQkJIm5ldGJvb3QyL3VzZSIsCisJCQkibmV0Ym9vdDIv ZXh0cmFfZmlsZXMiLAorCQkJIm5ldGJvb3QyL292ZXJsYXkiLAorCQkJIm5ldGJvb3QyL2J1c3li b3hfY29uZmlnIgorCQldKQorCiAJCXRyeToKIAkJCWlmIGFkZGxhcmdzLmhhc19rZXkoIm5ldGJv b3QyL3BhY2thZ2VzIik6CiAJCQkJaWYgdHlwZShhZGRsYXJnc1sibmV0Ym9vdDIvcGFja2FnZXMi XSkgPT0gdHlwZXMuU3RyaW5nVHlwZToKQEAgLTMxLDIxICszMywxMCBAQAogCQlleGNlcHQ6CiAJ CQlyYWlzZSBDYXRhbHlzdEVycm9yLCJjb25maWd1cmF0aW9uIGVycm9yIGluIG5ldGJvb3QyL3Bh Y2thZ2VzLiIKIAkJCi0JCQotCiAJCWdlbmVyaWNfc3RhZ2VfdGFyZ2V0Ll9faW5pdF9fKHNlbGYs c3BlYyxhZGRsYXJncykKIAkJc2VsZi5zZXRfYnVpbGRfa2VybmVsX3ZhcnMoKQorCQlzZWxmLnNl dHRpbmdzWyJtZXJnZV9wYXRoIl09bm9ybXBhdGgoIi90bXAvaW1hZ2UvIikKIAotCQkjIE1lcmdl IHBhY2thZ2VzIGludG8gdGhlIGJ1aWxkcm9vdCwgYW5kIHBpY2sgb3V0IGNlcnRhaW4gZmlsZXMg dG8gcGxhY2UgaW4KLQkJIyAvdG1wL2ltYWdlCi0JCXNlbGYuc2V0dGluZ3NbIm1lcmdlX3BhdGgi XT1ub3JtcGF0aCgiL3RtcC9pbWFnZSIpCi0KLQlkZWYgc2V0X2Rlc3RfcGF0aChzZWxmKToKLQkJ aWYgc2VsZi5zZXR0aW5ncy5oYXNfa2V5KCJtZXJnZV9wYXRoIik6Ci0JCQlzZWxmLnNldHRpbmdz WyJkZXN0cGF0aCJdPW5vcm1wYXRoKHNlbGYuc2V0dGluZ3NbImNocm9vdF9wYXRoIl0rc2VsZi5z ZXR0aW5nc1sibWVyZ2VfcGF0aCJdKQotCQllbHNlOgotCQkJc2VsZi5zZXR0aW5nc1siZGVzdHBh dGgiXT1ub3JtcGF0aChzZWxmLnNldHRpbmdzWyJjaHJvb3RfcGF0aCJdKQotCiAJZGVmIHNldF90 YXJnZXRfcGF0aChzZWxmKToKIAkJc2VsZi5zZXR0aW5nc1sidGFyZ2V0X3BhdGgiXT1ub3JtcGF0 aChzZWxmLnNldHRpbmdzWyJzdG9yZWRpciJdKyIvYnVpbGRzLyIrXAogCQkJc2VsZi5zZXR0aW5n c1sidGFyZ2V0X3N1YnBhdGgiXSsiLyIpCkBAIC05OSw2ICs5MCwxNyBAQAogCiAJCQl0b3VjaChz ZWxmLnNldHRpbmdzWyJhdXRvcmVzdW1lX3BhdGgiXSsiY29weV9maWxlc190b19pbWFnZSIpCiAK KwlkZWYgc2V0dXBfb3ZlcmxheShzZWxmKToJCisJCWlmIHNlbGYuc2V0dGluZ3MuaGFzX2tleSgi QVVUT1JFU1VNRSIpIFwKKwkJYW5kIG9zLnBhdGguZXhpc3RzKHNlbGYuc2V0dGluZ3NbImF1dG9y ZXN1bWVfcGF0aCJdKyJzZXR1cF9vdmVybGF5Iik6CisJCQlwcmludCAiUmVzdW1lIHBvaW50IGRl dGVjdGVkLCBza2lwcGluZyBzZXR1cF9vdmVybGF5IG9wZXJhdGlvbi4uLiIKKwkJZWxzZToKKwkJ CWlmIHNlbGYuc2V0dGluZ3MuaGFzX2tleSgibmV0Ym9vdDIvb3ZlcmxheSIpOgorCQkJCWZvciB4 IGluIHNlbGYuc2V0dGluZ3NbIm5ldGJvb3QyL292ZXJsYXkiXTogCisJCQkJCWlmIG9zLnBhdGgu ZXhpc3RzKHgpOgorCQkJCQkJY21kKCJyc3luYyAtYSAiK3grIi8gIitcCisJCQkJCQkJc2VsZi5z ZXR0aW5nc1siY2hyb290X3BhdGgiXSwgIm5ldGJvb3QyL292ZXJsYXk6ICIreCsiIGNvcHkgZmFp bGVkLiIsZW52PXNlbGYuZW52KQorCQkJCXRvdWNoKHNlbGYuc2V0dGluZ3NbImF1dG9yZXN1bWVf cGF0aCJdKyJzZXR1cF9vdmVybGF5IikKIAogCWRlZiBtb3ZlX2tlcm5lbHMoc2VsZik6CiAJCSMg d2UncmUgZG9uZSwgbW92ZSB0aGUga2VybmVscyB0byBidWlsZHMvKgpAQCAtMTEyLDEzICsxMTQs NDcgQEAKIAkJCXNlbGYudW5iaW5kKCkKIAkJCXJhaXNlIENhdGFseXN0RXJyb3IsIkZhaWxlZCB0 byBtb3ZlIGtlcm5lbCBpbWFnZXMhIgogCisJZGVmIHJlbW92ZShzZWxmKToKKwkJaWYgc2VsZi5z ZXR0aW5ncy5oYXNfa2V5KCJBVVRPUkVTVU1FIikgXAorCQkJYW5kIG9zLnBhdGguZXhpc3RzKHNl bGYuc2V0dGluZ3NbImF1dG9yZXN1bWVfcGF0aCJdKyJyZW1vdmUiKToKKwkJCXByaW50ICJSZXN1 bWUgcG9pbnQgZGV0ZWN0ZWQsIHNraXBwaW5nIHJlbW92ZSBvcGVyYXRpb24uLi4iCisJCWVsc2U6 CisJCQlpZiBzZWxmLnNldHRpbmdzLmhhc19rZXkoc2VsZi5zZXR0aW5nc1sic3BlY19wcmVmaXgi XSsiL3JtIik6CisJCQkJZm9yIHggaW4gc2VsZi5zZXR0aW5nc1tzZWxmLnNldHRpbmdzWyJzcGVj X3ByZWZpeCJdKyIvcm0iXToKKwkJCQkJIyB3ZSdyZSBnb2luZyB0byBzaGVsbCBvdXQgZm9yIGFs bCB0aGVzZSBjbGVhbmluZyBvcGVyYXRpb25zLAorCQkJCQkjIHNvIHdlIGdldCBlYXN5IGdsb2Ig aGFuZGxpbmcKKwkJCQkJcHJpbnQgIm5ldGJvb3QyOiByZW1vdmluZyAiICsgeAorCQkJCQlvcy5z eXN0ZW0oInJtIC1yZiAiICsgc2VsZi5zZXR0aW5nc1siY2hyb290X3BhdGgiXSArIHNlbGYuc2V0 dGluZ3NbIm1lcmdlX3BhdGgiXSArIHgpCiAKKwlkZWYgZW1wdHkoc2VsZik6CQkKKwkJaWYgc2Vs Zi5zZXR0aW5ncy5oYXNfa2V5KCJBVVRPUkVTVU1FIikgXAorCQkJYW5kIG9zLnBhdGguZXhpc3Rz KHNlbGYuc2V0dGluZ3NbImF1dG9yZXN1bWVfcGF0aCJdKyJlbXB0eSIpOgorCQkJcHJpbnQgIlJl c3VtZSBwb2ludCBkZXRlY3RlZCwgc2tpcHBpbmcgZW1wdHkgb3BlcmF0aW9uLi4uIgorCQllbHNl OgorCQkJaWYgc2VsZi5zZXR0aW5ncy5oYXNfa2V5KCJuZXRib290Mi9lbXB0eSIpOgorCQkJCWlm IHR5cGUoc2VsZi5zZXR0aW5nc1sibmV0Ym9vdDIvZW1wdHkiXSk9PXR5cGVzLlN0cmluZ1R5cGU6 CisJCQkJCXNlbGYuc2V0dGluZ3NbIm5ldGJvb3QyL2VtcHR5Il09c2VsZi5zZXR0aW5nc1sibmV0 Ym9vdDIvZW1wdHkiXS5zcGxpdCgpCisJCQkJZm9yIHggaW4gc2VsZi5zZXR0aW5nc1sibmV0Ym9v dDIvZW1wdHkiXToKKwkJCQkJbXllbXA9c2VsZi5zZXR0aW5nc1siY2hyb290X3BhdGgiXSArIHNl bGYuc2V0dGluZ3NbIm1lcmdlX3BhdGgiXSArIHgKKwkJCQkJaWYgbm90IG9zLnBhdGguaXNkaXIo bXllbXApOgorCQkJCQkJcHJpbnQgeCwibm90IGEgZGlyZWN0b3J5IG9yIGRvZXMgbm90IGV4aXN0 LCBza2lwcGluZyAnZW1wdHknIG9wZXJhdGlvbi4iCisJCQkJCQljb250aW51ZQorCQkJCQlwcmlu dCAiRW1wdHlpbmcgZGlyZWN0b3J5IiwgeAorCQkJCQkjIHN0YXQgdGhlIGRpciwgZGVsZXRlIHRo ZSBkaXIsIHJlY3JlYXRlIHRoZSBkaXIgYW5kIHNldAorCQkJCQkjIHRoZSBwcm9wZXIgcGVybXMg YW5kIG93bmVyc2hpcAorCQkJCQlteXN0YXQ9b3Muc3RhdChteWVtcCkKKwkJCQkJc2h1dGlsLnJt dHJlZShteWVtcCkKKwkJCQkJb3MubWFrZWRpcnMobXllbXAsMDc1NSkKKwkJCQkJb3MuY2hvd24o bXllbXAsbXlzdGF0W1NUX1VJRF0sbXlzdGF0W1NUX0dJRF0pCisJCQkJCW9zLmNobW9kKG15ZW1w LG15c3RhdFtTVF9NT0RFXSkKKwkJdG91Y2goc2VsZi5zZXR0aW5nc1siYXV0b3Jlc3VtZV9wYXRo Il0rImVtcHR5IikKKwogCWRlZiBzZXRfYWN0aW9uX3NlcXVlbmNlKHNlbGYpOgogCSAgICBzZWxm LnNldHRpbmdzWyJhY3Rpb25fc2VxdWVuY2UiXT1bInVucGFjayIsInVucGFja19zbmFwc2hvdCIs ImNvbmZpZ19wcm9maWxlX2xpbmsiLAogCSAgICAJCQkJInNldHVwX2NvbmZkaXIiLCJiaW5kIiwi Y2hyb290X3NldHVwIixcCiAJCQkJCSJzZXR1cF9lbnZpcm9ubWVudCIsImJ1aWxkX3BhY2thZ2Vz Iiwicm9vdF9vdmVybGF5IixcCi0JCQkJCSJjb3B5X2ZpbGVzX3RvX2ltYWdlIiwiYnVpbGRfa2Vy bmVsIiwibW92ZV9rZXJuZWxzIixcCi0JCQkJCSJ1bmJpbmQiLCJjbGVhbiIsImNsZWFyX2F1dG9y ZXN1bWUiXQorCQkJCQkiY29weV9maWxlc190b19pbWFnZSIsInNldHVwX292ZXJsYXkiLCJidWls ZF9rZXJuZWwiLCJtb3ZlX2tlcm5lbHMiLFwKKwkJCQkJInJlbW92ZSIsImVtcHR5IiwidW5iaW5k IiwiY2xlYW4iLCJjbGVhcl9hdXRvcmVzdW1lIl0KIAogZGVmIHJlZ2lzdGVyKGZvbyk6CiAJZm9v LnVwZGF0ZSh7Im5ldGJvb3QyIjpuZXRib290Ml90YXJnZXR9KQpJbmRleDogdGFyZ2V0cy9uZXRi b290Mi9uZXRib290Mi1jb250cm9sbGVyLnNoCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHRhcmdldHMvbmV0Ym9v dDIvbmV0Ym9vdDItY29udHJvbGxlci5zaAkocmV2aXNpb24gMTIyNCkKKysrIHRhcmdldHMvbmV0 Ym9vdDIvbmV0Ym9vdDItY29udHJvbGxlci5zaAkod29ya2luZyBjb3B5KQpAQCAtMTQsNiArMTQs MTEgQEAKIAk7OwogCXByZS1rbWVyZ2UpCiAJCSMgU2V0cyB1cCB0aGUgYnVpbGQgZW52aXJvbm1l bnQgYmVmb3JlIGFueSBrZXJuZWxzIGFyZSBjb21waWxlZAorCQlpZiBbIC16ICIke2Nsc3RfbmV0 Ym9vdDJfYnVzeWJveF9jb25maWd9IiBdOyB0aGVuCisJCQljcCAke2Nsc3Rfc2hhcmVkaXJ9L3Rh cmdldHMvbmV0Ym9vdDIvbmItYnVzeWJveC5jZiAke2Nsc3RfY2hyb290X3BhdGh9L3RtcC9idXN5 LWNvbmZpZworCQllbHNlCisJCQljcCAke2Nsc3RfbmV0Ym9vdDJfYnVzeWJveF9jb25maWd9ICR7 Y2xzdF9jaHJvb3RfcGF0aH0vdG1wL2J1c3ktY29uZmlnCisJCWZpCiAJCWV4ZWNfaW5fY2hyb290 ICR7Y2xzdF9zaGFyZWRpcn0vdGFyZ2V0cy9zdXBwb3J0L3ByZS1rbWVyZ2Uuc2gKIAk7OwogCXBv c3Qta21lcmdlKQpJbmRleDogdGFyZ2V0cy9uZXRib290Mi9uZXRib290Mi1jb3B5ZmlsZS5zaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSB0YXJnZXRzL25ldGJvb3QyL25ldGJvb3QyLWNvcHlmaWxlLnNoCShyZXZp c2lvbiAxMjI0KQorKysgdGFyZ2V0cy9uZXRib290Mi9uZXRib290Mi1jb3B5ZmlsZS5zaAkod29y a2luZyBjb3B5KQpAQCAtMTgsNCArMTgsMyBAQAogCQlmaQogCWZpCiBkb25lCi1lY2hvICIiCklu ZGV4OiB0YXJnZXRzL3N1cHBvcnQvZnVuY3Rpb25zLnNoCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHRhcmdldHMv c3VwcG9ydC9mdW5jdGlvbnMuc2gJKHJldmlzaW9uIDEyMjQpCisrKyB0YXJnZXRzL3N1cHBvcnQv ZnVuY3Rpb25zLnNoCSh3b3JraW5nIGNvcHkpCkBAIC0xMjQsNiArMTI0LDExIEBACiAJCXRoZW4g CiAJCQltdiAkezF9L2luaXRyYW1mcy0qICR7MX0vJHt4fS5pZ3oKIAkJZmkKKworCQlpZiBbIC1l ICR7MX0vU3lzdGVtLm1hcC0qIF07CisJCXRoZW4KKwkJCW12ICR7MX0vU3lzdGVtLm1hcC0qICR7 MX0vU3lzdGVtLm1hcC0ke3h9CisJCWZpCiAJZG9uZQogfQogCkluZGV4OiB0YXJnZXRzL3N1cHBv cnQvbmV0Ym9vdDItZmluYWwuc2gKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gdGFyZ2V0cy9zdXBwb3J0L25ldGJv b3QyLWZpbmFsLnNoCShyZXZpc2lvbiAxMjI0KQorKysgdGFyZ2V0cy9zdXBwb3J0L25ldGJvb3Qy LWZpbmFsLnNoCSh3b3JraW5nIGNvcHkpCkBAIC0xNCw2ICsxNCw3IEBACiBmb3IgeCBpbiAke2Ns c3RfYm9vdF9rZXJuZWx9OyBkbwogCW12ICR7Y2xzdF90YXJnZXRfcGF0aH1ib290LyR7eH0gJHtj bHN0X3RhcmdldF9wYXRofWtlcm5lbHMKIAltdiAke2Nsc3RfdGFyZ2V0X3BhdGh9Ym9vdC8ke3h9 LmlneiAke2Nsc3RfdGFyZ2V0X3BhdGh9a2VybmVscy9taXNjCisJbXYgJHtjbHN0X3RhcmdldF9w YXRofWJvb3QvU3lzdGVtLm1hcC0ke3h9ICR7Y2xzdF90YXJnZXRfcGF0aH1rZXJuZWxzL21pc2MK IGRvbmUKIAogcm1kaXIgJHtjbHN0X3RhcmdldF9wYXRofWJvb3QKQEAgLTMxLDcgKzMyLDE1IEBA CiAJCXNsZWVwIDAKIAkJOzsKIAlzcGFyYyopCi0JCXNsZWVwIDAKKwkJaWYgWyAiJHtjbHN0X2hv c3RhcmNofSIgPT0gInNwYXJjIiBdOyB0aGVuCisJCQlwaWdneWJhY2s9cGlnZ3liYWNrCisJCWVs c2UKKwkJCXBpZ2d5YmFjaz1waWdneWJhY2s2NAorCQlmaQorCQlmb3IgeCBpbiAke2Nsc3RfYm9v dF9rZXJuZWx9OyBkbworCQkJZWxmdG9hb3V0ICR7Y2xzdF90YXJnZXRfcGF0aH0va2VybmVscy8k e3h9IC1vICR7Y2xzdF90YXJnZXRfcGF0aH0ke3h9LWEub3V0CisJCQkke3BpZ2d5YmFja30gJHtj bHN0X3RhcmdldF9wYXRofS8ke3h9LWEub3V0ICR7Y2xzdF90YXJnZXRfcGF0aH1rZXJuZWxzL21p c2MvU3lzdGVtLm1hcC0ke3h9ICR7Y2xzdF90YXJnZXRfcGF0aH1rZXJuZWxzL21pc2MvJHt4fS5p Z3oKKwkJZG9uZQogCQk7OwogCWlhNjQpCiAJCXNsZWVwIDAKSW5kZXg6IHRhcmdldHMvc3VwcG9y dC9wcmUta21lcmdlLnNoCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHRhcmdldHMvc3VwcG9ydC9wcmUta21lcmdl LnNoCShyZXZpc2lvbiAxMjI0KQorKysgdGFyZ2V0cy9zdXBwb3J0L3ByZS1rbWVyZ2Uuc2gJKHdv cmtpbmcgY29weSkKQEAgLTI5LDE3ICsyOSwxNyBAQAogCiAJCSMgU2V0IHRoZSBuZXRib290IGJ1 aWxkZGF0ZS9ob3N0bmFtZSBpbiBsaW51eHJjIGFuZCBjb3B5IHRvIHByb3BlciBhcmNoCiAJCSMg ZGlyZWN0b3J5IGluIGdlbmtlcm5lbAotCQlzZWQgLWUgInMvQEBNWURBVEVAQC8ke2Nsc3RfbmV0 Ym9vdDJfYnVpbGRkYXRlfS9nIiBcCisJCXNlZCAtZSAicy9AQE1ZREFURUBALyQoZGF0ZSAnKyVZ JW0lZCcpL2ciIFwKIAkJICAgIC1lICJzL0BAUkVMVkVSQEAvJHtjbHN0X3ZlcnNpb25fc3RhbXB9 L2ciIFwKLQkJCSR7Y2xzdF9yb290X3BhdGh9dXNyL3NoYXJlL2dlbmtlcm5lbC9uZXRib290L2xp bnV4cmMueCBcCi0JCQkJPiAke2Nsc3Rfcm9vdF9wYXRofXVzci9zaGFyZS9nZW5rZXJuZWwvJHtj bHN0X2hvc3RhcmNofS9saW51eHJjCisJCQkvdXNyL3NoYXJlL2dlbmtlcm5lbC9uZXRib290L2xp bnV4cmMueCBcCisJCQk+IC91c3Ivc2hhcmUvZ2Vua2VybmVsLyR7Y2xzdF9ob3N0YXJjaH0vbGlu dXhyYwogCiAJCWVjaG8gIj4+PiBDb3B5aW5nIHN1cHBvcnQgZmlsZXMgdG8gJHtjbHN0X3Jvb3Rf cGF0aH0gLi4uIgotCQljcCAtcFBSZiAke2Nsc3Rfcm9vdF9wYXRofXVzci9zaGFyZS9nZW5rZXJu ZWwvbmV0Ym9vdC9taXNjLyogXAorCQljcCAtcFBSZiAvdXNyL3NoYXJlL2dlbmtlcm5lbC9uZXRi b290L21pc2MvKiBcCiAJCQkke2Nsc3RfbWVyZ2VfcGF0aH0KIAogCQllY2hvICI+Pj4gQ29weWlu ZyBidXN5Ym94IGNvbmZpZyAuLi4iCi0JCWNwIC1mICR7Y2xzdF9yb290X3BhdGh9dXNyL3NoYXJl L2dlbmtlcm5lbC8ke2Nsc3RfaG9zdGFyY2h9L25iLWJ1c3lib3guY2YgXAotCQkJJHtjbHN0X3Jv b3RfcGF0aH11c3Ivc2hhcmUvZ2Vua2VybmVsLyR7Y2xzdF9ob3N0YXJjaH0vYnVzeS1jb25maWcK KwkJY3AgLWYgL3RtcC9idXN5LWNvbmZpZyBcCisJCQkvdXNyL3NoYXJlL2dlbmtlcm5lbC8ke2Ns c3RfaG9zdGFyY2h9L2J1c3ktY29uZmlnCiAJOzsKIGVzYWMK