Re: [UPDATE] profanity 0.11.0 & change to libstrophe
> > I think something is off in your certs. Running > > > > Maybe you aren't using the fullchain and instead present the cert > > for just your host? It doesn't show the "middle" cert from LE. This > > is the chain for a correctly verified (from `openssl s_client` > > point of view) cert issued by LE > > Darn, it was my stupidity. My script to renew the LE certificate > copied the single cert into the prosody directory instead of the full > chain. I fixed the script and now it works as expected. Thanks! Lucas, thank you for your investigation! > @Florian: Sorry for the noise! No problem, asking is good and welcome. -- greetings, Florian Viehweger
Re: [UPDATE] profanity 0.11.0 & change to libstrophe
Hi Lucas, * Lucas wrote: > Hi Matthias, > > Matthias Schmidt wrote: > > Maybe it's me and my stupidity but since this update I can no longer > > connect to a XMPP server with a LE certificate. Both client and server > > are running -current (server with prosody). The client reports "Login > > failed" and the debug log shows: > > > > 19/09/2021 11:16:17: prof: INF: Connecting using account: > > x...@jabber.xosc.org > > 19/09/2021 11:16:17: prof: INF: Connecting as > > x...@jabber.xosc.org/profanity.kTdJ > > 19/09/2021 11:16:17: prof: DBG: Connecting with flags (0x2): > > 19/09/2021 11:16:17: prof: DBG: XMPP_CONN_FLAG_MANDATORY_TLS > > 19/09/2021 11:16:17: xmpp: DBG: SRV lookup failed, connecting via domain. > > 19/09/2021 11:16:17: xmpp: DBG: sock_connect() to jabber.xosc.org:5222 > > returned 7 > > 19/09/2021 11:16:17: xmpp: DBG: Attempting to connect to jabber.xosc.org > > 19/09/2021 11:16:17: xmpp: DBG: connection successful > > 19/09/2021 11:16:17: conn: DBG: SENT: > to="jabber.xosc.org" xml:lang="en" version="1.0" xmlns="jabber:client" > > xmlns:stream="http://etherx.jabber.org/streams;> > > 19/09/2021 11:16:17: xmpp: DBG: RECV: > id="8c063ebf-77e7-4493-9ac3-79b6b0defa4d" lang="en" from="jabber.xosc.org"> > > 19/09/2021 11:16:17: xmpp: DBG: RECV: > xmlns="http://etherx.jabber.org/streams;> > xmlns="urn:ietf:params:xml:ns:xmpp-tls"> > > 19/09/2021 11:16:17: conn: DBG: SENT: > xmlns="urn:ietf:params:xml:ns:xmpp-tls"/> > > 19/09/2021 11:16:17: xmpp: DBG: RECV: > xmlns="urn:ietf:params:xml:ns:xmpp-tls"/> > > 19/09/2021 11:16:17: xmpp: DBG: handle proceedtls called for proceed > > 19/09/2021 11:16:17: xmpp: DBG: proceeding with TLS > > 19/09/2021 11:16:17: tls: DBG: Certificate verification FAILED, > > result=X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY(20) > > 19/09/2021 11:16:17: tls: DBG: Certificate was not presented by peer > > 19/09/2021 11:16:17: tls: DBG: error=SSL_ERROR_SSL(1) errno=0 > > 19/09/2021 11:16:17: tls: DBG: error:14FFF086:SSL > > routines:(UNKNOWN)SSL_internal:certificate verify failed > > 19/09/2021 11:16:17: conn: DBG: Couldn't start TLS! error -3 tls_error 1 > > 19/09/2021 11:16:17: conn: DBG: SENT: > > 19/09/2021 11:16:17: xmpp: DBG: Send error occurred, disconnecting. > > 19/09/2021 11:16:17: xmpp: DBG: Closing socket. > > 19/09/2021 11:16:17: prof: DBG: Connection handler: XMPP_CONN_DISCONNECT > > 19/09/2021 11:16:17: prof: DBG: Connection handler: Login failed > > 19/09/2021 11:16:17: prof: DBG: Connection handler: No reconnect timer > > 19/09/2021 11:16:17: prof: INF: Login failed > > > > The server simply logs: > > > > Sep 19 09:23:14 omega prosody[38808]: c2s87a60669340: Client connected > > Sep 19 09:23:16 omega prosody[38808]: c2s87a60669340: Client disconnected: > > ssl handshake error: tlsv1 alert unknown ca > > I think something is off in your certs. Running > > Maybe you aren't using the fullchain and instead present the cert for > just your host? It doesn't show the "middle" cert from LE. This is the > chain for a correctly verified (from `openssl s_client` point of view) > cert issued by LE Darn, it was my stupidity. My script to renew the LE certificate copied the single cert into the prosody directory instead of the full chain. I fixed the script and now it works as expected. Thanks! @Florian: Sorry for the noise! Cheers Matthias
Re: [UPDATE] profanity 0.11.0 & change to libstrophe
Hi Matthias, Matthias Schmidt wrote: > Maybe it's me and my stupidity but since this update I can no longer > connect to a XMPP server with a LE certificate. Both client and server > are running -current (server with prosody). The client reports "Login > failed" and the debug log shows: > > 19/09/2021 11:16:17: prof: INF: Connecting using account: x...@jabber.xosc.org > 19/09/2021 11:16:17: prof: INF: Connecting as > x...@jabber.xosc.org/profanity.kTdJ > 19/09/2021 11:16:17: prof: DBG: Connecting with flags (0x2): > 19/09/2021 11:16:17: prof: DBG: XMPP_CONN_FLAG_MANDATORY_TLS > 19/09/2021 11:16:17: xmpp: DBG: SRV lookup failed, connecting via domain. > 19/09/2021 11:16:17: xmpp: DBG: sock_connect() to jabber.xosc.org:5222 > returned 7 > 19/09/2021 11:16:17: xmpp: DBG: Attempting to connect to jabber.xosc.org > 19/09/2021 11:16:17: xmpp: DBG: connection successful > 19/09/2021 11:16:17: conn: DBG: SENT: to="jabber.xosc.org" xml:lang="en" version="1.0" xmlns="jabber:client" > xmlns:stream="http://etherx.jabber.org/streams;> > 19/09/2021 11:16:17: xmpp: DBG: RECV: id="8c063ebf-77e7-4493-9ac3-79b6b0defa4d" lang="en" from="jabber.xosc.org"> > 19/09/2021 11:16:17: xmpp: DBG: RECV: xmlns="http://etherx.jabber.org/streams;> xmlns="urn:ietf:params:xml:ns:xmpp-tls"> > 19/09/2021 11:16:17: conn: DBG: SENT: xmlns="urn:ietf:params:xml:ns:xmpp-tls"/> > 19/09/2021 11:16:17: xmpp: DBG: RECV: xmlns="urn:ietf:params:xml:ns:xmpp-tls"/> > 19/09/2021 11:16:17: xmpp: DBG: handle proceedtls called for proceed > 19/09/2021 11:16:17: xmpp: DBG: proceeding with TLS > 19/09/2021 11:16:17: tls: DBG: Certificate verification FAILED, > result=X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY(20) > 19/09/2021 11:16:17: tls: DBG: Certificate was not presented by peer > 19/09/2021 11:16:17: tls: DBG: error=SSL_ERROR_SSL(1) errno=0 > 19/09/2021 11:16:17: tls: DBG: error:14FFF086:SSL > routines:(UNKNOWN)SSL_internal:certificate verify failed > 19/09/2021 11:16:17: conn: DBG: Couldn't start TLS! error -3 tls_error 1 > 19/09/2021 11:16:17: conn: DBG: SENT: > 19/09/2021 11:16:17: xmpp: DBG: Send error occurred, disconnecting. > 19/09/2021 11:16:17: xmpp: DBG: Closing socket. > 19/09/2021 11:16:17: prof: DBG: Connection handler: XMPP_CONN_DISCONNECT > 19/09/2021 11:16:17: prof: DBG: Connection handler: Login failed > 19/09/2021 11:16:17: prof: DBG: Connection handler: No reconnect timer > 19/09/2021 11:16:17: prof: INF: Login failed > > The server simply logs: > > Sep 19 09:23:14 omega prosody[38808]: c2s87a60669340: Client connected > Sep 19 09:23:16 omega prosody[38808]: c2s87a60669340: Client disconnected: > ssl handshake error: tlsv1 alert unknown ca I think something is off in your certs. Running openssl s_client -connect jabber.xosc.org:xmpp-server -starttls xmpp -xmpphost jabber.xosc.org When I play around with the /tls settings, I mostly get the message > > 11:20:36 - Certificate path setting only supported when built with libmesode. > 11:20:47 - Certificate path setting only supported when built with libmesode. This is bound to profanity code. It has quite a few big chunks under `#ifdef HAVE_LIBMESODE` in `src/command/cmd_funcs.c`. -Lucas
Re: [UPDATE] profanity 0.11.0 & change to libstrophe
Hi everybody, * Florian Viehweger wrote: > Am Fri, 27 Aug 2021 08:32:26 +0100 > schrieb Stuart Henderson : > > > On 2021/08/26 23:26, Florian Viehweger wrote: > > > Hi, > > > > > > this updates profanity to 0.11.0. > > > > > > Changes are listed here [1] as they are too long to list in this > > > mail. > > > > > > This version fixes several issues regarding OMEMO. Additional the > > > XMPP library is changed to libstrophe, as libmesode is deprecated > > > upstream. Maybe it's me and my stupidity but since this update I can no longer connect to a XMPP server with a LE certificate. Both client and server are running -current (server with prosody). The client reports "Login failed" and the debug log shows: 19/09/2021 11:16:17: prof: INF: Connecting using account: x...@jabber.xosc.org 19/09/2021 11:16:17: prof: INF: Connecting as x...@jabber.xosc.org/profanity.kTdJ 19/09/2021 11:16:17: prof: DBG: Connecting with flags (0x2): 19/09/2021 11:16:17: prof: DBG: XMPP_CONN_FLAG_MANDATORY_TLS 19/09/2021 11:16:17: xmpp: DBG: SRV lookup failed, connecting via domain. 19/09/2021 11:16:17: xmpp: DBG: sock_connect() to jabber.xosc.org:5222 returned 7 19/09/2021 11:16:17: xmpp: DBG: Attempting to connect to jabber.xosc.org 19/09/2021 11:16:17: xmpp: DBG: connection successful 19/09/2021 11:16:17: conn: DBG: SENT: http://etherx.jabber.org/streams;> 19/09/2021 11:16:17: xmpp: DBG: RECV: 19/09/2021 11:16:17: xmpp: DBG: RECV: http://etherx.jabber.org/streams;> 19/09/2021 11:16:17: conn: DBG: SENT: 19/09/2021 11:16:17: xmpp: DBG: RECV: 19/09/2021 11:16:17: xmpp: DBG: handle proceedtls called for proceed 19/09/2021 11:16:17: xmpp: DBG: proceeding with TLS 19/09/2021 11:16:17: tls: DBG: Certificate verification FAILED, result=X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY(20) 19/09/2021 11:16:17: tls: DBG: Certificate was not presented by peer 19/09/2021 11:16:17: tls: DBG: error=SSL_ERROR_SSL(1) errno=0 19/09/2021 11:16:17: tls: DBG: error:14FFF086:SSL routines:(UNKNOWN)SSL_internal:certificate verify failed 19/09/2021 11:16:17: conn: DBG: Couldn't start TLS! error -3 tls_error 1 19/09/2021 11:16:17: conn: DBG: SENT: 19/09/2021 11:16:17: xmpp: DBG: Send error occurred, disconnecting. 19/09/2021 11:16:17: xmpp: DBG: Closing socket. 19/09/2021 11:16:17: prof: DBG: Connection handler: XMPP_CONN_DISCONNECT 19/09/2021 11:16:17: prof: DBG: Connection handler: Login failed 19/09/2021 11:16:17: prof: DBG: Connection handler: No reconnect timer 19/09/2021 11:16:17: prof: INF: Login failed The server simply logs: Sep 19 09:23:14 omega prosody[38808]: c2s87a60669340: Client connected Sep 19 09:23:16 omega prosody[38808]: c2s87a60669340: Client disconnected: ssl handshake error: tlsv1 alert unknown ca When I play around with the /tls settings, I mostly get the message 11:20:36 - Certificate path setting only supported when built with libmesode. 11:20:47 - Certificate path setting only supported when built with libmesode. I know that connections to the server with the password are working since my mobile client connects successfully. I removed all settings and started completely fresh, however, I still cannot connect. Any hints on how to debug this further? Cheers Matthias
Re: [UPDATE] profanity 0.11.0 & change to libstrophe
Am Fri, 27 Aug 2021 08:32:26 +0100
schrieb Stuart Henderson :
> On 2021/08/26 23:26, Florian Viehweger wrote:
> > Hi,
> >
> > this updates profanity to 0.11.0.
> >
> > Changes are listed here [1] as they are too long to list in this
> > mail.
> >
> > This version fixes several issues regarding OMEMO. Additional the
> > XMPP library is changed to libstrophe, as libmesode is deprecated
> > upstream.
> >
> > portcheck, 'make lib-depends-check' and 'make test' are happy for
> > both profanity and libstrophe.
> >
> > Tested on amd64. I'm using it with 'standard' conversations with
> > OMEMO and on an another server with a self signed certificate in a
> > MUC chat room, again with OMEMO. No issues so far, it is running
> > fine.
> >
> > As libmesode is deprecated, I've modified devel/quirks.
> >
> > Comments? OK?
>
> This is looking pretty good. Couple of small things inline:
>
> > Thanks!
> >
> > [1] https://github.com/profanity-im/profanity/releases/tag/0.11.0
> With those changes, OK sthen@ (or I can make those changes and commit
> it if rsadowski is happy).
Hi,
I've made those changes and everything still seems fine.
rsadowski@: I'm happy to take maintainership of libstrophe, if you are
okay with it.
Thank you!
Comments? OK?
Index: devel/quirks/Makefile
===
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.1292
diff -u -p -u -p -r1.1292 Makefile
--- devel/quirks/Makefile 2 Sep 2021 13:07:31 - 1.1292
+++ devel/quirks/Makefile 5 Sep 2021 19:56:17 -
@@ -5,7 +5,7 @@ CATEGORIES =devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-4.45
+PKGNAME = quirks-4.46
PKG_ARCH = *
MAINTAINER = Marc Espie
Index: devel/quirks/files/Quirks.pm
===
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.1308
diff -u -p -u -p -r1.1308 Quirks.pm
--- devel/quirks/files/Quirks.pm2 Sep 2021 13:07:32 - 1.1308
+++ devel/quirks/files/Quirks.pm5 Sep 2021 19:56:17 -
@@ -487,6 +487,7 @@ my $stem_extensions = {
'py-paramiko' => 'py3-paramiko',
'py-nxos' => 'py3-nxos',
'py-scp' => 'py3-scp',
+ 'libmesode' => 'libstrophe',
};
my $obsolete_reason = {};
@@ -656,7 +657,6 @@ setup_obsolete_reason(
6 => 'suricata-update',
1 => 'exploitdb-papers',
3 => 'nautilus-sendto',
- 5 => 'libstrophe',
2 => 'ghostview',
7 => 'libcudf',
7 => 'ocaml-cudf',
Index: net/Makefile
===
RCS file: /cvs/ports/net/Makefile,v
retrieving revision 1.1266
diff -u -p -u -p -r1.1266 Makefile
--- net/Makefile2 Sep 2021 13:07:31 - 1.1266
+++ net/Makefile5 Sep 2021 19:56:23 -
@@ -210,7 +210,6 @@
SUBDIR += libircclient
SUBDIR += libktorrent
SUBDIR += libmaxminddb
- SUBDIR += libmesode
SUBDIR += libmygpo-qt
SUBDIR += libnet
SUBDIR += libnids
Index: net/libmesode/Makefile
===
RCS file: net/libmesode/Makefile
diff -N net/libmesode/Makefile
--- net/libmesode/Makefile 23 Oct 2020 13:44:41 - 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,39 +0,0 @@
-# $OpenBSD: Makefile,v 1.6 2020/10/23 13:44:41 rsadowski Exp $
-
-COMMENT = fork of libstrophe for use with profanity XMPP client
-
-GH_ACCOUNT = boothj5
-GH_PROJECT = libmesode
-GH_TAGNAME = 0.10.1
-
-CATEGORIES = net devel
-
-SHARED_LIBS += mesode1.0 # 0.0
-
-MAINTAINER = Rafael Sadowski
-
-# Dual licensed: MIT and GPLv3
-PERMIT_PACKAGE = Yes
-
-WANTLIB += crypto expat ssl
-
-# Only needed for tests, but cannot be a TEST_DEPENDS.
-# Check must be present at build time for tests to work.
-BUILD_DEPENDS += devel/check
-
-SEPARATE_BUILD = Yes
-
-USE_GMAKE =Yes
-
-AUTOMAKE_VERSION = 1.16
-AUTOCONF_VERSION = 2.69
-
-MAKE_FLAGS = CC="${CC}" \
- CFLAGS="${CFLAGS}"
-
-CONFIGURE_STYLE = autoreconf
-CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
-AUTORECONF = ./bootstrap.sh
-
-.include
Index: net/libmesode/distinfo
===
RCS file: net/libmesode/distinfo
diff -N net/libmesode/distinfo
--- net/libmesode/distinfo 23 Oct 2020 13:44:41 - 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,2 +0,0 @@
-SHA256 (libmesode-0.10.1.tar.gz) = yd2QZI5z2SuQ8rCuQaddj0abEW0+aqKXwUzVe+k32Z4=
-SIZE (libmesode-0.10.1.tar.gz) = 150629
Index: net/libmesode/pkg/DESCR
===
RCS file: net/libmesode/pkg/DESCR
diff -N net/libmesode/pkg/DESCR
--- net/libmesode/pkg/DESCR 3 Mar 2019 19:14:28
Re: [UPDATE] profanity 0.11.0 & change to libstrophe
On 2021/08/26 23:26, Florian Viehweger wrote:
> Hi,
>
> this updates profanity to 0.11.0.
>
> Changes are listed here [1] as they are too long to list in this mail.
>
> This version fixes several issues regarding OMEMO. Additional the XMPP
> library is changed to libstrophe, as libmesode is deprecated upstream.
>
> portcheck, 'make lib-depends-check' and 'make test' are happy for both
> profanity and libstrophe.
>
> Tested on amd64. I'm using it with 'standard' conversations with OMEMO
> and on an another server with a self signed certificate in a MUC chat
> room, again with OMEMO. No issues so far, it is running fine.
>
> As libmesode is deprecated, I've modified devel/quirks.
>
> Comments? OK?
This is looking pretty good. Couple of small things inline:
> Thanks!
>
> [1] https://github.com/profanity-im/profanity/releases/tag/0.11.0
>
>
> Index: devel/quirks/files/Quirks.pm
> ===
> RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
> retrieving revision 1.1296
> diff -u -p -u -p -r1.1296 Quirks.pm
> --- devel/quirks/files/Quirks.pm 10 Aug 2021 20:43:52 - 1.1296
> +++ devel/quirks/files/Quirks.pm 26 Aug 2021 20:25:58 -
> @@ -477,7 +477,8 @@ my $stem_extensions = {
> 'py-spark-parser' => 'py3-spark-parser',
> 'py-xdis' => 'py3-xdis',
> 'py-uncompyle6' => 'py3-uncompyle6',
> - 'py-click' => 'py3-click'
> + 'py-click' => 'py3-click',
> + 'libmesode' => 'libstrophe'
> };
>
> my $obsolete_reason = {};
> @@ -647,7 +648,6 @@ setup_obsolete_reason(
> 6 => 'suricata-update',
> 1 => 'exploitdb-papers',
> 3 => 'nautilus-sendto',
> - 5 => 'libstrophe',
> 2 => 'ghostview',
> 7 => 'libcudf',
> 7 => 'ocaml-cudf',
> @@ -1234,6 +1234,7 @@ setup_obsolete_reason(
> 3 => 'qt4-postgresql',
> 3 => 'qt4-sqlite2',
> 3 => 'qt4-tds',
> + 5 => 'libmesode',
> );
With the $stem_extensions addition that will automatically replace
libmesode with libstrophe, there shouldn't be a $obsolete_reason entry
for this. quirks needs a REVISION bump.
>
> # though it's not yet used, these should be pkgnames, so that eventually
> Index: net/Makefile
> ===
> RCS file: /cvs/ports/net/Makefile,v
> retrieving revision 1.1262
> diff -u -p -u -p -r1.1262 Makefile
> --- net/Makefile 24 Jul 2021 21:33:15 - 1.1262
> +++ net/Makefile 26 Aug 2021 20:26:04 -
> @@ -225,6 +225,7 @@
> SUBDIR += libsignal-protocol-c
> SUBDIR += libsmi
> SUBDIR += libst
> + SUBDIR += libstrophe
> SUBDIR += libtorrent
> SUBDIR += libtorrent-rasterbar
> SUBDIR += libunbound
libmesode should be removed from net/Makefile
> Index: net/libmesode/Makefile
> ===
> RCS file: net/libmesode/Makefile
> diff -N net/libmesode/Makefile
> --- net/libmesode/Makefile23 Oct 2020 13:44:41 - 1.6
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,39 +0,0 @@
> -# $OpenBSD: Makefile,v 1.6 2020/10/23 13:44:41 rsadowski Exp $
> -
> -COMMENT =fork of libstrophe for use with profanity XMPP client
> -
> -GH_ACCOUNT = boothj5
> -GH_PROJECT = libmesode
> -GH_TAGNAME = 0.10.1
> -
> -CATEGORIES = net devel
> -
> -SHARED_LIBS += mesode1.0 # 0.0
> -
> -MAINTAINER = Rafael Sadowski
> -
> -# Dual licensed: MIT and GPLv3
> -PERMIT_PACKAGE = Yes
> -
> -WANTLIB += crypto expat ssl
> -
> -# Only needed for tests, but cannot be a TEST_DEPENDS.
> -# Check must be present at build time for tests to work.
> -BUILD_DEPENDS += devel/check
> -
> -SEPARATE_BUILD = Yes
> -
> -USE_GMAKE = Yes
> -
> -AUTOMAKE_VERSION = 1.16
> -AUTOCONF_VERSION = 2.69
> -
> -MAKE_FLAGS = CC="${CC}" \
> - CFLAGS="${CFLAGS}"
> -
> -CONFIGURE_STYLE =autoreconf
> -CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE}/include" \
> - LDFLAGS="-L${LOCALBASE}/lib"
> -AUTORECONF = ./bootstrap.sh
> -
> -.include
> Index: net/libmesode/distinfo
> ===
> RCS file: net/libmesode/distinfo
> diff -N net/libmesode/distinfo
> --- net/libmesode/distinfo23 Oct 2020 13:44:41 - 1.4
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,2 +0,0 @@
> -SHA256 (libmesode-0.10.1.tar.gz) =
> yd2QZI5z2SuQ8rCuQaddj0abEW0+aqKXwUzVe+k32Z4=
> -SIZE (libmesode-0.10.1.tar.gz) = 150629
> Index: net/libmesode/pkg/DESCR
> ===
> RCS file: net/libmesode/pkg/DESCR
> diff -N net/libmesode/pkg/DESCR
> --- net/libmesode/pkg/DESCR 3 Mar 2019 19:14:28 - 1.1.1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,13 +0,0 @@
> -libmesode is a minimal XMPP library written in C. libmesode is a fork of
> -libstrophe for use in Profanity
[UPDATE] profanity 0.11.0 & change to libstrophe
Hi,
this updates profanity to 0.11.0.
Changes are listed here [1] as they are too long to list in this mail.
This version fixes several issues regarding OMEMO. Additional the XMPP
library is changed to libstrophe, as libmesode is deprecated upstream.
portcheck, 'make lib-depends-check' and 'make test' are happy for both
profanity and libstrophe.
Tested on amd64. I'm using it with 'standard' conversations with OMEMO
and on an another server with a self signed certificate in a MUC chat
room, again with OMEMO. No issues so far, it is running fine.
As libmesode is deprecated, I've modified devel/quirks.
Comments? OK?
Thanks!
[1] https://github.com/profanity-im/profanity/releases/tag/0.11.0
Index: devel/quirks/files/Quirks.pm
===
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.1296
diff -u -p -u -p -r1.1296 Quirks.pm
--- devel/quirks/files/Quirks.pm10 Aug 2021 20:43:52 - 1.1296
+++ devel/quirks/files/Quirks.pm26 Aug 2021 20:25:58 -
@@ -477,7 +477,8 @@ my $stem_extensions = {
'py-spark-parser' => 'py3-spark-parser',
'py-xdis' => 'py3-xdis',
'py-uncompyle6' => 'py3-uncompyle6',
- 'py-click' => 'py3-click'
+ 'py-click' => 'py3-click',
+ 'libmesode' => 'libstrophe'
};
my $obsolete_reason = {};
@@ -647,7 +648,6 @@ setup_obsolete_reason(
6 => 'suricata-update',
1 => 'exploitdb-papers',
3 => 'nautilus-sendto',
- 5 => 'libstrophe',
2 => 'ghostview',
7 => 'libcudf',
7 => 'ocaml-cudf',
@@ -1234,6 +1234,7 @@ setup_obsolete_reason(
3 => 'qt4-postgresql',
3 => 'qt4-sqlite2',
3 => 'qt4-tds',
+ 5 => 'libmesode',
);
# though it's not yet used, these should be pkgnames, so that eventually
Index: net/Makefile
===
RCS file: /cvs/ports/net/Makefile,v
retrieving revision 1.1262
diff -u -p -u -p -r1.1262 Makefile
--- net/Makefile24 Jul 2021 21:33:15 - 1.1262
+++ net/Makefile26 Aug 2021 20:26:04 -
@@ -225,6 +225,7 @@
SUBDIR += libsignal-protocol-c
SUBDIR += libsmi
SUBDIR += libst
+ SUBDIR += libstrophe
SUBDIR += libtorrent
SUBDIR += libtorrent-rasterbar
SUBDIR += libunbound
Index: net/libmesode/Makefile
===
RCS file: net/libmesode/Makefile
diff -N net/libmesode/Makefile
--- net/libmesode/Makefile 23 Oct 2020 13:44:41 - 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,39 +0,0 @@
-# $OpenBSD: Makefile,v 1.6 2020/10/23 13:44:41 rsadowski Exp $
-
-COMMENT = fork of libstrophe for use with profanity XMPP client
-
-GH_ACCOUNT = boothj5
-GH_PROJECT = libmesode
-GH_TAGNAME = 0.10.1
-
-CATEGORIES = net devel
-
-SHARED_LIBS += mesode1.0 # 0.0
-
-MAINTAINER = Rafael Sadowski
-
-# Dual licensed: MIT and GPLv3
-PERMIT_PACKAGE = Yes
-
-WANTLIB += crypto expat ssl
-
-# Only needed for tests, but cannot be a TEST_DEPENDS.
-# Check must be present at build time for tests to work.
-BUILD_DEPENDS += devel/check
-
-SEPARATE_BUILD = Yes
-
-USE_GMAKE =Yes
-
-AUTOMAKE_VERSION = 1.16
-AUTOCONF_VERSION = 2.69
-
-MAKE_FLAGS = CC="${CC}" \
- CFLAGS="${CFLAGS}"
-
-CONFIGURE_STYLE = autoreconf
-CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
-AUTORECONF = ./bootstrap.sh
-
-.include
Index: net/libmesode/distinfo
===
RCS file: net/libmesode/distinfo
diff -N net/libmesode/distinfo
--- net/libmesode/distinfo 23 Oct 2020 13:44:41 - 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,2 +0,0 @@
-SHA256 (libmesode-0.10.1.tar.gz) = yd2QZI5z2SuQ8rCuQaddj0abEW0+aqKXwUzVe+k32Z4=
-SIZE (libmesode-0.10.1.tar.gz) = 150629
Index: net/libmesode/pkg/DESCR
===
RCS file: net/libmesode/pkg/DESCR
diff -N net/libmesode/pkg/DESCR
--- net/libmesode/pkg/DESCR 3 Mar 2019 19:14:28 - 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,13 +0,0 @@
-libmesode is a minimal XMPP library written in C. libmesode is a fork of
-libstrophe for use in Profanity (ports/net/profanity).
-
-Reasons for forking:
-
-Remove Windows support
-Support only one XML Parser implementation (expat)
-Support only one SSL implementation (OpenSSL)
-
-This simplifies maintenance of the library when used in Profanity.
-
-Whilst Profanity will run against libstrophe, libmesode provides extra TLS
-functionality such as manual SSL certificate verification.
Index: net/libmesode/pkg/PLIST
===
RCS file: net/libmesode/pkg/PLIST
diff -N
