summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsalo <salo>2004-11-30 00:04:43 +0000
committersalo <salo>2004-11-30 00:04:43 +0000
commit0ec973ec0e3919f5842355e7c2617377935426aa (patch)
tree315a01dc63872695ddd5dae4928d4600f6522e2b
parent436440c462246ca3825123a3a8f861b37cb0236c (diff)
downloadpkgsrc-0ec973ec0e3919f5842355e7c2617377935426aa.tar.gz
Pullup ticket 159 - requested by Havard Eidnes
security fix for libxml2 Module Name: pkgsrc Committed By: xtraeme Date: Thu Oct 21 05:28:17 UTC 2004 Modified Files: pkgsrc/doc: CHANGES TODO pkgsrc/textproc/libxml2: Makefile distinfo Log Message: Update textproc/libxml2 to 2.6.14, this is a bugfix release. --- Module Name: pkgsrc Committed By: recht Date: Sun Oct 31 10:40:51 UTC 2004 Modified Files: pkgsrc/textproc/libxml2: Makefile buildlink3.mk distinfo pkgsrc/textproc/libxml2/patches: patch-aa patch-ab Log Message: update to libxml2-2.6.15 changes: * security fixes on the nanoftp and nanohttp modules For details see: http://www.securityfocus.com/archive/1/379383/2004-10-24/2004-10-30/0 * build fixes: - xmllint detection bug in configure - building outside the source tree (Thomas Fitzsimmons) * bug fixes: - HTML parser on broken ASCII chars in names (William) - Python paths (Malcolm Tredinnick) - xmlHasNsProp and default namespace (William) - saving to python file objects (Malcolm Tredinnick) - DTD lookup fix (Malcolm) - save back <group> in catalogs (William) - tree build fixes (DV and Rob Richards) - Schemas memory bug - structured error handler on Python 64bits - thread local memory deallocation - memory leak reported by Volker Roth - xmlValidateDtd in the presence of an internal subset - entities and _private problem (William) - xmlBuildRelativeURI error (William). * improvements: - better XInclude error reports (William) - tree debugging module and tests - convenience functions at the Reader API (Graham Bennett) - add support for PI in the HTML parser. Update BUILDLINK_RECOMMENDED to 2.6.15 for the security fix. --- Module Name: pkgsrc Committed By: minskim Date: Wed Nov 3 16:41:56 UTC 2004 Modified Files: pkgsrc/textproc/py-libxml2: Makefile distinfo Log Message: Sync with libxml2-2.6.15. Changes since 2.6.12: - saving to python file objects (Malcolm Tredinnick) - structured error handler on Python 64bits - Python space/tabs cleanups - Python libxml2 driver improvement --- Module Name: pkgsrc Committed By: recht Date: Thu Nov 11 21:01:15 UTC 2004 Modified Files: pkgsrc/textproc/libxml2: Makefile distinfo pkgsrc/textproc/libxml2/patches: patch-aa patch-ab Log Message: update to 2.6.16 2.6.16: Nov 10 2004: - general hardening and bug fixing crossing all the API based on new automated regression testing - build fix: IPv6 build and test on AIX (Dodji Seketeli) - bug fixes: problem with XML::Libxml reported by Petr Pajas, encoding conversion functions return values, UTF-8 bug affecting XPath reported by Markus Bertheau, catalog problem with NULL entries (William Brack) - documentation: fix to xmllint man page, some API function descritpion were updated. - improvements: DTD validation APIs provided at the Python level (Brent Hendricks) --- Module Name: pkgsrc Committed By: minskim Date: Thu Nov 25 18:37:43 UTC 2004 Modified Files: pkgsrc/textproc/py-libxml2: Makefile distinfo pkgsrc/textproc/py-libxml2/patches: patch-aa Log Message: Update py-libxml2 to 2.6.16. Changes: - improvements: DTD validation APIs provided at the Python level.
-rw-r--r--textproc/libxml2/Makefile4
-rw-r--r--textproc/libxml2/PLIST4
-rw-r--r--textproc/libxml2/buildlink3.mk3
-rw-r--r--textproc/libxml2/distinfo10
-rw-r--r--textproc/libxml2/patches/patch-aa6
-rw-r--r--textproc/libxml2/patches/patch-ab6
-rw-r--r--textproc/py-libxml2/Makefile4
-rw-r--r--textproc/py-libxml2/distinfo8
-rw-r--r--textproc/py-libxml2/patches/patch-aa6
9 files changed, 26 insertions, 25 deletions
diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 08f0269a320..8d9a58e154d 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.59 2004/09/02 11:13:27 jmmv Exp $
+# $NetBSD: Makefile,v 1.59.2.1 2004/11/30 00:04:43 salo Exp $
-DISTNAME= libxml2-2.6.13
+DISTNAME= libxml2-2.6.16
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libxml2/2.6/}
EXTRACT_SUFX= .tar.bz2
diff --git a/textproc/libxml2/PLIST b/textproc/libxml2/PLIST
index b7e02d5217c..f42f34f5e88 100644
--- a/textproc/libxml2/PLIST
+++ b/textproc/libxml2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.33 2004/09/02 11:13:27 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.33.2.1 2004/11/30 00:04:43 salo Exp $
bin/xml2-config
bin/xmlcatalog
bin/xmllint
@@ -51,7 +51,7 @@ lib/libxml2.a
lib/libxml2.la
lib/libxml2.so
lib/libxml2.so.8
-lib/libxml2.so.8.13
+lib/libxml2.so.8.16
lib/pkgconfig/libxml-2.0.pc
lib/xml2Conf.sh
man/man1/xml2-config.1
diff --git a/textproc/libxml2/buildlink3.mk b/textproc/libxml2/buildlink3.mk
index 92d7415537c..405b6a6873f 100644
--- a/textproc/libxml2/buildlink3.mk
+++ b/textproc/libxml2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:15 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4.6.1 2004/11/30 00:04:43 salo Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBXML2_BUILDLINK3_MK:= ${LIBXML2_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+= libxml2
.if !empty(LIBXML2_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.libxml2+= libxml2>=2.6.2
+BUILDLINK_RECOMMENDED.libxml2+= libxml2>=2.6.15
BUILDLINK_PKGSRCDIR.libxml2?= ../../textproc/libxml2
.endif # LIBXML2_BUILDLINK3_MK
diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo
index 69deece9bc2..f8d88e74e18 100644
--- a/textproc/libxml2/distinfo
+++ b/textproc/libxml2/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.42 2004/09/02 11:13:27 jmmv Exp $
+$NetBSD: distinfo,v 1.42.2.1 2004/11/30 00:04:43 salo Exp $
-SHA1 (libxml2-2.6.13.tar.bz2) = 990700b9c97430cd6d416a1f7a673925d62d99c1
-Size (libxml2-2.6.13.tar.bz2) = 2783813 bytes
-SHA1 (patch-aa) = 79ca42b0b78dda1581eb567fd02c77cbd500fe10
-SHA1 (patch-ab) = 90def7e936411ee7a28a51050e43a55d85526935
+SHA1 (libxml2-2.6.16.tar.bz2) = 0bd0e7217f75abadf0b6389c126e63b6c1b7972b
+Size (libxml2-2.6.16.tar.bz2) = 3100259 bytes
+SHA1 (patch-aa) = dee768bf9ff0fe7de232bcdc4a55bc250ec9ad1a
+SHA1 (patch-ab) = d9dd03a12fc53435804e7a163841bc5d834a48b5
diff --git a/textproc/libxml2/patches/patch-aa b/textproc/libxml2/patches/patch-aa
index e31c28722ba..dbf3b10302c 100644
--- a/textproc/libxml2/patches/patch-aa
+++ b/textproc/libxml2/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.17 2004/08/04 11:19:31 wiz Exp $
+$NetBSD: patch-aa,v 1.17.2.1 2004/11/30 00:04:43 salo Exp $
---- Makefile.in.orig 2004-07-05 19:46:31.000000000 +0200
+--- Makefile.in.orig Wed Nov 10 15:36:58 2004
+++ Makefile.in
-@@ -521,7 +521,7 @@ pkgconfig_DATA = libxml-2.0.pc
+@@ -538,7 +538,7 @@ pkgconfig_DATA = libxml-2.0.pc
#
BASE_DIR = $(datadir)/doc
DOC_MODULE = libxml2-$(VERSION)
diff --git a/textproc/libxml2/patches/patch-ab b/textproc/libxml2/patches/patch-ab
index eb8ba17005b..6b5e9534075 100644
--- a/textproc/libxml2/patches/patch-ab
+++ b/textproc/libxml2/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.9 2004/08/04 11:20:00 wiz Exp $
+$NetBSD: patch-ab,v 1.9.2.1 2004/11/30 00:04:43 salo Exp $
---- configure.orig 2004-07-05 19:35:47.000000000 +0200
+--- configure.orig Wed Nov 10 15:33:00 2004
+++ configure
-@@ -26250,7 +26250,7 @@ fi
+@@ -26449,7 +26449,7 @@ fi
fi
diff --git a/textproc/py-libxml2/Makefile b/textproc/py-libxml2/Makefile
index 0bb5d0bffd9..82d35c13404 100644
--- a/textproc/py-libxml2/Makefile
+++ b/textproc/py-libxml2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2004/08/24 11:43:32 drochner Exp $
+# $NetBSD: Makefile,v 1.10.2.1 2004/11/30 00:04:43 salo Exp $
-DISTNAME= libxml2-2.6.12
+DISTNAME= libxml2-2.6.16
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
CATEGORIES= textproc python
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libxml2/2.6/}
diff --git a/textproc/py-libxml2/distinfo b/textproc/py-libxml2/distinfo
index 4f1f56f9a9c..1fb93ab3f4a 100644
--- a/textproc/py-libxml2/distinfo
+++ b/textproc/py-libxml2/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2004/08/24 11:43:32 drochner Exp $
+$NetBSD: distinfo,v 1.6.2.1 2004/11/30 00:04:43 salo Exp $
-SHA1 (libxml2-2.6.12.tar.bz2) = c141f9491c03340bd6c72b490f2a2a5840d6a0f4
-Size (libxml2-2.6.12.tar.bz2) = 2773187 bytes
-SHA1 (patch-aa) = 8466178808ae179a4e952c7304e1a79b639c8174
+SHA1 (libxml2-2.6.16.tar.bz2) = 0bd0e7217f75abadf0b6389c126e63b6c1b7972b
+Size (libxml2-2.6.16.tar.bz2) = 3100259 bytes
+SHA1 (patch-aa) = 54ce6f91dd29144f22247d15093d6d273f5f433b
diff --git a/textproc/py-libxml2/patches/patch-aa b/textproc/py-libxml2/patches/patch-aa
index ff79943d85d..af7fefffdda 100644
--- a/textproc/py-libxml2/patches/patch-aa
+++ b/textproc/py-libxml2/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/01/04 11:47:17 recht Exp $
+$NetBSD: patch-aa,v 1.1.1.1.6.1 2004/11/30 00:04:43 salo Exp $
---- libxml.py.orig 2003-12-25 00:17:24.000000000 -0600
+--- libxml.py.orig 2004-09-28 05:59:58.000000000 -0500
+++ libxml.py
-@@ -278,7 +278,7 @@ class xmlCore:
+@@ -281,7 +281,7 @@ class xmlCore:
# defined as python2 properties
#
import sys