On Thu, Mar 03, 2016 at 04:51:10PM +0000, Nigel wrote: > On 07/27/15 10:52, Antoine Jacoutot wrote: > > On Mon, Jul 27, 2015 at 12:45:10PM +0300, Vadim Zhukov wrote: > >> 2015-07-27 12:07 GMT+03:00 Jérémie Courrèges-Anglas <j...@wxcvbn.org>: > >>> Antoine Jacoutot <ajacou...@bsdfrog.org> writes: > >>> > >>>> Not sure what change triggered this (unless it's a fluke...). > >>> > >>> Hmm, I've recently committed a change to qca-ossl. cc'ing Vadim. > >> > >> Nah, I already checked - that doesn't look like SSL/TLS-related issue. > >> See, the compiler doesn't pick up right function for connect(): it > >> should use QObject::connect(), but fails and tries connect() system > >> call instead. I'd rather look at the junk and engine log for clues > >> what was happenning in dpb at that time. > > > > Logs are available at: > > http://exopi.bsdfrog.org/logs/old/amd64/2015-07-26T09:40:00+0200/ > > > I changed net/psi to display packages installed when building, and > tracked down the problem, once dpb failed to build net/psi. > > net/psi fails if the package dante is installed, > this has a /usr/local/include/socks.h > > From cvs this was added to stop build failing for psi 0.10 > > Makefile 1.9 > > + > +# compilation breaks if /usr/local/include/socks.h (from security/dante) is > +# found before psi's own socks.h, so add a workaround. > +pre-build: > + @perl -pi -e 's,INCLUDEPATH.*,,' ${WRKSRC}/conf.pri > > When updated to psi 0.15 this was removed in Makefile 1.18. net/psi has > been failing ever since if dante was installed. I didn't think to look > at the cvs log for reintroducing old problems > > Below is a fix, builds, but not something I run, so no run time testing. >
Also need similar patches for iris/src/xmpp/xmpp-core/connector.cpp and iris/src/xmpp/xmpp-im/s5b.cpp otherwise ok shadchin@ > $ cvs -R -q diff -uNp > Index: Makefile > =================================================================== > RCS file: /home/cvs/ports/net/psi/Makefile,v > retrieving revision 1.22 > diff -u -p -r1.22 Makefile > --- Makefile 27 Mar 2015 08:13:03 -0000 1.22 > +++ Makefile 3 Mar 2016 15:41:43 -0000 > @@ -3,7 +3,7 @@ > COMMENT= multiplatform Jabber client > > DISTNAME= psi-0.15 > -REVISION= 3 > +REVISION= 4 > CATEGORIES= net > > HOMEPAGE= http://psi-im.org/ > Index: patches/patch-iris_src_irisnet_noncore_turnclient_cpp > =================================================================== > RCS file: patches/patch-iris_src_irisnet_noncore_turnclient_cpp > diff -N patches/patch-iris_src_irisnet_noncore_turnclient_cpp > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-iris_src_irisnet_noncore_turnclient_cpp 3 Mar > 2016 15:28:57 -0000 > @@ -0,0 +1,12 @@ > +$OpenBSD$ > +--- iris/src/irisnet/noncore/turnclient.cpp.orig Thu Oct 4 > 01:53:09 2012 > ++++ iris/src/irisnet/noncore/turnclient.cpp Thu Mar 3 15:28:29 2016 > +@@ -29,7 +29,7 @@ > + #include "bytestream.h" > + #include "bsocket.h" > + #include "httpconnect.h" > +-#include "socks.h" > ++#include "cutestuff/socks.h" > + > + namespace XMPP { > + > -- Alexandr Shadchin
