From 550124e459ae1be19a60ab540322e8f71ec81a3d Mon Sep 17 00:00:00 2001 From: martynas Date: Thu, 10 Sep 2009 21:31:42 +0000 Subject: [PATCH] update to irssi-0.8.14; api compatible with 0.8.13 - doesn't affect plugins. from Simon Kuhnle. maintainer timeout ok sthen@ --- net/irssi/Makefile | 5 ++--- net/irssi/distinfo | 10 +++++----- .../patch-src_fe-common_core_fe-core-commands_c | 14 ++++---------- .../patches/patch-src_fe-common_irc_fe-events_c | 15 --------------- 4 files changed, 11 insertions(+), 33 deletions(-) diff --git a/net/irssi/Makefile b/net/irssi/Makefile index 7336705fdb2..37b54f6ebd3 100644 --- a/net/irssi/Makefile +++ b/net/irssi/Makefile @@ -1,11 +1,10 @@ -# $OpenBSD: Makefile,v 1.41 2009/06/23 09:26:02 sthen Exp $ +# $OpenBSD: Makefile,v 1.42 2009/09/10 21:31:42 martynas Exp $ SHARED_ONLY= Yes COMMENT= modular IRC client with many features (ipv6,socks,proxy) -DISTNAME= irssi-0.8.13 -PKGNAME= ${DISTNAME}p1 +DISTNAME= irssi-0.8.14 CATEGORIES= net HOMEPAGE= http://www.irssi.org/ diff --git a/net/irssi/distinfo b/net/irssi/distinfo index ba74c676b1c..cff30817c6d 100644 --- a/net/irssi/distinfo +++ b/net/irssi/distinfo @@ -1,5 +1,5 @@ -MD5 (irssi-0.8.13.tar.gz) = Im8ZRXaJX/MHXBZFI4BtBg== -RMD160 (irssi-0.8.13.tar.gz) = jVZRDPXUAocS2JjGLHnwcuE3264= -SHA1 (irssi-0.8.13.tar.gz) = E2xAfc6Hr0vGrfZXPrzIW+nxahs= -SHA256 (irssi-0.8.13.tar.gz) = l+/MFK1t+buADS7mi5Bc3fRDXNsU5/sR+bnxN46lecc= -SIZE (irssi-0.8.13.tar.gz) = 1351528 +MD5 (irssi-0.8.14.tar.gz) = fZQ39TIJphr0/kycVSj/pw== +RMD160 (irssi-0.8.14.tar.gz) = MDaiJJ+gBumMjrMSEZiICPXB1DM= +SHA1 (irssi-0.8.14.tar.gz) = EhxD9KLgBK2cB19+Y/8flXka1cU= +SHA256 (irssi-0.8.14.tar.gz) = Mo03li7zupGiCm+INLFSsmfWkbiW4KA0cfBpefYm7QI= +SIZE (irssi-0.8.14.tar.gz) = 1356130 diff --git a/net/irssi/patches/patch-src_fe-common_core_fe-core-commands_c b/net/irssi/patches/patch-src_fe-common_core_fe-core-commands_c index 68e0abb0e89..5c7fdaf47d7 100644 --- a/net/irssi/patches/patch-src_fe-common_core_fe-core-commands_c +++ b/net/irssi/patches/patch-src_fe-common_core_fe-core-commands_c @@ -1,16 +1,10 @@ -$OpenBSD: patch-src_fe-common_core_fe-core-commands_c,v 1.1 2009/06/23 09:26:02 sthen Exp $ +$OpenBSD: patch-src_fe-common_core_fe-core-commands_c,v 1.2 2009/09/10 21:31:42 martynas Exp $ Don't assume the size of time_t. ---- src/fe-common/core/fe-core-commands.c.orig Mon Jun 22 22:12:56 2009 -+++ src/fe-common/core/fe-core-commands.c Mon Jun 22 22:13:36 2009 -@@ -172,12 +172,12 @@ static void cmd_nick(const char *data, SERVER_REC *ser - /* SYNTAX: UPTIME */ - static void cmd_uptime(char *data) - { -- time_t uptime; -+ long uptime; - +--- src/fe-common/core/fe-core-commands.c.orig Tue Jul 21 20:47:59 2009 ++++ src/fe-common/core/fe-core-commands.c Sat Aug 8 09:10:46 2009 +@@ -177,7 +177,7 @@ static void cmd_uptime(char *data) g_return_if_fail(data != NULL); if (*data == '\0') { diff --git a/net/irssi/patches/patch-src_fe-common_irc_fe-events_c b/net/irssi/patches/patch-src_fe-common_irc_fe-events_c index ded97fa7a28..e69de29bb2d 100644 --- a/net/irssi/patches/patch-src_fe-common_irc_fe-events_c +++ b/net/irssi/patches/patch-src_fe-common_irc_fe-events_c @@ -1,15 +0,0 @@ -$OpenBSD: patch-src_fe-common_irc_fe-events_c,v 1.1 2009/06/22 00:22:57 sthen Exp $ - -from SVN r5068; fix out of bounds access in event_wallops(). - ---- src/fe-common/irc/fe-events.c.orig Sun Jun 21 23:32:51 2009 -+++ src/fe-common/irc/fe-events.c Sun Jun 21 23:33:22 2009 -@@ -298,7 +298,7 @@ static void event_wallops(IRC_SERVER_REC *server, cons - - tmp = g_strdup(data+8); - len = strlen(tmp); -- if (tmp[len-1] == 1) tmp[len-1] = '\0'; -+ if (len >= 1 && tmp[len-1] == 1) tmp[len-1] = '\0'; - printformat(server, NULL, MSGLEVEL_WALLOPS, IRCTXT_ACTION_WALLOPS, nick, tmp); - g_free(tmp); - }