Hi,
I'm in the process of revising my submitted update to profanity to use
libstrophe instead of libmesode.
The reason is that libmesode is deprecated upstream and libstrophe
should be used.
libstrophe: portcheck, 'make lib-depends-check' and 'make tests' are
happy.
I've removed the patch, because libstrophe got LibreSSL support in
0.10.0.
profanity: it builds fine and portcheck is happy. However I cannot
install profanity and 'make lib-depends-check' complains with messages
added at the end.
CC current maintainer of (deprecated) libstrophe. I'm happy to take
mainainership.
I've added both diffs as attachments to avoid cluttering.
Any tips what I've done wrong?
Thank you!
--- snip ---
openbsd-ports$ make lib-depends-check
===> Looking for profanity-0.11.0.tgz in $PKG_PATH - Can't find
profanity-0.11.0.tgz
Couldn't install profanity-0.11.0
not found
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2122
'/usr/ports/packages/amd64/cache/profanity-0.11.0.tgz': @if /usr/bin/env -i ...)
`/usr/ports/pobj/profanity-0.11.0/fake-amd64/.fake_done' is up to date.
===> Building package for profanity-0.11.0
Create /usr/ports/packages/amd64/all/profanity-0.11.0.tgz
Error: Libraries in packing-lists in the ports tree
and libraries from installed packages don't match
--- /tmp/dep_cache.6piHy1P81/portstree-profanity-0.11.0 Thu Aug 26 12:33:18 2021
+++ /tmp/dep_cache.6piHy1P81/inst-profanity-0.11.0 Thu Aug 26 12:33:18 2021
@@ -16,7 +16,7 @@
-W iconv.7.0
-W intl.7.0
-W m.10.1
--W strophe.2.0
+-W strophe.3.0
-W nghttp2.0.17
-W otr.4.1
-W pcre.3.0
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:3432 'wantlib-args':
@case X${_DEPENDS_CACHE} in X) _DEPENDS_CACHE=$(doas -u _pb...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2142
'/usr/ports/packages/amd64/all/profanity-0.11.0.tgz': @trap "cd /usr/ports/p...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2132
'/usr/ports/packages/amd64/all/profanity-0.11.0.tgz': @cd /usr/ports/mystuff...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2623
'_internal-package': @case X${_DEPENDS_CACHE} in X) _DEPENDS_CACHE=$(doas -...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2602 'package':
@lock=profanity-0.11.0; export _LOCKS_HELD=" profanity-0.11.0"; ...)
*** Error 2 in /usr/ports/mystuff/net/profanity
(/usr/ports/infrastructure/mk/bsd.port.mk:2448 'lib-depends-check': @case
X${_DEPENDS_CACHE}...)
--
greetings,
Florian Viehweger
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/profanity/Makefile,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 Makefile
--- Makefile 23 Feb 2021 19:39:33 -0000 1.20
+++ Makefile 26 Aug 2021 10:19:20 -0000
@@ -1,15 +1,14 @@
# $OpenBSD: Makefile,v 1.20 2021/02/23 19:39:33 sthen Exp $
COMMENT = console based XMPP client
-DISTNAME = profanity-0.10.0
+DISTNAME = profanity-0.11.0
CATEGORIES = net
-REVISION = 0
HOMEPAGE = https://profanity-im.github.io/
MAINTAINER = Florian Viehweger <[email protected]>
-SHARED_LIBS += profanity 0.0 # 0.0
+SHARED_LIBS += profanity 1.0 # 0.0
# GPLv3+
PERMIT_PACKAGE = Yes
@@ -18,7 +17,7 @@ MASTER_SITES = https://profanity-im.gith
WANTLIB += assuan c crypto curl curses ereadline expat ffi gcrypt
WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gpg-error
-WANTLIB += gpgme iconv intl m mesode nghttp2 otr pcre pthread
+WANTLIB += gpgme iconv intl m strophe nghttp2 otr pcre pthread
WANTLIB += ${MODPY_WANTLIB} signal-protocol-c sqlite3 ssl util z
MODULES += lang/python
@@ -27,7 +26,7 @@ LIB_DEPENDS += databases/sqlite3 \
devel/glib2 \
devel/readline \
net/curl \
- net/libmesode \
+ net/libstrophe \
net/libsignal-protocol-c \
security/gpgme \
security/libotr
@@ -50,11 +49,11 @@ CONFIGURE_ARGS += --with-xscreensaver=no
--enable-omemo=yes \
--enable-otr=yes
+post-patch:
+ ${SUBST_CMD} ${WRKSRC}/configure.ac
+
MAKE_FLAGS = CC="${CC}" \
CFLAGS="${CFLAGS}"
-
-post-patch:
- ${SUBST_CMD} ${WRKSRC}/configure.ac
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/profanity/
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/profanity/distinfo,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 distinfo
--- distinfo 17 Jan 2021 17:08:09 -0000 1.11
+++ distinfo 26 Aug 2021 10:19:20 -0000
@@ -1,2 +1,2 @@
-SHA256 (profanity-0.10.0.tar.gz) = SgXjJZD57DhDDjNzW9As+hmbJXkitBFmE/I5Eso5/4w=
-SIZE (profanity-0.10.0.tar.gz) = 868180
+SHA256 (profanity-0.11.0.tar.gz) = P8mAmBb2kYbbuGCycYP2zSrvClKn0U4g5O9sOn8PNgY=
+SIZE (profanity-0.11.0.tar.gz) = 887566
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/profanity/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 PLIST
--- pkg/PLIST 17 Jan 2021 17:08:09 -0000 1.6
+++ pkg/PLIST 26 Aug 2021 10:19:20 -0000
@@ -18,6 +18,7 @@ lib/libprofanity.la
@man man/man1/profanity-bookmark.1
@man man/man1/profanity-caps.1
@man man/man1/profanity-carbons.1
+@man man/man1/profanity-changepassword.1
@man man/man1/profanity-charset.1
@man man/man1/profanity-clear.1
@man man/man1/profanity-close.1
@@ -29,6 +30,7 @@ lib/libprofanity.la
@man man/man1/profanity-correction.1
@man man/man1/profanity-disco.1
@man man/man1/profanity-disconnect.1
+@man man/man1/profanity-editor.1
@man man/man1/profanity-executable.1
@man man/man1/profanity-export.1
@man man/man1/profanity-flash.1
@@ -47,6 +49,7 @@ lib/libprofanity.la
@man man/man1/profanity-log.1
@man man/man1/profanity-logging.1
@man man/man1/profanity-mainwin.1
+@man man/man1/profanity-mam.1
@man man/man1/profanity-msg.1
@man man/man1/profanity-nick.1
@man man/man1/profanity-notify.1
@@ -77,6 +80,7 @@ lib/libprofanity.la
@man man/man1/profanity-script.1
@man man/man1/profanity-sendfile.1
@man man/man1/profanity-serversoftware.1
+@man man/man1/profanity-silence.1
@man man/man1/profanity-slashguard.1
@man man/man1/profanity-software.1
@man man/man1/profanity-splash.1
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/libstrophe/Makefile,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 Makefile
--- Makefile 12 Jul 2019 20:48:31 -0000 1.4
+++ Makefile 26 Aug 2021 09:50:41 -0000
@@ -2,16 +2,16 @@
COMMENT = simple, lightweight XMPP C library
-V = 0.9.2
+V = 0.10.1
DISTNAME = libstrophe-${V}
-SHARED_LIBS = strophe 2.0 # 1.0
+SHARED_LIBS = strophe 3.0 # 2.0
CATEGORIES = net devel
HOMEPAGE = http://strophe.im/libstrophe/
-MAINTAINER = Rafael Sadowski <[email protected]>
+MAINTAINER = Florian Viehweger <[email protected]>
# Dual licensed: MIT and GPLv3
PERMIT_PACKAGE = Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/libstrophe/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo 29 Mar 2018 19:56:59 -0000 1.3
+++ distinfo 26 Aug 2021 09:50:41 -0000
@@ -1,2 +1,2 @@
-SHA256 (libstrophe-0.9.2.tar.gz) = eH5qO5K5i2HMToo+cWWTyYZOL+KlWl9JyecOzRfEdNc=
-SIZE (libstrophe-0.9.2.tar.gz) = 500459
+SHA256 (libstrophe-0.10.1.tar.gz) = SRjEcCns3qLeq0sPkzbKSouxLCi3KyzsOX2YZkuUx3E=
+SIZE (libstrophe-0.10.1.tar.gz) = 520649
Index: patches/patch-src_tls_openssl_c
===================================================================
RCS file: patches/patch-src_tls_openssl_c
diff -N patches/patch-src_tls_openssl_c
--- patches/patch-src_tls_openssl_c 29 Mar 2018 19:56:59 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,41 +0,0 @@
-$OpenBSD: patch-src_tls_openssl_c,v 1.1 2018/03/29 19:56:59 rsadowski Exp $
-
-Index: src/tls_openssl.c
---- src/tls_openssl.c.orig
-+++ src/tls_openssl.c
-@@ -51,7 +51,7 @@ static void _tls_log_error(xmpp_ctx_t *ctx);
-
- void tls_initialize(void)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- SSL_library_init();
- SSL_load_error_strings();
- #else
-@@ -66,14 +66,14 @@ void tls_shutdown(void)
- * openssl after libstrophe finalization. Maybe better leak some fixed
- * memory rather than cause random crashes of the main program.
- */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- ERR_free_strings();
- EVP_cleanup();
- CRYPTO_cleanup_all_ex_data();
--#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
- SSL_COMP_free_compression_methods();
- #endif
--#if OPENSSL_VERSION_NUMBER < 0x10000000L
-+#if OPENSSL_VERSION_NUMBER < 0x10000000L || defined(LIBRESSL_VERSION_NUMBER)
- ERR_remove_state(0);
- #else
- ERR_remove_thread_state(NULL);
-@@ -120,7 +120,7 @@ tls_t *tls_new(xmpp_conn_t *conn)
- /* Trust server's certificate when user sets the flag explicitly. */
- mode = conn->tls_trust ? SSL_VERIFY_NONE : SSL_VERIFY_PEER;
- SSL_set_verify(tls->ssl, mode, 0);
--#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10002000L || !defined(LIBRESSL_VERSION_NUMBER)
- /* Hostname verification is supported in OpenSSL 1.0.2 and newer. */
- X509_VERIFY_PARAM *param = SSL_get0_param(tls->ssl);
-
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/libstrophe/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 25 Apr 2016 17:43:39 -0000 1.1.1.1
+++ pkg/PLIST 26 Aug 2021 09:50:41 -0000
@@ -1,6 +1,6 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2016/04/25 17:43:39 tb Exp $
include/strophe.h
-lib/libstrophe.a
+@static-lib lib/libstrophe.a
lib/libstrophe.la
@lib lib/libstrophe.so.${LIBstrophe_VERSION}
lib/pkgconfig/libstrophe.pc
