1316 2016-07-14 12:20:17 +0200 Java 8 expects *.dylib instead of *.jnilib on OS X 2019-03-30 01:34:19 +0100 1 1 3 JogAmp General builds 2.4.0 pc_x86_64 macosx RESOLVED FIXED P2 major --- 1 Martin.vGagern sgothel gouessej sgothel DEFECT gluegen 03bcef96e3105923ccc8c827b70b97ff0aa3464c joal 1cee337a9e888c9f223f36ffa05ceec5692bc08c jogl b83a912f19685e81b71c950914f0f82cc0e534bf jocl fb03bcb97326026155f17bbb4d8a634da6d62d43 --- oldest_to_newest 5658 0 Martin.vGagern 2016-07-14 12:20:17 +0200 For one application I've unpacked the native libs to a local directory (as part of the installation process), and I've set jogamp.gluegen.UseTempJarCache to false. This used to work in the past, but recently with Java 1.8 I see errors like this: java.lang.UnsatisfiedLinkError: Can't load library: /…/libgluegen-rt.dylib Searching the web for this, I found some indications that simply renaming the *.jnilib that came from the Jogamp release to *.dylib should work. I tried it out, and indeed it did work. So perhaps the natives jar file for OS X should be using those names? I haven't found any official documentation on that change so far. I'm using JOGL 2.2.1 here, but I verified that in 2.3.2 the files are still called jnilib not dylib. (I'm confused that the version field here in Bugzilla doesn't allow me selecting a version earlier than 2.4.0 as the version where the bug was found, so I couldn't fill out that required field correctly.) $ java -version java version "1.8.0_72" Java(TM) SE Runtime Environment (build 1.8.0_72-b15) Java HotSpot(TM) 64-Bit Server VM (build 25.72-b15, mixed mode) The OS is OS X 10.11.5 (15F34). https://github.com/LWJGL/lwjgl/commit/a6bb6e31d888c07026ac0381c2900c895765ffbb was what suggested simply renaming the files. It's also the source naming java 1.8 as the release introducing this breakage, so I'm simply quoting that. 5664 1 gouessej 2016-07-26 14:36:08 +0200 Would it still work with previous versions of Java under OS X, for example OpenJDK or Oracle Java 1.7? 5665 2 Martin.vGagern 2016-07-26 17:27:50 +0200 Trying to track this down: In OpenJDK the file hotspot/src/os/bsd/vm/os_bsd.cpp has this: #define JNI_LIB_PREFIX "lib" #ifdef __APPLE__ #define JNI_LIB_SUFFIX ".dylib" #else #define JNI_LIB_SUFFIX ".so" #endif This should be the setting that is being used by the native implementation of System.mapLibraryName in jdk/src/share/native/java/lang/System.c. The file names .dylib since it got included into the repository in 2011. I don't know how the Apple resp. Oracle JDK gets derived from this, so I don't know for how long they supported both forms, if ever. I don't have a wide range of OpenJDK at my disposal just now to test this. http://lists.apple.com/archives/java-dev/2012/Nov/msg00036.html reports dylib vs. jnilib naming issues with jogamp code as far back as 2012. JDK version unknown. 6017 3 gouessej 2017-01-17 15:01:44 +0100 Now I understand why .jnilib had been used: http://markmail.org/message/cksb24oiwjszohvl#query:+page:1+mid:nvmhqaimybukzg4l+state:results It seems reasonable to rename .jnilib files into .dylib, I'll do it as soon as possible. 6130 4 gouessej 2019-03-29 19:30:59 +0100 We should stop calling "rename.dylib" in make/build-jogl.xml, make/build-nativewindow.xml, make/build-newt.xml and make/build-oculusvr.xml. Then, we should replace "lib@{output.lib.name}.jnilib" by "lib@{output.lib.name}.dylib" in those files. 6132 5 sgothel 2019-03-29 19:39:27 +0100 (In reply to Julien Gouesse from comment #4) > We should stop calling "rename.dylib" in make/build-jogl.xml, > make/build-nativewindow.xml, make/build-newt.xml and > make/build-oculusvr.xml. Then, we should replace > "lib@{output.lib.name}.jnilib" by "lib@{output.lib.name}.dylib" in those > files. Correct. 6133 6 gouessej 2019-03-29 20:02:15 +0100 (In reply to Sven Gothel from comment #5) > (In reply to Julien Gouesse from comment #4) > > We should stop calling "rename.dylib" in make/build-jogl.xml, > > make/build-nativewindow.xml, make/build-newt.xml and > > make/build-oculusvr.xml. Then, we should replace > > "lib@{output.lib.name}.jnilib" by "lib@{output.lib.name}.dylib" in those > > files. > > Correct. I've forgotten to stop calling "rename.dylib" in make/build.xml in GlueGen, JOAL and JOCL too. 6134 7 804 gouessej 2019-03-29 20:37:03 +0100 Created attachment 804 Gluegen patch 6135 8 805 gouessej 2019-03-29 20:37:26 +0100 Created attachment 805 JOAL patch 6136 9 806 gouessej 2019-03-29 20:37:47 +0100 Created attachment 806 JOCL patch 6137 10 807 gouessej 2019-03-29 20:38:05 +0100 Created attachment 807 JOGL patch 6138 11 gouessej 2019-03-29 20:39:36 +0100 (In reply to Sven Gothel from comment #5) > (In reply to Julien Gouesse from comment #4) > > We should stop calling "rename.dylib" in make/build-jogl.xml, > > make/build-nativewindow.xml, make/build-newt.xml and > > make/build-oculusvr.xml. Then, we should replace > > "lib@{output.lib.name}.jnilib" by "lib@{output.lib.name}.dylib" in those > > files. > > Correct. Please can you give a try to my patches? There is still a target whose name contains the word "rename" in GlueGen whereas it no longer move any file now, feel free to rename this target. 6140 12 sgothel 2019-03-30 01:31:46 +0100 (In reply to Julien Gouesse from comment #11) > (In reply to Sven Gothel from comment #5) > > (In reply to Julien Gouesse from comment #4) > > > We should stop calling "rename.dylib" in make/build-jogl.xml, > > > make/build-nativewindow.xml, make/build-newt.xml and > > > make/build-oculusvr.xml. Then, we should replace > > > "lib@{output.lib.name}.jnilib" by "lib@{output.lib.name}.dylib" in those > > > files. > > > > Correct. > > Please can you give a try to my patches? There is still a target whose name > contains the word "rename" in GlueGen whereas it no longer move any file > now, feel free to rename this target. Julien, next time we both need to coordinate the work better ;-) I did same changes and completed testing now. BTW, I updated our poor test machine to latest OSX 10.14.13 and using XCode 10.2 - which was a necessary tedious exercise. So OSX 10.11 is now the lowest baseline, since XCode 10.2 claims to be need OSX >= 10.11 Whatever, all tests passed. 6141 13 sgothel 2019-03-30 01:34:19 +0100 Bug 1316: MacOSX: Keep *.dylib (Don't move to *.jnilib) Since Java8 (or even earlier), JRE on OSX uses *.dylib native library suffix instead of *.jnilib when automatically searching and loading them. This is not easily being recognized by JogAmp, since we explicitly name the native libraries with full path when testing with our TempJarCache. Tested on OSX 10.14, XCode 10.2, SDK OSX 10.11 baseline min version Java 1.8.0_192-b12 Working 804 2019-03-29 20:37:03 +0100 2019-03-29 20:37:03 +0100 Gluegen patch gluegen1316.patch text/plain 1267 gouessej ZGlmZiAtLWdpdCBhL21ha2UvYnVpbGQueG1sIGIvbWFrZS9idWlsZC54bWwKaW5kZXggNzdhMGVj MGYuLmRjNjYwMmZkIDEwMDY0NAotLS0gYS9tYWtlL2J1aWxkLnhtbAorKysgYi9tYWtlL2J1aWxk LnhtbApAQCAtNDEzLDggKzQxMyw3IEBACiAgICAgPC90YXJnZXQ+CiAKICAgICA8dGFyZ2V0IG5h bWU9ImMucmVuYW1lLmxpYi5tYWNvc3giIGlmPSJpc09TWCI+Ci0gICAgICA8bW92ZSBmaWxlPSIk e2J1aWxkfS9vYmovbGliZ2x1ZWdlbi1ydC5keWxpYiIgdG9maWxlPSIke2J1aWxkfS9vYmovbGli Z2x1ZWdlbi1ydC5qbmlsaWIiIC8+Ci0gICAgICA8Y29weSBmaWxlPSIke2J1aWxkfS9vYmovbGli Z2x1ZWdlbi1ydC5qbmlsaWIiIHRvZmlsZT0iJHtidWlsZH0vb2JqL2xpYmdsdWVnZW4tcnQuc28i IC8+CisgICAgICA8Y29weSBmaWxlPSIke2J1aWxkfS9vYmovbGliZ2x1ZWdlbi1ydC5keWxpYiIg dG9maWxlPSIke2J1aWxkfS9vYmovbGliZ2x1ZWdlbi1ydC5zbyIgLz4KICAgICA8L3RhcmdldD4K IAogICAgIDx0YXJnZXQgbmFtZT0iYy5tYW5pZmVzdCIgaWY9ImlzVkM4RmFtaWx5Ij4KQEAgLTQy OSw3ICs0MjgsNyBAQAogICAgICAgPHByb3BlcnR5IG5hbWU9Im91dHB1dC5saWIubmFtZSIgdmFs dWU9ImdsdWVnZW4tcnQiIC8+CiAgICAgICA8Y29uZGl0aW9uIHByb3BlcnR5PSJvdXRwdXQubGli Lm5hbWUub3MiIHZhbHVlPSJsaWIke291dHB1dC5saWIubmFtZX0uc28iPjxpc3NldCBwcm9wZXJ0 eT0iaXNVbml4Ii8+PC9jb25kaXRpb24+CiAgICAgICA8Y29uZGl0aW9uIHByb3BlcnR5PSJvdXRw dXQubGliLm5hbWUub3MiIHZhbHVlPSIke291dHB1dC5saWIubmFtZX0uZGxsIj48aXNzZXQgcHJv cGVydHk9ImlzV2luZG93cyIvPjwvY29uZGl0aW9uPgotICAgICAgPGNvbmRpdGlvbiBwcm9wZXJ0 eT0ib3V0cHV0LmxpYi5uYW1lLm9zIiB2YWx1ZT0ibGliJHtvdXRwdXQubGliLm5hbWV9LmpuaWxp YiI+PGlzc2V0IHByb3BlcnR5PSJpc09TWCIvPjwvY29uZGl0aW9uPgorICAgICAgPGNvbmRpdGlv biBwcm9wZXJ0eT0ib3V0cHV0LmxpYi5uYW1lLm9zIiB2YWx1ZT0ibGliJHtvdXRwdXQubGliLm5h bWV9LmR5bGliIj48aXNzZXQgcHJvcGVydHk9ImlzT1NYIi8+PC9jb25kaXRpb24+CiAKICAgICAg IDx1cHRvZGF0ZSBwcm9wZXJ0eT0iZ2x1ZWdlbi5idWlsZC5za2lwLmMiPgogICAgICAgICA8c3Jj ZmlsZXMgZGlyPSAiJHtwcm9qZWN0LnJvb3R9IiAgaW5jbHVkZXM9IiR7Yy5jb21waWxlci5zcmMu ZmlsZXMub3N9Ii8+Cg== 805 2019-03-29 20:37:26 +0100 2019-03-29 20:37:26 +0100 JOAL patch joal1316.patch text/plain 1012 gouessej ZGlmZiAtLWdpdCBhL21ha2UvYnVpbGQueG1sIGIvbWFrZS9idWlsZC54bWwKaW5kZXggMGMwN2E1 Yy4uNTQ3ODM5MiAxMDA3NTUKLS0tIGEvbWFrZS9idWlsZC54bWwKKysrIGIvbWFrZS9idWlsZC54 bWwKQEAgLTM3NSwxMCArMzc1LDYgQEAKICAgICAgICAgPG1vdmUgZmlsZT0iJHtzcmN9IiB0b2Zp bGU9IiR7ZGVzdH0iIC8+CiAgICAgPC90YXJnZXQ+CiAKLSAgICA8dGFyZ2V0IG5hbWU9InJlbmFt ZS5keWxpYiIgaWY9ImlzT1NYIj4KLSAgICAgICAgPG1vdmUgZmlsZT0iJHtzcmN9IiB0b2ZpbGU9 IiR7ZGVzdH0iIC8+Ci0gICAgPC90YXJnZXQ+Ci0KICAgICA8bWFjcm9kZWYgbmFtZT0iYy5idWls ZCI+CiAgICAgICAgIDxhdHRyaWJ1dGUgbmFtZT0iY29tcGlsZXIuY2ZnLmlkIiAvPgogICAgICAg ICA8YXR0cmlidXRlIG5hbWU9Imxpbmtlci5jZmcuaWQiIC8+CkBAIC00MzUsMTEgKzQzMSw2IEBA CiAgICAgICAgICAgICAgICAgPGxpbmtlciBleHRlbmRzPSJAe2xpbmtlci5jZmcuaWR9IiAvPgog ICAgICAgICAgICAgPC9jYz4KIAotICAgICAgICAgICAgPGFudGNhbGwgdGFyZ2V0PSJyZW5hbWUu ZHlsaWIiIGluaGVyaXRSZWZzPSJ0cnVlIj4KLSAgICAgICAgICAgICAgICA8cGFyYW0gbmFtZT0i c3JjIiAgdmFsdWU9IiR7b2JqfS9saWJAe291dHB1dC5saWIubmFtZX0uZHlsaWIiIC8+Ci0gICAg ICAgICAgICAgICAgPHBhcmFtIG5hbWU9ImRlc3QiIHZhbHVlPSIke29ian0vbGliQHtvdXRwdXQu bGliLm5hbWV9LmpuaWxpYiIgLz4KLSAgICAgICAgICAgIDwvYW50Y2FsbD4KLQogICAgICAgICAg ICAgPGFudGNhbGwgdGFyZ2V0PSJyZW5hbWUubWluZ3cuZGxsIiBpbmhlcml0UmVmcz0idHJ1ZSI+ CiAgICAgICAgICAgICAgICAgPHBhcmFtIG5hbWU9InNyYyIgIHZhbHVlPSIke29ian0vbGliQHtv dXRwdXQubGliLm5hbWV9LnNvIiAvPgogICAgICAgICAgICAgICAgIDxwYXJhbSBuYW1lPSJkZXN0 IiB2YWx1ZT0iJHtvYmp9L0B7b3V0cHV0LmxpYi5uYW1lfS5kbGwiIC8+Cg== 806 2019-03-29 20:37:47 +0100 2019-03-29 20:37:47 +0100 JOCL patch jocl1316.patch text/plain 1012 gouessej ZGlmZiAtLWdpdCBhL21ha2UvYnVpbGQueG1sIGIvbWFrZS9idWlsZC54bWwKaW5kZXggYjBkNGU0 OC4uMTdlYzhlNyAxMDA2NDQKLS0tIGEvbWFrZS9idWlsZC54bWwKKysrIGIvbWFrZS9idWlsZC54 bWwKQEAgLTQ2OSwxMCArNDY5LDYgQEAKICAgICAgICAgPG1vdmUgZmlsZT0iJHtzcmN9IiB0b2Zp bGU9IiR7ZGVzdH0iIC8+CiAgICAgPC90YXJnZXQ+CiAKLSAgICA8dGFyZ2V0IG5hbWU9InJlbmFt ZS5keWxpYiIgaWY9ImlzT1NYIj4KLSAgICAgICAgPG1vdmUgZmlsZT0iJHtzcmN9IiB0b2ZpbGU9 IiR7ZGVzdH0iIC8+Ci0gICAgPC90YXJnZXQ+Ci0KICAgICA8bWFjcm9kZWYgbmFtZT0iYy5idWls ZCI+CiAgICAgICAgIDxhdHRyaWJ1dGUgbmFtZT0iY29tcGlsZXIuY2ZnLmlkIiAvPgogICAgICAg ICA8YXR0cmlidXRlIG5hbWU9Imxpbmtlci5jZmcuaWQiIC8+CkBAIC01MzksMTEgKzUzNSw2IEBA CiAgICAgICAgICAgICAgICAgPGxpbmtlciBleHRlbmRzPSJAe2xpbmtlci5jZmcuaWR9IiAvPgog ICAgICAgICAgICAgPC9jYz4KIAotICAgICAgICAgICAgPGFudGNhbGwgdGFyZ2V0PSJyZW5hbWUu ZHlsaWIiIGluaGVyaXRSZWZzPSJ0cnVlIj4KLSAgICAgICAgICAgICAgICA8cGFyYW0gbmFtZT0i c3JjIiAgdmFsdWU9IiR7b2JqfS9saWJAe291dHB1dC5saWIubmFtZX0uZHlsaWIiIC8+Ci0gICAg ICAgICAgICAgICAgPHBhcmFtIG5hbWU9ImRlc3QiIHZhbHVlPSIke29ian0vbGliQHtvdXRwdXQu bGliLm5hbWV9LmpuaWxpYiIgLz4KLSAgICAgICAgICAgIDwvYW50Y2FsbD4KLQogICAgICAgICAg ICAgPGFudGNhbGwgdGFyZ2V0PSJyZW5hbWUubWluZ3cuZGxsIiBpbmhlcml0UmVmcz0idHJ1ZSI+ CiAgICAgICAgICAgICAgICAgPHBhcmFtIG5hbWU9InNyYyIgIHZhbHVlPSIke29ian0vbGliQHtv dXRwdXQubGliLm5hbWV9LnNvIiAvPgogICAgICAgICAgICAgICAgIDxwYXJhbSBuYW1lPSJkZXN0 IiB2YWx1ZT0iJHtvYmp9L0B7b3V0cHV0LmxpYi5uYW1lfS5kbGwiIC8+Cg== 807 2019-03-29 20:38:05 +0100 2019-03-29 20:38:05 +0100 JOGL patch jogl1316.patch text/plain 7813 gouessej ZGlmZiAtLWdpdCBhL21ha2UvYnVpbGQtam9nbC54bWwgYi9tYWtlL2J1aWxkLWpvZ2wueG1sCmlu ZGV4IDBmMWI0MzVjMi4uMGFkMjU2OWQ0IDEwMDY0NAotLS0gYS9tYWtlL2J1aWxkLWpvZ2wueG1s CisrKyBiL21ha2UvYnVpbGQtam9nbC54bWwKQEAgLTE0MzUsMTAgKzE0MzUsNiBAQAogICAgICAg ICA8bW92ZSBmaWxlPSIke3NyY30iIHRvZmlsZT0iJHtkZXN0fSIgLz4KICAgICA8L3RhcmdldD4K IAotICAgIDx0YXJnZXQgbmFtZT0icmVuYW1lLmR5bGliIiBpZj0iaXNPU1giPgotICAgICAgICA8 bW92ZSBmaWxlPSIke3NyY30iIHRvZmlsZT0iJHtkZXN0fSIgLz4KLSAgICA8L3RhcmdldD4KLQog ICAgIDwhLS0gT25seSBjb21waWxlIHRoZSBmZm1wZWcgdmVyc2lvbiBkZXBlbmRpbmcgc291cmNl IGZpbGVzIAogICAgICAgICAgYWdhaW5zdCB0aGVpciByZXNwZWN0aXZlIGhlYWRlciBmaWxlcyEg CiAgICAgICAgICBXZSBkbyBub3QgdXNlIHRoZSByZXN1bHRpbmcgc3RhdGljIGxpYnJhcmllcyBk aXJlY3RseSwKQEAgLTE0NzMsNyArMTQ2OSw3IEBACiAgICAgICAgICAgPHRhcmdldGZpbGVzPgog ICAgICAgICAgICAgPGZpbGVzZXQgZGlyPSIke29iai5qb2dsc3VifSIgaW5jbHVkZXM9ImxpYkB7 b3V0cHV0LmxpYi5uYW1lfS5zbyIvPgogICAgICAgICAgICAgPGZpbGVzZXQgZGlyPSIke29iai5q b2dsc3VifSIgaW5jbHVkZXM9IkB7b3V0cHV0LmxpYi5uYW1lfS5kbGwiLz4KLSAgICAgICAgICAg IDxmaWxlc2V0IGRpcj0iJHtvYmouam9nbHN1Yn0iIGluY2x1ZGVzPSJsaWJAe291dHB1dC5saWIu bmFtZX0uam5pbGliIi8+CisgICAgICAgICAgICA8ZmlsZXNldCBkaXI9IiR7b2JqLmpvZ2xzdWJ9 IiBpbmNsdWRlcz0ibGliQHtvdXRwdXQubGliLm5hbWV9LmR5bGliIi8+CiAgICAgICAgICAgPC90 YXJnZXRmaWxlcz4KICAgICAgICAgICA8c2VxdWVudGlhbD4KICAgICAgICAgICAgIDxjYyBvdXR0 eXBlPSJzaGFyZWQiIApAQCAtMTU5NSw3ICsxNTkxLDcgQEAKICAgICAgICAgICA8dGFyZ2V0Zmls ZXM+CiAgICAgICAgICAgICA8ZmlsZXNldCBkaXI9IiR7b2JqLmpvZ2x9IiBpbmNsdWRlcz0ibGli QHtvdXRwdXQubGliLm5hbWV9LnNvIi8+CiAgICAgICAgICAgICA8ZmlsZXNldCBkaXI9IiR7b2Jq LmpvZ2x9IiBpbmNsdWRlcz0iQHtvdXRwdXQubGliLm5hbWV9LmRsbCIvPgotICAgICAgICAgICAg PGZpbGVzZXQgZGlyPSIke29iai5qb2dsfSIgaW5jbHVkZXM9ImxpYkB7b3V0cHV0LmxpYi5uYW1l fS5qbmlsaWIiLz4KKyAgICAgICAgICAgIDxmaWxlc2V0IGRpcj0iJHtvYmouam9nbH0iIGluY2x1 ZGVzPSJsaWJAe291dHB1dC5saWIubmFtZX0uZHlsaWIiLz4KICAgICAgICAgICA8L3RhcmdldGZp bGVzPgogICAgICAgICAgIDxzZXF1ZW50aWFsPgogICAgICAgICAgICAgPGNjIG91dHR5cGU9InNo YXJlZCIgCkBAIC0xNjQ0LDEzICsxNjQwLDYgQEAKICAgICAKICAgICAgICAgICAgIDwhLS0gRklY TUU6IHRoaXMgaXMgYSBoYWNrOyB0aGUgY3BwdGFzayBzaG91bGQgaGF2ZSBhbiBvcHRpb24gdG8g Y2hhbmdlIHRoZQogICAgICAgICAgICAgICAgICBzdWZmaXggb3IgYXQgbGVhc3QgdW5kZXJzdGFu ZCB0aGUgb3ZlcnJpZGUgZnJvbSBkeWxpYiB0byBqbmlsaWIgLS0+Ci0gICAgICAgICAgICA8YW50 Y2FsbCB0YXJnZXQ9InJlbmFtZS5keWxpYiIgaW5oZXJpdFJlZnM9InRydWUiPgotICAgICAgICAg ICAgICAgIDxwYXJhbSBuYW1lPSJzcmMiICB2YWx1ZT0iJHtvYmouam9nbH0vbGliQHtvdXRwdXQu bGliLm5hbWV9LmR5bGliIiAvPgotICAgICAgICAgICAgICAgIDxwYXJhbSBuYW1lPSJkZXN0IiB2 YWx1ZT0iJHtvYmouam9nbH0vbGliQHtvdXRwdXQubGliLm5hbWV9LmpuaWxpYiIgLz4KLSAgICAg ICAgICAgIDwvYW50Y2FsbD4KLSAgICAKLSAgICAgICAgICAgIDwhLS0gRklYTUU6IHRoaXMgaXMg YSBoYWNrOyB0aGUgY3BwdGFzayBzaG91bGQgaGF2ZSBhbiBvcHRpb24gdG8gY2hhbmdlIHRoZQot ICAgICAgICAgICAgICAgICBzdWZmaXggb3IgYXQgbGVhc3QgdW5kZXJzdGFuZCB0aGUgb3ZlcnJp ZGUgZnJvbSBkeWxpYiB0byBqbmlsaWIgLS0+CiAgICAgICAgICAgICA8YW50Y2FsbCB0YXJnZXQ9 InJlbmFtZS5taW5ndy5kbGwiIGluaGVyaXRSZWZzPSJ0cnVlIj4KICAgICAgICAgICAgICAgICA8 cGFyYW0gbmFtZT0ic3JjIiAgdmFsdWU9IiR7b2JqLmpvZ2x9L2xpYkB7b3V0cHV0LmxpYi5uYW1l fS5zbyIgLz4KICAgICAgICAgICAgICAgICA8cGFyYW0gbmFtZT0iZGVzdCIgdmFsdWU9IiR7b2Jq LmpvZ2x9L0B7b3V0cHV0LmxpYi5uYW1lfS5kbGwiIC8+CmRpZmYgLS1naXQgYS9tYWtlL2J1aWxk LW5hdGl2ZXdpbmRvdy54bWwgYi9tYWtlL2J1aWxkLW5hdGl2ZXdpbmRvdy54bWwKaW5kZXggYjRk Nzg1OGE3Li42OTcwNDA5MTggMTAwNjQ0Ci0tLSBhL21ha2UvYnVpbGQtbmF0aXZld2luZG93Lnht bAorKysgYi9tYWtlL2J1aWxkLW5hdGl2ZXdpbmRvdy54bWwKQEAgLTYxNiwxMCArNjE2LDYgQEAK ICAgICAgICAgPG1vdmUgZmlsZT0iJHtzcmN9IiB0b2ZpbGU9IiR7ZGVzdH0iIC8+CiAgICAgPC90 YXJnZXQ+CiAKLSAgICA8dGFyZ2V0IG5hbWU9InJlbmFtZS5keWxpYiIgaWY9ImlzT1NYIj4KLSAg ICAgICAgPG1vdmUgZmlsZT0iJHtzcmN9IiB0b2ZpbGU9IiR7ZGVzdH0iIC8+Ci0gICAgPC90YXJn ZXQ+Ci0KICAgICA8bWFjcm9kZWYgbmFtZT0iYy5idWlsZCI+CiAgICAgICA8YXR0cmlidXRlIG5h bWU9ImMuY29tcGlsZXIuc3JjLmZpbGVzIiAvPgogICAgICAgPGF0dHJpYnV0ZSBuYW1lPSJjb21w aWxlci5jZmcuaWQiIC8+CkBAIC02ODgsNyArNjg0LDcgQEAKICAgICAgICAgICA8dGFyZ2V0Zmls ZXM+CiAgICAgICAgICAgICA8ZmlsZXNldCBkaXI9IiR7b2JqLm5hdGl2ZXdpbmRvd30iIGluY2x1 ZGVzPSJsaWJAe291dHB1dC5saWIubmFtZX0uc28iLz4KICAgICAgICAgICAgIDxmaWxlc2V0IGRp cj0iJHtvYmoubmF0aXZld2luZG93fSIgaW5jbHVkZXM9IkB7b3V0cHV0LmxpYi5uYW1lfS5kbGwi Lz4KLSAgICAgICAgICAgIDxmaWxlc2V0IGRpcj0iJHtvYmoubmF0aXZld2luZG93fSIgaW5jbHVk ZXM9ImxpYkB7b3V0cHV0LmxpYi5uYW1lfS5qbmlsaWIiLz4KKyAgICAgICAgICAgIDxmaWxlc2V0 IGRpcj0iJHtvYmoubmF0aXZld2luZG93fSIgaW5jbHVkZXM9ImxpYkB7b3V0cHV0LmxpYi5uYW1l fS5keWxpYiIvPgogICAgICAgICAgIDwvdGFyZ2V0ZmlsZXM+CiAgICAgICAgICAgPHNlcXVlbnRp YWw+CiAgICAgICAgICAgICA8Y2Mgb3V0dHlwZT0ic2hhcmVkIiAKQEAgLTcyOSwxMyArNzI1LDYg QEAKIAogICAgICAgICAgICAgPCEtLSBGSVhNRTogdGhpcyBpcyBhIGhhY2s7IHRoZSBjcHB0YXNr IHNob3VsZCBoYXZlIGFuIG9wdGlvbiB0byBjaGFuZ2UgdGhlCiAgICAgICAgICAgICAgICAgIHN1 ZmZpeCBvciBhdCBsZWFzdCB1bmRlcnN0YW5kIHRoZSBvdmVycmlkZSBmcm9tIGR5bGliIHRvIGpu aWxpYiAtLT4KLSAgICAgICAgICAgIDxhbnRjYWxsIHRhcmdldD0icmVuYW1lLmR5bGliIiBpbmhl cml0UmVmcz0idHJ1ZSI+Ci0gICAgICAgICAgICAgICAgPHBhcmFtIG5hbWU9InNyYyIgIHZhbHVl PSIke29iai5uYXRpdmV3aW5kb3d9L2xpYkB7b3V0cHV0LmxpYi5uYW1lfS5keWxpYiIgLz4KLSAg ICAgICAgICAgICAgICA8cGFyYW0gbmFtZT0iZGVzdCIgdmFsdWU9IiR7b2JqLm5hdGl2ZXdpbmRv d30vbGliQHtvdXRwdXQubGliLm5hbWV9LmpuaWxpYiIgLz4KLSAgICAgICAgICAgIDwvYW50Y2Fs bD4KLQotICAgICAgICAgICAgPCEtLSBGSVhNRTogdGhpcyBpcyBhIGhhY2s7IHRoZSBjcHB0YXNr IHNob3VsZCBoYXZlIGFuIG9wdGlvbiB0byBjaGFuZ2UgdGhlCi0gICAgICAgICAgICAgICAgIHN1 ZmZpeCBvciBhdCBsZWFzdCB1bmRlcnN0YW5kIHRoZSBvdmVycmlkZSBmcm9tIGR5bGliIHRvIGpu aWxpYiAtLT4KICAgICAgICAgICAgIDxhbnRjYWxsIHRhcmdldD0icmVuYW1lLm1pbmd3LmRsbCIg aW5oZXJpdFJlZnM9InRydWUiPgogICAgICAgICAgICAgICAgIDxwYXJhbSBuYW1lPSJzcmMiICB2 YWx1ZT0iJHtvYmoubmF0aXZld2luZG93fS9saWJAe291dHB1dC5saWIubmFtZX0uc28iIC8+CiAg ICAgICAgICAgICAgICAgPHBhcmFtIG5hbWU9ImRlc3QiIHZhbHVlPSIke29iai5uYXRpdmV3aW5k b3d9L0B7b3V0cHV0LmxpYi5uYW1lfS5kbGwiIC8+CmRpZmYgLS1naXQgYS9tYWtlL2J1aWxkLW5l d3QueG1sIGIvbWFrZS9idWlsZC1uZXd0LnhtbAppbmRleCA3MzNkNWFlYmQuLmRkNjAzN2Q5OCAx MDA2NDQKLS0tIGEvbWFrZS9idWlsZC1uZXd0LnhtbAorKysgYi9tYWtlL2J1aWxkLW5ld3QueG1s CkBAIC02MjAsMTAgKzYyMCw2IEBACiAgICAgICAgIDxtb3ZlIGZpbGU9IiR7c3JjfSIgdG9maWxl PSIke2Rlc3R9IiAvPgogICAgIDwvdGFyZ2V0PgogCi0gICAgPHRhcmdldCBuYW1lPSJyZW5hbWUu ZHlsaWIiIGlmPSJpc09TWCI+Ci0gICAgICAgIDxtb3ZlIGZpbGU9IiR7c3JjfSIgdG9maWxlPSIk e2Rlc3R9IiAvPgotICAgIDwvdGFyZ2V0PgotCiAgICAgPG1hY3JvZGVmIG5hbWU9ImMuYnVpbGQi PgogICAgICAgPGF0dHJpYnV0ZSBuYW1lPSJjLmNvbXBpbGVyLnNyYy5maWxlcyIgLz4KICAgICAg IDxhdHRyaWJ1dGUgbmFtZT0iY29tcGlsZXIuY2ZnLmlkIiAvPgpAQCAtNjcyLDcgKzY2OCw3IEBA CiAgICAgICAgICAgPHRhcmdldGZpbGVzPgogICAgICAgICAgICAgPGZpbGVzZXQgZGlyPSIke29i ai5uZXd0fSIgaW5jbHVkZXM9ImxpYkB7b3V0cHV0LmxpYi5uYW1lfS5zbyIvPgogICAgICAgICAg ICAgPGZpbGVzZXQgZGlyPSIke29iai5uZXd0fSIgaW5jbHVkZXM9IkB7b3V0cHV0LmxpYi5uYW1l fS5kbGwiLz4KLSAgICAgICAgICAgIDxmaWxlc2V0IGRpcj0iJHtvYmoubmV3dH0iIGluY2x1ZGVz PSJsaWJAe291dHB1dC5saWIubmFtZX0uam5pbGliIi8+CisgICAgICAgICAgICA8ZmlsZXNldCBk aXI9IiR7b2JqLm5ld3R9IiBpbmNsdWRlcz0ibGliQHtvdXRwdXQubGliLm5hbWV9LmR5bGliIi8+ CiAgICAgICAgICAgPC90YXJnZXRmaWxlcz4KICAgICAgICAgICA8c2VxdWVudGlhbD4KICAgICAg ICAgICAgIDxjYyBvdXR0eXBlPSJzaGFyZWQiCkBAIC03MTgsMTMgKzcxNCw2IEBACiAgICAgCiAg ICAgICAgICAgICA8IS0tIEZJWE1FOiB0aGlzIGlzIGEgaGFjazsgdGhlIGNwcHRhc2sgc2hvdWxk IGhhdmUgYW4gb3B0aW9uIHRvIGNoYW5nZSB0aGUKICAgICAgICAgICAgICAgICAgc3VmZml4IG9y IGF0IGxlYXN0IHVuZGVyc3RhbmQgdGhlIG92ZXJyaWRlIGZyb20gZHlsaWIgdG8gam5pbGliIC0t PgotICAgICAgICAgICAgPGFudGNhbGwgdGFyZ2V0PSJyZW5hbWUuZHlsaWIiIGluaGVyaXRSZWZz PSJ0cnVlIj4KLSAgICAgICAgICAgICAgICA8cGFyYW0gbmFtZT0ic3JjIiAgdmFsdWU9IiR7b2Jq Lm5ld3R9L2xpYkB7b3V0cHV0LmxpYi5uYW1lfS5keWxpYiIgLz4KLSAgICAgICAgICAgICAgICA8 cGFyYW0gbmFtZT0iZGVzdCIgdmFsdWU9IiR7b2JqLm5ld3R9L2xpYkB7b3V0cHV0LmxpYi5uYW1l fS5qbmlsaWIiIC8+Ci0gICAgICAgICAgICA8L2FudGNhbGw+Ci0gICAgCi0gICAgICAgICAgICA8 IS0tIEZJWE1FOiB0aGlzIGlzIGEgaGFjazsgdGhlIGNwcHRhc2sgc2hvdWxkIGhhdmUgYW4gb3B0 aW9uIHRvIGNoYW5nZSB0aGUKLSAgICAgICAgICAgICAgICAgc3VmZml4IG9yIGF0IGxlYXN0IHVu ZGVyc3RhbmQgdGhlIG92ZXJyaWRlIGZyb20gZHlsaWIgdG8gam5pbGliIC0tPgogICAgICAgICAg ICAgPGFudGNhbGwgdGFyZ2V0PSJyZW5hbWUubWluZ3cuZGxsIiBpbmhlcml0UmVmcz0idHJ1ZSI+ CiAgICAgICAgICAgICAgICAgPHBhcmFtIG5hbWU9InNyYyIgIHZhbHVlPSIke29iai5uZXd0fS9s aWJAe291dHB1dC5saWIubmFtZX0uc28iIC8+CiAgICAgICAgICAgICAgICAgPHBhcmFtIG5hbWU9 ImRlc3QiIHZhbHVlPSIke29iai5uZXd0fS9Ae291dHB1dC5saWIubmFtZX0uZGxsIiAvPgpkaWZm IC0tZ2l0IGEvbWFrZS9idWlsZC1vY3VsdXN2ci54bWwgYi9tYWtlL2J1aWxkLW9jdWx1c3ZyLnht bAppbmRleCBiODliNjZmYjcuLmEyNTY0Yzk0NCAxMDA2NDQKLS0tIGEvbWFrZS9idWlsZC1vY3Vs dXN2ci54bWwKKysrIGIvbWFrZS9idWlsZC1vY3VsdXN2ci54bWwKQEAgLTQxMSwxMCArNDExLDYg QEAKICAgICAgICAgPG1vdmUgZmlsZT0iJHtzcmN9IiB0b2ZpbGU9IiR7ZGVzdH0iIC8+CiAgICAg PC90YXJnZXQ+CiAKLSAgICA8dGFyZ2V0IG5hbWU9InJlbmFtZS5keWxpYiIgaWY9ImlzT1NYIj4K LSAgICAgICAgPG1vdmUgZmlsZT0iJHtzcmN9IiB0b2ZpbGU9IiR7ZGVzdH0iIC8+Ci0gICAgPC90 YXJnZXQ+Ci0KICAgICA8bWFjcm9kZWYgbmFtZT0iYy5idWlsZCI+CiAgICAgICA8YXR0cmlidXRl IG5hbWU9ImNvbXBpbGVyLmNmZy5pZCIgLz4KICAgICAgIDxhdHRyaWJ1dGUgbmFtZT0ibGlua2Vy LmNmZy5pZCIgLz4KQEAgLTUzMCw3ICs1MjYsNyBAQAogICAgICAgICAgIDx0YXJnZXRmaWxlcz4K ICAgICAgICAgICAgIDxmaWxlc2V0IGRpcj0iJHtvYmoub2N1bHVzdnJ9IiBpbmNsdWRlcz0ibGli QHtvdXRwdXQubGliLm5hbWV9LnNvIi8+CiAgICAgICAgICAgICA8ZmlsZXNldCBkaXI9IiR7b2Jq Lm9jdWx1c3ZyfSIgaW5jbHVkZXM9IkB7b3V0cHV0LmxpYi5uYW1lfS5kbGwiLz4KLSAgICAgICAg ICAgIDxmaWxlc2V0IGRpcj0iJHtvYmoub2N1bHVzdnJ9IiBpbmNsdWRlcz0ibGliQHtvdXRwdXQu bGliLm5hbWV9LmpuaWxpYiIvPgorICAgICAgICAgICAgPGZpbGVzZXQgZGlyPSIke29iai5vY3Vs dXN2cn0iIGluY2x1ZGVzPSJsaWJAe291dHB1dC5saWIubmFtZX0uZHlsaWIiLz4KICAgICAgICAg ICA8L3RhcmdldGZpbGVzPgogICAgICAgICAgIDxzZXF1ZW50aWFsPgogICAgICAgICAgICAgPCEt LSBDIENvbXBpbGF0aW9uIC0tPgpAQCAtNjYxLDEzICs2NTcsNiBAQAogICAgIAogICAgICAgICAg ICAgPCEtLSBGSVhNRTogdGhpcyBpcyBhIGhhY2s7IHRoZSBjcHB0YXNrIHNob3VsZCBoYXZlIGFu IG9wdGlvbiB0byBjaGFuZ2UgdGhlCiAgICAgICAgICAgICAgICAgIHN1ZmZpeCBvciBhdCBsZWFz dCB1bmRlcnN0YW5kIHRoZSBvdmVycmlkZSBmcm9tIGR5bGliIHRvIGpuaWxpYiAtLT4KLSAgICAg ICAgICAgIDxhbnRjYWxsIHRhcmdldD0icmVuYW1lLmR5bGliIiBpbmhlcml0UmVmcz0idHJ1ZSI+ Ci0gICAgICAgICAgICAgICAgPHBhcmFtIG5hbWU9InNyYyIgIHZhbHVlPSIke29iai5vY3VsdXN2 cn0vbGliQHtvdXRwdXQubGliLm5hbWV9LmR5bGliIiAvPgotICAgICAgICAgICAgICAgIDxwYXJh bSBuYW1lPSJkZXN0IiB2YWx1ZT0iJHtvYmoub2N1bHVzdnJ9L2xpYkB7b3V0cHV0LmxpYi5uYW1l fS5qbmlsaWIiIC8+Ci0gICAgICAgICAgICA8L2FudGNhbGw+Ci0gICAgCi0gICAgICAgICAgICA8 IS0tIEZJWE1FOiB0aGlzIGlzIGEgaGFjazsgdGhlIGNwcHRhc2sgc2hvdWxkIGhhdmUgYW4gb3B0 aW9uIHRvIGNoYW5nZSB0aGUKLSAgICAgICAgICAgICAgICAgc3VmZml4IG9yIGF0IGxlYXN0IHVu ZGVyc3RhbmQgdGhlIG92ZXJyaWRlIGZyb20gZHlsaWIgdG8gam5pbGliIC0tPgogICAgICAgICAg ICAgPGFudGNhbGwgdGFyZ2V0PSJyZW5hbWUubWluZ3cuZGxsIiBpbmhlcml0UmVmcz0idHJ1ZSI+ CiAgICAgICAgICAgICAgICAgPHBhcmFtIG5hbWU9InNyYyIgIHZhbHVlPSIke29iai5vY3VsdXN2 cn0vbGliQHtvdXRwdXQubGliLm5hbWV9LnNvIiAvPgogICAgICAgICAgICAgICAgIDxwYXJhbSBu YW1lPSJkZXN0IiB2YWx1ZT0iJHtvYmoub2N1bHVzdnJ9L0B7b3V0cHV0LmxpYi5uYW1lfS5kbGwi IC8+Cg==