On 2016/02/16 13:35, Henrik Friedrichsen wrote:
> I see. What do you suggest should be done about the luadbi-mysql port?
> Surely I can ship prosody with libpthread being preloaded, but that
> feels pretty hacky and dirty.
> 
> Shouldn't other software using the MySQL driver be affected by this as
> well?

Yes, it will be, though as far as ports goes, prosody is the only
thing using luadbi.

Another option would be to link the lua interpreter binaries with
-lpthread, but that's not something we could do at this point in the
release cycle (and I'm not familiar enough with lua to know if we'd
want to do that anyway).

For now I think this would be a reasonable option - any OKs to push
this for release?

Index: Makefile
===================================================================
RCS file: /cvs/ports/net/prosody/Makefile,v
retrieving revision 1.39
diff -u -p -r1.39 Makefile
--- Makefile    29 Jan 2016 12:13:55 -0000      1.39
+++ Makefile    16 Feb 2016 12:45:51 -0000
@@ -4,6 +4,7 @@ SHARED_ONLY=    Yes
 
 COMMENT=       communications server for Jabber/XMPP written in Lua
 DISTNAME=      prosody-0.9.10
+REVISION=      0
 CATEGORIES=    net
 MASTER_SITES=  http://prosody.im/downloads/source/
 
Index: pkg/README
===================================================================
RCS file: /cvs/ports/net/prosody/pkg/README,v
retrieving revision 1.8
diff -u -p -r1.8 README
--- pkg/README  23 Aug 2015 11:01:49 -0000      1.8
+++ pkg/README  16 Feb 2016 12:45:51 -0000
@@ -39,6 +39,10 @@ Using Prosody in an OpenBSD environment
    # ${TRUEPREFIX}/sbin/prosodyctl adduser usern...@domain.tld
 
 5) In case you decide to enable 'mod_storage_sql', the default SQLite3
-   driver has already been installed. If you like to use MySQL or
+   driver has already been installed. If you like to use MySQL/MariaDB or
    PostgreSQL for the database, please install luadbi-mysql,${FLAVOR}
    or luadbi-pgsql,${FLAVOR} respectively.
+
+   For MySQL/MariaDB, also add the following to /etc/login.conf:
+
+   prosody:setenv=LD_PRELOAD=/usr/lib/libpthread.so:tc=daemon:

Reply via email to