summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorfrueauf <frueauf@pkgsrc.org>2005-11-01 20:09:50 +0000
committerfrueauf <frueauf@pkgsrc.org>2005-11-01 20:09:50 +0000
commit53197386f552566bb51b8e54864db6c8c20858ca (patch)
tree22276b85b85f2a97a5b64b9697b3bf8128aa54c0 /net
parentd1823e61089e4012c43735bbe3c62212da70e89a (diff)
downloadpkgsrc-53197386f552566bb51b8e54864db6c8c20858ca.tar.gz
Add patch for security issue published at http://secunia.com/product/1228/
taken from http://www.gentoo.org/cgi-bin/viewcvs.cgi/*checkout*/net-analyzer/ethereal/files/ethereal-0.10.13-fix-irc-loop-DoS-CVE-2005-3313.diff?hideattic=1 Also bump version to 0.10.13nb1.
Diffstat (limited to 'net')
-rw-r--r--net/ethereal/Makefile3
-rw-r--r--net/ethereal/patches/patch-ab25
2 files changed, 27 insertions, 1 deletions
diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile
index 70de9dfc560..40ca5ccdd01 100644
--- a/net/ethereal/Makefile
+++ b/net/ethereal/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.117 2005/10/25 11:32:04 salo Exp $
+# $NetBSD: Makefile,v 1.118 2005/11/01 20:09:50 frueauf Exp $
DISTNAME= ethereal-0.10.13
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= http://www.ethereal.com/distribution/ \
http://ethereal.planetmirror.com/distribution/ \
diff --git a/net/ethereal/patches/patch-ab b/net/ethereal/patches/patch-ab
new file mode 100644
index 00000000000..183449d2be4
--- /dev/null
+++ b/net/ethereal/patches/patch-ab
@@ -0,0 +1,25 @@
+$NetBSD: patch-ab,v 1.7 2005/11/01 20:09:50 frueauf Exp $
+
+Fixes security issue published at http://secunia.com/advisories/17370/.
+Diff taken from http://www.gentoo.org/cgi-bin/viewcvs.cgi/*checkout*/net-analyzer/ethereal/files/ethereal-0.10.13-fix-irc-loop-DoS-CVE-2005-3313.diff?hideattic=1
+
+--- epan/dissectors/packet-irc.c 2005/09/23 21:33:02 15985
++++ epan/dissectors/packet-irc.c 2005/10/24 02:35:43 16290
+@@ -86,6 +86,17 @@
+ * Find the end of the line.
+ */
+ linelen = tvb_find_line_end(tvb, offset, -1, &next_offset, FALSE);
++ if (next_offset == offset) {
++ /*
++ * XXX - we really want the "show data a
++ * line at a time" loops in various
++ * dissectors to do reassembly and to
++ * throw an exception if there's no
++ * line ending in the current packet
++ * and we're not doing reassembly.
++ */
++ break;
++ }
+
+ if (linelen != 0)
+ {