update to 2.7.8 changes: -add code to plug in ICU converters by default -Add xmlSaveOption XML_SAVE_WSNONSIG -documentation fixes -portability fixes -bugfixes, in particular for an XPath problem which can be exploited to crash the program by a malformed XPath expression (CVE-2010-4008) -misc improvements, cleanupdiff -r1.104 -r1.105 pkgsrc/textproc/libxml2/Makefile
(drochner)
@@ -1,16 +1,16 @@ | @@ -1,16 +1,16 @@ | |||
1 | # $NetBSD: Makefile,v 1.104 2010/04/13 16:04:09 drochner Exp $ | 1 | # $NetBSD: Makefile,v 1.105 2010/11/25 13:18:38 drochner Exp $ | |
2 | 2 | |||
3 | DISTNAME= libxml2-2.7.7 | 3 | DISTNAME= libxml2-2.7.8 | |
4 | CATEGORIES= textproc | 4 | CATEGORIES= textproc | |
5 | MASTER_SITES= ftp://xmlsoft.org/libxml2/ \ | 5 | MASTER_SITES= ftp://xmlsoft.org/libxml2/ \ | |
6 | http://xmlsoft.org/sources/ | 6 | http://xmlsoft.org/sources/ | |
7 | #MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libxml2/2.7/} | 7 | #MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libxml2/2.7/} | |
8 | 8 | |||
9 | MAINTAINER= recht@NetBSD.org | 9 | MAINTAINER= recht@NetBSD.org | |
10 | HOMEPAGE= http://xmlsoft.org/ | 10 | HOMEPAGE= http://xmlsoft.org/ | |
11 | COMMENT= XML parser library from the GNOME project | 11 | COMMENT= XML parser library from the GNOME project | |
12 | LICENSE= modified-bsd | 12 | LICENSE= modified-bsd | |
13 | 13 | |||
14 | PKG_INSTALLATION_TYPES= overwrite pkgviews | 14 | PKG_INSTALLATION_TYPES= overwrite pkgviews | |
15 | PKG_DESTDIR_SUPPORT= user-destdir | 15 | PKG_DESTDIR_SUPPORT= user-destdir | |
16 | 16 |
@@ -1,12 +1,12 @@ | @@ -1,12 +1,12 @@ | |||
1 | $NetBSD: distinfo,v 1.78 2010/04/28 08:54:30 obache Exp $ | 1 | $NetBSD: distinfo,v 1.79 2010/11/25 13:18:38 drochner Exp $ | |
2 | 2 | |||
3 | SHA1 (libxml2-2.7.7.tar.gz) = 8592824a2788574a172cbddcdc72f734ff87abe3 | 3 | SHA1 (libxml2-2.7.8.tar.gz) = 859dd535edbb851cc15b64740ee06551a7a17d40 | |
4 | RMD160 (libxml2-2.7.7.tar.gz) = 9f72c778c3e9e348a68eada0cf624c012658c085 | 4 | RMD160 (libxml2-2.7.8.tar.gz) = 30709622cfe3e2175e73d6701b7e19a25ab5ac47 | |
5 | Size (libxml2-2.7.7.tar.gz) = 4868502 bytes | 5 | Size (libxml2-2.7.8.tar.gz) = 4881808 bytes | |
6 | SHA1 (patch-aa) = bf7db00ddf8a36394521baf656cf83d99bd9cbd3 | 6 | SHA1 (patch-aa) = bf7db00ddf8a36394521baf656cf83d99bd9cbd3 | |
7 | SHA1 (patch-ab) = d7e61cdec90790c905f9d699919a2da397de3dcc | 7 | SHA1 (patch-ab) = ccc4103a8ff53267644123a17dcc777ac3f151e3 | |
8 | SHA1 (patch-ac) = 264c75cf9fff5319105b971c122cdf5fc103c04e | 8 | SHA1 (patch-ac) = 264c75cf9fff5319105b971c122cdf5fc103c04e | |
9 | SHA1 (patch-ad) = cd45da492b02cce9983c46762839f68b8b1e0177 | 9 | SHA1 (patch-ad) = cd45da492b02cce9983c46762839f68b8b1e0177 | |
10 | SHA1 (patch-ae) = b9176919edbf3582cb24aff53f7c4f291e2b78c8 | 10 | SHA1 (patch-ae) = b8d8e0275cab3caafd98275ac22b63951fc4b5fd | |
11 | SHA1 (patch-ag) = 30ec5c8daece4aba75a02bbc13db5373542dea7b | 11 | SHA1 (patch-ag) = 30ec5c8daece4aba75a02bbc13db5373542dea7b | |
12 | SHA1 (patch-aj) = 24eb4a08ea4c40be6d75a72cd0bb5280514f73d4 | 12 | SHA1 (patch-aj) = 24eb4a08ea4c40be6d75a72cd0bb5280514f73d4 |
@@ -1,13 +1,22 @@ | @@ -1,13 +1,22 @@ | |||
1 | $NetBSD: patch-ab,v 1.18 2010/04/13 16:04:09 drochner Exp $ | 1 | $NetBSD: patch-ab,v 1.19 2010/11/25 13:18:39 drochner Exp $ | |
2 | 2 | |||
3 | --- configure.orig 2010-03-15 15:18:22.000000000 +0000 | 3 | --- configure.orig 2010-11-04 17:28:14.000000000 +0000 | |
4 | +++ configure | 4 | +++ configure | |
5 | @@ -19734,7 +19734,7 @@ fi | 5 | @@ -13364,7 +13364,7 @@ fi | |
6 | fi | 6 | fi | |
7 | 7 | |||
8 | 8 | |||
9 | -XML_LIBDIR='-L${libdir}' | 9 | -XML_LIBDIR='-L${libdir}' | |
10 | +XML_LIBDIR='-Wl,-R${libdir} -L${libdir}' | 10 | +XML_LIBDIR='-Wl,-R${libdir} -L${libdir}' | |
11 | XML_INCLUDEDIR='-I${includedir}/libxml2' | 11 | XML_INCLUDEDIR='-I${includedir}/libxml2' | |
12 | 12 | |||
13 | XML_CFLAGS="" | 13 | XML_CFLAGS="" | |
14 | @@ -14584,7 +14584,7 @@ $as_echo "#define vsnprintf _vsnprintf" | |||
15 | ||||
16 | if test "${PYTHON}" != "" | |||
17 | then | |||
18 | - WIN32_EXTRA_PYTHON_LIBADD="-L${pythondir}/../../libs -lpython${PYTHON_VERSION//./}" | |||
19 | +# WIN32_EXTRA_PYTHON_LIBADD="-L${pythondir}/../../libs -lpython${PYTHON_VERSION//./}" | |||
20 | fi | |||
21 | ;; | |||
22 | *-*-cygwin*) |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | $NetBSD: patch-ae,v 1.10 2008/04/22 21:42:07 wiz Exp $ | 1 | $NetBSD: patch-ae,v 1.11 2010/11/25 13:18:39 drochner Exp $ | |
2 | 2 | |||
3 | --- doc/examples/Makefile.in.orig 2008-04-08 14:55:02.000000000 +0000 | 3 | --- doc/examples/Makefile.in.orig 2010-11-04 17:28:16.000000000 +0000 | |
4 | +++ doc/examples/Makefile.in | 4 | +++ doc/examples/Makefile.in | |
5 | @@ -754,7 +754,8 @@ index.html: examples.xml examples.xsl | 5 | @@ -791,7 +791,8 @@ index.html: examples.xml examples.xsl | |
6 | 6 | |||
7 | install-data-local: | 7 | install-data-local: | |
8 | $(mkinstalldirs) $(DESTDIR)$(HTML_DIR) | 8 | @MKDIR_P@ $(DESTDIR)$(HTML_DIR) | |
9 | - -@INSTALL@ -m 0644 $(srcdir)/*.html $(srcdir)/*.c $(srcdir)/*.xml $(srcdir)/*.xsl $(srcdir)/*.res $(DESTDIR)$(HTML_DIR) | 9 | - -@INSTALL@ -m 0644 $(srcdir)/*.html $(srcdir)/*.c $(srcdir)/*.xml $(srcdir)/*.xsl $(srcdir)/*.res $(DESTDIR)$(HTML_DIR) | |
10 | + -@INSTALL@ -m 0644 $(srcdir)/*.c $(srcdir)/*.xml $(srcdir)/*.xsl $(srcdir)/*.res $(DESTDIR)$(HTML_DIR) | 10 | + -@INSTALL@ -m 0644 $(srcdir)/*.c $(srcdir)/*.xml $(srcdir)/*.xsl $(srcdir)/*.res $(DESTDIR)$(HTML_DIR) | |
11 | + -@INSTALL@ -m 0644 $(srcdir)/*.html $(DESTDIR)$(HTML_DIR) | 11 | + -@INSTALL@ -m 0644 $(srcdir)/*.html $(DESTDIR)$(HTML_DIR) | |
12 | 12 | |||
13 | valgrind: | 13 | valgrind: | |
14 | $(MAKE) CHECKER='valgrind' tests | 14 | $(MAKE) CHECKER='valgrind' tests |