Hi XMPP OpenBSD users,
please find attached libmesode-0.9.2 as tarball. libmesode is a fork of
net/libstrophe for use in profanity. Reasons for forking:
- Remove Windows support
- Support only one XML Parser implementation (expat)
- Support only one SSL implementation (OpenSSL)
More: https://github.com/boothj5/libmesode
Profanity with libmesode supports TLS now. Tested with @jabber.ccc.de
I would like remove libstrophe and import libmesode as replacement.
There are no other consumers and libstrophe was only imported for
profanity. Below you can find the profanity update diff which replace
libstrophe with libmesode.
Tests and OK's welcome!
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/profanity/Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile
--- Makefile 1 Jul 2018 11:52:40 -0000 1.7
+++ Makefile 3 Mar 2019 11:01:14 -0000
@@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.7 2018/07/01 11:52:40 rsadowski Exp $
COMMENT = console based XMPP client
-DISTNAME = profanity-0.5.1
+DISTNAME = profanity-0.6.0
CATEGORIES = net
-REVISION = 1
HOMEPAGE = http://www.profanity.im/
MAINTAINER = Rafael Sadowski <rsadowski@openbsd.org>
@@ -13,33 +12,35 @@ PERMIT_PACKAGE_CDROM = Yes
MASTER_SITES = http://www.profanity.im/
-WANTLIB += assuan c crypto curl ereadline expat ffi gcrypt gdk_pixbuf-2.0
+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 ncursesw nghttp2 notify otr
-WANTLIB += pcre png pthread ssl strophe util z ${MODPY_WANTLIB}
-MODULES = lang/python
+WANTLIB += gpgme iconv intl m mesode nghttp2 otr pcre pthread
+WANTLIB += ${MODPY_WANTLIB} ssl util z
+
+MODULES += lang/python
BUILD_DEPENDS +=${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS}
LIB_DEPENDS += devel/glib2 \
- devel/libnotify \
- devel/readline>=6.1p2 \
- graphics/gdk-pixbuf2 \
+ devel/readline \
net/curl \
- net/libstrophe>=0.9.1 \
+ net/libmesode \
security/gpgme \
security/libotr
-TEST_DEPENDS = devel/cmocka
+# Only needed for tests, but cannot be a TEST_DEPENDS.
+# Check must be present at build time for tests to work.
+BUILD_DEPENDS += devel/cmocka
CONFIGURE_STYLE = autoconf
+
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-CONFIGURE_ARGS = --with-xscreensaver=no \
+CONFIGURE_ARGS += --with-xscreensaver=no \
--enable-icons=no \
- --enable-notifications=yes \
+ --enable-plugins=yes \
--enable-otr=yes
MAKE_FLAGS = CC="${CC}" CFLAGS="${CFLAGS}"
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/profanity/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo 6 Feb 2017 21:57:55 -0000 1.3
+++ distinfo 3 Mar 2019 11:01:14 -0000
@@ -1,2 +1,2 @@
-SHA256 (profanity-0.5.1.tar.gz) = 41E3E+dOwzY/vbrCkZvcF+JJmIeAzFpFidFCWAen/rg=
-SIZE (profanity-0.5.1.tar.gz) = 691508
+SHA256 (profanity-0.6.0.tar.gz) = 8bJ3O3nrKUKXaG85E+lInCDv+uXjozXIlW2xj27i9mA=
+SIZE (profanity-0.6.0.tar.gz) = 741812
Index: patches/patch-configure_ac
===================================================================
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- patches/patch-configure_ac 29 Nov 2016 22:26:57 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,52 +0,0 @@
-$OpenBSD: patch-configure_ac,v 1.2 2016/11/29 22:26:57 tb Exp $
---- configure.ac.orig Wed Sep 14 22:52:04 2016
-+++ configure.ac Sun Sep 25 21:17:03 2016
-@@ -22,6 +22,7 @@ AC_CANONICAL_HOST
- PLATFORM="unknown"
- AS_CASE([$host_os],
- [freebsd*], [PLATFORM="freebsd"],
-+ [openbsd*], [PLATFORM="openbsd"],
- [darwin*], [PLATFORM="osx"],
- [cygwin], [PLATFORM="cygwin"],
- [PLATFORM="nix"])
-@@ -172,15 +173,22 @@ AS_IF([test "x$enable_icons" != xno],
- [AC_MSG_ERROR([gtk+-2.0 or higher is required for icons])],
- [AC_MSG_NOTICE([gtk+-2.0 not found, icons not enabled])])])])
-
--AS_IF([test "x$PLATFORM" != xosx],
-- [AC_CHECK_LIB([readline], [main], [],
-- [AC_MSG_ERROR([libreadline is required for profanity])])],
-- [AC_CHECK_FILE([/usr/local/opt/readline/lib],
-- [LIBS="-lreadline $LIBS"
-- AM_CPPFLAGS="-I/usr/local/opt/readline/include $AM_CPPFLAGS"
-- AM_LDFLAGS="-L/usr/local/opt/readline/lib $AM_LDFLAGS"
-- AC_SUBST(AM_LDFLAGS)],
-- [AC_MSG_ERROR([libreadline is required for profanity])])])
-+AS_IF([test "x$PLATFORM" = xosx],
-+ [AC_CHECK_FILE([/usr/local/opt/readline/lib],
-+ [LIBS="-lreadline $LIBS"
-+ AM_CPPFLAGS="-I/usr/local/opt/readline/include $AM_CPPFLAGS"
-+ AM_LDFLAGS="-L/usr/local/opt/readline/lib $AM_LDFLAGS"
-+ AC_SUBST(AM_LDFLAGS)])],
-+ [test "x$PLATFORM" = xopenbsd],
-+ [AC_CHECK_FILE([/usr/local/include/ereadline],
-+ [LIBS="-lereadline $LIBS"
-+ AM_CPPFLAGS="-I/usr/local/include/ereadline $AM_CPPFLAGS"
-+ AM_LDFLAGS="-L/usr/local/lib $AM_LDFLAGS"
-+ AC_SUBST(AM_LDFLAGS)])],
-+ [test "x$PLATFORM" = xnix],
-+ [AC_CHECK_LIB([readline],[main],[],
-+ [AC_MSG_ERROR([libreadline is required for profanity])])],
-+ [AC_MSG_ERROR([libreadline is required for profanity])])
-
- ### Check for desktop notification support
- ### Linux/FreeBSD require libnotify
-@@ -196,7 +204,7 @@ AS_IF([test "x$PLATFORM" = xosx],
- [AC_MSG_ERROR([terminal-notifier not found, required for desktop notifications.])],
- [AC_MSG_NOTICE([Desktop notifications not supported.])])],
- [AC_DEFINE([HAVE_OSXNOTIFY], [1], [terminal notifier])])])],
-- [test "x$PLATFORM" = xnix -o "x$PLATFORM" = xfreebsd],
-+ [test "x$PLATFORM" = xnix -o "x$PLATFORM" = xfreebsd -o "x$PLATFORM" = xopenbsd],
- [AS_IF([test "x$enable_notifications" != xno],
- [PKG_CHECK_MODULES([libnotify], [libnotify],
- [AC_DEFINE([HAVE_LIBNOTIFY], [1], [libnotify module])],
Index: patches/patch-tests_unittests_tools_stub_http_upload_c
===================================================================
RCS file: patches/patch-tests_unittests_tools_stub_http_upload_c
diff -N patches/patch-tests_unittests_tools_stub_http_upload_c
--- patches/patch-tests_unittests_tools_stub_http_upload_c 6 Feb 2017 21:57:55 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-tests_unittests_tools_stub_http_upload_c,v 1.2 2017/02/06 21:57:55 tb Exp $
-
-fix missing include
-
---- tests/unittests/tools/stub_http_upload.c.orig Sat Jan 28 22:10:04 2017
-+++ tests/unittests/tools/stub_http_upload.c Sun Feb 5 20:17:59 2017
-@@ -3,6 +3,8 @@
-
- #include <curl/curl.h>
-
-+#include <pthread.h>
-+
- // forward -> ui/win_types.h
- typedef struct prof_win_t ProfWin;
-
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/profanity/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 PLIST
--- pkg/PLIST 29 Nov 2016 22:26:57 -0000 1.2
+++ pkg/PLIST 3 Mar 2019 11:01:14 -0000
@@ -10,6 +10,7 @@ share/profanity/themes/aqua
share/profanity/themes/batman
share/profanity/themes/bios
share/profanity/themes/boothj5
+share/profanity/themes/boothj5_laptop
share/profanity/themes/boothj5_slack
share/profanity/themes/complex
share/profanity/themes/forest
No comments:
Post a Comment