cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 2.6.32

Browse Source
This commit is contained in:
steven 2008-05-06 18:53:01 +00:00
parent 2729156e6b
commit 28437252b2
10 changed files with 55 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
textproc/libxml/Makefile
View File

@ -1,13 +1,13 @@
# $OpenBSD: Makefile,v 1.112 2008/04/01 11:36:24 jasper Exp $ # $OpenBSD: Makefile,v 1.113 2008/05/06 18:53:01 steven Exp $
COMMENT-main= XML parsing library COMMENT-main= XML parsing library
COMMENT-python= Python bindings for libxml COMMENT-python= Python bindings for libxml
VERSION= 2.6.30 VERSION= 2.6.32
DISTNAME= libxml2-${VERSION} DISTNAME= libxml2-${VERSION}
PKGNAME-main= libxml-${VERSION}p0 PKGNAME-main= libxml-${VERSION}
PKGNAME-python= py-libxml-${VERSION}p1 PKGNAME-python= py-libxml-${VERSION}
SHARED_LIBS= xml2 9.7 SHARED_LIBS= xml2 9.8
CATEGORIES= textproc CATEGORIES= textproc
MASTER_SITES= ftp://xmlsoft.org/libxml/ \ MASTER_SITES= ftp://xmlsoft.org/libxml/ \
${MASTER_SITE_GNOME:=sources/libxml2/2.6/} ${MASTER_SITE_GNOME:=sources/libxml2/2.6/}

10
textproc/libxml/distinfo
View File

@ -1,5 +1,5 @@
MD5 (libxml2-2.6.30.tar.gz) = Rg5thT6CTacA1phTLlcxaw== MD5 (libxml2-2.6.32.tar.gz) = JiHTIsFvAlfjDw/ysTOE3g==
RMD160 (libxml2-2.6.30.tar.gz) = itzKKmC06Q3omNlxCjpFBptzu/4= RMD160 (libxml2-2.6.32.tar.gz) = 7bnJqBPssS6yFNH3XZJ6yzgUgxw=
SHA1 (libxml2-2.6.30.tar.gz) = UZcB3zoQdwmA6ZMzb+Ge99lbW7o= SHA1 (libxml2-2.6.32.tar.gz) = HEZcDvnSG7Sn3wLU7frX3+HiY98=
SHA256 (libxml2-2.6.30.tar.gz) = h3dioPRHhUh9dH7XvT2zZK3nWUPm2OnEn6Y0DDgzc14= SHA256 (libxml2-2.6.32.tar.gz) = G0QouHmvyq48IBOyEoO6rQQGYfvVAuiT6DrcPRXIXVM=
SIZE (libxml2-2.6.30.tar.gz) = 4726657 SIZE (libxml2-2.6.32.tar.gz) = 4722227

10
textproc/libxml/patches/patch-Makefile.in
View File

@ -1,6 +1,6 @@
--- Makefile.in.orig Tue Jun 12 18:20:23 2007 --- Makefile.in.orig Tue Apr 8 16:55:03 2008
+++ Makefile.in Mon Jul 2 12:50:32 2007 +++ Makefile.in Sat Apr 26 10:51:02 2008
@@ -525,7 +525,7 @@ testModule_DEPENDENCIES = $(DEPS) @@ -584,7 +584,7 @@ testModule_DEPENDENCIES = $(DEPS)
testModule_LDADD = $(LDADDS) testModule_LDADD = $(LDADDS)
noinst_LTLIBRARIES = testdso.la noinst_LTLIBRARIES = testdso.la
testdso_la_SOURCES = testdso.c testdso_la_SOURCES = testdso.c
@ -9,7 +9,7 @@
testapi_SOURCES = testapi.c testapi_SOURCES = testapi.c
testapi_LDFLAGS = testapi_LDFLAGS =
testapi_DEPENDENCIES = $(DEPS) testapi_DEPENDENCIES = $(DEPS)
@@ -554,7 +554,7 @@ pkgconfig_DATA = libxml-2.0.pc @@ -613,7 +613,7 @@ pkgconfig_DATA = libxml-2.0.pc
# Install the tests program sources as examples # Install the tests program sources as examples
# #
BASE_DIR = $(datadir)/doc BASE_DIR = $(datadir)/doc
@ -18,7 +18,7 @@
EXAMPLES_DIR = $(BASE_DIR)/$(DOC_MODULE)/examples EXAMPLES_DIR = $(BASE_DIR)/$(DOC_MODULE)/examples
all: config.h all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive $(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -1922,6 +1922,7 @@ SVGtests : xmllint$(EXEEXT) @@ -1990,6 +1990,7 @@ SVGtests : xmllint$(EXEEXT)
grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\
else \ else \
echo Testing $$name ; \ echo Testing $$name ; \

8
textproc/libxml/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.17 2007/07/05 16:05:09 steven Exp $ $OpenBSD: patch-configure,v 1.18 2008/05/06 18:53:01 steven Exp $
--- configure.orig Tue Jun 12 18:10:36 2007 --- configure.orig Tue Apr 8 16:48:27 2008
+++ configure Mon Jul 2 12:50:32 2007 +++ configure Sat Apr 26 10:51:02 2008
@@ -27029,7 +27029,7 @@ fi @@ -27302,7 +27302,7 @@ fi
fi fi
if test "$with_python" != "" if test "$with_python" != ""
then then

12
textproc/libxml/patches/patch-doc_Makefile_in
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-doc_Makefile_in,v 1.15 2007/07/05 16:05:09 steven Exp $ $OpenBSD: patch-doc_Makefile_in,v 1.16 2008/05/06 18:53:01 steven Exp $
--- doc/Makefile.in.orig Tue Jun 12 18:20:21 2007 --- doc/Makefile.in.orig Tue Apr 8 16:55:01 2008
+++ doc/Makefile.in Mon Jul 2 12:50:32 2007 +++ doc/Makefile.in Sat Apr 26 10:51:46 2008
@@ -274,7 +274,7 @@ sbindir = @sbindir@ @@ -275,7 +275,7 @@ sysconfdir = @sysconfdir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@ target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-SUBDIRS = devhelp examples -SUBDIRS = devhelp examples
+SUBDIRS = examples +SUBDIRS = examples

58
textproc/libxml/patches/patch-parserInternals_c
View File

@ -1,58 +0,0 @@
$OpenBSD: patch-parserInternals_c,v 1.1 2008/04/01 11:34:16 jasper Exp $
--- parserInternals.c.orig Tue Jun 12 15:33:54 2007
+++ parserInternals.c Tue Apr 1 10:36:06 2008
@@ -638,14 +638,13 @@ xmlCurrentChar(xmlParserCtxtPtr ctxt, int *len) {
c = *cur;
if (c & 0x80) {
- if (c == 0xC0)
+ if (((c & 0x40) == 0) || (c == 0xC0))
goto encoding_error;
if (cur[1] == 0)
xmlParserInputGrow(ctxt->input, INPUT_CHUNK);
if ((cur[1] & 0xc0) != 0x80)
goto encoding_error;
if ((c & 0xe0) == 0xe0) {
-
if (cur[2] == 0)
xmlParserInputGrow(ctxt->input, INPUT_CHUNK);
if ((cur[2] & 0xc0) != 0x80)
@@ -662,18 +661,24 @@ xmlCurrentChar(xmlParserCtxtPtr ctxt, int *len) {
val |= (cur[1] & 0x3f) << 12;
val |= (cur[2] & 0x3f) << 6;
val |= cur[3] & 0x3f;
+ if (val < 0x10000)
+ goto encoding_error;
} else {
/* 3-byte code */
*len = 3;
val = (cur[0] & 0xf) << 12;
val |= (cur[1] & 0x3f) << 6;
val |= cur[2] & 0x3f;
+ if (val < 0x800)
+ goto encoding_error;
}
} else {
/* 2-byte code */
*len = 2;
val = (cur[0] & 0x1f) << 6;
val |= cur[1] & 0x3f;
+ if (val < 0x80)
+ goto encoding_error;
}
if (!IS_CHAR(val)) {
xmlErrEncodingInt(ctxt, XML_ERR_INVALID_CHAR,
@@ -683,6 +688,13 @@ xmlCurrentChar(xmlParserCtxtPtr ctxt, int *len) {
} else {
/* 1-byte code */
*len = 1;
+ if (*ctxt->input->cur == 0)
+ xmlParserInputGrow(ctxt->input, INPUT_CHUNK);
+ if ((*ctxt->input->cur == 0) &&
+ (ctxt->input->end > ctxt->input->cur)) {
+ xmlErrEncodingInt(ctxt, XML_ERR_INVALID_CHAR,
+ "Char 0x%X out of allowed range\n", val);
+ }
if (*ctxt->input->cur == 0xD) {
if (ctxt->input->cur[1] == 0xA) {
ctxt->nbChars++;

21
textproc/libxml/patches/patch-python_Makefile_in
View File

@ -1,13 +1,12 @@
$OpenBSD: patch-python_Makefile_in,v 1.8 2007/07/05 16:05:09 steven Exp $ $OpenBSD: patch-python_Makefile_in,v 1.9 2008/05/06 18:53:01 steven Exp $
--- python/Makefile.in.orig Tue Jun 12 18:20:22 2007 --- python/Makefile.in.orig Tue Apr 8 16:55:02 2008
+++ python/Makefile.in Mon Jul 2 12:50:32 2007 +++ python/Makefile.in Sat Apr 26 11:53:47 2008
@@ -735,9 +735,6 @@ uninstall-info: uninstall-info-recursive @@ -737,7 +737,7 @@ info: info-recursive
@WITH_PYTHON_TRUE@ $(mkinstalldirs) $(DESTDIR)$(pythondir)
@WITH_PYTHON_TRUE@ @INSTALL@ -m 0644 libxml2.py $(DESTDIR)$(pythondir)
@WITH_PYTHON_TRUE@ @INSTALL@ -m 0644 $(srcdir)/drv_libxml2.py $(DESTDIR)$(pythondir)
-@WITH_PYTHON_TRUE@ $(mkinstalldirs) $(DESTDIR)$(DOCS_DIR)
-@WITH_PYTHON_TRUE@ @(for doc in $(DOCS) ; \
-@WITH_PYTHON_TRUE@ do @INSTALL@ -m 0644 $$doc $(DESTDIR)$(DOCS_DIR) ; done)
@WITH_PYTHON_TRUE@$(GENERATED): gen_prog info-am:
-install-data-am: install-dist_docsDATA install-dist_pythonDATA \
+install-data-am: install-dist_pythonDATA \
install-pythonDATA install-pythonLTLIBRARIES
install-dvi: install-dvi-recursive

17
textproc/libxml/patches/patch-python_tests_Makefile_in
View File

@ -1,7 +1,16 @@
$OpenBSD: patch-python_tests_Makefile_in,v 1.7 2007/07/05 16:05:09 steven Exp $ $OpenBSD: patch-python_tests_Makefile_in,v 1.8 2008/05/06 18:53:01 steven Exp $
--- python/tests/Makefile.in.orig Tue Jun 12 18:20:23 2007 --- python/tests/Makefile.in.orig Tue Apr 8 16:55:02 2008
+++ python/tests/Makefile.in Mon Jul 2 12:50:32 2007 +++ python/tests/Makefile.in Sat Apr 26 11:59:41 2008
@@ -297,7 +297,6 @@ PYTESTS = \ @@ -270,7 +270,7 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-exampledir = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION)/examples
+exampledir = $(datadir)/examples/libxml2
dist_example_DATA = $(PYTESTS) $(XMLS)
PYTESTS = \
build.py \
@@ -307,7 +307,6 @@ PYTESTS = \
readererr.py\ readererr.py\
relaxng.py \ relaxng.py \
schema.py \ schema.py \

10
textproc/libxml/patches/patch-xstc_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-xstc_Makefile_in,v 1.1 2007/07/05 16:05:09 steven Exp $ $OpenBSD: patch-xstc_Makefile_in,v 1.2 2008/05/06 18:53:01 steven Exp $
--- xstc/Makefile.in.orig Mon Jul 2 13:45:51 2007 --- xstc/Makefile.in.orig Tue Apr 8 16:55:02 2008
+++ xstc/Makefile.in Mon Jul 2 13:46:06 2007 +++ xstc/Makefile.in Sat Apr 26 10:51:02 2008
@@ -461,7 +461,7 @@ $(TESTDIRS) Tests/Metadata/$(NISTTESTDEF_2) Tests/Meta @@ -471,7 +471,7 @@ $(TESTDIRS) Tests/Metadata/$(NISTTESTDEF_2) Tests/Meta
else echo "Dont' know how to fetch $(TARBALLURL_2)" ; fi ; fi ; fi) else echo "Dont' know how to fetch $(TARBALLURL_2)" ; fi ; fi ; fi)
-@(if [ -f $(TARBALL_2) ] ; then \ -@(if [ -f $(TARBALL_2) ] ; then \
echo -n "extracting test data (NIST)..." ; \ echo -n "extracting test data (NIST)..." ; \
@ -10,7 +10,7 @@ $OpenBSD: patch-xstc_Makefile_in,v 1.1 2007/07/05 16:05:09 steven Exp $
echo "done" ; \ echo "done" ; \
fi) fi)
-@(if [ ! -f $(TARBALL) ] ; then \ -@(if [ ! -f $(TARBALL) ] ; then \
@@ -473,7 +473,7 @@ $(TESTDIRS) Tests/Metadata/$(NISTTESTDEF_2) Tests/Meta @@ -483,7 +483,7 @@ $(TESTDIRS) Tests/Metadata/$(NISTTESTDEF_2) Tests/Meta
else echo "Dont' know how to fetch $(TARBALLURL)" ; fi ; fi ; fi) else echo "Dont' know how to fetch $(TARBALLURL)" ; fi ; fi ; fi)
-@(if [ -f $(TARBALL) ] ; then \ -@(if [ -f $(TARBALL) ] ; then \
echo -n "extracting test data (Sun, Microsoft)..." ; \ echo -n "extracting test data (Sun, Microsoft)..." ; \

3
textproc/libxml/pkg/PFRAG.shared-python
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PFRAG.shared-python,v 1.2 2007/04/23 15:34:04 steven Exp $ @comment $OpenBSD: PFRAG.shared-python,v 1.3 2008/05/06 18:53:01 steven Exp $
lib/python${MODPY_VERSION}/ lib/python${MODPY_VERSION}/
lib/python${MODPY_VERSION}/site-packages/ lib/python${MODPY_VERSION}/site-packages/
lib/python${MODPY_VERSION}/site-packages/drv_libxml2.py lib/python${MODPY_VERSION}/site-packages/drv_libxml2.py
@ -55,4 +55,5 @@ share/examples/libxml2/validate.py
share/examples/libxml2/walker.py share/examples/libxml2/walker.py
share/examples/libxml2/xpath.py share/examples/libxml2/xpath.py
share/examples/libxml2/xpathext.py share/examples/libxml2/xpathext.py
share/examples/libxml2/xpathns.py
share/examples/libxml2/xpathret.py share/examples/libxml2/xpathret.py