185446 2007-07-15 19:34 0000 x11-libs/qt Multiple issues (CVE-2007-3388) 2007-08-22 22:42:19 0000 1 1 1 Unclassified Gentoo Security Vulnerabilities unspecified All Linux RESOLVED FIXED http://secunia.com/advisories/26298/ B2 [glsa] jaervosz P2 normal --- 187552 1 jaervosz@gentoo.org security@gentoo.org caleb@gentoo.org ingmar@gentoo.org jakub@gentoo.org meax@huicht.org mips@gentoo.org jaervosz@gentoo.org 2007-07-15 19:34:01 0000 Attaching patches in a moment. jaervosz@gentoo.org 2007-07-15 19:35:33 0000 Created an attachment (id=124945) 270240.diff Patch for issue reported by Tracey Parry of Portcullis Computer Security Ltd. jaervosz@gentoo.org 2007-07-15 19:37:05 0000 Created an attachment (id=124947) format-warnings.diff Reported by Dirk Mueller. jaervosz@gentoo.org 2007-07-15 19:40:36 0000 Caleb please advise. Do NOT commit anything yet. Instead you can attach updated ebuilds to this bug for prestable testing if needed. caleb@gentoo.org 2007-07-15 20:06:27 0000 both patches look mostly harmless to me. 99% of them just affect debugging output, which shouldn't matter to anyone really. The very last line on the format-warning.diff seems to affect reverseable layouts, which might cause an impact to someone who uses a right-to-left language, but I don't have any way to test that particular feature. In short: the patches look completely fine to me. jaervosz@gentoo.org 2007-07-15 20:25:34 0000 Thx Caleb. Do you want prestable arch testing or should we just wait until the issues go public? caleb@gentoo.org 2007-07-15 20:44:56 0000 I don't see any fixes in here that would affect any arches at all, really, so I think we're okay to wait. caleb@gentoo.org 2007-07-16 11:26:11 0000 also, since qt-4.3.0 is ready for a stablization request for the arches anyway, we can just tie these patches with a normal stablization request. I'm not sure if these will work against the qt-4.2 series, but it may not be necessary to even worry about that. jaervosz@gentoo.org 2007-07-16 19:38:00 0000 The initial report for CVE-2007-3388 said to affect qt-3 only. So I guess we're going directly to stable on qt-3 once the release date is reached? caleb@gentoo.org 2007-07-16 20:05:08 0000 oh, didn't realize it was qt3 only. in any case, no problem going straight to stable with the patches. jaervosz@gentoo.org 2007-07-22 08:08:40 0000 Created an attachment (id=125619) qt_patch.diff Upstream patch. jaervosz@gentoo.org 2007-07-29 21:00:05 0000 Caleb, did you see any public information about this yet? Disclosure date should have been friday, I wonder wether it was postponed. py@gentoo.org 2007-08-02 18:19:44 0000 *** Bug 187465 has been marked as a duplicate of this bug. *** py@gentoo.org 2007-08-02 18:25:46 0000 this is public now, sorry for the delay. Arches, please test and mark stable: qt-3.3.8-r3 and qt-4.3.0-r1 (target "alpha amd64 hppa ia64 mips ppc ppc64 sparc x86 ~x86-fbsd" corsair@gentoo.org 2007-08-02 18:34:37 0000 ppc64 stable polynomial-c@gentoo.org 2007-08-02 20:38:09 0000 How about updating the qt.eclass as well when you throw a new qt ebuild into portage? Currently I get circular dependency errors when updating world because 3.3.8-r3 is not listed in the QT3VERSIONS variable of qt.eclass... polynomial-c@gentoo.org 2007-08-02 20:43:22 0000 Of course I mean qt3.eclass. fauli@gentoo.org 2007-08-02 21:19:46 0000 x86 stable and qt3.eclass has been fixed by carlo, thanks. tanderson@gentoo.org 2007-08-03 00:00:49 0000 ====amd64==== All looks good here. Building kdelibs against qt-3.3.8-r3 works fine. Is there anything additional to test so that I know that the vulnerability itself is fixed? Portage 2.1.2.9 (default-linux/amd64/2007.0, gcc-4.1.2, glibc-2.5-r4, 2.6.20-gentoo-r7 x86_64) ================================================================= System uname: 2.6.20-gentoo-r7 x86_64 unknown Gentoo Base System release 1.12.9 Timestamp of tree: Thu, 02 Aug 2007 19:01:01 +0000 ccache version 2.4 [enabled] dev-java/java-config: 1.3.7, 2.0.33-r1 dev-lang/python: 2.4.4-r4 dev-python/pycrypto: 2.0.1-r6 dev-util/ccache: 2.4-r7 sys-apps/sandbox: 1.2.17 sys-devel/autoconf: 2.13, 2.61 sys-devel/automake: 1.5, 1.6.3, 1.7.9-r1, 1.8.5-r3, 1.9.6-r2, 1.10 sys-devel/binutils: 2.17 sys-devel/gcc-config: 1.3.16 sys-devel/libtool: 1.5.23b virtual/os-headers: 2.6.21 ACCEPT_KEYWORDS="amd64" AUTOCLEAN="yes" CBUILD="x86_64-pc-linux-gnu" CFLAGS="-march=athlon64 -O2 -pipe" CHOST="x86_64-pc-linux-gnu" CONFIG_PROTECT="/etc /usr/kde/3.5/env /usr/kde/3.5/share/config /usr/kde/3.5/shutdown /usr/share/X11/xkb /usr/share/config" CONFIG_PROTECT_MASK="/etc/env.d /etc/env.d/java/ /etc/gconf /etc/revdep-rebuild /etc/terminfo" CXXFLAGS="-march=athlon64 -O2 -pipe" DISTDIR="/distfiles" FEATURES="ccache collision-protect distlocks metadata-transfer multilib-strict sandbox sfperms strict test userpriv" GENTOO_MIRRORS="http://mirrors.acm.cs.rpi.edu/gentoo/ http://distfiles.gentoo.org/" MAKEOPTS="-j2" PKGDIR="/usr/portage/packages" PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --compress --force --whole-file --delete --delete-after --stats --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages --filter=H_**/files/digest-*" PORTAGE_TMPDIR="/var/tmp" PORTDIR="/usr/portage" PORTDIR_OVERLAY="/overlay" SYNC="rsync://kv80/gentoo-portage" USE="X acl aiglx aim amd64 berkdb bitmap-fonts branding cli cracklib crypt cups dri fortran gdbm gpm gtk iconv imap ipv6 isdnlog libg++ midi mmx mpeg3 mudflap ncurses nls nptl nptlonly nvidia opengl openmp pam pcre perl pppd python qt3 readline reflection session sockets spl sqlite3 sse sse2 ssl tcpd test truetype-fonts type1-fonts unicode vim xcomposite xine xorg zlib" ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci emu10k1x ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 intel8x0m maestro3 trident usb-audio via82xx via82xx-modem ymfpci" ALSA_PCM_PLUGINS="adpcm alaw asym copy dmix dshare dsnoop empty extplug file hooks iec958 ioplug ladspa lfloat linear meter mulaw multi null plug rate route share shm softvol" ELIBC="glibc" INPUT_DEVICES="keyboard mouse evdev" KERNEL="linux" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" USERLAND="GNU" VIDEO_CARDS="nvidia" Unset: CTARGET, EMERGE_DEFAULT_OPTS, INSTALL_MASK, LANG, LC_ALL, LDFLAGS, LINGUAS, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS nyhm@gentoo.org 2007-08-03 03:57:37 0000 /usr/portage/x11-libs/qt/qt-4.3.0-r1.ebuild: line 122: epatch/usr/portage/x11-libs/qt/files/0185-fix-format-strings.diff: No such file or directory Try again. jakub@gentoo.org 2007-08-03 07:34:17 0000 Yeah, Bug 187552... No point in stabilizing this ATM, plus it will IMO require another revbump because users silently failed to get the right patch for this issue w/ 4.3.0-r1 :( gustavoz@gentoo.org 2007-08-03 13:43:20 0000 sparc stable. carlo@gentoo.org 2007-08-03 23:45:04 0000 Sorry for the typo guys, please do qt-3.3.8-r3 (if you didn't already) and qt-4.3.0-r2. dertobi123@gentoo.org 2007-08-04 10:17:12 0000 ppc stable armin76@gentoo.org 2007-08-05 14:42:26 0000 alpha/ia64/x86 stable gustavoz@gentoo.org 2007-08-06 12:49:20 0000 sparc stable. beandog@gentoo.org 2007-08-12 14:51:52 0000 amd64 stable jer@gentoo.org 2007-08-15 14:24:29 0000 Both stable for HPPA. falco@gentoo.org 2007-08-22 22:42:19 0000 GLSA 200708-16, sorry for the delay 124945 2007-07-15 19:35 0000 CVE-2007-3388.diff CVE-2007-3388.diff text/plain LS0tIHNyYy93aWRnZXRzL3F0ZXh0ZWRpdC5jcHAJMjAwNy0wNy0xMyAwNzozODowMiAtMDAwMAor Kysgc3JjL3dpZGdldHMvcXRleHRlZGl0LmNwcAkyMDA3LTA3LTEzIDA3OjM4OjAyIC0wMDAwCgpA QCAtNjM0OSw3ICs2MzQ5LDcgQEAKIAkJICAgIGN1ciA9IHRhZy0+cHJldjsKIAkJICAgIGlmICgg IWN1ciApIHsKICNpZmRlZiBRVF9DSEVDS19SQU5HRQotCQkJcVdhcm5pbmcoICJRVGV4dEVkaXQ6 Om9wdGltUGFyc2VUYWdzOiBubyBsZWZ0LXRhZyBmb3IgJzwiICsgdGFnLT50YWcgKyAiPicgaW4g bGluZSAlZC4iLCB0YWctPmxpbmUgKyAxICk7CisJCQlxV2FybmluZyggIlFUZXh0RWRpdDo6b3B0 aW1QYXJzZVRhZ3M6IG5vIGxlZnQtdGFnIGZvciAnPCVzPicgaW4gbGluZSAlZC4iLCB0YWctPnRh Zy5hc2NpaSgpLCB0YWctPmxpbmUgKyAxICk7CiAjZW5kaWYKIAkJCXJldHVybjsgLy8gc29tZXRo aW5nIGlzIHdyb25nIC0gZ2l2ZSB1cAogCQkgICAgfQpAQCAtNjM3Miw3ICs2MzcyLDcgQEAKIAkJ CQkgICAgYnJlYWs7CiAJCQkJfSBlbHNlIGlmICggIWN1ci0+bGVmdFRhZyApIHsKICNpZmRlZiBR VF9DSEVDS19SQU5HRQotCQkJCSAgICBxV2FybmluZyggIlFUZXh0RWRpdDo6b3B0aW1QYXJzZVRh Z3M6IG1pc21hdGNoaW5nICVzLXRhZyBmb3IgJzwiICsgY3VyLT50YWcgKyAiPicgaW4gbGluZSAl ZC4iLCBjdXItPnRhZ1swXSA9PSAnLycgPyAibGVmdCIgOiAicmlnaHQiLCBjdXItPmxpbmUgKyAx ICk7CisJCQkJICAgIHFXYXJuaW5nKCAiUVRleHRFZGl0OjpvcHRpbVBhcnNlVGFnczogbWlzbWF0 Y2hpbmcgJXMtdGFnIGZvciAnPCVzPicgaW4gbGluZSAlZC4iLCBjdXItPnRhZ1swXSA9PSAnLycg PyAibGVmdCIgOiAicmlnaHQiLCBjdXItPnRhZy5hc2NpaSgpLCBjdXItPmxpbmUgKyAxICk7CiAj ZW5kaWYKIAkJCQkgICAgcmV0dXJuOyAvLyBzb21ldGhpbmcgaXMgYW1pc3MgLSBnaXZlIHVwCiAJ CQkJfQo= 124947 2007-07-15 19:37 0000 format-warnings.diff format-warnings.diff text/plain LS0tIHNxbC9xZGF0YXRhYmxlLmNwcAkJKHJldmlzaW9uIDY1ODIxMykKKysrIHNxbC9xZGF0YXRh YmxlLmNwcAkJKHdvcmtpbmcgY29weSkKQEAgLTEwNDMsOCArMTA0Myw4IEBAIGJvb2wgUURhdGFU YWJsZTo6aW5zZXJ0Q3VycmVudCgpCiAJcmV0dXJuIEZBTFNFOwogICAgIGlmICggIXNxbEN1cnNv cigpLT5jYW5JbnNlcnQoKSApIHsKICNpZmRlZiBRVF9DSEVDS19SQU5HRQotCXFXYXJuaW5nKCJR RGF0YVRhYmxlOjppbnNlcnRDdXJyZW50OiBpbnNlcnQgbm90IGFsbG93ZWQgZm9yICIgKwotCQkg c3FsQ3Vyc29yKCktPm5hbWUoKSApOworCXFXYXJuaW5nKCJRRGF0YVRhYmxlOjppbnNlcnRDdXJy ZW50OiBpbnNlcnQgbm90IGFsbG93ZWQgZm9yICVzIiwKKwkJIHNxbEN1cnNvcigpLT5uYW1lKCku bGF0aW4xKCkgKTsKICNlbmRpZgogCWVuZEluc2VydCgpOwogCXJldHVybiBGQUxTRTsKQEAgLTEx MTcsMTYgKzExMTcsMTYgQEAgYm9vbCBRRGF0YVRhYmxlOjp1cGRhdGVDdXJyZW50KCkKIAlyZXR1 cm4gRkFMU0U7CiAgICAgaWYgKCBzcWxDdXJzb3IoKS0+cHJpbWFyeUluZGV4KCkuY291bnQoKSA9 PSAwICkgewogI2lmZGVmIFFUX0NIRUNLX1JBTkdFCi0JcVdhcm5pbmcoIlFEYXRhVGFibGU6OnVw ZGF0ZUN1cnJlbnQ6IG5vIHByaW1hcnkgaW5kZXggZm9yICIgKwotCQkgc3FsQ3Vyc29yKCktPm5h bWUoKSApOworCXFXYXJuaW5nKCJRRGF0YVRhYmxlOjp1cGRhdGVDdXJyZW50OiBubyBwcmltYXJ5 IGluZGV4IGZvciAlcyIsCisJCSBzcWxDdXJzb3IoKS0+bmFtZSgpLmxhdGluMSgpICk7CiAjZW5k aWYKIAllbmRVcGRhdGUoKTsKIAlyZXR1cm4gRkFMU0U7CiAgICAgfQogICAgIGlmICggIXNxbEN1 cnNvcigpLT5jYW5VcGRhdGUoKSApIHsKICNpZmRlZiBRVF9DSEVDS19SQU5HRQotCXFXYXJuaW5n KCJRRGF0YVRhYmxlOjp1cGRhdGVDdXJyZW50OiB1cGRhdGVzIG5vdCBhbGxvd2VkIGZvciAiICsK LQkJIHNxbEN1cnNvcigpLT5uYW1lKCkgKTsKKwlxV2FybmluZygiUURhdGFUYWJsZTo6dXBkYXRl Q3VycmVudDogdXBkYXRlcyBub3QgYWxsb3dlZCBmb3IgJXMiLAorCQkgc3FsQ3Vyc29yKCktPm5h bWUoKS5sYXRpbjEoKSApOwogI2VuZGlmCiAJZW5kVXBkYXRlKCk7CiAJcmV0dXJuIEZBTFNFOwpA QCAtMTE5MSw4ICsxMTkxLDggQEAgYm9vbCBRRGF0YVRhYmxlOjpkZWxldGVDdXJyZW50KCkKIAly ZXR1cm4gRkFMU0U7CiAgICAgaWYgKCBzcWxDdXJzb3IoKS0+cHJpbWFyeUluZGV4KCkuY291bnQo KSA9PSAwICkgewogI2lmZGVmIFFUX0NIRUNLX1JBTkdFCi0JcVdhcm5pbmcoIlFEYXRhVGFibGU6 OmRlbGV0ZUN1cnJlbnQ6IG5vIHByaW1hcnkgaW5kZXggIiArCi0JCSBzcWxDdXJzb3IoKS0+bmFt ZSgpICk7CisJcVdhcm5pbmcoIlFEYXRhVGFibGU6OmRlbGV0ZUN1cnJlbnQ6IG5vIHByaW1hcnkg aW5kZXggJXMiLAorCQkgc3FsQ3Vyc29yKCktPm5hbWUoKS5sYXRpbjEoKSApOwogI2VuZGlmCiAJ cmV0dXJuIEZBTFNFOwogICAgIH0KLS0tIHNxbC9xc3FsZGF0YWJhc2UuY3BwCQkocmV2aXNpb24g NjU4MjEzKQorKysgc3FsL3FzcWxkYXRhYmFzZS5jcHAJCSh3b3JraW5nIGNvcHkpCkBAIC0yMzQs NyArMjM0LDggQEAgUVNxbERhdGFiYXNlKiBRU3FsRGF0YWJhc2VNYW5hZ2VyOjpkYXRhYgogCWRi LT5vcGVuKCk7CiAjaWZkZWYgUVRfQ0hFQ0tfUkFOR0UKIAlpZiAoICFkYi0+aXNPcGVuKCkgKQot CSAgICBxV2FybmluZygiUVNxbERhdGFiYXNlTWFuYWdlcjo6ZGF0YWJhc2U6IHVuYWJsZSB0byBv cGVuIGRhdGFiYXNlOiAiICsgZGItPmxhc3RFcnJvcigpLmRhdGFiYXNlVGV4dCgpICsgIjogIiAr IGRiLT5sYXN0RXJyb3IoKS5kcml2ZXJUZXh0KCkgKTsKKwkgICAgcVdhcm5pbmcoIlFTcWxEYXRh YmFzZU1hbmFnZXI6OmRhdGFiYXNlOiB1bmFibGUgdG8gb3BlbiBkYXRhYmFzZTogJXM6ICVzIiwK KyAgICAgICAgICAgICAgICAgICAgZGItPmxhc3RFcnJvcigpLmRhdGFiYXNlVGV4dCgpLmxhdGlu MSgpLCBkYi0+bGFzdEVycm9yKCkuZHJpdmVyVGV4dCgpLmxhdGluMSgpICk7CiAjZW5kaWYKICAg ICB9CiAgICAgcmV0dXJuIGRiOwpAQCAtNjg2LDcgKzY4Nyw3IEBAIHZvaWQgUVNxbERhdGFiYXNl Ojppbml0KCBjb25zdCBRU3RyaW5nJiAKICAgICBpZiAoICFkLT5kcml2ZXIgKSB7CiAjaWZkZWYg UVRfQ0hFQ0tfUkFOR0UKIAlxV2FybmluZyggIlFTcWxEYXRhYmFzZTogJXMgZHJpdmVyIG5vdCBs b2FkZWQiLCB0eXBlLmxhdGluMSgpICk7Ci0JcVdhcm5pbmcoICJRU3FsRGF0YWJhc2U6IGF2YWls YWJsZSBkcml2ZXJzOiAiICsgZHJpdmVycygpLmpvaW4oIiAiKSApOworCXFXYXJuaW5nKCAiUVNx bERhdGFiYXNlOiBhdmFpbGFibGUgZHJpdmVyczogJXMiLCBkcml2ZXJzKCkuam9pbigiICIpLmxh dGluMSgpICk7CiAjZW5kaWYKIAlkLT5kcml2ZXIgPSBuZXcgUU51bGxEcml2ZXIoKTsKIAlkLT5k cml2ZXItPnNldExhc3RFcnJvciggUVNxbEVycm9yKCAiRHJpdmVyIG5vdCBsb2FkZWQiLCAiRHJp dmVyIG5vdCBsb2FkZWQiICkgKTsKLS0tIHNxbC9xc3FsaW5kZXguY3BwCQkocmV2aXNpb24gNjU4 MjEzKQorKysgc3FsL3FzcWxpbmRleC5jcHAJCSh3b3JraW5nIGNvcHkpCkBAIC0yNzMsNyArMjcz LDcgQEAgUVNxbEluZGV4IFFTcWxJbmRleDo6ZnJvbVN0cmluZ0xpc3QoIGNvbgogCWlmICggZmll bGQgKQogCSAgICBuZXdTb3J0LmFwcGVuZCggKmZpZWxkLCBkZXNjICk7CiAJZWxzZQotCSAgICBx V2FybmluZyggIlFTcWxJbmRleDo6ZnJvbVN0cmluZ0xpc3Q6IHVua25vd24gZmllbGQ6ICciICsg ZiArICInIiApOworCSAgICBxV2FybmluZyggIlFTcWxJbmRleDo6ZnJvbVN0cmluZ0xpc3Q6IHVu a25vd24gZmllbGQ6ICclcyciLCBmLmxhdGluMSgpKTsKICAgICB9CiAgICAgcmV0dXJuIG5ld1Nv cnQ7CiB9Ci0tLSBzcWwvcXNxbHJlY29yZC5jcHAJCShyZXZpc2lvbiA2NTgyMTMpCisrKyBzcWwv cXNxbHJlY29yZC5jcHAJCSh3b3JraW5nIGNvcHkpCkBAIC0yOTgsNyArMjk4LDcgQEAgaW50IFFT cWxSZWNvcmQ6OnBvc2l0aW9uKCBjb25zdCBRU3RyaW5nJgogCSAgICByZXR1cm4gaTsKICAgICB9 CiAjaWZkZWYgUVRfQ0hFQ0tfUkFOR0UKLSAgICBxV2FybmluZyggIlFTcWxSZWNvcmQ6OnBvc2l0 aW9uOiB1bmFibGUgdG8gZmluZCBmaWVsZCAiICsgbmFtZSApOworICAgIHFXYXJuaW5nKCAiUVNx bFJlY29yZDo6cG9zaXRpb246IHVuYWJsZSB0byBmaW5kIGZpZWxkICVzIiwgbmFtZS5sYXRpbjEo KSApOwogI2VuZGlmCiAgICAgcmV0dXJuIC0xOwogfQpAQCAtMzEzLDcgKzMxMyw3IEBAIFFTcWxG aWVsZCogUVNxbFJlY29yZDo6ZmllbGQoIGludCBpICkKICAgICBjaGVja0RldGFjaCgpOwogICAg IGlmICggIXNoLT5kLT5jb250YWlucyggaSApICkgewogI2lmZGVmIFFUX0NIRUNLX1JBTkdFCi0J cVdhcm5pbmcoICJRU3FsUmVjb3JkOjpmaWVsZDogaW5kZXggb3V0IG9mIHJhbmdlOiAiICsgUVN0 cmluZzo6bnVtYmVyKCBpICkgKTsKKwlxV2FybmluZyggIlFTcWxSZWNvcmQ6OmZpZWxkOiBpbmRl eCBvdXQgb2YgcmFuZ2U6ICVkIiwgaSApOwogI2VuZGlmCiAJcmV0dXJuIDA7CiAgICAgfQpAQCAt MzQ0LDcgKzM0NCw3IEBAIGNvbnN0IFFTcWxGaWVsZCogUVNxbFJlY29yZDo6ZmllbGQoIGludCAK IHsKICAgICBpZiAoICFzaC0+ZC0+Y29udGFpbnMoIGkgKSApIHsKICNpZmRlZiBRVF9DSEVDS19S QU5HRQotCXFXYXJuaW5nKCAiUVNxbFJlY29yZDo6ZmllbGQ6IGluZGV4IG91dCBvZiByYW5nZTog IiArIFFTdHJpbmc6Om51bWJlciggaSApICk7CisJcVdhcm5pbmcoICJRU3FsUmVjb3JkOjpmaWVs ZDogaW5kZXggb3V0IG9mIHJhbmdlOiAlZCIsIGkgICk7CiAjZW5kaWYgLy8gUVRfQ0hFQ0tfUkFO R0UKIAlyZXR1cm4gMDsKICAgICB9Ci0tLSB0b29scy9xZ2RpY3QuY3BwCQkocmV2aXNpb24gNjU4 MjEzKQorKysgdG9vbHMvcWdkaWN0LmNwcAkJKHdvcmtpbmcgY29weSkKQEAgLTg0MywxMSArODQz LDExIEBAIHZvaWQgUUdEaWN0OjpzdGF0aXN0aWNzKCkgY29uc3QKICAgICBRU3RyaW5nIGxpbmU7 CiAgICAgbGluZS5maWxsKCAnLScsIDYwICk7CiAgICAgZG91YmxlIHJlYWwsIGlkZWFsOwotICAg IHFEZWJ1ZyggbGluZS5hc2NpaSgpICk7CisgICAgcURlYnVnKCAiJXMiLCBsaW5lLmFzY2lpKCkg KTsKICAgICBxRGVidWcoICJESUNUSU9OQVJZIFNUQVRJU1RJQ1M6IiApOwogICAgIGlmICggY291 bnQoKSA9PSAwICkgewogCXFEZWJ1ZyggIkVtcHR5ISIgKTsKLQlxRGVidWcoIGxpbmUuYXNjaWko KSApOworCXFEZWJ1ZyggIiVzIiwgbGluZS5hc2NpaSgpICk7CiAJcmV0dXJuOwogICAgIH0KICAg ICByZWFsID0gMC4wOwpAQCAtODY4LDcgKzg2OCw3IEBAIHZvaWQgUUdEaWN0OjpzdGF0aXN0aWNz KCkgY29uc3QKIAl3aGlsZSAoIGItLSApCiAJICAgICpwYnVmKysgPSAnKic7CiAJKnBidWYgPSAn XDAnOwotCXFEZWJ1ZyggYnVmICk7CisJcURlYnVnKCAiJXMiLCBidWYgKTsKIAlpKys7CiAgICAg fQogICAgIHFEZWJ1ZyggIkFycmF5IHNpemUgPSAlZCIsIHNpemUoKSApOwpAQCAtODc2LDcgKzg3 Niw3IEBAIHZvaWQgUUdEaWN0OjpzdGF0aXN0aWNzKCkgY29uc3QKICAgICBxRGVidWcoICJSZWFs IGRpc3QgID0gJWciLCByZWFsICk7CiAgICAgcURlYnVnKCAiUmFuZCBkaXN0ICA9ICVnIiwgaWRl YWwgKTsKICAgICBxRGVidWcoICJSZWFsL1JhbmQgID0gJWciLCByZWFsL2lkZWFsICk7Ci0gICAg cURlYnVnKCBsaW5lLmFzY2lpKCkgKTsKKyAgICBxRGVidWcoICIlcyIsIGxpbmUuYXNjaWkoKSAp OwogI2VuZGlmIC8vIFFUX0RFQlVHCiB9CiAKLS0tIHRvb2xzL3FnbG9iYWwuY3BwCQkocmV2aXNp b24gNjU4MjEzKQorKysgdG9vbHMvcWdsb2JhbC5jcHAJCSh3b3JraW5nIGNvcHkpCkBAIC02ODAs NyArNjgwLDcgQEAgdm9pZCBxU3lzdGVtV2FybmluZyggY29uc3QgY2hhciogbXNnLCBpbgogICAg IGlmICggY29kZSAhPSAtMSApCiAJcVdhcm5pbmcoICIlc1xuXHRFcnJvciBjb2RlICVkIC0gJXMi LCBtc2csIGNvZGUsIHN0cmVycm9yKCBjb2RlICkgKTsKICAgICBlbHNlCi0JcVdhcm5pbmcoIG1z ZyApOworCXFXYXJuaW5nKCAiJXMiLCBtc2cgKTsKICNlbmRpZgogI2Vsc2UKICAgICBRX1VOVVNF RCggbXNnICk7Ci0tLSB0b29scy9xY3N0cmluZy5oCQkocmV2aXNpb24gNjU4MjEzKQorKysgdG9v bHMvcWNzdHJpbmcuaAkJKHdvcmtpbmcgY29weSkKQEAgLTE2MSw3ICsxNjEsMTEgQEAgcHVibGlj OgogCiAgICAgUUNTdHJpbmcJY29weSgpCWNvbnN0OwogCi0gICAgUUNTdHJpbmcgICAgJnNwcmlu dGYoIGNvbnN0IGNoYXIgKmZvcm1hdCwgLi4uICk7CisgICAgUUNTdHJpbmcgICAgJnNwcmludGYo IGNvbnN0IGNoYXIgKmZvcm1hdCwgLi4uICkKKyNpZiBkZWZpbmVkKFFfQ0NfR05VKSAmJiAhZGVm aW5lZChfX0lOU1VSRV9fKQorICAgIF9fYXR0cmlidXRlX18gKChmb3JtYXQgKHByaW50ZiwgMiwg MykpKQorI2VuZGlmCisgICAgICAgIDsKIAogICAgIGludAkJZmluZCggY2hhciBjLCBpbnQgaW5k ZXg9MCwgYm9vbCBjcz1UUlVFICkgY29uc3Q7CiAgICAgaW50CQlmaW5kKCBjb25zdCBjaGFyICpz dHIsIGludCBpbmRleD0wLCBib29sIGNzPVRSVUUgKSBjb25zdDsKLS0tIHRvb2xzL3FnY2FjaGUu Y3BwCQkocmV2aXNpb24gNjU4MjEzKQorKysgdG9vbHMvcWdjYWNoZS5jcHAJCSh3b3JraW5nIGNv cHkpCkBAIC02MzgsNyArNjM4LDcgQEAgdm9pZCBRR0NhY2hlOjpzdGF0aXN0aWNzKCkgY29uc3QK ICNpZiBkZWZpbmVkKFFUX0RFQlVHKQogICAgIFFTdHJpbmcgbGluZTsKICAgICBsaW5lLmZpbGwo ICcqJywgODAgKTsKLSAgICBxRGVidWcoIGxpbmUuYXNjaWkoKSApOworICAgIHFEZWJ1ZyggIiVz IiwgbGluZS5hc2NpaSgpICk7CiAgICAgcURlYnVnKCAiQ0FDSEUgU1RBVElTVElDUzoiICk7CiAg ICAgcURlYnVnKCAiY2FjaGUgY29udGFpbnMgJWQgaXRlbSVzLCB3aXRoIGEgdG90YWwgY29zdCBv ZiAlZCIsCiAJICAgY291bnQoKSwgY291bnQoKSAhPSAxID8gInMiIDogIiIsIHRDb3N0ICk7CkBA IC02NTksNyArNjU5LDcgQEAgdm9pZCBRR0NhY2hlOjpzdGF0aXN0aWNzKCkgY29uc3QKIAkgICBs cnVMaXN0LT5kdW1wcyAhPSAxID8gImhhdmUiIDogImhhcyIsIGxydUxpc3QtPmR1bXBDb3N0cyAp OwogICAgIHFEZWJ1ZyggIlN0YXRpc3RpY3MgZnJvbSBpbnRlcm5hbCBkaWN0aW9uYXJ5IGNsYXNz OiIgKTsKICAgICBkaWN0LT5zdGF0aXN0aWNzKCk7Ci0gICAgcURlYnVnKCBsaW5lLmFzY2lpKCkg KTsKKyAgICBxRGVidWcoICIlcyIsIGxpbmUuYXNjaWkoKSApOwogI2VuZGlmCiB9CiAKLS0tIHht bC9xc3ZnZGV2aWNlLmNwcAkJKHJldmlzaW9uIDY1ODIxMykKKysrIHhtbC9xc3ZnZGV2aWNlLmNw cAkJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSw1IEBACisjaWZuZGVmIFhNTF9RU1ZHREVWSUNF LkNQUAorI2RlZmluZSBYTUxfUVNWR0RFVklDRS5DUFAKIC8qKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCiAq KiAkSWQ6IHF0L3FzdmdkZXZpY2UuY3BwICAgMy4zLjggICBlZGl0ZWQgSmFuIDExIDE0OjQ2ICQK ICoqCkBAIC05NzgsNyArOTgwLDcgQEAgYm9vbCBRU3ZnRGV2aWNlOjpwbGF5KCBjb25zdCBRRG9t Tm9kZSAmbgogCQkvLyAjIyMgY2F0Y2ggcmVmZXJlbmNlcyB0byBlbWJlZGRlZCAuc3ZnIGZpbGVz CiAJCVFQaXhtYXAgcGl4OwogCQlpZiAoICFwaXgubG9hZCggaHJlZiApICkgewotCQkgICAgcVdh cm5pbmcoICJRU3ZnRGV2aWNlOjpwbGF5OiBDb3VsZG4ndCBsb2FkIGltYWdlICIraHJlZiApOwor CQkgICAgcVdhcm5pbmcoICJRU3ZnRGV2aWNlOjpwbGF5OiBDb3VsZG4ndCBsb2FkIGltYWdlICVz IiwgaHJlZi5sYXRpbjEoKSApOwogCQkgICAgYnJlYWs7CiAJCX0KIAkJcHQtPmRyYXdQaXhtYXAo IFFSZWN0KCB4MSwgeTEsIHcsIGggKSwgcGl4ICk7CkBAIC0xMDI0LDggKzEwMjYsOCBAQCBib29s IFFTdmdEZXZpY2U6OnBsYXkoIGNvbnN0IFFEb21Ob2RlICZuCiAgICAgICAgICAgICAgICAgYnJl YWs7CiAJICAgIH0KIAljYXNlIEludmFsaWRFbGVtZW50OgotCSAgICBxV2FybmluZyggIlFTdmdE ZXZpY2U6OnBsYXk6IHVua25vd24gZWxlbWVudCB0eXBlICIgKwotCQkgICAgICBub2RlLm5vZGVO YW1lKCkgKTsKKwkgICAgcVdhcm5pbmcoICJRU3ZnRGV2aWNlOjpwbGF5OiB1bmtub3duIGVsZW1l bnQgdHlwZSAlcyIsCisJCSAgICAgIG5vZGUubm9kZU5hbWUoKS5sYXRpbjEoKSApOwogCSAgICBi cmVhazsKIAl9OwogCkBAIC0xMTExLDcgKzExMTMsNyBAQCBkb3VibGUgUVN2Z0RldmljZTo6cGFy c2VMZW4oIGNvbnN0IFFTdHJpCiB7CiAgICAgUVJlZ0V4cCByZWcoIFFTdHJpbmc6OmZyb21MYXRp bjEoIihbKy1dP1xcZCpcXC4qXFxkKltFZV0/WystXT9cXGQqKShlbXxleHxweHwlfHB0fHBjfGNt fG1tfGlufCkkIikgKTsKICAgICBpZiAoIHJlZy5zZWFyY2goIHN0ciApID09IC0xICkgewotCXFX YXJuaW5nKCAiUVN2Z0RldmljZTo6cGFyc2VMZW46IGNvdWxkbid0IHBhcnNlICIgKyBzdHIgKTsK KwlxV2FybmluZyggIlFTdmdEZXZpY2U6OnBhcnNlTGVuOiBjb3VsZG4ndCBwYXJzZSAlcyAiLCBz dHIubGF0aW4xKCkgKTsKIAlpZiAoIG9rICkKIAkgICAgKm9rID0gRkFMU0U7CiAJcmV0dXJuIDAu MDsKQEAgLTExNDAsNyArMTE0Miw3IEBAIGRvdWJsZSBRU3ZnRGV2aWNlOjpwYXJzZUxlbiggY29u c3QgUVN0cmkKIAllbHNlIGlmICggdSA9PSAicGMiICkKIAkgICAgZGJsICo9IG0ubG9naWNhbERw aVgoKSAvIDYuMDsKIAllbHNlCi0JICAgIHFXYXJuaW5nKCAiUVN2Z0RldmljZTo6cGFyc2VMZW46 IFVua25vd24gdW5pdCAiICsgdSApOworCSAgICBxV2FybmluZyggIlFTdmdEZXZpY2U6OnBhcnNl TGVuOiBVbmtub3duIHVuaXQgJXMiLCAgdS5sYXRpbjEoKSApOwogICAgIH0KICAgICBpZiAoIG9r ICkKIAkqb2sgPSBUUlVFOwpAQCAtMTU4NiwzICsxNTg4LDQgQEAgdm9pZCBRU3ZnRGV2aWNlOjph cHBseVRyYW5zZm9ybSggUURvbUVsZQogfQogCiAjZW5kaWYgLy8gUVRfTk9fU1ZHCisjZW5kaWYg Ly8gWE1MX1FTVkdERVZJQ0UuQ1BQCi0tLSB3aWRnZXRzL3FoZWFkZXIuY3BwCQkocmV2aXNpb24g NjU4MjEzKQorKysgd2lkZ2V0cy9xaGVhZGVyLmNwcAkJKHdvcmtpbmcgY29weSkKQEAgLTE4NzMs MTAgKzE4NzMsOCBAQCB2b2lkIFFIZWFkZXI6OnNldFVwZGF0ZXNFbmFibGVkKCBib29sIGVuCiAK IGJvb2wgUUhlYWRlcjo6cmV2ZXJzZSAoKSBjb25zdAogewotI2lmIDAKKyNpZiAxCiAgICAgcmV0 dXJuICggb3JpZW50ID09IFF0OjpIb3Jpem9udGFsICYmIFFBcHBsaWNhdGlvbjo6cmV2ZXJzZUxh eW91dCgpICk7Ci0jZWxzZQotICAgIHJldHVybiBGQUxTRTsKICNlbmRpZgogfQo= 125619 2007-07-22 08:08 0000 qt_patch.diff qt_patch.diff text/plain LS0tIC8vZGVwb3QvcXQvMy9zcmMvd2lkZ2V0cy9xdGV4dGVkaXQuY3BwCU1vbiBKdWwgMTYgMTA6 NDQ6NDAgQ0VTVCAyMDA3CisrKyAvL2RlcG90L3F0LzMvc3JjL3dpZGdldHMvcXRleHRlZGl0LmNw cAlNb24gSnVsIDE2IDEwOjQ0OjQwIENFU1QgMjAwNwoKQEAgLTYzNDksNyArNjM0OSw3IEBACiAJ CSAgICBjdXIgPSB0YWctPnByZXY7CiAJCSAgICBpZiAoICFjdXIgKSB7CiAjaWZkZWYgUVRfQ0hF Q0tfUkFOR0UKLQkJCXFXYXJuaW5nKCAiUVRleHRFZGl0OjpvcHRpbVBhcnNlVGFnczogbm8gbGVm dC10YWcgZm9yICc8IiArIHRhZy0+dGFnICsgIj4nIGluIGxpbmUgJWQuIiwgdGFnLT5saW5lICsg MSApOworCQkJcVdhcm5pbmcoICJRVGV4dEVkaXQ6Om9wdGltUGFyc2VUYWdzOiBubyBsZWZ0LXRh ZyBmb3IgJzwlcz4nIGluIGxpbmUgJWQuIiwgdGFnLT50YWcuYXNjaWkoKSwgdGFnLT5saW5lICsg MSApOwogI2VuZGlmCiAJCQlyZXR1cm47IC8vIHNvbWV0aGluZyBpcyB3cm9uZyAtIGdpdmUgdXAK IAkJICAgIH0KQEAgLTYzNzIsNyArNjM3Miw3IEBACiAJCQkJICAgIGJyZWFrOwogCQkJCX0gZWxz ZSBpZiAoICFjdXItPmxlZnRUYWcgKSB7CiAjaWZkZWYgUVRfQ0hFQ0tfUkFOR0UKLQkJCQkgICAg cVdhcm5pbmcoICJRVGV4dEVkaXQ6Om9wdGltUGFyc2VUYWdzOiBtaXNtYXRjaGluZyAlcy10YWcg Zm9yICc8IiArIGN1ci0+dGFnICsgIj4nIGluIGxpbmUgJWQuIiwgY3VyLT50YWdbMF0gPT0gJy8n ID8gImxlZnQiIDogInJpZ2h0IiwgY3VyLT5saW5lICsgMSApOworCQkJCSAgICBxV2FybmluZygg IlFUZXh0RWRpdDo6b3B0aW1QYXJzZVRhZ3M6IG1pc21hdGNoaW5nICVzLXRhZyBmb3IgJzwlcz4n IGluIGxpbmUgJWQuIiwgY3VyLT50YWdbMF0gPT0gJy8nID8gImxlZnQiIDogInJpZ2h0IiwgY3Vy LT50YWcuYXNjaWkoKSwgY3VyLT5saW5lICsgMSApOwogI2VuZGlmCiAJCQkJICAgIHJldHVybjsg Ly8gc29tZXRoaW5nIGlzIGFtaXNzIC0gZ2l2ZSB1cAogCQkJCX0KLS0tIC8vZGVwb3QvcXQvMy9z cmMvc3FsL3FkYXRhdGFibGUuY3BwCU1vbiBKdWwgMTYgMTA6NDU6MDMgQ0VTVCAyMDA3CisrKyAv L2RlcG90L3F0LzMvc3JjL3NxbC9xZGF0YXRhYmxlLmNwcAlNb24gSnVsIDE2IDEwOjQ1OjAzIENF U1QgMjAwNwoKQEAgLTEwNDMsOCArMTA0Myw4IEBACiAJcmV0dXJuIEZBTFNFOwogICAgIGlmICgg IXNxbEN1cnNvcigpLT5jYW5JbnNlcnQoKSApIHsKICNpZmRlZiBRVF9DSEVDS19SQU5HRQotCXFX YXJuaW5nKCJRRGF0YVRhYmxlOjppbnNlcnRDdXJyZW50OiBpbnNlcnQgbm90IGFsbG93ZWQgZm9y ICIgKwotCQkgc3FsQ3Vyc29yKCktPm5hbWUoKSApOworCXFXYXJuaW5nKCJRRGF0YVRhYmxlOjpp bnNlcnRDdXJyZW50OiBpbnNlcnQgbm90IGFsbG93ZWQgZm9yICVzIiwKKwkJIHNxbEN1cnNvcigp LT5uYW1lKCkubGF0aW4xKCkgKTsKICNlbmRpZgogCWVuZEluc2VydCgpOwogCXJldHVybiBGQUxT RTsKQEAgLTExMTcsMTYgKzExMTcsMTYgQEAKIAlyZXR1cm4gRkFMU0U7CiAgICAgaWYgKCBzcWxD dXJzb3IoKS0+cHJpbWFyeUluZGV4KCkuY291bnQoKSA9PSAwICkgewogI2lmZGVmIFFUX0NIRUNL X1JBTkdFCi0JcVdhcm5pbmcoIlFEYXRhVGFibGU6OnVwZGF0ZUN1cnJlbnQ6IG5vIHByaW1hcnkg aW5kZXggZm9yICIgKwotCQkgc3FsQ3Vyc29yKCktPm5hbWUoKSApOworCXFXYXJuaW5nKCJRRGF0 YVRhYmxlOjp1cGRhdGVDdXJyZW50OiBubyBwcmltYXJ5IGluZGV4IGZvciAlcyIsCisJCSBzcWxD dXJzb3IoKS0+bmFtZSgpLmxhdGluMSgpICk7CiAjZW5kaWYKIAllbmRVcGRhdGUoKTsKIAlyZXR1 cm4gRkFMU0U7CiAgICAgfQogICAgIGlmICggIXNxbEN1cnNvcigpLT5jYW5VcGRhdGUoKSApIHsK ICNpZmRlZiBRVF9DSEVDS19SQU5HRQotCXFXYXJuaW5nKCJRRGF0YVRhYmxlOjp1cGRhdGVDdXJy ZW50OiB1cGRhdGVzIG5vdCBhbGxvd2VkIGZvciAiICsKLQkJIHNxbEN1cnNvcigpLT5uYW1lKCkg KTsKKwlxV2FybmluZygiUURhdGFUYWJsZTo6dXBkYXRlQ3VycmVudDogdXBkYXRlcyBub3QgYWxs b3dlZCBmb3IgJXMiLAorCQkgc3FsQ3Vyc29yKCktPm5hbWUoKS5sYXRpbjEoKSApOwogI2VuZGlm CiAJZW5kVXBkYXRlKCk7CiAJcmV0dXJuIEZBTFNFOwpAQCAtMTE5MSw4ICsxMTkxLDggQEAKIAly ZXR1cm4gRkFMU0U7CiAgICAgaWYgKCBzcWxDdXJzb3IoKS0+cHJpbWFyeUluZGV4KCkuY291bnQo KSA9PSAwICkgewogI2lmZGVmIFFUX0NIRUNLX1JBTkdFCi0JcVdhcm5pbmcoIlFEYXRhVGFibGU6 OmRlbGV0ZUN1cnJlbnQ6IG5vIHByaW1hcnkgaW5kZXggIiArCi0JCSBzcWxDdXJzb3IoKS0+bmFt ZSgpICk7CisJcVdhcm5pbmcoIlFEYXRhVGFibGU6OmRlbGV0ZUN1cnJlbnQ6IG5vIHByaW1hcnkg aW5kZXggJXMiLAorCQkgc3FsQ3Vyc29yKCktPm5hbWUoKS5sYXRpbjEoKSApOwogI2VuZGlmCiAJ cmV0dXJuIEZBTFNFOwogICAgIH0KCi0tLSAvL2RlcG90L3F0LzMvc3JjL3NxbC9xc3FsZGF0YWJh c2UuY3BwCU1vbiBKdWwgMTYgMTA6NDU6MDMgQ0VTVCAyMDA3CisrKyAvL2RlcG90L3F0LzMvc3Jj L3NxbC9xc3FsZGF0YWJhc2UuY3BwCU1vbiBKdWwgMTYgMTA6NDU6MDMgQ0VTVCAyMDA3CgpAQCAt MjM0LDcgKzIzNCw4IEBACiAJZGItPm9wZW4oKTsKICNpZmRlZiBRVF9DSEVDS19SQU5HRQogCWlm ICggIWRiLT5pc09wZW4oKSApCi0JICAgIHFXYXJuaW5nKCJRU3FsRGF0YWJhc2VNYW5hZ2VyOjpk YXRhYmFzZTogdW5hYmxlIHRvIG9wZW4gZGF0YWJhc2U6ICIgKyBkYi0+bGFzdEVycm9yKCkuZGF0 YWJhc2VUZXh0KCkgKyAiOiAiICsgZGItPmxhc3RFcnJvcigpLmRyaXZlclRleHQoKSApOworCSAg ICBxV2FybmluZygiUVNxbERhdGFiYXNlTWFuYWdlcjo6ZGF0YWJhc2U6IHVuYWJsZSB0byBvcGVu IGRhdGFiYXNlOiAlczogJXMiLAorICAgICAgICAgICAgICAgICAgICBkYi0+bGFzdEVycm9yKCku ZGF0YWJhc2VUZXh0KCkubGF0aW4xKCksIGRiLT5sYXN0RXJyb3IoKS5kcml2ZXJUZXh0KCkubGF0 aW4xKCkgKTsKICNlbmRpZgogICAgIH0KICAgICByZXR1cm4gZGI7CkBAIC02ODYsNyArNjg3LDcg QEAKICAgICBpZiAoICFkLT5kcml2ZXIgKSB7CiAjaWZkZWYgUVRfQ0hFQ0tfUkFOR0UKIAlxV2Fy bmluZyggIlFTcWxEYXRhYmFzZTogJXMgZHJpdmVyIG5vdCBsb2FkZWQiLCB0eXBlLmxhdGluMSgp ICk7Ci0JcVdhcm5pbmcoICJRU3FsRGF0YWJhc2U6IGF2YWlsYWJsZSBkcml2ZXJzOiAiICsgZHJp dmVycygpLmpvaW4oIiAiKSApOworCXFXYXJuaW5nKCAiUVNxbERhdGFiYXNlOiBhdmFpbGFibGUg ZHJpdmVyczogJXMiLCBkcml2ZXJzKCkuam9pbigiICIpLmxhdGluMSgpICk7CiAjZW5kaWYKIAlk LT5kcml2ZXIgPSBuZXcgUU51bGxEcml2ZXIoKTsKIAlkLT5kcml2ZXItPnNldExhc3RFcnJvcigg UVNxbEVycm9yKCAiRHJpdmVyIG5vdCBsb2FkZWQiLCAiRHJpdmVyIG5vdCBsb2FkZWQiICkgKTsK Ci0tLSAvL2RlcG90L3F0LzMvc3JjL3NxbC9xc3FsaW5kZXguY3BwCU1vbiBKdWwgMTYgMTA6NDU6 MDMgQ0VTVCAyMDA3CisrKyAvL2RlcG90L3F0LzMvc3JjL3NxbC9xc3FsaW5kZXguY3BwCU1vbiBK dWwgMTYgMTA6NDU6MDMgQ0VTVCAyMDA3CgpAQCAtMjczLDcgKzI3Myw3IEBACiAJaWYgKCBmaWVs ZCApCiAJICAgIG5ld1NvcnQuYXBwZW5kKCAqZmllbGQsIGRlc2MgKTsKIAllbHNlCi0JICAgIHFX YXJuaW5nKCAiUVNxbEluZGV4Ojpmcm9tU3RyaW5nTGlzdDogdW5rbm93biBmaWVsZDogJyIgKyBm ICsgIiciICk7CisJICAgIHFXYXJuaW5nKCAiUVNxbEluZGV4Ojpmcm9tU3RyaW5nTGlzdDogdW5r bm93biBmaWVsZDogJyVzJyIsIGYubGF0aW4xKCkpOwogICAgIH0KICAgICByZXR1cm4gbmV3U29y dDsKIH0KCi0tLSAvL2RlcG90L3F0LzMvc3JjL3NxbC9xc3FscmVjb3JkLmNwcAlNb24gSnVsIDE2 IDEwOjQ1OjAzIENFU1QgMjAwNworKysgLy9kZXBvdC9xdC8zL3NyYy9zcWwvcXNxbHJlY29yZC5j cHAJTW9uIEp1bCAxNiAxMDo0NTowMyBDRVNUIDIwMDcKCkBAIC0yOTgsNyArMjk4LDcgQEAKIAkg ICAgcmV0dXJuIGk7CiAgICAgfQogI2lmZGVmIFFUX0NIRUNLX1JBTkdFCi0gICAgcVdhcm5pbmco ICJRU3FsUmVjb3JkOjpwb3NpdGlvbjogdW5hYmxlIHRvIGZpbmQgZmllbGQgIiArIG5hbWUgKTsK KyAgICBxV2FybmluZyggIlFTcWxSZWNvcmQ6OnBvc2l0aW9uOiB1bmFibGUgdG8gZmluZCBmaWVs ZCAlcyIsIG5hbWUubGF0aW4xKCkgKTsKICNlbmRpZgogICAgIHJldHVybiAtMTsKIH0KQEAgLTMx Myw3ICszMTMsNyBAQAogICAgIGNoZWNrRGV0YWNoKCk7CiAgICAgaWYgKCAhc2gtPmQtPmNvbnRh aW5zKCBpICkgKSB7CiAjaWZkZWYgUVRfQ0hFQ0tfUkFOR0UKLQlxV2FybmluZyggIlFTcWxSZWNv cmQ6OmZpZWxkOiBpbmRleCBvdXQgb2YgcmFuZ2U6ICIgKyBRU3RyaW5nOjpudW1iZXIoIGkgKSAp OworCXFXYXJuaW5nKCAiUVNxbFJlY29yZDo6ZmllbGQ6IGluZGV4IG91dCBvZiByYW5nZTogJWQi LCBpICk7CiAjZW5kaWYKIAlyZXR1cm4gMDsKICAgICB9CkBAIC0zNDQsNyArMzQ0LDcgQEAKIHsK ICAgICBpZiAoICFzaC0+ZC0+Y29udGFpbnMoIGkgKSApIHsKICNpZmRlZiBRVF9DSEVDS19SQU5H RQotCXFXYXJuaW5nKCAiUVNxbFJlY29yZDo6ZmllbGQ6IGluZGV4IG91dCBvZiByYW5nZTogIiAr IFFTdHJpbmc6Om51bWJlciggaSApICk7CisJcVdhcm5pbmcoICJRU3FsUmVjb3JkOjpmaWVsZDog aW5kZXggb3V0IG9mIHJhbmdlOiAlZCIsIGkgICk7CiAjZW5kaWYgLy8gUVRfQ0hFQ0tfUkFOR0UK IAlyZXR1cm4gMDsKICAgICB9CgotLS0gLy9kZXBvdC9xdC8zL3NyYy90b29scy9xZ2xvYmFsLmNw cAlNb24gSnVsIDE2IDEwOjQ1OjAzIENFU1QgMjAwNworKysgLy9kZXBvdC9xdC8zL3NyYy90b29s cy9xZ2xvYmFsLmNwcAlNb24gSnVsIDE2IDEwOjQ1OjAzIENFU1QgMjAwNwoKQEAgLTY4MCw3ICs2 ODAsNyBAQAogICAgIGlmICggY29kZSAhPSAtMSApCiAJcVdhcm5pbmcoICIlc1xuXHRFcnJvciBj b2RlICVkIC0gJXMiLCBtc2csIGNvZGUsIHN0cmVycm9yKCBjb2RlICkgKTsKICAgICBlbHNlCi0J cVdhcm5pbmcoIG1zZyApOworCXFXYXJuaW5nKCAiJXMiLCBtc2cgKTsKICNlbmRpZgogI2Vsc2UK ICAgICBRX1VOVVNFRCggbXNnICk7CgotLS0gLy9kZXBvdC9xdC8zL3NyYy94bWwvcXN2Z2Rldmlj ZS5jcHAJTW9uIEp1bCAxNiAxMDo0NTowMyBDRVNUIDIwMDcKKysrIC8vZGVwb3QvcXQvMy9zcmMv eG1sL3FzdmdkZXZpY2UuY3BwCU1vbiBKdWwgMTYgMTA6NDU6MDMgQ0VTVCAyMDA3CgpAQCAtOTc4 LDcgKzk3OCw3IEBACiAJCS8vICMjIyBjYXRjaCByZWZlcmVuY2VzIHRvIGVtYmVkZGVkIC5zdmcg ZmlsZXMKIAkJUVBpeG1hcCBwaXg7CiAJCWlmICggIXBpeC5sb2FkKCBocmVmICkgKSB7Ci0JCSAg ICBxV2FybmluZyggIlFTdmdEZXZpY2U6OnBsYXk6IENvdWxkbid0IGxvYWQgaW1hZ2UgIitocmVm ICk7CisJCSAgICBxV2FybmluZyggIlFTdmdEZXZpY2U6OnBsYXk6IENvdWxkbid0IGxvYWQgaW1h Z2UgJXMiLCBocmVmLmxhdGluMSgpICk7CiAJCSAgICBicmVhazsKIAkJfQogCQlwdC0+ZHJhd1Bp eG1hcCggUVJlY3QoIHgxLCB5MSwgdywgaCApLCBwaXggKTsKQEAgLTEwMjQsOCArMTAyNCw4IEBA CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAJICAgIH0KIAljYXNlIEludmFsaWRFbGVtZW50Ogot CSAgICBxV2FybmluZyggIlFTdmdEZXZpY2U6OnBsYXk6IHVua25vd24gZWxlbWVudCB0eXBlICIg KwotCQkgICAgICBub2RlLm5vZGVOYW1lKCkgKTsKKwkgICAgcVdhcm5pbmcoICJRU3ZnRGV2aWNl OjpwbGF5OiB1bmtub3duIGVsZW1lbnQgdHlwZSAlcyIsCisJCSAgICAgIG5vZGUubm9kZU5hbWUo KS5sYXRpbjEoKSApOwogCSAgICBicmVhazsKIAl9OwogCkBAIC0xMTExLDcgKzExMTEsNyBAQAog ewogICAgIFFSZWdFeHAgcmVnKCBRU3RyaW5nOjpmcm9tTGF0aW4xKCIoWystXT9cXGQqXFwuKlxc ZCpbRWVdP1srLV0/XFxkKikoZW18ZXh8cHh8JXxwdHxwY3xjbXxtbXxpbnwpJCIpICk7CiAgICAg aWYgKCByZWcuc2VhcmNoKCBzdHIgKSA9PSAtMSApIHsKLQlxV2FybmluZyggIlFTdmdEZXZpY2U6 OnBhcnNlTGVuOiBjb3VsZG4ndCBwYXJzZSAiICsgc3RyICk7CisJcVdhcm5pbmcoICJRU3ZnRGV2 aWNlOjpwYXJzZUxlbjogY291bGRuJ3QgcGFyc2UgJXMgIiwgc3RyLmxhdGluMSgpICk7CiAJaWYg KCBvayApCiAJICAgICpvayA9IEZBTFNFOwogCXJldHVybiAwLjA7CkBAIC0xMTQwLDcgKzExNDAs NyBAQAogCWVsc2UgaWYgKCB1ID09ICJwYyIgKQogCSAgICBkYmwgKj0gbS5sb2dpY2FsRHBpWCgp IC8gNi4wOwogCWVsc2UKLQkgICAgcVdhcm5pbmcoICJRU3ZnRGV2aWNlOjpwYXJzZUxlbjogVW5r bm93biB1bml0ICIgKyB1ICk7CisJICAgIHFXYXJuaW5nKCAiUVN2Z0RldmljZTo6cGFyc2VMZW46 IFVua25vd24gdW5pdCAlcyIsICB1LmxhdGluMSgpICk7CiAgICAgfQogICAgIGlmICggb2sgKQog CSpvayA9IFRSVUU7Cg==