Quick update fixing a bunch of issues, please see https://github.com/irssi/irssi/releases for the full list.
Build and run tested successfully on amd64, all tests pass, FLAVOR=socks and net/irssi-{icb,otr,xmpp} build tested successfully as well. Feedback? Any takers? diff --git a/net/irssi/Makefile b/net/irssi/Makefile index 27b78214096..bc3c8cc4723 100644 --- a/net/irssi/Makefile +++ b/net/irssi/Makefile @@ -2,7 +2,7 @@ COMMENT = modular IRC client with many features (ipv6,socks,proxy) -V = 1.0.6 +V = 1.1.0 DISTNAME = irssi-$V PKGSPEC = irssi-=$V diff --git a/net/irssi/distinfo b/net/irssi/distinfo index 331bb08d290..828b37e75f4 100644 --- a/net/irssi/distinfo +++ b/net/irssi/distinfo @@ -1,2 +1,2 @@ -SHA256 (irssi-1.0.6.tar.gz) = q5J722Z8nhf876CUUAPjkrHjiqWnDLm0vrQtlEwHP0Y= -SIZE (irssi-1.0.6.tar.gz) = 1600284 +SHA256 (irssi-1.1.0.tar.gz) = BYnzQ9ZdyQMUDLJryIpUsbNtqnz77K4KPkc/Zs0WZng= +SIZE (irssi-1.1.0.tar.gz) = 1705125 diff --git a/net/irssi/patches/patch-src_core_settings_c b/net/irssi/patches/patch-src_core_settings_c index b32eb141691..78120147450 100644 --- a/net/irssi/patches/patch-src_core_settings_c +++ b/net/irssi/patches/patch-src_core_settings_c @@ -1,7 +1,8 @@ $OpenBSD: patch-src_core_settings_c,v 1.6 2017/06/07 21:57:46 sthen Exp $ ---- src/core/settings.c.orig Mon Jun 5 14:05:43 2017 -+++ src/core/settings.c Tue Jun 6 23:19:02 2017 -@@ -718,7 +718,7 @@ static CONFIG_REC *parse_configfile(const char *fname) +Index: src/core/settings.c +--- src/core/settings.c.orig ++++ src/core/settings.c +@@ -726,7 +726,7 @@ static CONFIG_REC *parse_configfile(const char *fname) else { /* user configuration file not found, use the default one from sysconfdir */ diff --git a/net/irssi/patches/patch-src_fe-common_core_Makefile_in b/net/irssi/patches/patch-src_fe-common_core_Makefile_in index e30a9ed7330..e7e52281fa5 100644 --- a/net/irssi/patches/patch-src_fe-common_core_Makefile_in +++ b/net/irssi/patches/patch-src_fe-common_core_Makefile_in @@ -1,12 +1,13 @@ $OpenBSD: patch-src_fe-common_core_Makefile_in,v 1.10 2017/06/07 21:57:46 sthen Exp $ ---- src/fe-common/core/Makefile.in.orig Tue Jun 6 19:12:14 2017 -+++ src/fe-common/core/Makefile.in Tue Jun 6 23:19:02 2017 -@@ -375,7 +375,7 @@ AM_CPPFLAGS = \ +Index: src/fe-common/core/Makefile.in +--- src/fe-common/core/Makefile.in.orig ++++ src/fe-common/core/Makefile.in +@@ -392,7 +392,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src -I$(top_srcdir)/src/core/ \ $(GLIB_CFLAGS) \ -DHELPDIR=\""$(datadir)/irssi/help"\" \ - -DTHEMESDIR=\""$(datadir)/irssi/themes"\" + -DTHEMESDIR=\""$(sysconfdir)/irssi/themes"\" - libfe_common_core_a_SOURCES = \ - chat-completion.c \ + libfe_common_core_a_SOURCES = chat-completion.c command-history.c \ + completion.c fe-channels.c fe-common-core.c fe-core-commands.c \ diff --git a/net/irssi/patches/patch-src_perl_Makefile_in b/net/irssi/patches/patch-src_perl_Makefile_in index 4fc91991c91..cbd63613b06 100644 --- a/net/irssi/patches/patch-src_perl_Makefile_in +++ b/net/irssi/patches/patch-src_perl_Makefile_in @@ -1,7 +1,8 @@ $OpenBSD: patch-src_perl_Makefile_in,v 1.10 2017/06/07 21:57:46 sthen Exp $ ---- src/perl/Makefile.in.orig Tue Jun 6 19:12:14 2017 -+++ src/perl/Makefile.in Tue Jun 6 23:19:02 2017 -@@ -389,7 +389,7 @@ AM_CPPFLAGS = \ +Index: src/perl/Makefile.in +--- src/perl/Makefile.in.orig ++++ src/perl/Makefile.in +@@ -393,7 +393,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/core \ -I$(top_srcdir)/src/fe-common/core \ $(GLIB_CFLAGS) \ diff --git a/net/irssi/pkg/PLIST b/net/irssi/pkg/PLIST index 44f1649a5f3..6b3e2f6b94a 100644 --- a/net/irssi/pkg/PLIST +++ b/net/irssi/pkg/PLIST @@ -8,6 +8,7 @@ include/irssi/src/ include/irssi/src/common.h include/irssi/src/core/ include/irssi/src/core/args.h +include/irssi/src/core/capsicum.h include/irssi/src/core/channel-rec.h include/irssi/src/core/channel-setup-rec.h include/irssi/src/core/channels-setup.h @@ -19,6 +20,7 @@ include/irssi/src/core/commands.h include/irssi/src/core/core.h include/irssi/src/core/expandos.h include/irssi/src/core/ignore.h +include/irssi/src/core/iregex.h include/irssi/src/core/levels.h include/irssi/src/core/line-split.h include/irssi/src/core/log.h @@ -30,6 +32,7 @@ include/irssi/src/core/modules.h include/irssi/src/core/net-disconnect.h include/irssi/src/core/net-nonblock.h include/irssi/src/core/net-sendbuffer.h +include/irssi/src/core/network-openssl.h include/irssi/src/core/network.h include/irssi/src/core/nick-rec.h include/irssi/src/core/nicklist.h @@ -59,6 +62,7 @@ include/irssi/src/fe-common/core/ include/irssi/src/fe-common/core/chat-completion.h include/irssi/src/fe-common/core/command-history.h include/irssi/src/fe-common/core/completion.h +include/irssi/src/fe-common/core/fe-capsicum.h include/irssi/src/fe-common/core/fe-channels.h include/irssi/src/fe-common/core/fe-common-core.h include/irssi/src/fe-common/core/fe-core-commands.h @@ -66,6 +70,7 @@ include/irssi/src/fe-common/core/fe-exec.h include/irssi/src/fe-common/core/fe-messages.h include/irssi/src/fe-common/core/fe-queries.h include/irssi/src/fe-common/core/fe-recode.h +include/irssi/src/fe-common/core/fe-settings.h include/irssi/src/fe-common/core/fe-tls.h include/irssi/src/fe-common/core/fe-windows.h include/irssi/src/fe-common/core/formats.h @@ -155,6 +160,7 @@ libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Irssi/UI/ libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Irssi/UI/UI.so @man man/man1/irssi.1 share/doc/irssi/ +share/doc/irssi/capsicum.txt share/doc/irssi/design.txt share/doc/irssi/faq.html share/doc/irssi/faq.txt @@ -164,6 +170,7 @@ share/doc/irssi/perl.txt share/doc/irssi/signals.txt share/doc/irssi/special_vars.txt share/doc/irssi/startup-HOWTO.html +share/doc/irssi/startup-HOWTO.txt share/examples/irssi/ @sample ${SYSCONFDIR}/irssi/ share/examples/irssi/irssi.conf