124329 2013-11-13 18:36:26 -0800 Deprecate WebHistory methods that use NSCalendarDate 2013-11-18 22:43:05 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified REOPENED P2 Normal --- 1 andersca andersca aestes buildbot commit-queue joepeck mhahnenberg mitz mrowe rniwa oldest_to_newest 950476 0 andersca 2013-11-13 18:36:26 -0800 Deprecate WebHistory methods that use NSCalendarDate 950478 1 216886 andersca 2013-11-13 18:41:29 -0800 Created attachment 216886 Patch 950479 2 commit-queue 2013-11-13 18:42:59 -0800 Attachment 216886 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit/ChangeLog', u'Source/WebKit/WebKit.xcodeproj/project.pbxproj', u'Source/WebKit/mac/ChangeLog', u'Source/WebKit/mac/History/WebHistory.h', u'Source/WebKit/mac/History/WebHistory.mm']" exit_code: 1 Source/WebKit/mac/History/WebHistory.h:31: #ifndef header guard has wrong style, please use: WebHistory_h [build/header_guard] [5] Source/WebKit/mac/History/WebHistory.h:32: Missing spaces around = [whitespace/operators] [4] Source/WebKit/mac/History/WebHistory.h:32: Missing space after , [whitespace/comma] [3] Total errors found: 3 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 950484 3 andersca 2013-11-13 18:56:50 -0800 Committed r159271: <http://trac.webkit.org/changeset/159271> 950487 4 joepeck 2013-11-13 19:07:19 -0800 (In reply to comment #3) > Committed r159271: <http://trac.webkit.org/changeset/159271> Rolled this out in <http://trac.webkit.org/changeset/159273> (requested by bdash). It broke Mountain Lion builds: > CompileC /Volumes/Data/slave/mountainlion-release/build/WebKitBuild/WebKit.build/Release/WebKit.build/Objects-normal/x86_64/WebFrameLoaderClient.o mac/WebCoreSupport/WebFrameLoaderClient.mm normal x86_64 objective-c++ com.apple.compilers.llvm.clang.1_0.compiler > cd /Volumes/Data/slave/mountainlion-release/build/Source/WebKit > setenv LANG en_US.US-ASCII > /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c++ -arch x86_64 -fmessage-length=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit=0 -std=gnu++11 -stdlib=libc++ -fobjc-gc -Wno-trigraphs -fno-exceptions -fno-rtti -fpascal-strings -O2 -Werror -Wno-missing-field-initializers -Wmissing-prototypes -Wno-implicit-atomic-properties -Wno-receiver-is-weak -Wno-arc-repeated-use-of-weak -Wnon-virtual-dtor -Wno-overloaded-virtual -Wno-exit-time-destructors -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wsign-compare -Wno-shorten-64-to-32 -Wnewline-eof -Wno-selector -Wno-strict-selector-match -Wno-undeclared-selector -Wno-deprecated-implementations -Wno-c++11-extensions -DNDEBUG -DENABLE_WEBKIT_UNSET_DYLD_FRAMEWORK_PATH -DENABLE_3D_RENDERING -DENABLE_BLOB -DENABLE_CACHE_PARTITIONING -DENABLE_CANVAS_PATH -DENABLE_CHANNEL_MESSAGING -DENABLE_CSS_BOX_DECORATION_BREAK -DENABLE_CSS_COMPOSITING -DENABLE_CSS_EXCLUSIONS -DENABLE_CSS_FILTERS -DENABLE_CSS_REGIONS -DENABLE_CSS_SHADERS -DENABLE_CSS_SHAPES -DENABLE_CSS_STICKY_POSITION -DENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED -DENABLE_CSS3_TEXT_DECORATION -DENABLE_CURSOR_VISIBILITY -DENABLE_DASHBOARD_SUPPORT -DENABLE_DETAILS_ELEMENT -DENABLE_DOM4_EVENTS_CONSTRUCTOR -DENABLE_FILTERS -DENABLE_FULLSCREEN_API -DENABLE_GEOLOCATION -DENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING -DENABLE_ICONDATABASE -DENABLE_IFRAME_SEAMLESS -DENABLE_INDEXED_DATABASE -DENABLE_INDIE_UI -DENABLE_INPUT_TYPE_COLOR -DENABLE_INPUT_TYPE_COLOR_POPOVER -DENABLE_JAVASCRIPT_DEBUGGER -DENABLE_LEGACY_CSS_VENDOR_PREFIXES -DENABLE_LEGACY_NOTIFICATIONS -DENABLE_LEGACY_VENDOR_PREFIXES -DENABLE_LEGACY_WEB_AUDIO -DENABLE_MATHML -DENABLE_MEDIA_CONTROLS_SCRIPT -DENABLE_MEDIA_SOURCE -DENABLE_METER_ELEMENT -DENABLE_MOUSE_CURSOR_SCALE -DENABLE_NOTIFICATIONS -DENABLE_PAGE_VISIBILITY_API -DENABLE_PDFKIT_PLUGIN -DENABLE_PROGRESS_ELEMENT -DENABLE_PROMISES -DENABLE_PUBLIC_SUFFIX_LIST -DENABLE_REQUEST_ANIMATION_FRAME -DENABLE_REMOTE_INSPECTOR -DENABLE_SHARED_WORKERS -DENABLE_SPEECH_SYNTHESIS -DENABLE_SQL_DATABASE -DENABLE_SVG -DENABLE_SVG_FONTS -DENABLE_USERSELECT_ALL -DENABLE_VIDEO -DENABLE_VIDEO_TRACK -DENABLE_WEBGL -DENABLE_WEB_ANIMATIONS -DENABLE_WEB_AUDIO -DENABLE_WEB_SOCKETS -DENABLE_WORKERS -DENABLE_XHR_TIMEOUT -DENABLE_XSLT -DFRAMEWORK_NAME=WebKit -DWEBKIT_VERSION_MIN_REQUIRED=WEBKIT_VERSION_LATEST -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -Winvalid-offsetof -mmacosx-version-min=10.8 -g -fvisibility-inlines-hidden -fno-threadsafe-statics -Wno-sign-conversion -I/Volumes/Data/slave/mountainlion-release/build/WebKitBuild/WebKit.build/Release/WebKit.build/WebKit.hmap -I/Volumes/Data/slave/mountainlion-release/build/WebKitBuild/Release/include -I/Volumes/Data/slave/mountainlion-release/build/WebKitBuild/Release/usr/local/include -I/Volumes/Data/slave/mountainlion-release/build/WebKitBuild/Release/WebCore.framework/PrivateHeaders/ForwardingHeaders -I/Volumes/Data/slave/mountainlion-release/build/WebKitBuild/Release/WebCore.framework/PrivateHeaders/icu -I/Volumes/Data/slave/mountainlion-release/build/WebKitBuild/Release/DerivedSources/WebKit -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Volumes/Data/slave/mountainlion-release/build/WebKitBuild/WebKit.build/Release/WebKit.build/DerivedSources/x86_64 -I/Volumes/Data/slave/mountainlion-release/build/WebKitBuild/WebKit.build/Release/WebKit.build/DerivedSources -Wall -Wextra -Wchar-subscripts -Wextra-tokens -Wformat-security -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wno-unused-parameter -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -F/Volumes/Data/slave/mountainlion-release/build/WebKitBuild/Release -F/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/WebKit.framework/Versions/A/Frameworks -iframework /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/ApplicationServices.framework/Frameworks -iframework /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Carbon.framework/Frameworks -iframework /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Quartz.framework/Frameworks -iframework /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/CoreServices.framework/Frameworks -iframework /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/PrivateFrameworks -include /Volumes/Data/slave/mountainlion-release/build/WebKitBuild/PrecompiledHeaders/WebKitPrefix-fxwomnyouexnutarzdwigoiniwaf/WebKitPrefix.h -MMD -MT dependencies -MF /Volumes/Data/slave/mountainlion-release/build/WebKitBuild/WebKit.build/Release/WebKit.build/Objects-normal/x86_64/WebFrameLoaderClient.d --serialize-diagnostics /Volumes/Data/slave/mountainlion-release/build/WebKitBuild/WebKit.build/Release/WebKit.build/Objects-normal/x86_64/WebFrameLoaderClient.dia -c /Volumes/Data/slave/mountainlion-release/build/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm -o /Volumes/Data/slave/mountainlion-release/build/WebKitBuild/WebKit.build/Release/WebKit.build/Objects-normal/x86_64/WebFrameLoaderClient.o > In file included from /Volumes/Data/slave/mountainlion-release/build/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm:55: > In file included from /Volumes/Data/slave/mountainlion-release/build/Source/WebKit/mac/History/WebHistoryInternal.h:29: > In file included from /Volumes/Data/slave/mountainlion-release/build/Source/WebKit/mac/History/WebHistoryPrivate.h:29: > /Volumes/Data/slave/mountainlion-release/build/Source/WebKit/mac/History/WebHistory.h:123:36: error: expected ';' after method prototype > - (NSArray *)orderedLastVisitedDays NS_DEPRECATED_MAC(10_3, 10_9); > ^ > ; > /Volumes/Data/slave/mountainlion-release/build/Source/WebKit/mac/History/WebHistory.h:132:103: error: expected ':' > - (NSArray *)orderedItemsLastVisitedOnDay:(NSCalendarDate *)calendarDate NS_DEPRECATED_MAC(10_3, 10_9); > ^ > 2 errors generated. 950489 5 216886 buildbot 2013-11-13 19:11:34 -0800 Comment on attachment 216886 Patch Attachment 216886 did not pass mac-wk2-ews (mac-wk2): Output: http://webkit-queues.appspot.com/results/22720060 950493 6 216886 buildbot 2013-11-13 19:38:08 -0800 Comment on attachment 216886 Patch Attachment 216886 did not pass mac-ews (mac): Output: http://webkit-queues.appspot.com/results/21250190 950873 7 216886 mrowe 2013-11-14 15:29:50 -0800 Comment on attachment 216886 Patch Marking as obsolete since it broke builds. 951969 8 mrowe 2013-11-18 22:43:05 -0800 When we do this we should revert the WebHistory.h portion of r159480 that was added to silence deprecation warnings (<http://trac.webkit.org/changeset/159480/trunk/Source/WebKit/mac/History/WebHistory.h>). 216886 2013-11-13 18:41:29 -0800 2013-11-14 15:29:50 -0800 Patch bug-124329-20131113184128.patch text/plain 7128 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTU5MjY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDI5OGY1NmE0YzJjMzBjN2Rm Yjc1NDllYTdlZjYxZmRiMWUzNjUxMzkuLmIzNWNkMzAwMjlhYWUyODg2NTM5Yjk1NTZlZDM0NGEz NjY4ZWJhOTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTMtMTEtMTMgIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBEZXByZWNhdGUgV2ViSGlz dG9yeSBtZXRob2RzIHRoYXQgdXNlIE5TQ2FsZW5kYXJEYXRlCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjQzMjkKKyAgICAgICAgPHJkYXI6Ly9wcm9i bGVtLzE1NDQxMTIyPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogV2ViS2l0Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisgICAgICAgIEFkZCBh IHNoZWxsIHNjcmlwdCBwaGFzZSB0aGF0IHVzZXMgdW5pZmRlZiB0byByZW1vdmUgdGhlIF9fTlNk XzEwXzkgI2RlZmluZSBmcm9tCisgICAgICAgIFdlYkhpc3Rvcnkgb24gTWF2ZXJpY2tzLgorCiAy MDEzLTExLTExICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAK ICAgICAgICAgVW5yZXZpZXdlZCBidWlsZCBmaXggZm9yIFdpbjY0LgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCmlu ZGV4IDUyMzAxNjExZGQxMTE2NWQ0NjQwZmRlMTlmMzc5ZTY1ZDU2ZjE3NWQuLjQ0ZDk1ZDVkYjAy MmM2OWNiNTliN2Q1ODVjYmZkYjY0OTVkYmE2MjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv bWFjL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwxOCBAQAorMjAxMy0xMS0xMyAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29t PgorCisgICAgICAgIERlcHJlY2F0ZSBXZWJIaXN0b3J5IG1ldGhvZHMgdGhhdCB1c2UgTlNDYWxl bmRhckRhdGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEyNDMyOQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTU0NDExMjI+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBIaXN0b3J5L1dlYkhpc3Rvcnku aDoKKyAgICAgICAgQWRkIE5TX0RFUFJFQ0FURURfTUFDIHRvIG9yZGVyZWRMYXN0VmlzaXRlZERh eXMgYW5kIG9yZGVyZWRJdGVtc0xhc3RWaXNpdGVkT25EYXk6LgorICAgICAgICBJbiBvcmRlciB0 byBub3QgYnJlYWsgdGhlIE1vdW50YWluIExpb24gYnVpbGQsIGRlZmluZSBfX05TZF8xMF85IGlm IG5lY2Vzc2FyeS4KKyAgICAgICAgCisgICAgICAgICogSGlzdG9yeS9XZWJIaXN0b3J5Lm1tOgor ICAgICAgICBJZ25vcmUgZGVwcmVjYXRpb24gd2FybmluZ3MgaW4gbWV0aG9kcyB3aGVyZSBOU0Nh bGVuZGFyRGF0ZSBpcyB1c2VkLgorCiAyMDEzLTExLTEzICBHb3Jkb24gU2hlcmlkYW4gIDxnb3Jk b25fc2hlcmlkYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZWQgZGVwcmVjYXRlZCBkb3du bG9hZCBkZWxlZ2F0ZXMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYktpdC54Y29kZXBy b2ovcHJvamVjdC5wYnhwcm9qIGIvU291cmNlL1dlYktpdC9XZWJLaXQueGNvZGVwcm9qL3Byb2pl Y3QucGJ4cHJvagppbmRleCBiNmI0YmI3OGRhZjAwNTQzOTdmODdhYzI0MTg5MTcxMTVlZWI1ZDNk Li4xNDhiZjE3MmI4ZGFhYjE4ZDMyY2UwMWYzNTllZGZhYTg3NjQwYmQ3IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1dlYktpdC54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCisrKyBiL1NvdXJj ZS9XZWJLaXQvV2ViS2l0Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKQEAgLTE5NzcsNiArMTk3 Nyw3IEBACiAJCQkJMUM2Q0IwNTEwQUE2M0VCMDAwRDIzQkZEIC8qIE1pZ3JhdGUgSGVhZGVycyAq LywKIAkJCQk5Mzk4MTEzMDA4MjRCRjAxMDA4REYwMzggLyogTWFrZSBGcmFtZXdvcmtzIFN5bWJv bGljIExpbmsgKi8sCiAJCQkJOTM5ODEwMEQwODI0QkYwMTAwOERGMDM4IC8qIEhlYWRlcnMgKi8s CisJCQkJMUE2RDY1QkExODM0NkFERDAwNUFFREU5IC8qIFBvc3Rwcm9jZXNzIEhlYWRlcnMgKi8s CiAJCQkJOTM5ODEwQjIwODI0QkYwMTAwOERGMDM4IC8qIFJlc291cmNlcyAqLywKIAkJCQk5Mzk4 MTBCQjA4MjRCRjAxMDA4REYwMzggLyogU291cmNlcyAqLywKIAkJCQkxQzM5NURFMjBDNkJFOEUw MDAwRDFFNTIgLyogR2VuZXJhdGUgNjQtYml0IEV4cG9ydCBGaWxlICovLApAQCAtMjA0NSw2ICsy MDQ2LDIxIEBACiAvKiBFbmQgUEJYUmVzb3VyY2VzQnVpbGRQaGFzZSBzZWN0aW9uICovCiAKIC8q IEJlZ2luIFBCWFNoZWxsU2NyaXB0QnVpbGRQaGFzZSBzZWN0aW9uICovCisJCTFBNkQ2NUJBMTgz NDZBREQwMDVBRURFOSAvKiBQb3N0cHJvY2VzcyBIZWFkZXJzICovID0geworCQkJaXNhID0gUEJY U2hlbGxTY3JpcHRCdWlsZFBoYXNlOworCQkJYnVpbGRBY3Rpb25NYXNrID0gMjE0NzQ4MzY0NzsK KwkJCWZpbGVzID0gKAorCQkJKTsKKwkJCWlucHV0UGF0aHMgPSAoCisJCQkJIiQoVEFSR0VUX0JV SUxEX0RJUikvJChQVUJMSUNfSEVBREVSU19GT0xERVJfUEFUSCkvV2ViSGlzdG9yeS5oIiwKKwkJ CSk7CisJCQluYW1lID0gIlBvc3Rwcm9jZXNzIEhlYWRlcnMiOworCQkJb3V0cHV0UGF0aHMgPSAo CisJCQkpOworCQkJcnVuT25seUZvckRlcGxveW1lbnRQb3N0cHJvY2Vzc2luZyA9IDA7CisJCQlz aGVsbFBhdGggPSAvYmluL3NoOworCQkJc2hlbGxTY3JpcHQgPSAiY2QgXCIke1RBUkdFVF9CVUlM RF9ESVJ9LyR7UFVCTElDX0hFQURFUlNfRk9MREVSX1BBVEh9XCJcblxuaWYgW1sgJHtUQVJHRVRf TUFDX09TX1hfVkVSU0lPTl9NQUpPUn0gPT0gXCIxMDgwXCIgXV07IHRoZW5cblVOSUZERUZfT1BU SU9OPVwiLVVfX05TZF8xMF85XCI7XG5lbHNlXG5VTklGREVGX09QVElPTj1cIi1EX19OU2RfMTBf OVwiO1xuZmlcblxuZm9yIEhFQURFUiBpbiBXZWJIaXN0b3J5Lmg7IGRvXG51bmlmZGVmIC1CICR7 VU5JRkRFRl9PUFRJT059IC1vICR7SEVBREVSfS51bmlmZGVmICR7SEVBREVSfVxuY2FzZSAkPyBp blxuMClcbnJtICR7SEVBREVSfS51bmlmZGVmXG47O1xuMSlcbm12ICR7SEVBREVSfXsudW5pZmRl Zix9XG47O1xuKilcbmV4aXQgMVxuZXNhY1xuZG9uZVxuIjsKKwkJfTsKIAkJMUMzOTVERTIwQzZC RThFMDAwMEQxRTUyIC8qIEdlbmVyYXRlIDY0LWJpdCBFeHBvcnQgRmlsZSAqLyA9IHsKIAkJCWlz YSA9IFBCWFNoZWxsU2NyaXB0QnVpbGRQaGFzZTsKIAkJCWJ1aWxkQWN0aW9uTWFzayA9IDIxNDc0 ODM2NDc7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9IaXN0b3J5L1dlYkhpc3Rvcnku aCBiL1NvdXJjZS9XZWJLaXQvbWFjL0hpc3RvcnkvV2ViSGlzdG9yeS5oCmluZGV4IDhhNmVjMGJj NThmMGIyN2MxYmMyZGJjMjIyZTUxMWNjZTNjMDBhZjUuLjhjOWQzNjkyZTBmYmE4NGQ5MTZkYzkw YWU5YzliZTUzNGJmZWE1YTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL0hpc3Rvcnkv V2ViSGlzdG9yeS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0hpc3RvcnkvV2ViSGlzdG9yeS5o CkBAIC0yOCw2ICsyOCwxMCBAQAogCiAjaW1wb3J0IDxGb3VuZGF0aW9uL0ZvdW5kYXRpb24uaD4K IAorI2lmbmRlZiBfX05TZF8xMF85CisjZGVmaW5lIF9fTlNkXzEwXzkgLGRlcHJlY2F0ZWQ9MTAu OQorI2VuZGlmCisKIEBjbGFzcyBOU0Vycm9yOwogCiBAY2xhc3MgV2ViSGlzdG9yeUl0ZW07CkBA IC0xMTYsNyArMTIwLDcgQEAgZXh0ZXJuIE5TU3RyaW5nICpXZWJIaXN0b3J5SXRlbXNLZXk7CiAg ICAgb3IgbW9yZSBoaXN0b3J5IGl0ZW1zLCBvcmRlcmVkIGZyb20gbW9zdCByZWNlbnQgdG8gb2xk ZXN0LgogICAgIEByZXN1bHQgUmV0dXJucyBhbiBhcnJheSBvZiBOU0NhbGVuZGFyRGF0ZXMgZm9y IHdoaWNoIGhpc3RvcnkgaXRlbXMgZXhpc3QgaW4gdGhlIFdlYkhpc3RvcnkuCiAqLwotLSAoTlNB cnJheSAqKW9yZGVyZWRMYXN0VmlzaXRlZERheXM7CistIChOU0FycmF5ICopb3JkZXJlZExhc3RW aXNpdGVkRGF5cyBOU19ERVBSRUNBVEVEX01BQygxMF8zLCAxMF85KTsKIAogLyohCiAgICAgQG1l dGhvZCBvcmRlcmVkSXRlbXNMYXN0VmlzaXRlZE9uRGF5OgpAQCAtMTI1LDcgKzEyOSw3IEBAIGV4 dGVybiBOU1N0cmluZyAqV2ViSGlzdG9yeUl0ZW1zS2V5OwogICAgIEBwYXJhbSBjYWxlbmRhckRh dGUgQSBkYXRlIGlkZW50aWZ5aW5nIHRoZSB1bmlxdWUgZGF5IG9mIGludGVyZXN0LgogICAgIEBy ZXN1bHQgUmV0dXJucyBhbiBhcnJheSBvZiBXZWJIaXN0b3J5SXRlbXMgbGFzdCB2aXNpdGVkIG9u IHRoZSBpbmRpY2F0ZWQgZGF5LgogKi8KLS0gKE5TQXJyYXkgKilvcmRlcmVkSXRlbXNMYXN0Vmlz aXRlZE9uRGF5OihOU0NhbGVuZGFyRGF0ZSAqKWNhbGVuZGFyRGF0ZTsKKy0gKE5TQXJyYXkgKilv cmRlcmVkSXRlbXNMYXN0VmlzaXRlZE9uRGF5OihOU0NhbGVuZGFyRGF0ZSAqKWNhbGVuZGFyRGF0 ZSBOU19ERVBSRUNBVEVEX01BQygxMF8zLCAxMF85KTsKIAogLyohCiAgICAgQG1ldGhvZCBpdGVt Rm9yVVJMOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvSGlzdG9yeS9XZWJIaXN0b3J5 Lm1tIGIvU291cmNlL1dlYktpdC9tYWMvSGlzdG9yeS9XZWJIaXN0b3J5Lm1tCmluZGV4IDRiNjU5 NTc5NDZiMzlkMjllOTY4MTEyMTUwNjU4OGViYzliNGIzMWQuLjhkMzc3NGY2ODVkZDBkOWExYjA5 NTdhMGNmMWJkNmY0NDNlN2Q4YzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL0hpc3Rv cnkvV2ViSGlzdG9yeS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9IaXN0b3J5L1dlYkhpc3Rv cnkubW0KQEAgLTkyLDcgKzkyLDYgQEAgcHJpdmF0ZToKIC0gKHZvaWQpcmVidWlsZEhpc3RvcnlC eURheUlmTmVlZGVkOihXZWJIaXN0b3J5ICopd2ViSGlzdG9yeTsKIAogLSAoTlNBcnJheSAqKW9y ZGVyZWRMYXN0VmlzaXRlZERheXM7Ci0tIChOU0FycmF5ICopb3JkZXJlZEl0ZW1zTGFzdFZpc2l0 ZWRPbkRheTooTlNDYWxlbmRhckRhdGUgKiljYWxlbmRhckRhdGU7CiAtIChCT09MKWNvbnRhaW5z VVJMOihOU1VSTCAqKVVSTDsKIC0gKFdlYkhpc3RvcnlJdGVtICopaXRlbUZvclVSTDooTlNVUkwg KilVUkw7CiAtIChXZWJIaXN0b3J5SXRlbSAqKWl0ZW1Gb3JVUkxTdHJpbmc6KE5TU3RyaW5nICop VVJMU3RyaW5nOwpAQCAtMTAxLDggKzEwMCw2IEBAIHByaXZhdGU6CiAtIChCT09MKWxvYWRGcm9t VVJMOihOU1VSTCAqKVVSTCBjb2xsZWN0RGlzY2FyZGVkSXRlbXNJbnRvOihOU011dGFibGVBcnJh eSAqKWRpc2NhcmRlZEl0ZW1zIGVycm9yOihOU0Vycm9yICoqKWVycm9yOwogLSAoQk9PTClzYXZl VG9VUkw6KE5TVVJMICopVVJMIGVycm9yOihOU0Vycm9yICoqKWVycm9yOwogCi0tIChOU0NhbGVu ZGFyRGF0ZSAqKWFnZUxpbWl0RGF0ZTsKLQogLSAodm9pZClzZXRIaXN0b3J5SXRlbUxpbWl0Oihp bnQpbGltaXQ7CiAtIChpbnQpaGlzdG9yeUl0ZW1MaW1pdDsKIC0gKHZvaWQpc2V0SGlzdG9yeUFn ZUluRGF5c0xpbWl0OihpbnQpbGltaXQ7CkBAIC00MzIsNiArNDI5LDkgQEAgc3RhdGljIGlubGlu ZSBXZWJIaXN0b3J5RGF0ZUtleSBkYXRlS2V5KE5TVGltZUludGVydmFsIGRhdGUpCiAKIC8vIE1B Uks6IERBVEUtQkFTRUQgUkVUUklFVkFMCiAKKyNwcmFnbWEgY2xhbmcgZGlhZ25vc3RpYyBwdXNo CisjcHJhZ21hIGNsYW5nIGRpYWdub3N0aWMgaWdub3JlZCAiLVdkZXByZWNhdGVkLWRlY2xhcmF0 aW9ucyIKKwogLSAoTlNBcnJheSAqKW9yZGVyZWRMYXN0VmlzaXRlZERheXMKIHsKICAgICBpZiAo IV9vcmRlcmVkTGFzdFZpc2l0ZWREYXlzKSB7CkBAIC00NjIsNiArNDYyLDggQEAgc3RhdGljIGlu bGluZSBXZWJIaXN0b3J5RGF0ZUtleSBkYXRlS2V5KE5TVGltZUludGVydmFsIGRhdGUpCiAgICAg cmV0dXJuIF9lbnRyaWVzQnlEYXRlLT5nZXQoZGF0ZUtleSkuZ2V0KCk7CiB9CiAKKyNwcmFnbWEg Y2xhbmcgZGlhZ25vc3RpYyBwb3AKKwogLy8gTUFSSzogVVJMIE1BVENISU5HCiAKIC0gKFdlYkhp c3RvcnlJdGVtICopaXRlbUZvclVSTFN0cmluZzooTlNTdHJpbmcgKilVUkxTdHJpbmcKQEAgLTUx Miw2ICs1MTQsOSBAQCBzdGF0aWMgaW5saW5lIFdlYkhpc3RvcnlEYXRlS2V5IGRhdGVLZXkoTlNU aW1lSW50ZXJ2YWwgZGF0ZSkKICAgICByZXR1cm4gW1tOU1VzZXJEZWZhdWx0cyBzdGFuZGFyZFVz ZXJEZWZhdWx0c10gaW50ZWdlckZvcktleTpAIldlYktpdEhpc3RvcnlJdGVtTGltaXQiXTsKIH0K IAorI3ByYWdtYSBjbGFuZyBkaWFnbm9zdGljIHB1c2gKKyNwcmFnbWEgY2xhbmcgZGlhZ25vc3Rp YyBpZ25vcmVkICItV2RlcHJlY2F0ZWQtZGVjbGFyYXRpb25zIgorCiAvLyBSZXR1cm4gYSBkYXRl IHRoYXQgbWFya3MgdGhlIGFnZSBsaW1pdCBmb3IgaGlzdG9yeSBlbnRyaWVzIHNhdmVkIHRvIG9y CiAvLyBsb2FkZWQgZnJvbSBkaXNrLiBBbnkgZW50cnkgb2xkZXIgdGhhbiB0aGlzIGl0ZW0gc2hv dWxkIGJlIHJlamVjdGVkLgogLSAoTlNDYWxlbmRhckRhdGUgKilhZ2VMaW1pdERhdGUKQEAgLTUy MCw2ICs1MjUsOCBAQCBzdGF0aWMgaW5saW5lIFdlYkhpc3RvcnlEYXRlS2V5IGRhdGVLZXkoTlNU aW1lSW50ZXJ2YWwgZGF0ZSkKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGhvdXJzOjAgbWludXRlczowIHNlY29uZHM6MF07CiB9CiAKKyNwcmFn bWEgY2xhbmcgZGlhZ25vc3RpYyBwb3AKKwogLSAoQk9PTClsb2FkSGlzdG9yeUd1dHNGcm9tVVJM OihOU1VSTCAqKVVSTCBzYXZlZEl0ZW1zQ291bnQ6KGludCAqKW51bWJlck9mSXRlbXNMb2FkZWQg Y29sbGVjdERpc2NhcmRlZEl0ZW1zSW50bzooTlNNdXRhYmxlQXJyYXkgKilkaXNjYXJkZWRJdGVt cyBlcnJvcjooTlNFcnJvciAqKillcnJvcgogewogICAgICpudW1iZXJPZkl0ZW1zTG9hZGVkID0g MDsK