197080 2019-04-18 15:58:50 -0700 Deprecate WebKit2 plug-in support 2019-04-19 14:04:31 -0700 1 1 1 Unclassified WebKit WebKit API WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 197103 1 beidson beidson aestes commit-queue rmorisset sroberts oldest_to_newest 1528638 0 beidson 2019-04-18 15:58:50 -0700 Deprecate WebKit2 plug-in support <rdar://problem/43812306> 1528657 1 367776 beidson 2019-04-18 16:54:48 -0700 Created attachment 367776 Patch 1528658 2 367776 aestes 2019-04-18 17:01:09 -0700 Comment on attachment 367776 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=367776&action=review > Source/WebKit/UIProcess/API/Cocoa/WKPreferences.h:70 > +@property (nonatomic) BOOL javaEnabled WK_API_DEPRECATED("Java is no longer supported", macos(WK_MAC_TBA, WK_MAC_TBA)); > +@property (nonatomic) BOOL plugInsEnabled WK_API_DEPRECATED("Plug-ins are no longer supported", macos(WK_MAC_TBA, WK_MAC_TBA)); The first WK_MAC_TBA should instead be the release that introduced the property. 1528659 3 367777 beidson 2019-04-18 17:01:12 -0700 Created attachment 367777 Patch 1528686 4 367777 commit-queue 2019-04-18 19:37:00 -0700 Comment on attachment 367777 Patch Clearing flags on attachment: 367777 Committed r244447: <https://trac.webkit.org/changeset/244447> 1528687 5 commit-queue 2019-04-18 19:37:02 -0700 All reviewed patches have been landed. Closing bug. 1528688 6 rmorisset 2019-04-18 19:58:57 -0700 This broke the build for me: /Users/rmorisset/Webkit/OpenSource/WebKitBuild/Release/WebKit.framework/Headers/WKPreferences.h:69:92: error: expected a version of the form 'major[.minor[.subminor]]' @property (nonatomic) BOOL javaEnabled API_DEPRECATED("Java is no longer supported", macos(macos(10.10), 10.14.4)); ^ /Users/rmorisset/Webkit/OpenSource/WebKitBuild/Release/WebKit.framework/Headers/WKPreferences.h:70:100: error: expected a version of the form 'major[.minor[.subminor]]' @property (nonatomic) BOOL plugInsEnabled API_DEPRECATED("Plug-ins are no longer supported", macos(macos(10.10), 10.14.4)); Replacing macOS(10.10) by 10.10 fixed it. I don't know why it did not break the build for the bots. 1528694 7 beidson 2019-04-18 21:03:01 -0700 That is truly odd. Also built locally for me on two different OSes, and the formatting in this patch can be seen elsewhere. 🤔 1528765 8 sroberts 2019-04-19 08:43:15 -0700 Rolled out in https://trac.webkit.org/changeset/244451/webkit Was causing OpenSource and Internal builders to fail. https://build.webkit.org/builders/Apple%20Mojave%20Release%20%28Build%29/builds/5069/steps/compile-webkit/logs/stdio In file included from /Volumes/Data/slave/mojave-release/build/Tools/MiniBrowser/mac/MiniBrowser_Prefix.pch:28: In file included from /Volumes/Data/slave/mojave-release/build/WebKitBuild/Release/WebKit.framework/Headers/WebKit.h:39: /Volumes/Data/slave/mojave-release/build/WebKitBuild/Release/WebKit.framework/Headers/WKPreferences.h:69:92: error: expected a version of the form 'major[.minor[.subminor]]' @property (nonatomic) BOOL javaEnabled API_DEPRECATED("Java is no longer supported", macos(macos(10.10), 10.14)); ^ /Volumes/Data/slave/mojave-release/build/WebKitBuild/Release/WebKit.framework/Headers/WKPreferences.h:70:100: error: expected a version of the form 'major[.minor[.subminor]]' @property (nonatomic) BOOL plugInsEnabled API_DEPRECATED("Plug-ins are no longer supported", macos(macos(10.10), 10.14)); 1528823 9 367812 beidson 2019-04-19 12:44:52 -0700 Created attachment 367812 Patch 1528857 10 367812 commit-queue 2019-04-19 14:04:30 -0700 Comment on attachment 367812 Patch Clearing flags on attachment: 367812 Committed r244465: <https://trac.webkit.org/changeset/244465> 1528858 11 commit-queue 2019-04-19 14:04:31 -0700 All reviewed patches have been landed. Closing bug. 367776 2019-04-18 16:54:48 -0700 2019-04-18 17:01:11 -0700 Patch bug-197080-20190418165447.patch text/plain 4663 beidson U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ0NDI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDJiNjgxNGRkZmIxZDJjZTA1 NGVhMGNhMzJmMTQwMmExNWU4OWQyMWUuLmJjNWU5YzgwMTQxNjUyZjRmOWViNTRlOGI1MTZjYWU4 NjAwMGNlZTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTktMDQtMTggIEJyYWR5IEVp ZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAgICAgIERlcHJlY2F0ZSBXZWJLaXQyIHBs dWctaW4gc3VwcG9ydC4KKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQzODEyMzA2PiBhbmQgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NzA4MAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2Nv YS9XS1ByZWZlcmVuY2VzLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1ByZWZl cmVuY2VzLm1tOgorICAgICAgICAoLVtXS1ByZWZlcmVuY2VzIGVuY29kZVdpdGhDb2RlcjpdKToK KyAgICAgICAgKC1bV0tQcmVmZXJlbmNlcyBpbml0V2l0aENvZGVyOl0pOgorICAgICAgICAoLVtX S1ByZWZlcmVuY2VzIGphdmFFbmFibGVkXSk6CisgICAgICAgICgtW1dLUHJlZmVyZW5jZXMgc2V0 SmF2YUVuYWJsZWQ6XSk6CisgICAgICAgICgtW1dLUHJlZmVyZW5jZXMgcGx1Z0luc0VuYWJsZWRd KToKKyAgICAgICAgKC1bV0tQcmVmZXJlbmNlcyBzZXRQbHVnSW5zRW5hYmxlZDpdKToKKwogMjAx OS0wNC0xOCAgU2hhd24gUm9iZXJ0cyAgPHNyb2JlcnRzQGFwcGxlLmNvbT4KIAogICAgICAgICBV bnJldmlld2VkIG1hbnVhbCByb2xsb3V0IG9mIHIyNDQyNDggYW5kIHIyNDQ0MDkKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1ByZWZlcmVuY2VzLmggYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tQcmVmZXJlbmNlcy5oCmluZGV4IGY0 ZTczYTc0YzI5NDgwMWI4Mzc0MWU4MzQwMGMzZmIyNTRhOTIzODEuLjNkNjUzYjhhNmRlZDJiMmNi NDlmZGI4ZmM0YTVjNWUxYjU4ZDQ5MTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0FQSS9Db2NvYS9XS1ByZWZlcmVuY2VzLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvQVBJL0NvY29hL1dLUHJlZmVyZW5jZXMuaApAQCAtNTIsMTYgKzUyLDYgQEAgV0tfQ0xBU1Nf QVZBSUxBQkxFKG1hY29zKDEwLjEwKSwgaW9zKDguMCkpCiBAcHJvcGVydHkgKG5vbmF0b21pYykg Qk9PTCBqYXZhU2NyaXB0Q2FuT3BlbldpbmRvd3NBdXRvbWF0aWNhbGx5OwogCiAjaWYgIVRBUkdF VF9PU19JUEhPTkUKLS8qISBAYWJzdHJhY3QgQSBCb29sZWFuIHZhbHVlIGluZGljYXRpbmcgd2hl dGhlciBKYXZhIGlzIGVuYWJsZWQuCi0gQGRpc2N1c3Npb24gVGhlIGRlZmF1bHQgdmFsdWUgaXMg Tk8uCi0gKi8KLUBwcm9wZXJ0eSAobm9uYXRvbWljKSBCT09MIGphdmFFbmFibGVkOwotCi0vKiEg QGFic3RyYWN0IEEgQm9vbGVhbiB2YWx1ZSBpbmRpY2F0aW5nIHdoZXRoZXIgcGx1Zy1pbnMgYXJl IGVuYWJsZWQuCi0gQGRpc2N1c3Npb24gVGhlIGRlZmF1bHQgdmFsdWUgaXMgTk8uCi0gKi8KLUBw cm9wZXJ0eSAobm9uYXRvbWljKSBCT09MIHBsdWdJbnNFbmFibGVkOwotCiAvKiEKICBAcHJvcGVy dHkgdGFiRm9jdXNlc0xpbmtzCiAgQGFic3RyYWN0IElmIHRhYkZvY3VzZXNMaW5rcyBpcyBZRVMs IHRoZSB0YWIga2V5IHdpbGwgZm9jdXMgbGlua3MgYW5kIGZvcm0gY29udHJvbHMuCkBAIC03MSwz ICs2MSwxNCBAQCBXS19DTEFTU19BVkFJTEFCTEUobWFjb3MoMTAuMTApLCBpb3MoOC4wKSkKICNl bmRpZgogCiBAZW5kCisKKyNpZiAhVEFSR0VUX09TX0lQSE9ORQorCitAaW50ZXJmYWNlIFdLUHJl ZmVyZW5jZXMgKFdLRGVwcmVjYXRlZCkKKworQHByb3BlcnR5IChub25hdG9taWMpIEJPT0wgamF2 YUVuYWJsZWQgV0tfQVBJX0RFUFJFQ0FURUQoIkphdmEgaXMgbm8gbG9uZ2VyIHN1cHBvcnRlZCIs IG1hY29zKFdLX01BQ19UQkEsIFdLX01BQ19UQkEpKTsKK0Bwcm9wZXJ0eSAobm9uYXRvbWljKSBC T09MIHBsdWdJbnNFbmFibGVkIFdLX0FQSV9ERVBSRUNBVEVEKCJQbHVnLWlucyBhcmUgbm8gbG9u Z2VyIHN1cHBvcnRlZCIsIG1hY29zKFdLX01BQ19UQkEsIFdLX01BQ19UQkEpKTsKKworQGVuZAor CisjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9X S1ByZWZlcmVuY2VzLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLUHJl ZmVyZW5jZXMubW0KaW5kZXggNmIyNDk5YzJhNTI1ZDE3MWYxMWU5NTYyZTk5ZWVhYjViNGRkOTdl OC4uYzNiZWZjZTE5MGY5YTk4NWFhMTBmNzE2ZjU2YzNiYjVkZmY5YTU4MiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLUHJlZmVyZW5jZXMubW0KKysrIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLUHJlZmVyZW5jZXMubW0KQEAgLTY5 LDggKzY5LDEwIEBAIC0gKHZvaWQpZW5jb2RlV2l0aENvZGVyOihOU0NvZGVyICopY29kZXIKICAg ICBbY29kZXIgZW5jb2RlQm9vbDpzZWxmLmphdmFTY3JpcHRDYW5PcGVuV2luZG93c0F1dG9tYXRp Y2FsbHkgZm9yS2V5OkAiamF2YVNjcmlwdENhbk9wZW5XaW5kb3dzQXV0b21hdGljYWxseSJdOwog CiAjaWYgUExBVEZPUk0oTUFDKQorQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNfQkVHSU4K ICAgICBbY29kZXIgZW5jb2RlQm9vbDpzZWxmLmphdmFFbmFibGVkIGZvcktleTpAImphdmFFbmFi bGVkIl07CiAgICAgW2NvZGVyIGVuY29kZUJvb2w6c2VsZi5wbHVnSW5zRW5hYmxlZCBmb3JLZXk6 QCJwbHVnSW5zRW5hYmxlZCJdOworQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNfRU5ECiAg ICAgW2NvZGVyIGVuY29kZUJvb2w6c2VsZi50YWJGb2N1c2VzTGlua3MgZm9yS2V5OkAidGFiRm9j dXNlc0xpbmtzIl07CiAjZW5kaWYKIH0KQEAgLTg1LDggKzg3LDEwIEBAIC0gKGluc3RhbmNldHlw ZSlpbml0V2l0aENvZGVyOihOU0NvZGVyICopY29kZXIKICAgICBzZWxmLmphdmFTY3JpcHRDYW5P cGVuV2luZG93c0F1dG9tYXRpY2FsbHkgPSBbY29kZXIgZGVjb2RlQm9vbEZvcktleTpAImphdmFT Y3JpcHRDYW5PcGVuV2luZG93c0F1dG9tYXRpY2FsbHkiXTsKIAogI2lmIFBMQVRGT1JNKE1BQykK K0FMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0JFR0lOCiAgICAgc2VsZi5qYXZhRW5hYmxl ZCA9IFtjb2RlciBkZWNvZGVCb29sRm9yS2V5OkAiamF2YUVuYWJsZWQiXTsKICAgICBzZWxmLnBs dWdJbnNFbmFibGVkID0gW2NvZGVyIGRlY29kZUJvb2xGb3JLZXk6QCJwbHVnSW5zRW5hYmxlZCJd OworQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNfRU5ECiAgICAgc2VsZi50YWJGb2N1c2Vz TGlua3MgPSBbY29kZXIgZGVjb2RlQm9vbEZvcktleTpAInRhYkZvY3VzZXNMaW5rcyJdOwogI2Vu ZGlmCiAKQEAgLTEzMiwyNiArMTM2LDYgQEAgLSAodm9pZClzZXRKYXZhU2NyaXB0Q2FuT3Blbldp bmRvd3NBdXRvbWF0aWNhbGx5OihCT09MKWphdmFTY3JpcHRDYW5PcGVuV2luZG93c0EKIAogI2lm IFBMQVRGT1JNKE1BQykKIAotLSAoQk9PTClqYXZhRW5hYmxlZAotewotICAgIHJldHVybiBfcHJl ZmVyZW5jZXMtPmphdmFFbmFibGVkKCk7Ci19Ci0KLS0gKHZvaWQpc2V0SmF2YUVuYWJsZWQ6KEJP T0wpamF2YUVuYWJsZWQKLXsKLSAgICBfcHJlZmVyZW5jZXMtPnNldEphdmFFbmFibGVkKGphdmFF bmFibGVkKTsKLX0KLQotLSAoQk9PTClwbHVnSW5zRW5hYmxlZAotewotICAgIHJldHVybiBfcHJl ZmVyZW5jZXMtPnBsdWdpbnNFbmFibGVkKCk7Ci19Ci0KLS0gKHZvaWQpc2V0UGx1Z0luc0VuYWJs ZWQ6KEJPT0wpcGx1Z0luc0VuYWJsZWQKLXsKLSAgICBfcHJlZmVyZW5jZXMtPnNldFBsdWdpbnNF bmFibGVkKHBsdWdJbnNFbmFibGVkKTsKLX0KLQogLSAoQk9PTCl0YWJGb2N1c2VzTGlua3MKIHsK ICAgICByZXR1cm4gX3ByZWZlcmVuY2VzLT50YWJzVG9MaW5rcygpOwpAQCAtMTM2MSwzICsxMzQ1 LDMxIEBAIC0gKEJPT0wpX2RldmljZU9yaWVudGF0aW9uRXZlbnRFbmFibGVkCiB9CiAKIEBlbmQK KworI2lmICFUQVJHRVRfT1NfSVBIT05FCisKK0BpbXBsZW1lbnRhdGlvbiBXS1ByZWZlcmVuY2Vz IChXS0RlcHJlY2F0ZWQpCisKKy0gKEJPT0wpamF2YUVuYWJsZWQKK3sKKyAgICByZXR1cm4gX3By ZWZlcmVuY2VzLT5qYXZhRW5hYmxlZCgpOworfQorCistICh2b2lkKXNldEphdmFFbmFibGVkOihC T09MKWphdmFFbmFibGVkCit7CisgICAgX3ByZWZlcmVuY2VzLT5zZXRKYXZhRW5hYmxlZChqYXZh RW5hYmxlZCk7Cit9CisKKy0gKEJPT0wpcGx1Z0luc0VuYWJsZWQKK3sKKyAgICByZXR1cm4gX3By ZWZlcmVuY2VzLT5wbHVnaW5zRW5hYmxlZCgpOworfQorCistICh2b2lkKXNldFBsdWdJbnNFbmFi bGVkOihCT09MKXBsdWdJbnNFbmFibGVkCit7CisgICAgX3ByZWZlcmVuY2VzLT5zZXRQbHVnaW5z RW5hYmxlZChwbHVnSW5zRW5hYmxlZCk7Cit9CisKK0BlbmQKKworI2VuZGlmCg== 367777 2019-04-18 17:01:12 -0700 2019-04-19 12:44:51 -0700 Patch bug-197080-20190418170111.patch text/plain 4667 beidson U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ0NDI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDJiNjgxNGRkZmIxZDJjZTA1 NGVhMGNhMzJmMTQwMmExNWU4OWQyMWUuLmJjNWU5YzgwMTQxNjUyZjRmOWViNTRlOGI1MTZjYWU4 NjAwMGNlZTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTktMDQtMTggIEJyYWR5IEVp ZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAgICAgIERlcHJlY2F0ZSBXZWJLaXQyIHBs dWctaW4gc3VwcG9ydC4KKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQzODEyMzA2PiBhbmQgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NzA4MAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2Nv YS9XS1ByZWZlcmVuY2VzLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1ByZWZl cmVuY2VzLm1tOgorICAgICAgICAoLVtXS1ByZWZlcmVuY2VzIGVuY29kZVdpdGhDb2RlcjpdKToK KyAgICAgICAgKC1bV0tQcmVmZXJlbmNlcyBpbml0V2l0aENvZGVyOl0pOgorICAgICAgICAoLVtX S1ByZWZlcmVuY2VzIGphdmFFbmFibGVkXSk6CisgICAgICAgICgtW1dLUHJlZmVyZW5jZXMgc2V0 SmF2YUVuYWJsZWQ6XSk6CisgICAgICAgICgtW1dLUHJlZmVyZW5jZXMgcGx1Z0luc0VuYWJsZWRd KToKKyAgICAgICAgKC1bV0tQcmVmZXJlbmNlcyBzZXRQbHVnSW5zRW5hYmxlZDpdKToKKwogMjAx OS0wNC0xOCAgU2hhd24gUm9iZXJ0cyAgPHNyb2JlcnRzQGFwcGxlLmNvbT4KIAogICAgICAgICBV bnJldmlld2VkIG1hbnVhbCByb2xsb3V0IG9mIHIyNDQyNDggYW5kIHIyNDQ0MDkKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1ByZWZlcmVuY2VzLmggYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tQcmVmZXJlbmNlcy5oCmluZGV4IGY0 ZTczYTc0YzI5NDgwMWI4Mzc0MWU4MzQwMGMzZmIyNTRhOTIzODEuLjU1YzAwMjYzNjZmN2U1NjA0 ZWFkNGIxYzY3ZDg4Nzc3ZmI0MmRhMGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0FQSS9Db2NvYS9XS1ByZWZlcmVuY2VzLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvQVBJL0NvY29hL1dLUHJlZmVyZW5jZXMuaApAQCAtNTIsMTYgKzUyLDYgQEAgV0tfQ0xBU1Nf QVZBSUxBQkxFKG1hY29zKDEwLjEwKSwgaW9zKDguMCkpCiBAcHJvcGVydHkgKG5vbmF0b21pYykg Qk9PTCBqYXZhU2NyaXB0Q2FuT3BlbldpbmRvd3NBdXRvbWF0aWNhbGx5OwogCiAjaWYgIVRBUkdF VF9PU19JUEhPTkUKLS8qISBAYWJzdHJhY3QgQSBCb29sZWFuIHZhbHVlIGluZGljYXRpbmcgd2hl dGhlciBKYXZhIGlzIGVuYWJsZWQuCi0gQGRpc2N1c3Npb24gVGhlIGRlZmF1bHQgdmFsdWUgaXMg Tk8uCi0gKi8KLUBwcm9wZXJ0eSAobm9uYXRvbWljKSBCT09MIGphdmFFbmFibGVkOwotCi0vKiEg QGFic3RyYWN0IEEgQm9vbGVhbiB2YWx1ZSBpbmRpY2F0aW5nIHdoZXRoZXIgcGx1Zy1pbnMgYXJl IGVuYWJsZWQuCi0gQGRpc2N1c3Npb24gVGhlIGRlZmF1bHQgdmFsdWUgaXMgTk8uCi0gKi8KLUBw cm9wZXJ0eSAobm9uYXRvbWljKSBCT09MIHBsdWdJbnNFbmFibGVkOwotCiAvKiEKICBAcHJvcGVy dHkgdGFiRm9jdXNlc0xpbmtzCiAgQGFic3RyYWN0IElmIHRhYkZvY3VzZXNMaW5rcyBpcyBZRVMs IHRoZSB0YWIga2V5IHdpbGwgZm9jdXMgbGlua3MgYW5kIGZvcm0gY29udHJvbHMuCkBAIC03MSwz ICs2MSwxNCBAQCBXS19DTEFTU19BVkFJTEFCTEUobWFjb3MoMTAuMTApLCBpb3MoOC4wKSkKICNl bmRpZgogCiBAZW5kCisKKyNpZiAhVEFSR0VUX09TX0lQSE9ORQorCitAaW50ZXJmYWNlIFdLUHJl ZmVyZW5jZXMgKFdLRGVwcmVjYXRlZCkKKworQHByb3BlcnR5IChub25hdG9taWMpIEJPT0wgamF2 YUVuYWJsZWQgV0tfQVBJX0RFUFJFQ0FURUQoIkphdmEgaXMgbm8gbG9uZ2VyIHN1cHBvcnRlZCIs IG1hY29zKG1hY29zKDEwLjEwKSwgV0tfTUFDX1RCQSkpOworQHByb3BlcnR5IChub25hdG9taWMp IEJPT0wgcGx1Z0luc0VuYWJsZWQgV0tfQVBJX0RFUFJFQ0FURUQoIlBsdWctaW5zIGFyZSBubyBs b25nZXIgc3VwcG9ydGVkIiwgbWFjb3MobWFjb3MoMTAuMTApLCBXS19NQUNfVEJBKSk7CisKK0Bl bmQKKworI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29j b2EvV0tQcmVmZXJlbmNlcy5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9X S1ByZWZlcmVuY2VzLm1tCmluZGV4IDZiMjQ5OWMyYTUyNWQxNzFmMTFlOTU2MmU5OWVlYWI1YjRk ZDk3ZTguLmMzYmVmY2UxOTBmOWE5ODVhYTEwZjcxNmY1NmMzYmI1ZGZmOWE1ODIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1ByZWZlcmVuY2VzLm1tCisr KyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1ByZWZlcmVuY2VzLm1tCkBA IC02OSw4ICs2OSwxMCBAQCAtICh2b2lkKWVuY29kZVdpdGhDb2RlcjooTlNDb2RlciAqKWNvZGVy CiAgICAgW2NvZGVyIGVuY29kZUJvb2w6c2VsZi5qYXZhU2NyaXB0Q2FuT3BlbldpbmRvd3NBdXRv bWF0aWNhbGx5IGZvcktleTpAImphdmFTY3JpcHRDYW5PcGVuV2luZG93c0F1dG9tYXRpY2FsbHki XTsKIAogI2lmIFBMQVRGT1JNKE1BQykKK0FMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0JF R0lOCiAgICAgW2NvZGVyIGVuY29kZUJvb2w6c2VsZi5qYXZhRW5hYmxlZCBmb3JLZXk6QCJqYXZh RW5hYmxlZCJdOwogICAgIFtjb2RlciBlbmNvZGVCb29sOnNlbGYucGx1Z0luc0VuYWJsZWQgZm9y S2V5OkAicGx1Z0luc0VuYWJsZWQiXTsKK0FMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0VO RAogICAgIFtjb2RlciBlbmNvZGVCb29sOnNlbGYudGFiRm9jdXNlc0xpbmtzIGZvcktleTpAInRh YkZvY3VzZXNMaW5rcyJdOwogI2VuZGlmCiB9CkBAIC04NSw4ICs4NywxMCBAQCAtIChpbnN0YW5j ZXR5cGUpaW5pdFdpdGhDb2RlcjooTlNDb2RlciAqKWNvZGVyCiAgICAgc2VsZi5qYXZhU2NyaXB0 Q2FuT3BlbldpbmRvd3NBdXRvbWF0aWNhbGx5ID0gW2NvZGVyIGRlY29kZUJvb2xGb3JLZXk6QCJq YXZhU2NyaXB0Q2FuT3BlbldpbmRvd3NBdXRvbWF0aWNhbGx5Il07CiAKICNpZiBQTEFURk9STShN QUMpCitBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19CRUdJTgogICAgIHNlbGYuamF2YUVu YWJsZWQgPSBbY29kZXIgZGVjb2RlQm9vbEZvcktleTpAImphdmFFbmFibGVkIl07CiAgICAgc2Vs Zi5wbHVnSW5zRW5hYmxlZCA9IFtjb2RlciBkZWNvZGVCb29sRm9yS2V5OkAicGx1Z0luc0VuYWJs ZWQiXTsKK0FMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0VORAogICAgIHNlbGYudGFiRm9j dXNlc0xpbmtzID0gW2NvZGVyIGRlY29kZUJvb2xGb3JLZXk6QCJ0YWJGb2N1c2VzTGlua3MiXTsK ICNlbmRpZgogCkBAIC0xMzIsMjYgKzEzNiw2IEBAIC0gKHZvaWQpc2V0SmF2YVNjcmlwdENhbk9w ZW5XaW5kb3dzQXV0b21hdGljYWxseTooQk9PTClqYXZhU2NyaXB0Q2FuT3BlbldpbmRvd3NBCiAK ICNpZiBQTEFURk9STShNQUMpCiAKLS0gKEJPT0wpamF2YUVuYWJsZWQKLXsKLSAgICByZXR1cm4g X3ByZWZlcmVuY2VzLT5qYXZhRW5hYmxlZCgpOwotfQotCi0tICh2b2lkKXNldEphdmFFbmFibGVk OihCT09MKWphdmFFbmFibGVkCi17Ci0gICAgX3ByZWZlcmVuY2VzLT5zZXRKYXZhRW5hYmxlZChq YXZhRW5hYmxlZCk7Ci19Ci0KLS0gKEJPT0wpcGx1Z0luc0VuYWJsZWQKLXsKLSAgICByZXR1cm4g X3ByZWZlcmVuY2VzLT5wbHVnaW5zRW5hYmxlZCgpOwotfQotCi0tICh2b2lkKXNldFBsdWdJbnNF bmFibGVkOihCT09MKXBsdWdJbnNFbmFibGVkCi17Ci0gICAgX3ByZWZlcmVuY2VzLT5zZXRQbHVn aW5zRW5hYmxlZChwbHVnSW5zRW5hYmxlZCk7Ci19Ci0KIC0gKEJPT0wpdGFiRm9jdXNlc0xpbmtz CiB7CiAgICAgcmV0dXJuIF9wcmVmZXJlbmNlcy0+dGFic1RvTGlua3MoKTsKQEAgLTEzNjEsMyAr MTM0NSwzMSBAQCAtIChCT09MKV9kZXZpY2VPcmllbnRhdGlvbkV2ZW50RW5hYmxlZAogfQogCiBA ZW5kCisKKyNpZiAhVEFSR0VUX09TX0lQSE9ORQorCitAaW1wbGVtZW50YXRpb24gV0tQcmVmZXJl bmNlcyAoV0tEZXByZWNhdGVkKQorCistIChCT09MKWphdmFFbmFibGVkCit7CisgICAgcmV0dXJu IF9wcmVmZXJlbmNlcy0+amF2YUVuYWJsZWQoKTsKK30KKworLSAodm9pZClzZXRKYXZhRW5hYmxl ZDooQk9PTClqYXZhRW5hYmxlZAoreworICAgIF9wcmVmZXJlbmNlcy0+c2V0SmF2YUVuYWJsZWQo amF2YUVuYWJsZWQpOworfQorCistIChCT09MKXBsdWdJbnNFbmFibGVkCit7CisgICAgcmV0dXJu IF9wcmVmZXJlbmNlcy0+cGx1Z2luc0VuYWJsZWQoKTsKK30KKworLSAodm9pZClzZXRQbHVnSW5z RW5hYmxlZDooQk9PTClwbHVnSW5zRW5hYmxlZAoreworICAgIF9wcmVmZXJlbmNlcy0+c2V0UGx1 Z2luc0VuYWJsZWQocGx1Z0luc0VuYWJsZWQpOworfQorCitAZW5kCisKKyNlbmRpZgo= 367812 2019-04-19 12:44:52 -0700 2019-04-19 14:04:30 -0700 Patch bug-197080-20190419124452.patch text/plain 4614 beidson U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ0NDU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDNmMzk5MTI2NjM2ZTExOTVj ZTc2MzhiYWI0OTE5MzEyMWNmNTgxNWQuLmM0MjE5ZTU5YWFiZjQ4ZDMwYjZiNjUwODZhY2QzMTJh NmQ2Njk3ZTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTktMDQtMTkgIEJyYWR5IEVp ZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAgICAgIERlcHJlY2F0ZSBXZWJLaXQyIHBs dWctaW4gc3VwcG9ydC4KKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQzODEyMzA2PiBhbmQgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NzA4MAorCisgICAgICAgIFJl dmlld2VkIGJ5IEFuZHkgRXN0ZXMuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dL UHJlZmVyZW5jZXMuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLUHJlZmVyZW5j ZXMubW06CisgICAgICAgICgtW1dLUHJlZmVyZW5jZXMgZW5jb2RlV2l0aENvZGVyOl0pOgorICAg ICAgICAoLVtXS1ByZWZlcmVuY2VzIGluaXRXaXRoQ29kZXI6XSk6CisgICAgICAgICgtW1dLUHJl ZmVyZW5jZXMgamF2YUVuYWJsZWRdKToKKyAgICAgICAgKC1bV0tQcmVmZXJlbmNlcyBzZXRKYXZh RW5hYmxlZDpdKToKKyAgICAgICAgKC1bV0tQcmVmZXJlbmNlcyBwbHVnSW5zRW5hYmxlZF0pOgor ICAgICAgICAoLVtXS1ByZWZlcmVuY2VzIHNldFBsdWdJbnNFbmFibGVkOl0pOgorCiAyMDE5LTA0 LTE5ICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAgICAgICAgIFlv dVR1YmUgYW5kIFR3aXR0ZXIgZW1iZWRzIGRvbid0IGxvYWQgaW4gTmV3cwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLUHJlZmVyZW5jZXMuaCBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1ByZWZlcmVuY2VzLmgKaW5kZXggZjRlNzNh NzRjMjk0ODAxYjgzNzQxZTgzNDAwYzNmYjI1NGE5MjM4MS4uNjQwOTQwYWI1MGQ5M2ViNmI3ZWMz ZGI2ZjJlYmYzMzU3NDhiOTIwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QVBJL0NvY29hL1dLUHJlZmVyZW5jZXMuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B UEkvQ29jb2EvV0tQcmVmZXJlbmNlcy5oCkBAIC01MiwxNiArNTIsNiBAQCBXS19DTEFTU19BVkFJ TEFCTEUobWFjb3MoMTAuMTApLCBpb3MoOC4wKSkKIEBwcm9wZXJ0eSAobm9uYXRvbWljKSBCT09M IGphdmFTY3JpcHRDYW5PcGVuV2luZG93c0F1dG9tYXRpY2FsbHk7CiAKICNpZiAhVEFSR0VUX09T X0lQSE9ORQotLyohIEBhYnN0cmFjdCBBIEJvb2xlYW4gdmFsdWUgaW5kaWNhdGluZyB3aGV0aGVy IEphdmEgaXMgZW5hYmxlZC4KLSBAZGlzY3Vzc2lvbiBUaGUgZGVmYXVsdCB2YWx1ZSBpcyBOTy4K LSAqLwotQHByb3BlcnR5IChub25hdG9taWMpIEJPT0wgamF2YUVuYWJsZWQ7Ci0KLS8qISBAYWJz dHJhY3QgQSBCb29sZWFuIHZhbHVlIGluZGljYXRpbmcgd2hldGhlciBwbHVnLWlucyBhcmUgZW5h YmxlZC4KLSBAZGlzY3Vzc2lvbiBUaGUgZGVmYXVsdCB2YWx1ZSBpcyBOTy4KLSAqLwotQHByb3Bl cnR5IChub25hdG9taWMpIEJPT0wgcGx1Z0luc0VuYWJsZWQ7Ci0KIC8qIQogIEBwcm9wZXJ0eSB0 YWJGb2N1c2VzTGlua3MKICBAYWJzdHJhY3QgSWYgdGFiRm9jdXNlc0xpbmtzIGlzIFlFUywgdGhl IHRhYiBrZXkgd2lsbCBmb2N1cyBsaW5rcyBhbmQgZm9ybSBjb250cm9scy4KQEAgLTcxLDMgKzYx LDEwIEBAIFdLX0NMQVNTX0FWQUlMQUJMRShtYWNvcygxMC4xMCksIGlvcyg4LjApKQogI2VuZGlm CiAKIEBlbmQKKworQGludGVyZmFjZSBXS1ByZWZlcmVuY2VzIChXS0RlcHJlY2F0ZWQpCisKK0Bw cm9wZXJ0eSAobm9uYXRvbWljKSBCT09MIGphdmFFbmFibGVkIFdLX0FQSV9ERVBSRUNBVEVEKCJK YXZhIGlzIG5vIGxvbmdlciBzdXBwb3J0ZWQiLCBtYWNvcygxMC4xMCwgV0tfTUFDX1RCQSkpOwor QHByb3BlcnR5IChub25hdG9taWMpIEJPT0wgcGx1Z0luc0VuYWJsZWQgV0tfQVBJX0RFUFJFQ0FU RUQoIlBsdWctaW5zIGFyZSBubyBsb25nZXIgc3VwcG9ydGVkIiwgbWFjb3MoMTAuMTAsIFdLX01B Q19UQkEpKTsKKworQGVuZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJ L0NvY29hL1dLUHJlZmVyZW5jZXMubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29j b2EvV0tQcmVmZXJlbmNlcy5tbQppbmRleCA2YjI0OTljMmE1MjVkMTcxZjExZTk1NjJlOTllZWFi NWI0ZGQ5N2U4Li5jM2JlZmNlMTkwZjlhOTg1YWExMGY3MTZmNTZjM2JiNWRmZjlhNTgyIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tQcmVmZXJlbmNlcy5t bQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tQcmVmZXJlbmNlcy5t bQpAQCAtNjksOCArNjksMTAgQEAgLSAodm9pZCllbmNvZGVXaXRoQ29kZXI6KE5TQ29kZXIgKilj b2RlcgogICAgIFtjb2RlciBlbmNvZGVCb29sOnNlbGYuamF2YVNjcmlwdENhbk9wZW5XaW5kb3dz QXV0b21hdGljYWxseSBmb3JLZXk6QCJqYXZhU2NyaXB0Q2FuT3BlbldpbmRvd3NBdXRvbWF0aWNh bGx5Il07CiAKICNpZiBQTEFURk9STShNQUMpCitBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9O U19CRUdJTgogICAgIFtjb2RlciBlbmNvZGVCb29sOnNlbGYuamF2YUVuYWJsZWQgZm9yS2V5OkAi amF2YUVuYWJsZWQiXTsKICAgICBbY29kZXIgZW5jb2RlQm9vbDpzZWxmLnBsdWdJbnNFbmFibGVk IGZvcktleTpAInBsdWdJbnNFbmFibGVkIl07CitBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9O U19FTkQKICAgICBbY29kZXIgZW5jb2RlQm9vbDpzZWxmLnRhYkZvY3VzZXNMaW5rcyBmb3JLZXk6 QCJ0YWJGb2N1c2VzTGlua3MiXTsKICNlbmRpZgogfQpAQCAtODUsOCArODcsMTAgQEAgLSAoaW5z dGFuY2V0eXBlKWluaXRXaXRoQ29kZXI6KE5TQ29kZXIgKiljb2RlcgogICAgIHNlbGYuamF2YVNj cmlwdENhbk9wZW5XaW5kb3dzQXV0b21hdGljYWxseSA9IFtjb2RlciBkZWNvZGVCb29sRm9yS2V5 OkAiamF2YVNjcmlwdENhbk9wZW5XaW5kb3dzQXV0b21hdGljYWxseSJdOwogCiAjaWYgUExBVEZP Uk0oTUFDKQorQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNfQkVHSU4KICAgICBzZWxmLmph dmFFbmFibGVkID0gW2NvZGVyIGRlY29kZUJvb2xGb3JLZXk6QCJqYXZhRW5hYmxlZCJdOwogICAg IHNlbGYucGx1Z0luc0VuYWJsZWQgPSBbY29kZXIgZGVjb2RlQm9vbEZvcktleTpAInBsdWdJbnNF bmFibGVkIl07CitBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19FTkQKICAgICBzZWxmLnRh YkZvY3VzZXNMaW5rcyA9IFtjb2RlciBkZWNvZGVCb29sRm9yS2V5OkAidGFiRm9jdXNlc0xpbmtz Il07CiAjZW5kaWYKIApAQCAtMTMyLDI2ICsxMzYsNiBAQCAtICh2b2lkKXNldEphdmFTY3JpcHRD YW5PcGVuV2luZG93c0F1dG9tYXRpY2FsbHk6KEJPT0wpamF2YVNjcmlwdENhbk9wZW5XaW5kb3dz QQogCiAjaWYgUExBVEZPUk0oTUFDKQogCi0tIChCT09MKWphdmFFbmFibGVkCi17Ci0gICAgcmV0 dXJuIF9wcmVmZXJlbmNlcy0+amF2YUVuYWJsZWQoKTsKLX0KLQotLSAodm9pZClzZXRKYXZhRW5h YmxlZDooQk9PTClqYXZhRW5hYmxlZAotewotICAgIF9wcmVmZXJlbmNlcy0+c2V0SmF2YUVuYWJs ZWQoamF2YUVuYWJsZWQpOwotfQotCi0tIChCT09MKXBsdWdJbnNFbmFibGVkCi17Ci0gICAgcmV0 dXJuIF9wcmVmZXJlbmNlcy0+cGx1Z2luc0VuYWJsZWQoKTsKLX0KLQotLSAodm9pZClzZXRQbHVn SW5zRW5hYmxlZDooQk9PTClwbHVnSW5zRW5hYmxlZAotewotICAgIF9wcmVmZXJlbmNlcy0+c2V0 UGx1Z2luc0VuYWJsZWQocGx1Z0luc0VuYWJsZWQpOwotfQotCiAtIChCT09MKXRhYkZvY3VzZXNM aW5rcwogewogICAgIHJldHVybiBfcHJlZmVyZW5jZXMtPnRhYnNUb0xpbmtzKCk7CkBAIC0xMzYx LDMgKzEzNDUsMzEgQEAgLSAoQk9PTClfZGV2aWNlT3JpZW50YXRpb25FdmVudEVuYWJsZWQKIH0K IAogQGVuZAorCisjaWYgIVRBUkdFVF9PU19JUEhPTkUKKworQGltcGxlbWVudGF0aW9uIFdLUHJl ZmVyZW5jZXMgKFdLRGVwcmVjYXRlZCkKKworLSAoQk9PTClqYXZhRW5hYmxlZAoreworICAgIHJl dHVybiBfcHJlZmVyZW5jZXMtPmphdmFFbmFibGVkKCk7Cit9CisKKy0gKHZvaWQpc2V0SmF2YUVu YWJsZWQ6KEJPT0wpamF2YUVuYWJsZWQKK3sKKyAgICBfcHJlZmVyZW5jZXMtPnNldEphdmFFbmFi bGVkKGphdmFFbmFibGVkKTsKK30KKworLSAoQk9PTClwbHVnSW5zRW5hYmxlZAoreworICAgIHJl dHVybiBfcHJlZmVyZW5jZXMtPnBsdWdpbnNFbmFibGVkKCk7Cit9CisKKy0gKHZvaWQpc2V0UGx1 Z0luc0VuYWJsZWQ6KEJPT0wpcGx1Z0luc0VuYWJsZWQKK3sKKyAgICBfcHJlZmVyZW5jZXMtPnNl dFBsdWdpbnNFbmFibGVkKHBsdWdJbnNFbmFibGVkKTsKK30KKworQGVuZAorCisjZW5kaWYK