diff options
| author | Pav Lucistnik <pav@FreeBSD.org> | 2003-12-14 13:26:21 +0000 |
|---|---|---|
| committer | Pav Lucistnik <pav@FreeBSD.org> | 2003-12-14 13:26:21 +0000 |
| commit | 2887d4f2a8a25013bc400c2fd88fc34538ddc925 (patch) | |
| tree | 6356c47ac7e07ecd221553b07076badbc97ddf40 /irc | |
| parent | Display package message in post-install. (diff) | |
- Add a patch obtained from authors:
A bug discovered in 2.0.6 allows a remote user to crash the client.
All users should upgrade to a patched 2.0.6 immediately.
- Point fetching to our own resources, www.xchat.org is not able to
reliably transfer a file.
- Bump portrevision
Reported by: Rui Lopes
Notes
Notes:
svn path=/head/; revision=95785
Diffstat (limited to 'irc')
| -rw-r--r-- | irc/xchat-gnome/Makefile | 6 | ||||
| -rw-r--r-- | irc/xchat-gnome/files/patch-xc206-fixpsend.diff | 22 | ||||
| -rw-r--r-- | irc/xchat2/Makefile | 6 | ||||
| -rw-r--r-- | irc/xchat2/files/patch-xc206-fixpsend.diff | 22 |
4 files changed, 52 insertions, 4 deletions
diff --git a/irc/xchat-gnome/Makefile b/irc/xchat-gnome/Makefile index 6f4ab55cce31..630593b71d14 100644 --- a/irc/xchat-gnome/Makefile +++ b/irc/xchat-gnome/Makefile @@ -7,9 +7,11 @@ PORTNAME= xchat2 PORTVERSION= 2.0.6 +PORTREVISION= 1 CATEGORIES= irc gnome ipv6 -MASTER_SITES= http://xchat.org/files/source/2.0/ \ - http://xchat.linuxpower.org/files/source/2.0/ +MASTER_SITES= ${MASTER_SITE_LOCAL} +MASTER_SITE_SUBDIR= adamw +# http://xchat.org/files/source/2.0/ DISTNAME= xchat-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org diff --git a/irc/xchat-gnome/files/patch-xc206-fixpsend.diff b/irc/xchat-gnome/files/patch-xc206-fixpsend.diff new file mode 100644 index 000000000000..7c6d49564492 --- /dev/null +++ b/irc/xchat-gnome/files/patch-xc206-fixpsend.diff @@ -0,0 +1,22 @@ +# Fixes potential crash when receiving an invalid PSEND ID number. +--- src/common/dcc.c 2003-11-28 14:06:57.000000000 +1100 ++++ src/common/dcc.c 2003-12-13 20:17:12.000000000 +1100 +@@ -1659,9 +1659,15 @@ + * sending file. + */ + dcc = find_dcc_from_id (pasvid, TYPE_SEND); +- dcc->addr = addr; +- dcc->port = port; +- dcc_connect(dcc); ++ if (dcc) ++ { ++ dcc->addr = addr; ++ dcc->port = port; ++ dcc_connect (dcc); ++ } else ++ { ++ dcc_malformed (sess, nick, word_eol[4] + 2); ++ } + return; + } + diff --git a/irc/xchat2/Makefile b/irc/xchat2/Makefile index 6f4ab55cce31..630593b71d14 100644 --- a/irc/xchat2/Makefile +++ b/irc/xchat2/Makefile @@ -7,9 +7,11 @@ PORTNAME= xchat2 PORTVERSION= 2.0.6 +PORTREVISION= 1 CATEGORIES= irc gnome ipv6 -MASTER_SITES= http://xchat.org/files/source/2.0/ \ - http://xchat.linuxpower.org/files/source/2.0/ +MASTER_SITES= ${MASTER_SITE_LOCAL} +MASTER_SITE_SUBDIR= adamw +# http://xchat.org/files/source/2.0/ DISTNAME= xchat-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org diff --git a/irc/xchat2/files/patch-xc206-fixpsend.diff b/irc/xchat2/files/patch-xc206-fixpsend.diff new file mode 100644 index 000000000000..7c6d49564492 --- /dev/null +++ b/irc/xchat2/files/patch-xc206-fixpsend.diff @@ -0,0 +1,22 @@ +# Fixes potential crash when receiving an invalid PSEND ID number. +--- src/common/dcc.c 2003-11-28 14:06:57.000000000 +1100 ++++ src/common/dcc.c 2003-12-13 20:17:12.000000000 +1100 +@@ -1659,9 +1659,15 @@ + * sending file. + */ + dcc = find_dcc_from_id (pasvid, TYPE_SEND); +- dcc->addr = addr; +- dcc->port = port; +- dcc_connect(dcc); ++ if (dcc) ++ { ++ dcc->addr = addr; ++ dcc->port = port; ++ dcc_connect (dcc); ++ } else ++ { ++ dcc_malformed (sess, nick, word_eol[4] + 2); ++ } + return; + } + |