14141 2007-06-14 09:02:33 -0700 Please add a version to the Gtk port 2008-06-06 01:07:39 -0700 1 1 1 Unclassified WebKit WebKit Misc. 523.x (Safari 3) PC Linux RESOLVED FIXED Gtk P2 Enhancement --- 16562 16584 16624 17066 17171 17176 1 mh+webkit christian alp christian cosimoc marco.barisione pierre-luc.beaudoin slomo oldest_to_newest 7567 0 mh+webkit 2007-06-14 09:02:33 -0700 Please add a VERSION variable in WebCore/WebCore.pro so that the QT and Gtk port libraries have a "proper" SONAME. Please then update this VERSION whenever the ABI is broken. 69319 1 alp 2008-02-03 23:32:09 -0800 I think we're pretty much ready for versioning. We should introduce macros similar to what GTK+ provides for version checking. We'll probably additionally want to allow ways to test the WebCore version at runtime. Patches welcome. 69365 2 christian 2008-02-04 11:13:36 -0800 (In reply to comment #1) > I think we're pretty much ready for versioning. Well, very close, but not quite ready yet unfortunately. Adding the following bugs that touch fundamental API as dependencies: bug 17176, bug 17066, bug 16584, bug 16562, bug 16624, bug 17171 I don't know what the state of some of these bugs is, I hope this won't take too long. 69768 3 alp 2008-02-08 04:02:34 -0800 (In reply to comment #2) > (In reply to comment #1) > > I think we're pretty much ready for versioning. > > Well, very close, but not quite ready yet unfortunately. > > Adding the following bugs that touch fundamental API as dependencies: > bug 17176, bug 17066, bug 16584, bug 16562, bug 16624, bug 17171 Now that the .pc package name and header locations are fixed, it's time to introduce versioning macros ASAP. Perhaps that should be done in a different bug. I think we should consider using versioning, at least as a "test run", very soon. It might make your planned API/ABI changes less painful to early adopters. 82140 4 21465 christian 2008-06-02 11:48:35 -0700 Created attachment 21465 Add version macros This patch implements version macros and functions similar to what glib and gtk have. 82142 5 21465 alp 2008-06-02 12:00:23 -0700 Comment on attachment 21465 Add version macros >diff --git a/GNUmakefile.am b/GNUmakefile.am >index 3118722..bd86ced 100644 >--- a/GNUmakefile.am >+++ b/GNUmakefile.am >@@ -294,6 +294,7 @@ webkitgtk_h_api += \ > WebKit/gtk/webkit/webkit.h \ > WebKit/gtk/webkit/webkitdefines.h \ > WebKit/gtk/webkit/webkitnetworkrequest.h \ >+ WebKit/gtk/webkit/webkitversion.h \ > WebKit/gtk/webkit/webkitwebbackforwardlist.h \ > WebKit/gtk/webkit/webkitwebframe.h \ > WebKit/gtk/webkit/webkitwebhistoryitem.h \ >@@ -317,6 +318,7 @@ webkitgtk_headers += \ > webkitgtk_sources += \ > WebKit/gtk/webkit/webkitnetworkrequest.cpp \ > WebKit/gtk/webkit/webkitprivate.cpp \ >+ WebKit/gtk/webkit/webkitversion.cpp \ > WebKit/gtk/webkit/webkitwebbackforwardlist.cpp \ > WebKit/gtk/webkit/webkitwebframe.cpp \ > WebKit/gtk/webkit/webkitwebhistoryitem.cpp \ >diff --git a/WebKit/gtk/webkit/webkit.h b/WebKit/gtk/webkit/webkit.h >index babd50a..55d5b56 100644 >--- a/WebKit/gtk/webkit/webkit.h >+++ b/WebKit/gtk/webkit/webkit.h >@@ -20,6 +20,7 @@ > #ifndef __WEBKIT_H__ > #define __WEBKIT_H__ > >+#include <webkit/webkitversion.h> > #include <webkit/webkitdefines.h> > #include <webkit/webkitnetworkrequest.h> > #include <webkit/webkitwebframe.h> >diff --git a/WebKit/gtk/webkit/webkitversion.cpp b/WebKit/gtk/webkit/webkitversion.cpp >new file mode 100644 >index 0000000..ea78993 >--- /dev/null >+++ b/WebKit/gtk/webkit/webkitversion.cpp >@@ -0,0 +1,57 @@ >+/* >+ * Copyright (C) 2008 Christian Dywan <christian@imendio.com> >+ * >+ * This library is free software; you can redistribute it and/or >+ * modify it under the terms of the GNU Library General Public >+ * License as published by the Free Software Foundation; either >+ * version 2 of the License, or (at your option) any later version. >+ * >+ * This library is distributed in the hope that it will be useful, >+ * but WITHOUT ANY WARRANTY; without even the implied warranty of >+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >+ * Library General Public License for more details. >+ * >+ * You should have received a copy of the GNU Library General Public License >+ * along with this library; see the file COPYING.LIB. If not, write to >+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, >+ * Boston, MA 02110-1301, USA. >+ */ >+ >+#include "webkitversion.h" >+ I believe everything after the includes should be wrapped with extern "C". Check with me if in doubt. >+/** >+ * webkit_major_version: >+ * >+ * The major version number of the WebKit that is linked against. >+ * >+ * Return value: The major version >+ */ >+guint webkit_major_version(void) >+{ >+ return WEBKIT_MAJOR_VERSION; >+} Please remove the empty void from the implementations (though it's correct to have them in the header). Should be only one newline below.. >+ >+ >+/** >+ * webkit_minor_version: >+ * >+ * The minor version number of the WebKit that is linked against. >+ * >+ * Return value: The minor version >+ */ >+guint webkit_minor_version(void) >+{ >+ return WEBKIT_MINOR_VERSION; >+} >+ >+/** >+ * webkit_micro_version: >+ * >+ * The micro version number of the WebKit that is linked against. >+ * >+ * Return value: The micro version >+ */ >+guint webkit_micro_version(void) >+{ >+ return WEBKIT_MICRO_VERSION; >+} >diff --git a/WebKit/gtk/webkit/webkitversion.h b/WebKit/gtk/webkit/webkitversion.h >new file mode 100644 >index 0000000..29c96fa >--- /dev/null >+++ b/WebKit/gtk/webkit/webkitversion.h >@@ -0,0 +1,52 @@ >+/* >+ * Copyright (C) 2008 Christian Dywan <christian@imendio.com> >+ * >+ * This library is free software; you can redistribute it and/or >+ * modify it under the terms of the GNU Library General Public >+ * License as published by the Free Software Foundation; either >+ * version 2 of the License, or (at your option) any later version. >+ * >+ * This library is distributed in the hope that it will be useful, >+ * but WITHOUT ANY WARRANTY; without even the implied warranty of >+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >+ * Library General Public License for more details. >+ * >+ * You should have received a copy of the GNU Library General Public License >+ * along with this library; see the file COPYING.LIB. If not, write to >+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, >+ * Boston, MA 02110-1301, USA. >+ */ >+ >+#ifndef WEBKIT_VERSION_H >+#define WEBKIT_VERSION_H >+ >+#include <glib.h> >+#include <webkit/webkitdefines.h> >+ >+G_BEGIN_DECLS >+ >+#define WEBKIT_MAJOR_VERSION 1 >+#define WEBKIT_MINOR_VERSION 0 >+#define WEBKIT_MICRO_VERSION 1 ^ I wonder if we should hook this up to autoconf from the get-go. >+ >+#define WEBKIT_CHECK_VERSION(major, minor, micro) \ >+ (WEBKIT_MAJOR_VERSION > (major) || \ >+ (WEBKIT_MAJOR_VERSION == (major) && WEBKIT_MINOR_VERSION > (minor)) || \ >+ (WEBKIT_MAJOR_VERSION == (major) && WEBKIT_MINOR_VERSION == (minor) && \ >+ WEBKIT_MICRO_VERSION >= (micro))) >+ >+WEBKIT_API guint >+webkit_major_version (void); >+ >+WEBKIT_API guint >+webkit_minor_version (void); >+ >+WEBKIT_API guint >+webkit_micro_version (void); >+ >+WEBKIT_API gboolean >+webkit_check_version (guint major, guint minor, guint micro); >+ >+G_END_DECLS >+ >+#endif >diff --git a/WebKit/gtk/webkit/webkitwebsettings.cpp b/WebKit/gtk/webkit/webkitwebsettings.cpp >index 26d60b3..08e409d 100644 >--- a/WebKit/gtk/webkit/webkitwebsettings.cpp >+++ b/WebKit/gtk/webkit/webkitwebsettings.cpp >@@ -252,6 +252,13 @@ static void webkit_web_settings_class_init(WebKitWebSettingsClass* klass) > 0, > flags)); > >+ /** >+ * WebKitWebSettings:zoom-step: >+ * >+ * The value by which the zoom level is changed when zooming in or out. >+ * >+ * Since: 1.0.1 >+ */ > g_object_class_install_property(gobject_class, > PROP_ZOOM_STEP, > g_param_spec_float( >diff --git a/WebKit/gtk/webkit/webkitwebview.cpp b/WebKit/gtk/webkit/webkitwebview.cpp >index d831c74..9de77f5 100644 >--- a/WebKit/gtk/webkit/webkitwebview.cpp >+++ b/WebKit/gtk/webkit/webkitwebview.cpp >@@ -1220,6 +1220,13 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass) > FALSE, > WEBKIT_PARAM_READWRITE)); > >+ /** >+ * WebKitWebView:zoom-level: >+ * >+ * The level of zoom of the content. >+ * >+ * Since: 1.0.1 >+ */ > g_object_class_install_property(objectClass, PROP_ZOOM_LEVEL, > g_param_spec_float("zoom-level", > "Zoom level", >@@ -1229,6 +1236,13 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass) > 1.0f, > WEBKIT_PARAM_READWRITE)); > >+ /** >+ * WebKitWebView:full-content-zoom: >+ * >+ * Whether the full content is scaled when zooming. >+ * >+ * Since: 1.0.1 >+ */ > g_object_class_install_property(objectClass, PROP_FULL_CONTENT_ZOOM, > g_param_spec_boolean("full-content-zoom", > "Full content zoom", >@@ -2065,6 +2079,8 @@ void webkit_web_view_set_transparent(WebKitWebView* webView, gboolean flag) > * elements in the page. > * > * Return value: the zoom level of @web_view >+ * >+ * Since: 1.0.1 > */ > gfloat webkit_web_view_get_zoom_level(WebKitWebView* webView) > { >@@ -2097,6 +2113,8 @@ static void webkit_web_view_apply_zoom_level(WebKitWebView* webView, gfloat zoom > * If the "full-content-zoom" property is set to %FALSE (the default) > * the zoom level changes the text size, or if %TRUE, scales all > * elements in the page. >+ * >+ * Since: 1.0.1 > */ > void webkit_web_view_set_zoom_level(WebKitWebView* webView, gfloat zoomLevel) > { >@@ -2113,6 +2131,8 @@ void webkit_web_view_set_zoom_level(WebKitWebView* webView, gfloat zoomLevel) > * Increases the zoom level of @web_view. The current zoom > * level is incremented by the value of the "zoom-step" > * property of the #WebKitWebSettings associated with @web_view. >+ * >+ * Since: 1.0.1 > */ > void webkit_web_view_zoom_in(WebKitWebView* webView) > { >@@ -2132,6 +2152,8 @@ void webkit_web_view_zoom_in(WebKitWebView* webView) > * Decreases the zoom level of @web_view. The current zoom > * level is decremented by the value of the "zoom-step" > * property of the #WebKitWebSettings associated with @web_view. >+ * >+ * Since: 1.0.1 > */ > void webkit_web_view_zoom_out(WebKitWebView* webView) > { >@@ -2152,6 +2174,8 @@ void webkit_web_view_zoom_out(WebKitWebView* webView) > * > * Return value: %FALSE if only text should be scaled (the default), > * %TRUE if the full content of the view should be scaled. >+ * >+ * Since: 1.0.1 > */ > gboolean webkit_web_view_get_full_content_zoom(WebKitWebView* webView) > { >@@ -2168,6 +2192,8 @@ gboolean webkit_web_view_get_full_content_zoom(WebKitWebView* webView) > * %TRUE if the full content of the view should be scaled. > * > * Sets whether the zoom level affects only text or all elements. >+ * >+ * Since: 1.0.1 > */ > void webkit_web_view_set_full_content_zoom(WebKitWebView* webView, gboolean zoomFullContent) > { 82161 6 21468 christian 2008-06-02 14:44:03 -0700 Created attachment 21468 Add version macros, with autotool magic Fixed according to comments including integration with autotools. 82327 7 alp 2008-06-04 23:10:22 -0700 (In reply to comment #6) > Created an attachment (id=21468) [edit] > Add version macros, with autotool magic > > Fixed according to comments including integration with autotools. > +LIBWEBKITGTK_VERSION=webkit_major_version:webkit_minor_version:webkit_micro_version ^ Trying to remember what we decided (we were reading sjoerd's mail on soname versioning IIRC). Is this safe? 82343 8 slomo 2008-06-05 05:28:05 -0700 No, it's plain wrong. You should forget about any correlation between the "version number", i.e. webkit 1.0.1.2.3 and the "library version". The correct thing to do is to start at 0:0:0 and then apply the following rules before every release: dnl ################################################################ dnl # libtool versioning dnl ################################################################ dnl # dnl # +1 : 0 : +1 == new interface that does not break old one. dnl # +1 : 0 : 0 == removed an interface. Breaks old apps. dnl # ? : +1 : ? == internal changes that doesn't break anything. dnl # dnl # CURRENT : REVISION : AGE dnl # LT_CURRENT=2 LT_REVISION=2 LT_AGE=1 LT_* are then passed to the -version-info parameter like -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) This will then care for correct numbers at the end of the filenames of the library ;) 82362 9 21513 christian 2008-06-05 15:12:14 -0700 Created attachment 21513 Correct libtool version This patch has a proper libtool version and a little table as well as a libtool documentation link. We don't gurarantee stability yet, so don't rely on this ;) 82364 10 christian 2008-06-05 15:53:16 -0700 Committed in r34387. Left out libtool versioning as discussed in IRC. 82381 11 21513 alp 2008-06-05 20:57:11 -0700 Comment on attachment 21513 Correct libtool version Landed already. 82396 12 slomo 2008-06-06 01:07:39 -0700 Ok, so is there a new bug about the libtool versioning? 21465 2008-06-02 11:48:35 -0700 2008-06-05 20:57:21 -0700 Add version macros webkitversion.diff text/plain 8882 christian ZGlmZiAtLWdpdCBhL0dOVW1ha2VmaWxlLmFtIGIvR05VbWFrZWZpbGUuYW0KaW5kZXggMzExODcy Mi4uYmQ4NmNlZCAxMDA2NDQKLS0tIGEvR05VbWFrZWZpbGUuYW0KKysrIGIvR05VbWFrZWZpbGUu YW0KQEAgLTI5NCw2ICsyOTQsNyBAQCB3ZWJraXRndGtfaF9hcGkgKz0gXAogCVdlYktpdC9ndGsv d2Via2l0L3dlYmtpdC5oIFwKIAlXZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRkZWZpbmVzLmggXAog CVdlYktpdC9ndGsvd2Via2l0L3dlYmtpdG5ldHdvcmtyZXF1ZXN0LmggXAorCVdlYktpdC9ndGsv d2Via2l0L3dlYmtpdHZlcnNpb24uaCBcCiAJV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2ViYmFj a2ZvcndhcmRsaXN0LmggXAogCVdlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYmZyYW1lLmggXAog CVdlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYmhpc3RvcnlpdGVtLmggXApAQCAtMzE3LDYgKzMx OCw3IEBAIHdlYmtpdGd0a19oZWFkZXJzICs9IFwKIHdlYmtpdGd0a19zb3VyY2VzICs9IFwKIAlX ZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRuZXR3b3JrcmVxdWVzdC5jcHAgXAogCVdlYktpdC9ndGsv d2Via2l0L3dlYmtpdHByaXZhdGUuY3BwIFwKKwlXZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR2ZXJz aW9uLmNwcCBcCiAJV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2ViYmFja2ZvcndhcmRsaXN0LmNw cCBcCiAJV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2ViZnJhbWUuY3BwIFwKIAlXZWJLaXQvZ3Rr L3dlYmtpdC93ZWJraXR3ZWJoaXN0b3J5aXRlbS5jcHAgXApkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0 ay93ZWJraXQvd2Via2l0LmggYi9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXQuaAppbmRleCBiYWJk NTBhLi41NWQ1YjU2IDEwMDY0NAotLS0gYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXQuaAorKysg Yi9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXQuaApAQCAtMjAsNiArMjAsNyBAQAogI2lmbmRlZiBf X1dFQktJVF9IX18KICNkZWZpbmUgX19XRUJLSVRfSF9fCiAKKyNpbmNsdWRlIDx3ZWJraXQvd2Vi a2l0dmVyc2lvbi5oPgogI2luY2x1ZGUgPHdlYmtpdC93ZWJraXRkZWZpbmVzLmg+CiAjaW5jbHVk ZSA8d2Via2l0L3dlYmtpdG5ldHdvcmtyZXF1ZXN0Lmg+CiAjaW5jbHVkZSA8d2Via2l0L3dlYmtp dHdlYmZyYW1lLmg+CmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR2ZXJzaW9u LmNwcCBiL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHZlcnNpb24uY3BwCm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAuLmVhNzg5OTMKLS0tIC9kZXYvbnVsbAorKysgYi9XZWJLaXQv Z3RrL3dlYmtpdC93ZWJraXR2ZXJzaW9uLmNwcApAQCAtMCwwICsxLDU3IEBACisvKgorICogQ29w eXJpZ2h0IChDKSAyMDA4IENocmlzdGlhbiBEeXdhbiA8Y2hyaXN0aWFuQGltZW5kaW8uY29tPgor ICoKKyAqIFRoaXMgbGlicmFyeSBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0 ZSBpdCBhbmQvb3IKKyAqIG1vZGlmeSBpdCB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEdOVSBMaWJy YXJ5IEdlbmVyYWwgUHVibGljCisgKiBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBieSB0aGUgRnJlZSBT b2Z0d2FyZSBGb3VuZGF0aW9uOyBlaXRoZXIKKyAqIHZlcnNpb24gMiBvZiB0aGUgTGljZW5zZSwg b3IgKGF0IHlvdXIgb3B0aW9uKSBhbnkgbGF0ZXIgdmVyc2lvbi4KKyAqCisgKiBUaGlzIGxpYnJh cnkgaXMgZGlzdHJpYnV0ZWQgaW4gdGhlIGhvcGUgdGhhdCBpdCB3aWxsIGJlIHVzZWZ1bCwKKyAq IGJ1dCBXSVRIT1VUIEFOWSBXQVJSQU5UWTsgd2l0aG91dCBldmVuIHRoZSBpbXBsaWVkIHdhcnJh bnR5IG9mCisgKiBNRVJDSEFOVEFCSUxJVFkgb3IgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBV UlBPU0UuICBTZWUgdGhlIEdOVQorICogTGlicmFyeSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGZv ciBtb3JlIGRldGFpbHMuCisgKgorICogWW91IHNob3VsZCBoYXZlIHJlY2VpdmVkIGEgY29weSBv ZiB0aGUgR05VIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMgTGljZW5zZQorICogYWxvbmcgd2l0aCB0 aGlzIGxpYnJhcnk7IHNlZSB0aGUgZmlsZSBDT1BZSU5HLkxJQi4gIElmIG5vdCwgd3JpdGUgdG8K KyAqIHRoZSBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24sIEluYy4sIDUxIEZyYW5rbGluIFN0cmVl dCwgRmlmdGggRmxvb3IsCisgKiBCb3N0b24sIE1BIDAyMTEwLTEzMDEsIFVTQS4KKyAqLworCisj aW5jbHVkZSAid2Via2l0dmVyc2lvbi5oIgorCisvKioKKyAqIHdlYmtpdF9tYWpvcl92ZXJzaW9u OgorICoKKyAqIFRoZSBtYWpvciB2ZXJzaW9uIG51bWJlciBvZiB0aGUgV2ViS2l0IHRoYXQgaXMg bGlua2VkIGFnYWluc3QuCisgKgorICogUmV0dXJuIHZhbHVlOiBUaGUgbWFqb3IgdmVyc2lvbgor ICovCitndWludCB3ZWJraXRfbWFqb3JfdmVyc2lvbih2b2lkKQoreworICAgIHJldHVybiBXRUJL SVRfTUFKT1JfVkVSU0lPTjsKK30KKworCisvKioKKyAqIHdlYmtpdF9taW5vcl92ZXJzaW9uOgor ICoKKyAqIFRoZSBtaW5vciB2ZXJzaW9uIG51bWJlciBvZiB0aGUgV2ViS2l0IHRoYXQgaXMgbGlu a2VkIGFnYWluc3QuCisgKgorICogUmV0dXJuIHZhbHVlOiBUaGUgbWlub3IgdmVyc2lvbgorICov CitndWludCB3ZWJraXRfbWlub3JfdmVyc2lvbih2b2lkKQoreworICAgIHJldHVybiBXRUJLSVRf TUlOT1JfVkVSU0lPTjsKK30KKworLyoqCisgKiB3ZWJraXRfbWljcm9fdmVyc2lvbjoKKyAqCisg KiBUaGUgbWljcm8gdmVyc2lvbiBudW1iZXIgb2YgdGhlIFdlYktpdCB0aGF0IGlzIGxpbmtlZCBh Z2FpbnN0LgorICoKKyAqIFJldHVybiB2YWx1ZTogVGhlIG1pY3JvIHZlcnNpb24KKyAqLworZ3Vp bnQgd2Via2l0X21pY3JvX3ZlcnNpb24odm9pZCkKK3sKKyAgICByZXR1cm4gV0VCS0lUX01JQ1JP X1ZFUlNJT047Cit9CmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR2ZXJzaW9u LmggYi9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR2ZXJzaW9uLmgKbmV3IGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggMDAwMDAwMC4uMjljOTZmYQotLS0gL2Rldi9udWxsCisrKyBiL1dlYktpdC9ndGsv d2Via2l0L3dlYmtpdHZlcnNpb24uaApAQCAtMCwwICsxLDUyIEBACisvKgorICogQ29weXJpZ2h0 IChDKSAyMDA4IENocmlzdGlhbiBEeXdhbiA8Y2hyaXN0aWFuQGltZW5kaW8uY29tPgorICoKKyAq IFRoaXMgbGlicmFyeSBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBh bmQvb3IKKyAqIG1vZGlmeSBpdCB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEdOVSBMaWJyYXJ5IEdl bmVyYWwgUHVibGljCisgKiBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBieSB0aGUgRnJlZSBTb2Z0d2Fy ZSBGb3VuZGF0aW9uOyBlaXRoZXIKKyAqIHZlcnNpb24gMiBvZiB0aGUgTGljZW5zZSwgb3IgKGF0 IHlvdXIgb3B0aW9uKSBhbnkgbGF0ZXIgdmVyc2lvbi4KKyAqCisgKiBUaGlzIGxpYnJhcnkgaXMg ZGlzdHJpYnV0ZWQgaW4gdGhlIGhvcGUgdGhhdCBpdCB3aWxsIGJlIHVzZWZ1bCwKKyAqIGJ1dCBX SVRIT1VUIEFOWSBXQVJSQU5UWTsgd2l0aG91dCBldmVuIHRoZSBpbXBsaWVkIHdhcnJhbnR5IG9m CisgKiBNRVJDSEFOVEFCSUxJVFkgb3IgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBVUlBPU0Uu ICBTZWUgdGhlIEdOVQorICogTGlicmFyeSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGZvciBtb3Jl IGRldGFpbHMuCisgKgorICogWW91IHNob3VsZCBoYXZlIHJlY2VpdmVkIGEgY29weSBvZiB0aGUg R05VIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMgTGljZW5zZQorICogYWxvbmcgd2l0aCB0aGlzIGxp YnJhcnk7IHNlZSB0aGUgZmlsZSBDT1BZSU5HLkxJQi4gIElmIG5vdCwgd3JpdGUgdG8KKyAqIHRo ZSBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24sIEluYy4sIDUxIEZyYW5rbGluIFN0cmVldCwgRmlm dGggRmxvb3IsCisgKiBCb3N0b24sIE1BIDAyMTEwLTEzMDEsIFVTQS4KKyAqLworCisjaWZuZGVm IFdFQktJVF9WRVJTSU9OX0gKKyNkZWZpbmUgV0VCS0lUX1ZFUlNJT05fSAorCisjaW5jbHVkZSA8 Z2xpYi5oPgorI2luY2x1ZGUgPHdlYmtpdC93ZWJraXRkZWZpbmVzLmg+CisKK0dfQkVHSU5fREVD TFMKKworI2RlZmluZSBXRUJLSVRfTUFKT1JfVkVSU0lPTiAxCisjZGVmaW5lIFdFQktJVF9NSU5P Ul9WRVJTSU9OIDAKKyNkZWZpbmUgV0VCS0lUX01JQ1JPX1ZFUlNJT04gMQorCisjZGVmaW5lIFdF QktJVF9DSEVDS19WRVJTSU9OKG1ham9yLCBtaW5vciwgbWljcm8pIFwKKyAgKFdFQktJVF9NQUpP Ul9WRVJTSU9OID4gKG1ham9yKSB8fCBcCisgIChXRUJLSVRfTUFKT1JfVkVSU0lPTiA9PSAobWFq b3IpICYmIFdFQktJVF9NSU5PUl9WRVJTSU9OID4gKG1pbm9yKSkgfHwgXAorICAoV0VCS0lUX01B Sk9SX1ZFUlNJT04gPT0gKG1ham9yKSAmJiBXRUJLSVRfTUlOT1JfVkVSU0lPTiA9PSAobWlub3Ip ICYmIFwKKyAgV0VCS0lUX01JQ1JPX1ZFUlNJT04gPj0gKG1pY3JvKSkpCisKK1dFQktJVF9BUEkg Z3VpbnQKK3dlYmtpdF9tYWpvcl92ZXJzaW9uICh2b2lkKTsKKworV0VCS0lUX0FQSSBndWludAor d2Via2l0X21pbm9yX3ZlcnNpb24gKHZvaWQpOworCitXRUJLSVRfQVBJIGd1aW50Cit3ZWJraXRf bWljcm9fdmVyc2lvbiAodm9pZCk7CisKK1dFQktJVF9BUEkgZ2Jvb2xlYW4KK3dlYmtpdF9jaGVj a192ZXJzaW9uIChndWludCBtYWpvciwgZ3VpbnQgbWlub3IsIGd1aW50IG1pY3JvKTsKKworR19F TkRfREVDTFMKKworI2VuZGlmCmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3 ZWJzZXR0aW5ncy5jcHAgYi9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJzZXR0aW5ncy5jcHAK aW5kZXggMjZkNjBiMy4uMDhlNDA5ZCAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay93ZWJraXQvd2Vi a2l0d2Vic2V0dGluZ3MuY3BwCisrKyBiL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnNldHRp bmdzLmNwcApAQCAtMjUyLDYgKzI1MiwxMyBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3NldHRp bmdzX2NsYXNzX2luaXQoV2ViS2l0V2ViU2V0dGluZ3NDbGFzcyoga2xhc3MpCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAwLAogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgZmxhZ3MpKTsKIAorICAgIC8qKgorICAgICogV2ViS2l0V2ViU2V0dGluZ3M6em9v bS1zdGVwOgorICAgICoKKyAgICAqIFRoZSB2YWx1ZSBieSB3aGljaCB0aGUgem9vbSBsZXZlbCBp cyBjaGFuZ2VkIHdoZW4gem9vbWluZyBpbiBvciBvdXQuCisgICAgKgorICAgICogU2luY2U6IDEu MC4xCisgICAgKi8KICAgICBnX29iamVjdF9jbGFzc19pbnN0YWxsX3Byb3BlcnR5KGdvYmplY3Rf Y2xhc3MsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBQUk9QX1pPT01fU1RF UCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdfcGFyYW1fc3BlY19mbG9h dCgKZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwIGIvV2Vi S2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAKaW5kZXggZDgzMWM3NC4uOWRlNzdmNSAx MDA2NDQKLS0tIGEvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAKKysrIGIvV2Vi S2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAKQEAgLTEyMjAsNiArMTIyMCwxMyBAQCBz dGF0aWMgdm9pZCB3ZWJraXRfd2ViX3ZpZXdfY2xhc3NfaW5pdChXZWJLaXRXZWJWaWV3Q2xhc3Mq IHdlYlZpZXdDbGFzcykKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIEZBTFNFLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgV0VCS0lUX1BBUkFNX1JFQURXUklURSkpOwogCisgICAg LyoqCisgICAgKiBXZWJLaXRXZWJWaWV3Onpvb20tbGV2ZWw6CisgICAgKgorICAgICogVGhlIGxl dmVsIG9mIHpvb20gb2YgdGhlIGNvbnRlbnQuCisgICAgKgorICAgICogU2luY2U6IDEuMC4xCisg ICAgKi8KICAgICBnX29iamVjdF9jbGFzc19pbnN0YWxsX3Byb3BlcnR5KG9iamVjdENsYXNzLCBQ Uk9QX1pPT01fTEVWRUwsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBnX3Bh cmFtX3NwZWNfZmxvYXQoInpvb20tbGV2ZWwiLAogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICJab29tIGxldmVsIiwKQEAgLTEyMjksNiArMTIz NiwxMyBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3ZpZXdfY2xhc3NfaW5pdChXZWJLaXRXZWJW aWV3Q2xhc3MqIHdlYlZpZXdDbGFzcykKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAxLjBmLAogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIFdFQktJVF9QQVJBTV9SRUFEV1JJVEUpKTsKIAor ICAgIC8qKgorICAgICogV2ViS2l0V2ViVmlldzpmdWxsLWNvbnRlbnQtem9vbToKKyAgICAqCisg ICAgKiBXaGV0aGVyIHRoZSBmdWxsIGNvbnRlbnQgaXMgc2NhbGVkIHdoZW4gem9vbWluZy4KKyAg ICAqCisgICAgKiBTaW5jZTogMS4wLjEKKyAgICAqLwogICAgIGdfb2JqZWN0X2NsYXNzX2luc3Rh bGxfcHJvcGVydHkob2JqZWN0Q2xhc3MsIFBST1BfRlVMTF9DT05URU5UX1pPT00sCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBnX3BhcmFtX3NwZWNfYm9vbGVhbigiZnVsbC1j b250ZW50LXpvb20iLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIkZ1bGwgY29udGVudCB6b29tIiwKQEAgLTIwNjUsNiArMjA3OSw4IEBA IHZvaWQgd2Via2l0X3dlYl92aWV3X3NldF90cmFuc3BhcmVudChXZWJLaXRXZWJWaWV3KiB3ZWJW aWV3LCBnYm9vbGVhbiBmbGFnKQogICogZWxlbWVudHMgaW4gdGhlIHBhZ2UuCiAgKgogICogUmV0 dXJuIHZhbHVlOiB0aGUgem9vbSBsZXZlbCBvZiBAd2ViX3ZpZXcKKyAqCisgKiBTaW5jZTogMS4w LjEKICAqLwogZ2Zsb2F0IHdlYmtpdF93ZWJfdmlld19nZXRfem9vbV9sZXZlbChXZWJLaXRXZWJW aWV3KiB3ZWJWaWV3KQogewpAQCAtMjA5Nyw2ICsyMTEzLDggQEAgc3RhdGljIHZvaWQgd2Via2l0 X3dlYl92aWV3X2FwcGx5X3pvb21fbGV2ZWwoV2ViS2l0V2ViVmlldyogd2ViVmlldywgZ2Zsb2F0 IHpvb20KICAqIElmIHRoZSAiZnVsbC1jb250ZW50LXpvb20iIHByb3BlcnR5IGlzIHNldCB0byAl RkFMU0UgKHRoZSBkZWZhdWx0KQogICogdGhlIHpvb20gbGV2ZWwgY2hhbmdlcyB0aGUgdGV4dCBz aXplLCBvciBpZiAlVFJVRSwgc2NhbGVzIGFsbAogICogZWxlbWVudHMgaW4gdGhlIHBhZ2UuCisg KgorICogU2luY2U6IDEuMC4xCiAgKi8KIHZvaWQgd2Via2l0X3dlYl92aWV3X3NldF96b29tX2xl dmVsKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcsIGdmbG9hdCB6b29tTGV2ZWwpCiB7CkBAIC0yMTEz LDYgKzIxMzEsOCBAQCB2b2lkIHdlYmtpdF93ZWJfdmlld19zZXRfem9vbV9sZXZlbChXZWJLaXRX ZWJWaWV3KiB3ZWJWaWV3LCBnZmxvYXQgem9vbUxldmVsKQogICogSW5jcmVhc2VzIHRoZSB6b29t IGxldmVsIG9mIEB3ZWJfdmlldy4gVGhlIGN1cnJlbnQgem9vbQogICogbGV2ZWwgaXMgaW5jcmVt ZW50ZWQgYnkgdGhlIHZhbHVlIG9mIHRoZSAiem9vbS1zdGVwIgogICogcHJvcGVydHkgb2YgdGhl ICNXZWJLaXRXZWJTZXR0aW5ncyBhc3NvY2lhdGVkIHdpdGggQHdlYl92aWV3LgorICoKKyAqIFNp bmNlOiAxLjAuMQogICovCiB2b2lkIHdlYmtpdF93ZWJfdmlld196b29tX2luKFdlYktpdFdlYlZp ZXcqIHdlYlZpZXcpCiB7CkBAIC0yMTMyLDYgKzIxNTIsOCBAQCB2b2lkIHdlYmtpdF93ZWJfdmll d196b29tX2luKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpCiAgKiBEZWNyZWFzZXMgdGhlIHpvb20g bGV2ZWwgb2YgQHdlYl92aWV3LiBUaGUgY3VycmVudCB6b29tCiAgKiBsZXZlbCBpcyBkZWNyZW1l bnRlZCBieSB0aGUgdmFsdWUgb2YgdGhlICJ6b29tLXN0ZXAiCiAgKiBwcm9wZXJ0eSBvZiB0aGUg I1dlYktpdFdlYlNldHRpbmdzIGFzc29jaWF0ZWQgd2l0aCBAd2ViX3ZpZXcuCisgKgorICogU2lu Y2U6IDEuMC4xCiAgKi8KIHZvaWQgd2Via2l0X3dlYl92aWV3X3pvb21fb3V0KFdlYktpdFdlYlZp ZXcqIHdlYlZpZXcpCiB7CkBAIC0yMTUyLDYgKzIxNzQsOCBAQCB2b2lkIHdlYmtpdF93ZWJfdmll d196b29tX291dChXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KQogICoKICAqIFJldHVybiB2YWx1ZTog JUZBTFNFIGlmIG9ubHkgdGV4dCBzaG91bGQgYmUgc2NhbGVkICh0aGUgZGVmYXVsdCksCiAgKiAl VFJVRSBpZiB0aGUgZnVsbCBjb250ZW50IG9mIHRoZSB2aWV3IHNob3VsZCBiZSBzY2FsZWQuCisg KgorICogU2luY2U6IDEuMC4xCiAgKi8KIGdib29sZWFuIHdlYmtpdF93ZWJfdmlld19nZXRfZnVs bF9jb250ZW50X3pvb20oV2ViS2l0V2ViVmlldyogd2ViVmlldykKIHsKQEAgLTIxNjgsNiArMjE5 Miw4IEBAIGdib29sZWFuIHdlYmtpdF93ZWJfdmlld19nZXRfZnVsbF9jb250ZW50X3pvb20oV2Vi S2l0V2ViVmlldyogd2ViVmlldykKICAqICVUUlVFIGlmIHRoZSBmdWxsIGNvbnRlbnQgb2YgdGhl IHZpZXcgc2hvdWxkIGJlIHNjYWxlZC4KICAqCiAgKiBTZXRzIHdoZXRoZXIgdGhlIHpvb20gbGV2 ZWwgYWZmZWN0cyBvbmx5IHRleHQgb3IgYWxsIGVsZW1lbnRzLgorICoKKyAqIFNpbmNlOiAxLjAu MQogICovCiB2b2lkIHdlYmtpdF93ZWJfdmlld19zZXRfZnVsbF9jb250ZW50X3pvb20oV2ViS2l0 V2ViVmlldyogd2ViVmlldywgZ2Jvb2xlYW4gem9vbUZ1bGxDb250ZW50KQogewo= 21468 2008-06-02 14:44:03 -0700 2008-06-05 15:12:14 -0700 Add version macros, with autotool magic webkitversion.diff text/plain 10163 christian ZGlmZiAtLWdpdCBhL0dOVW1ha2VmaWxlLmFtIGIvR05VbWFrZWZpbGUuYW0KaW5kZXggMzExODcy Mi4uYmQ4NmNlZCAxMDA2NDQKLS0tIGEvR05VbWFrZWZpbGUuYW0KKysrIGIvR05VbWFrZWZpbGUu YW0KQEAgLTI5NCw2ICsyOTQsNyBAQCB3ZWJraXRndGtfaF9hcGkgKz0gXAogCVdlYktpdC9ndGsv d2Via2l0L3dlYmtpdC5oIFwKIAlXZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRkZWZpbmVzLmggXAog CVdlYktpdC9ndGsvd2Via2l0L3dlYmtpdG5ldHdvcmtyZXF1ZXN0LmggXAorCVdlYktpdC9ndGsv d2Via2l0L3dlYmtpdHZlcnNpb24uaCBcCiAJV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2ViYmFj a2ZvcndhcmRsaXN0LmggXAogCVdlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYmZyYW1lLmggXAog CVdlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYmhpc3RvcnlpdGVtLmggXApAQCAtMzE3LDYgKzMx OCw3IEBAIHdlYmtpdGd0a19oZWFkZXJzICs9IFwKIHdlYmtpdGd0a19zb3VyY2VzICs9IFwKIAlX ZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRuZXR3b3JrcmVxdWVzdC5jcHAgXAogCVdlYktpdC9ndGsv d2Via2l0L3dlYmtpdHByaXZhdGUuY3BwIFwKKwlXZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR2ZXJz aW9uLmNwcCBcCiAJV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2ViYmFja2ZvcndhcmRsaXN0LmNw cCBcCiAJV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2ViZnJhbWUuY3BwIFwKIAlXZWJLaXQvZ3Rr L3dlYmtpdC93ZWJraXR3ZWJoaXN0b3J5aXRlbS5jcHAgXApkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0 ay93ZWJraXQvd2Via2l0LmggYi9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXQuaAppbmRleCBiYWJk NTBhLi41NWQ1YjU2IDEwMDY0NAotLS0gYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXQuaAorKysg Yi9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXQuaApAQCAtMjAsNiArMjAsNyBAQAogI2lmbmRlZiBf X1dFQktJVF9IX18KICNkZWZpbmUgX19XRUJLSVRfSF9fCiAKKyNpbmNsdWRlIDx3ZWJraXQvd2Vi a2l0dmVyc2lvbi5oPgogI2luY2x1ZGUgPHdlYmtpdC93ZWJraXRkZWZpbmVzLmg+CiAjaW5jbHVk ZSA8d2Via2l0L3dlYmtpdG5ldHdvcmtyZXF1ZXN0Lmg+CiAjaW5jbHVkZSA8d2Via2l0L3dlYmtp dHdlYmZyYW1lLmg+CmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR2ZXJzaW9u LmNwcCBiL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHZlcnNpb24uY3BwCm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAuLmFmZDdhZjQKLS0tIC9kZXYvbnVsbAorKysgYi9XZWJLaXQv Z3RrL3dlYmtpdC93ZWJraXR2ZXJzaW9uLmNwcApAQCAtMCwwICsxLDYwIEBACisvKgorICogQ29w eXJpZ2h0IChDKSAyMDA4IENocmlzdGlhbiBEeXdhbiA8Y2hyaXN0aWFuQGltZW5kaW8uY29tPgor ICoKKyAqIFRoaXMgbGlicmFyeSBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0 ZSBpdCBhbmQvb3IKKyAqIG1vZGlmeSBpdCB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEdOVSBMaWJy YXJ5IEdlbmVyYWwgUHVibGljCisgKiBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBieSB0aGUgRnJlZSBT b2Z0d2FyZSBGb3VuZGF0aW9uOyBlaXRoZXIKKyAqIHZlcnNpb24gMiBvZiB0aGUgTGljZW5zZSwg b3IgKGF0IHlvdXIgb3B0aW9uKSBhbnkgbGF0ZXIgdmVyc2lvbi4KKyAqCisgKiBUaGlzIGxpYnJh cnkgaXMgZGlzdHJpYnV0ZWQgaW4gdGhlIGhvcGUgdGhhdCBpdCB3aWxsIGJlIHVzZWZ1bCwKKyAq IGJ1dCBXSVRIT1VUIEFOWSBXQVJSQU5UWTsgd2l0aG91dCBldmVuIHRoZSBpbXBsaWVkIHdhcnJh bnR5IG9mCisgKiBNRVJDSEFOVEFCSUxJVFkgb3IgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBV UlBPU0UuICBTZWUgdGhlIEdOVQorICogTGlicmFyeSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGZv ciBtb3JlIGRldGFpbHMuCisgKgorICogWW91IHNob3VsZCBoYXZlIHJlY2VpdmVkIGEgY29weSBv ZiB0aGUgR05VIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMgTGljZW5zZQorICogYWxvbmcgd2l0aCB0 aGlzIGxpYnJhcnk7IHNlZSB0aGUgZmlsZSBDT1BZSU5HLkxJQi4gIElmIG5vdCwgd3JpdGUgdG8K KyAqIHRoZSBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24sIEluYy4sIDUxIEZyYW5rbGluIFN0cmVl dCwgRmlmdGggRmxvb3IsCisgKiBCb3N0b24sIE1BIDAyMTEwLTEzMDEsIFVTQS4KKyAqLworCisj aW5jbHVkZSAid2Via2l0dmVyc2lvbi5oIgorCitleHRlcm4gIkMiIHsKKworLyoqCisgKiB3ZWJr aXRfbWFqb3JfdmVyc2lvbjoKKyAqCisgKiBUaGUgbWFqb3IgdmVyc2lvbiBudW1iZXIgb2YgdGhl IFdlYktpdCB0aGF0IGlzIGxpbmtlZCBhZ2FpbnN0LgorICoKKyAqIFJldHVybiB2YWx1ZTogVGhl IG1ham9yIHZlcnNpb24KKyAqLworZ3VpbnQgd2Via2l0X21ham9yX3ZlcnNpb24oKQoreworICAg IHJldHVybiBXRUJLSVRfTUFKT1JfVkVSU0lPTjsKK30KKworLyoqCisgKiB3ZWJraXRfbWlub3Jf dmVyc2lvbjoKKyAqCisgKiBUaGUgbWlub3IgdmVyc2lvbiBudW1iZXIgb2YgdGhlIFdlYktpdCB0 aGF0IGlzIGxpbmtlZCBhZ2FpbnN0LgorICoKKyAqIFJldHVybiB2YWx1ZTogVGhlIG1pbm9yIHZl cnNpb24KKyAqLworZ3VpbnQgd2Via2l0X21pbm9yX3ZlcnNpb24oKQoreworICAgIHJldHVybiBX RUJLSVRfTUlOT1JfVkVSU0lPTjsKK30KKworLyoqCisgKiB3ZWJraXRfbWljcm9fdmVyc2lvbjoK KyAqCisgKiBUaGUgbWljcm8gdmVyc2lvbiBudW1iZXIgb2YgdGhlIFdlYktpdCB0aGF0IGlzIGxp bmtlZCBhZ2FpbnN0LgorICoKKyAqIFJldHVybiB2YWx1ZTogVGhlIG1pY3JvIHZlcnNpb24KKyAq LworZ3VpbnQgd2Via2l0X21pY3JvX3ZlcnNpb24oKQoreworICAgIHJldHVybiBXRUJLSVRfTUlD Uk9fVkVSU0lPTjsKK30KKworfQpkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0 dmVyc2lvbi5oLmluIGIvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0dmVyc2lvbi5oLmluCm5ldyBm aWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmY3MDgwMGQKLS0tIC9kZXYvbnVsbAorKysg Yi9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR2ZXJzaW9uLmguaW4KQEAgLTAsMCArMSw1MiBAQAor LyoKKyAqIENvcHlyaWdodCAoQykgMjAwOCBDaHJpc3RpYW4gRHl3YW4gPGNocmlzdGlhbkBpbWVu ZGlvLmNvbT4KKyAqCisgKiBUaGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiBy ZWRpc3RyaWJ1dGUgaXQgYW5kL29yCisgKiBtb2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRo ZSBHTlUgTGlicmFyeSBHZW5lcmFsIFB1YmxpYworICogTGljZW5zZSBhcyBwdWJsaXNoZWQgYnkg dGhlIEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbjsgZWl0aGVyCisgKiB2ZXJzaW9uIDIgb2YgdGhl IExpY2Vuc2UsIG9yIChhdCB5b3VyIG9wdGlvbikgYW55IGxhdGVyIHZlcnNpb24uCisgKgorICog VGhpcyBsaWJyYXJ5IGlzIGRpc3RyaWJ1dGVkIGluIHRoZSBob3BlIHRoYXQgaXQgd2lsbCBiZSB1 c2VmdWwsCisgKiBidXQgV0lUSE9VVCBBTlkgV0FSUkFOVFk7IHdpdGhvdXQgZXZlbiB0aGUgaW1w bGllZCB3YXJyYW50eSBvZgorICogTUVSQ0hBTlRBQklMSVRZIG9yIEZJVE5FU1MgRk9SIEEgUEFS VElDVUxBUiBQVVJQT1NFLiAgU2VlIHRoZSBHTlUKKyAqIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMg TGljZW5zZSBmb3IgbW9yZSBkZXRhaWxzLgorICoKKyAqIFlvdSBzaG91bGQgaGF2ZSByZWNlaXZl ZCBhIGNvcHkgb2YgdGhlIEdOVSBMaWJyYXJ5IEdlbmVyYWwgUHVibGljIExpY2Vuc2UKKyAqIGFs b25nIHdpdGggdGhpcyBsaWJyYXJ5OyBzZWUgdGhlIGZpbGUgQ09QWUlORy5MSUIuICBJZiBub3Qs IHdyaXRlIHRvCisgKiB0aGUgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLCBJbmMuLCA1MSBGcmFu a2xpbiBTdHJlZXQsIEZpZnRoIEZsb29yLAorICogQm9zdG9uLCBNQSAwMjExMC0xMzAxLCBVU0Eu CisgKi8KKworI2lmbmRlZiBXRUJLSVRfVkVSU0lPTl9ICisjZGVmaW5lIFdFQktJVF9WRVJTSU9O X0gKKworI2luY2x1ZGUgPGdsaWIuaD4KKyNpbmNsdWRlIDx3ZWJraXQvd2Via2l0ZGVmaW5lcy5o PgorCitHX0JFR0lOX0RFQ0xTCisKKyNkZWZpbmUgV0VCS0lUX01BSk9SX1ZFUlNJT04gKEBXRUJL SVRfTUFKT1JfVkVSU0lPTkApCisjZGVmaW5lIFdFQktJVF9NSU5PUl9WRVJTSU9OIChAV0VCS0lU X01JTk9SX1ZFUlNJT05AKQorI2RlZmluZSBXRUJLSVRfTUlDUk9fVkVSU0lPTiAoQFdFQktJVF9N SUNST19WRVJTSU9OQCkKKworI2RlZmluZSBXRUJLSVRfQ0hFQ0tfVkVSU0lPTihtYWpvciwgbWlu b3IsIG1pY3JvKSBcCisgIChXRUJLSVRfTUFKT1JfVkVSU0lPTiA+IChtYWpvcikgfHwgXAorICAo V0VCS0lUX01BSk9SX1ZFUlNJT04gPT0gKG1ham9yKSAmJiBXRUJLSVRfTUlOT1JfVkVSU0lPTiA+ IChtaW5vcikpIHx8IFwKKyAgKFdFQktJVF9NQUpPUl9WRVJTSU9OID09IChtYWpvcikgJiYgV0VC S0lUX01JTk9SX1ZFUlNJT04gPT0gKG1pbm9yKSAmJiBcCisgIFdFQktJVF9NSUNST19WRVJTSU9O ID49IChtaWNybykpKQorCitXRUJLSVRfQVBJIGd1aW50Cit3ZWJraXRfbWFqb3JfdmVyc2lvbiAo dm9pZCk7CisKK1dFQktJVF9BUEkgZ3VpbnQKK3dlYmtpdF9taW5vcl92ZXJzaW9uICh2b2lkKTsK KworV0VCS0lUX0FQSSBndWludAord2Via2l0X21pY3JvX3ZlcnNpb24gKHZvaWQpOworCitXRUJL SVRfQVBJIGdib29sZWFuCit3ZWJraXRfY2hlY2tfdmVyc2lvbiAoZ3VpbnQgbWFqb3IsIGd1aW50 IG1pbm9yLCBndWludCBtaWNybyk7CisKK0dfRU5EX0RFQ0xTCisKKyNlbmRpZgpkaWZmIC0tZ2l0 IGEvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vic2V0dGluZ3MuY3BwIGIvV2ViS2l0L2d0ay93 ZWJraXQvd2Via2l0d2Vic2V0dGluZ3MuY3BwCmluZGV4IDI2ZDYwYjMuLjA4ZTQwOWQgMTAwNjQ0 Ci0tLSBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnNldHRpbmdzLmNwcAorKysgYi9XZWJL aXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJzZXR0aW5ncy5jcHAKQEAgLTI1Miw2ICsyNTIsMTMgQEAg c3RhdGljIHZvaWQgd2Via2l0X3dlYl9zZXR0aW5nc19jbGFzc19pbml0KFdlYktpdFdlYlNldHRp bmdzQ2xhc3MqIGtsYXNzKQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgMCwK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZsYWdzKSk7CiAKKyAgICAvKioK KyAgICAqIFdlYktpdFdlYlNldHRpbmdzOnpvb20tc3RlcDoKKyAgICAqCisgICAgKiBUaGUgdmFs dWUgYnkgd2hpY2ggdGhlIHpvb20gbGV2ZWwgaXMgY2hhbmdlZCB3aGVuIHpvb21pbmcgaW4gb3Ig b3V0LgorICAgICoKKyAgICAqIFNpbmNlOiAxLjAuMQorICAgICovCiAgICAgZ19vYmplY3RfY2xh c3NfaW5zdGFsbF9wcm9wZXJ0eShnb2JqZWN0X2NsYXNzLAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgUFJPUF9aT09NX1NURVAsCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBnX3BhcmFtX3NwZWNfZmxvYXQoCmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL3dl YmtpdC93ZWJraXR3ZWJ2aWV3LmNwcCBiL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcu Y3BwCmluZGV4IGQ4MzFjNzQuLjlkZTc3ZjUgMTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvd2Via2l0 L3dlYmtpdHdlYnZpZXcuY3BwCisrKyBiL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcu Y3BwCkBAIC0xMjIwLDYgKzEyMjAsMTMgQEAgc3RhdGljIHZvaWQgd2Via2l0X3dlYl92aWV3X2Ns YXNzX2luaXQoV2ViS2l0V2ViVmlld0NsYXNzKiB3ZWJWaWV3Q2xhc3MpCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBGQUxTRSwKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFdFQktJ VF9QQVJBTV9SRUFEV1JJVEUpKTsKIAorICAgIC8qKgorICAgICogV2ViS2l0V2ViVmlldzp6b29t LWxldmVsOgorICAgICoKKyAgICAqIFRoZSBsZXZlbCBvZiB6b29tIG9mIHRoZSBjb250ZW50Lgor ICAgICoKKyAgICAqIFNpbmNlOiAxLjAuMQorICAgICovCiAgICAgZ19vYmplY3RfY2xhc3NfaW5z dGFsbF9wcm9wZXJ0eShvYmplY3RDbGFzcywgUFJPUF9aT09NX0xFVkVMLAogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgZ19wYXJhbV9zcGVjX2Zsb2F0KCJ6b29tLWxldmVsIiwK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAi Wm9vbSBsZXZlbCIsCkBAIC0xMjI5LDYgKzEyMzYsMTMgQEAgc3RhdGljIHZvaWQgd2Via2l0X3dl Yl92aWV3X2NsYXNzX2luaXQoV2ViS2l0V2ViVmlld0NsYXNzKiB3ZWJWaWV3Q2xhc3MpCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgMS4wZiwK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBX RUJLSVRfUEFSQU1fUkVBRFdSSVRFKSk7CiAKKyAgICAvKioKKyAgICAqIFdlYktpdFdlYlZpZXc6 ZnVsbC1jb250ZW50LXpvb206CisgICAgKgorICAgICogV2hldGhlciB0aGUgZnVsbCBjb250ZW50 IGlzIHNjYWxlZCB3aGVuIHpvb21pbmcuCisgICAgKgorICAgICogU2luY2U6IDEuMC4xCisgICAg Ki8KICAgICBnX29iamVjdF9jbGFzc19pbnN0YWxsX3Byb3BlcnR5KG9iamVjdENsYXNzLCBQUk9Q X0ZVTExfQ09OVEVOVF9aT09NLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg Z19wYXJhbV9zcGVjX2Jvb2xlYW4oImZ1bGwtY29udGVudC16b29tIiwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJGdWxsIGNvbnRlbnQg em9vbSIsCkBAIC0yMDY1LDYgKzIwNzksOCBAQCB2b2lkIHdlYmtpdF93ZWJfdmlld19zZXRfdHJh bnNwYXJlbnQoV2ViS2l0V2ViVmlldyogd2ViVmlldywgZ2Jvb2xlYW4gZmxhZykKICAqIGVsZW1l bnRzIGluIHRoZSBwYWdlLgogICoKICAqIFJldHVybiB2YWx1ZTogdGhlIHpvb20gbGV2ZWwgb2Yg QHdlYl92aWV3CisgKgorICogU2luY2U6IDEuMC4xCiAgKi8KIGdmbG9hdCB3ZWJraXRfd2ViX3Zp ZXdfZ2V0X3pvb21fbGV2ZWwoV2ViS2l0V2ViVmlldyogd2ViVmlldykKIHsKQEAgLTIwOTcsNiAr MjExMyw4IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJfdmlld19hcHBseV96b29tX2xldmVsKFdl YktpdFdlYlZpZXcqIHdlYlZpZXcsIGdmbG9hdCB6b29tCiAgKiBJZiB0aGUgImZ1bGwtY29udGVu dC16b29tIiBwcm9wZXJ0eSBpcyBzZXQgdG8gJUZBTFNFICh0aGUgZGVmYXVsdCkKICAqIHRoZSB6 b29tIGxldmVsIGNoYW5nZXMgdGhlIHRleHQgc2l6ZSwgb3IgaWYgJVRSVUUsIHNjYWxlcyBhbGwK ICAqIGVsZW1lbnRzIGluIHRoZSBwYWdlLgorICoKKyAqIFNpbmNlOiAxLjAuMQogICovCiB2b2lk IHdlYmtpdF93ZWJfdmlld19zZXRfem9vbV9sZXZlbChXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBn ZmxvYXQgem9vbUxldmVsKQogewpAQCAtMjExMyw2ICsyMTMxLDggQEAgdm9pZCB3ZWJraXRfd2Vi X3ZpZXdfc2V0X3pvb21fbGV2ZWwoV2ViS2l0V2ViVmlldyogd2ViVmlldywgZ2Zsb2F0IHpvb21M ZXZlbCkKICAqIEluY3JlYXNlcyB0aGUgem9vbSBsZXZlbCBvZiBAd2ViX3ZpZXcuIFRoZSBjdXJy ZW50IHpvb20KICAqIGxldmVsIGlzIGluY3JlbWVudGVkIGJ5IHRoZSB2YWx1ZSBvZiB0aGUgInpv b20tc3RlcCIKICAqIHByb3BlcnR5IG9mIHRoZSAjV2ViS2l0V2ViU2V0dGluZ3MgYXNzb2NpYXRl ZCB3aXRoIEB3ZWJfdmlldy4KKyAqCisgKiBTaW5jZTogMS4wLjEKICAqLwogdm9pZCB3ZWJraXRf d2ViX3ZpZXdfem9vbV9pbihXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KQogewpAQCAtMjEzMiw2ICsy MTUyLDggQEAgdm9pZCB3ZWJraXRfd2ViX3ZpZXdfem9vbV9pbihXZWJLaXRXZWJWaWV3KiB3ZWJW aWV3KQogICogRGVjcmVhc2VzIHRoZSB6b29tIGxldmVsIG9mIEB3ZWJfdmlldy4gVGhlIGN1cnJl bnQgem9vbQogICogbGV2ZWwgaXMgZGVjcmVtZW50ZWQgYnkgdGhlIHZhbHVlIG9mIHRoZSAiem9v bS1zdGVwIgogICogcHJvcGVydHkgb2YgdGhlICNXZWJLaXRXZWJTZXR0aW5ncyBhc3NvY2lhdGVk IHdpdGggQHdlYl92aWV3LgorICoKKyAqIFNpbmNlOiAxLjAuMQogICovCiB2b2lkIHdlYmtpdF93 ZWJfdmlld196b29tX291dChXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KQogewpAQCAtMjE1Miw2ICsy MTc0LDggQEAgdm9pZCB3ZWJraXRfd2ViX3ZpZXdfem9vbV9vdXQoV2ViS2l0V2ViVmlldyogd2Vi VmlldykKICAqCiAgKiBSZXR1cm4gdmFsdWU6ICVGQUxTRSBpZiBvbmx5IHRleHQgc2hvdWxkIGJl IHNjYWxlZCAodGhlIGRlZmF1bHQpLAogICogJVRSVUUgaWYgdGhlIGZ1bGwgY29udGVudCBvZiB0 aGUgdmlldyBzaG91bGQgYmUgc2NhbGVkLgorICoKKyAqIFNpbmNlOiAxLjAuMQogICovCiBnYm9v bGVhbiB3ZWJraXRfd2ViX3ZpZXdfZ2V0X2Z1bGxfY29udGVudF96b29tKFdlYktpdFdlYlZpZXcq IHdlYlZpZXcpCiB7CkBAIC0yMTY4LDYgKzIxOTIsOCBAQCBnYm9vbGVhbiB3ZWJraXRfd2ViX3Zp ZXdfZ2V0X2Z1bGxfY29udGVudF96b29tKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpCiAgKiAlVFJV RSBpZiB0aGUgZnVsbCBjb250ZW50IG9mIHRoZSB2aWV3IHNob3VsZCBiZSBzY2FsZWQuCiAgKgog ICogU2V0cyB3aGV0aGVyIHRoZSB6b29tIGxldmVsIGFmZmVjdHMgb25seSB0ZXh0IG9yIGFsbCBl bGVtZW50cy4KKyAqCisgKiBTaW5jZTogMS4wLjEKICAqLwogdm9pZCB3ZWJraXRfd2ViX3ZpZXdf c2V0X2Z1bGxfY29udGVudF96b29tKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcsIGdib29sZWFuIHpv b21GdWxsQ29udGVudCkKIHsKZGlmZiAtLWdpdCBhL2NvbmZpZ3VyZS5hYyBiL2NvbmZpZ3VyZS5h YwppbmRleCA2OTkyMjdlLi42NzFjZjMwIDEwMDY0NAotLS0gYS9jb25maWd1cmUuYWMKKysrIGIv Y29uZmlndXJlLmFjCkBAIC0xLDEyICsxLDI0IEBACi1BQ19JTklUKFtXZWJLaXRdLFswLjFdLFto dHRwOi8vYnVncy53ZWJraXQub3JnL10pCi0KIEFDX1BSRVJFUSgyLjU5KQogCittNF9kZWZpbmUo W3dlYmtpdF9tYWpvcl92ZXJzaW9uXSwgWzFdKQorbTRfZGVmaW5lKFt3ZWJraXRfbWlub3JfdmVy c2lvbl0sIFswXSkKK200X2RlZmluZShbd2Via2l0X21pY3JvX3ZlcnNpb25dLCBbMV0pCisKK0FD X0lOSVQoW1dlYktpdF0sW3dlYmtpdF9tYWpvcl92ZXJzaW9uLndlYmtpdF9taW5vcl92ZXJzaW9u LndlYmtpdF9taWNyb192ZXJzaW9uXSxbaHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9dKQorCiBBQ19D T05GSUdfSEVBREVSUyhbYWNvbmZpZy5oXSkKKworV0VCS0lUX01BSk9SX1ZFUlNJT049d2Via2l0 X21ham9yX3ZlcnNpb24KK1dFQktJVF9NSU5PUl9WRVJTSU9OPXdlYmtpdF9taW5vcl92ZXJzaW9u CitXRUJLSVRfTUlDUk9fVkVSU0lPTj13ZWJraXRfbWljcm9fdmVyc2lvbgorQUNfU1VCU1QoV0VC S0lUX01BSk9SX1ZFUlNJT04pCitBQ19TVUJTVChXRUJLSVRfTUlOT1JfVkVSU0lPTikKK0FDX1NV QlNUKFdFQktJVF9NSUNST19WRVJTSU9OKQorCiBBQ19DT05GSUdfU1JDRElSKFtXZWJDb3JlL2Nv bmZpZy5oXSkKIAogIyBzZWUgaHR0cDovL3d3dy5nbnUub3JnL3NvZnR3YXJlL2xpYnRvb2wvbWFu dWFsLmh0bWwjVmVyc2lvbmluZwotTElCV0VCS0lUR1RLX1ZFUlNJT049MTowOjAKK0xJQldFQktJ VEdUS19WRVJTSU9OPXdlYmtpdF9tYWpvcl92ZXJzaW9uOndlYmtpdF9taW5vcl92ZXJzaW9uOndl YmtpdF9taWNyb192ZXJzaW9uCiBBQ19TVUJTVChbTElCV0VCS0lUR1RLX1ZFUlNJT05dKQogCiBB TV9JTklUX0FVVE9NQUtFKFtmb3JlaWduIHN1YmRpci1vYmplY3RzXSkKQEAgLTU1MCw2ICs1NjIs NyBAQCBBTV9DT05ESVRJT05BTChbSFRNTF9GTEFHU10sW3Rlc3QgIiRodG1sX2ZsYWdzIiA9ICJ5 ZXMiXSkKIEFDX0NPTkZJR19GSUxFUyhbCiBHTlVtYWtlZmlsZQogV2ViS2l0L2d0ay93ZWJraXQt MS4wLnBjOldlYktpdC9ndGsvd2Via2l0LnBjLmluCitXZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR2 ZXJzaW9uLmgKIF0KICkKIAo= 21513 2008-06-05 15:12:14 -0700 2008-06-05 20:57:11 -0700 Correct libtool version webkitversion.diff text/plain 10615 christian ZGlmZiAtLWdpdCBhL0dOVW1ha2VmaWxlLmFtIGIvR05VbWFrZWZpbGUuYW0KaW5kZXggMzExODcy Mi4uYmQ4NmNlZCAxMDA2NDQKLS0tIGEvR05VbWFrZWZpbGUuYW0KKysrIGIvR05VbWFrZWZpbGUu YW0KQEAgLTI5NCw2ICsyOTQsNyBAQCB3ZWJraXRndGtfaF9hcGkgKz0gXAogCVdlYktpdC9ndGsv d2Via2l0L3dlYmtpdC5oIFwKIAlXZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRkZWZpbmVzLmggXAog CVdlYktpdC9ndGsvd2Via2l0L3dlYmtpdG5ldHdvcmtyZXF1ZXN0LmggXAorCVdlYktpdC9ndGsv d2Via2l0L3dlYmtpdHZlcnNpb24uaCBcCiAJV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2ViYmFj a2ZvcndhcmRsaXN0LmggXAogCVdlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYmZyYW1lLmggXAog CVdlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYmhpc3RvcnlpdGVtLmggXApAQCAtMzE3LDYgKzMx OCw3IEBAIHdlYmtpdGd0a19oZWFkZXJzICs9IFwKIHdlYmtpdGd0a19zb3VyY2VzICs9IFwKIAlX ZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRuZXR3b3JrcmVxdWVzdC5jcHAgXAogCVdlYktpdC9ndGsv d2Via2l0L3dlYmtpdHByaXZhdGUuY3BwIFwKKwlXZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR2ZXJz aW9uLmNwcCBcCiAJV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2ViYmFja2ZvcndhcmRsaXN0LmNw cCBcCiAJV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2ViZnJhbWUuY3BwIFwKIAlXZWJLaXQvZ3Rr L3dlYmtpdC93ZWJraXR3ZWJoaXN0b3J5aXRlbS5jcHAgXApkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0 ay93ZWJraXQvd2Via2l0LmggYi9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXQuaAppbmRleCBiYWJk NTBhLi41NWQ1YjU2IDEwMDY0NAotLS0gYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXQuaAorKysg Yi9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXQuaApAQCAtMjAsNiArMjAsNyBAQAogI2lmbmRlZiBf X1dFQktJVF9IX18KICNkZWZpbmUgX19XRUJLSVRfSF9fCiAKKyNpbmNsdWRlIDx3ZWJraXQvd2Vi a2l0dmVyc2lvbi5oPgogI2luY2x1ZGUgPHdlYmtpdC93ZWJraXRkZWZpbmVzLmg+CiAjaW5jbHVk ZSA8d2Via2l0L3dlYmtpdG5ldHdvcmtyZXF1ZXN0Lmg+CiAjaW5jbHVkZSA8d2Via2l0L3dlYmtp dHdlYmZyYW1lLmg+CmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR2ZXJzaW9u LmNwcCBiL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHZlcnNpb24uY3BwCm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAuLmFmZDdhZjQKLS0tIC9kZXYvbnVsbAorKysgYi9XZWJLaXQv Z3RrL3dlYmtpdC93ZWJraXR2ZXJzaW9uLmNwcApAQCAtMCwwICsxLDYwIEBACisvKgorICogQ29w eXJpZ2h0IChDKSAyMDA4IENocmlzdGlhbiBEeXdhbiA8Y2hyaXN0aWFuQGltZW5kaW8uY29tPgor ICoKKyAqIFRoaXMgbGlicmFyeSBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0 ZSBpdCBhbmQvb3IKKyAqIG1vZGlmeSBpdCB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEdOVSBMaWJy YXJ5IEdlbmVyYWwgUHVibGljCisgKiBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBieSB0aGUgRnJlZSBT b2Z0d2FyZSBGb3VuZGF0aW9uOyBlaXRoZXIKKyAqIHZlcnNpb24gMiBvZiB0aGUgTGljZW5zZSwg b3IgKGF0IHlvdXIgb3B0aW9uKSBhbnkgbGF0ZXIgdmVyc2lvbi4KKyAqCisgKiBUaGlzIGxpYnJh cnkgaXMgZGlzdHJpYnV0ZWQgaW4gdGhlIGhvcGUgdGhhdCBpdCB3aWxsIGJlIHVzZWZ1bCwKKyAq IGJ1dCBXSVRIT1VUIEFOWSBXQVJSQU5UWTsgd2l0aG91dCBldmVuIHRoZSBpbXBsaWVkIHdhcnJh bnR5IG9mCisgKiBNRVJDSEFOVEFCSUxJVFkgb3IgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBV UlBPU0UuICBTZWUgdGhlIEdOVQorICogTGlicmFyeSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGZv ciBtb3JlIGRldGFpbHMuCisgKgorICogWW91IHNob3VsZCBoYXZlIHJlY2VpdmVkIGEgY29weSBv ZiB0aGUgR05VIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMgTGljZW5zZQorICogYWxvbmcgd2l0aCB0 aGlzIGxpYnJhcnk7IHNlZSB0aGUgZmlsZSBDT1BZSU5HLkxJQi4gIElmIG5vdCwgd3JpdGUgdG8K KyAqIHRoZSBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24sIEluYy4sIDUxIEZyYW5rbGluIFN0cmVl dCwgRmlmdGggRmxvb3IsCisgKiBCb3N0b24sIE1BIDAyMTEwLTEzMDEsIFVTQS4KKyAqLworCisj aW5jbHVkZSAid2Via2l0dmVyc2lvbi5oIgorCitleHRlcm4gIkMiIHsKKworLyoqCisgKiB3ZWJr aXRfbWFqb3JfdmVyc2lvbjoKKyAqCisgKiBUaGUgbWFqb3IgdmVyc2lvbiBudW1iZXIgb2YgdGhl IFdlYktpdCB0aGF0IGlzIGxpbmtlZCBhZ2FpbnN0LgorICoKKyAqIFJldHVybiB2YWx1ZTogVGhl IG1ham9yIHZlcnNpb24KKyAqLworZ3VpbnQgd2Via2l0X21ham9yX3ZlcnNpb24oKQoreworICAg IHJldHVybiBXRUJLSVRfTUFKT1JfVkVSU0lPTjsKK30KKworLyoqCisgKiB3ZWJraXRfbWlub3Jf dmVyc2lvbjoKKyAqCisgKiBUaGUgbWlub3IgdmVyc2lvbiBudW1iZXIgb2YgdGhlIFdlYktpdCB0 aGF0IGlzIGxpbmtlZCBhZ2FpbnN0LgorICoKKyAqIFJldHVybiB2YWx1ZTogVGhlIG1pbm9yIHZl cnNpb24KKyAqLworZ3VpbnQgd2Via2l0X21pbm9yX3ZlcnNpb24oKQoreworICAgIHJldHVybiBX RUJLSVRfTUlOT1JfVkVSU0lPTjsKK30KKworLyoqCisgKiB3ZWJraXRfbWljcm9fdmVyc2lvbjoK KyAqCisgKiBUaGUgbWljcm8gdmVyc2lvbiBudW1iZXIgb2YgdGhlIFdlYktpdCB0aGF0IGlzIGxp bmtlZCBhZ2FpbnN0LgorICoKKyAqIFJldHVybiB2YWx1ZTogVGhlIG1pY3JvIHZlcnNpb24KKyAq LworZ3VpbnQgd2Via2l0X21pY3JvX3ZlcnNpb24oKQoreworICAgIHJldHVybiBXRUJLSVRfTUlD Uk9fVkVSU0lPTjsKK30KKworfQpkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0 dmVyc2lvbi5oLmluIGIvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0dmVyc2lvbi5oLmluCm5ldyBm aWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmY3MDgwMGQKLS0tIC9kZXYvbnVsbAorKysg Yi9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR2ZXJzaW9uLmguaW4KQEAgLTAsMCArMSw1MiBAQAor LyoKKyAqIENvcHlyaWdodCAoQykgMjAwOCBDaHJpc3RpYW4gRHl3YW4gPGNocmlzdGlhbkBpbWVu ZGlvLmNvbT4KKyAqCisgKiBUaGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiBy ZWRpc3RyaWJ1dGUgaXQgYW5kL29yCisgKiBtb2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRo ZSBHTlUgTGlicmFyeSBHZW5lcmFsIFB1YmxpYworICogTGljZW5zZSBhcyBwdWJsaXNoZWQgYnkg dGhlIEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbjsgZWl0aGVyCisgKiB2ZXJzaW9uIDIgb2YgdGhl IExpY2Vuc2UsIG9yIChhdCB5b3VyIG9wdGlvbikgYW55IGxhdGVyIHZlcnNpb24uCisgKgorICog VGhpcyBsaWJyYXJ5IGlzIGRpc3RyaWJ1dGVkIGluIHRoZSBob3BlIHRoYXQgaXQgd2lsbCBiZSB1 c2VmdWwsCisgKiBidXQgV0lUSE9VVCBBTlkgV0FSUkFOVFk7IHdpdGhvdXQgZXZlbiB0aGUgaW1w bGllZCB3YXJyYW50eSBvZgorICogTUVSQ0hBTlRBQklMSVRZIG9yIEZJVE5FU1MgRk9SIEEgUEFS VElDVUxBUiBQVVJQT1NFLiAgU2VlIHRoZSBHTlUKKyAqIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMg TGljZW5zZSBmb3IgbW9yZSBkZXRhaWxzLgorICoKKyAqIFlvdSBzaG91bGQgaGF2ZSByZWNlaXZl ZCBhIGNvcHkgb2YgdGhlIEdOVSBMaWJyYXJ5IEdlbmVyYWwgUHVibGljIExpY2Vuc2UKKyAqIGFs b25nIHdpdGggdGhpcyBsaWJyYXJ5OyBzZWUgdGhlIGZpbGUgQ09QWUlORy5MSUIuICBJZiBub3Qs IHdyaXRlIHRvCisgKiB0aGUgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLCBJbmMuLCA1MSBGcmFu a2xpbiBTdHJlZXQsIEZpZnRoIEZsb29yLAorICogQm9zdG9uLCBNQSAwMjExMC0xMzAxLCBVU0Eu CisgKi8KKworI2lmbmRlZiBXRUJLSVRfVkVSU0lPTl9ICisjZGVmaW5lIFdFQktJVF9WRVJTSU9O X0gKKworI2luY2x1ZGUgPGdsaWIuaD4KKyNpbmNsdWRlIDx3ZWJraXQvd2Via2l0ZGVmaW5lcy5o PgorCitHX0JFR0lOX0RFQ0xTCisKKyNkZWZpbmUgV0VCS0lUX01BSk9SX1ZFUlNJT04gKEBXRUJL SVRfTUFKT1JfVkVSU0lPTkApCisjZGVmaW5lIFdFQktJVF9NSU5PUl9WRVJTSU9OIChAV0VCS0lU X01JTk9SX1ZFUlNJT05AKQorI2RlZmluZSBXRUJLSVRfTUlDUk9fVkVSU0lPTiAoQFdFQktJVF9N SUNST19WRVJTSU9OQCkKKworI2RlZmluZSBXRUJLSVRfQ0hFQ0tfVkVSU0lPTihtYWpvciwgbWlu b3IsIG1pY3JvKSBcCisgIChXRUJLSVRfTUFKT1JfVkVSU0lPTiA+IChtYWpvcikgfHwgXAorICAo V0VCS0lUX01BSk9SX1ZFUlNJT04gPT0gKG1ham9yKSAmJiBXRUJLSVRfTUlOT1JfVkVSU0lPTiA+ IChtaW5vcikpIHx8IFwKKyAgKFdFQktJVF9NQUpPUl9WRVJTSU9OID09IChtYWpvcikgJiYgV0VC S0lUX01JTk9SX1ZFUlNJT04gPT0gKG1pbm9yKSAmJiBcCisgIFdFQktJVF9NSUNST19WRVJTSU9O ID49IChtaWNybykpKQorCitXRUJLSVRfQVBJIGd1aW50Cit3ZWJraXRfbWFqb3JfdmVyc2lvbiAo dm9pZCk7CisKK1dFQktJVF9BUEkgZ3VpbnQKK3dlYmtpdF9taW5vcl92ZXJzaW9uICh2b2lkKTsK KworV0VCS0lUX0FQSSBndWludAord2Via2l0X21pY3JvX3ZlcnNpb24gKHZvaWQpOworCitXRUJL SVRfQVBJIGdib29sZWFuCit3ZWJraXRfY2hlY2tfdmVyc2lvbiAoZ3VpbnQgbWFqb3IsIGd1aW50 IG1pbm9yLCBndWludCBtaWNybyk7CisKK0dfRU5EX0RFQ0xTCisKKyNlbmRpZgpkaWZmIC0tZ2l0 IGEvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vic2V0dGluZ3MuY3BwIGIvV2ViS2l0L2d0ay93 ZWJraXQvd2Via2l0d2Vic2V0dGluZ3MuY3BwCmluZGV4IDI2ZDYwYjMuLjA4ZTQwOWQgMTAwNjQ0 Ci0tLSBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnNldHRpbmdzLmNwcAorKysgYi9XZWJL aXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJzZXR0aW5ncy5jcHAKQEAgLTI1Miw2ICsyNTIsMTMgQEAg c3RhdGljIHZvaWQgd2Via2l0X3dlYl9zZXR0aW5nc19jbGFzc19pbml0KFdlYktpdFdlYlNldHRp bmdzQ2xhc3MqIGtsYXNzKQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgMCwK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZsYWdzKSk7CiAKKyAgICAvKioK KyAgICAqIFdlYktpdFdlYlNldHRpbmdzOnpvb20tc3RlcDoKKyAgICAqCisgICAgKiBUaGUgdmFs dWUgYnkgd2hpY2ggdGhlIHpvb20gbGV2ZWwgaXMgY2hhbmdlZCB3aGVuIHpvb21pbmcgaW4gb3Ig b3V0LgorICAgICoKKyAgICAqIFNpbmNlOiAxLjAuMQorICAgICovCiAgICAgZ19vYmplY3RfY2xh c3NfaW5zdGFsbF9wcm9wZXJ0eShnb2JqZWN0X2NsYXNzLAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgUFJPUF9aT09NX1NURVAsCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBnX3BhcmFtX3NwZWNfZmxvYXQoCmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL3dl YmtpdC93ZWJraXR3ZWJ2aWV3LmNwcCBiL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcu Y3BwCmluZGV4IGQ4MzFjNzQuLjlkZTc3ZjUgMTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvd2Via2l0 L3dlYmtpdHdlYnZpZXcuY3BwCisrKyBiL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcu Y3BwCkBAIC0xMjIwLDYgKzEyMjAsMTMgQEAgc3RhdGljIHZvaWQgd2Via2l0X3dlYl92aWV3X2Ns YXNzX2luaXQoV2ViS2l0V2ViVmlld0NsYXNzKiB3ZWJWaWV3Q2xhc3MpCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBGQUxTRSwKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFdFQktJ VF9QQVJBTV9SRUFEV1JJVEUpKTsKIAorICAgIC8qKgorICAgICogV2ViS2l0V2ViVmlldzp6b29t LWxldmVsOgorICAgICoKKyAgICAqIFRoZSBsZXZlbCBvZiB6b29tIG9mIHRoZSBjb250ZW50Lgor ICAgICoKKyAgICAqIFNpbmNlOiAxLjAuMQorICAgICovCiAgICAgZ19vYmplY3RfY2xhc3NfaW5z dGFsbF9wcm9wZXJ0eShvYmplY3RDbGFzcywgUFJPUF9aT09NX0xFVkVMLAogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgZ19wYXJhbV9zcGVjX2Zsb2F0KCJ6b29tLWxldmVsIiwK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAi Wm9vbSBsZXZlbCIsCkBAIC0xMjI5LDYgKzEyMzYsMTMgQEAgc3RhdGljIHZvaWQgd2Via2l0X3dl Yl92aWV3X2NsYXNzX2luaXQoV2ViS2l0V2ViVmlld0NsYXNzKiB3ZWJWaWV3Q2xhc3MpCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgMS4wZiwK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBX RUJLSVRfUEFSQU1fUkVBRFdSSVRFKSk7CiAKKyAgICAvKioKKyAgICAqIFdlYktpdFdlYlZpZXc6 ZnVsbC1jb250ZW50LXpvb206CisgICAgKgorICAgICogV2hldGhlciB0aGUgZnVsbCBjb250ZW50 IGlzIHNjYWxlZCB3aGVuIHpvb21pbmcuCisgICAgKgorICAgICogU2luY2U6IDEuMC4xCisgICAg Ki8KICAgICBnX29iamVjdF9jbGFzc19pbnN0YWxsX3Byb3BlcnR5KG9iamVjdENsYXNzLCBQUk9Q X0ZVTExfQ09OVEVOVF9aT09NLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg Z19wYXJhbV9zcGVjX2Jvb2xlYW4oImZ1bGwtY29udGVudC16b29tIiwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJGdWxsIGNvbnRlbnQg em9vbSIsCkBAIC0yMDY1LDYgKzIwNzksOCBAQCB2b2lkIHdlYmtpdF93ZWJfdmlld19zZXRfdHJh bnNwYXJlbnQoV2ViS2l0V2ViVmlldyogd2ViVmlldywgZ2Jvb2xlYW4gZmxhZykKICAqIGVsZW1l bnRzIGluIHRoZSBwYWdlLgogICoKICAqIFJldHVybiB2YWx1ZTogdGhlIHpvb20gbGV2ZWwgb2Yg QHdlYl92aWV3CisgKgorICogU2luY2U6IDEuMC4xCiAgKi8KIGdmbG9hdCB3ZWJraXRfd2ViX3Zp ZXdfZ2V0X3pvb21fbGV2ZWwoV2ViS2l0V2ViVmlldyogd2ViVmlldykKIHsKQEAgLTIwOTcsNiAr MjExMyw4IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJfdmlld19hcHBseV96b29tX2xldmVsKFdl YktpdFdlYlZpZXcqIHdlYlZpZXcsIGdmbG9hdCB6b29tCiAgKiBJZiB0aGUgImZ1bGwtY29udGVu dC16b29tIiBwcm9wZXJ0eSBpcyBzZXQgdG8gJUZBTFNFICh0aGUgZGVmYXVsdCkKICAqIHRoZSB6 b29tIGxldmVsIGNoYW5nZXMgdGhlIHRleHQgc2l6ZSwgb3IgaWYgJVRSVUUsIHNjYWxlcyBhbGwK ICAqIGVsZW1lbnRzIGluIHRoZSBwYWdlLgorICoKKyAqIFNpbmNlOiAxLjAuMQogICovCiB2b2lk IHdlYmtpdF93ZWJfdmlld19zZXRfem9vbV9sZXZlbChXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBn ZmxvYXQgem9vbUxldmVsKQogewpAQCAtMjExMyw2ICsyMTMxLDggQEAgdm9pZCB3ZWJraXRfd2Vi X3ZpZXdfc2V0X3pvb21fbGV2ZWwoV2ViS2l0V2ViVmlldyogd2ViVmlldywgZ2Zsb2F0IHpvb21M ZXZlbCkKICAqIEluY3JlYXNlcyB0aGUgem9vbSBsZXZlbCBvZiBAd2ViX3ZpZXcuIFRoZSBjdXJy ZW50IHpvb20KICAqIGxldmVsIGlzIGluY3JlbWVudGVkIGJ5IHRoZSB2YWx1ZSBvZiB0aGUgInpv b20tc3RlcCIKICAqIHByb3BlcnR5IG9mIHRoZSAjV2ViS2l0V2ViU2V0dGluZ3MgYXNzb2NpYXRl ZCB3aXRoIEB3ZWJfdmlldy4KKyAqCisgKiBTaW5jZTogMS4wLjEKICAqLwogdm9pZCB3ZWJraXRf d2ViX3ZpZXdfem9vbV9pbihXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KQogewpAQCAtMjEzMiw2ICsy MTUyLDggQEAgdm9pZCB3ZWJraXRfd2ViX3ZpZXdfem9vbV9pbihXZWJLaXRXZWJWaWV3KiB3ZWJW aWV3KQogICogRGVjcmVhc2VzIHRoZSB6b29tIGxldmVsIG9mIEB3ZWJfdmlldy4gVGhlIGN1cnJl bnQgem9vbQogICogbGV2ZWwgaXMgZGVjcmVtZW50ZWQgYnkgdGhlIHZhbHVlIG9mIHRoZSAiem9v bS1zdGVwIgogICogcHJvcGVydHkgb2YgdGhlICNXZWJLaXRXZWJTZXR0aW5ncyBhc3NvY2lhdGVk IHdpdGggQHdlYl92aWV3LgorICoKKyAqIFNpbmNlOiAxLjAuMQogICovCiB2b2lkIHdlYmtpdF93 ZWJfdmlld196b29tX291dChXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KQogewpAQCAtMjE1Miw2ICsy MTc0LDggQEAgdm9pZCB3ZWJraXRfd2ViX3ZpZXdfem9vbV9vdXQoV2ViS2l0V2ViVmlldyogd2Vi VmlldykKICAqCiAgKiBSZXR1cm4gdmFsdWU6ICVGQUxTRSBpZiBvbmx5IHRleHQgc2hvdWxkIGJl IHNjYWxlZCAodGhlIGRlZmF1bHQpLAogICogJVRSVUUgaWYgdGhlIGZ1bGwgY29udGVudCBvZiB0 aGUgdmlldyBzaG91bGQgYmUgc2NhbGVkLgorICoKKyAqIFNpbmNlOiAxLjAuMQogICovCiBnYm9v bGVhbiB3ZWJraXRfd2ViX3ZpZXdfZ2V0X2Z1bGxfY29udGVudF96b29tKFdlYktpdFdlYlZpZXcq IHdlYlZpZXcpCiB7CkBAIC0yMTY4LDYgKzIxOTIsOCBAQCBnYm9vbGVhbiB3ZWJraXRfd2ViX3Zp ZXdfZ2V0X2Z1bGxfY29udGVudF96b29tKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpCiAgKiAlVFJV RSBpZiB0aGUgZnVsbCBjb250ZW50IG9mIHRoZSB2aWV3IHNob3VsZCBiZSBzY2FsZWQuCiAgKgog ICogU2V0cyB3aGV0aGVyIHRoZSB6b29tIGxldmVsIGFmZmVjdHMgb25seSB0ZXh0IG9yIGFsbCBl bGVtZW50cy4KKyAqCisgKiBTaW5jZTogMS4wLjEKICAqLwogdm9pZCB3ZWJraXRfd2ViX3ZpZXdf c2V0X2Z1bGxfY29udGVudF96b29tKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcsIGdib29sZWFuIHpv b21GdWxsQ29udGVudCkKIHsKZGlmZiAtLWdpdCBhL2NvbmZpZ3VyZS5hYyBiL2NvbmZpZ3VyZS5h YwppbmRleCA2OTkyMjdlLi5hNjMxMWUxIDEwMDY0NAotLS0gYS9jb25maWd1cmUuYWMKKysrIGIv Y29uZmlndXJlLmFjCkBAIC0xLDEyICsxLDM2IEBACi1BQ19JTklUKFtXZWJLaXRdLFswLjFdLFto dHRwOi8vYnVncy53ZWJraXQub3JnL10pCi0KIEFDX1BSRVJFUSgyLjU5KQogCittNF9kZWZpbmUo W3dlYmtpdF9tYWpvcl92ZXJzaW9uXSwgWzFdKQorbTRfZGVmaW5lKFt3ZWJraXRfbWlub3JfdmVy c2lvbl0sIFswXSkKK200X2RlZmluZShbd2Via2l0X21pY3JvX3ZlcnNpb25dLCBbMV0pCisKK0FD X0lOSVQoW1dlYktpdF0sW3dlYmtpdF9tYWpvcl92ZXJzaW9uLndlYmtpdF9taW5vcl92ZXJzaW9u LndlYmtpdF9taWNyb192ZXJzaW9uXSxbaHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9dKQorCiBBQ19D T05GSUdfSEVBREVSUyhbYWNvbmZpZy5oXSkKKworV0VCS0lUX01BSk9SX1ZFUlNJT049d2Via2l0 X21ham9yX3ZlcnNpb24KK1dFQktJVF9NSU5PUl9WRVJTSU9OPXdlYmtpdF9taW5vcl92ZXJzaW9u CitXRUJLSVRfTUlDUk9fVkVSU0lPTj13ZWJraXRfbWljcm9fdmVyc2lvbgorQUNfU1VCU1QoV0VC S0lUX01BSk9SX1ZFUlNJT04pCitBQ19TVUJTVChXRUJLSVRfTUlOT1JfVkVSU0lPTikKK0FDX1NV QlNUKFdFQktJVF9NSUNST19WRVJTSU9OKQorCiBBQ19DT05GSUdfU1JDRElSKFtXZWJDb3JlL2Nv bmZpZy5oXSkKIAotIyBzZWUgaHR0cDovL3d3dy5nbnUub3JnL3NvZnR3YXJlL2xpYnRvb2wvbWFu dWFsLmh0bWwjVmVyc2lvbmluZwotTElCV0VCS0lUR1RLX1ZFUlNJT049MTowOjAKK2RubCAjIyMj IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMjCitkbmwgIyBsaWJ0b29sIHZlcnNpb25pbmcKK2RubCAjIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjCitkbmwgIworZG5sICMg Q1VSUkVOVCA6IFJFVklTSU9OIDogQUdFCitkbmwgIworZG5sICMgc291cmNlIGNvZGUgY2hhbmdl ZCAgICAgICAgIGM6cjphID0+IGMgIDpyKzE6YQorZG5sICMgYWRkLCByZW1vdmUgb3IgY2hhbmdl ZCBhcGk6IGM6cjphID0+IGMrMTowICA6YQorZG5sICMgYWRkIGFwaTogICAgICAgICAgICAgICAg ICAgIGM6cjphID0+IGMgIDpyICA6YSsxCitkbmwgIyBhZGQgYXBpOiAgICAgICAgICAgICAgICAg ICAgYzpyOmEgPT4gYyAgOnIgIDowCitkbmwgIworZG5sICMgc2VlIGh0dHA6Ly93d3cuZ251Lm9y Zy9zb2Z0d2FyZS9saWJ0b29sL21hbnVhbC5odG1sI1ZlcnNpb25pbmcKKworTElCV0VCS0lUR1RL X1ZFUlNJT049MjowOjEKIEFDX1NVQlNUKFtMSUJXRUJLSVRHVEtfVkVSU0lPTl0pCiAKIEFNX0lO SVRfQVVUT01BS0UoW2ZvcmVpZ24gc3ViZGlyLW9iamVjdHNdKQpAQCAtNTUwLDYgKzU3NCw3IEBA IEFNX0NPTkRJVElPTkFMKFtIVE1MX0ZMQUdTXSxbdGVzdCAiJGh0bWxfZmxhZ3MiID0gInllcyJd KQogQUNfQ09ORklHX0ZJTEVTKFsKIEdOVW1ha2VmaWxlCiBXZWJLaXQvZ3RrL3dlYmtpdC0xLjAu cGM6V2ViS2l0L2d0ay93ZWJraXQucGMuaW4KK1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHZlcnNp b24uaAogXQogKQogCg==