pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/chat/bitchx Changes 1.1:
details: https://anonhg.NetBSD.org/pkgsrc/rev/20f182d46a88
branches: trunk
changeset: 484233:20f182d46a88
user: adam <adam%pkgsrc.org@localhost>
date: Fri Nov 26 11:38:14 2004 +0000
description:
Changes 1.1:
* Fixed bug with using [$8] in expressions (Reported by BlackJac)
(Patch from |Rain|) (BugID: 64) (powuh)
* Fixed bug in /set show_end_of_msgs. When OFF prevented hooking
of some end_of_msg numerics. (Reported by BlackJac)
(Patch from |Rain|) (BugID: 51) (powuh)
* Fixed incorrect ordering of operations in screen.c which
caused an off-by-one access at the end ofthe buffer.
(Patch from |Rain|) (BugID: 48) (powuh)
* Fixed ischanvoice() to be compatiable with epic. Maintained
reverse functionality as not to break existing scripts.
(Patch from |Rain|) (BugID: 20) (powuh)
* Fixed segfault with convert_output_format not honoring
MAX_RECURSE. (Patch from |Rain|) (powuh)
* Fixed possble rouge server exploit:
If a rogue server sends us a ctcp request from an extremely large
nickname (over about 512 bytes), we may attempt to alloca() a
negative value, which under gcc will return a invalid pointer the
contents of which will then be overwritten. (Reported by O_6)
(Patch from |Rain|) (powuh)
* Fixed segfault with channel mode parsing. (Patch from O_6) (powuh)
* Removed auto_resume script, it's not needed any more (caf).
* Fixed string copying snafu in gtkbitchx.c (reported by Huey) (caf).
* Added STATUS_USER20 to STATUS_USER39 (patch from BlackJac) (caf).
diffstat:
chat/bitchx/Makefile | 20 +++----
chat/bitchx/PLIST | 9 ++-
chat/bitchx/distinfo | 19 ++----
chat/bitchx/patches/patch-aa | 10 +-
chat/bitchx/patches/patch-ab | 8 +-
chat/bitchx/patches/patch-ad | 8 +-
chat/bitchx/patches/patch-ag | 72 ---------------------------
chat/bitchx/patches/patch-ah | 20 -------
chat/bitchx/patches/patch-ai | 113 -------------------------------------------
chat/bitchx/patches/patch-aj | 41 ---------------
chat/bitchx/patches/patch-ak | 18 ------
chat/bitchx/patches/patch-al | 54 --------------------
chat/bitchx/patches/patch-am | 13 ----
13 files changed, 35 insertions(+), 370 deletions(-)
diffs (truncated from 513 to 300 lines):
diff -r ac2310e7c6cc -r 20f182d46a88 chat/bitchx/Makefile
--- a/chat/bitchx/Makefile Fri Nov 26 10:31:29 2004 +0000
+++ b/chat/bitchx/Makefile Fri Nov 26 11:38:14 2004 +0000
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.31 2004/10/28 23:42:25 heas Exp $
-#
+# $NetBSD: Makefile,v 1.32 2004/11/26 11:38:14 adam Exp $
-DISTNAME= ircii-pana-1.0c19
-PKGNAME= bitchx-1.0.3.19
-PKGREVISION= 8
+DISTNAME= ircii-pana-1.1-final
+PKGNAME= bitchx-1.1
CATEGORIES= chat
-MASTER_SITES= ftp://ftp.bitchx.org/pub/BitchX/source/ \
+MASTER_SITES= http://www.bitchx.org/files/source/ \
+ ftp://ftp.bitchx.org/pub/BitchX/source/ \
ftp://ftp.bitchx.org/pub/BitchX/source/old/
MAINTAINER= jmcneill%invisible.yi.org@localhost
@@ -16,11 +15,10 @@
NOT_FOR_PLATFORM= *-*-alpha *-*-sparc64 *-*-x86_64
WRKSRC= ${WRKDIR}/BitchX
-USE_BUILDLINK3= YES
-USE_PKGINSTALL= YES
-GNU_CONFIGURE= YES
-
-CONFIGURE_ARGS= --with-ssl
+USE_BUILDLINK3= YES
+USE_PKGINSTALL= YES
+GNU_CONFIGURE= YES
+CONFIGURE_ARGS= --with-ssl
.if defined(BITCHX_WITH_GTK) && !empty(BITCHX_WITH_GTK:M[Yy][Ee][Ss])
.include "../../graphics/imlib/buildlink3.mk"
diff -r ac2310e7c6cc -r 20f182d46a88 chat/bitchx/PLIST
--- a/chat/bitchx/PLIST Fri Nov 26 10:31:29 2004 +0000
+++ b/chat/bitchx/PLIST Fri Nov 26 11:38:14 2004 +0000
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.5 2003/05/05 06:06:11 grant Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/11/26 11:38:14 adam Exp $
bin/${GTK}BitchX
-bin/${GTK}BitchX-1.0c19
+bin/${GTK}BitchX-1.1-final
${NOT_GTK}bin/scr-bx
man/man1/BitchX.1
share/bx/BitchX.doc
@@ -917,15 +917,20 @@
share/bx/help/findcomm.bz2
share/bx/help/functions.bz2
share/bx/help/out.bz2
+share/bx/script/SCRIPTS
share/bx/script/actplug.gmz
share/bx/script/auto_resume
share/bx/script/bxglobal
share/bx/script/bxtcl.tcl
+share/bx/script/cyp1.0k.tar.gz
+share/bx/script/dcc_fserve-0.50.tgz
share/bx/script/example-.bitchxrc
share/bx/script/file.tcl
share/bx/script/fserve+vfs.tar.gz
share/bx/script/fserve.irc
+share/bx/script/logger.bx
share/bx/script/menu.bx
+share/bx/script/operchallenge-1.3.tar
share/bx/script/query
share/bx/script/query.bx
share/bx/translation/ASCII.bz2
diff -r ac2310e7c6cc -r 20f182d46a88 chat/bitchx/distinfo
--- a/chat/bitchx/distinfo Fri Nov 26 10:31:29 2004 +0000
+++ b/chat/bitchx/distinfo Fri Nov 26 11:38:14 2004 +0000
@@ -1,18 +1,11 @@
-$NetBSD: distinfo,v 1.10 2004/06/27 00:35:04 heas Exp $
+$NetBSD: distinfo,v 1.11 2004/11/26 11:38:14 adam Exp $
-SHA1 (ircii-pana-1.0c19.tar.gz) = 4821ebbd3f55ec2cfc2a20e2109e34ea45b3f144
-Size (ircii-pana-1.0c19.tar.gz) = 2533621 bytes
-SHA1 (patch-aa) = d3cab337be4180645e418024efa97e6720be9075
-SHA1 (patch-ab) = de56331930587df238049aebc9be85ab1d64e0ce
+SHA1 (ircii-pana-1.1-final.tar.gz) = b25635b62c7ff905b6492a4aaa88c43b5aa164f8
+Size (ircii-pana-1.1-final.tar.gz) = 2532476 bytes
+SHA1 (patch-aa) = c184a5341217d21277060d07c4ed12c20f374dc8
+SHA1 (patch-ab) = 843e1bdfe6bdd93c93944484edb56be7393f298d
SHA1 (patch-ac) = ba59735707ca8758d62e78b7756330aa933f2de7
-SHA1 (patch-ad) = ad6678061ea154153d3a04c0b2ea3d295ecb9686
+SHA1 (patch-ad) = ba00fb80b1b980a32b70d84e4ca4db91e9fd5538
SHA1 (patch-ae) = 90c7e0a19c81e710392c675be650c57e64ee65b3
SHA1 (patch-af) = c79fcbcc57b8234d5918b1414219965b75e3c0d1
-SHA1 (patch-ag) = 4b89c3da7eb4483b87d9660b5e3d4e62752c5bfd
-SHA1 (patch-ah) = 2cc10ac0e312c53f8af379ea50aafa7439671be7
-SHA1 (patch-ai) = 7ebe26aaa82a993f5fa40ec5f74ed87769abe2fd
-SHA1 (patch-aj) = 156be839ab2dc5abebb918398f64c62373f3561e
-SHA1 (patch-ak) = 4e70e8d42b104b91849e79930fabe8c5a43d10f5
-SHA1 (patch-al) = dd501c530af801bece9f035b4355d1ecaaa7658a
-SHA1 (patch-am) = 6ed1f089f46ca1fb95192e14c1f26f3a7e6a9a98
SHA1 (patch-an) = 59a6dc31a90b88bbffac5bb4629feaa2488afeff
diff -r ac2310e7c6cc -r 20f182d46a88 chat/bitchx/patches/patch-aa
--- a/chat/bitchx/patches/patch-aa Fri Nov 26 10:31:29 2004 +0000
+++ b/chat/bitchx/patches/patch-aa Fri Nov 26 11:38:14 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2003/01/31 00:17:45 salo Exp $
+$NetBSD: patch-aa,v 1.4 2004/11/26 11:38:14 adam Exp $
---- configure.orig Sun Mar 24 10:30:49 2002
-+++ configure Thu Jan 30 23:30:53 2003
-@@ -14756,7 +14756,7 @@
+--- configure.orig 2003-04-11 01:09:04.000000000 +0000
++++ configure
+@@ -14837,7 +14837,7 @@ if test -n "$CYGWIN" -o -n "$EMXOS2" -o
mandir="\$(IRCLIB)"
else
INSTALL_IRC="\${bindir}/\$(_VERSION_)\$(EXEEXT)"
@@ -11,7 +11,7 @@
IRCPATH="\$(DEFAULT_CTOOLZ_DIR):\$(DEFAULT_CTOOLZ_DIR)/plugins:.:\$(PLUGINDIR):\$(INSTALL_SCRIPT):\$(IRCLIB)"
TRANSLATION_PATH="\$(IRCLIB)/translation"
HELPDIR="\$(IRCLIB)/help"
-@@ -14764,7 +14764,7 @@
+@@ -14845,7 +14845,7 @@ else
INSTALL_SCRBX="\${bindir}/scr-bx\$(EXEEXT)"
INSTALL_SCRIPT="\$(IRCLIB)/script"
INSTALL_HELP_CMD="cp -pfr bitchx-docs/* \$(HELPDIR)"
diff -r ac2310e7c6cc -r 20f182d46a88 chat/bitchx/patches/patch-ab
--- a/chat/bitchx/patches/patch-ab Fri Nov 26 10:31:29 2004 +0000
+++ b/chat/bitchx/patches/patch-ab Fri Nov 26 11:38:14 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2003/01/31 00:17:45 salo Exp $
+$NetBSD: patch-ab,v 1.3 2004/11/26 11:38:14 adam Exp $
---- include/config.h.orig Sun Mar 24 10:31:04 2002
-+++ include/config.h Thu Jan 30 23:32:52 2003
-@@ -309,7 +309,7 @@
+--- include/config.h.orig 2003-07-26 07:00:32.000000000 +0000
++++ include/config.h
+@@ -295,7 +295,7 @@
* This is recommended when you want to start BitchX in an xterm without
* the usage of the special "vga"-font.
*/
diff -r ac2310e7c6cc -r 20f182d46a88 chat/bitchx/patches/patch-ad
--- a/chat/bitchx/patches/patch-ad Fri Nov 26 10:31:29 2004 +0000
+++ b/chat/bitchx/patches/patch-ad Fri Nov 26 11:38:14 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.2 2003/01/31 00:17:45 salo Exp $
+$NetBSD: patch-ad,v 1.3 2004/11/26 11:38:14 adam Exp $
---- source/screen.c.orig Thu Feb 28 05:22:50 2002
-+++ source/screen.c Thu Jan 30 23:34:33 2003
-@@ -2975,6 +2975,8 @@
+--- source/screen.c.orig 2003-07-31 07:01:08.000000000 +0000
++++ source/screen.c
+@@ -2974,6 +2974,8 @@ static char retbuf[512];
if (back == 58)
strcat(retbuf, current_term->TI_sgrstrs[TERM_SGR_BLINK_ON - 1]);
diff -r ac2310e7c6cc -r 20f182d46a88 chat/bitchx/patches/patch-ag
--- a/chat/bitchx/patches/patch-ag Fri Nov 26 10:31:29 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2003/03/29 21:20:30 salo Exp $
-
-Fixes potential remote buffer overflows. See the following url for more
-details: http://securityfocus.com/archive/1/315057
-
-Patch by caf%guarana.org@localhost.
-
---- source/banlist.c.orig 2002-02-28 05:22:46.000000000 +0100
-+++ source/banlist.c 2003-03-29 21:30:20.000000000 +0100
-@@ -264,9 +264,9 @@
- char * ban_it(char *nick, char *user, char *host, char *ip)
- {
- static char banstr[BIG_BUFFER_SIZE/4+1];
--char *tmpstr = NULL;
- char *t = user;
- char *t1 = user;
-+char *tmp;
-
- *banstr = 0;
- while (strlen(t1)>9)
-@@ -277,33 +277,40 @@
- case 7:
- if (ip)
- {
-- sprintf(banstr, "*!*@%s", cluster(ip));
-+ snprintf(banstr, sizeof banstr, "*!*@%s",
-+ cluster(ip));
- break;
- }
- case 2: /* Better */
-- sprintf(banstr, "*!*%s@%s", t1, cluster(host));
-+ snprintf(banstr, sizeof banstr, "*!*%s@%s", t1,
-+ cluster(host));
- break;
- case 3: /* Host */
-- sprintf(banstr, "*!*@%s", host);
-+ snprintf(banstr, sizeof banstr, "*!*@%s", host);
- break;
- case 4: /* Domain */
-- sprintf(banstr, "*!*@*%s", strrchr(host, '.'));
-+ tmp = strrchr(host, '.');
-+ if (tmp)
-+ snprintf(banstr, sizeof banstr, "*!*@*%s",
-+ tmp);
-+ else
-+ snprintf(banstr, sizeof banstr, "*!*@%s",
-+ host);
- break;
- case 5: /* User */
-- sprintf(banstr, "*!%s@%s", t, cluster(host));
-+ snprintf(banstr, sizeof banstr, "*!%s@%s", t,
-+ cluster(host));
- break;
- case 6: /* Screw */
-- malloc_sprintf(&tmpstr, "*!*%s@%s", t1, host);
-- strcpy(banstr, screw(tmpstr));
-- new_free(&tmpstr);
-+ snprintf(banstr, sizeof banstr, "*!*%s@%s", t1, host);
-+ screw(banstr);
- break;
- case 1: /* Normal */
- default:
-- {
-- sprintf(banstr, "%s!*%s@%s", nick, t1, host);
-+ snprintf(banstr, sizeof banstr, "%s!*%s@%s", nick, t1,
-+ host);
- break;
- }
-- }
- return banstr;
- }
-
diff -r ac2310e7c6cc -r 20f182d46a88 chat/bitchx/patches/patch-ah
--- a/chat/bitchx/patches/patch-ah Fri Nov 26 10:31:29 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2003/03/29 21:20:30 salo Exp $
-
-Fixes potential remote buffer overflows. See the following url for more
-details: http://securityfocus.com/archive/1/315057
-
-Patch by caf%guarana.org@localhost.
-
---- source/ctcp.c.orig 2002-02-28 05:22:47.000000000 +0100
-+++ source/ctcp.c 2003-03-29 21:41:01.000000000 +0100
-@@ -1482,6 +1482,10 @@
- *putbuf2;
- int len;
- len = IRCD_BUFFER_SIZE - (12 + strlen(to));
-+
-+ if (len < strlen(ctcp_cmd[datatag].name) + 3)
-+ return;
-+
- putbuf2 = alloca(len);
-
- if (format)
diff -r ac2310e7c6cc -r 20f182d46a88 chat/bitchx/patches/patch-ai
--- a/chat/bitchx/patches/patch-ai Fri Nov 26 10:31:29 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,113 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2003/03/29 21:20:30 salo Exp $
-
-Fixes potential remote buffer overflows. See the following url for more
-details: http://securityfocus.com/archive/1/315057
-
-Patch by caf%guarana.org@localhost.
-
---- source/misc.c.orig 2002-03-24 10:31:07.000000000 +0100
-+++ source/misc.c 2003-03-29 21:44:37.000000000 +0100
-@@ -3110,42 +3110,47 @@
- static char result[IRCD_BUFFER_SIZE/4 + 1];
- char temphost[BIG_BUFFER_SIZE + 1];
- char *host;
-+ char *atsign;
-
- if (!hostname)
- return NULL;
-- host = temphost;
-- *result = 0;
-- memset(result, 0, sizeof(result));
-- memset(temphost, 0, sizeof(temphost));
-- if (strchr(hostname, '@'))
-- {
-- if (*hostname == '~')
-- hostname++;
-- strcpy(result, hostname);
-- *strchr(result, '@') = '\0';
-- if (strlen(result) > 9)
-- {
-+
-+ atsign = strchr(hostname, '@');
-+ if (atsign) {
-+ if (*hostname == '~') {
-+ strcpy(result, "~*@");
-+ } else {
-+ size_t ident_len = atsign - hostname;
-+
-+ if (ident_len <= 9) {
-+ /* copy ident@ */
-+ strmcpy(result, hostname, ident_len + 1);
-+ } else {
-+ strmcpy(result, hostname, 8);
Home |
Main Index |
Thread Index |
Old Index