On Sat, Feb 16, 2019 at 10:15:07PM +0100, Klemens Nanni wrote:
> -WANTLIB += c crypto curses glib-2.0 gmodule-2.0 iconv intl m pcre \
> +WANTLIB += c crypto curses glib-2.0 gmodule-2.0 iconv intl m pcre \
> perl pthread ssl
Proper diff with missing "gcrypt gpg-error otr" added. gpg-error is
pulled in through the new libgcrypt LDEP.
Index: net/Makefile
===================================================================
RCS file: /cvs/ports/net/Makefile,v
retrieving revision 1.1109
diff -u -p -r1.1109 Makefile
--- net/Makefile 13 Feb 2019 15:16:13 -0000 1.1109
+++ net/Makefile 15 Feb 2019 20:09:04 -0000
@@ -168,7 +168,6 @@
SUBDIR += irssi
SUBDIR += irssi,socks
SUBDIR += irssi-icb
- SUBDIR += irssi-otr
SUBDIR += irssi-xmpp
SUBDIR += isc-bind
SUBDIR += isc-bind,geoip
Index: net/irssi/Makefile
===================================================================
RCS file: /cvs/ports/net/irssi/Makefile,v
retrieving revision 1.77
diff -u -p -r1.77 Makefile
--- net/irssi/Makefile 9 Jan 2019 16:54:19 -0000 1.77
+++ net/irssi/Makefile 16 Feb 2019 21:22:09 -0000
@@ -2,10 +2,9 @@
COMMENT = modular IRC client with many features (ipv6,socks,proxy)
-V = 1.1.2
+V = 1.2.0
DISTNAME = irssi-$V
PKGSPEC = irssi-=$V
-REVISION = 0
CATEGORIES = net
@@ -16,27 +15,30 @@ MAINTAINER = Klemens Nanni <kn@openbsd.o
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB += c crypto curses glib-2.0 gmodule-2.0 iconv intl m pcre \
- perl pthread ssl
+WANTLIB += c crypto curses gcrypt glib-2.0 gmodule-2.0 gpg-error \
+ iconv intl m otr pcre perl pthread ssl
MASTER_SITES = https://github.com/irssi/irssi/releases/download/${V}/
FLAVORS = socks
FLAVOR ?=
-LIB_DEPENDS = devel/glib2
+LIB_DEPENDS = devel/glib2>=2.28.0 \
+ security/libgcrypt>=1.2.0 \
+ security/libotr>=4.1.0
LIBTOOL_FLAGS += --tag=disable-static
CONFIGURE_STYLE = gnu
-CONFIGURE_ARGS += --with-pic \
- --with-proxy \
+CONFIGURE_ARGS = --with-otr=module \
+ --with-perl-lib=${PREFIX}/libdata/perl5/site_perl \
--with-perl=yes \
- --with-perl-lib=${PREFIX}/libdata/perl5/site_perl
-
-.if ${FLAVOR:Msocks}
+ --with-pic \
+ --with-proxy
CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
+
+.if ${FLAVOR:Msocks}
CONFIGURE_ARGS += --with-socks
LIB_DEPENDS += security/dante
WANTLIB += socks
Index: net/irssi/distinfo
===================================================================
RCS file: /cvs/ports/net/irssi/distinfo,v
retrieving revision 1.31
diff -u -p -r1.31 distinfo
--- net/irssi/distinfo 9 Jan 2019 16:54:19 -0000 1.31
+++ net/irssi/distinfo 12 Feb 2019 17:36:34 -0000
@@ -1,2 +1,2 @@
-SHA256 (irssi-1.1.2.tar.gz) = 232ewnHBOijiivnXJlb2GEneiOJZLLt1MHaNphRpcEk=
-SIZE (irssi-1.1.2.tar.gz) = 1714592
+SHA256 (irssi-1.2.0.tar.gz) = NQ38X9jbiB5vGYLaBGaQC1sXVSfpqU1praC36Qpz4+o=
+SIZE (irssi-1.2.0.tar.gz) = 1840945
Index: net/irssi/patches/patch-src_core_network-openssl_c
===================================================================
RCS file: net/irssi/patches/patch-src_core_network-openssl_c
diff -N net/irssi/patches/patch-src_core_network-openssl_c
--- net/irssi/patches/patch-src_core_network-openssl_c 23 Feb 2018 14:39:51
-0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-$OpenBSD: patch-src_core_network-openssl_c,v 1.6 2018/02/23 14:39:51 sthen Exp
$
-
-Index: src/core/network-openssl.c
---- src/core/network-openssl.c.orig
-+++ src/core/network-openssl.c
-@@ -35,7 +35,8 @@
- #include <openssl/err.h>
-
- /* OpenSSL 1.1.0 introduced some backward-incompatible changes to the api */
--#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) &&
!defined(LIBRESSL_VERSION_NUMBER)
-+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && \
-+ (!defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER <
0x2070000fL)
- /* The two functions below could be already defined if OPENSSL_API_COMPAT is
- * below the 1.1.0 version so let's do a clean start */
- #undef X509_get_notBefore
-@@ -47,7 +48,8 @@
-
- /* OpenSSL 1.1.0 also introduced some useful additions to the api */
- #if (OPENSSL_VERSION_NUMBER >= 0x10002000L)
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined
(LIBRESSL_VERSION_NUMBER)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
-+ (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER <
0x2070000fL)
- static int X509_STORE_up_ref(X509_STORE *vfy)
- {
- int n;
Index: net/irssi/patches/patch-src_fe-common_core_Makefile_in
===================================================================
RCS file: /cvs/ports/net/irssi/patches/patch-src_fe-common_core_Makefile_in,v
retrieving revision 1.12
diff -u -p -r1.12 patch-src_fe-common_core_Makefile_in
--- net/irssi/patches/patch-src_fe-common_core_Makefile_in 9 Jan 2019
16:54:19 -0000 1.12
+++ net/irssi/patches/patch-src_fe-common_core_Makefile_in 12 Feb 2019
17:37:28 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_fe-common_core_Makef
Index: src/fe-common/core/Makefile.in
--- src/fe-common/core/Makefile.in.orig
+++ src/fe-common/core/Makefile.in
-@@ -408,7 +408,7 @@ AM_CPPFLAGS = \
+@@ -420,7 +420,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src -I$(top_srcdir)/src/core/ \
$(GLIB_CFLAGS) \
-DHELPDIR=\""$(datadir)/irssi/help"\" \
Index: net/irssi/patches/patch-src_perl_Makefile_in
===================================================================
RCS file: /cvs/ports/net/irssi/patches/patch-src_perl_Makefile_in,v
retrieving revision 1.12
diff -u -p -r1.12 patch-src_perl_Makefile_in
--- net/irssi/patches/patch-src_perl_Makefile_in 9 Jan 2019 16:54:19
-0000 1.12
+++ net/irssi/patches/patch-src_perl_Makefile_in 12 Feb 2019 17:37:27
-0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_perl_Makefile_in,v 1
Index: src/perl/Makefile.in
--- src/perl/Makefile.in.orig
+++ src/perl/Makefile.in
-@@ -397,7 +397,7 @@ AM_CPPFLAGS = \
+@@ -409,7 +409,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/core \
-I$(top_srcdir)/src/fe-common/core \
$(GLIB_CFLAGS) \
Index: net/irssi/pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/irssi/pkg/PLIST,v
retrieving revision 1.25
diff -u -p -r1.25 PLIST
--- net/irssi/pkg/PLIST 28 Jan 2018 17:47:58 -0000 1.25
+++ net/irssi/pkg/PLIST 16 Feb 2019 20:44:42 -0000
@@ -96,10 +96,18 @@ include/irssi/src/fe-common/irc/notifyli
include/irssi/src/fe-common/irc/notifylist/module-formats.h
include/irssi/src/fe-common/irc/notifylist/module.h
include/irssi/src/fe-text/
+include/irssi/src/fe-text/gui-printtext.h
+include/irssi/src/fe-text/gui-windows.h
+include/irssi/src/fe-text/mainwindows.h
include/irssi/src/fe-text/statusbar-item.h
+include/irssi/src/fe-text/statusbar.h
+include/irssi/src/fe-text/term.h
+include/irssi/src/fe-text/textbuffer-view.h
+include/irssi/src/fe-text/textbuffer.h
include/irssi/src/irc/
include/irssi/src/irc/core/
include/irssi/src/irc/core/bans.h
+include/irssi/src/irc/core/channel-events.h
include/irssi/src/irc/core/channel-rejoin.h
include/irssi/src/irc/core/ctcp.h
include/irssi/src/irc/core/irc-cap.h
@@ -143,6 +151,8 @@ lib/irssi/
lib/irssi/modules/
lib/irssi/modules/libirc_proxy.la
lib/irssi/modules/libirc_proxy.so
+lib/irssi/modules/libotr_core.la
+lib/irssi/modules/libotr_core.so
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Irssi/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Irssi.pm
@@ -161,6 +171,7 @@ libdata/perl5/site_perl/${MACHINE_ARCH}-
@man man/man1/irssi.1
share/doc/irssi/
share/doc/irssi/capsicum.txt
+share/doc/irssi/design.html
share/doc/irssi/design.txt
share/doc/irssi/faq.html
share/doc/irssi/faq.txt
@@ -275,6 +286,7 @@ share/irssi/help/notice
share/irssi/help/notify
share/irssi/help/op
share/irssi/help/oper
+share/irssi/help/otr
share/irssi/help/part
share/irssi/help/ping
share/irssi/help/query
Index: net/irssi-icb/Makefile
===================================================================
RCS file: /cvs/ports/net/irssi-icb/Makefile,v
retrieving revision 1.41
diff -u -p -r1.41 Makefile
--- net/irssi-icb/Makefile 24 Jun 2016 14:52:20 -0000 1.41
+++ net/irssi-icb/Makefile 15 Feb 2019 20:12:24 -0000
@@ -5,6 +5,7 @@ COMMENT= ICB plugin for irssi
GH_ACCOUNT= mglocker
GH_PROJECT= irssi-icb
GH_COMMIT= c4e2ea8939b5b75d1941ebe3335475482d218838
+REVISION= 0
DISTNAME= irssi-icb-0.17
Index: net/irssi-otr/Makefile
===================================================================
RCS file: net/irssi-otr/Makefile
diff -N net/irssi-otr/Makefile
--- net/irssi-otr/Makefile 4 Sep 2018 12:46:17 -0000 1.9
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,57 +0,0 @@
-# $OpenBSD: Makefile,v 1.9 2018/09/04 12:46:17 espie Exp $
-
-COMMENT = OTR (off the record) encryption support for irssi
-
-V = 1.0.1
-REVISION = 3
-DISTNAME = irssi-otr-$V
-
-CATEGORIES = net security
-
-HOMEPAGE = https://github.com/cryptodotis/irssi-otr
-
-MAINTAINER = Florian Stinglmayr <flor...@n0la.org>
-
-# GPLv2+
-PERMIT_PACKAGE_CDROM = Yes
-
-WANTLIB = c gcrypt gpg-error iconv intl otr pthread
-
-MASTER_SITES = https://www.otr.im/dist/irssi-otr/
-EXTRACT_SUFX = .tar.bz2
-
-BUILD_DEPENDS = net/irssi>=0.8.15p5 \
- devel/libtool \
- ${MODGNU_AUTOCONF_DEPENDS} \
- ${MODGNU_AUTOMAKE_DEPENDS}
-
-LIB_DEPENDS = security/libgcrypt \
- security/libotr>=4.0.0
-RUN_DEPENDS = net/irssi
-
-CONFIGURE_STYLE = gnu
-AUTOCONF_VERSION = 2.69
-AUTOMAKE_VERSION = 1.9
-NO_TEST = Yes
-
-MAKE_FLAGS = IRSSI_DIST="$(LOCALBASE)/include/irssi"
-
-# libtool.m4 required for build, but also loading the module into irssi
-# fails with /usr/bin/libtool as of 20140521
-USE_LIBTOOL = gnu
-
-LIBTOOL_FLAGS += --tag=disable-static
-CONFIGURE_ARGS += --with-libotr-inc-prefix=${LOCALBASE}/include
-
-post-patch:
- cd ${WRKSRC} && \
- AUTOCONF_VERSION=${AUTOCONF_VERSION} \
- AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
- autoreconf -i
-
-post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/irssi/
- ${INSTALL_DATA} ${WRKSRC}/README.md \
- ${PREFIX}/share/doc/irssi/otr-plugin.txt
-
-.include <bsd.port.mk>
Index: net/irssi-otr/distinfo
===================================================================
RCS file: net/irssi-otr/distinfo
diff -N net/irssi-otr/distinfo
--- net/irssi-otr/distinfo 12 Jan 2015 00:13:53 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-SHA256 (irssi-otr-1.0.1.tar.bz2) = +9xG/3z0VFFbNnJjcnii7UYwvkGjlktV4ViuNsauT88=
-SIZE (irssi-otr-1.0.1.tar.bz2) = 295144
Index: net/irssi-otr/patches/patch-configure_ac
===================================================================
RCS file: net/irssi-otr/patches/patch-configure_ac
diff -N net/irssi-otr/patches/patch-configure_ac
--- net/irssi-otr/patches/patch-configure_ac 12 Jan 2015 00:13:53 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-configure_ac,v 1.2 2015/01/12 00:13:53 jca Exp $
---- configure.ac.orig Sat Jan 3 17:50:28 2015
-+++ configure.ac Wed Jan 7 18:25:30 2015
-@@ -77,7 +77,7 @@ AC_SUBST(DEFAULT_INCLUDES)
- AC_ARG_WITH([irssi-module-dir],
- AS_HELP_STRING([--with-irssi-module-dir=DIR], [Irssi module directory]),
- [IRSSI_MODULE_DIR="$withval"],
-- [IRSSI_MODULE_DIR="/usr/lib/irssi/modules"])
-+ [IRSSI_MODULE_DIR="$prefix/lib/irssi/modules"])
-
- AC_SUBST(IRSSI_MODULE_DIR)
-
Index: net/irssi-otr/patches/patch-help_Makefile_am
===================================================================
RCS file: net/irssi-otr/patches/patch-help_Makefile_am
diff -N net/irssi-otr/patches/patch-help_Makefile_am
--- net/irssi-otr/patches/patch-help_Makefile_am 21 May 2014 15:40:54
-0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-help_Makefile_am,v 1.1.1.1 2014/05/21 15:40:54 sthen Exp $
---- help/Makefile.am.orig Thu Jan 30 21:30:06 2014
-+++ help/Makefile.am Thu Jan 30 21:30:12 2014
-@@ -1,6 +1,4 @@
--# The day Irssi will be able to check in $(prefix), this will change. Until
--# then, it's hardcoded.
--helpdir = /usr/share/irssi/help
-+helpdir = ${prefix}/share/irssi/help
- help_DATA = otr
-
- EXTRA_DIST = otr
Index: net/irssi-otr/patches/patch-src_module_c
===================================================================
RCS file: net/irssi-otr/patches/patch-src_module_c
diff -N net/irssi-otr/patches/patch-src_module_c
--- net/irssi-otr/patches/patch-src_module_c 13 Mar 2016 14:41:30 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,51 +0,0 @@
-$OpenBSD: patch-src_module_c,v 1.1 2016/03/13 14:41:30 sthen Exp $
---- src/module.c.orig Mon Sep 29 22:11:07 2014
-+++ src/module.c Sat Mar 12 19:03:22 2016
-@@ -32,6 +32,7 @@
- #include "otr.h"
- #include "otr-formats.h"
- #include "utils.h"
-+#include "irssi-version.h"
-
- GCRY_THREAD_OPTION_PTHREAD_IMPL;
-
-@@ -90,8 +91,13 @@ end:
- /*
- * Pipes all incoming private messages through OTR
- */
-+#if IRSSI_VERSION_DATE > 20141206
- void sig_message_private(SERVER_REC *server, const char *msg,
-+ const char *nick, const char *address, const char *target)
-+#else
-+void sig_message_private(SERVER_REC *server, const char *msg,
- const char *nick, const char *address)
-+#endif
- {
- int ret;
- char *new_msg = NULL;
-@@ -106,7 +112,11 @@ void sig_message_private(SERVER_REC *server, const cha
-
- if (!new_msg) {
- /* This message was not OTR */
-+#if IRSSI_VERSION_DATE > 20141206
-+ signal_continue(5, server, msg, nick, address, target);
-+#else
- signal_continue(4, server, msg, nick, address);
-+#endif
- } else {
- /*
- * Check for /me IRC marker and if so, handle it so the user
does not
-@@ -371,3 +381,13 @@ void otr_deinit(void)
-
- theme_unregister();
- }
-+
-+#ifdef IRSSI_ABI_VERSION
-+/*
-+ * irssi abicheck()
-+ */
-+void otr_abicheck(int *version)
-+{
-+ *version = IRSSI_ABI_VERSION;
-+}
-+#endif
Index: net/irssi-otr/pkg/DESCR
===================================================================
RCS file: net/irssi-otr/pkg/DESCR
diff -N net/irssi-otr/pkg/DESCR
--- net/irssi-otr/pkg/DESCR 21 May 2014 15:40:54 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-IRSSI support for Off-The-Record (http://www.cypherpunks.ca/otr/)
-messaging, allowing you to have private conversations over instant
-messaging by providing:
-
-Encryption
- * No one else can read your instant messages.
-
-Authentication
- * You are assured the correspondent is who you think it is.
-
-Deniability
- * The messages you send do not have digital signatures that are
- checkable by a third party. Anyone can forge messages after a
- conversation to make them look like they came from you. However,
- during a conversation, your correspondent is assured the messages
- he sees are authentic and unmodified.
-
-Perfect forward secrecy
- * If you lose control of your private keys, no previous conversation is
- compromised.
Index: net/irssi-otr/pkg/PLIST
===================================================================
RCS file: net/irssi-otr/pkg/PLIST
diff -N net/irssi-otr/pkg/PLIST
--- net/irssi-otr/pkg/PLIST 4 Sep 2018 12:46:17 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,5 +0,0 @@
-@comment $OpenBSD: PLIST,v 1.3 2018/09/04 12:46:17 espie Exp $
-lib/irssi/modules/libotr.so
-share/doc/irssi/otr-plugin.txt
-share/doc/pkg-readmes/${PKGSTEM}
-share/irssi/help/otr
Index: net/irssi-otr/pkg/README
===================================================================
RCS file: net/irssi-otr/pkg/README
diff -N net/irssi-otr/pkg/README
--- net/irssi-otr/pkg/README 4 Sep 2018 12:46:17 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: README,v 1.3 2018/09/04 12:46:17 espie Exp $
-
-+-----------------------------------------------------------------------
-| Running ${PKGSTEM} on OpenBSD
-+-----------------------------------------------------------------------
-
-Quick start
-===========
-
-To load irssi-otr type in the IRSSI main window
- /load otr
-
-To initiate OTR session open a chat window and type
- /otr init
-
-For further detail please refer to ${TRUEPREFIX}/share/irssi/help/otr
-and ${TRUEPREFIX}/share/doc/irssi/otr-plugin.txt
Index: net/irssi-xmpp/Makefile
===================================================================
RCS file: /cvs/ports/net/irssi-xmpp/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- net/irssi-xmpp/Makefile 27 Feb 2018 08:53:22 -0000 1.13
+++ net/irssi-xmpp/Makefile 16 Feb 2019 12:59:20 -0000
@@ -3,7 +3,7 @@
COMMENT= XMPP plugin for irssi
DISTNAME= irssi-xmpp-0.54
-REVISION= 0
+REVISION= 1
CATEGORIES= net
Index: devel/quirks/Makefile
===================================================================
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.708
diff -u -p -r1.708 Makefile
--- devel/quirks/Makefile 12 Feb 2019 21:57:34 -0000 1.708
+++ devel/quirks/Makefile 16 Feb 2019 20:55:57 -0000
@@ -5,7 +5,7 @@ CATEGORIES = devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-3.101
+PKGNAME = quirks-3.102
PKG_ARCH = *
MAINTAINER = Marc Espie <es...@openbsd.org>
Index: devel/quirks/files/Quirks.pm
===================================================================
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.722
diff -u -p -r1.722 Quirks.pm
--- devel/quirks/files/Quirks.pm 12 Feb 2019 21:57:34 -0000 1.722
+++ devel/quirks/files/Quirks.pm 16 Feb 2019 21:00:49 -0000
@@ -1152,6 +1152,7 @@ my $obsolete_reason = {
'py-nevow' => 5,
'gupnp-ui' => 3,
'suricata-update' => 6,
+ 'irssi-otr' => 5,
};
# reasons for obsolete packages
