libxml2 ver. bump
This commit is contained in:
@@ -14,6 +14,8 @@ def setup():
|
|||||||
# fix sandbox violations when attempt to read "/missing.xml"
|
# fix sandbox violations when attempt to read "/missing.xml"
|
||||||
pisitools.dosed("testapi.c", "\/missing.xml", "missing.xml")
|
pisitools.dosed("testapi.c", "\/missing.xml", "missing.xml")
|
||||||
|
|
||||||
|
autotools.autoreconf("-fiv")
|
||||||
|
|
||||||
shelltools.system("mkdir build-py{2,3}")
|
shelltools.system("mkdir build-py{2,3}")
|
||||||
shelltools.cd("build-py2")
|
shelltools.cd("build-py2")
|
||||||
shelltools.sym("../configure", "configure")
|
shelltools.sym("../configure", "configure")
|
||||||
@@ -32,7 +34,7 @@ def setup():
|
|||||||
--without-python"
|
--without-python"
|
||||||
else: options += " --with-python=/usr/bin/python \
|
else: options += " --with-python=/usr/bin/python \
|
||||||
--libdir=/usr/lib"
|
--libdir=/usr/lib"
|
||||||
|
|
||||||
autotools.configure(options)
|
autotools.configure(options)
|
||||||
pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
|
pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
|
||||||
|
|
||||||
@@ -63,11 +65,11 @@ def build():
|
|||||||
shelltools.cd("../build-py3")
|
shelltools.cd("../build-py3")
|
||||||
autotools.make()
|
autotools.make()
|
||||||
|
|
||||||
#def check():
|
def check():
|
||||||
#shelltools.cd("build-py2")
|
shelltools.cd("build-py2")
|
||||||
#autotools.make("check")
|
autotools.make("check")
|
||||||
#shelltools.cd("../build-py3")
|
shelltools.cd("../build-py3")
|
||||||
#autotools.make("check")
|
autotools.make("check")
|
||||||
|
|
||||||
def install():
|
def install():
|
||||||
shelltools.cd("build-py2")
|
shelltools.cd("build-py2")
|
||||||
|
|||||||
@@ -0,0 +1,33 @@
|
|||||||
|
https://gitlab.gnome.org/GNOME/libxml2/-/issues/252
|
||||||
|
|
||||||
|
From 5d6403682a3463f29a1f7c27aa54ecb5e3971547 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Sam James <sam@gentoo.org>
|
||||||
|
Date: Thu, 13 May 2021 17:40:22 +0000
|
||||||
|
Subject: [PATCH] Disable fuzz tests
|
||||||
|
|
||||||
|
Not all of the fuzz files are included with the dist tarball,
|
||||||
|
so disabling them for now to get the release in with most tests
|
||||||
|
given the security bug.
|
||||||
|
--- a/Makefile.am
|
||||||
|
+++ b/Makefile.am
|
||||||
|
@@ -2,9 +2,9 @@
|
||||||
|
|
||||||
|
ACLOCAL_AMFLAGS = -I m4
|
||||||
|
|
||||||
|
-SUBDIRS = include . doc example fuzz xstc $(PYTHON_SUBDIR)
|
||||||
|
+SUBDIRS = include . doc example xstc $(PYTHON_SUBDIR)
|
||||||
|
|
||||||
|
-DIST_SUBDIRS = include . doc example fuzz python xstc
|
||||||
|
+DIST_SUBDIRS = include . doc example python xstc
|
||||||
|
|
||||||
|
AM_CPPFLAGS = -I$(top_builddir)/include -I$(srcdir)/include
|
||||||
|
|
||||||
|
@@ -210,7 +210,6 @@ runtests: runtest$(EXEEXT) testrecurse$(EXEEXT) testapi$(EXEEXT) \
|
||||||
|
$(CHECKER) ./runxmlconf$(EXEEXT)
|
||||||
|
@(if [ "$(PYTHON_SUBDIR)" != "" ] ; then cd python ; \
|
||||||
|
$(MAKE) tests ; fi)
|
||||||
|
- @cd fuzz; $(MAKE) tests
|
||||||
|
|
||||||
|
check: all runtests
|
||||||
|
|
||||||
|
--
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
https://gitlab.gnome.org/GNOME/libxml2/merge_requests/14
|
||||||
|
|
||||||
|
From 54878c018af979b20ca1bfbf12599973484cae5b Mon Sep 17 00:00:00 2001
|
||||||
|
From: Mike Frysinger <vapier@gentoo.org>
|
||||||
|
Date: Thu, 3 Jan 2019 05:44:03 -0500
|
||||||
|
Subject: [PATCH] fix reader5.py test when building out of tree
|
||||||
|
|
||||||
|
When building out of tree, the relative path this test uses doesn't
|
||||||
|
work. Resolve the path relative to the test script itself instead.
|
||||||
|
|
||||||
|
Url: https://bugs.gentoo.org/565576
|
||||||
|
--- a/python/tests/reader5.py
|
||||||
|
+++ b/python/tests/reader5.py
|
||||||
|
@@ -4,6 +4,7 @@
|
||||||
|
# this extract the Dragon bibliography entries from the XML specification
|
||||||
|
#
|
||||||
|
import libxml2
|
||||||
|
+import os
|
||||||
|
import sys
|
||||||
|
|
||||||
|
# Memory debug specific
|
||||||
|
@@ -14,7 +15,8 @@ Ravi Sethi, and Jeffrey D. Ullman.
|
||||||
|
<emph>Compilers: Principles, Techniques, and Tools</emph>.
|
||||||
|
Reading: Addison-Wesley, 1986, rpt. corr. 1988.</bibl>"""
|
||||||
|
|
||||||
|
-f = open('../../test/valid/REC-xml-19980210.xml', 'rb')
|
||||||
|
+basedir = os.path.dirname(os.path.realpath(__file__))
|
||||||
|
+f = open(os.path.join(basedir, '../../test/valid/REC-xml-19980210.xml'), 'rb')
|
||||||
|
input = libxml2.inputBuffer(f)
|
||||||
|
reader = input.newTextReader("REC")
|
||||||
|
res=""
|
||||||
|
--
|
||||||
@@ -21,9 +21,10 @@
|
|||||||
<Dependency versionFrom="8.0.1">readline-devel</Dependency>
|
<Dependency versionFrom="8.0.1">readline-devel</Dependency>
|
||||||
</BuildDependencies>
|
</BuildDependencies>
|
||||||
<Patches>
|
<Patches>
|
||||||
<!-- <Patch level="1">fedora/libxml2-2.9.12-fix-formatting-regression.patch</Patch> -->
|
<Patch level="1">fedora/libxml2-2.9.12-fix-lxml-corrupted-tree.patch</Patch>
|
||||||
<Patch level="1">fedora/libxml2-2.9.12-fix-lxml-corrupted-tree.patch </Patch>
|
<Patch level="1">fedora/libxml2-2.9.12-fix-formatting-regression.patch</Patch>
|
||||||
<Patch level="1">fedora/libxml2-2.9.8-python3-unicode-errors.patch</Patch>
|
<Patch level="1">fedora/libxml2-2.9.8-python3-unicode-errors.patch</Patch>
|
||||||
|
<Patch level="1">libxml2-2.9.11-disable-fuzz-tests.patch</Patch>
|
||||||
</Patches>
|
</Patches>
|
||||||
</Source>
|
</Source>
|
||||||
|
|
||||||
@@ -91,11 +92,11 @@
|
|||||||
|
|
||||||
<History>
|
<History>
|
||||||
<Update release="11">
|
<Update release="11">
|
||||||
<Date>2021-06-04</Date>
|
<Date>2021-06-03</Date>
|
||||||
<Version>2.9.12</Version>
|
<Version>2.9.12</Version>
|
||||||
<Comment>Upgrade to 2.9.12</Comment>
|
<Comment>Version bump.</Comment>
|
||||||
<Name>İdris Kalp</Name>
|
<Name>Mustafa Cinasal</Name>
|
||||||
<Email>idriskalp@gmail.com</Email>
|
<Email>muscnsl@gmail.com</Email>
|
||||||
</Update>
|
</Update>
|
||||||
<Update release="10">
|
<Update release="10">
|
||||||
<Date>2021-03-13</Date>
|
<Date>2021-03-13</Date>
|
||||||
|
|||||||
Reference in New Issue
Block a user