128351 2006-04-01 00:58 0000 Cheesetracker fails to compile with GCC 4.1 2006-04-18 11:24:44 0000 1 1 1 Unclassified Gentoo Linux GCC Porting 2006.0 All Linux RESOLVED FIXED P2 normal --- 117482 1 rmmarm@sdf.lonestar.org sound@gentoo.org dirtyepic@gentoo.org rmmarm@sdf.lonestar.org 2006-04-01 00:58:38 0000 When emerging cheesetracker with GCC-4.1, compilation fails with several extra-qualifier errors and a few namespace glitches. I will attach a patch that fixes many of these problems. Gentoo Base System version 1.12.0_pre16 Portage 2.1_pre7-r2 (default-linux/x86/2006.0, gcc-4.1.0, glibc-2.4-r1, 2.6.16-gentoo i686) ================================================================= System uname: 2.6.16-gentoo i686 AMD Athlon(tm) XP 2200+ distcc 2.18.3 i686-pc-linux-gnu (protocols 1 and 2) (default port 3632) [disabled] ccache version 2.4 [enabled] dev-lang/python: 2.3.5, 2.4.2-r1 sys-apps/sandbox: 1.2.17 sys-devel/autoconf: 2.13, 2.59-r7 sys-devel/automake: 1.4_p6, 1.5, 1.6.3, 1.7.9-r1, 1.8.5-r3, 1.9.6-r2 sys-devel/binutils: 2.16.1-r2 sys-devel/libtool: 1.5.22 virtual/os-headers: 2.6.11-r3 ACCEPT_KEYWORDS="x86 ~x86" AUTOCLEAN="yes" CBUILD="i686-pc-linux-gnu" CFLAGS="-O2 -march=athlon-xp -pipe -fomit-frame-pointer" CHOST="i686-pc-linux-gnu" CONFIG_PROTECT="/etc /usr/kde/2/share/config /usr/kde/3.5/env /usr/kde/3.5/share/config /usr/kde/3.5/shutdown /usr/kde/3/share/config /usr/lib/mozilla/defaults/pref /usr/share/X11/xkb /usr/share/config /var/bind /var/qmail/control" CONFIG_PROTECT_MASK="/etc/gconf /etc/revdep-rebuild /etc/terminfo /etc/texmf/web2c /etc/env.d" CXXFLAGS="-O2 -march=athlon-xp -pipe -fomit-frame-pointer" DISTDIR="/usr/portage/distfiles" FEATURES="autoconfig ccache distlocks gentrip metadata-transfer sandbox sfperms strict" GENTOO_MIRRORS="http://distfiles.gentoo.org http://distro.ibiblio.org/pub/linux/distributions/gentoo" LINGUAS="en he grc" MAKEOPTS="" PKGDIR="/usr/portage/packages" PORTAGE_TMPDIR="/var/tmp" PORTDIR="/usr/portage" PORTDIR_OVERLAY="/usr/local/portage" SYNC="rsync://rsync.gentoo.org/gentoo-portage" USE="x86 3dnow X Xaw3d aalib acpi ada aim alsa apache apache2 apm asf audiofile avi berkdb bidi bindist bitmap-fonts browserplugin bzip2 calendar cdr cli crypt cscope ctype cups curl curlwrappers dba dedicated dga dio divx4linux doc dri dvd dvdr eds emboss encode esd expat fastbuild fastcgi ffmpeg fftw firefox flac flash flatfile foomatic foomaticdb force-cgi-redirect fortran ftp gb gcj gd gdbm ggi gif gmp gphoto2 gpm gstreamer gtk gtk2 hal iconv icq imagemagick imap imlib ipv6 isdnlog jabber jack java jikes jpeg kde kdexdeltas ladcca lcms ldap libg++ libwww mad mbox mcal memlimit mikmod mime ming mmap mmx mng motif mozcalendar mozilla mp3 mpeg mysql mysqli nas ncurses network new-login nls nocd nptl nptlonly nsplugin objc ogg oggvorbis openal opengl oscar oss pam pcntl pcre pda pdf pdflib perl php pie plotutils plugin png posix postgres ppds pppd python qt quicktime quotes readline sasl scanner sdl session shared simplexml slang soap sockets softmmu speex spell spl sse ssl svg sysvipc szip tcltk tcpd tetex theora tidy tiff tokenizer truetype truetype-fonts type1-fonts udev unicode usb v4l v4l2 videos vorbis win32codecs wmf wxwindows xcomposite xine xinerama xml xml2 xmms xpm xscreensaver xsl xv xvid yahoo zlib elibc_glibc input_devices_keyboard input_devices_mouse kernel_linux linguas_en linguas_he linguas_grc userland_GNU video_cards_nvidia" Unset: ASFLAGS, CTARGET, EMERGE_DEFAULT_OPTS, LANG, LC_ALL, LDFLAGS rmmarm@sdf.lonestar.org 2006-04-01 00:59:31 0000 Created an attachment (id=83590) Proposed patch for compiling cheesetracker with GCC-4.1 dirtyepic@gentoo.org 2006-04-01 20:53:54 0000 this isn't a patch ;) rmmarm@sdf.lonestar.org 2006-04-02 00:26:37 0000 Created an attachment (id=83694) The REAL patch file Oops. Sorry about that. Here's the real file. flameeyes@gentoo.org 2006-04-18 11:24:44 0000 Thanks for the patch, added to portage. 83590 2006-04-01 00:59 0000 Proposed patch for compiling cheesetracker with GCC-4.1 cheesetracker-0.9.9.ebuild text/plain IyBDb3B5cmlnaHQgMTk5OS0yMDA2IEdlbnRvbyBGb3VuZGF0aW9uCiMgRGlzdHJpYnV0ZWQgdW5k ZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2MgojICRIZWFk ZXI6IC92YXIvY3Zzcm9vdC9nZW50b28teDg2L21lZGlhLXNvdW5kL2NoZWVzZXRyYWNrZXIvY2hl ZXNldHJhY2tlci0wLjkuOS5lYnVpbGQsdiAxLjEzIDIwMDYvMDIvMDcgMjE6NDY6MjYgYWdyaWZm aXMgRXhwICQKCmluaGVyaXQgZXV0aWxzCgpERVNDUklQVElPTj0iQSBjbG9uZSBvZiBJbXB1bHNl IFRyYWNrZXIgd2l0aCBzb21lIGV4dGVuc2lvbnMgYW5kIGEgYnVpbHQtaW4gc2FtcGxlIGVkaXRv cjsgdXNlcyBRVCIKSE9NRVBBR0U9Imh0dHA6Ly9jaGVlc2V0cm9uaWMuc2YubmV0LyIKU1JDX1VS ST0ibWlycm9yOi8vc291cmNlZm9yZ2UvY2hlZXNldHJvbmljLyR7UH0udGFyLmd6IgoKTElDRU5T RT0iR1BMLTIiClNMT1Q9IjAiCktFWVdPUkRTPSJhbHBoYSBhbWQ2NCB+cHBjIHNwYXJjIHg4NiIK SVVTRT0iamFjayIKClJERVBFTkQ9ImphY2s/ICggbWVkaWEtc291bmQvamFjay1hdWRpby1jb25u ZWN0aW9uLWtpdCApCgk9ZGV2LWxpYnMvbGlic2lnYysrLTEuMioKCT14MTEtbGlicy9xdC0zKiIK REVQRU5EPSIke1JERVBFTkR9Cgk+PWRldi11dGlsL3Njb25zLTAuOTQtcjIiCgpzcmNfdW5wYWNr KCkgewoJdW5wYWNrICR7QX0KCWVwYXRjaCAke0ZJTEVTRElSfS8ke1B9LTY0Yml0LWNsZWFuLmRp ZmYKCWVwYXRjaCAke0ZJTEVTRElSfS8ke1B9LWdjYzQuZGlmZgp9CgpzcmNfY29tcGlsZSgpIHsK CXNjb25zIHx8IGRpZQp9CgpzcmNfaW5zdGFsbCgpIHsKCWRvZGlyIC91c3IvYmluCglzY29ucyBw cmVmaXg9JHtEfS91c3IgaW5zdGFsbCB8fCBkaWUKCWRvZG9jIEFVVEhPUlMgQ2hhbmdlTG9nIE5F V1MgUkVBRE1FIFRPRE8gZG9jcy8qLnR4dAp9Cg== 83694 2006-04-02 00:26 0000 The REAL patch file cheesetracker-0.9.9-gcc4.diff text/plain ZGlmZiAtTmF1ciBjaGVlc2V0cmFja2VyLTAuOS45Lm9sZC9jaGVlc2V0cmFja2VyL2ludGVyZmFj ZV9fUVQvaW50ZXJmYWNlLmNwcCBjaGVlc2V0cmFja2VyLTAuOS45L2NoZWVzZXRyYWNrZXIvaW50 ZXJmYWNlX19RVC9pbnRlcmZhY2UuY3BwCi0tLSBjaGVlc2V0cmFja2VyLTAuOS45Lm9sZC9jaGVl c2V0cmFja2VyL2ludGVyZmFjZV9fUVQvaW50ZXJmYWNlLmNwcAkyMDA2LTA0LTAxIDAwOjAzOjQ0 LjAwMDAwMDAwMCAtMDUwMAorKysgY2hlZXNldHJhY2tlci0wLjkuOS9jaGVlc2V0cmFja2VyL2lu dGVyZmFjZV9fUVQvaW50ZXJmYWNlLmNwcAkyMDA2LTA0LTAxIDAwOjAzOjQzLjAwMDAwMDAwMCAt MDUwMApAQCAtNDIsNyArNDIsNyBAQAogI2luY2x1ZGUgPHFtZXNzYWdlYm94Lmg+CiAKIAotU2F2 ZXI6OkVycm9yICBJbnRlcmZhY2U6OnNhdmVfc29uZygpIHsKK0F1ZGlvOjpTYXZlcjo6RXJyb3Ig IEludGVyZmFjZTo6c2F2ZV9zb25nKCkgewogCiAJRklMRSAqZj1mb3Blbih0cmFja2VyLnNvbmcu dmFyaWFibGVzLmZpbGVuYW1lLmNfc3RyKCksInJiIik7CiAJaWYgKCFmKSB7IC8vZmlsZSBkb2Vz bnQgZXhpc3QsIGNhbnQgZG8gZGlyZWN0IHNhdmUKQEAgLTUzLDE0ICs1MywxNCBAQAogICAgICAg ICBpZiAodHJhY2tlci5mb3JtYXRfbWFuYWdlci5zYXZlX21vZHVsZSh0cmFja2VyLnNvbmcudmFy aWFibGVzLmZpbGVuYW1lLmNfc3RyKCkpKSB7CiAKIAkJUU1lc3NhZ2VCb3g6Ondhcm5pbmcoIHRo aXMsICJPb3BzISIsIkVycm9yIHNhdmluZyBzb25nISIsIk9rIik7Ci0JCXJldHVybiBTYXZlcjo6 U0FWRV9FUlJPUjsKKwkJcmV0dXJuIEF1ZGlvOjpTYXZlcjo6U0FWRV9FUlJPUjsKIAl9CiAKLQly ZXR1cm4gU2F2ZXI6OlNBVkVfT0s7CisJcmV0dXJuIEF1ZGlvOjpTYXZlcjo6U0FWRV9PSzsKIAog fQogCi1TYXZlcjo6RXJyb3IgIEludGVyZmFjZTo6c2F2ZV9zb25nX2FzKCkgeworQXVkaW86OlNh dmVyOjpFcnJvciAgSW50ZXJmYWNlOjpzYXZlX3NvbmdfYXMoKSB7CiAKIAlRU3RyaW5nIHM9UVN0 cmluZzo6bnVsbDsKIApAQCAtODcsNyArODcsNyBAQAogCiAKIAlpZiAocz09UVN0cmluZzo6bnVs bCkKLQkJcmV0dXJuIFNhdmVyOjpTQVZFX09LOyAvL25vdGhpbmcgc2VsZWN0ZWQKKwkJcmV0dXJu IEF1ZGlvOjpTYXZlcjo6U0FWRV9PSzsgLy9ub3RoaW5nIHNlbGVjdGVkCiAKIAogCkBAIC05Nywx OSArOTcsMTkgQEAKIAkJaWYgKCBRTWVzc2FnZUJveDo6d2FybmluZyggdGhpcywgIlF1ZXN0aW9u OiIsIkZpbGUgZXhpc3RzISBPdmVyd3JpdGU/IiwiWWVzIiwgIk5vIikgKSB7CiAKIC8vCQkJLy9w cmludGYoIkxlYXZpbmcgZmlsZSBhbG9uZSFcbiIpOwotCQkJcmV0dXJuIFNhdmVyOjpTQVZFX09L OworCQkJcmV0dXJuIEF1ZGlvOjpTYXZlcjo6U0FWRV9PSzsKIAkJfQogCX0KIAogICAgICAgICBp ZiAodHJhY2tlci5mb3JtYXRfbWFuYWdlci5zYXZlX21vZHVsZShzLmFzY2lpKCkpKSB7CiAKIAkJ UU1lc3NhZ2VCb3g6Ondhcm5pbmcoIHRoaXMsICJPb3BzISIsIkVycm9yIHNhdmluZyBzb25nISIs Ik9rIik7Ci0JCXJldHVybiBTYXZlcjo6U0FWRV9FUlJPUjsKKwkJcmV0dXJuIEF1ZGlvOjpTYXZl cjo6U0FWRV9FUlJPUjsKIAl9CiAKIAl0cmFja2VyLnNvbmcudmFyaWFibGVzLmZpbGVuYW1lPXMu YXNjaWkoKTsKIAotCXJldHVybiBTYXZlcjo6U0FWRV9PSzsKKwlyZXR1cm4gQXVkaW86OlNhdmVy OjpTQVZFX09LOwogfQogCiBzdHJpbmcgSW50ZXJmYWNlOjpnZXRfc29uZ19uYW1lKCkgewpkaWZm IC1OYXVyIGNoZWVzZXRyYWNrZXItMC45Ljkub2xkL2NoZWVzZXRyYWNrZXIvaW50ZXJmYWNlX19R VC9pbnRlcmZhY2UuaCBjaGVlc2V0cmFja2VyLTAuOS45L2NoZWVzZXRyYWNrZXIvaW50ZXJmYWNl X19RVC9pbnRlcmZhY2UuaAotLS0gY2hlZXNldHJhY2tlci0wLjkuOS5vbGQvY2hlZXNldHJhY2tl ci9pbnRlcmZhY2VfX1FUL2ludGVyZmFjZS5oCTIwMDYtMDQtMDEgMDA6MDM6NDQuMDAwMDAwMDAw IC0wNTAwCisrKyBjaGVlc2V0cmFja2VyLTAuOS45L2NoZWVzZXRyYWNrZXIvaW50ZXJmYWNlX19R VC9pbnRlcmZhY2UuaAkyMDA2LTA0LTAxIDAwOjAzOjQzLjAwMDAwMDAwMCAtMDUwMApAQCAtMTEy LDggKzExMiw4IEBACiAJUGFnZUxpc3QgZ2V0X2N1cnJlbnRfcGFnZSgpOwogCiAJTG9hZGVyOjpF cnJvciAgb3Blbl9zb25nKHN0cmluZyBwX25hbWUpOwotCVNhdmVyOjpFcnJvciAgc2F2ZV9zb25n KCk7Ci0JU2F2ZXI6OkVycm9yICBzYXZlX3NvbmdfYXMoKTsKKwlBdWRpbzo6U2F2ZXI6OkVycm9y ICBzYXZlX3NvbmcoKTsKKwlBdWRpbzo6U2F2ZXI6OkVycm9yICBzYXZlX3NvbmdfYXMoKTsKIAog CiAgICAgSW50ZXJmYWNlKFFXaWRnZXQgKnBfd2lkZ2V0KTsKZGlmZiAtTmF1ciBjaGVlc2V0cmFj a2VyLTAuOS45Lm9sZC9jaGVlc2V0cmFja2VyL3NhdmVycy9zYXZlcl9jdC5oIGNoZWVzZXRyYWNr ZXItMC45LjkvY2hlZXNldHJhY2tlci9zYXZlcnMvc2F2ZXJfY3QuaAotLS0gY2hlZXNldHJhY2tl ci0wLjkuOS5vbGQvY2hlZXNldHJhY2tlci9zYXZlcnMvc2F2ZXJfY3QuaAkyMDA2LTA0LTAxIDAw OjAzOjQ0LjAwMDAwMDAwMCAtMDUwMAorKysgY2hlZXNldHJhY2tlci0wLjkuOS9jaGVlc2V0cmFj a2VyL3NhdmVycy9zYXZlcl9jdC5oCTIwMDYtMDQtMDEgMDA6MDM6NDMuMDAwMDAwMDAwIC0wNTAw CkBAIC0xNSw2ICsxNSw4IEBACiAjaW5jbHVkZSAidHJhY2tlcmNvcmUvc2F2ZXIuaCIKICNpbmNs dWRlICJjb21wb25lbnRzL2F1ZGlvL2Rkc19oZWxwZXJzLmgiCiAKK3VzaW5nIG5hbWVzcGFjZSBB dWRpbzsKKwogLyoqCiBAYXV0aG9yIEp1YW4gTGluaWV0c2t5CiAqLwpkaWZmIC1OYXVyIGNoZWVz ZXRyYWNrZXItMC45Ljkub2xkL2NoZWVzZXRyYWNrZXIvc2F2ZXJzL3NhdmVyX2l0LmggY2hlZXNl dHJhY2tlci0wLjkuOS9jaGVlc2V0cmFja2VyL3NhdmVycy9zYXZlcl9pdC5oCi0tLSBjaGVlc2V0 cmFja2VyLTAuOS45Lm9sZC9jaGVlc2V0cmFja2VyL3NhdmVycy9zYXZlcl9pdC5oCTIwMDYtMDQt MDEgMDA6MDM6NDQuMDAwMDAwMDAwIC0wNTAwCisrKyBjaGVlc2V0cmFja2VyLTAuOS45L2NoZWVz ZXRyYWNrZXIvc2F2ZXJzL3NhdmVyX2l0LmgJMjAwNi0wNC0wMSAwMDowMzo0My4wMDAwMDAwMDAg LTA1MDAKQEAgLTUxLDcgKzUxLDcgQEAKICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq LwogCiAKLQordXNpbmcgbmFtZXNwYWNlIEF1ZGlvOwogCiAKIGNsYXNzIFNhdmVyX0lUIDogcHVi bGljIFNhdmVyIHsKZGlmZiAtTmF1ciBjaGVlc2V0cmFja2VyLTAuOS45Lm9sZC9jaGVlc2V0cmFj a2VyL3NhdmVycy9zYXZlcl9yYXcuaCBjaGVlc2V0cmFja2VyLTAuOS45L2NoZWVzZXRyYWNrZXIv c2F2ZXJzL3NhdmVyX3Jhdy5oCi0tLSBjaGVlc2V0cmFja2VyLTAuOS45Lm9sZC9jaGVlc2V0cmFj a2VyL3NhdmVycy9zYXZlcl9yYXcuaAkyMDA2LTA0LTAxIDAwOjAzOjQ0LjAwMDAwMDAwMCAtMDUw MAorKysgY2hlZXNldHJhY2tlci0wLjkuOS9jaGVlc2V0cmFja2VyL3NhdmVycy9zYXZlcl9yYXcu aAkyMDA2LTA0LTAxIDAwOjAzOjQzLjAwMDAwMDAwMCAtMDUwMApAQCAtNDIsNyArNDIsNyBAQAog ICAqQGF1dGhvciByZWQKICAgKi8KIAotCit1c2luZyBuYW1lc3BhY2UgQXVkaW87CiAKIAogY2xh c3MgU2F2ZXJfUmF3IDogcHVibGljIFNhdmVyICB7CmRpZmYgLU5hdXIgY2hlZXNldHJhY2tlci0w LjkuOS5vbGQvY2hlZXNldHJhY2tlci9zYXZlcnMvc2F2ZXJfd2F2LmggY2hlZXNldHJhY2tlci0w LjkuOS9jaGVlc2V0cmFja2VyL3NhdmVycy9zYXZlcl93YXYuaAotLS0gY2hlZXNldHJhY2tlci0w LjkuOS5vbGQvY2hlZXNldHJhY2tlci9zYXZlcnMvc2F2ZXJfd2F2LmgJMjAwNi0wNC0wMSAwMDow Mzo0NC4wMDAwMDAwMDAgLTA1MDAKKysrIGNoZWVzZXRyYWNrZXItMC45LjkvY2hlZXNldHJhY2tl ci9zYXZlcnMvc2F2ZXJfd2F2LmgJMjAwNi0wNC0wMSAwMDowMzo0My4wMDAwMDAwMDAgLTA1MDAK QEAgLTM5LDcgKzM5LDcgQEAKICAgKkBhdXRob3IgcmVkCiAgICovCiAKLQordXNpbmcgbmFtZXNw YWNlIEF1ZGlvOwogCiAKIGNsYXNzIFNhdmVyX1dhdiA6IHB1YmxpYyBTYXZlciAgewpkaWZmIC1O YXVyIGNoZWVzZXRyYWNrZXItMC45Ljkub2xkL2NoZWVzZXRyYWNrZXIvdHJhY2tlcmNvcmUvZmls ZV9mb3JtYXRfbWFuYWdlci5jcHAgY2hlZXNldHJhY2tlci0wLjkuOS9jaGVlc2V0cmFja2VyL3Ry YWNrZXJjb3JlL2ZpbGVfZm9ybWF0X21hbmFnZXIuY3BwCi0tLSBjaGVlc2V0cmFja2VyLTAuOS45 Lm9sZC9jaGVlc2V0cmFja2VyL3RyYWNrZXJjb3JlL2ZpbGVfZm9ybWF0X21hbmFnZXIuY3BwCTIw MDYtMDQtMDEgMDA6MDM6NDQuMDAwMDAwMDAwIC0wNTAwCisrKyBjaGVlc2V0cmFja2VyLTAuOS45 L2NoZWVzZXRyYWNrZXIvdHJhY2tlcmNvcmUvZmlsZV9mb3JtYXRfbWFuYWdlci5jcHAJMjAwNi0w NC0wMSAwMDowNDoyMi4wMDAwMDAwMDAgLTA1MDAKQEAgLTM1LDcgKzM1LDcgQEAKIAogI2luY2x1 ZGUgImZpbGVfZm9ybWF0X21hbmFnZXIuaCIKIAotCit1c2luZyBuYW1lc3BhY2UgQXVkaW87CiAK IAogRmlsZV9Gb3JtYXRfTWFuYWdlcjo6RmlsZV9Gb3JtYXRfTWFuYWdlcigpewpAQCAtNzgsNyAr NzgsNyBAQAogCXJldHVybiB0ZW1wZXJyOwogfQogCi12b2lkIEZpbGVfRm9ybWF0X01hbmFnZXI6 OnJlZ2lzdGVyX3NhdmVyKFNhdmVyICpwX3NhdmVyKSB7Cit2b2lkIEZpbGVfRm9ybWF0X01hbmFn ZXI6OnJlZ2lzdGVyX3NhdmVyKEF1ZGlvOjpTYXZlciAqcF9zYXZlcikgewogCiAJaWYgKHNvbmc9 PU5VTEwpIHsKIApAQCAtOTMsMTEgKzkzLDExIEBACiBpbnQgRmlsZV9Gb3JtYXRfTWFuYWdlcjo6 c2F2ZV9tb2R1bGUoY29uc3QgY2hhciAqcF9maWxlbmFtZSkgewogCQogCVNhdmVyX0xpc3Q6OmNv bnN0X2l0ZXJhdG9yIEk7Ci0JaW50IHRlbXBlcnI9U2F2ZXI6OlVOS05PV05fVFlQRTsKKwlpbnQg dGVtcGVycj1BdWRpbzo6U2F2ZXI6OlVOS05PV05fVFlQRTsKIAogCWZvciAoST1zYXZlcl9saXN0 LmJlZ2luKCk7SSE9c2F2ZXJfbGlzdC5lbmQoKTtJKyspIHsKIAotCQlpZiAoKHRlbXBlcnI9KCpJ KS0+c2F2ZShwX2ZpbGVuYW1lKSkhPVNhdmVyOjpVTktOT1dOX1RZUEUpIHsKKwkJaWYgKCh0ZW1w ZXJyPSgqSSktPnNhdmUocF9maWxlbmFtZSkpIT1BdWRpbzo6U2F2ZXI6OlVOS05PV05fVFlQRSkg ewogCiAJCQkJcmV0dXJuIHRlbXBlcnI7CiAJCX0KQEAgLTEwOSwxMSArMTA5LDExIEBACiBpbnQg RmlsZV9Gb3JtYXRfTWFuYWdlcjo6c2F2ZV9zYW1wbGUoY29uc3QgY2hhciAqcF9maWxlbmFtZSwg aW50IHBfaW5kZXgpIHsKIAogCVNhdmVyX0xpc3Q6OmNvbnN0X2l0ZXJhdG9yIEk7Ci0JaW50IHRl bXBlcnI9U2F2ZXI6OlVOS05PV05fVFlQRTsKKwlpbnQgdGVtcGVycj1BdWRpbzo6U2F2ZXI6OlVO S05PV05fVFlQRTsKIAogCWZvciAoST1zYXZlcl9saXN0LmJlZ2luKCk7SSE9c2F2ZXJfbGlzdC5l bmQoKTtJKyspIHsKIAotCQlpZiAoKHRlbXBlcnI9KCpJKS0+c2F2ZV9zYW1wbGUocF9maWxlbmFt ZSxwX2luZGV4KSkhPVNhdmVyOjpVTktOT1dOX1RZUEUpIHsKKwkJaWYgKCh0ZW1wZXJyPSgqSSkt PnNhdmVfc2FtcGxlKHBfZmlsZW5hbWUscF9pbmRleCkpIT1BdWRpbzo6U2F2ZXI6OlVOS05PV05f VFlQRSkgewogCiAJCQkJcmV0dXJuIHRlbXBlcnI7CiAJCX0KQEAgLTEyNCwxMSArMTI0LDExIEBA CiBpbnQgRmlsZV9Gb3JtYXRfTWFuYWdlcjo6c2F2ZV9pbnN0cnVtZW50KGNvbnN0IGNoYXIgKnBf ZmlsZW5hbWUsIGludCBwX2luZGV4KSB7CiAKIAlTYXZlcl9MaXN0Ojpjb25zdF9pdGVyYXRvciBJ OwotCWludCB0ZW1wZXJyPVNhdmVyOjpVTktOT1dOX1RZUEU7CisJaW50IHRlbXBlcnI9QXVkaW86 OlNhdmVyOjpVTktOT1dOX1RZUEU7CiAKIAlmb3IgKEk9c2F2ZXJfbGlzdC5iZWdpbigpO0khPXNh dmVyX2xpc3QuZW5kKCk7SSsrKSB7CiAKLQkJaWYgKCh0ZW1wZXJyPSgqSSktPnNhdmVfaW5zdHJ1 bWVudChwX2ZpbGVuYW1lLHBfaW5kZXgpKSE9U2F2ZXI6OlVOS05PV05fVFlQRSkgeworCQlpZiAo KHRlbXBlcnI9KCpJKS0+c2F2ZV9pbnN0cnVtZW50KHBfZmlsZW5hbWUscF9pbmRleCkpIT1BdWRp bzo6U2F2ZXI6OlVOS05PV05fVFlQRSkgewogCiAJCQkJcmV0dXJuIHRlbXBlcnI7CiAJCX0KZGlm ZiAtTmF1ciBjaGVlc2V0cmFja2VyLTAuOS45Lm9sZC9jaGVlc2V0cmFja2VyL3RyYWNrZXJjb3Jl L2ZpbGVfZm9ybWF0X21hbmFnZXIuaCBjaGVlc2V0cmFja2VyLTAuOS45L2NoZWVzZXRyYWNrZXIv dHJhY2tlcmNvcmUvZmlsZV9mb3JtYXRfbWFuYWdlci5oCi0tLSBjaGVlc2V0cmFja2VyLTAuOS45 Lm9sZC9jaGVlc2V0cmFja2VyL3RyYWNrZXJjb3JlL2ZpbGVfZm9ybWF0X21hbmFnZXIuaAkyMDA2 LTA0LTAxIDAwOjAzOjQ0LjAwMDAwMDAwMCAtMDUwMAorKysgY2hlZXNldHJhY2tlci0wLjkuOS9j aGVlc2V0cmFja2VyL3RyYWNrZXJjb3JlL2ZpbGVfZm9ybWF0X21hbmFnZXIuaAkyMDA2LTA0LTAx IDAwOjAzOjQzLjAwMDAwMDAwMCAtMDUwMApAQCAtNjAsNyArNjAsNyBAQAogY2xhc3MgRmlsZV9G b3JtYXRfTWFuYWdlciB7CiAKIAl0eXBlZGVmIGxpc3Q8TG9hZGVyKj4gTG9hZGVyX0xpc3Q7Ci0J dHlwZWRlZiBsaXN0PFNhdmVyKj4gU2F2ZXJfTGlzdDsKKwl0eXBlZGVmIGxpc3Q8QXVkaW86OlNh dmVyKj4gU2F2ZXJfTGlzdDsKIAogCUxvYWRlcl9MaXN0IGxvYWRlcl9saXN0OwogCVNhdmVyX0xp c3Qgc2F2ZXJfbGlzdDsKQEAgLTgwLDcgKzgwLDcgQEAKIAogICAgICAgICBMb2FkZXIqIGxvYWRf c2FtcGxlX2xpYnJhcnkoY29uc3QgY2hhciAqcF9maWxlbmFtZSk7IC8vIFVzdWFsbHksIGZyb20g YW4gaW5zdHJ1bWVudCwgYnV0IHNvdW5kZm9uZHMgd291bGQgYmUgY29vbCEKIAotCXZvaWQgcmVn aXN0ZXJfc2F2ZXIoU2F2ZXIgKnBfc2F2ZXIpOworCXZvaWQgcmVnaXN0ZXJfc2F2ZXIoQXVkaW86 OlNhdmVyICpwX3NhdmVyKTsKICAgICAgICAgaW50IHNhdmVfbW9kdWxlKGNvbnN0IGNoYXIgKnBf ZmlsZW5hbWUpOwogCiAJaW50IHNhdmVfc2FtcGxlKGNvbnN0IGNoYXIgKnBfZmlsZW5hbWUsIGlu dCBwX2luZGV4KTsKZGlmZiAtTmF1ciBjaGVlc2V0cmFja2VyLTAuOS45Lm9sZC9jaGVlc2V0cmFj a2VyL3RyYWNrZXJjb3JlL3NhdmVyLmggY2hlZXNldHJhY2tlci0wLjkuOS9jaGVlc2V0cmFja2Vy L3RyYWNrZXJjb3JlL3NhdmVyLmgKLS0tIGNoZWVzZXRyYWNrZXItMC45Ljkub2xkL2NoZWVzZXRy YWNrZXIvdHJhY2tlcmNvcmUvc2F2ZXIuaAkyMDA2LTA0LTAxIDAwOjAzOjQ0LjAwMDAwMDAwMCAt MDUwMAorKysgY2hlZXNldHJhY2tlci0wLjkuOS9jaGVlc2V0cmFja2VyL3RyYWNrZXJjb3JlL3Nh dmVyLmgJMjAwNi0wNC0wMSAwMDowMzo0My4wMDAwMDAwMDAgLTA1MDAKQEAgLTUzLDcgKzUzLDcg QEAKIAogCiAKLQorbmFtZXNwYWNlIEF1ZGlvewogY2xhc3MgU2F2ZXIgewogcHJvdGVjdGVkOgog CVNvbmcgKnNvbmc7CkBAIC03OCw3ICs3OCw3IEBACiAJU2F2ZXIoKTsKIAl2aXJ0dWFsIH5TYXZl cigpOwogfTsKLQorfQogCiAKICNlbmRpZgpkaWZmIC1OYXVyIGNoZWVzZXRyYWNrZXItMC45Ljku b2xkL2NvbW1vbi9jb21wb25lbnRzL2F1ZGlvL3Jlc2FtcGxlcl9tYW5hZ2VyLmggY2hlZXNldHJh Y2tlci0wLjkuOS9jb21tb24vY29tcG9uZW50cy9hdWRpby9yZXNhbXBsZXJfbWFuYWdlci5oCi0t LSBjaGVlc2V0cmFja2VyLTAuOS45Lm9sZC9jb21tb24vY29tcG9uZW50cy9hdWRpby9yZXNhbXBs ZXJfbWFuYWdlci5oCTIwMDYtMDQtMDEgMDA6MDM6NDQuMDAwMDAwMDAwIC0wNTAwCisrKyBjaGVl c2V0cmFja2VyLTAuOS45L2NvbW1vbi9jb21wb25lbnRzL2F1ZGlvL3Jlc2FtcGxlcl9tYW5hZ2Vy LmgJMjAwNi0wNC0wMSAwMDowMzo0My4wMDAwMDAwMDAgLTA1MDAKQEAgLTM0LDcgKzM0LDcgQEAK IAogcHVibGljOgogCi0Jc3RhdGljIFJlc2FtcGxlcl9NYW5hZ2VyICogUmVzYW1wbGVyX01hbmFn ZXI6OmdldF9yZXNhbXBsZXJfbWFuYWdlcigpOworCXN0YXRpYyBSZXNhbXBsZXJfTWFuYWdlciAq IGdldF9yZXNhbXBsZXJfbWFuYWdlcigpOwogCWludCBnZXRfcmVzYW1wbGVyX2NvdW50KCk7CiAJ UmVzYW1wbGVyICogZ2V0X3Jlc2FtcGxlcihpbnQgcF9pbmRleCk7CiAKZGlmZiAtTmF1ciBjaGVl c2V0cmFja2VyLTAuOS45Lm9sZC9jb21tb24vY29tcG9uZW50cy9kYXRhL3Byb3BlcnR5X2JyaWRn ZXMuaCBjaGVlc2V0cmFja2VyLTAuOS45L2NvbW1vbi9jb21wb25lbnRzL2RhdGEvcHJvcGVydHlf YnJpZGdlcy5oCi0tLSBjaGVlc2V0cmFja2VyLTAuOS45Lm9sZC9jb21tb24vY29tcG9uZW50cy9k YXRhL3Byb3BlcnR5X2JyaWRnZXMuaAkyMDA2LTA0LTAxIDAwOjAzOjQ0LjAwMDAwMDAwMCAtMDUw MAorKysgY2hlZXNldHJhY2tlci0wLjkuOS9jb21tb24vY29tcG9uZW50cy9kYXRhL3Byb3BlcnR5 X2JyaWRnZXMuaAkyMDA2LTA0LTAxIDAwOjAzOjQzLjAwMDAwMDAwMCAtMDUwMApAQCAtNDEsNyAr NDEsNyBAQAogICAqLwogCiAgICNkZWZpbmUgQlJJREdFX0NPUFlfVkFMVUUoVCkgXAotCXZpcnR1 YWwgYm9vbCBUOjpjb3B5X3ZhbHVlKGNvbnN0IFByb3BlcnR5X0JyaWRnZSYgcnZhbHVlKSB7XAor CXZpcnR1YWwgYm9vbCBjb3B5X3ZhbHVlKGNvbnN0IFByb3BlcnR5X0JyaWRnZSYgcnZhbHVlKSB7 XAogCQlUKiByY2FzdCA9IGR5bmFtaWNfY2FzdDxUKj4oKFQqKSZydmFsdWUpO1wKIAkJaWYgKHJj YXN0KSB7XAogCQkJc2V0KHJjYXN0LT5nZXQoKSk7XApkaWZmIC1OYXVyIGNoZWVzZXRyYWNrZXIt MC45Ljkub2xkL2NvbW1vbi9kcml2ZXJzL3Bvc2l4L3NvdW5kX2RyaXZlcl9qYWNrLmggY2hlZXNl dHJhY2tlci0wLjkuOS9jb21tb24vZHJpdmVycy9wb3NpeC9zb3VuZF9kcml2ZXJfamFjay5oCi0t LSBjaGVlc2V0cmFja2VyLTAuOS45Lm9sZC9jb21tb24vZHJpdmVycy9wb3NpeC9zb3VuZF9kcml2 ZXJfamFjay5oCTIwMDYtMDQtMDEgMDA6MDM6NDQuMDAwMDAwMDAwIC0wNTAwCisrKyBjaGVlc2V0 cmFja2VyLTAuOS45L2NvbW1vbi9kcml2ZXJzL3Bvc2l4L3NvdW5kX2RyaXZlcl9qYWNrLmgJMjAw Ni0wNC0wMSAwMDowMzo0My4wMDAwMDAwMDAgLTA1MDAKQEAgLTcyLDcgKzcyLDcgQEAKIAogCWlu dCBqYWNrX2NhbGxiYWNrX25mcmFtZXM7CiAKLQlTb3VuZF9Ecml2ZXI6OlN0YXR1cyBTb3VuZF9E cml2ZXJfSkFDSzo6cHJvY2VzcygpOworCVNvdW5kX0RyaXZlcjo6U3RhdHVzIHByb2Nlc3MoKTsK IAogICAgICAgICBzdGF0aWMgaW50IHByb2Nlc3NfamFja19jYWxsYmFjayhqYWNrX25mcmFtZXNf dCBuZnJhbWVzLHZvaWQgKmFyZyk7CiAgICAgICAgIHN0YXRpYyBpbnQgamFja19zZXRfbWl4ZnJl cShqYWNrX25mcmFtZXNfdCBuZnJhbWVzLHZvaWQgKmFyZyk7Cg==