diff options
-rw-r--r-- | chat/irssi/Makefile | 6 | ||||
-rw-r--r-- | chat/irssi/Makefile.common | 8 | ||||
-rw-r--r-- | chat/irssi/distinfo | 9 | ||||
-rw-r--r-- | chat/irssi/patches/patch-ab | 19 |
4 files changed, 11 insertions, 31 deletions
diff --git a/chat/irssi/Makefile b/chat/irssi/Makefile index eec5e76c7a2..5b8331dea4a 100644 --- a/chat/irssi/Makefile +++ b/chat/irssi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.52 2009/07/27 12:59:44 obache Exp $ +# $NetBSD: Makefile,v 1.53 2009/07/30 21:58:15 adrianp Exp $ DISTNAME= ${IRSSI_DISTNAME} CATEGORIES= chat @@ -24,10 +24,6 @@ CONFIGURE_ARGS+= --with-terminfo \ --without-ncurses \ --sysconfdir=${PKG_SYSCONFDIR} -.if ${OPSYS} == "Darwin" -INSTALL_UNSTRIPPED=YES -.endif - # Avoid an ICE in gcc2 on sparc64 CONFIGURE_ENV+= F77=${FALSE:Q} diff --git a/chat/irssi/Makefile.common b/chat/irssi/Makefile.common index 7213f5867bf..bf3f159380a 100644 --- a/chat/irssi/Makefile.common +++ b/chat/irssi/Makefile.common @@ -1,8 +1,8 @@ -# $NetBSD: Makefile.common,v 1.9 2009/07/27 12:59:44 obache Exp $ +# $NetBSD: Makefile.common,v 1.10 2009/07/30 21:58:15 adrianp Exp $ # used by chat/irssi-icb/Makefile # Specific distribution information. -IRSSI_VERSION= 0.8.13 +IRSSI_VERSION= 0.8.14 IRSSI_DISTNAME= irssi-${IRSSI_VERSION} IRSSI_EXTRACT_SUFX= .tar.bz2 IRSSI_DISTFILE= ${IRSSI_DISTNAME}${IRSSI_EXTRACT_SUFX} @@ -11,3 +11,7 @@ IRSSI_DISTFILE= ${IRSSI_DISTNAME}${IRSSI_EXTRACT_SUFX} # plugins to compile properly. IRSSI_CONFIG= ${PREFIX}/share/irssi/irssi-config IRSSI_CONFIG_H= ${PREFIX}/include/irssi/irssi-config.h + +.if ${OPSYS} == "Darwin" +INSTALL_UNSTRIPPED=YES +.endif diff --git a/chat/irssi/distinfo b/chat/irssi/distinfo index 30ac3be9232..00e38483778 100644 --- a/chat/irssi/distinfo +++ b/chat/irssi/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.29 2009/07/27 12:59:44 obache Exp $ +$NetBSD: distinfo,v 1.30 2009/07/30 21:58:15 adrianp Exp $ -SHA1 (irssi-0.8.13.tar.bz2) = 8ad6e5de345e64a2aad372ae237fd59a7b43f47b -RMD160 (irssi-0.8.13.tar.bz2) = d09b76fcb6cbdacea510cefd63ad5638b623f5a3 -Size (irssi-0.8.13.tar.bz2) = 946203 bytes +SHA1 (irssi-0.8.14.tar.bz2) = 7718afec2de99a85b7eee0b945f8424d7b1bc947 +RMD160 (irssi-0.8.14.tar.bz2) = 9c1cd4738432e7b3461ab371b9dcaafa0cd00827 +Size (irssi-0.8.14.tar.bz2) = 944708 bytes SHA1 (patch-aa) = 83a0f6def09cb283aa55b63a249a81121748232b -SHA1 (patch-ab) = 94d44084c6b89e59e2e454a43cf8bc0e0fb34695 SHA1 (patch-ad) = 8cb41612afcd6088b869235166da9a6eb37e6ec7 SHA1 (patch-ae) = b5475edc01da7b8778522a77155b2b76b2a7b738 diff --git a/chat/irssi/patches/patch-ab b/chat/irssi/patches/patch-ab deleted file mode 100644 index 8db65b0e172..00000000000 --- a/chat/irssi/patches/patch-ab +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-ab,v 1.9 2009/07/27 12:59:44 obache Exp $ - -Fix out of bounds access in event_wallops(). - -This fixes irssi bug #662 (also known as CVE-2009-1959). - -http://svn.irssi.org/cgi-bin/viewvc.cgi?view=rev&root=irssi&revision=5068 - ---- src/fe-common/irc/fe-events.c.orig 2009-07-15 22:54:17.000000000 +0200 -+++ src/fe-common/irc/fe-events.c -@@ -298,7 +298,7 @@ static void event_wallops(IRC_SERVER_REC - - 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); - } |