Date: Tue, 5 Jul 2011 05:58:53 +0000 From: "b. f." <bf1783@googlemail.com> To: Kostik Belousov <kostikbel@gmail.com> Cc: "freebsd-x11@FreeBSD.org" <freebsd-x11@freebsd.org>, danfe@FreeBSD.org Subject: Re: x11/nvidia-driver incompatible with portmaster? Message-ID: <CAGFTUwPHREj=oucqCihCpYB%2BzdZR3Vtkztaod9EbV2SaP679HA@mail.gmail.com> In-Reply-To: <20110703140400.GO48734@deviant.kiev.zoral.com.ua> References: <CAGFTUwMPV9Tge6%2BGZO879KD7dh6Sr6%2BfPGK97SGvRndBitMTjg@mail.gmail.com> <4E0FCDD1.7050809@missouri.edu> <4E0FD8DC.20700@missouri.edu> <CAGFTUwM-c4WvkX01iuDh4kWcjX8kLKv9Gm1297orPMgNyV_1Cg@mail.gmail.com> <20110703114104.GK48734@deviant.kiev.zoral.com.ua> <CAGFTUwM2VMBsWmxQ70PkNcDfPb_JOBUw7N1wZOVsXfPPSQic1g@mail.gmail.com> <20110703140400.GO48734@deviant.kiev.zoral.com.ua>
next in thread | previous in thread | raw e-mail | index | archive | help
--bcaec520f223c0bb4b04a74c2deb Content-Type: text/plain; charset=ISO-8859-1 On 7/3/11, Kostik Belousov <kostikbel@gmail.com> wrote: > On Sun, Jul 03, 2011 at 12:45:50PM +0000, b. f. wrote: >> On 7/3/11, Kostik Belousov <kostikbel@gmail.com> wrote: >> > On Sun, Jul 03, 2011 at 03:54:15AM +0000, b. f. wrote: >> >> On 7/3/11, Stephen Montgomery-Smith <stephen@missouri.edu> wrote: >> >> > On 07/02/2011 09:02 PM, Stephen Montgomery-Smith wrote: >> >> >> On 07/02/2011 08:39 PM, b. f. wrote: >> ... >> > >> > That said, there is absolutely no need in any static linker tricks, >> > esp. a heavy one like filters or linker scripts. A symlink named ... >> >> > libGL.so would be enough for the static linker, pointing to any >> > of two libraries. And symlink libGL.so.1 would be also enough >> > for dynamic linker. >> > >> > The real issue with xorg-server, mesa and nvidia driver is only >> > the overwrite of extensions/libglx.so and lib/libGL.so.1. If >> > this can be somewhat solved by the packaging system, that would >> > be great. On my hybrid laptop I have to manually manage the >> > said symlinks (actually, with the rc script that verifies >> > the list of pci devices and arranges the symlinks). >> >> So basically, you would prefer that we: >> >> patch xorg-server so that it installs, e.g., >> ${PREFIX}/lib/xorg/modules/extensions/libglx-xorg.so.1 instead of >> ${PREFIX}/lib/xorg/modules/extensions/libglx.so.1, and points the >> symlink ${PREFIX}/lib/xorg/modules/extensions/libglx-xorg.so at the >> former; >> >> patch libGL so that it installs, e.g., ${PREFIX}/lib/libGL-mesa.so.1 >> instead of ${PREFIX}/lib/libGL.so.1, and points the symlink >> ${PREFIX}/lib/libGL.so at the former; >> >> and patch nvidia-driver so that it installs, e.g., >> ${PREFIX}/lib/xorg/modules/extensions/libglx-nvidia.so.1 instead of >> ${PREFIX}/lib/xorg/modules/extensions/libglx.so.1, and >> ${PREFIX}/lib/libGL-nvidia.so.1 instead of ${PREFIX}/lib/libGL.so.1; >> and during installation it overwrites the >> ${PREFIX}/lib/xorg/modules/extensions/libglx-xorg.so and >> ${PREFIX}/lib/libGL.so symlinks, redirecting them to the corresponding >> nvidia libraries; while during deinstallation it changes them to point >> to the mesa/xorg libraries? > Yes. > >> >> And corresponding redirection to handle the libtool archive file? > I do not think this is needed. First, I believe .la files are only > installed by the Xorg ports. Second, as I described, libGL.so from > Xorg and from NVidia should be replacable for the static linking > purposes. Third, libglx.la is not used at all. ... > On Sun, Jul 03, 2011 at 01:33:09PM +0000, b. f. wrote: >> On second thought the renaming of these libraries is not very >> convenient, since they are built by nvidia, and not necessary if their >> mesa/xorg counterparts already have different names. > > As I said, it is useful for me on the hybrid laptop, where a switch > selects the GPU attached to the panel. The startup script then would > only need to create proper symlink, instead of delicate renaming > of the libraries. Please consider the attached patch. Small unrelated clean-ups to x11-servers/xorg-server and bsd.mesalib.mk are included with the changes that remove the collisions, and add the necessary symlinks. The renaming in the xorg-server post-install target is a bit ugly, but much easier than dissecting the libtool build and installation of the glx convenience library. I used sed rather than patches for some of the changes in libGL and nvidia-driver because of the multiple distfiles involved. b. --bcaec520f223c0bb4b04a74c2deb Content-Type: application/octet-stream; name="nvidia_conflict.diff" Content-Disposition: attachment; filename="nvidia_conflict.diff" Content-Transfer-Encoding: base64 X-Attachment-Id: file0 SW5kZXg6IGdyYXBoaWNzL2xpYkdML01ha2VmaWxlCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9ob21l L3BjdnMvcG9ydHMvZ3JhcGhpY3MvbGliR0wvTWFrZWZpbGUsdgpyZXRyaWV2aW5nIHJldmlzaW9u IDEuMTcKZGlmZiAtdSAtcjEuMTcgTWFrZWZpbGUKLS0tIGdyYXBoaWNzL2xpYkdML01ha2VmaWxl CTI1IEZlYiAyMDExIDE2OjUyOjA2IC0wMDAwCTEuMTcKKysrIGdyYXBoaWNzL2xpYkdML01ha2Vm aWxlCTUgSnVsIDIwMTEgMDM6MTU6NTUgLTAwMDAKQEAgLTcsNiArNyw3IEBACiAKIFBPUlROQU1F PQlsaWJHTAogUE9SVFZFUlNJT049CSR7TUVTQVZFUlNJT059CitQT1JUUkVWSVNJT049CTEKIENB VEVHT1JJRVM9CWdyYXBoaWNzCiAKIENPTU1FTlQ9CU9wZW5HTCBsaWJyYXJ5IHRoYXQgcmVuZGVy cyB1c2luZyBHTFggb3IgRFJJCkBAIC0yMCw2ICsyMSwxMSBAQAogZG8taW5zdGFsbDoKIAkke1JN fSAtZiAke1dSS1NSQ30vaW5jbHVkZS9HTC9nbHUqLmgKIAljZCAke1dSS1NSQ30vc3JjL21lc2E7 ICR7R01BS0V9IGluc3RhbGwtbGliZ2wKKwkke0lOU1RBTExfTElCfSAke1dSS1NSQ30vbGliL2xp YkdMLnNvLjEgJHtQUkVGSVh9L2xpYi9saWJHTC1tZXNhLnNvLjEKKyNGb3IgdGhlIGxpYkdMLnNv LjEgbGluaywgZGVmZXIgdG8gbnZpZGlhLWRyaXZlciwgaWYgdGhlIGxhdHRlciBpcyBwcmVzZW50 OgorCWNkICR7UFJFRklYfS9saWIgOyAke0xOfSAtc2YgbGliR0wuc28uMSBsaWJHTC5zbyA7IFwK KwkJaWYgWyAhIC1mIGxpYkdMLW52aWRpYS5zby4xIF0gOyB0aGVuIFwKKwkJJHtMTn0gLXNmIGxp YkdMLW1lc2Euc28uMSBsaWJHTC5zby4xIDsgZmkKIAogLmluY2x1ZGUgIiR7LkNVUkRJUn0vYnNk Lm1lc2FsaWIubWsiCiAuaW5jbHVkZSA8YnNkLnBvcnQubWs+CkluZGV4OiBncmFwaGljcy9saWJH TC9ic2QubWVzYWxpYi5tawo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvaG9tZS9wY3ZzL3BvcnRzL2dy YXBoaWNzL2xpYkdML2JzZC5tZXNhbGliLm1rLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjE3CmRp ZmYgLXUgLXIxLjE3IGJzZC5tZXNhbGliLm1rCi0tLSBncmFwaGljcy9saWJHTC9ic2QubWVzYWxp Yi5tawkyNSBGZWIgMjAxMSAxNjo1MjowNiAtMDAwMAkxLjE3CisrKyBncmFwaGljcy9saWJHTC9i c2QubWVzYWxpYi5tawk1IEp1bCAyMDExIDAyOjU2OjA2IC0wMDAwCkBAIC00Myw4ICs0Myw5IEBA CiBHTlVfQ09ORklHVVJFPQl5ZXMKIE1BS0VfSk9CU19TQUZFPQl5ZXMKIAotQ09ORklHVVJFX0VO Vj0JQ1BQRkxBR1M9LUkke0xPQ0FMQkFTRX0vaW5jbHVkZSBcCi0JCQkJTERGTEFHUz0tTCR7TE9D QUxCQVNFfS9saWIKK0NQUEZMQUdTKz0JLUkke0xPQ0FMQkFTRX0vaW5jbHVkZQorTERGTEFHUys9 CS1MJHtMT0NBTEJBU0V9L2xpYgorQ09ORklHVVJFX0VOVj0JTERGTEFHUz0iJHtMREZMQUdTfSIK IENPTkZJR1VSRV9BUkdTPQktLWRpc2FibGUtZ2FsbGl1bQogCiBBTExfVEFSR0VUPQkJZGVmYXVs dApAQCAtMTA4LDYgKzEwOSwxMCBAQAogCQkke1dSS1NSQ30vc3JjL2dsdy9NYWtlZmlsZSBcCiAJ CSR7V1JLU1JDfS9zcmMvbWVzYS9NYWtlZmlsZSBcCiAJCSR7V1JLU1JDfS9zcmMvbWVzYS9kcml2 ZXJzL2RyaS9NYWtlZmlsZQorLmlmICR7Q09NUE9ORU5UOk1HTH0gIT0gIiIKKwlAJHtSRUlOUExB Q0VfQ01EfSAtZSAnL2luc3RhbGwtbGliZ2w6LywvOi97L0lOU1RBTEwuKkdMX0xJQl9HTE9CLywv SU5TVEFMTF9MSUJfRElSL2Q7fScgXAorCQkke1dSS1NSQ30vc3JjL21lc2EvTWFrZWZpbGUKKy5l bmRpZgogLmlmICR7Q09NUE9ORU5UOk1nbHV0fSAhPSAiIgogCUAke1JFSU5QTEFDRV9DTUR9IC1l ICdzfFskJF0oSU5TVEFMTF9MSUJfRElSKS9wa2djb25maWd8JHtQUkVGSVh9L2xpYmRhdGEvcGtn Y29uZmlnfCcgXAogCQkke1dSS1NSQ30vc3JjL2dsdXQvZ2x4L01ha2VmaWxlCkluZGV4OiBncmFw aGljcy9saWJHTC9wa2ctcGxpc3QKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2hvbWUvcGN2cy9wb3J0 cy9ncmFwaGljcy9saWJHTC9wa2ctcGxpc3QsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuNApkaWZm IC11IC1yMS40IHBrZy1wbGlzdAotLS0gZ3JhcGhpY3MvbGliR0wvcGtnLXBsaXN0CTcgRmViIDIw MTAgMTE6NTE6MDUgLTAwMDAJMS40CisrKyBncmFwaGljcy9saWJHTC9wa2ctcGxpc3QJNSBKdWwg MjAxMSAwMDozMjoyOCAtMDAwMApAQCAtMTQsNyArMTQsMTEgQEAKIGluY2x1ZGUvR0wvdm1zX3hf Zml4LmgKICUlTUVTQUxJQjc2JSVpbmNsdWRlL0dML3dnbGV4dC5oCiBpbmNsdWRlL0dML3dtZXNh LmgKLWxpYi9saWJHTC5zbwotbGliL2xpYkdMLnNvLjEKK2xpYi9saWJHTC1tZXNhLnNvLjEKK0Bl eGVjIGxuIC1zZiBsaWJHTC5zby4xICVCL2xpYkdMLnNvCitAY29tbWVudCBGb3IgdGhlIGxpYkdM LnNvLjEgbGluaywgZGVmZXIgdG8gbnZpZGlhLWRyaXZlciwgaWYgdGhlIGxhdHRlciBpcyBwcmVz ZW50OgorQGV4ZWMgaWYgWyAhIC1mICVCL2xpYkdMLW52aWRpYS5zby4xIF0gOyB0aGVuIGxuIC1z ZiAlZiAlQi9saWJHTC5zby4xIDsgZmkKK0Bjb21tZW50IE9uIHJlbW92YWwsIGRlbGV0ZSB0aGVz ZSBsaW5rcyBpZiB0aGV5IGFyZSBub3Qgb3duZWQgYnkgbnZpZGlhLWRyaXZlcjoKK0B1bmV4ZWMg aWYgWyAhIC1mICVCL2xpYkdMLW52aWRpYS5zby4xIF0gOyB0aGVuIHJtIC1mICVCL2xpYkdMLnNv LjEgJUIvbGliR0wuc28gOyBmaQogbGliZGF0YS9wa2djb25maWcvZ2wucGMKIEBkaXJybXRyeSBp bmNsdWRlL0dMCkluZGV4OiB4MTEtc2VydmVycy94b3JnLXNlcnZlci9NYWtlZmlsZQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09ClJDUyBmaWxlOiAvaG9tZS9wY3ZzL3BvcnRzL3gxMS1zZXJ2ZXJzL3hvcmctc2VydmVyL01h a2VmaWxlLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjgwCmRpZmYgLXUgLXIxLjgwIE1ha2VmaWxl Ci0tLSB4MTEtc2VydmVycy94b3JnLXNlcnZlci9NYWtlZmlsZQkyNyBGZWIgMjAxMSAyMzoxNjow OSAtMDAwMAkxLjgwCisrKyB4MTEtc2VydmVycy94b3JnLXNlcnZlci9NYWtlZmlsZQk0IEp1bCAy MDExIDIzOjQ2OjM4IC0wMDAwCkBAIC03LDE3ICs3LDE0IEBACiAKIFBPUlROQU1FPQl4b3JnLXNl cnZlcgogUE9SVFZFUlNJT049CTEuNy43Ci1QT1JUUkVWSVNJT049CTEKK1BPUlRSRVZJU0lPTj0J MgogUE9SVEVQT0NIPQkxCiBDQVRFR09SSUVTPQl4MTEtc2VydmVycwotTUFTVEVSX1NJVEVTPQlo dHRwOi8veG9yZy5mcmVlZGVza3RvcC5vcmcvcmVsZWFzZXMvaW5kaXZpZHVhbC94c2VydmVyLwot RElTVEZJTEVTPQl4b3JnLXNlcnZlci0ke1BPUlRWRVJTSU9OfS50YXIuYnoyCiAKIE1BSU5UQUlO RVI9CXgxMUBGcmVlQlNELm9yZwogQ09NTUVOVD0JWC5PcmcgWCBzZXJ2ZXIgYW5kIHJlbGF0ZWQg cHJvZ3JhbXMKIAogTElCX0RFUEVORFM9CWRybToke1BPUlRTRElSfS9ncmFwaGljcy9saWJkcm0K LQogUlVOX0RFUEVORFM9CSR7TE9DQUxCQVNFfS9zaGFyZS9YMTEveGtiL3J1bGVzL2Jhc2UueG1s OiR7UE9SVFNESVJ9L3gxMS94a2V5Ym9hcmQtY29uZmlnCiAKIFhPUkdfQ0FUPQl4c2VydmVyCkBA IC05MSwyMSArODgsMjEgQEAKIAogLmlmICR7QVJDSH0gPT0gYWxwaGEKIFBMSVNUX1NVQis9CUFM UEhBX05BPSJAY29tbWVudCAiCi1FWFRSQV9QQVRDSEVTPQkkey5DVVJESVJ9L2ZpbGVzL2V4dHJh LWFyY2gtYWxwaGEKK0VYVFJBX1BBVENIRVM9CSR7RklMRVNESVJ9L2V4dHJhLWFyY2gtYWxwaGEK IC5lbHNlCiBQTElTVF9TVUIrPQlBTFBIQV9OQT0iIgogLmVuZGlmCiAKIC5pZiAke0FSQ0h9ID09 IGlhNjQKLVBMSVNUX1NVQis9ICAgICBJQTY0X05BPSJAY29tbWVudCAiCi1FWFRSQV9QQVRDSEVT PSAgJHsuQ1VSRElSfS9maWxlcy9leHRyYS1hcmNoLWlhNjQKK1BMSVNUX1NVQis9CUlBNjRfTkE9 IkBjb21tZW50ICIKK0VYVFJBX1BBVENIRVM9CSR7RklMRVNESVJ9L2V4dHJhLWFyY2gtaWE2NAog LmVsc2UKLVBMSVNUX1NVQis9ICAgICBJQTY0X05BPSIiCitQTElTVF9TVUIrPQlJQTY0X05BPSIi CiAuZW5kaWYKIAogLmlmICR7QVJDSH0gPT0gcG93ZXJwYyB8fCAke0FSQ0h9ID09IHBvd2VycGM2 NAogUExJU1RfU1VCKz0JUFBDX05BPSJAY29tbWVudCAiCi1FWFRSQV9QQVRDSEVTPQkkey5DVVJE SVJ9L2ZpbGVzL2V4dHJhLWFyY2gtcG93ZXJwYworRVhUUkFfUEFUQ0hFUz0JJHtGSUxFU0RJUn0v ZXh0cmEtYXJjaC1wb3dlcnBjCiAuZWxzZQogUExJU1RfU1VCKz0JUFBDX05BPSIiCiAuZW5kaWYK QEAgLTEzNCw0ICsxMzEsMTQgQEAKIAlAJHtFQ0hPX01TR30gIk5PX1NVSURfWFNFUlZFUj1ZRVMg aW4gL2V0Yy9tYWtlLmNvbmYuIgogLmVuZGlmCiAKKyNBdm9pZCBjb25mbGljdCB3aXRoIG52aWRp YS1kcml2ZXIgYnkgbW92aW5nIGxpYmdseC5zbyB0byBsaWJnbHgteG9yZy5zby4gIElmCisjdGhl IG52aWRpYS1kcml2ZXIgaXMgcHJlc2VudCwgcmVzdG9yZSBhbnkgbnZpZGlhLWRyaXZlciBzeW1s aW5rcyB0aGF0IG1heSBoYXZlIGJlZW4KKyNjbG9iYmVyZWQgZHVyaW5nIGluc3RhbGxhdGlvbjoK K3Bvc3QtaW5zdGFsbDoKKwlAKGNkICR7UFJFRklYfS9saWIveG9yZy9tb2R1bGVzL2V4dGVuc2lv bnMgOyBcCisJCSR7TVZ9IC1mIGxpYmdseC5zbyBsaWJnbHgteG9yZy5zbyA7IFwKKwkJaWYgWyAt TCBsaWJnbHguc28uMSBdIDsgdGhlbiBcCisJCSR7TE59IC1zZiBsaWJnbHguc28uMSBsaWJnbHgu c28gOyBlbHNlIFwKKwkJJHtMTn0gLXNmIGxpYmdseC14b3JnLnNvIGxpYmdseC5zbyA7IGZpKQor CiAuaW5jbHVkZSA8YnNkLnBvcnQucG9zdC5taz4KSW5kZXg6IHgxMS1zZXJ2ZXJzL3hvcmctc2Vy dmVyL3BrZy1wbGlzdAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvaG9tZS9wY3ZzL3BvcnRzL3gxMS1z ZXJ2ZXJzL3hvcmctc2VydmVyL3BrZy1wbGlzdCx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS4yMQpk aWZmIC11IC1yMS4yMSBwa2ctcGxpc3QKLS0tIHgxMS1zZXJ2ZXJzL3hvcmctc2VydmVyL3BrZy1w bGlzdAkxIE1heSAyMDEwIDExOjQxOjA1IC0wMDAwCTEuMjEKKysrIHgxMS1zZXJ2ZXJzL3hvcmct c2VydmVyL3BrZy1wbGlzdAk1IEp1bCAyMDExIDA1OjQyOjQ0IC0wMDAwCkBAIC0xNzUsNyArMTc1 LDEwIEBACiBsaWIveG9yZy9tb2R1bGVzL2V4dGVuc2lvbnMvbGliZXh0bW9kLmxhCiBsaWIveG9y Zy9tb2R1bGVzL2V4dGVuc2lvbnMvbGliZXh0bW9kLnNvCiBsaWIveG9yZy9tb2R1bGVzL2V4dGVu c2lvbnMvbGliZ2x4LmxhCi1saWIveG9yZy9tb2R1bGVzL2V4dGVuc2lvbnMvbGliZ2x4LnNvCits aWIveG9yZy9tb2R1bGVzL2V4dGVuc2lvbnMvbGliZ2x4LXhvcmcuc28KK0Bjb21tZW50IEFkZCBh bmQgcmVtb3ZlIGxpbmtzIHRvIGxpYmdseC5zbywgaWYgdGhlIG52aWRpYS1kcml2ZXIgaXMgbm90 IHByZXNlbnQ6CitAZXhlYyBpZiBbICEgLUwgJUIvbGliZ2x4LnNvLjEgXSA7IHRoZW4gbG4gLXNm ICVmICVCL2xpYmdseC5zbyA7IGZpCitAdW5leGVjIGlmIFsgISAtTCAlQi9saWJnbHguc28uMSBd IDsgdGhlbiBybSAtZiAlQi9saWJnbHguc28gOyBmaQogbGliL3hvcmcvbW9kdWxlcy9leHRlbnNp b25zL2xpYnJlY29yZC5sYQogbGliL3hvcmcvbW9kdWxlcy9leHRlbnNpb25zL2xpYnJlY29yZC5z bwogbGliL3hvcmcvbW9kdWxlcy9saWJleGEubGEKQEAgLTIxOCwxMSArMjIxLDEwIEBACiBsaWJk YXRhL3BrZ2NvbmZpZy94b3JnLXNlcnZlci5wYwogc2hhcmUvYWNsb2NhbC94b3JnLXNlcnZlci5t NAogQGRpcnJtIGluY2x1ZGUveG9yZwotQGRpcnJtIGxpYi94b3JnL21vZHVsZXMvZXh0ZW5zaW9u cwotQGRpcnJtIGxpYi94b3JnL21vZHVsZXMvbGludXgKLUBkaXJybSBsaWIveG9yZy9tb2R1bGVz L211bHRpbWVkaWEKLUBkaXJybSBsaWIveG9yZy9tb2R1bGVzCi1AZGlycm0gbGliL3hvcmcKK0Bk aXJybXRyeSBsaWIveG9yZy9tb2R1bGVzL2V4dGVuc2lvbnMKK0BkaXJybXRyeSBsaWIveG9yZy9t b2R1bGVzL2xpbnV4CitAZGlycm10cnkgbGliL3hvcmcvbW9kdWxlcy9tdWx0aW1lZGlhCitAZGly cm10cnkgbGliL3hvcmcvbW9kdWxlcwogQGRpcnJtdHJ5IGluY2x1ZGUvWDExL2JpdG1hcHMKIEBk aXJybXRyeSBpbmNsdWRlL1gxMS9waXhtYXBzCiBAZGlycm10cnkgbGliL1gxMS9kb2MKSW5kZXg6 IHgxMS9udmlkaWEtZHJpdmVyL01ha2VmaWxlCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9ob21lL3Bj dnMvcG9ydHMveDExL252aWRpYS1kcml2ZXIvTWFrZWZpbGUsdgpyZXRyaWV2aW5nIHJldmlzaW9u IDEuMTA3CmRpZmYgLXUgLXIxLjEwNyBNYWtlZmlsZQotLS0geDExL252aWRpYS1kcml2ZXIvTWFr ZWZpbGUJMjMgTWF5IDIwMTEgMDc6MTQ6NTAgLTAwMDAJMS4xMDcKKysrIHgxMS9udmlkaWEtZHJp dmVyL01ha2VmaWxlCTUgSnVsIDIwMTEgMDU6MzA6MTIgLTAwMDAKQEAgLTcsNyArNyw3IEBACiAK IFBPUlROQU1FPQludmlkaWEtZHJpdmVyCiBESVNUVkVSU0lPTj89CTI3MC40MS4xOQotUE9SVFJF VklTSU9OPz0JMAkJCSMgQXMgYSByZW1pbmRlciBpdCBjYW4gYmUgb3ZlcnJpZGRlbgorUE9SVFJF VklTSU9OPz0JMQkJCSMgQXMgYSByZW1pbmRlciBpdCBjYW4gYmUgb3ZlcnJpZGRlbgogQ0FURUdP UklFUz0JeDExIGtsZAogTUFTVEVSX1NJVEVTPQkke01BU1RFUl9TSVRFX05WSURJQX0KICMgTUFT VEVSX1NJVEVfU1VCRElSIGhhcyB0byBiZSBzZXQgbGF0ZXIgYmVjYXVzZSBpdCBkZXBlbmRzIG9u IE5WVkVSU0lPTgpAQCAtNjcsMTEgKzY3LDcgQEAKIAogLmluY2x1ZGUgPGJzZC5wb3J0LnByZS5t az4KIAotWFNFUlZWRVJTSU9OIT0JJHtQS0dfSU5GT30gLXFPIHgxMS1zZXJ2ZXJzL3hvcmctc2Vy dmVyIDI+L2Rldi9udWxsIHx8IHRydWUKLUxJQkdMVkVSU0lPTiE9CSR7UEtHX0lORk99IC1xTyBn cmFwaGljcy9saWJHTCAyPi9kZXYvbnVsbCB8fCB0cnVlCi0KLVBMSVNUX1NVQis9CVhTRVJWVkVS U0lPTj0ke1hTRVJWVkVSU0lPTn0gTElCR0xWRVJTSU9OPSR7TElCR0xWRVJTSU9OfSBcCi0JCUxJ TlVYQkFTRT0ke0xJTlVYQkFTRX0gU0hMSUJfVkVSU0lPTj0ke1BPUlRWRVJTSU9OfSBcCitQTElT VF9TVUIrPQlMSU5VWEJBU0U9JHtMSU5VWEJBU0V9IFNITElCX1ZFUlNJT049JHtQT1JUVkVSU0lP Tn0gXAogCQlNT0RVTEVTRElSPSR7TU9EVUxFU0RJUn0KIAogLmlmICFkZWZpbmVkKFdJVEhPVVRf TElOVVgpCkBAIC05Myw2ICs4OSwxMCBAQAogTElCX0RFUEVORFMrPQltLjM6JHtQT1JUU0RJUn0v bWlzYy9jb21wYXQ1eAogLmVuZGlmCiAKK3Bvc3QtZXh0cmFjdDoKKwlAKGNkICR7V1JLU1JDfS9v Ymo7ICR7TVZ9IC1mIGxpYkdMLnNvLjEgbGliR0wtbnZpZGlhLnNvLjE7IFwKKwkJJHtNVn0gLWYg bGliZ2x4LnNvLjEgbGliZ2x4LW52aWRpYS5zby4xKQorCiBwb3N0LXBhdGNoOiAuU0lMRU5UCiAj IFdlIHNob3VsZCBzdXBwb3J0IC1DVVJSRU5UOiBraWxsIHRoZSBjaGVjawogCSR7UkVJTlBMQUNF X0NNRH0gLWUgJzI0LDI2ZCcgJHtXUktTUkN9L3NyYy9udi1mcmVlYnNkLmgKQEAgLTEzOCw2ICsx MzgsMTIgQEAKIC5lbmRpZgogIyBEbyBub3QgZXhlY3V0ZSBhZnRlcmluc3RhbGwgdGFyZ2V0IChw cmV2ZW50IGF1dG9tYXRpYyBtb2R1bGUgcmVnaXN0cmF0aW9uKQogCSR7UkVJTlBMQUNFX0NNRH0g LWUgJ3MvYWZ0ZXJpbnN0YWxsL2RvbnRleGVjdXRlLycgJHtXUktTUkN9L01ha2VmaWxlCisjIERv bid0IHJlbW92ZSBsaWJHTCBvciB4b3JnLXNlcnZlciBsaWJyYXJpZXMgb3IgbGlua3MgZHVyaW5n IGJlZm9yZWluc3RhbGw6CisjIGVpdGhlciB0aGV5IG5vIGxvbmdlciBjb2xsaWRlIGFmdGVyIHRo ZSBudmlkaWEgbGlicmFyeSBuYW1lIGNoYW5nZXMsIG9yIHRoZXkKKyMgYXJlIGFsdGVyZWQgaW4g cG9zdC1pbnN0YWxsCisJJHtSRUlOUExBQ0VfQ01EfSAtZSBcCisJCScvRklORF9GSUxFUyE9Lywv RUNITy97cy9saWJHTC8mLW52aWRpYS87cy9saWJnbHgvJi1udmlkaWEvO30nIFwKKwkJJHtXUktT UkN9L2xpYi9NYWtlZmlsZQogCiBwcmUtc3UtaW5zdGFsbDoKICMgV2hpbGUgdGhpcyBwb3J0IHNp bGVudGx5IGFzc3VtZXMgUFJFRklYID09IExPQ0FMQkFTRSwgYXQgbGVhc3QgdHJ5IHRvCkBAIC0x NjIsNiArMTY4LDcgQEAKIAkke1JFSU5QTEFDRV9DTUR9IC1FICdzL2xpYkdMY29yZS9saWJudmlk aWEtZ2xjb3JlLyA7IFwKIAkJL3Vzci4qKGdsY29yZXx0bHMpLipzb1wuMSQkL2QnICR7VE1QUExJ U1R9CiAuZW5kaWYKKwkke0xOfSAtc2YgbGliZ2x4LnNvLjEgJHtQUkVGSVh9LyR7TU9EVUxFU0RJ Un0vZXh0ZW5zaW9ucy9saWJnbHguc28KICMgU29tZSBhcHBsaWNhdGlvbnMgbmVlZCB0aGlzIHN5 bWxpbmsgKHNlZSBQUiBwb3J0cy83Mjg3NykKIAkke0xOfSAtc2YgbGliWHZNQ05WSURJQS5zby4x ICR7UFJFRklYfS9saWIvbGliWHZNQ05WSURJQV9keW5hbWljLnNvLjEKIAkke0VDSE9fTVNHfQpJ bmRleDogeDExL252aWRpYS1kcml2ZXIvcGtnLXBsaXN0Cj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9o b21lL3BjdnMvcG9ydHMveDExL252aWRpYS1kcml2ZXIvcGtnLXBsaXN0LHYKcmV0cmlldmluZyBy ZXZpc2lvbiAxLjI5CmRpZmYgLXUgLXIxLjI5IHBrZy1wbGlzdAotLS0geDExL252aWRpYS1kcml2 ZXIvcGtnLXBsaXN0CTIxIE1heSAyMDExIDE0OjA0OjQ4IC0wMDAwCTEuMjkKKysrIHgxMS9udmlk aWEtZHJpdmVyL3BrZy1wbGlzdAk1IEp1bCAyMDExIDAwOjU0OjU3IC0wMDAwCkBAIC0xLDExICsx LDcgQEAKLUBleGVjIG12IC1mICVELyUlTU9EVUxFU0RJUiUlL2V4dGVuc2lvbnMvbGliZ2x4Lmxh ICVELyUlTU9EVUxFU0RJUiUlL2V4dGVuc2lvbnMvWFhYLWxpYmdseC5sYS4lJSUlLiUlWFNFUlZW RVJTSU9OJSUKLUB1bmV4ZWMgbXYgLWYgJUQvJSVNT0RVTEVTRElSJSUvZXh0ZW5zaW9ucy9YWFgt bGliZ2x4LmxhLiUlJSUuJSVYU0VSVlZFUlNJT04lJSAlRC8lJU1PRFVMRVNESVIlJS9leHRlbnNp b25zL2xpYmdseC5sYQotQGV4ZWMgbXYgLWYgJUQvJSVNT0RVTEVTRElSJSUvZXh0ZW5zaW9ucy9s aWJnbHguc28gJUQvJSVNT0RVTEVTRElSJSUvZXh0ZW5zaW9ucy9YWFgtbGliZ2x4LnNvLiUlJSUu JSVYU0VSVlZFUlNJT04lJQotJSVNT0RVTEVTRElSJSUvZXh0ZW5zaW9ucy9saWJnbHguc28KLUB1 bmV4ZWMgbXYgLWYgJUQvJSVNT0RVTEVTRElSJSUvZXh0ZW5zaW9ucy9YWFgtbGliZ2x4LnNvLiUl JSUuJSVYU0VSVlZFUlNJT04lJSAlRC8lJU1PRFVMRVNESVIlJS9leHRlbnNpb25zL2xpYmdseC5z bwotQGV4ZWMgbXYgLWYgJUQvbGliL2xpYkdMLnNvLjEgJUQvbGliL1hYWC1saWJHTC5zby4xLiUl JSUuJSVMSUJHTFZFUlNJT04lJQotbGliL2xpYkdMLnNvLjEKLUB1bmV4ZWMgbXYgLWYgJUQvbGli L1hYWC1saWJHTC5zby4xLiUlJSUuJSVMSUJHTFZFUlNJT04lJSAlRC9saWIvbGliR0wuc28uMQor bGliL2xpYkdMLW52aWRpYS5zby4xCitAZXhlYyBsbiAtc2YgJWYgJUIvbGliR0wuc28uMQorQGNv bW1lbnQgT24gcmVtb3ZhbCwgcmVzdG9yZSB0aGUgbGluayBiZXR3ZWVuIGxpYkdMLnNvLjEgYW5k IGxpYkdMLCBpZiB0aGUgbGF0dGVyIGlzIHByZXNlbnQ6CitAdW5leGVjIGlmIFsgLWYgJUIvbGli R0wtbWVzYS5zby4xIF0gOyB0aGVuIGxuIC1zZiBsaWJHTC1tZXNhLnNvLjEgJUIvbGliR0wuc28u MSA7IGVsc2Ugcm0gLWYgICVCL2xpYkdMLnNvLjEgOyBmaQogbGliL2xpYm52aWRpYS10bHMuc28u MQogbGliL2xpYm52aWRpYS10bHMuc28KIGxpYi9saWJudmlkaWEtY2ZnLnNvLjEKQEAgLTIyLDcg KzE4LDEwIEBACiAlJU1PRFVMRVNESVIlJS9saWJudmlkaWEtd2ZiLnNvLjEKICUlTU9EVUxFU0RJ UiUlL2RyaXZlcnMvbnZpZGlhX2Rydi5zbwogJSVNT0RVTEVTRElSJSUvZXh0ZW5zaW9ucy9saWJn bHguc28uMQotQGV4ZWMgbG4gLXNmIGxpYmdseC5zby4xICVELyUlTU9EVUxFU0RJUiUlL2V4dGVu c2lvbnMvbGliZ2x4LnNvCitAZXhlYyBsbiAtc2YgJWYgJUIvbGliZ2x4LnNvCitAY29tbWVudCBP biByZW1vdmFsLCByZXN0b3JlIHRoZSBsaW5rIGJldHdlZW4gZ2x4LnNvIGFuZCB0aGUgeG9yZy1z ZXJ2ZXIsIGlmIHRoZSBsYXR0ZXIgaXMgcHJlc2VudDoKK0B1bmV4ZWMgaWYgWyAtZiAlQi9saWJn bHgteG9yZy5zbyBdIDsgdGhlbiBsbiAtc2YgbGliZ2x4LXhvcmcuc28gJUIvbGliZ2x4LnNvIDsg ZWxzZSBybSAtZiAlQi9saWJnbHguc28gOyBmaQorJSVNT0RVTEVTRElSJSUvZXh0ZW5zaW9ucy9s aWJnbHgtbnZpZGlhLnNvLjEKIEBkaXJybXRyeSAlJU1PRFVMRVNESVIlJS9kcml2ZXJzCiBAY3dk IC9ib290L21vZHVsZXMKIG52aWRpYS5rbwpJbmRleDogeDExL252aWRpYS1kcml2ZXIvZmlsZXMv cGF0Y2gtbGliX19saWJHTF9fTWFrZWZpbGUKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogeDExL252aWRp YS1kcml2ZXIvZmlsZXMvcGF0Y2gtbGliX19saWJHTF9fTWFrZWZpbGUKZGlmZiAtTiB4MTEvbnZp ZGlhLWRyaXZlci9maWxlcy9wYXRjaC1saWJfX2xpYkdMX19NYWtlZmlsZQotLS0gL2Rldi9udWxs CTEgSmFuIDE5NzAgMDA6MDA6MDAgLTAwMDAKKysrIHgxMS9udmlkaWEtZHJpdmVyL2ZpbGVzL3Bh dGNoLWxpYl9fbGliR0xfX01ha2VmaWxlCTMgSnVsIDIwMTEgMjA6MjQ6MzMgLTAwMDAKQEAgLTAs MCArMSwxMCBAQAorLS0tIGxpYi9saWJHTC9NYWtlZmlsZS5vcmlnCTIwMTEtMDQtMTQgMDQ6MTU6 NDMuMDAwMDAwMDAwIC0wNDAwCisrKysgbGliL2xpYkdML01ha2VmaWxlCTIwMTEtMDctMDMgMTY6 MjI6NTAuMDAwMDAwMDAwIC0wNDAwCitAQCAtNiw1ICs2LDcgQEAKKyBMSUI9CQlHTAorIFNITElC X01BSk9SPQkxCisgTElCRElSPQkJJHtYMTFCQVNFfS9saWIKKytTSExJQl9MSU5LPQlsaWIke0xJ Qn0uc28uJHtTSExJQl9NQUpPUn0KKytTSExJQl9OQU1FPQlsaWIke0xJQn0tbnZpZGlhLnNvLiR7 U0hMSUJfTUFKT1J9CisgCisgLmluY2x1ZGUgPCR7TlZJRElBX1JPT1R9L21rL252aWRpYS5saWIu bWs+CkluZGV4OiB4MTEvbnZpZGlhLWRyaXZlci9maWxlcy9wYXRjaC14MTFfX2V4dGVuc2lvbl9f TWFrZWZpbGUKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogeDExL252aWRpYS1kcml2ZXIvZmlsZXMvcGF0 Y2gteDExX19leHRlbnNpb25fX01ha2VmaWxlCmRpZmYgLU4geDExL252aWRpYS1kcml2ZXIvZmls ZXMvcGF0Y2gteDExX19leHRlbnNpb25fX01ha2VmaWxlCi0tLSAvZGV2L251bGwJMSBKYW4gMTk3 MCAwMDowMDowMCAtMDAwMAorKysgeDExL252aWRpYS1kcml2ZXIvZmlsZXMvcGF0Y2gteDExX19l eHRlbnNpb25fX01ha2VmaWxlCTQgSnVsIDIwMTEgMDI6MTg6MzUgLTAwMDAKQEAgLTAsMCArMSwx MCBAQAorLS0tIHgxMS9leHRlbnNpb24vTWFrZWZpbGUub3JpZwkyMDExLTA3LTAzIDE2OjI4OjI2 LjAwMDAwMDAwMCAtMDQwMAorKysrIHgxMS9leHRlbnNpb24vTWFrZWZpbGUJMjAxMS0wNy0wMyAx NjoyOToyOS4wMDAwMDAwMDAgLTA0MDAKK0BAIC0xMSw1ICsxMSw3IEBACisgLmVsc2UKKyBMSUJE SVI9CQkke1gxMUJBU0V9L2xpYi9tb2R1bGVzL2V4dGVuc2lvbnMKKyAuZW5kaWYKKytTSExJQl9M SU5LPQlsaWIke0xJQn0uc28uJHtTSExJQl9NQUpPUn0KKytTSExJQl9OQU1FPQlsaWIke0xJQn0t bnZpZGlhLnNvLiR7U0hMSUJfTUFKT1J9CisgCisgLmluY2x1ZGUgPCR7TlZJRElBX1JPT1R9L21r L252aWRpYS5saWIubWs+CkluZGV4OiB4MTEvbnZpZGlhLWRyaXZlci03MS9NYWtlZmlsZQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09ClJDUyBmaWxlOiAvaG9tZS9wY3ZzL3BvcnRzL3gxMS9udmlkaWEtZHJpdmVyLTcxL01h a2VmaWxlLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjE5CmRpZmYgLXUgLXIxLjE5IE1ha2VmaWxl Ci0tLSB4MTEvbnZpZGlhLWRyaXZlci03MS9NYWtlZmlsZQkyMSBNYXkgMjAxMSAxNDowNDo0OCAt MDAwMAkxLjE5CisrKyB4MTEvbnZpZGlhLWRyaXZlci03MS9NYWtlZmlsZQk0IEp1bCAyMDExIDIz OjQzOjE1IC0wMDAwCkBAIC02LDcgKzYsNyBAQAogIwogCiBESVNUVkVSU0lPTj0JNzEuODYuMTQK LVBPUlRSRVZJU0lPTj0JMgorUE9SVFJFVklTSU9OPQkzCiAKIE1BU1RFUkRJUj0JJHsuQ1VSRElS fS8uLi9udmlkaWEtZHJpdmVyCiBOT19MQVRFU1RfTElOSz0JeWVzCkluZGV4OiB4MTEvbnZpZGlh LWRyaXZlci05Ni9NYWtlZmlsZQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvaG9tZS9wY3ZzL3BvcnRz L3gxMS9udmlkaWEtZHJpdmVyLTk2L01ha2VmaWxlLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjIw CmRpZmYgLXUgLXIxLjIwIE1ha2VmaWxlCi0tLSB4MTEvbnZpZGlhLWRyaXZlci05Ni9NYWtlZmls ZQkyMSBNYXkgMjAxMSAxNDowNDo0OCAtMDAwMAkxLjIwCisrKyB4MTEvbnZpZGlhLWRyaXZlci05 Ni9NYWtlZmlsZQk0IEp1bCAyMDExIDIzOjQzOjM3IC0wMDAwCkBAIC02LDcgKzYsNyBAQAogIwog CiBESVNUVkVSU0lPTj0JOTYuNDMuMTkKLVBPUlRSRVZJU0lPTj0JMgorUE9SVFJFVklTSU9OPQkz CiAKIE1BU1RFUkRJUj0JJHsuQ1VSRElSfS8uLi9udmlkaWEtZHJpdmVyCiBOT19MQVRFU1RfTElO Sz0JeWVzCg== --bcaec520f223c0bb4b04a74c2deb--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAGFTUwPHREj=oucqCihCpYB%2BzdZR3Vtkztaod9EbV2SaP679HA>