summaryrefslogtreecommitdiff
path: root/textproc/libxml2
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>2008-10-09 15:01:27 +0000
committertron <tron@pkgsrc.org>2008-10-09 15:01:27 +0000
commit206e58dadefc441e7d02bd007326788a0cf0f4ee (patch)
treeb53e09e7f364a9ec0fd1bda26ce558552463a9bc /textproc/libxml2
parent65b4ce045fbe23fad898b81598be1f5ac265d41a (diff)
downloadpkgsrc-206e58dadefc441e7d02bd007326788a0cf0f4ee.tar.gz
Add a fix for CVE-2008-4409 (also known as CVE-2008-4422) from the
GNOME bugzilla. Bump package revision.
Diffstat (limited to 'textproc/libxml2')
-rw-r--r--textproc/libxml2/Makefile3
-rw-r--r--textproc/libxml2/distinfo3
-rw-r--r--textproc/libxml2/patches/patch-af21
3 files changed, 25 insertions, 2 deletions
diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index a528f9048c4..225fe419f1c 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.94 2008/09/06 14:58:34 wiz Exp $
+# $NetBSD: Makefile,v 1.95 2008/10/09 15:01:27 tron Exp $
DISTNAME= libxml2-2.7.1
+PKGREVISION= 1
CATEGORIES= textproc
MASTER_SITES= ftp://xmlsoft.org/libxml2/ \
http://xmlsoft.org/sources/
diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo
index 49b699735a5..2204c27e7b1 100644
--- a/textproc/libxml2/distinfo
+++ b/textproc/libxml2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.66 2008/09/06 14:58:34 wiz Exp $
+$NetBSD: distinfo,v 1.67 2008/10/09 15:01:27 tron Exp $
SHA1 (libxml2-2.7.1.tar.gz) = 54b2d24ce0b716054628303bff47cf0db2966d84
RMD160 (libxml2-2.7.1.tar.gz) = 4de3732c39efa95b63abbd60dbb74357075faf63
@@ -8,3 +8,4 @@ SHA1 (patch-ab) = a8dc745539528db69bf1ccb8977a69c24fa818e3
SHA1 (patch-ac) = 264c75cf9fff5319105b971c122cdf5fc103c04e
SHA1 (patch-ad) = cd45da492b02cce9983c46762839f68b8b1e0177
SHA1 (patch-ae) = b9176919edbf3582cb24aff53f7c4f291e2b78c8
+SHA1 (patch-af) = 53757ead74ac0f3bba68adee89a65fcfa544fc59
diff --git a/textproc/libxml2/patches/patch-af b/textproc/libxml2/patches/patch-af
new file mode 100644
index 00000000000..16b3e1788e0
--- /dev/null
+++ b/textproc/libxml2/patches/patch-af
@@ -0,0 +1,21 @@
+$NetBSD: patch-af,v 1.1 2008/10/09 15:01:27 tron Exp $
+
+Patch for CVE-2008-4409 taken from here:
+
+http://bugzilla.gnome.org/show_bug.cgi?id=554660
+http://bugzilla.gnome.org/attachment.cgi?id=119824
+
+--- parser.c.orig 2008-09-01 07:22:40.000000000 +0100
++++ parser.c 2008-10-09 15:22:55.000000000 +0100
+@@ -7225,8 +7225,10 @@
+ * Predefined entites override any extra definition
+ */
+ ent = xmlGetPredefinedEntity(name);
+- if (ent != NULL)
++ if (ent != NULL) {
++ *str = ptr;
+ return(ent);
++ }
+
+ /*
+ * Increate the number of entity references parsed