126003 2006-03-12 18:02 0000 compilation of gnome-base/gnome-panel-1.4.2 failed.. 2006-11-27 20:30:38 0000 1 1 1 Unclassified Gentoo Linux GNOME 2005.1 x86 Linux RESOLVED WONTFIX P2 major --- 154102 1 britta_22@hotmail.com gnome@gentoo.org britta_22@hotmail.com dennis.gurnick@gmail.com gentoo-bugs@babytux.info gentoo@schirmeier.com gnarlin@utopia.is mcummings@gentoo.org si@mindspring.com britta_22@hotmail.com 2006-03-12 18:02:30 0000 emerge --info: ------------------------------------------------------------------ Portage 2.0.54 (default-linux/x86/2005.1, gcc-3.4.5, glibc-2.3.5-r2, 2.6.15-gentoo-r1 i686) ================================================================= System uname: 2.6.15-gentoo-r1 i686 Mobile Intel(R) Pentium(R) 4 CPU 3.06GHz Gentoo Base System version 1.6.14 ccache version 2.3 [enabled] dev-lang/python: 2.3.5-r2, 2.4.2 sys-apps/sandbox: 1.2.12 sys-devel/autoconf: 2.13, 2.59-r6 sys-devel/automake: 1.4_p6, 1.5, 1.6.3, 1.7.9-r1, 1.8.5-r3, 1.9.6-r1 sys-devel/binutils: 2.16.1 sys-devel/libtool: 1.5.22 virtual/os-headers: 2.6.11-r2 ACCEPT_KEYWORDS="x86" AUTOCLEAN="yes" CBUILD="i686-pc-linux-gnu" CFLAGS="-march=pentium4 -O2 -pipe -fomit-frame-pointer" CHOST="i686-pc-linux-gnu" CONFIG_PROTECT="/etc /usr/kde/2/share/config /usr/kde/3.4/env /usr/kde/3.4/share/config /usr/kde/3.4/shutdown /usr/kde/3/share/config /usr/lib/X11/xkb /usr/lib/mozilla/defaults/pref /usr/share/config /var/qmail/control" CONFIG_PROTECT_MASK="/etc/gconf /etc/splash /etc/terminfo /etc/env.d" CXXFLAGS="-march=pentium4 -O2 -pipe -fomit-frame-pointer" DISTDIR="/usr/portage/distfiles" FEATURES="autoconfig ccache distlocks sandbox sfperms strict" GENTOO_MIRRORS="http://distfiles.gentoo.org http://distro.ibiblio.org/pub/linux/distributions/gentoo" PKGDIR="/usr/portage/packages" PORTAGE_TMPDIR="/var/tmp" PORTDIR="/usr/portage" SYNC="rsync://rsync.gentoo.org/gentoo-portage" USE="x86 X aac acpi alsa amd applet arts asf audiofile automount avi bash-completion bitmap-fonts bzip2 cardbus chroot crypt crypto_libgcrypt crypto_openssl cups curl curlwrappers dri dvd eds emboss encode esd exif expat fam fat fbcon fbsplash font-server fontconfig foomaticdb fortran gdbm gif glut gmp gnome gnome-print gpm gstreamer gtk gtk2 gtkhtml gvim gzip idn ieee1394 imagemagick imlib ipv6 java jpeg kde lcms libg++ libwww mad mikmod mng motif mozilla mp3 mpeg mpeg2 mplayer ncurses nls ntfs ogg oggvorbis opengl openssh openssl oss pam pcre pdflib perl png python qt quicktime readline real samba screen sdl spell splashutils sse sse2 ssl symlink tcltk tcpd tiff truetype truetype-fonts type1-fonts udev urandom usb video_cards_ati vim vim-with-x vnc vorbis wifi wma x11vnc xml xml2 xmms xv xvid zlib video_cards_radeon userland_GNU kernel_linux elibc_glibc" Unset: ASFLAGS, CTARGET, LANG, LC_ALL, LDFLAGS, LINGUAS, MAKEOPTS, PORTDIR_OVERLAY ------------------------------------------------------------------ I was going to compile gkismet and it should have... [ebuild NS ] gnome-base/gnome-panel-1.4.2-r2 and the compilation of gnome-panel failed... the end of compilation: ------------------------------------------------------------------ gcc -DHAVE_CONFIG_H -I. -I. -I.. -I. -I. -I../intl -I../intl -I../panel -DGNOMELOCALEDIR=\""/var/tmp/portage/gnome-panel-1.4.2-r2/image//usr/share/locale"\" -DGNOME_DATADIR=\""/var/tmp/portage/gnome-panel-1.4.2-r2/image//usr/share"\" -DGLADEDIR=\""/var/tmp/portage/gnome-panel-1.4.2-r2/image//usr/share/gnome/panel"\" -DGLOBAL_CONFDIR=\""/var/tmp/portage/gnome-panel-1.4.2-r2/image//etc/gnome/panel-config"\" -I/var/tmp/portage/gnome-panel-1.4.2-r2/image//usr/include -I/usr/include/gnome-1.0 -DNEED_GNOMESUPPORT_H -I/usr/lib/gnome-libs/include -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/include/orbit-1.0 -I/usr/include/gtk-1.2 -I/usr/include/libcapplet1 -I/usr/include/gnome-1.0 -DNEED_GNOMESUPPORT_H -I/usr/lib/gnome-libs/include -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/include/orbit-1.0 -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/include/orbit-1.0 -I/usr/include/gnome-1.0 -I/usr/include/freetype2 -DNEED_GNOMESUPPORT_H -I/usr/lib/gnome-libs/include -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/include/gdk-pixbuf-1.0 -I/usr/include/gnome-xml -I/usr/include/libglade-1.0 -I/usr/include/gnome-xml -I/usr/include/gdk-pixbuf-1.0 -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -march=pentium4 -O2 -pipe -fomit-frame-pointer -I/usr/include/gdk-pixbuf-1.0 -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -Wall -Wunused -c gwmh.c gwmh.c: In function `gwmh_init': gwmh.c:233: error: syntax error before string constant gwmh.c:233: warning: left-hand operand of comma expression has no effect gwmh.c:233: error: syntax error before ')' token gwmh.c: In function `get_typed_property_data': gwmh.c:393: error: syntax error before string constant gwmh.c:399: error: syntax error before string constant gwmh.c: In function `gwmh_desk_notifier_remove': gwmh.c:1589: error: syntax error before string constant gwmh.c:1589: warning: left-hand operand of comma expression has no effect gwmh.c:1589: error: syntax error before ')' token gwmh.c: In function `gwmh_task_notifier_remove': gwmh.c:1599: error: syntax error before string constant gwmh.c:1599: warning: left-hand operand of comma expression has no effect gwmh.c:1599: error: syntax error before ')' token gwmh.c: In function `gwmh_desk_notifier_remove_func': gwmh.c:1627: error: syntax error before string constant gwmh.c:1627: warning: left-hand operand of comma expression has no effect gwmh.c:1627: warning: left-hand operand of comma expression has no effect gwmh.c:1627: error: syntax error before ')' token gwmh.c: In function `gwmh_task_notifier_remove_func': gwmh.c:1646: error: syntax error before string constant gwmh.c:1646: warning: left-hand operand of comma expression has no effect gwmh.c:1646: warning: left-hand operand of comma expression has no effect gwmh.c:1646: error: syntax error before ')' token gwmh.c: In function `check_client': gwmh.c:2548: warning: dereferencing type-punned pointer will break strict-aliasing rules make[1]: *** [gwmh.o] Error 1 make[1]: Leaving directory `/var/tmp/portage/gnome-panel-1.4.2-r2/work/gnome-core-1.4.2/panel' make: *** [install-recursive] Error 1 make: Leaving directory `/var/tmp/portage/gnome-panel-1.4.2-r2/work/gnome-core-1.4.2/panel' ------------------------------------------------------------------ gnarlin@utopia.is 2006-05-07 20:53:04 0000 I'm also having the same problem. This is the error output: DGNOMELOCALEDIR=\""/var/tmp/portage/gnome-panel-1.4.2-r2/image//usr/share/locale"\" -DGNOME_DATADIR=\""/var/tmp/portage/gnome-panel-1.4.2-r2/image//usr/share"\" -DGLADEDIR=\""/var/tmp/portage/gnome-panel-1.4.2-r2/image//usr/share/gnome/panel"\" -DGLOBAL_CONFDIR=\""/var/tmp/portage/gnome-panel-1.4.2-r2/image//etc/gnome/panel-config"\" -I/var/tmp/portage/gnome-panel-1.4.2-r2/image//usr/include -I/usr/include/gnome-1.0 -DNEED_GNOMESUPPORT_H -I/usr/lib/gnome-libs/include -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/include/orbit-1.0 -I/usr/include/gtk-1.2 -I/usr/include/libcapplet1 -I/usr/include/gnome-1.0 -DNEED_GNOMESUPPORT_H -I/usr/lib/gnome-libs/include -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/include/orbit-1.0 -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/include/orbit-1.0 -I/usr/include/libglade-1.0 -I/usr/include/gnome-xml -I/usr/include/gdk-pixbuf-1.0 -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -march=athlon-tbird -O3 -pipe -I/usr/include/gdk-pixbuf-1.0 -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -Wall -Wunused -c gwmh.c gwmh.c: In function `gwmh_init': gwmh.c:233: error: syntax error before string constant gwmh.c:233: warning: left-hand operand of comma expression has no effect gwmh.c:233: error: syntax error before ')' token gwmh.c: In function `get_typed_property_data': gwmh.c:393: error: syntax error before string constant gwmh.c:399: error: syntax error before string constant gwmh.c: In function `gwmh_desk_notifier_remove': gwmh.c:1589: error: syntax error before string constant gwmh.c:1589: warning: left-hand operand of comma expression has no effect gwmh.c:1589: error: syntax error before ')' token gwmh.c: In function `gwmh_task_notifier_remove': gwmh.c:1599: error: syntax error before string constant gwmh.c:1599: warning: left-hand operand of comma expression has no effect gwmh.c:1599: error: syntax error before ')' token gwmh.c: In function `gwmh_desk_notifier_remove_func': gwmh.c:1627: error: syntax error before string constant gwmh.c:1627: warning: left-hand operand of comma expression has no effect gwmh.c:1627: warning: left-hand operand of comma expression has no effect gwmh.c:1627: error: syntax error before ')' token gwmh.c: In function `gwmh_task_notifier_remove_func': gwmh.c:1646: error: syntax error before string constant gwmh.c:1646: warning: left-hand operand of comma expression has no effect gwmh.c:1646: warning: left-hand operand of comma expression has no effect gwmh.c:1646: error: syntax error before ')' token gwmh.c: In function `check_client': gwmh.c:2548: warning: dereferencing type-punned pointer will break strict-aliasing rules make[1]: *** [gwmh.o] Error 1 make[1]: Leaving directory `/var/tmp/portage/gnome-panel-1.4.2-r2/work/gnome-core-1.4.2/panel' make: *** [install-recursive] Error 1 make: Leaving directory `/var/tmp/portage/gnome-panel-1.4.2-r2/work/gnome-core-1.4.2/panel' Here is the emerge --info: Portage 2203-svn (default-linux/x86/2006.0, gcc-3.4.5, glibc-2.3.6-r3, 2.6.15.1 i686) ================================================================= System uname: 2.6.15.1 i686 AMD Athlon(tm) processor Gentoo Base System version 1.6.14 dev-lang/python: 2.4.2 dev-python/pycrypto: 2.0-r1 dev-util/ccache: [Not Present] dev-util/confcache: [Not Present] sys-apps/sandbox: 1.2.12 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-r1 sys-devel/binutils: 2.16.1 sys-devel/libtool: 1.5.22 virtual/os-headers: 2.6.11-r2 ACCEPT_KEYWORDS="x86" AUTOCLEAN="yes" CBUILD="i686-pc-linux-gnu" CFLAGS="-march=athlon-tbird -O3 -pipe" CHOST="i686-pc-linux-gnu" CONFIG_PROTECT="/etc /usr/kde/2/share/config /usr/kde/3.2/share/config /usr/kde/3.3/env /usr/kde/3.3/share/config /usr/kde/3.3/shutdown /usr/kde/3.4/env /usr/kde/3.4/share/config /usr/kde/3.4/shutdown /usr/kde/3/share/config /usr/lib/X11/xkb /usr/lib/mozilla/defaults/pref /usr/share/config /var/qmail/control" CONFIG_PROTECT_MASK="/etc/eselect/compiler /etc/gconf /etc/terminfo /etc/env.d" CXXFLAGS="-march=athlon-tbird -O3 -pipe" DISTDIR="/usr/portage/distfiles" FEATURES="autoconfig ccache digest distlocks sandbox sfperms strict userpriv usersandbox" GENTOO_MIRRORS="ftp://ftp.rhnet.is/pub/gentoo http://gentoo.oregonstate.edu http://www.ibiblio.org/pub/Linux/distributions/gentoo" LC_ALL="is_IS.UTF-8" MAKEOPTS="-j2" PKGDIR="/usr/portage/packages" PORTAGE_TMPDIR="/var/tmp" PORTDIR="/usr/portage" PORTDIR_OVERLAY="/usr/local/ipl_ebuilds" SYNC="rsync://rsync.gentoo.org/gentoo-portage" USE="x86 3dnow 3dnowext 3ds S3TC X a52 aac acpi aim alsa amarok apache2 apm applet async audacious audiofile avi bash-completion bdf bindist bitmap-fonts bittorrent blender-game bzip2 cairo ccache cdda cddb cdinstall cdparanoia cdr cdrom chroot cli cpudetection crypt css cups curl dbus devmap dga dnd dri dts dvd dvdread emboss encode escreen exif expat exscalibar extensions fam ffmpeg firefox flac fmod foomaticdb fortran gd gdbm gecko-sdk gif glut gmail gmailtimestamps gmp gnome gpm gstreamer gtk gtk2 guile hal idn imagemagick imap imlib imlib2 ipod isdnlog jabber javascript joystick jpeg jpeg2k kde kdeenablefinal lcms libg++ libwww mad maildir mhash mikmod mmx mng mono motif mp3 mpeg mplayer msn music musicbrainz mysql nagios-dns nagios-ntp nagios-ping nagios-ssh ncurses net network nls nocd nowin nptl nsplugin nvidia ogg openal opengl oss pam pcre pdf pdflib perl physfs png pnp pppd python qemu-fast qt quicktime readline real reflection reiserfs remix remote samba savedconfig sdl session smartcard softmmu sounds speech speex spell spl sqlite sse ssl stencil-buffer svg tcltk tcpd tga theora threads tiff truetype truetype-fonts trusted type1-fonts udev unicode urandom usb utf8 vfat visualization voice vorbis win32codecs wordperfect wv x264 xanim xface xml xml2 xorg xpm xprint xrandr xscreensaver xv xvid xvmc yahoo zeroconf zlib userland_GNU kernel_linux elibc_glibc" Unset: ASFLAGS, CTARGET, INSTALL_MASK, LANG, LDFLAGS, LINGUAS, PORTAGE_RSYNC_EXTRA_OPTS, PORTAGE_RSYNC_OPTS I hope someone takes this bug seriously and takes a look at it. larryas2@fastmail.us 2006-06-14 11:17:35 0000 I found a way to get this to work on my system. In the source dir there is a subdir called panel. In panel are two .h files gstc.h and gwmh.h with lines like: -------------start------------------------------------------ /* FIXME: this works around old glib versions (pre 1.2.2) */ #undef G_GNUC_FUNCTION #undef G_GNUC_PRETTY_FUNCTION #ifdef __GNUC__ #define G_GNUC_FUNCTION __FUNCTION__ #define G_GNUC_PRETTY_FUNCTION __PRETTY_FUNCTION__ #else /* !__GNUC__ */ #define G_GNUC_FUNCTION "" #define G_GNUC_PRETTY_FUNCTION "" #endif /* !__GNUC__ */ -----------------------end--------------------------------- If I comment out the ifdef GNUC parts, it compiles cleanly. The files then look like: /* FIXME: this works around old glib versions (pre 1.2.2) */ #undef G_GNUC_FUNCTION #undef G_GNUC_PRETTY_FUNCTION //#ifdef __GNUC__ //#define G_GNUC_FUNCTION __FUNCTION__ //#define G_GNUC_PRETTY_FUNCTION __PRETTY_FUNCTION__ //#else /* !__GNUC__ */ #define G_GNUC_FUNCTION "" #define G_GNUC_PRETTY_FUNCTION "" //#endif /* !__GNUC__ */ I haven't learned how to create patches yet :( mcummings@gentoo.org 2006-07-06 10:16:41 0000 Gnome folks, Does the change in comment 2 work for you? (this blocks being unable to unmask dev-perl/POE because of a dep on gnome-panel-1*) Thanks, ~mcummings compnerd@gentoo.org 2006-08-27 13:16:30 0000 *** Bug 138211 has been marked as a duplicate of this bug. *** gentoo-bugs@babytux.info 2006-10-08 20:40:38 0000 The bug still exists in gnome-panel-1.4.2-r2. The "patch" in comment #2 fixed the problem for me. emerge --info Portage 2.1.2_pre2-r6 (default-linux/x86/2006.0, gcc-4.1.1, glibc-2.4-r4, 2.6.17-gentoo-r8-baby_tux i686) ================================================================= System uname: 2.6.17-gentoo-r8-baby_tux i686 AMD Athlon(tm) XP 3200+ Gentoo Base System version 1.12.5 Last Sync: Sun, 08 Oct 2006 05:50:01 +0000 ccache version 2.4 [disabled] app-admin/eselect-compiler: [Not Present] dev-java/java-config: 1.3.7, 2.0.30 dev-lang/python: 2.2.3-r6, 2.3.5-r2, 2.4.3-r4 dev-python/pycrypto: 2.0.1-r5 dev-util/ccache: 2.4-r6 dev-util/confcache: [Not Present] sys-apps/sandbox: 1.2.18.1 sys-devel/autoconf: 2.13, 2.60 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.17 sys-devel/gcc-config: 1.3.13-r4 sys-devel/libtool: 1.5.22 virtual/os-headers: 2.6.17-r1 ACCEPT_KEYWORDS="x86 ~x86" AUTOCLEAN="yes" CBUILD="i686-pc-linux-gnu" CFLAGS="-mtune=athlon-xp -O3 -pipe" CHOST="i686-pc-linux-gnu" CONFIG_PROTECT="/etc /usr/X11R6/lib/X11/xkb /usr/kde/3.5/env /usr/kde/3.5/share/config /usr/kde/3.5/shutdown /usr/lib/fax /usr/lib/mozilla/defaults/pref /usr/share/X11/xkb /usr/share/config /var/spool/fax/etc" CONFIG_PROTECT_MASK="/etc/env.d /etc/env.d/java/ /etc/gconf /etc/java-config/vms/ /etc/revdep-rebuild /etc/splash /etc/terminfo /etc/texmf/web2c" CXXFLAGS="-mtune=athlon-xp -O3 -pipe" DISTDIR="/usr/portage/distfiles" FEATURES="autoconfig distlocks fixpackages metadata-transfer sandbox sfperms strict" GENTOO_MIRRORS="http://mirror.datapipe.net/gentoo" LANG="fr_CA.utf8" LC_ALL="fr_CA.utf8" LINGUAS="fr en" 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" PORTAGE_TMPDIR="/var/tmp" PORTDIR="/usr/portage" PORTDIR_OVERLAY="/usr/local/portage" SYNC="rsync://rsync.ca.gentoo.org/gentoo-portage" USE="x86 16bit 3dnow 3dnowext 3ds 7zip X a52 aac abook accessibility acpi activefilter ada adsl aim aimextras alsa amd apache2 apm arts berkdb bitmap-fonts bonjour cdda cddb cdinstall cdparanoia cdr cdrom cg cgi chroot cjk cli courier crypt css ctype cups dba divx4linux dlloader doc dri dv dvd dvdr eds elibc_glibc emacs emacs-w3 emboss encode esd fat fbdev fbsplash ffmpeg firefox flac foomaticdb fortran ftp fuse gaim gd gdbm gif gimp gmail gmailtimestamps gnome gphoto2 gpm gs gstreamer gtk gtk2 gtkhtml hal html id3 ieee1394 imap imlib input_devices_evdev input_devices_joystick input_devices_keyboard input_devices_mouse ipv6 irc irssi isdnlog jabber joystick jpeg kde kernel_linux ldap libg++ libwww linguas_en linguas_fr lirc live logrotate lzo lzw mad mail maildir maildrop mailwrapper math md5sum mikmod mime mjpeg mmx motif mozcalendar mp3 mp4 mp4live mpe mpeg mpeg2 mplayer msn musepack music mysql mysqli mythtv ncurses net network nfs nls nptl nptlonly nsplugin ntfs nvidia objc odbc ogg opengl openssl oscar oss pam pcre pdf pdfkit pdo-external pear perl php player plugin pmu png pop postfix ppds pppd print python qmail qt3 qt4 quicktime quotas rar readline real realms reflection reiser4 reiserfs remix remote rhythmbox rss rtc samba sasl sblive scanner screen sdk sdl sendfile sendmail serial server session sftp silc simplexml smtp soap sockets socks5 sounds sox speech speedo speex spell spl sql sse ssl tcpd tga truetype truetype-fonts type1-fonts udev unicode userland_GNU userlocales utf8 v4l v4l2 vcd vda vhosts video_cards_fbdev video_cards_nvidia video_cards_vesa vim vim-pager vim-with-x vnc vorbis win32codecs wma wma123 wmf x11vnc xchat xchatdccserver xemacs xfs xinerama xmail xml xmms xorg xscreensaver xsl xv xvid yahoo zip zlib" Unset: CTARGET, EMERGE_DEFAULT_OPTS, INSTALL_MASK, LDFLAGS, MAKEOPTS, PORTAGE_RSYNC_EXTRA_OPTS gentoo@schirmeier.com 2006-10-25 02:23:02 0000 Created an attachment (id=100442) gnome-panel-1.4.2-prettyfunction.diff This patch fixes the problem in a better way, IMHO; starting with GCC 3.4, __FUNCTION__ and __PRETTY_FUNCTION__ are not string literals anymore (that can be concatenated with other string literals), but variables. See http://gcc.gnu.org/onlinedocs/gcc-4.1.1/gcc/Function-Names.html#Function-Names for more details. gentoo@schirmeier.com 2006-10-25 02:26:32 0000 Created an attachment (id=100444) gnome-panel-1.4.2-prettyfunction.diff Oops. The previous patch included the result of the <locale.h> sed substitution in the ebuild... mark_gray@markvgray.com 2006-11-01 04:44:11 0000 (In reply to comment #7) > Created an attachment (id=100444) [edit] > gnome-panel-1.4.2-prettyfunction.diff Compiled successfully with this patch. Thanks. compnerd@gentoo.org 2006-11-27 20:30:38 0000 Marked for removal. Please migrate to gnome-2.x 100442 2006-10-25 02:23 0000 gnome-panel-1.4.2-prettyfunction.diff gnome-panel-1.4.2-prettyfunction.diff text/plain LS0tIGdub21lLWNvcmUtMS40LjIvcGFuZWwvZ25vbWUtcGFuZWwtc2NyZWVuc2hvdC5jLm9yaWcJ MjAwNi0xMC0yNSAwMzo0OToyNC4wMDAwMDAwMDAgKzAyMDAKKysrIGdub21lLWNvcmUtMS40LjIv cGFuZWwvZ25vbWUtcGFuZWwtc2NyZWVuc2hvdC5jCTIwMDYtMTAtMjUgMDM6NDk6MjQuMDAwMDAw MDAwICswMjAwCkBAIC00MCw2ICs0MCw3IEBACiAjaW5jbHVkZSA8c3RkbGliLmg+CiAjaW5jbHVk ZSA8ZmNudGwuaD4KICNpbmNsdWRlIDxlcnJuby5oPgorI2luY2x1ZGUgPGxvY2FsZS5oPgogI2lm ZGVmIEhBVkVfR05PTUVfUFJJTlQKICNpbmNsdWRlIDxsaWJnbm9tZXByaW50L2dub21lLXByaW50 Lmg+CiAjaW5jbHVkZSA8bGliZ25vbWVwcmludC9nbm9tZS1wcmludC1tYXN0ZXIuaD4KLS0tIGdu b21lLWNvcmUtMS40LjIvcGFuZWwvZ3N0Yy5jLm9yaWcJMjAwNi0xMC0yNSAxMTowMjozNC4wMDAw MDAwMDAgKzAyMDAKKysrIGdub21lLWNvcmUtMS40LjIvcGFuZWwvZ3N0Yy5jCTIwMDYtMTAtMjUg MTE6MDM6MTkuMDAwMDAwMDAwICswMjAwCkBAIC0xNzIsOCArMTcyLDggQEAgZ3N0Y19wYXJlbnRf YWRkX2NoaWxkIChHc3RjUGFyZW50ICpzcGFyZQogICAgIH0KICAgaWYgKGNpID49IDApCiAgICAg ewotICAgICAgZ193YXJuaW5nIChHX0dOVUNfUFJFVFRZX0ZVTkNUSU9OICIoKTogY2FuJ3QgYWRk IGtub3duIHdpbmRvdyAlbGQgdG8gJWxkIiwKLQkJIHhjaGlsZCwKKyAgICAgIGdfd2FybmluZyAo IiVzKCk6IGNhbid0IGFkZCBrbm93biB3aW5kb3cgJWxkIHRvICVsZCIsCisJCSBHX0dOVUNfUFJF VFRZX0ZVTkNUSU9OLCB4Y2hpbGQsCiAJCSBHU1RDX1BBUkVOVF9YV0lORE9XIChzcGFyZW50KSk7 CiAgICAgICByZXR1cm47CiAgICAgfQpAQCAtMjA3LDggKzIwNyw4IEBAIGdzdGNfcGFyZW50X3Jl bW92ZV9jaGlsZCAoR3N0Y1BhcmVudCAqc3AKICAgLyogc2FuaXR5IGNoZWNrcyAqLwogICBpZiAo Y2kgPCAwKQogICAgIHsKLSAgICAgIGdfd2FybmluZyAoR19HTlVDX1BSRVRUWV9GVU5DVElPTiAi KCk6IGNhbid0IHJlbW92ZSB1bmtub3duIHdpbmRvdyAlbGQiLAotCQkgeGNoaWxkKTsKKyAgICAg IGdfd2FybmluZyAoIiVzKCk6IGNhbid0IHJlbW92ZSB1bmtub3duIHdpbmRvdyAlbGQiLAorCQkg R19HTlVDX1BSRVRUWV9GVU5DVElPTiwgeGNoaWxkKTsKICAgICAgIHJldHVybjsKICAgICB9CiAK QEAgLTI0OSwxNCArMjQ5LDE0IEBAIGdzdGNfcGFyZW50X3Jlc3RhY2tfY2hpbGQgKEdzdGNQYXJl bnQgKnMKICAgLyogc2FuaXR5IGNoZWNrcyAqLwogICBpZiAoY2kgPCAwKQogICAgIHsKLSAgICAg IGdfd2FybmluZyAoR19HTlVDX1BSRVRUWV9GVU5DVElPTiAiKCk6IGNhbid0IHJlc3RhY2sgdW5r bm93biB3aW5kb3cgJWxkIiwKLQkJIHhjaGlsZCk7CisgICAgICBnX3dhcm5pbmcgKCIlcygpOiBj YW4ndCByZXN0YWNrIHVua25vd24gd2luZG93ICVsZCIsCisJCSBHX0dOVUNfUFJFVFRZX0ZVTkNU SU9OLCB4Y2hpbGQpOwogICAgICAgcmV0dXJuOwogICAgIH0KICAgaWYgKHhiZWxvdyAmJiBiaSA8 IDApCiAgICAgewotICAgICAgZ193YXJuaW5nIChHX0dOVUNfUFJFVFRZX0ZVTkNUSU9OICIoKTog Y2FuJ3QgcmVzdGFjayB3aW5kb3cgJWxkIG9uIHRvcCBvZiB1bmtub3duIHdpbmRvdyAlbGQiLAot CQkgeGNoaWxkLAorICAgICAgZ193YXJuaW5nICgiJXMoKTogY2FuJ3QgcmVzdGFjayB3aW5kb3cg JWxkIG9uIHRvcCBvZiB1bmtub3duIHdpbmRvdyAlbGQiLAorCQkgR19HTlVDX1BSRVRUWV9GVU5D VElPTiwgeGNoaWxkLAogCQkgeGJlbG93KTsKICAgICAgIHJldHVybjsKICAgICB9CkBAIC0yOTcs MTAgKzI5NywxMCBAQCBnc3RjX3BhcmVudF9ldmVudF9tb25pdG9yIChHZGtYRXZlbnQgKmdkCiAg ICAgewogICAgIGNhc2UgQ3JlYXRlTm90aWZ5OgogICAgICAgaWYgKHhldmVudC0+eGNyZWF0ZXdp bmRvdy5wYXJlbnQgIT0geHBhcmVudCkKLQlnX3dhcm5pbmcgKEdfR05VQ19QUkVUVFlfRlVOQ1RJ T04gIigpOiBub3cgd2hhdCBpcyBUSElTPyAiCisJZ193YXJuaW5nICgiJXMoKTogbm93IHdoYXQg aXMgVEhJUz8gIgogCQkgICAiaSByZWNlaXZlIGEgU3Vic3RydWN0dXJlTm90aWZ5IFhDcmVhdGVX aW5kb3dFdmVudCAiCiAJCSAgICJmb3IgYSAqZm9yZWlnbiogY2hpbGQgKCVsZCk/Pz8gWCBpcyBv biBkcnVncyEiLAotCQkgICB4ZXZlbnQtPnhjcmVhdGV3aW5kb3cud2luZG93KTsKKwkJICAgR19H TlVDX1BSRVRUWV9GVU5DVElPTiwgeGV2ZW50LT54Y3JlYXRld2luZG93LndpbmRvdyk7CiAgICAg ICBlbHNlCiAJZ3N0Y19wYXJlbnRfYWRkX2NoaWxkIChzcGFyZW50LCB4ZXZlbnQtPnhjcmVhdGV3 aW5kb3cud2luZG93KTsKICAgICAgIGJyZWFrOwotLS0gZ25vbWUtY29yZS0xLjQuMi9wYW5lbC9n d21oLmMub3JpZwkyMDA2LTEwLTI1IDEwOjU5OjE5LjAwMDAwMDAwMCArMDIwMAorKysgZ25vbWUt Y29yZS0xLjQuMi9wYW5lbC9nd21oLmMJMjAwNi0xMC0yNSAxMTowMTowMC4wMDAwMDAwMDAgKzAy MDAKQEAgLTIzMCw4ICsyMzAsOCBAQCBnd21oX2luaXQgKHZvaWQpCiAgICAgICAvKiBzZXR1cCB0 aGUgcm9vdCB3aW5kb3cgZXZlbnQgbW9uaXRvciAqLwogICAgICAgd2luZG93ID0gZ2RrX3dpbmRv d19yZWZfZnJvbV94aWQgKEdES19ST09UX1dJTkRPVyAoKSk7CiAgICAgICBpZiAoIXdpbmRvdykK LQlnX2Vycm9yIChHX0dOVUNfUFJFVFRZX0ZVTkNUSU9OICIoKTogcm9vdCB3aW5kb3cgaWQgJWxk IGludmFsaWQ/IGJhZCBiYWQuLi4iLAotCQkgR0RLX1JPT1RfV0lORE9XICgpKTsKKwlnX2Vycm9y ICgiJXMoKTogcm9vdCB3aW5kb3cgaWQgJWxkIGludmFsaWQ/IGJhZCBiYWQuLi4iLAorCQkgR19H TlVDX1BSRVRUWV9GVU5DVElPTiwgR0RLX1JPT1RfV0lORE9XICgpKTsKICAgICAgIGdka193aW5k b3dfYWRkX2ZpbHRlciAod2luZG93LAogCQkJICAgICByb290X2V2ZW50X21vbml0b3IsCiAJCQkg ICAgIHdpbmRvdyk7CkBAIC0zOTAsMTQgKzM5MCwxNCBAQCBnZXRfdHlwZWRfcHJvcGVydHlfZGF0 YSAoRGlzcGxheSAqeGRpc3BsCiAgICAgfQogICBpZiAoIWFib3J0ICYmIGJ5dGVzX2FmdGVyX3Jl dHVybikKICAgICB7Ci0gICAgICBnX3dhcm5pbmcgKEdfR05VQ19QUkVUVFlfRlVOQ1RJT04gIigp OiBFZWVrLCBwcm9wZXJ0eSBoYXMgbW9yZSB0aGFuICV1IGJ5dGVzLCBzdG9yZWQgb24gaGFyZGRp c2s/IiwKLQkJIHByb3BfYnVmZmVyX2xlbmdoKTsKKyAgICAgIGdfd2FybmluZyAoIiVzKCk6IEVl ZWssIHByb3BlcnR5IGhhcyBtb3JlIHRoYW4gJXUgYnl0ZXMsIHN0b3JlZCBvbiBoYXJkZGlzaz8i LAorCQkgR19HTlVDX1BSRVRUWV9GVU5DVElPTiwgcHJvcF9idWZmZXJfbGVuZ2gpOwogICAgICAg YWJvcnQrKzsKICAgICB9CiAgIGlmICghYWJvcnQgJiYgZXhwZWN0ZWRfZm9ybWF0ICYmIGV4cGVj dGVkX2Zvcm1hdCAhPSBmb3JtYXRfcmV0dXJuZWQpCiAgICAgewotICAgICAgZ193YXJuaW5nIChH X0dOVUNfUFJFVFRZX0ZVTkNUSU9OICIoKTogRXhwZWN0ZWQgZm9ybWF0ICgldSkgdW5tYXRjaGVk ICglZCksIHByb2dyYW1tZXIgd2FzIGRydW5rPyIsCi0JCSBleHBlY3RlZF9mb3JtYXQsIGZvcm1h dF9yZXR1cm5lZCk7CisgICAgICBnX3dhcm5pbmcgKCIlcygpOiBFeHBlY3RlZCBmb3JtYXQgKCV1 KSB1bm1hdGNoZWQgKCVkKSwgcHJvZ3JhbW1lciB3YXMgZHJ1bms/IiwKKwkJIEdfR05VQ19QUkVU VFlfRlVOQ1RJT04sIGV4cGVjdGVkX2Zvcm1hdCwgZm9ybWF0X3JldHVybmVkKTsKICAgICAgIGFi b3J0Kys7CiAgICAgfQogICBpZiAoIWFib3J0ICYmIHByb3BfZGF0YSAmJiBuaXRlbXNfcmV0dXJu ICYmIGZvcm1hdF9yZXR1cm5lZCkKQEAgLTY0OCw3ICs2NDgsOCBAQCBnZXRfdGFza19yb290X2Fu ZF9mcmFtZSAoR3dtaFRhc2sgKnRhc2spCiAgICAgICB4ZnJhbWUgPSBOb25lOwogICAgICAgLyog YXBhcmVudGx5IHRoaXMgY2FuIGhhcHBlbiBpZiBhIHdpbmRvdyBpcyBkZXN0cnVjdGVkIHNob3J0 bHkgYWZ0ZXIKICAgICAgICAqIGNyZWF0aW9uLCBqdXN0IGJlIHNpbGVudC4KLSAgICAgICAqIGdf d2FybmluZyAoR19HTlVDX1BSRVRUWV9GVU5DVElPTiAiKCk6IHRhc2sgd2luZG93IGlkICVsZCBp bnZhbGlkPyIsIHRhc2stPnh3aW4pOworICAgICAgICogZ193YXJuaW5nICgiJXMoKTogdGFzayB3 aW5kb3cgaWQgJWxkIGludmFsaWQ/IiwKKyAgICAgICAqICAgICAgICAgICAgR19HTlVDX1BSRVRU WV9GVU5DVElPTiwgdGFzay0+eHdpbik7CiAgICAgICAgKi8KICAgICB9CiAKQEAgLTE1ODYsOCAr MTU4Nyw4IEBAIGd3bWhfZGVza19ub3RpZmllcl9yZW1vdmUgKGd1aW50IGlkKQogICBnX3JldHVy bl9pZl9mYWlsIChpZCA+IDApOwogCiAgIGlmICghZ19ob29rX2Rlc3Ryb3kgKCZnd21oX2Rlc2tf aG9va19saXN0LCBpZCkpCi0gICAgZ193YXJuaW5nIChHX0dOVUNfUFJFVFRZX0ZVTkNUSU9OICIo KTogdW5hYmxlIHRvIHJlbW92ZSBub3RpZmllciAoJWQpIiwKLQkgICAgICAgaWQpOworICAgIGdf d2FybmluZyAoIiVzKCk6IHVuYWJsZSB0byByZW1vdmUgbm90aWZpZXIgKCVkKSIsCisJICAgICAg IEdfR05VQ19QUkVUVFlfRlVOQ1RJT04sIGlkKTsKIH0KIAogdm9pZApAQCAtMTU5Niw4ICsxNTk3 LDggQEAgZ3dtaF90YXNrX25vdGlmaWVyX3JlbW92ZSAoZ3VpbnQgaWQpCiAgIGdfcmV0dXJuX2lm X2ZhaWwgKGlkID4gMCk7CiAKICAgaWYgKCFnX2hvb2tfZGVzdHJveSAoJmd3bWhfdGFza19ob29r X2xpc3QsIGlkKSkKLSAgICBnX3dhcm5pbmcgKEdfR05VQ19QUkVUVFlfRlVOQ1RJT04gIigpOiB1 bmFibGUgdG8gcmVtb3ZlIG5vdGlmaWVyICglZCkiLAotCSAgICAgICBpZCk7CisgICAgZ193YXJu aW5nICgiJXMoKTogdW5hYmxlIHRvIHJlbW92ZSBub3RpZmllciAoJWQpIiwKKwkgICAgICAgR19H TlVDX1BSRVRUWV9GVU5DVElPTiwgaWQpOwogfQogCiBzdGF0aWMgZ2Jvb2xlYW4KQEAgLTE2MjQs OCArMTYyNSw4IEBAIGd3bWhfZGVza19ub3RpZmllcl9yZW1vdmVfZnVuYyAoR3dtaERlc2sKICAg aWYgKGhvb2spCiAgICAgZ19ob29rX2Rlc3Ryb3lfbGluayAoJmd3bWhfZGVza19ob29rX2xpc3Qs IGhvb2spOwogICBlbHNlCi0gICAgZ193YXJuaW5nIChHX0dOVUNfUFJFVFRZX0ZVTkNUSU9OICIo KTogdW5hYmxlIHRvIHJlbW92ZSBub3RpZmllciA8JXA+ICglcCkiLAotCSAgICAgICBmdW5jLCBm dW5jX2RhdGEpOworICAgIGdfd2FybmluZyAoIiVzKCk6IHVuYWJsZSB0byByZW1vdmUgbm90aWZp ZXIgPCVwPiAoJXApIiwKKwkgICAgICAgR19HTlVDX1BSRVRUWV9GVU5DVElPTiwgZnVuYywgZnVu Y19kYXRhKTsKIH0KIAogdm9pZApAQCAtMTY0Myw4ICsxNjQ0LDggQEAgZ3dtaF90YXNrX25vdGlm aWVyX3JlbW92ZV9mdW5jIChHd21oVGFzawogICBpZiAoaG9vaykKICAgICBnX2hvb2tfZGVzdHJv eV9saW5rICgmZ3dtaF90YXNrX2hvb2tfbGlzdCwgaG9vayk7CiAgIGVsc2UKLSAgICBnX3dhcm5p bmcgKEdfR05VQ19QUkVUVFlfRlVOQ1RJT04gIigpOiB1bmFibGUgdG8gcmVtb3ZlIG5vdGlmaWVy IDwlcD4gKCVwKSIsCi0JICAgICAgIGZ1bmMsIGZ1bmNfZGF0YSk7CisgICAgZ193YXJuaW5nICgi JXMoKTogdW5hYmxlIHRvIHJlbW92ZSBub3RpZmllciA8JXA+ICglcCkiLAorCSAgICAgICBHX0dO VUNfUFJFVFRZX0ZVTkNUSU9OLCBmdW5jLCBmdW5jX2RhdGEpOwogfQogCiBzdGF0aWMgZ2Jvb2xl YW4KLS0tIGdub21lLWNvcmUtMS40LjIvcGFuZWwveHN0dWZmLmMub3JpZwkyMDA2LTEwLTI1IDEx OjA0OjA3LjAwMDAwMDAwMCArMDIwMAorKysgZ25vbWUtY29yZS0xLjQuMi9wYW5lbC94c3R1ZmYu YwkyMDA2LTEwLTI1IDExOjA0OjQ2LjAwMDAwMDAwMCArMDIwMApAQCAtMzIyLDE5ICszMjIsMjAg QEAgZ2V0X3R5cGVkX3Byb3BlcnR5X2RhdGEgKERpc3BsYXkgKnhkaXNwbAogICAgICAgcmVxdWVz dGVkX3R5cGUgIT0gQW55UHJvcGVydHlUeXBlICYmCiAgICAgICByZXF1ZXN0ZWRfdHlwZSAhPSB0 eXBlX3JldHVybmVkKQogICAgIHsKLSAgICAgIGdfd2FybmluZyAoR19HTlVDX1BSRVRUWV9GVU5D VElPTiAiKCk6IFByb3BlcnR5IGhhcyB3cm9uZyB0eXBlLCBwcm9iYWJseSBvbiBjcmFjayIpOwor ICAgICAgZ193YXJuaW5nICgiJXMoKTogUHJvcGVydHkgaGFzIHdyb25nIHR5cGUsIHByb2JhYmx5 IG9uIGNyYWNrIiwKKwkJIEdfR05VQ19QUkVUVFlfRlVOQ1RJT04pOwogICAgICAgYWJvcnQrKzsK ICAgICB9CiAgIGlmICghYWJvcnQgJiYgYnl0ZXNfYWZ0ZXJfcmV0dXJuKQogICAgIHsKLSAgICAg IGdfd2FybmluZyAoR19HTlVDX1BSRVRUWV9GVU5DVElPTiAiKCk6IEVlZWssIHByb3BlcnR5IGhh cyBtb3JlIHRoYW4gJXUgYnl0ZXMsIHN0b3JlZCBvbiBoYXJkZGlzaz8iLAotCQkgcHJvcF9idWZm ZXJfbGVuZ2gpOworICAgICAgZ193YXJuaW5nICgiJXMoKTogRWVlaywgcHJvcGVydHkgaGFzIG1v cmUgdGhhbiAldSBieXRlcywgc3RvcmVkIG9uIGhhcmRkaXNrPyIsCisJCSBHX0dOVUNfUFJFVFRZ X0ZVTkNUSU9OLCBwcm9wX2J1ZmZlcl9sZW5naCk7CiAgICAgICBhYm9ydCsrOwogICAgIH0KICAg aWYgKCFhYm9ydCAmJiBleHBlY3RlZF9mb3JtYXQgJiYgZXhwZWN0ZWRfZm9ybWF0ICE9IGZvcm1h dF9yZXR1cm5lZCkKICAgICB7Ci0gICAgICBnX3dhcm5pbmcgKEdfR05VQ19QUkVUVFlfRlVOQ1RJ T04gIigpOiBFeHBlY3RlZCBmb3JtYXQgKCV1KSB1bm1hdGNoZWQgKCVkKSwgcHJvZ3JhbW1lciB3 YXMgZHJ1bms/IiwKLQkJIGV4cGVjdGVkX2Zvcm1hdCwgZm9ybWF0X3JldHVybmVkKTsKKyAgICAg IGdfd2FybmluZyAoIiVzKCk6IEV4cGVjdGVkIGZvcm1hdCAoJXUpIHVubWF0Y2hlZCAoJWQpLCBw cm9ncmFtbWVyIHdhcyBkcnVuaz8iLAorCQkgR19HTlVDX1BSRVRUWV9GVU5DVElPTiwgZXhwZWN0 ZWRfZm9ybWF0LCBmb3JtYXRfcmV0dXJuZWQpOwogICAgICAgYWJvcnQrKzsKICAgICB9CiAgIGlm ICghYWJvcnQgJiYgcHJvcF9kYXRhICYmIG5pdGVtc19yZXR1cm4gJiYgZm9ybWF0X3JldHVybmVk KQo= 100444 2006-10-25 02:26 0000 gnome-panel-1.4.2-prettyfunction.diff gnome-panel-1.4.2-prettyfunction.diff text/plain LS0tIGdub21lLWNvcmUtMS40LjIvcGFuZWwvZ3N0Yy5jLm9yaWcJMjAwNi0xMC0yNSAxMTowMjoz NC4wMDAwMDAwMDAgKzAyMDAKKysrIGdub21lLWNvcmUtMS40LjIvcGFuZWwvZ3N0Yy5jCTIwMDYt MTAtMjUgMTE6MDM6MTkuMDAwMDAwMDAwICswMjAwCkBAIC0xNzIsOCArMTcyLDggQEAgZ3N0Y19w YXJlbnRfYWRkX2NoaWxkIChHc3RjUGFyZW50ICpzcGFyZQogICAgIH0KICAgaWYgKGNpID49IDAp CiAgICAgewotICAgICAgZ193YXJuaW5nIChHX0dOVUNfUFJFVFRZX0ZVTkNUSU9OICIoKTogY2Fu J3QgYWRkIGtub3duIHdpbmRvdyAlbGQgdG8gJWxkIiwKLQkJIHhjaGlsZCwKKyAgICAgIGdfd2Fy bmluZyAoIiVzKCk6IGNhbid0IGFkZCBrbm93biB3aW5kb3cgJWxkIHRvICVsZCIsCisJCSBHX0dO VUNfUFJFVFRZX0ZVTkNUSU9OLCB4Y2hpbGQsCiAJCSBHU1RDX1BBUkVOVF9YV0lORE9XIChzcGFy ZW50KSk7CiAgICAgICByZXR1cm47CiAgICAgfQpAQCAtMjA3LDggKzIwNyw4IEBAIGdzdGNfcGFy ZW50X3JlbW92ZV9jaGlsZCAoR3N0Y1BhcmVudCAqc3AKICAgLyogc2FuaXR5IGNoZWNrcyAqLwog ICBpZiAoY2kgPCAwKQogICAgIHsKLSAgICAgIGdfd2FybmluZyAoR19HTlVDX1BSRVRUWV9GVU5D VElPTiAiKCk6IGNhbid0IHJlbW92ZSB1bmtub3duIHdpbmRvdyAlbGQiLAotCQkgeGNoaWxkKTsK KyAgICAgIGdfd2FybmluZyAoIiVzKCk6IGNhbid0IHJlbW92ZSB1bmtub3duIHdpbmRvdyAlbGQi LAorCQkgR19HTlVDX1BSRVRUWV9GVU5DVElPTiwgeGNoaWxkKTsKICAgICAgIHJldHVybjsKICAg ICB9CiAKQEAgLTI0OSwxNCArMjQ5LDE0IEBAIGdzdGNfcGFyZW50X3Jlc3RhY2tfY2hpbGQgKEdz dGNQYXJlbnQgKnMKICAgLyogc2FuaXR5IGNoZWNrcyAqLwogICBpZiAoY2kgPCAwKQogICAgIHsK LSAgICAgIGdfd2FybmluZyAoR19HTlVDX1BSRVRUWV9GVU5DVElPTiAiKCk6IGNhbid0IHJlc3Rh Y2sgdW5rbm93biB3aW5kb3cgJWxkIiwKLQkJIHhjaGlsZCk7CisgICAgICBnX3dhcm5pbmcgKCIl cygpOiBjYW4ndCByZXN0YWNrIHVua25vd24gd2luZG93ICVsZCIsCisJCSBHX0dOVUNfUFJFVFRZ X0ZVTkNUSU9OLCB4Y2hpbGQpOwogICAgICAgcmV0dXJuOwogICAgIH0KICAgaWYgKHhiZWxvdyAm JiBiaSA8IDApCiAgICAgewotICAgICAgZ193YXJuaW5nIChHX0dOVUNfUFJFVFRZX0ZVTkNUSU9O ICIoKTogY2FuJ3QgcmVzdGFjayB3aW5kb3cgJWxkIG9uIHRvcCBvZiB1bmtub3duIHdpbmRvdyAl bGQiLAotCQkgeGNoaWxkLAorICAgICAgZ193YXJuaW5nICgiJXMoKTogY2FuJ3QgcmVzdGFjayB3 aW5kb3cgJWxkIG9uIHRvcCBvZiB1bmtub3duIHdpbmRvdyAlbGQiLAorCQkgR19HTlVDX1BSRVRU WV9GVU5DVElPTiwgeGNoaWxkLAogCQkgeGJlbG93KTsKICAgICAgIHJldHVybjsKICAgICB9CkBA IC0yOTcsMTAgKzI5NywxMCBAQCBnc3RjX3BhcmVudF9ldmVudF9tb25pdG9yIChHZGtYRXZlbnQg KmdkCiAgICAgewogICAgIGNhc2UgQ3JlYXRlTm90aWZ5OgogICAgICAgaWYgKHhldmVudC0+eGNy ZWF0ZXdpbmRvdy5wYXJlbnQgIT0geHBhcmVudCkKLQlnX3dhcm5pbmcgKEdfR05VQ19QUkVUVFlf RlVOQ1RJT04gIigpOiBub3cgd2hhdCBpcyBUSElTPyAiCisJZ193YXJuaW5nICgiJXMoKTogbm93 IHdoYXQgaXMgVEhJUz8gIgogCQkgICAiaSByZWNlaXZlIGEgU3Vic3RydWN0dXJlTm90aWZ5IFhD cmVhdGVXaW5kb3dFdmVudCAiCiAJCSAgICJmb3IgYSAqZm9yZWlnbiogY2hpbGQgKCVsZCk/Pz8g WCBpcyBvbiBkcnVncyEiLAotCQkgICB4ZXZlbnQtPnhjcmVhdGV3aW5kb3cud2luZG93KTsKKwkJ ICAgR19HTlVDX1BSRVRUWV9GVU5DVElPTiwgeGV2ZW50LT54Y3JlYXRld2luZG93LndpbmRvdyk7 CiAgICAgICBlbHNlCiAJZ3N0Y19wYXJlbnRfYWRkX2NoaWxkIChzcGFyZW50LCB4ZXZlbnQtPnhj cmVhdGV3aW5kb3cud2luZG93KTsKICAgICAgIGJyZWFrOwotLS0gZ25vbWUtY29yZS0xLjQuMi9w YW5lbC9nd21oLmMub3JpZwkyMDA2LTEwLTI1IDEwOjU5OjE5LjAwMDAwMDAwMCArMDIwMAorKysg Z25vbWUtY29yZS0xLjQuMi9wYW5lbC9nd21oLmMJMjAwNi0xMC0yNSAxMTowMTowMC4wMDAwMDAw MDAgKzAyMDAKQEAgLTIzMCw4ICsyMzAsOCBAQCBnd21oX2luaXQgKHZvaWQpCiAgICAgICAvKiBz ZXR1cCB0aGUgcm9vdCB3aW5kb3cgZXZlbnQgbW9uaXRvciAqLwogICAgICAgd2luZG93ID0gZ2Rr X3dpbmRvd19yZWZfZnJvbV94aWQgKEdES19ST09UX1dJTkRPVyAoKSk7CiAgICAgICBpZiAoIXdp bmRvdykKLQlnX2Vycm9yIChHX0dOVUNfUFJFVFRZX0ZVTkNUSU9OICIoKTogcm9vdCB3aW5kb3cg aWQgJWxkIGludmFsaWQ/IGJhZCBiYWQuLi4iLAotCQkgR0RLX1JPT1RfV0lORE9XICgpKTsKKwln X2Vycm9yICgiJXMoKTogcm9vdCB3aW5kb3cgaWQgJWxkIGludmFsaWQ/IGJhZCBiYWQuLi4iLAor CQkgR19HTlVDX1BSRVRUWV9GVU5DVElPTiwgR0RLX1JPT1RfV0lORE9XICgpKTsKICAgICAgIGdk a193aW5kb3dfYWRkX2ZpbHRlciAod2luZG93LAogCQkJICAgICByb290X2V2ZW50X21vbml0b3Is CiAJCQkgICAgIHdpbmRvdyk7CkBAIC0zOTAsMTQgKzM5MCwxNCBAQCBnZXRfdHlwZWRfcHJvcGVy dHlfZGF0YSAoRGlzcGxheSAqeGRpc3BsCiAgICAgfQogICBpZiAoIWFib3J0ICYmIGJ5dGVzX2Fm dGVyX3JldHVybikKICAgICB7Ci0gICAgICBnX3dhcm5pbmcgKEdfR05VQ19QUkVUVFlfRlVOQ1RJ T04gIigpOiBFZWVrLCBwcm9wZXJ0eSBoYXMgbW9yZSB0aGFuICV1IGJ5dGVzLCBzdG9yZWQgb24g aGFyZGRpc2s/IiwKLQkJIHByb3BfYnVmZmVyX2xlbmdoKTsKKyAgICAgIGdfd2FybmluZyAoIiVz KCk6IEVlZWssIHByb3BlcnR5IGhhcyBtb3JlIHRoYW4gJXUgYnl0ZXMsIHN0b3JlZCBvbiBoYXJk ZGlzaz8iLAorCQkgR19HTlVDX1BSRVRUWV9GVU5DVElPTiwgcHJvcF9idWZmZXJfbGVuZ2gpOwog ICAgICAgYWJvcnQrKzsKICAgICB9CiAgIGlmICghYWJvcnQgJiYgZXhwZWN0ZWRfZm9ybWF0ICYm IGV4cGVjdGVkX2Zvcm1hdCAhPSBmb3JtYXRfcmV0dXJuZWQpCiAgICAgewotICAgICAgZ193YXJu aW5nIChHX0dOVUNfUFJFVFRZX0ZVTkNUSU9OICIoKTogRXhwZWN0ZWQgZm9ybWF0ICgldSkgdW5t YXRjaGVkICglZCksIHByb2dyYW1tZXIgd2FzIGRydW5rPyIsCi0JCSBleHBlY3RlZF9mb3JtYXQs IGZvcm1hdF9yZXR1cm5lZCk7CisgICAgICBnX3dhcm5pbmcgKCIlcygpOiBFeHBlY3RlZCBmb3Jt YXQgKCV1KSB1bm1hdGNoZWQgKCVkKSwgcHJvZ3JhbW1lciB3YXMgZHJ1bms/IiwKKwkJIEdfR05V Q19QUkVUVFlfRlVOQ1RJT04sIGV4cGVjdGVkX2Zvcm1hdCwgZm9ybWF0X3JldHVybmVkKTsKICAg ICAgIGFib3J0Kys7CiAgICAgfQogICBpZiAoIWFib3J0ICYmIHByb3BfZGF0YSAmJiBuaXRlbXNf cmV0dXJuICYmIGZvcm1hdF9yZXR1cm5lZCkKQEAgLTY0OCw3ICs2NDgsOCBAQCBnZXRfdGFza19y b290X2FuZF9mcmFtZSAoR3dtaFRhc2sgKnRhc2spCiAgICAgICB4ZnJhbWUgPSBOb25lOwogICAg ICAgLyogYXBhcmVudGx5IHRoaXMgY2FuIGhhcHBlbiBpZiBhIHdpbmRvdyBpcyBkZXN0cnVjdGVk IHNob3J0bHkgYWZ0ZXIKICAgICAgICAqIGNyZWF0aW9uLCBqdXN0IGJlIHNpbGVudC4KLSAgICAg ICAqIGdfd2FybmluZyAoR19HTlVDX1BSRVRUWV9GVU5DVElPTiAiKCk6IHRhc2sgd2luZG93IGlk ICVsZCBpbnZhbGlkPyIsIHRhc2stPnh3aW4pOworICAgICAgICogZ193YXJuaW5nICgiJXMoKTog dGFzayB3aW5kb3cgaWQgJWxkIGludmFsaWQ/IiwKKyAgICAgICAqICAgICAgICAgICAgR19HTlVD X1BSRVRUWV9GVU5DVElPTiwgdGFzay0+eHdpbik7CiAgICAgICAgKi8KICAgICB9CiAKQEAgLTE1 ODYsOCArMTU4Nyw4IEBAIGd3bWhfZGVza19ub3RpZmllcl9yZW1vdmUgKGd1aW50IGlkKQogICBn X3JldHVybl9pZl9mYWlsIChpZCA+IDApOwogCiAgIGlmICghZ19ob29rX2Rlc3Ryb3kgKCZnd21o X2Rlc2tfaG9va19saXN0LCBpZCkpCi0gICAgZ193YXJuaW5nIChHX0dOVUNfUFJFVFRZX0ZVTkNU SU9OICIoKTogdW5hYmxlIHRvIHJlbW92ZSBub3RpZmllciAoJWQpIiwKLQkgICAgICAgaWQpOwor ICAgIGdfd2FybmluZyAoIiVzKCk6IHVuYWJsZSB0byByZW1vdmUgbm90aWZpZXIgKCVkKSIsCisJ ICAgICAgIEdfR05VQ19QUkVUVFlfRlVOQ1RJT04sIGlkKTsKIH0KIAogdm9pZApAQCAtMTU5Niw4 ICsxNTk3LDggQEAgZ3dtaF90YXNrX25vdGlmaWVyX3JlbW92ZSAoZ3VpbnQgaWQpCiAgIGdfcmV0 dXJuX2lmX2ZhaWwgKGlkID4gMCk7CiAKICAgaWYgKCFnX2hvb2tfZGVzdHJveSAoJmd3bWhfdGFz a19ob29rX2xpc3QsIGlkKSkKLSAgICBnX3dhcm5pbmcgKEdfR05VQ19QUkVUVFlfRlVOQ1RJT04g IigpOiB1bmFibGUgdG8gcmVtb3ZlIG5vdGlmaWVyICglZCkiLAotCSAgICAgICBpZCk7CisgICAg Z193YXJuaW5nICgiJXMoKTogdW5hYmxlIHRvIHJlbW92ZSBub3RpZmllciAoJWQpIiwKKwkgICAg ICAgR19HTlVDX1BSRVRUWV9GVU5DVElPTiwgaWQpOwogfQogCiBzdGF0aWMgZ2Jvb2xlYW4KQEAg LTE2MjQsOCArMTYyNSw4IEBAIGd3bWhfZGVza19ub3RpZmllcl9yZW1vdmVfZnVuYyAoR3dtaERl c2sKICAgaWYgKGhvb2spCiAgICAgZ19ob29rX2Rlc3Ryb3lfbGluayAoJmd3bWhfZGVza19ob29r X2xpc3QsIGhvb2spOwogICBlbHNlCi0gICAgZ193YXJuaW5nIChHX0dOVUNfUFJFVFRZX0ZVTkNU SU9OICIoKTogdW5hYmxlIHRvIHJlbW92ZSBub3RpZmllciA8JXA+ICglcCkiLAotCSAgICAgICBm dW5jLCBmdW5jX2RhdGEpOworICAgIGdfd2FybmluZyAoIiVzKCk6IHVuYWJsZSB0byByZW1vdmUg bm90aWZpZXIgPCVwPiAoJXApIiwKKwkgICAgICAgR19HTlVDX1BSRVRUWV9GVU5DVElPTiwgZnVu YywgZnVuY19kYXRhKTsKIH0KIAogdm9pZApAQCAtMTY0Myw4ICsxNjQ0LDggQEAgZ3dtaF90YXNr X25vdGlmaWVyX3JlbW92ZV9mdW5jIChHd21oVGFzawogICBpZiAoaG9vaykKICAgICBnX2hvb2tf ZGVzdHJveV9saW5rICgmZ3dtaF90YXNrX2hvb2tfbGlzdCwgaG9vayk7CiAgIGVsc2UKLSAgICBn X3dhcm5pbmcgKEdfR05VQ19QUkVUVFlfRlVOQ1RJT04gIigpOiB1bmFibGUgdG8gcmVtb3ZlIG5v dGlmaWVyIDwlcD4gKCVwKSIsCi0JICAgICAgIGZ1bmMsIGZ1bmNfZGF0YSk7CisgICAgZ193YXJu aW5nICgiJXMoKTogdW5hYmxlIHRvIHJlbW92ZSBub3RpZmllciA8JXA+ICglcCkiLAorCSAgICAg ICBHX0dOVUNfUFJFVFRZX0ZVTkNUSU9OLCBmdW5jLCBmdW5jX2RhdGEpOwogfQogCiBzdGF0aWMg Z2Jvb2xlYW4KLS0tIGdub21lLWNvcmUtMS40LjIvcGFuZWwveHN0dWZmLmMub3JpZwkyMDA2LTEw LTI1IDExOjA0OjA3LjAwMDAwMDAwMCArMDIwMAorKysgZ25vbWUtY29yZS0xLjQuMi9wYW5lbC94 c3R1ZmYuYwkyMDA2LTEwLTI1IDExOjA0OjQ2LjAwMDAwMDAwMCArMDIwMApAQCAtMzIyLDE5ICsz MjIsMjAgQEAgZ2V0X3R5cGVkX3Byb3BlcnR5X2RhdGEgKERpc3BsYXkgKnhkaXNwbAogICAgICAg cmVxdWVzdGVkX3R5cGUgIT0gQW55UHJvcGVydHlUeXBlICYmCiAgICAgICByZXF1ZXN0ZWRfdHlw ZSAhPSB0eXBlX3JldHVybmVkKQogICAgIHsKLSAgICAgIGdfd2FybmluZyAoR19HTlVDX1BSRVRU WV9GVU5DVElPTiAiKCk6IFByb3BlcnR5IGhhcyB3cm9uZyB0eXBlLCBwcm9iYWJseSBvbiBjcmFj ayIpOworICAgICAgZ193YXJuaW5nICgiJXMoKTogUHJvcGVydHkgaGFzIHdyb25nIHR5cGUsIHBy b2JhYmx5IG9uIGNyYWNrIiwKKwkJIEdfR05VQ19QUkVUVFlfRlVOQ1RJT04pOwogICAgICAgYWJv cnQrKzsKICAgICB9CiAgIGlmICghYWJvcnQgJiYgYnl0ZXNfYWZ0ZXJfcmV0dXJuKQogICAgIHsK LSAgICAgIGdfd2FybmluZyAoR19HTlVDX1BSRVRUWV9GVU5DVElPTiAiKCk6IEVlZWssIHByb3Bl cnR5IGhhcyBtb3JlIHRoYW4gJXUgYnl0ZXMsIHN0b3JlZCBvbiBoYXJkZGlzaz8iLAotCQkgcHJv cF9idWZmZXJfbGVuZ2gpOworICAgICAgZ193YXJuaW5nICgiJXMoKTogRWVlaywgcHJvcGVydHkg aGFzIG1vcmUgdGhhbiAldSBieXRlcywgc3RvcmVkIG9uIGhhcmRkaXNrPyIsCisJCSBHX0dOVUNf UFJFVFRZX0ZVTkNUSU9OLCBwcm9wX2J1ZmZlcl9sZW5naCk7CiAgICAgICBhYm9ydCsrOwogICAg IH0KICAgaWYgKCFhYm9ydCAmJiBleHBlY3RlZF9mb3JtYXQgJiYgZXhwZWN0ZWRfZm9ybWF0ICE9 IGZvcm1hdF9yZXR1cm5lZCkKICAgICB7Ci0gICAgICBnX3dhcm5pbmcgKEdfR05VQ19QUkVUVFlf RlVOQ1RJT04gIigpOiBFeHBlY3RlZCBmb3JtYXQgKCV1KSB1bm1hdGNoZWQgKCVkKSwgcHJvZ3Jh bW1lciB3YXMgZHJ1bms/IiwKLQkJIGV4cGVjdGVkX2Zvcm1hdCwgZm9ybWF0X3JldHVybmVkKTsK KyAgICAgIGdfd2FybmluZyAoIiVzKCk6IEV4cGVjdGVkIGZvcm1hdCAoJXUpIHVubWF0Y2hlZCAo JWQpLCBwcm9ncmFtbWVyIHdhcyBkcnVuaz8iLAorCQkgR19HTlVDX1BSRVRUWV9GVU5DVElPTiwg ZXhwZWN0ZWRfZm9ybWF0LCBmb3JtYXRfcmV0dXJuZWQpOwogICAgICAgYWJvcnQrKzsKICAgICB9 CiAgIGlmICghYWJvcnQgJiYgcHJvcF9kYXRhICYmIG5pdGVtc19yZXR1cm4gJiYgZm9ybWF0X3Jl dHVybmVkKQo=