Re: [UPDATE] net/irssi 0.8.18

2016-03-19 Thread Joerg Jung 
On Sun, Mar 13, 2016 at 11:07:34PM +0100, Joerg Jung wrote:
> On Sun, Mar 13, 2016 at 03:02:24PM +, Stuart Henderson wrote:
> > On 2016/03/12 19:18, Florian Stinglmayr wrote:
> > > This is also fixed in the patch below for irssi-otr.
> > > 
> > > Also +1 for the irssi patch.
> > 
> > irssi-icb, irssi-otr: fixes committed.
> > 
> > irssi-xmpp: jung, could you take a look at this please?
> 
> Unfortunately I will be very busy this week :( 
> I will try to look into this by the end of the week.
> 
> > https://github.com/cdidier/irssi-xmpp adds the ABI check,
> > it looks like it will also be affected by the privmsg-to-self
> > API change.

Please find below a diff which switches irssi-xmpp to the most recent
GH_COMMIT as of today, which includes a lot of fixes. config_mk patch is
no longer needed with this and as mentioned above ABI check is also
already in.  I also queried upstream for a new release (last 0.52 was
back in 2012).

I tested this with both irssi-0.8.17 and 0.8.18 (using the diff posted
earlier in this thread) and it seems to work fine.  

What is the "privmsg-to-self" API change issue about exactly?  /query or
/msg to my own /resource seems to work and does not crash or
something.

Though, I'm unsure about the DISTNAME and chosen a Debian style name,
better suggestions are welcome.

Other than that, OKs?

Regards,
Joerg


Index: Makefile
===
RCS file: /cvs/ports/net/irssi-xmpp/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile29 Dec 2015 22:45:48 -  1.6
+++ Makefile17 Mar 2016 21:52:15 -
@@ -4,8 +4,11 @@ SHARED_ONLY=   Yes
 
 COMMENT=   XMPP plugin for irssi
 
-DISTNAME=  irssi-xmpp-0.52
-REVISION = 3
+DISTNAME=  irssi-xmpp-0.52+git20160317
+
+GH_ACCOUNT =   cdidier
+GH_PROJECT =   irssi-xmpp
+GH_COMMIT =55cc27bd8d60a5c835050f654e80deb1afe36986
 
 CATEGORIES=net
 
@@ -17,8 +20,6 @@ MAINTAINER =  Joerg Jung

Re: [UPDATE] net/irssi 0.8.18

2016-03-19 Thread Stuart Henderson 
On 2016/03/17 23:11, Joerg Jung wrote:
> Please find below a diff which switches irssi-xmpp to the most recent
> GH_COMMIT as of today, which includes a lot of fixes. config_mk patch is
> no longer needed with this and as mentioned above ABI check is also
> already in.  I also queried upstream for a new release (last 0.52 was
> back in 2012).
> 
> I tested this with both irssi-0.8.17 and 0.8.18 (using the diff posted
> earlier in this thread) and it seems to work fine.  
> 
> What is the "privmsg-to-self" API change issue about exactly?  /query or
> /msg to my own /resource seems to work and does not crash or
> something.

I haven't used XMPP, but before irssi-icb was fixed, "/msg sthen"
was printing an invalid username when the message was displayed in
the window on my screen. (Maybe the actual behaviour depends on
how malloc.conf is set and what else is in memory nearby).

This is how the API change is described in irssi's NEWS file,

* The signature of "message private" has been changed to
  5: server, message, nick, address, target
  in order to support "self messages". Module authors should
  implement this change if they are using this signal.

Previously it was "4: server, message, nick, address".

The minimal change that was done in irssi-icb was to s/4/5/ and add
server->nick, but actually looking at the bottom of irssi-xmpp TODO
I think that this irssi change is exactly what irssi-xmpp are
asking for in order to solve a problem they had.

> Though, I'm unsure about the DISTNAME and chosen a Debian style name,
> better suggestions are welcome.

packages-specs(7) has information about this, in this case
I think something like this would work:

DISTNAME=   irssi-xmpp-0.52pl20160317

> Other than that, OKs?

I think I'd probably commit with the DISTNAME change for now, I'm OK
with that and it should let us move on updating irssi. But also ask
upstream what they suggest about the signature change.

Re: [UPDATE] net/irssi 0.8.18

2016-03-14 Thread Nigel Taylor 
On 03/14/16 01:54, Michael McConville wrote:
> Stuart Henderson wrote:
>> On 2016/03/12 19:18, Florian Stinglmayr wrote:
>>> This is also fixed in the patch below for irssi-otr.
>>>
>>> Also +1 for the irssi patch.
>>
>> irssi-icb, irssi-otr: fixes committed.
> 
> I'm getting the below failure in my bulk build. It's plausible that
> everyone who's tested already has irssi installed, which would explain
> why I'm the first one to run into this. Or it could just be an anomaly
> on my end.
> 
> I only looked briefly, but it seems that unless configure.ac is patched,
> net/irssi has to be in BUILD_DEPENDS rather than RUN_DEPENDS.
> 
> 
 Building on localhost under net/irssi-icb
>BDEPENDS = 
> [devel/autoconf/2.69;devel/libtool;devel/automake/1.15;devel/metaauto]
>DIST = [net/irssi-icb:irssi-icb-0.16pre20160307.tar.gz]
>FULLPKGNAME = irssi-icb-0.16pre20160307
>RDEPENDS = [net/irssi]
> (Junk lock obtained for localhost at 1457919882)
 Running depends in net/irssi-icb at 1457919882
>last junk was in games/0ad/base
> /usr/sbin/pkg_add -aI -Dunsigned -rqU -Dupdate -Dupdatedepends -Dinstalled 
> -Drepair autoconf-2.69p1 automake-1.15 libtool-2.4.2p0
> was: /usr/sbin/pkg_add -aI -Dunsigned -rqU -Dupdate -Dupdatedepends 
> -Dinstalled -Drepair autoconf-2.69p1 automake-1.15 libtool-2.4.2p0 
> metaauto-1.0p1
> /usr/sbin/pkg_add -aI -Dunsigned -rqU -Dupdate -Dupdatedepends -Dinstalled 
> -Drepair autoconf-2.69p1 automake-1.15 libtool-2.4.2p0
 Running show-prepare-results in net/irssi-icb at 1457919885
> ===> net/irssi-icb
> ===> irssi-icb-0.16pre20160307 depends on: metaauto-* -> metaauto-1.0p1
> ===> irssi-icb-0.16pre20160307 depends on: autoconf-2.69 -> autoconf-2.69p1
> ===> irssi-icb-0.16pre20160307 depends on: automake->=1.15,<1.16 -> 
> automake-1.15
> ===> irssi-icb-0.16pre20160307 depends on: libtool-* -> libtool-2.4.2p0
> autoconf-2.69p1
> automake-1.15
> libtool-2.4.2p0
> metaauto-1.0p1
> (Junk lock released for localhost at 1457919886)
> distfiles size=22893
 Running build in net/irssi-icb at 1457919886
> ===> net/irssi-icb
> ===>  Checking files for irssi-icb-0.16pre20160307
> `/mnt/big/ports/distfiles/irssi-icb-0.16pre20160307.tar.gz' is up to date.
> ===>  Extracting for irssi-icb-0.16pre20160307
> ===>  Patching for irssi-icb-0.16pre20160307
> cd 
> /home/dpb-wrk/irssi-icb-0.16pre20160307/irssi-icb-8f7060835355d5f620a5d3b75a45336ab8efefd9
>  && AUTOCONF_VERSION=2.69  AUTOMAKE_VERSION=1.15 sh ./autorun.sh
> configure.ac:12: installing './ar-lib'
> configure.ac:10: installing './compile'
> configure.ac:13: installing './config.guess'
> configure.ac:13: installing './config.sub'
> configure.ac:6: installing './install-sh'
> configure.ac:6: installing './missing'
> src/core/Makefile.am: installing './depcomp'
> ===>  Configuring for irssi-icb-0.16pre20160307
> Using /home/dpb-wrk/irssi-icb-0.16pre20160307/config.site (generated)
> configure: WARNING: unrecognized options: --disable-gtk-doc
> configure: loading site script 
> /home/dpb-wrk/irssi-icb-0.16pre20160307/config.site
> checking for a BSD-compatible install... 
> /home/dpb-wrk/irssi-icb-0.16pre20160307/bin/install -c 
> checking whether build environment is sane... yes
> checking for a thread-safe mkdir -p... mkdir -p
> checking for gawk... (cached) awk
> checking whether make sets $(MAKE)... (cached) yes
> checking whether make supports nested variables... yes
> checking whether to enable maintainer-specific portions of Makefiles... no
> checking for gcc... cc
> checking whether the C compiler works... yes
> checking for C compiler default output file name... a.out
> checking for suffix of executables... 
> checking whether we are cross compiling... no
> checking for suffix of object files... (cached) o
> checking whether we are using the GNU C compiler... (cached) yes
> checking whether cc accepts -g... (cached) yes
> checking for cc option to accept ISO C89... none needed
> checking whether cc understands -c and -o together... yes
> checking for style of include used by make... GNU
> checking dependency style of cc... gcc3
> checking how to run the C preprocessor... cc -E
> checking for ar... (cached) ar
> checking the archiver (ar) interface... ar
> checking build system type... x86_64-unknown-openbsd5.9
> checking host system type... x86_64-unknown-openbsd5.9
> checking how to print strings... print -r
> checking for a sed that does not truncate output... (cached) /usr/bin/sed
> checking for grep that handles long lines and -e... (cached) /usr/bin/grep
> checking for egrep... (cached) /usr/bin/egrep
> checking for fgrep... (cached) /usr/bin/fgrep
> checking for ld used by cc... /usr/bin/ld
> checking if the linker (/usr/bin/ld) is GNU ld... yes
> checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
> checking the name lister (/usr/bin/nm -B) interface... BSD nm
> checking whether ln -s works... yes
> checking the maximum length of command line arguments... (cached) 131072
>

Re: [UPDATE] net/irssi 0.8.18

2016-03-13 Thread Michael McConville 
Stuart Henderson wrote:
> On 2016/03/12 19:18, Florian Stinglmayr wrote:
> > This is also fixed in the patch below for irssi-otr.
> > 
> > Also +1 for the irssi patch.
> 
> irssi-icb, irssi-otr: fixes committed.

I'm getting the below failure in my bulk build. It's plausible that
everyone who's tested already has irssi installed, which would explain
why I'm the first one to run into this. Or it could just be an anomaly
on my end.

I only looked briefly, but it seems that unless configure.ac is patched,
net/irssi has to be in BUILD_DEPENDS rather than RUN_DEPENDS.


>>> Building on localhost under net/irssi-icb
 BDEPENDS = 
[devel/autoconf/2.69;devel/libtool;devel/automake/1.15;devel/metaauto]
 DIST = [net/irssi-icb:irssi-icb-0.16pre20160307.tar.gz]
 FULLPKGNAME = irssi-icb-0.16pre20160307
 RDEPENDS = [net/irssi]
(Junk lock obtained for localhost at 1457919882)
>>> Running depends in net/irssi-icb at 1457919882
   last junk was in games/0ad/base
/usr/sbin/pkg_add -aI -Dunsigned -rqU -Dupdate -Dupdatedepends -Dinstalled 
-Drepair autoconf-2.69p1 automake-1.15 libtool-2.4.2p0
was: /usr/sbin/pkg_add -aI -Dunsigned -rqU -Dupdate -Dupdatedepends -Dinstalled 
-Drepair autoconf-2.69p1 automake-1.15 libtool-2.4.2p0 metaauto-1.0p1
/usr/sbin/pkg_add -aI -Dunsigned -rqU -Dupdate -Dupdatedepends -Dinstalled 
-Drepair autoconf-2.69p1 automake-1.15 libtool-2.4.2p0
>>> Running show-prepare-results in net/irssi-icb at 1457919885
===> net/irssi-icb
===> irssi-icb-0.16pre20160307 depends on: metaauto-* -> metaauto-1.0p1
===> irssi-icb-0.16pre20160307 depends on: autoconf-2.69 -> autoconf-2.69p1
===> irssi-icb-0.16pre20160307 depends on: automake->=1.15,<1.16 -> 
automake-1.15
===> irssi-icb-0.16pre20160307 depends on: libtool-* -> libtool-2.4.2p0
autoconf-2.69p1
automake-1.15
libtool-2.4.2p0
metaauto-1.0p1
(Junk lock released for localhost at 1457919886)
distfiles size=22893
>>> Running build in net/irssi-icb at 1457919886
===> net/irssi-icb
===>  Checking files for irssi-icb-0.16pre20160307
`/mnt/big/ports/distfiles/irssi-icb-0.16pre20160307.tar.gz' is up to date.
===>  Extracting for irssi-icb-0.16pre20160307
===>  Patching for irssi-icb-0.16pre20160307
cd 
/home/dpb-wrk/irssi-icb-0.16pre20160307/irssi-icb-8f7060835355d5f620a5d3b75a45336ab8efefd9
 && AUTOCONF_VERSION=2.69  AUTOMAKE_VERSION=1.15 sh ./autorun.sh
configure.ac:12: installing './ar-lib'
configure.ac:10: installing './compile'
configure.ac:13: installing './config.guess'
configure.ac:13: installing './config.sub'
configure.ac:6: installing './install-sh'
configure.ac:6: installing './missing'
src/core/Makefile.am: installing './depcomp'
===>  Configuring for irssi-icb-0.16pre20160307
Using /home/dpb-wrk/irssi-icb-0.16pre20160307/config.site (generated)
configure: WARNING: unrecognized options: --disable-gtk-doc
configure: loading site script 
/home/dpb-wrk/irssi-icb-0.16pre20160307/config.site
checking for a BSD-compatible install... 
/home/dpb-wrk/irssi-icb-0.16pre20160307/bin/install -c 
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... mkdir -p
checking for gawk... (cached) awk
checking whether make sets $(MAKE)... (cached) yes
checking whether make supports nested variables... yes
checking whether to enable maintainer-specific portions of Makefiles... no
checking for gcc... cc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables... 
checking whether we are cross compiling... no
checking for suffix of object files... (cached) o
checking whether we are using the GNU C compiler... (cached) yes
checking whether cc accepts -g... (cached) yes
checking for cc option to accept ISO C89... none needed
checking whether cc understands -c and -o together... yes
checking for style of include used by make... GNU
checking dependency style of cc... gcc3
checking how to run the C preprocessor... cc -E
checking for ar... (cached) ar
checking the archiver (ar) interface... ar
checking build system type... x86_64-unknown-openbsd5.9
checking host system type... x86_64-unknown-openbsd5.9
checking how to print strings... print -r
checking for a sed that does not truncate output... (cached) /usr/bin/sed
checking for grep that handles long lines and -e... (cached) /usr/bin/grep
checking for egrep... (cached) /usr/bin/egrep
checking for fgrep... (cached) /usr/bin/fgrep
checking for ld used by cc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... (cached) 131072
checking whether the shell understands some XSI constructs... yes
checking whether the shell understands "+="... no
checking how to convert x86_64-unknown-openbsd5.9 file names to 
x86_64-unknown-openbsd5.9 format...

Re: [UPDATE] net/irssi 0.8.18

2016-03-13 Thread Stuart Henderson 
On 2016/03/12 19:18, Florian Stinglmayr wrote:
> This is also fixed in the patch below for irssi-otr.
> 
> Also +1 for the irssi patch.

irssi-icb, irssi-otr: fixes committed.

irssi-xmpp: jung, could you take a look at this please?
https://github.com/cdidier/irssi-xmpp adds the ABI check,
it looks like it will also be affected by the privmsg-to-self
API change.

irssi-silc: *UNTESTED* diff inline below. if anyone is still using
this, please test in conjunction with the irssi update.

Index: Makefile
===
RCS file: /cvs/ports/net/irssi-silc/Makefile,v
retrieving revision 1.34
diff -u -p -r1.34 Makefile
--- Makefile6 Jan 2016 17:01:54 -   1.34
+++ Makefile13 Mar 2016 14:59:48 -
@@ -5,7 +5,7 @@ SHARED_ONLY=Yes
 COMMENT=   SILC plugin for irssi
 
 DISTNAME=  irssi-silc-1.1.8
-REVISION=  7
+REVISION=  8
 
 CATEGORIES=net
 
Index: patches/patch-apps_irssi_src_fe-common_silc_fe-common-silc_c
===
RCS file: 
/cvs/ports/net/irssi-silc/patches/patch-apps_irssi_src_fe-common_silc_fe-common-silc_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-apps_irssi_src_fe-common_silc_fe-common-silc_c
--- patches/patch-apps_irssi_src_fe-common_silc_fe-common-silc_c18 Nov 
2007 17:36:18 -  1.1
+++ patches/patch-apps_irssi_src_fe-common_silc_fe-common-silc_c13 Mar 
2016 14:59:48 -
@@ -1,6 +1,6 @@
 $OpenBSD: patch-apps_irssi_src_fe-common_silc_fe-common-silc_c,v 1.1 
2007/11/18 17:36:18 martynas Exp $
 apps/irssi/src/fe-common/silc/fe-common-silc.c.origSun May 20 
19:40:29 2007
-+++ apps/irssi/src/fe-common/silc/fe-common-silc.c Wed Nov 14 00:06:11 2007
+--- apps/irssi/src/fe-common/silc/fe-common-silc.c.origSat May 23 
01:08:57 2009
 apps/irssi/src/fe-common/silc/fe-common-silc.c Sun Mar 13 14:54:45 2016
 @@ -42,6 +42,7 @@ static void silc_init(void)
fe_silc_messages_init();
fe_silc_queries_init();
@@ -9,3 +9,15 @@ $OpenBSD: patch-apps_irssi_src_fe-common
  }
  
  void fe_common_silc_init(void)
+@@ -71,3 +72,11 @@ void fe_silc_deinit(void)
+ {
+   fe_common_silc_deinit();
+ }
++
++#ifdef IRSSI_ABI_VERSION
++void
++silc_core_abicheck(int * version)
++{
++  *version = IRSSI_ABI_VERSION;
++}
++#endif
Index: patches/patch-apps_irssi_src_silc_core_client_ops_c
===
RCS file: 
/cvs/ports/net/irssi-silc/patches/patch-apps_irssi_src_silc_core_client_ops_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-apps_irssi_src_silc_core_client_ops_c
--- patches/patch-apps_irssi_src_silc_core_client_ops_c 31 Jul 2010 12:43:25 
-  1.3
+++ patches/patch-apps_irssi_src_silc_core_client_ops_c 13 Mar 2016 14:59:48 
-
@@ -1,6 +1,6 @@
 $OpenBSD: patch-apps_irssi_src_silc_core_client_ops_c,v 1.3 2010/07/31 
12:43:25 sthen Exp $
 apps/irssi/src/silc/core/client_ops.c.orig Fri May 22 20:11:25 2009
-+++ apps/irssi/src/silc/core/client_ops.c  Thu Jul 29 22:42:52 2010
+--- apps/irssi/src/silc/core/client_ops.c.orig Sat May 23 01:11:25 2009
 apps/irssi/src/silc/core/client_ops.c  Sun Mar 13 14:59:18 2016
 @@ -262,10 +262,11 @@ int verify_message_signature(SilcClientEntry sender,
  sizeof(sender->fingerprint));
if (strcmp(fingerprint, fingerprint2)) {
@@ -15,7 +15,39 @@ $OpenBSD: patch-apps_irssi_src_silc_core
}
silc_free(fingerprint2);
  }
-@@ -1069,6 +1070,8 @@ void silc_notify(SilcClient client, SilcClientConnecti
+@@ -663,9 +664,15 @@ void silc_private_message(SilcClient client, SilcClien
+ sender->nickname[0] ? sender->nickname : "[]",
+ sender->username[0] ? userhost : NULL, verified);
+   else
++#if IRSSI_VERSION_DATE > 20141206
++signal_emit("message private", 5, server, cp,
++sender->nickname[0] ? sender->nickname : "[]",
++sender->username[0] ? userhost : NULL, server->nick);
++#else
+ signal_emit("message private", 4, server, cp,
+ sender->nickname[0] ? sender->nickname : "[]",
+ sender->username[0] ? userhost : NULL);
++#endif
+   silc_free(dm);
+   return;
+ }
+@@ -675,9 +682,15 @@ void silc_private_message(SilcClient client, SilcClien
+   sender->nickname[0] ? sender->nickname : "[]",
+   sender->username[0] ? userhost : NULL, verified);
+ else
++#if IRSSI_VERSION_DATE > 20141206
++  signal_emit("message private", 5, server, cp,
++  sender->nickname[0] ? sender->nickname : "[]",
++  sender->username[0] ? userhost : NULL, server->nick);
++#else
+   signal_emit("message private", 4, server, message,
+   sender->nickname[0] ? sender->nickname : "[]",
+   sender->username[0] ? userhost : NULL);
++#endif
+   }
+ }
+ 
+@@ -1069,6 +1082,8 @@ void

Re: [UPDATE] net/irssi 0.8.18

2016-03-12 Thread Florian Stinglmayr 
On Sun, Mar 06, 2016 at 01:48:41PM +, Stuart Henderson wrote:
> This is due to needing a version check adding, I've committed the fix
> for this to irssi-icb; the other modules will need similar. Mentioned
> offlist but irssi-otr has https://github.com/cryptodotis/irssi-otr/pull/60,
> if maintainers of any other modules would like to look for similar or
> write it themselves that'd be nice :)
>

Upstream is AWOL so a patch is attached. Can be removed if upstream
merges and releases a new version.

> There is another problem which affects at least irssi-otr and irssi-icb
> (and I suspect the others too), sending yourself a message fails like this
> (this is mentioned in https://github.com/cryptodotis/irssi-otr/pull/58)
>
> 13:44 -!- Irssi: critical privmsg_get_query: assertion 'nick != NULL' failed
> 13:44 -!- Irssi: critical query_find: assertion 'nick != NULL' failed
> 13:44 [msg()] test
>

This is also fixed in the patch below for irssi-otr.

Also +1 for the irssi patch.

Regards,
Florian

Index: Makefile
===
RCS file: /cvs/ports/net/irssi-otr/Makefile,v
retrieving revision 1.5
diff -u -p -u -r1.5 Makefile
--- Makefile29 Dec 2015 22:45:48 -  1.5
+++ Makefile12 Mar 2016 18:16:13 -
@@ -5,7 +5,7 @@ SHARED_ONLY =   Yes
 COMMENT =  OTR (off the record) encryption support for irssi
 
 V =1.0.1
-REVISION = 0
+REVISION = 1
 DISTNAME = irssi-otr-$V
 
 CATEGORIES =   net security
Index: patches/patch-src_module_c
===
RCS file: patches/patch-src_module_c
diff -N patches/patch-src_module_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_module_c  12 Mar 2016 18:16:13 -
@@ -0,0 +1,51 @@
+$OpenBSD$
+--- 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

Re: [UPDATE] net/irssi 0.8.18

2016-03-06 Thread Stuart Henderson 
On 2016/03/06 13:29, Stuart Henderson wrote:
> On 2016/03/06 14:13, viq wrote:
> > https://raw.githubusercontent.com/irssi/irssi/0.8.18/NEWS
> > 
> > Lightly tested on amd64
> > 
> > Please test it with things running with or on top of irssi, like irssi-
> > xmpp and irssi-icb
> 
> Same problem I mentioned in TODO on openbsd-wip:
> 
> irssi:/usr/local/lib/irssi/modules/libfe_icb.so: undefined symbol 
> 'icb_split_free'
> irssi:/usr/local/lib/irssi/modules/libfe_icb.so: undefined symbol 
> 'icb_command'
> irssi:/usr/local/lib/irssi/modules/libfe_icb.so: undefined symbol 'icb_split'
> irssi:/usr/local/lib/irssi/modules/libfe_icb.so: undefined symbol 
> 'icb_nicklist_insert'
> 

This is due to needing a version check adding, I've committed the fix
for this to irssi-icb; the other modules will need similar. Mentioned
offlist but irssi-otr has https://github.com/cryptodotis/irssi-otr/pull/60,
if maintainers of any other modules would like to look for similar or
write it themselves that'd be nice :)

There is another problem which affects at least irssi-otr and irssi-icb
(and I suspect the others too), sending yourself a message fails like this
(this is mentioned in https://github.com/cryptodotis/irssi-otr/pull/58)

13:44 -!- Irssi: critical privmsg_get_query: assertion 'nick != NULL' failed
13:44 -!- Irssi: critical query_find: assertion 'nick != NULL' failed
13:44 [msg()] test

Please also re-add the PKGSPEC line.

Re: [UPDATE] net/irssi 0.8.18

2016-03-06 Thread Stuart Henderson 
On 2016/03/06 14:13, viq wrote:
> https://raw.githubusercontent.com/irssi/irssi/0.8.18/NEWS
> 
> Lightly tested on amd64
> 
> Please test it with things running with or on top of irssi, like irssi-
> xmpp and irssi-icb

Same problem I mentioned in TODO on openbsd-wip:

irssi:/usr/local/lib/irssi/modules/libfe_icb.so: undefined symbol 
'icb_split_free'
irssi:/usr/local/lib/irssi/modules/libfe_icb.so: undefined symbol 'icb_command'
irssi:/usr/local/lib/irssi/modules/libfe_icb.so: undefined symbol 'icb_split'
irssi:/usr/local/lib/irssi/modules/libfe_icb.so: undefined symbol 
'icb_nicklist_insert'

[UPDATE] net/irssi 0.8.18

2016-03-06 Thread viq 
https://raw.githubusercontent.com/irssi/irssi/0.8.18/NEWS

Lightly tested on amd64

Please test it with things running with or on top of irssi, like irssi-
xmpp and irssi-icb
-- 
viq 
? TODO
Index: Makefile
===
RCS file: /cvs/ports/net/irssi/Makefile,v
retrieving revision 1.61
diff -u -p -u -d -r1.61 Makefile
--- Makefile	29 Dec 2015 22:54:49 -	1.61
+++ Makefile	6 Mar 2016 13:07:12 -
@@ -4,11 +4,8 @@ SHARED_ONLY =	Yes
 
 COMMENT =	modular IRC client with many features (ipv6,socks,proxy)
 
-V =		0.8.17
-DISTNAME =	irssi-$V
-PKGSPEC =	irssi-=$V
-
-EXTRACT_SUFX =	.tar.bz2
+V =		0.8.18
+DISTNAME =	irssi-${V}
 
 CATEGORIES =	net
 
@@ -22,7 +19,7 @@ PERMIT_PACKAGE_CDROM =	Yes
 WANTLIB += c crypto m ncurses perl pthread ssl util pcre glib-2.0
 WANTLIB += gmodule-2.0
 
-MASTER_SITES =	https://github.com/irssi-import/irssi/releases/download/$V/
+MASTER_SITES =	https://github.com/irssi/irssi/releases/download/${V}/
 
 FLAVORS =	socks
 FLAVOR ?=
Index: distinfo
===
RCS file: /cvs/ports/net/irssi/distinfo,v
retrieving revision 1.20
diff -u -p -u -d -r1.20 distinfo
--- distinfo	29 Dec 2015 22:44:37 -	1.20
+++ distinfo	6 Mar 2016 13:07:12 -
@@ -1,2 +1,2 @@
-SHA256 (irssi-0.8.17.tar.bz2) = PJYAytLt9Y8dAS/rwaC6hEJ0324zHAGp6TVGdwUWaAc=
-SIZE (irssi-0.8.17.tar.bz2) = 1102196
+SHA256 (irssi-0.8.18.tar.gz) = MAQ3hIFbuGSxu2aoLB5lnDJb4KGN3PdvwQGBLjbDnCA=
+SIZE (irssi-0.8.18.tar.gz) = 1563130
Index: patches/patch-docs_irssi_1
===
RCS file: patches/patch-docs_irssi_1
diff -N patches/patch-docs_irssi_1
--- patches/patch-docs_irssi_1	29 Dec 2015 22:44:37 -	1.5
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,39 +0,0 @@
-$OpenBSD: patch-docs_irssi_1,v 1.5 2015/12/29 22:44:37 sthen Exp $
 docs/irssi.1.orig	Sat Oct 11 09:42:36 2014
-+++ docs/irssi.1	Tue Dec 29 16:47:56 2015
-@@ -62,10 +62,10 @@ show a help message.
- .SH SEE ALSO
- .B Irssi
- has been supplied with a huge amount of documentation. Check /help or look
--at the files contained by /usr/share/doc/irssi*
-+at the files contained by ${PREFIX}/share/irssi/* and ${PREFIX}/share/doc/irssi/*
- .SH FILES
- .TP
--.I /etc/irssi.conf
-+.I ${SYSCONFDIR}/irssi/irssi.conf
- Global configuration file
- .TP
- .I ~/.irssi/config
-@@ -80,13 +80,18 @@ Default irssi theme
- .I ~/.irssi/away.log
- Logged messages in away status
- .TP
--.I /usr/share/irssi/help/
--Directory including many help files
-+.I ${PREFIX}/share/irssi/help/
-+.RS .3
-+.I ${PREFIX}/share/doc/irssi/
-+.RE
-+.RS
-+Directories including many help files
-+.RE
- .TP
--.I /usr/share/irssi/scripts/
-+.I ${SYSCONFDIR}/irssi/scripts/
- Global scripts directory
- .TP
--.I /usr/share/irssi/themes/
-+.I ${SYSCONFDIR}/irssi/themes/
- Global themes directory
- .TP
- .I ~/.irssi/scripts/
Index: patches/patch-src_core_settings_c
===
RCS file: /cvs/ports/net/irssi/patches/patch-src_core_settings_c,v
retrieving revision 1.4
diff -u -p -u -d -r1.4 patch-src_core_settings_c
--- patches/patch-src_core_settings_c	23 May 2009 17:47:01 -	1.4
+++ patches/patch-src_core_settings_c	6 Mar 2016 13:07:12 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-src_core_settings_c,v 1.4 2009/05/23 17:47:01 martynas Exp $
 src/core/settings.c.orig	Tue Mar 31 22:50:02 2009
-+++ src/core/settings.c	Sun Apr  5 01:22:16 2009
-@@ -647,7 +647,7 @@ static CONFIG_REC *parse_configfile(const char *fname)
+--- src/core/settings.c.orig	Tue Dec 15 13:06:50 2015
 src/core/settings.c	Tue Dec 29 15:53:22 2015
+@@ -648,7 +648,7 @@ static CONFIG_REC *parse_configfile(const char *fname)
  	else {
  		/* user configuration file not found, use the default one
  		   from sysconfdir */
Index: 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.7
diff -u -p -u -d -r1.7 patch-src_fe-common_core_Makefile_in
--- patches/patch-src_fe-common_core_Makefile_in	29 Dec 2015 22:44:37 -	1.7
+++ patches/patch-src_fe-common_core_Makefile_in	6 Mar 2016 13:07:12 -
@@ -1,6 +1,6 @@
-$OpenBSD: patch-src_fe-common_core_Makefile_in,v 1.7 2015/12/29 22:44:37 sthen Exp $
 src/fe-common/core/Makefile.in.orig	Sat Oct 11 09:58:14 2014
-+++ src/fe-common/core/Makefile.in	Tue Dec 29 16:47:56 2015
+$OpenBSD$
+--- src/fe-common/core/Makefile.in.orig	Tue Dec 15 10:23:01 2015
 src/fe-common/core/Makefile.in	Tue Dec 29 16:11:32 2015
 @@ -365,7 +365,7 @@ AM_CPPFLAGS = \
  	-I$(top_srcdir)/src -I$(top_srcdir)/src/core/ \
  	$(GLIB_CFLAGS) \
Index: patches/patch-src_perl_Makefile_in
===
RCS file: /cvs/ports/net/irssi/patches/patch-src_perl_Makefile_in,v
retrieving revision 1.7
diff -u