From owner-svn-ports-head@freebsd.org Fri Apr 8 05:24:41 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 88299B06FDB; Fri, 8 Apr 2016 05:24:41 +0000 (UTC) (envelope-from philip@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4AC94113C; Fri, 8 Apr 2016 05:24:41 +0000 (UTC) (envelope-from philip@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u385OePV079263; Fri, 8 Apr 2016 05:24:40 GMT (envelope-from philip@FreeBSD.org) Received: (from philip@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u385OeSr079258; Fri, 8 Apr 2016 05:24:40 GMT (envelope-from philip@FreeBSD.org) Message-Id: <201604080524.u385OeSr079258@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: philip set sender to philip@FreeBSD.org using -f From: Philip Paeps Date: Fri, 8 Apr 2016 05:24:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r412719 - in head/irc/irssi-otr: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Apr 2016 05:24:41 -0000 Author: philip Date: Fri Apr 8 05:24:40 2016 New Revision: 412719 URL: https://svnweb.freebsd.org/changeset/ports/412719 Log: o Update to 1.0.1 o Include patches to work with irssi versions >= 0.8.17 Approved by: ashish (maintainer) Added: head/irc/irssi-otr/files/patch-src_module.c (contents, props changed) head/irc/irssi-otr/files/patch-src_otr-ops.c (contents, props changed) Deleted: head/irc/irssi-otr/files/patch-configure.ac Modified: head/irc/irssi-otr/Makefile head/irc/irssi-otr/distinfo Modified: head/irc/irssi-otr/Makefile ============================================================================== --- head/irc/irssi-otr/Makefile Fri Apr 8 04:44:48 2016 (r412718) +++ head/irc/irssi-otr/Makefile Fri Apr 8 05:24:40 2016 (r412719) @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= irssi-otr -PORTVERSION= 1.0.0 +PORTVERSION= 1.0.1 DISTVERSIONPREFIX= v -PORTREVISION= 4 CATEGORIES= irc MAINTAINER= ashish@FreeBSD.org @@ -26,7 +25,7 @@ USE_GITHUB= yes GH_ACCOUNT= cryptodotis GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-libotr-inc-prefix=${LOCALBASE}/include +CONFIGURE_ARGS= --with-libotr-inc-prefix=${LOCALBASE}/include --with-irssi-module-dir=${LOCALBASE}/lib/irssi/modules INSTALL_TARGET= install-strip PLIST_FILES= lib/irssi/modules/libotr.so \ Modified: head/irc/irssi-otr/distinfo ============================================================================== --- head/irc/irssi-otr/distinfo Fri Apr 8 04:44:48 2016 (r412718) +++ head/irc/irssi-otr/distinfo Fri Apr 8 05:24:40 2016 (r412719) @@ -1,2 +1,2 @@ -SHA256 (cryptodotis-irssi-otr-v1.0.0_GH0.tar.gz) = bad09a2853ea6fb1a7af42c8f15868fd3ce45f973be90c78944ddf04f8ab517e -SIZE (cryptodotis-irssi-otr-v1.0.0_GH0.tar.gz) = 39481 +SHA256 (cryptodotis-irssi-otr-v1.0.1_GH0.tar.gz) = 3b6baa39adab360cd4f6519b6d4a53db4eee7b070d6a9e716f1655245d3ca89d +SIZE (cryptodotis-irssi-otr-v1.0.1_GH0.tar.gz) = 40334 Added: head/irc/irssi-otr/files/patch-src_module.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/irc/irssi-otr/files/patch-src_module.c Fri Apr 8 05:24:40 2016 (r412719) @@ -0,0 +1,53 @@ +--- src/module.c 2014-02-12 18:50:45.000000000 -0600 ++++ src/module.c 2016-04-07 17:35:00.000000000 +0530 +@@ -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 @@ static void sig_server_sendmsg(SERVER_REC *server, const char *target, + /* + * 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 *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 char *msg, + + if (!new_msg) { + /* This message was not OTR */ +- signal_continue(4, server, msg, nick, address); ++#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 +371,13 @@ void otr_deinit(void) + + theme_unregister(); + } ++ ++#ifdef IRSSI_ABI_VERSION ++/* ++ * irssi abicheck() ++ */ ++void otr_abicheck(int *version) ++{ ++ *version = IRSSI_ABI_VERSION; ++} ++#endif + Added: head/irc/irssi-otr/files/patch-src_otr-ops.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/irc/irssi-otr/files/patch-src_otr-ops.c Fri Apr 8 05:24:40 2016 (r412719) @@ -0,0 +1,25 @@ +--- src/otr-ops.c 2014-02-12 18:50:45.000000000 -0600 ++++ src/otr-ops.c 2016-04-07 17:35:00.000000000 +0530 +@@ -21,6 +21,7 @@ + + #include "key.h" + #include "module.h" ++#include "irssi-version.h" + + static OtrlPolicy OTR_DEFAULT_POLICY = + OTRL_POLICY_MANUAL | OTRL_POLICY_WHITESPACE_START_AKE; +@@ -206,8 +207,13 @@ static void ops_handle_msg_event(void *opdata, OtrlMessageEvent msg_event, + * submit a patch or email me a better way. + */ + signal_remove("message private", (SIGNAL_FUNC) sig_message_private); +- signal_emit("message private", 4, server, message, username, ++#if IRSSI_VERSION_DATE > 20141206 ++ signal_emit("message private", 5, server, message, username, server->nick, + IRSSI_CONN_ADDR(server)); ++#else ++ signal_emit("message private", 4, server, message, username, ++ IRSSI_CONN_ADDR(server)); ++#endif + signal_add_first("message private", (SIGNAL_FUNC) sig_message_private); + break; + case OTRL_MSGEVENT_RCVDMSG_UNRECOGNIZED: