[arch-commits] Commit in libxml2/repos (3 files)
Ionut Biru
ibiru at archlinux.org
Thu Nov 5 19:35:39 UTC 2009
Date: Thursday, November 5, 2009 @ 14:35:39
Author: ibiru
Revision: 58182
Merged revisions 58140 via svnmerge from
svn+ssh://gerolde.archlinux.org/srv/svn-packages/libxml2/trunk
........
r58140 | jgc | 2009-11-04 14:06:09 +0200 (Wed, 04 Nov 2009) | 1 line
Update to 2.7.6 - remove old security patch, integrated upstream
........
Modified:
libxml2/repos/extra-i686/ (properties)
libxml2/repos/extra-i686/PKGBUILD
Deleted:
libxml2/repos/extra-i686/libxml2-2.7.3-ficora-parse.patch
----------------------------------+
PKGBUILD | 13 +--
libxml2-2.7.3-ficora-parse.patch | 159 -------------------------------------
2 files changed, 5 insertions(+), 167 deletions(-)
Property changes on: libxml2/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
- /libxml2/trunk:1-49695
+ /libxml2/trunk:1-58181
Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2009-11-05 19:33:54 UTC (rev 58181)
+++ extra-i686/PKGBUILD 2009-11-05 19:35:39 UTC (rev 58182)
@@ -3,8 +3,8 @@
# Contributor: John Proctor <jproctor at prium.net>
pkgname=libxml2
-pkgver=2.7.3
-pkgrel=3
+pkgver=2.7.6
+pkgrel=1
pkgdesc="XML parsing library, version 2"
arch=(i686 x86_64)
license=('custom')
@@ -13,16 +13,13 @@
options=('!libtool')
url="http://www.xmlsoft.org/"
source=(ftp://ftp.xmlsoft.org/${pkgname}/${pkgname}-${pkgver}.tar.gz
- largefile64.patch
- libxml2-2.7.3-ficora-parse.patch)
-md5sums=('8f4fda3969237c2a33bdb1583b5d06b2'
- '5ad4915665608ebfa5b89f7908467a72'
- 'e4ed4ef08a941d44d053f5418945fc5d')
+ largefile64.patch)
+md5sums=('7740a8ec23878a2f50120e1faa2730f2'
+ '5ad4915665608ebfa5b89f7908467a72')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
patch -Np1 -i "${srcdir}/largefile64.patch" || return 1
- patch -Np1 -i "${srcdir}/libxml2-2.7.3-ficora-parse.patch" || return 1
./configure --prefix=/usr --with-threads --with-history || return 1
make || return 1
make DESTDIR="${pkgdir}" install || return 1
Deleted: extra-i686/libxml2-2.7.3-ficora-parse.patch
===================================================================
--- extra-i686/libxml2-2.7.3-ficora-parse.patch 2009-11-05 19:33:54 UTC (rev 58181)
+++ extra-i686/libxml2-2.7.3-ficora-parse.patch 2009-11-05 19:35:39 UTC (rev 58182)
@@ -1,159 +0,0 @@
-diff --git a/parser.c b/parser.c
-index a476060..b404722 100644
---- a/parser.c
-+++ b/parser.c
-@@ -5323,7 +5323,8 @@ xmlParseNotationType(xmlParserCtxtPtr ctxt) {
- if (name == NULL) {
- xmlFatalErrMsg(ctxt, XML_ERR_NAME_REQUIRED,
- "Name expected in NOTATION declaration\n");
-- return(ret);
-+ xmlFreeEnumeration(ret);
-+ return(NULL);
- }
- tmp = ret;
- while (tmp != NULL) {
-@@ -5339,7 +5340,10 @@ xmlParseNotationType(xmlParserCtxtPtr ctxt) {
- }
- if (tmp == NULL) {
- cur = xmlCreateEnumeration(name);
-- if (cur == NULL) return(ret);
-+ if (cur == NULL) {
-+ xmlFreeEnumeration(ret);
-+ return(NULL);
-+ }
- if (last == NULL) ret = last = cur;
- else {
- last->next = cur;
-@@ -5350,9 +5354,8 @@ xmlParseNotationType(xmlParserCtxtPtr ctxt) {
- } while (RAW == '|');
- if (RAW != ')') {
- xmlFatalErr(ctxt, XML_ERR_NOTATION_NOT_FINISHED, NULL);
-- if ((last != NULL) && (last != ret))
-- xmlFreeEnumeration(last);
-- return(ret);
-+ xmlFreeEnumeration(ret);
-+ return(NULL);
- }
- NEXT;
- return(ret);
-@@ -5407,7 +5410,10 @@ xmlParseEnumerationType(xmlParserCtxtPtr ctxt) {
- cur = xmlCreateEnumeration(name);
- if (!xmlDictOwns(ctxt->dict, name))
- xmlFree(name);
-- if (cur == NULL) return(ret);
-+ if (cur == NULL) {
-+ xmlFreeEnumeration(ret);
-+ return(NULL);
-+ }
- if (last == NULL) ret = last = cur;
- else {
- last->next = cur;
-@@ -5775,9 +5781,10 @@ xmlParseElementMixedContentDecl(xmlParserCtxtPtr ctxt, int inputchk) {
- }
-
- /**
-- * xmlParseElementChildrenContentDecl:
-+ * xmlParseElementChildrenContentDeclPriv:
- * @ctxt: an XML parser context
- * @inputchk: the input used for the current entity, needed for boundary checks
-+ * @depth: the level of recursion
- *
- * parse the declaration for a Mixed Element content
- * The leading '(' and spaces have been skipped in xmlParseElementContentDecl
-@@ -5805,12 +5812,20 @@ xmlParseElementMixedContentDecl(xmlParserCtxtPtr ctxt, int inputchk) {
- * Returns the tree of xmlElementContentPtr describing the element
- * hierarchy.
- */
--xmlElementContentPtr
--xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputchk) {
-+static xmlElementContentPtr
-+xmlParseElementChildrenContentDeclPriv(xmlParserCtxtPtr ctxt, int inputchk,
-+ int depth) {
- xmlElementContentPtr ret = NULL, cur = NULL, last = NULL, op = NULL;
- const xmlChar *elem;
- xmlChar type = 0;
-
-+ if (((depth > 128) && ((ctxt->options & XML_PARSE_HUGE) == 0)) ||
-+ (depth > 2048)) {
-+ xmlFatalErrMsgInt(ctxt, XML_ERR_ELEMCONTENT_NOT_FINISHED,
-+"xmlParseElementChildrenContentDecl : depth %d too deep, use XML_PARSE_HUGE\n",
-+ depth);
-+ return(NULL);
-+ }
- SKIP_BLANKS;
- GROW;
- if (RAW == '(') {
-@@ -5819,7 +5834,8 @@ xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputchk) {
- /* Recurse on first child */
- NEXT;
- SKIP_BLANKS;
-- cur = ret = xmlParseElementChildrenContentDecl(ctxt, inputid);
-+ cur = ret = xmlParseElementChildrenContentDeclPriv(ctxt, inputid,
-+ depth + 1);
- SKIP_BLANKS;
- GROW;
- } else {
-@@ -5951,7 +5967,8 @@ xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputchk) {
- /* Recurse on second child */
- NEXT;
- SKIP_BLANKS;
-- last = xmlParseElementChildrenContentDecl(ctxt, inputid);
-+ last = xmlParseElementChildrenContentDeclPriv(ctxt, inputid,
-+ depth + 1);
- SKIP_BLANKS;
- } else {
- elem = xmlParseName(ctxt);
-@@ -6062,6 +6079,44 @@ xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputchk) {
- }
-
- /**
-+ *
-+ * xmlParseElementChildrenContentDecl:
-+ * @ctxt: an XML parser context
-+ * @inputchk: the input used for the current entity, needed for boundary checks
-+ * @depth: the level of recursion
-+ *
-+ * parse the declaration for a Mixed Element content
-+ * The leading '(' and spaces have been skipped in xmlParseElementContentDecl
-+ *
-+ * [47] children ::= (choice | seq) ('?' | '*' | '+')?
-+ *
-+ * [48] cp ::= (Name | choice | seq) ('?' | '*' | '+')?
-+ *
-+ * [49] choice ::= '(' S? cp ( S? '|' S? cp )* S? ')'
-+ *
-+ * [50] seq ::= '(' S? cp ( S? ',' S? cp )* S? ')'
-+ *
-+ * [ VC: Proper Group/PE Nesting ] applies to [49] and [50]
-+ * TODO Parameter-entity replacement text must be properly nested
-+ * with parenthesized groups. That is to say, if either of the
-+ * opening or closing parentheses in a choice, seq, or Mixed
-+ * construct is contained in the replacement text for a parameter
-+ * entity, both must be contained in the same replacement text. For
-+ * interoperability, if a parameter-entity reference appears in a
-+ * choice, seq, or Mixed construct, its replacement text should not
-+ * be empty, and neither the first nor last non-blank character of
-+ * the replacement text should be a connector (| or ,).
-+ *
-+ * Returns the tree of xmlElementContentPtr describing the element
-+ * hierarchy.
-+ */
-+xmlElementContentPtr
-+xmlParseElementChildrenContentDecl(xmlParserCtxtPtr ctxt, int inputchk) {
-+ /* stub left for API/ABI compat */
-+ return(xmlParseElementChildrenContentDeclPriv(ctxt, inputchk, 1));
-+}
-+
-+/**
- * xmlParseElementContentDecl:
- * @ctxt: an XML parser context
- * @name: the name of the element being defined.
-@@ -6097,7 +6152,7 @@ xmlParseElementContentDecl(xmlParserCtxtPtr ctxt, const xmlChar *name,
- tree = xmlParseElementMixedContentDecl(ctxt, inputid);
- res = XML_ELEMENT_TYPE_MIXED;
- } else {
-- tree = xmlParseElementChildrenContentDecl(ctxt, inputid);
-+ tree = xmlParseElementChildrenContentDeclPriv(ctxt, inputid, 1);
- res = XML_ELEMENT_TYPE_ELEMENT;
- }
- SKIP_BLANKS;
More information about the arch-commits
mailing list