* [ptxdist] update libxml2 and libxslt
@ 2014-10-27 20:11 Alexander Dahl
2014-10-27 20:11 ` [ptxdist] [PATCH 1/2] libxslt: update to 1.1.28 Alexander Dahl
2014-10-27 20:11 ` [ptxdist] [PATCH 2/2] libxml2: update to 2.9.2 Alexander Dahl
0 siblings, 2 replies; 22+ messages in thread
From: Alexander Dahl @ 2014-10-27 20:11 UTC (permalink / raw)
To: ptxdist
Hei hei,
after the last debian security updates for libxml2 I had a look into
ptxdist's libxml2 package and noticed it was still on a quite old
version 2.7.7 so I made a patch to update it. I also updated libxslt
along with this, because the older libxslt 1.2.6 would not build
against a 2.9.x libxml2. Because there where some tiny API changes I
compiled all dependend packages for testing which succeeded. However I
would recommend a good review!
Greets
Alex
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 22+ messages in thread
* [ptxdist] [PATCH 1/2] libxslt: update to 1.1.28
2014-10-27 20:11 [ptxdist] update libxml2 and libxslt Alexander Dahl
@ 2014-10-27 20:11 ` Alexander Dahl
2014-11-13 16:49 ` Michael Olbrich
2014-10-27 20:11 ` [ptxdist] [PATCH 2/2] libxml2: update to 2.9.2 Alexander Dahl
1 sibling, 1 reply; 22+ messages in thread
From: Alexander Dahl @ 2014-10-27 20:11 UTC (permalink / raw)
To: ptxdist
(upgrade needed for working with libxml2 > 2.9.0)
Signed-off-by: Alexander Dahl <post@lespocky.de>
---
patches/libxslt-1.1.26/series | 1 -
.../0001-xslt-config-add-SYSROOT-support.patch | 8 ++------
patches/libxslt-1.1.28/series | 4 ++++
rules/libxslt.make | 4 ++--
4 files changed, 8 insertions(+), 9 deletions(-)
delete mode 100644 patches/libxslt-1.1.26/series
rename patches/{libxslt-1.1.26 => libxslt-1.1.28}/0001-xslt-config-add-SYSROOT-support.patch (73%)
create mode 100644 patches/libxslt-1.1.28/series
diff --git a/patches/libxslt-1.1.26/series b/patches/libxslt-1.1.26/series
deleted file mode 100644
index 218abc0..0000000
--- a/patches/libxslt-1.1.26/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-xslt-config-add-SYSROOT-support.patch
diff --git a/patches/libxslt-1.1.26/0001-xslt-config-add-SYSROOT-support.patch b/patches/libxslt-1.1.28/0001-xslt-config-add-SYSROOT-support.patch
similarity index 73%
rename from patches/libxslt-1.1.26/0001-xslt-config-add-SYSROOT-support.patch
rename to patches/libxslt-1.1.28/0001-xslt-config-add-SYSROOT-support.patch
index 89b2b2b..dacc3ee 100644
--- a/patches/libxslt-1.1.26/0001-xslt-config-add-SYSROOT-support.patch
+++ b/patches/libxslt-1.1.28/0001-xslt-config-add-SYSROOT-support.patch
@@ -1,4 +1,3 @@
-From b08208f3faae4d9cdb0ef9a5840b4b3836dd7083 Mon Sep 17 00:00:00 2001
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Sun, 10 Jan 2010 01:10:34 +0100
Subject: [PATCH] xslt-config: add SYSROOT support
@@ -6,10 +5,10 @@ Subject: [PATCH] xslt-config: add SYSROOT support
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
xslt-config.in | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/xslt-config.in b/xslt-config.in
-index a1e1fb5..fcfeed3 100644
+index 45c3e28f2f12..5c009c4f4ad2 100644
--- a/xslt-config.in
+++ b/xslt-config.in
@@ -1,6 +1,6 @@
@@ -20,6 +19,3 @@ index a1e1fb5..fcfeed3 100644
exec_prefix=@exec_prefix@
exec_prefix_set=no
includedir=@includedir@
---
-1.6.6
-
diff --git a/patches/libxslt-1.1.28/series b/patches/libxslt-1.1.28/series
new file mode 100644
index 0000000..04dc8b0
--- /dev/null
+++ b/patches/libxslt-1.1.28/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-xslt-config-add-SYSROOT-support.patch
+# 646fc10f99566b9f24135a2ca6e26cbc - git-ptx-patches magic
diff --git a/rules/libxslt.make b/rules/libxslt.make
index 5bf63b5..5ea8d23 100644
--- a/rules/libxslt.make
+++ b/rules/libxslt.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_LIBXSLT) += libxslt
#
# Paths and names
#
-LIBXSLT_VERSION := 1.1.26
-LIBXSLT_MD5 := e61d0364a30146aaa3001296f853b2b9
+LIBXSLT_VERSION := 1.1.28
+LIBXSLT_MD5 := 9667bf6f9310b957254fdcf6596600b7
LIBXSLT := libxslt-$(LIBXSLT_VERSION)
LIBXSLT_SUFFIX := tar.gz
LIBXSLT_SOURCE := $(SRCDIR)/$(LIBXSLT).$(LIBXSLT_SUFFIX)
--
1.7.10.4
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 22+ messages in thread
* [ptxdist] [PATCH 2/2] libxml2: update to 2.9.2
2014-10-27 20:11 [ptxdist] update libxml2 and libxslt Alexander Dahl
2014-10-27 20:11 ` [ptxdist] [PATCH 1/2] libxslt: update to 1.1.28 Alexander Dahl
@ 2014-10-27 20:11 ` Alexander Dahl
2014-11-13 16:50 ` Michael Olbrich
1 sibling, 1 reply; 22+ messages in thread
From: Alexander Dahl @ 2014-10-27 20:11 UTC (permalink / raw)
To: ptxdist
Also integrated two changes from upstream fixing two minor issues.
Build successfully tested against all ptxdist packages requiring
libxml2, no runtime tests.
Signed-off-by: Alexander Dahl <post@lespocky.de>
---
patches/libxml2-2.7.7/series | 3 ---
...ing-initialization-for-the-catalog-module.patch | 25 ++++++++++++++++++
...-missing-entities-after-CVE-2014-3660-fix.patch | 27 ++++++++++++++++++++
.../0200-xml2-config-is-not-SYSROOT-aware.patch} | 7 ++---
patches/libxml2-2.9.2/series | 8 ++++++
rules/libxml2.make | 4 +--
6 files changed, 64 insertions(+), 10 deletions(-)
delete mode 100644 patches/libxml2-2.7.7/series
create mode 100644 patches/libxml2-2.9.2/0001-Revert-Missing-initialization-for-the-catalog-module.patch
create mode 100644 patches/libxml2-2.9.2/0002-Fix-missing-entities-after-CVE-2014-3660-fix.patch
rename patches/{libxml2-2.7.7/0001-xml2-config-is-not-SYSROOT-aware.patch => libxml2-2.9.2/0200-xml2-config-is-not-SYSROOT-aware.patch} (84%)
create mode 100644 patches/libxml2-2.9.2/series
diff --git a/patches/libxml2-2.7.7/series b/patches/libxml2-2.7.7/series
deleted file mode 100644
index 404fb88..0000000
--- a/patches/libxml2-2.7.7/series
+++ /dev/null
@@ -1,3 +0,0 @@
-# generated by git-ptx-patches
-0001-xml2-config-is-not-SYSROOT-aware.patch
-# 39e3efe4b37f5ed3cf17be9609775022 - git-ptx-patches magic
diff --git a/patches/libxml2-2.9.2/0001-Revert-Missing-initialization-for-the-catalog-module.patch b/patches/libxml2-2.9.2/0001-Revert-Missing-initialization-for-the-catalog-module.patch
new file mode 100644
index 0000000..9377a64
--- /dev/null
+++ b/patches/libxml2-2.9.2/0001-Revert-Missing-initialization-for-the-catalog-module.patch
@@ -0,0 +1,25 @@
+From: Daniel Veillard <veillard@redhat.com>
+Date: Fri, 17 Oct 2014 17:13:41 +0800
+Subject: [PATCH] Revert "Missing initialization for the catalog module"
+
+This reverts commit 054c716ea1bf001544127a4ab4f4346d1b9947e7.
+As this break xmlcatalog command
+https://bugzilla.redhat.com/show_bug.cgi?id=1153753
+---
+ parser.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/parser.c b/parser.c
+index 1d9396786ba7..67c9dfd9ad9f 100644
+--- a/parser.c
++++ b/parser.c
+@@ -14830,9 +14830,6 @@ xmlInitParser(void) {
+ #ifdef LIBXML_XPATH_ENABLED
+ xmlXPathInit();
+ #endif
+-#ifdef LIBXML_CATALOG_ENABLED
+- xmlInitializeCatalog();
+-#endif
+ xmlParserInitialized = 1;
+ #ifdef LIBXML_THREAD_ENABLED
+ }
diff --git a/patches/libxml2-2.9.2/0002-Fix-missing-entities-after-CVE-2014-3660-fix.patch b/patches/libxml2-2.9.2/0002-Fix-missing-entities-after-CVE-2014-3660-fix.patch
new file mode 100644
index 0000000..845610a
--- /dev/null
+++ b/patches/libxml2-2.9.2/0002-Fix-missing-entities-after-CVE-2014-3660-fix.patch
@@ -0,0 +1,27 @@
+From: Daniel Veillard <veillard@redhat.com>
+Date: Thu, 23 Oct 2014 11:35:36 +0800
+Subject: [PATCH] Fix missing entities after CVE-2014-3660 fix
+
+For https://bugzilla.gnome.org/show_bug.cgi?id=738805
+
+The fix for CVE-2014-3660 introduced a regression in some case
+where entity substitution is required and the entity is used
+first in anotther entity referenced from an attribute value
+---
+ parser.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/parser.c b/parser.c
+index 67c9dfd9ad9f..a8d1b6731681 100644
+--- a/parser.c
++++ b/parser.c
+@@ -7235,7 +7235,8 @@ xmlParseReference(xmlParserCtxtPtr ctxt) {
+ * far more secure as the parser will only process data coming from
+ * the document entity by default.
+ */
+- if ((ent->checked == 0) &&
++ if (((ent->checked == 0) ||
++ ((ent->children == NULL) && (ctxt->options & XML_PARSE_NOENT))) &&
+ ((ent->etype != XML_EXTERNAL_GENERAL_PARSED_ENTITY) ||
+ (ctxt->options & (XML_PARSE_NOENT | XML_PARSE_DTDVALID)))) {
+ unsigned long oldnbent = ctxt->nbentities;
diff --git a/patches/libxml2-2.7.7/0001-xml2-config-is-not-SYSROOT-aware.patch b/patches/libxml2-2.9.2/0200-xml2-config-is-not-SYSROOT-aware.patch
similarity index 84%
rename from patches/libxml2-2.7.7/0001-xml2-config-is-not-SYSROOT-aware.patch
rename to patches/libxml2-2.9.2/0200-xml2-config-is-not-SYSROOT-aware.patch
index 817c0b9..d096e3c 100644
--- a/patches/libxml2-2.7.7/0001-xml2-config-is-not-SYSROOT-aware.patch
+++ b/patches/libxml2-2.9.2/0200-xml2-config-is-not-SYSROOT-aware.patch
@@ -7,10 +7,10 @@ This patch adds $SYSROOT support to xml2-config.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
xml2-config.in | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/xml2-config.in b/xml2-config.in
-index 2989325..4e170b6 100644
+index 19574864cb6a..ee1949ce9542 100644
--- a/xml2-config.in
+++ b/xml2-config.in
@@ -1,6 +1,6 @@
@@ -21,6 +21,3 @@ index 2989325..4e170b6 100644
exec_prefix=@exec_prefix@
includedir=@includedir@
libdir=@libdir@
---
-1.7.1
-
diff --git a/patches/libxml2-2.9.2/series b/patches/libxml2-2.9.2/series
new file mode 100644
index 0000000..e8eef47
--- /dev/null
+++ b/patches/libxml2-2.9.2/series
@@ -0,0 +1,8 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+#tag:upstream --start-number 1
+0001-Revert-Missing-initialization-for-the-catalog-module.patch
+0002-Fix-missing-entities-after-CVE-2014-3660-fix.patch
+#tag:ptx --start-number 200
+0200-xml2-config-is-not-SYSROOT-aware.patch
+# 42924c0b78c90f6e07e0a460d25ef885 - git-ptx-patches magic
diff --git a/rules/libxml2.make b/rules/libxml2.make
index 36450ea..3392e5e 100644
--- a/rules/libxml2.make
+++ b/rules/libxml2.make
@@ -18,8 +18,8 @@ PACKAGES-$(PTXCONF_LIBXML2) += libxml2
#
# Paths and names
#
-LIBXML2_VERSION := 2.7.7
-LIBXML2_MD5 := 9abc9959823ca9ff904f1fbcf21df066
+LIBXML2_VERSION := 2.9.2
+LIBXML2_MD5 := 9e6a9aca9d155737868b3dc5fd82f788
LIBXML2 := libxml2-$(LIBXML2_VERSION)
LIBXML2_SUFFIX := tar.gz
LIBXML2_SOURCE := $(SRCDIR)/$(LIBXML2).$(LIBXML2_SUFFIX)
--
1.7.10.4
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [ptxdist] [PATCH 1/2] libxslt: update to 1.1.28
2014-10-27 20:11 ` [ptxdist] [PATCH 1/2] libxslt: update to 1.1.28 Alexander Dahl
@ 2014-11-13 16:49 ` Michael Olbrich
0 siblings, 0 replies; 22+ messages in thread
From: Michael Olbrich @ 2014-11-13 16:49 UTC (permalink / raw)
To: ptxdist
On Mon, Oct 27, 2014 at 09:11:08PM +0100, Alexander Dahl wrote:
> (upgrade needed for working with libxml2 > 2.9.0)
>
> Signed-off-by: Alexander Dahl <post@lespocky.de>
Thanks, applied.
Michael
> ---
> patches/libxslt-1.1.26/series | 1 -
> .../0001-xslt-config-add-SYSROOT-support.patch | 8 ++------
> patches/libxslt-1.1.28/series | 4 ++++
> rules/libxslt.make | 4 ++--
> 4 files changed, 8 insertions(+), 9 deletions(-)
> delete mode 100644 patches/libxslt-1.1.26/series
> rename patches/{libxslt-1.1.26 => libxslt-1.1.28}/0001-xslt-config-add-SYSROOT-support.patch (73%)
> create mode 100644 patches/libxslt-1.1.28/series
>
> diff --git a/patches/libxslt-1.1.26/series b/patches/libxslt-1.1.26/series
> deleted file mode 100644
> index 218abc0..0000000
> --- a/patches/libxslt-1.1.26/series
> +++ /dev/null
> @@ -1 +0,0 @@
> -0001-xslt-config-add-SYSROOT-support.patch
> diff --git a/patches/libxslt-1.1.26/0001-xslt-config-add-SYSROOT-support.patch b/patches/libxslt-1.1.28/0001-xslt-config-add-SYSROOT-support.patch
> similarity index 73%
> rename from patches/libxslt-1.1.26/0001-xslt-config-add-SYSROOT-support.patch
> rename to patches/libxslt-1.1.28/0001-xslt-config-add-SYSROOT-support.patch
> index 89b2b2b..dacc3ee 100644
> --- a/patches/libxslt-1.1.26/0001-xslt-config-add-SYSROOT-support.patch
> +++ b/patches/libxslt-1.1.28/0001-xslt-config-add-SYSROOT-support.patch
> @@ -1,4 +1,3 @@
> -From b08208f3faae4d9cdb0ef9a5840b4b3836dd7083 Mon Sep 17 00:00:00 2001
> From: Marc Kleine-Budde <mkl@pengutronix.de>
> Date: Sun, 10 Jan 2010 01:10:34 +0100
> Subject: [PATCH] xslt-config: add SYSROOT support
> @@ -6,10 +5,10 @@ Subject: [PATCH] xslt-config: add SYSROOT support
> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
> ---
> xslt-config.in | 2 +-
> - 1 files changed, 1 insertions(+), 1 deletions(-)
> + 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/xslt-config.in b/xslt-config.in
> -index a1e1fb5..fcfeed3 100644
> +index 45c3e28f2f12..5c009c4f4ad2 100644
> --- a/xslt-config.in
> +++ b/xslt-config.in
> @@ -1,6 +1,6 @@
> @@ -20,6 +19,3 @@ index a1e1fb5..fcfeed3 100644
> exec_prefix=@exec_prefix@
> exec_prefix_set=no
> includedir=@includedir@
> ---
> -1.6.6
> -
> diff --git a/patches/libxslt-1.1.28/series b/patches/libxslt-1.1.28/series
> new file mode 100644
> index 0000000..04dc8b0
> --- /dev/null
> +++ b/patches/libxslt-1.1.28/series
> @@ -0,0 +1,4 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +0001-xslt-config-add-SYSROOT-support.patch
> +# 646fc10f99566b9f24135a2ca6e26cbc - git-ptx-patches magic
> diff --git a/rules/libxslt.make b/rules/libxslt.make
> index 5bf63b5..5ea8d23 100644
> --- a/rules/libxslt.make
> +++ b/rules/libxslt.make
> @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_LIBXSLT) += libxslt
> #
> # Paths and names
> #
> -LIBXSLT_VERSION := 1.1.26
> -LIBXSLT_MD5 := e61d0364a30146aaa3001296f853b2b9
> +LIBXSLT_VERSION := 1.1.28
> +LIBXSLT_MD5 := 9667bf6f9310b957254fdcf6596600b7
> LIBXSLT := libxslt-$(LIBXSLT_VERSION)
> LIBXSLT_SUFFIX := tar.gz
> LIBXSLT_SOURCE := $(SRCDIR)/$(LIBXSLT).$(LIBXSLT_SUFFIX)
> --
> 1.7.10.4
>
>
> --
> ptxdist mailing list
> ptxdist@pengutronix.de
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [ptxdist] [PATCH 2/2] libxml2: update to 2.9.2
2014-10-27 20:11 ` [ptxdist] [PATCH 2/2] libxml2: update to 2.9.2 Alexander Dahl
@ 2014-11-13 16:50 ` Michael Olbrich
2014-11-14 15:01 ` Alexander Dahl
2014-11-18 15:02 ` Alexander Dahl
0 siblings, 2 replies; 22+ messages in thread
From: Michael Olbrich @ 2014-11-13 16:50 UTC (permalink / raw)
To: ptxdist
On Mon, Oct 27, 2014 at 09:11:09PM +0100, Alexander Dahl wrote:
> Also integrated two changes from upstream fixing two minor issues.
> Build successfully tested against all ptxdist packages requiring
> libxml2, no runtime tests.
>
host-libxml2 failed to build here. I'm not sure why. Some missing lzma
symbols. Also, configure got some new options that should be added.
Michael
> Signed-off-by: Alexander Dahl <post@lespocky.de>
> ---
> patches/libxml2-2.7.7/series | 3 ---
> ...ing-initialization-for-the-catalog-module.patch | 25 ++++++++++++++++++
> ...-missing-entities-after-CVE-2014-3660-fix.patch | 27 ++++++++++++++++++++
> .../0200-xml2-config-is-not-SYSROOT-aware.patch} | 7 ++---
> patches/libxml2-2.9.2/series | 8 ++++++
> rules/libxml2.make | 4 +--
> 6 files changed, 64 insertions(+), 10 deletions(-)
> delete mode 100644 patches/libxml2-2.7.7/series
> create mode 100644 patches/libxml2-2.9.2/0001-Revert-Missing-initialization-for-the-catalog-module.patch
> create mode 100644 patches/libxml2-2.9.2/0002-Fix-missing-entities-after-CVE-2014-3660-fix.patch
> rename patches/{libxml2-2.7.7/0001-xml2-config-is-not-SYSROOT-aware.patch => libxml2-2.9.2/0200-xml2-config-is-not-SYSROOT-aware.patch} (84%)
> create mode 100644 patches/libxml2-2.9.2/series
>
> diff --git a/patches/libxml2-2.7.7/series b/patches/libxml2-2.7.7/series
> deleted file mode 100644
> index 404fb88..0000000
> --- a/patches/libxml2-2.7.7/series
> +++ /dev/null
> @@ -1,3 +0,0 @@
> -# generated by git-ptx-patches
> -0001-xml2-config-is-not-SYSROOT-aware.patch
> -# 39e3efe4b37f5ed3cf17be9609775022 - git-ptx-patches magic
> diff --git a/patches/libxml2-2.9.2/0001-Revert-Missing-initialization-for-the-catalog-module.patch b/patches/libxml2-2.9.2/0001-Revert-Missing-initialization-for-the-catalog-module.patch
> new file mode 100644
> index 0000000..9377a64
> --- /dev/null
> +++ b/patches/libxml2-2.9.2/0001-Revert-Missing-initialization-for-the-catalog-module.patch
> @@ -0,0 +1,25 @@
> +From: Daniel Veillard <veillard@redhat.com>
> +Date: Fri, 17 Oct 2014 17:13:41 +0800
> +Subject: [PATCH] Revert "Missing initialization for the catalog module"
> +
> +This reverts commit 054c716ea1bf001544127a4ab4f4346d1b9947e7.
> +As this break xmlcatalog command
> +https://bugzilla.redhat.com/show_bug.cgi?id=1153753
> +---
> + parser.c | 3 ---
> + 1 file changed, 3 deletions(-)
> +
> +diff --git a/parser.c b/parser.c
> +index 1d9396786ba7..67c9dfd9ad9f 100644
> +--- a/parser.c
> ++++ b/parser.c
> +@@ -14830,9 +14830,6 @@ xmlInitParser(void) {
> + #ifdef LIBXML_XPATH_ENABLED
> + xmlXPathInit();
> + #endif
> +-#ifdef LIBXML_CATALOG_ENABLED
> +- xmlInitializeCatalog();
> +-#endif
> + xmlParserInitialized = 1;
> + #ifdef LIBXML_THREAD_ENABLED
> + }
> diff --git a/patches/libxml2-2.9.2/0002-Fix-missing-entities-after-CVE-2014-3660-fix.patch b/patches/libxml2-2.9.2/0002-Fix-missing-entities-after-CVE-2014-3660-fix.patch
> new file mode 100644
> index 0000000..845610a
> --- /dev/null
> +++ b/patches/libxml2-2.9.2/0002-Fix-missing-entities-after-CVE-2014-3660-fix.patch
> @@ -0,0 +1,27 @@
> +From: Daniel Veillard <veillard@redhat.com>
> +Date: Thu, 23 Oct 2014 11:35:36 +0800
> +Subject: [PATCH] Fix missing entities after CVE-2014-3660 fix
> +
> +For https://bugzilla.gnome.org/show_bug.cgi?id=738805
> +
> +The fix for CVE-2014-3660 introduced a regression in some case
> +where entity substitution is required and the entity is used
> +first in anotther entity referenced from an attribute value
> +---
> + parser.c | 3 ++-
> + 1 file changed, 2 insertions(+), 1 deletion(-)
> +
> +diff --git a/parser.c b/parser.c
> +index 67c9dfd9ad9f..a8d1b6731681 100644
> +--- a/parser.c
> ++++ b/parser.c
> +@@ -7235,7 +7235,8 @@ xmlParseReference(xmlParserCtxtPtr ctxt) {
> + * far more secure as the parser will only process data coming from
> + * the document entity by default.
> + */
> +- if ((ent->checked == 0) &&
> ++ if (((ent->checked == 0) ||
> ++ ((ent->children == NULL) && (ctxt->options & XML_PARSE_NOENT))) &&
> + ((ent->etype != XML_EXTERNAL_GENERAL_PARSED_ENTITY) ||
> + (ctxt->options & (XML_PARSE_NOENT | XML_PARSE_DTDVALID)))) {
> + unsigned long oldnbent = ctxt->nbentities;
> diff --git a/patches/libxml2-2.7.7/0001-xml2-config-is-not-SYSROOT-aware.patch b/patches/libxml2-2.9.2/0200-xml2-config-is-not-SYSROOT-aware.patch
> similarity index 84%
> rename from patches/libxml2-2.7.7/0001-xml2-config-is-not-SYSROOT-aware.patch
> rename to patches/libxml2-2.9.2/0200-xml2-config-is-not-SYSROOT-aware.patch
> index 817c0b9..d096e3c 100644
> --- a/patches/libxml2-2.7.7/0001-xml2-config-is-not-SYSROOT-aware.patch
> +++ b/patches/libxml2-2.9.2/0200-xml2-config-is-not-SYSROOT-aware.patch
> @@ -7,10 +7,10 @@ This patch adds $SYSROOT support to xml2-config.
> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
> ---
> xml2-config.in | 2 +-
> - 1 files changed, 1 insertions(+), 1 deletions(-)
> + 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/xml2-config.in b/xml2-config.in
> -index 2989325..4e170b6 100644
> +index 19574864cb6a..ee1949ce9542 100644
> --- a/xml2-config.in
> +++ b/xml2-config.in
> @@ -1,6 +1,6 @@
> @@ -21,6 +21,3 @@ index 2989325..4e170b6 100644
> exec_prefix=@exec_prefix@
> includedir=@includedir@
> libdir=@libdir@
> ---
> -1.7.1
> -
> diff --git a/patches/libxml2-2.9.2/series b/patches/libxml2-2.9.2/series
> new file mode 100644
> index 0000000..e8eef47
> --- /dev/null
> +++ b/patches/libxml2-2.9.2/series
> @@ -0,0 +1,8 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +#tag:upstream --start-number 1
> +0001-Revert-Missing-initialization-for-the-catalog-module.patch
> +0002-Fix-missing-entities-after-CVE-2014-3660-fix.patch
> +#tag:ptx --start-number 200
> +0200-xml2-config-is-not-SYSROOT-aware.patch
> +# 42924c0b78c90f6e07e0a460d25ef885 - git-ptx-patches magic
> diff --git a/rules/libxml2.make b/rules/libxml2.make
> index 36450ea..3392e5e 100644
> --- a/rules/libxml2.make
> +++ b/rules/libxml2.make
> @@ -18,8 +18,8 @@ PACKAGES-$(PTXCONF_LIBXML2) += libxml2
> #
> # Paths and names
> #
> -LIBXML2_VERSION := 2.7.7
> -LIBXML2_MD5 := 9abc9959823ca9ff904f1fbcf21df066
> +LIBXML2_VERSION := 2.9.2
> +LIBXML2_MD5 := 9e6a9aca9d155737868b3dc5fd82f788
> LIBXML2 := libxml2-$(LIBXML2_VERSION)
> LIBXML2_SUFFIX := tar.gz
> LIBXML2_SOURCE := $(SRCDIR)/$(LIBXML2).$(LIBXML2_SUFFIX)
> --
> 1.7.10.4
>
>
> --
> ptxdist mailing list
> ptxdist@pengutronix.de
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [ptxdist] [PATCH 2/2] libxml2: update to 2.9.2
2014-11-13 16:50 ` Michael Olbrich
@ 2014-11-14 15:01 ` Alexander Dahl
2014-11-18 15:02 ` Alexander Dahl
1 sibling, 0 replies; 22+ messages in thread
From: Alexander Dahl @ 2014-11-14 15:01 UTC (permalink / raw)
To: ptxdist
Hei hei,
Am 2014-11-13 17:50, schrieb Michael Olbrich:
> host-libxml2 failed to build here. I'm not sure why. Some missing lzma
> symbols. Also, configure got some new options that should be added.
I have to admit I was not aware of host-libxslt and host-libxml2 and had
a look now which packages use them. I tried building with two different
toolchains after a `ptxdist clean` on different targets after activating
some packages using those host packages. Both did not fail:
OSELAS.Toolchain-2012.12.1/arm-v5te-linux-gnueabi
OSELAS.Toolchain-2013.12.2/arm-1136jfs-linux-gnueabihf
So I could not reproduce this (yet), but could try for two other
targets. Build machine is Debian 7 Wheezy on amd64 here.
Besides: I'll have a look into the changed options and resend a new
patch.
Greets
Alex
--
»With the first link, the chain is forged. The first speech censured,
the first thought forbidden, the first freedom denied, chains us all
irrevocably.« (Jean-Luc Picard, quoting Judge Aaron Satie)
*** GnuPG-FP: 02C8 A590 7FE5 CA5F 3601 D1D5 8FBA 7744 CC87 10D0 ***
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [ptxdist] [PATCH 2/2] libxml2: update to 2.9.2
2014-11-13 16:50 ` Michael Olbrich
2014-11-14 15:01 ` Alexander Dahl
@ 2014-11-18 15:02 ` Alexander Dahl
2014-11-19 10:20 ` Michael Olbrich
1 sibling, 1 reply; 22+ messages in thread
From: Alexander Dahl @ 2014-11-18 15:02 UTC (permalink / raw)
To: ptxdist
Hei hei,
Am 2014-11-13 17:50, schrieb Michael Olbrich:
> On Mon, Oct 27, 2014 at 09:11:09PM +0100, Alexander Dahl wrote:
>> Also integrated two changes from upstream fixing two minor issues.
>> Build successfully tested against all ptxdist packages requiring
>> libxml2, no runtime tests.
>>
>
> host-libxml2 failed to build here. I'm not sure why. Some missing lzma
> symbols. Also, configure got some new options that should be added.
--with-lzma is one of the new options. For ptxdist the liblzma lib is
part of the package xz. For the host-libxml2 package this option is not
set or unset, prepare stage aka ./configure contains this here:
checking for LZMA... no
checking lzma.h usability... no
checking lzma.h presence... no
checking for lzma.h... no
Not sure if --without-lzma should be added to the host-libxml2.make
rule? On my systems with different BSPs this was always handled
automatically without errors.
Meanwhile I integrated the missing options to the libxml2 non host
rules. Will send the patch in the next days.
Greets
Alex
--
»With the first link, the chain is forged. The first speech censured,
the first thought forbidden, the first freedom denied, chains us all
irrevocably.« (Jean-Luc Picard, quoting Judge Aaron Satie)
*** GnuPG-FP: 02C8 A590 7FE5 CA5F 3601 D1D5 8FBA 7744 CC87 10D0 ***
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [ptxdist] [PATCH 2/2] libxml2: update to 2.9.2
2014-11-18 15:02 ` Alexander Dahl
@ 2014-11-19 10:20 ` Michael Olbrich
2014-11-19 11:16 ` Alexander Dahl
0 siblings, 1 reply; 22+ messages in thread
From: Michael Olbrich @ 2014-11-19 10:20 UTC (permalink / raw)
To: ptxdist
On Tue, Nov 18, 2014 at 04:02:22PM +0100, Alexander Dahl wrote:
> Am 2014-11-13 17:50, schrieb Michael Olbrich:
> > On Mon, Oct 27, 2014 at 09:11:09PM +0100, Alexander Dahl wrote:
> >> Also integrated two changes from upstream fixing two minor issues.
> >> Build successfully tested against all ptxdist packages requiring
> >> libxml2, no runtime tests.
> >>
> >
> > host-libxml2 failed to build here. I'm not sure why. Some missing lzma
> > symbols. Also, configure got some new options that should be added.
>
> --with-lzma is one of the new options. For ptxdist the liblzma lib is
> part of the package xz. For the host-libxml2 package this option is not
> set or unset, prepare stage aka ./configure contains this here:
>
> checking for LZMA... no
> checking lzma.h usability... no
> checking lzma.h presence... no
> checking for lzma.h... no
>
> Not sure if --without-lzma should be added to the host-libxml2.make
> rule? On my systems with different BSPs this was always handled
> automatically without errors.
This is probably why I get the error. I don't have the logs right now but
I guess lzma was detected for me and something went wrong during linking.
This is why the rules should specify the configure options for all
auto detected features.
Michael
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [ptxdist] [PATCH 2/2] libxml2: update to 2.9.2
2014-11-19 10:20 ` Michael Olbrich
@ 2014-11-19 11:16 ` Alexander Dahl
2014-11-19 11:51 ` Michael Olbrich
0 siblings, 1 reply; 22+ messages in thread
From: Alexander Dahl @ 2014-11-19 11:16 UTC (permalink / raw)
To: ptxdist
Hei Michael,
Am 2014-11-19 11:20, schrieb Michael Olbrich:
> This is probably why I get the error. I don't have the logs right now but
> I guess lzma was detected for me and something went wrong during linking.
>
> This is why the rules should specify the configure options for all
> auto detected features.
But this is not the case for host-libxml2.make. I had a look into the
revision log. Last five changes on this file were made by you, one in
2014, one in 2012, three in 2010, everything else is much older.
HOST_LIBXML2 is selected by HOST_LIBXSLT only. HOST_LIBXSLT on the other
hand is selected by UDISKS, DEVICEKIT_DISKS, HOST_LIBXCB, and LIBXCB.
I'm not familiar with any of those and I'm not using any of those, so I
have no idea why HOST_LIBXSLT is needed and what would be reasonable
defaults for host libxslt and host libxml2 packages. :-/
Greets
Alex
--
»With the first link, the chain is forged. The first speech censured,
the first thought forbidden, the first freedom denied, chains us all
irrevocably.« (Jean-Luc Picard, quoting Judge Aaron Satie)
*** GnuPG-FP: 02C8 A590 7FE5 CA5F 3601 D1D5 8FBA 7744 CC87 10D0 ***
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [ptxdist] [PATCH 2/2] libxml2: update to 2.9.2
2014-11-19 11:16 ` Alexander Dahl
@ 2014-11-19 11:51 ` Michael Olbrich
2014-11-21 7:00 ` [ptxdist] [PATCH 1/2] " Alexander Dahl
0 siblings, 1 reply; 22+ messages in thread
From: Michael Olbrich @ 2014-11-19 11:51 UTC (permalink / raw)
To: ptxdist
Hi,
On Wed, Nov 19, 2014 at 12:16:05PM +0100, Alexander Dahl wrote:
> Am 2014-11-19 11:20, schrieb Michael Olbrich:
> > This is probably why I get the error. I don't have the logs right now but
> > I guess lzma was detected for me and something went wrong during linking.
> >
> > This is why the rules should specify the configure options for all
> > auto detected features.
>
> But this is not the case for host-libxml2.make. I had a look into the
> revision log. Last five changes on this file were made by you, one in
> 2014, one in 2012, three in 2010, everything else is much older.
> HOST_LIBXML2 is selected by HOST_LIBXSLT only. HOST_LIBXSLT on the other
> hand is selected by UDISKS, DEVICEKIT_DISKS, HOST_LIBXCB, and LIBXCB.
> I'm not familiar with any of those and I'm not using any of those, so I
> have no idea why HOST_LIBXSLT is needed and what would be reasonable
> defaults for host libxslt and host libxml2 packages. :-/
Just disable everything new. My build tests will catch an missing features
and I'll amend the patch.
Michael
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 22+ messages in thread
* [ptxdist] [PATCH 1/2] libxml2: update to 2.9.2
2014-11-19 11:51 ` Michael Olbrich
@ 2014-11-21 7:00 ` Alexander Dahl
2014-11-21 7:00 ` [ptxdist] [PATCH 2/2] libxml2: handle new ./configure options Alexander Dahl
0 siblings, 1 reply; 22+ messages in thread
From: Alexander Dahl @ 2014-11-21 7:00 UTC (permalink / raw)
To: ptxdist
Also integrated two changes from upstream fixing two minor issues.
Build successfully tested against all ptxdist packages requiring
libxml2, no runtime tests.
Signed-off-by: Alexander Dahl <post@lespocky.de>
---
patches/libxml2-2.7.7/series | 3 ---
...ing-initialization-for-the-catalog-module.patch | 25 ++++++++++++++++++
...-missing-entities-after-CVE-2014-3660-fix.patch | 27 ++++++++++++++++++++
.../0200-xml2-config-is-not-SYSROOT-aware.patch} | 7 ++---
patches/libxml2-2.9.2/series | 8 ++++++
rules/libxml2.make | 4 +--
6 files changed, 64 insertions(+), 10 deletions(-)
delete mode 100644 patches/libxml2-2.7.7/series
create mode 100644 patches/libxml2-2.9.2/0001-Revert-Missing-initialization-for-the-catalog-module.patch
create mode 100644 patches/libxml2-2.9.2/0002-Fix-missing-entities-after-CVE-2014-3660-fix.patch
rename patches/{libxml2-2.7.7/0001-xml2-config-is-not-SYSROOT-aware.patch => libxml2-2.9.2/0200-xml2-config-is-not-SYSROOT-aware.patch} (84%)
create mode 100644 patches/libxml2-2.9.2/series
diff --git a/patches/libxml2-2.7.7/series b/patches/libxml2-2.7.7/series
deleted file mode 100644
index 404fb88..0000000
--- a/patches/libxml2-2.7.7/series
+++ /dev/null
@@ -1,3 +0,0 @@
-# generated by git-ptx-patches
-0001-xml2-config-is-not-SYSROOT-aware.patch
-# 39e3efe4b37f5ed3cf17be9609775022 - git-ptx-patches magic
diff --git a/patches/libxml2-2.9.2/0001-Revert-Missing-initialization-for-the-catalog-module.patch b/patches/libxml2-2.9.2/0001-Revert-Missing-initialization-for-the-catalog-module.patch
new file mode 100644
index 0000000..9377a64
--- /dev/null
+++ b/patches/libxml2-2.9.2/0001-Revert-Missing-initialization-for-the-catalog-module.patch
@@ -0,0 +1,25 @@
+From: Daniel Veillard <veillard@redhat.com>
+Date: Fri, 17 Oct 2014 17:13:41 +0800
+Subject: [PATCH] Revert "Missing initialization for the catalog module"
+
+This reverts commit 054c716ea1bf001544127a4ab4f4346d1b9947e7.
+As this break xmlcatalog command
+https://bugzilla.redhat.com/show_bug.cgi?id=1153753
+---
+ parser.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/parser.c b/parser.c
+index 1d9396786ba7..67c9dfd9ad9f 100644
+--- a/parser.c
++++ b/parser.c
+@@ -14830,9 +14830,6 @@ xmlInitParser(void) {
+ #ifdef LIBXML_XPATH_ENABLED
+ xmlXPathInit();
+ #endif
+-#ifdef LIBXML_CATALOG_ENABLED
+- xmlInitializeCatalog();
+-#endif
+ xmlParserInitialized = 1;
+ #ifdef LIBXML_THREAD_ENABLED
+ }
diff --git a/patches/libxml2-2.9.2/0002-Fix-missing-entities-after-CVE-2014-3660-fix.patch b/patches/libxml2-2.9.2/0002-Fix-missing-entities-after-CVE-2014-3660-fix.patch
new file mode 100644
index 0000000..845610a
--- /dev/null
+++ b/patches/libxml2-2.9.2/0002-Fix-missing-entities-after-CVE-2014-3660-fix.patch
@@ -0,0 +1,27 @@
+From: Daniel Veillard <veillard@redhat.com>
+Date: Thu, 23 Oct 2014 11:35:36 +0800
+Subject: [PATCH] Fix missing entities after CVE-2014-3660 fix
+
+For https://bugzilla.gnome.org/show_bug.cgi?id=738805
+
+The fix for CVE-2014-3660 introduced a regression in some case
+where entity substitution is required and the entity is used
+first in anotther entity referenced from an attribute value
+---
+ parser.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/parser.c b/parser.c
+index 67c9dfd9ad9f..a8d1b6731681 100644
+--- a/parser.c
++++ b/parser.c
+@@ -7235,7 +7235,8 @@ xmlParseReference(xmlParserCtxtPtr ctxt) {
+ * far more secure as the parser will only process data coming from
+ * the document entity by default.
+ */
+- if ((ent->checked == 0) &&
++ if (((ent->checked == 0) ||
++ ((ent->children == NULL) && (ctxt->options & XML_PARSE_NOENT))) &&
+ ((ent->etype != XML_EXTERNAL_GENERAL_PARSED_ENTITY) ||
+ (ctxt->options & (XML_PARSE_NOENT | XML_PARSE_DTDVALID)))) {
+ unsigned long oldnbent = ctxt->nbentities;
diff --git a/patches/libxml2-2.7.7/0001-xml2-config-is-not-SYSROOT-aware.patch b/patches/libxml2-2.9.2/0200-xml2-config-is-not-SYSROOT-aware.patch
similarity index 84%
rename from patches/libxml2-2.7.7/0001-xml2-config-is-not-SYSROOT-aware.patch
rename to patches/libxml2-2.9.2/0200-xml2-config-is-not-SYSROOT-aware.patch
index 817c0b9..d096e3c 100644
--- a/patches/libxml2-2.7.7/0001-xml2-config-is-not-SYSROOT-aware.patch
+++ b/patches/libxml2-2.9.2/0200-xml2-config-is-not-SYSROOT-aware.patch
@@ -7,10 +7,10 @@ This patch adds $SYSROOT support to xml2-config.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
xml2-config.in | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/xml2-config.in b/xml2-config.in
-index 2989325..4e170b6 100644
+index 19574864cb6a..ee1949ce9542 100644
--- a/xml2-config.in
+++ b/xml2-config.in
@@ -1,6 +1,6 @@
@@ -21,6 +21,3 @@ index 2989325..4e170b6 100644
exec_prefix=@exec_prefix@
includedir=@includedir@
libdir=@libdir@
---
-1.7.1
-
diff --git a/patches/libxml2-2.9.2/series b/patches/libxml2-2.9.2/series
new file mode 100644
index 0000000..e8eef47
--- /dev/null
+++ b/patches/libxml2-2.9.2/series
@@ -0,0 +1,8 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+#tag:upstream --start-number 1
+0001-Revert-Missing-initialization-for-the-catalog-module.patch
+0002-Fix-missing-entities-after-CVE-2014-3660-fix.patch
+#tag:ptx --start-number 200
+0200-xml2-config-is-not-SYSROOT-aware.patch
+# 42924c0b78c90f6e07e0a460d25ef885 - git-ptx-patches magic
diff --git a/rules/libxml2.make b/rules/libxml2.make
index 36450ea..3392e5e 100644
--- a/rules/libxml2.make
+++ b/rules/libxml2.make
@@ -18,8 +18,8 @@ PACKAGES-$(PTXCONF_LIBXML2) += libxml2
#
# Paths and names
#
-LIBXML2_VERSION := 2.7.7
-LIBXML2_MD5 := 9abc9959823ca9ff904f1fbcf21df066
+LIBXML2_VERSION := 2.9.2
+LIBXML2_MD5 := 9e6a9aca9d155737868b3dc5fd82f788
LIBXML2 := libxml2-$(LIBXML2_VERSION)
LIBXML2_SUFFIX := tar.gz
LIBXML2_SOURCE := $(SRCDIR)/$(LIBXML2).$(LIBXML2_SUFFIX)
--
1.7.10.4
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 22+ messages in thread
* [ptxdist] [PATCH 2/2] libxml2: handle new ./configure options
2014-11-21 7:00 ` [ptxdist] [PATCH 1/2] " Alexander Dahl
@ 2014-11-21 7:00 ` Alexander Dahl
2014-11-21 14:44 ` Michael Olbrich
0 siblings, 1 reply; 22+ messages in thread
From: Alexander Dahl @ 2014-11-21 7:00 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Alexander Dahl <post@lespocky.de>
---
rules/host-libxml2.make | 3 ++-
rules/libxml2.in | 13 +++++++++++++
rules/libxml2.make | 2 ++
3 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/rules/host-libxml2.make b/rules/host-libxml2.make
index c4a4b4b..2940c9b 100644
--- a/rules/host-libxml2.make
+++ b/rules/host-libxml2.make
@@ -32,6 +32,7 @@ HOST_LIBXML2_ENV := $(HOST_ENV)
HOST_LIBXML2_AUTOCONF := \
$(HOST_AUTOCONF) \
--disable-static \
- --without-iconv
+ --without-iconv \
+ --without-lzma
# vim: syntax=make
diff --git a/rules/libxml2.in b/rules/libxml2.in
index 72c1725..8642296 100644
--- a/rules/libxml2.in
+++ b/rules/libxml2.in
@@ -6,6 +6,7 @@ menuconfig LIBXML2
select LIBC_M
select LIBC_DL if LIBXML2_MODULES
select ZLIB if LIBXML2_ZLIB
+ select XZ if LIBXML2_LZMA
select PYTHON if LIBXML2_PYTHON
help
Libxml2 is a XML C parser and toolkit. XML itself is a
@@ -90,6 +91,12 @@ config LIBXML2_HTTP
help
Add HTTP support.
+config LIBXML2_ICU
+ bool
+ prompt "ICU support"
+ help
+ Add ICU support.
+
config LIBXML2_ISO8859X
bool
default y
@@ -264,4 +271,10 @@ config LIBXML2_ZLIB
default y
prompt "zlib (compression) support"
+config LIBXML2_LZMA
+ bool
+ prompt "lzma (compression) support"
+ help
+ LZMA (compression) support with liblzma from XZ tools.
+
endif
diff --git a/rules/libxml2.make b/rules/libxml2.make
index 3392e5e..6b5c05c 100644
--- a/rules/libxml2.make
+++ b/rules/libxml2.make
@@ -54,8 +54,10 @@ LIBXML2_AUTOCONF := \
--$(call ptx/wwo, PTXCONF_LIBXML2_HISTORY)-history \
--$(call ptx/wwo, PTXCONF_LIBXML2_HTML)-html \
--$(call ptx/wwo, PTXCONF_LIBXML2_HTTP)-http \
+ --$(call ptx/wwo, PTXCONF_LIBXML2_ICU)-icu \
--$(call ptx/wwo, PTXCONF_LIBXML2_ISO8859X)-iso8859x \
--$(call ptx/wwo, PTXCONF_LIBXML2_LEGACY)-legacy \
+ --$(call ptx/wwo, PTXCONF_LIBXML2_LZMA)-lzma \
--$(call ptx/wwo, PTXCONF_LIBXML2_MEM_DEBUG)-mem-debug \
--$(call ptx/wwo, PTXCONF_LIBXML2_MINIMUM)-minimum \
--$(call ptx/wwo, PTXCONF_LIBXML2_OUTPUT)-output \
--
1.7.10.4
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [ptxdist] [PATCH 2/2] libxml2: handle new ./configure options
2014-11-21 7:00 ` [ptxdist] [PATCH 2/2] libxml2: handle new ./configure options Alexander Dahl
@ 2014-11-21 14:44 ` Michael Olbrich
2014-11-24 11:25 ` [ptxdist] [PATCHv3 0/2] libxml/libxslt update Alexander Dahl
0 siblings, 1 reply; 22+ messages in thread
From: Michael Olbrich @ 2014-11-21 14:44 UTC (permalink / raw)
To: ptxdist
On Fri, Nov 21, 2014 at 08:00:37AM +0100, Alexander Dahl wrote:
>
> Signed-off-by: Alexander Dahl <post@lespocky.de>
Please squash this into the other patch.
> ---
> rules/host-libxml2.make | 3 ++-
> rules/libxml2.in | 13 +++++++++++++
> rules/libxml2.make | 2 ++
> 3 files changed, 17 insertions(+), 1 deletion(-)
>
> diff --git a/rules/host-libxml2.make b/rules/host-libxml2.make
> index c4a4b4b..2940c9b 100644
> --- a/rules/host-libxml2.make
> +++ b/rules/host-libxml2.make
> @@ -32,6 +32,7 @@ HOST_LIBXML2_ENV := $(HOST_ENV)
> HOST_LIBXML2_AUTOCONF := \
> $(HOST_AUTOCONF) \
> --disable-static \
> - --without-iconv
> + --without-iconv \
> + --without-lzma
--without-icu ??
>
> # vim: syntax=make
> diff --git a/rules/libxml2.in b/rules/libxml2.in
> index 72c1725..8642296 100644
> --- a/rules/libxml2.in
> +++ b/rules/libxml2.in
> @@ -6,6 +6,7 @@ menuconfig LIBXML2
> select LIBC_M
> select LIBC_DL if LIBXML2_MODULES
> select ZLIB if LIBXML2_ZLIB
> + select XZ if LIBXML2_LZMA
> select PYTHON if LIBXML2_PYTHON
> help
> Libxml2 is a XML C parser and toolkit. XML itself is a
> @@ -90,6 +91,12 @@ config LIBXML2_HTTP
> help
> Add HTTP support.
>
> +config LIBXML2_ICU
> + bool
> + prompt "ICU support"
> + help
> + Add ICU support.
This requires icu to install icu-config to sysroot-cross.
I don't mind if you disable icu support unconditionally.
If someone needs it then they can extend the rule.
> +
> config LIBXML2_ISO8859X
> bool
> default y
> @@ -264,4 +271,10 @@ config LIBXML2_ZLIB
> default y
> prompt "zlib (compression) support"
>
> +config LIBXML2_LZMA
> + bool
> + prompt "lzma (compression) support"
> + help
> + LZMA (compression) support with liblzma from XZ tools.
> +
> endif
> diff --git a/rules/libxml2.make b/rules/libxml2.make
> index 3392e5e..6b5c05c 100644
> --- a/rules/libxml2.make
> +++ b/rules/libxml2.make
> @@ -54,8 +54,10 @@ LIBXML2_AUTOCONF := \
> --$(call ptx/wwo, PTXCONF_LIBXML2_HISTORY)-history \
> --$(call ptx/wwo, PTXCONF_LIBXML2_HTML)-html \
> --$(call ptx/wwo, PTXCONF_LIBXML2_HTTP)-http \
> + --$(call ptx/wwo, PTXCONF_LIBXML2_ICU)-icu \
> --$(call ptx/wwo, PTXCONF_LIBXML2_ISO8859X)-iso8859x \
> --$(call ptx/wwo, PTXCONF_LIBXML2_LEGACY)-legacy \
> + --$(call ptx/wwo, PTXCONF_LIBXML2_LZMA)-lzma \
> --$(call ptx/wwo, PTXCONF_LIBXML2_MEM_DEBUG)-mem-debug \
> --$(call ptx/wwo, PTXCONF_LIBXML2_MINIMUM)-minimum \
> --$(call ptx/wwo, PTXCONF_LIBXML2_OUTPUT)-output \
Nothing for this patch, but this really needs to be cleaned up. I think
several of those options should just be enable unconditionally...
Michael
> --
> 1.7.10.4
>
>
> --
> ptxdist mailing list
> ptxdist@pengutronix.de
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 22+ messages in thread
* [ptxdist] [PATCHv3 0/2] libxml/libxslt update
2014-11-21 14:44 ` Michael Olbrich
@ 2014-11-24 11:25 ` Alexander Dahl
2014-11-24 11:25 ` [ptxdist] [PATCHv3 1/2] libxslt: add --without-python to host package Alexander Dahl
` (2 more replies)
0 siblings, 3 replies; 22+ messages in thread
From: Alexander Dahl @ 2014-11-24 11:25 UTC (permalink / raw)
To: ptxdist
Hei hei,
I made a third series, squashed the libxml2 stuff into one patch and
added anoter patch for host-libxslt to avoid problems on system
without python dev headers installed. I hope I got it right this
time. Agreed on the general request for cleanup. O:-)
Greets
Alex
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 22+ messages in thread
* [ptxdist] [PATCHv3 1/2] libxslt: add --without-python to host package
2014-11-24 11:25 ` [ptxdist] [PATCHv3 0/2] libxml/libxslt update Alexander Dahl
@ 2014-11-24 11:25 ` Alexander Dahl
2014-11-24 11:25 ` [ptxdist] [PATCHv3 2/2] libxml2: update to 2.9.2 Alexander Dahl
2014-11-26 9:58 ` [ptxdist] [PATCHv3 0/2] libxml/libxslt update Michael Olbrich
2 siblings, 0 replies; 22+ messages in thread
From: Alexander Dahl @ 2014-11-24 11:25 UTC (permalink / raw)
To: ptxdist
---
rules/host-libxslt.make | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/rules/host-libxslt.make b/rules/host-libxslt.make
index d78b58d..bb5ed8b 100644
--- a/rules/host-libxslt.make
+++ b/rules/host-libxslt.make
@@ -32,6 +32,7 @@ HOST_LIBXSLT_ENV := $(HOST_ENV)
HOST_LIBXSLT_AUTOCONF := \
$(HOST_AUTOCONF) \
--disable-static \
- --without-crypto
+ --without-crypto \
+ --without-python
# vim: syntax=make
--
1.7.10.4
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 22+ messages in thread
* [ptxdist] [PATCHv3 2/2] libxml2: update to 2.9.2
2014-11-24 11:25 ` [ptxdist] [PATCHv3 0/2] libxml/libxslt update Alexander Dahl
2014-11-24 11:25 ` [ptxdist] [PATCHv3 1/2] libxslt: add --without-python to host package Alexander Dahl
@ 2014-11-24 11:25 ` Alexander Dahl
2014-11-26 9:58 ` [ptxdist] [PATCHv3 0/2] libxml/libxslt update Michael Olbrich
2 siblings, 0 replies; 22+ messages in thread
From: Alexander Dahl @ 2014-11-24 11:25 UTC (permalink / raw)
To: ptxdist
Also integrated two changes from upstream fixing two minor issues.
Build successfully tested against all ptxdist packages requiring
libxml2, no runtime tests.
---
patches/libxml2-2.7.7/series | 3 ---
...ing-initialization-for-the-catalog-module.patch | 25 ++++++++++++++++++
...-missing-entities-after-CVE-2014-3660-fix.patch | 27 ++++++++++++++++++++
.../0200-xml2-config-is-not-SYSROOT-aware.patch} | 7 ++---
patches/libxml2-2.9.2/series | 8 ++++++
rules/host-libxml2.make | 5 +++-
rules/libxml2.in | 7 +++++
rules/libxml2.make | 6 +++--
8 files changed, 77 insertions(+), 11 deletions(-)
delete mode 100644 patches/libxml2-2.7.7/series
create mode 100644 patches/libxml2-2.9.2/0001-Revert-Missing-initialization-for-the-catalog-module.patch
create mode 100644 patches/libxml2-2.9.2/0002-Fix-missing-entities-after-CVE-2014-3660-fix.patch
rename patches/{libxml2-2.7.7/0001-xml2-config-is-not-SYSROOT-aware.patch => libxml2-2.9.2/0200-xml2-config-is-not-SYSROOT-aware.patch} (84%)
create mode 100644 patches/libxml2-2.9.2/series
diff --git a/patches/libxml2-2.7.7/series b/patches/libxml2-2.7.7/series
deleted file mode 100644
index 404fb88..0000000
--- a/patches/libxml2-2.7.7/series
+++ /dev/null
@@ -1,3 +0,0 @@
-# generated by git-ptx-patches
-0001-xml2-config-is-not-SYSROOT-aware.patch
-# 39e3efe4b37f5ed3cf17be9609775022 - git-ptx-patches magic
diff --git a/patches/libxml2-2.9.2/0001-Revert-Missing-initialization-for-the-catalog-module.patch b/patches/libxml2-2.9.2/0001-Revert-Missing-initialization-for-the-catalog-module.patch
new file mode 100644
index 0000000..9377a64
--- /dev/null
+++ b/patches/libxml2-2.9.2/0001-Revert-Missing-initialization-for-the-catalog-module.patch
@@ -0,0 +1,25 @@
+From: Daniel Veillard <veillard@redhat.com>
+Date: Fri, 17 Oct 2014 17:13:41 +0800
+Subject: [PATCH] Revert "Missing initialization for the catalog module"
+
+This reverts commit 054c716ea1bf001544127a4ab4f4346d1b9947e7.
+As this break xmlcatalog command
+https://bugzilla.redhat.com/show_bug.cgi?id=1153753
+---
+ parser.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/parser.c b/parser.c
+index 1d9396786ba7..67c9dfd9ad9f 100644
+--- a/parser.c
++++ b/parser.c
+@@ -14830,9 +14830,6 @@ xmlInitParser(void) {
+ #ifdef LIBXML_XPATH_ENABLED
+ xmlXPathInit();
+ #endif
+-#ifdef LIBXML_CATALOG_ENABLED
+- xmlInitializeCatalog();
+-#endif
+ xmlParserInitialized = 1;
+ #ifdef LIBXML_THREAD_ENABLED
+ }
diff --git a/patches/libxml2-2.9.2/0002-Fix-missing-entities-after-CVE-2014-3660-fix.patch b/patches/libxml2-2.9.2/0002-Fix-missing-entities-after-CVE-2014-3660-fix.patch
new file mode 100644
index 0000000..845610a
--- /dev/null
+++ b/patches/libxml2-2.9.2/0002-Fix-missing-entities-after-CVE-2014-3660-fix.patch
@@ -0,0 +1,27 @@
+From: Daniel Veillard <veillard@redhat.com>
+Date: Thu, 23 Oct 2014 11:35:36 +0800
+Subject: [PATCH] Fix missing entities after CVE-2014-3660 fix
+
+For https://bugzilla.gnome.org/show_bug.cgi?id=738805
+
+The fix for CVE-2014-3660 introduced a regression in some case
+where entity substitution is required and the entity is used
+first in anotther entity referenced from an attribute value
+---
+ parser.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/parser.c b/parser.c
+index 67c9dfd9ad9f..a8d1b6731681 100644
+--- a/parser.c
++++ b/parser.c
+@@ -7235,7 +7235,8 @@ xmlParseReference(xmlParserCtxtPtr ctxt) {
+ * far more secure as the parser will only process data coming from
+ * the document entity by default.
+ */
+- if ((ent->checked == 0) &&
++ if (((ent->checked == 0) ||
++ ((ent->children == NULL) && (ctxt->options & XML_PARSE_NOENT))) &&
+ ((ent->etype != XML_EXTERNAL_GENERAL_PARSED_ENTITY) ||
+ (ctxt->options & (XML_PARSE_NOENT | XML_PARSE_DTDVALID)))) {
+ unsigned long oldnbent = ctxt->nbentities;
diff --git a/patches/libxml2-2.7.7/0001-xml2-config-is-not-SYSROOT-aware.patch b/patches/libxml2-2.9.2/0200-xml2-config-is-not-SYSROOT-aware.patch
similarity index 84%
rename from patches/libxml2-2.7.7/0001-xml2-config-is-not-SYSROOT-aware.patch
rename to patches/libxml2-2.9.2/0200-xml2-config-is-not-SYSROOT-aware.patch
index 817c0b9..d096e3c 100644
--- a/patches/libxml2-2.7.7/0001-xml2-config-is-not-SYSROOT-aware.patch
+++ b/patches/libxml2-2.9.2/0200-xml2-config-is-not-SYSROOT-aware.patch
@@ -7,10 +7,10 @@ This patch adds $SYSROOT support to xml2-config.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
xml2-config.in | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/xml2-config.in b/xml2-config.in
-index 2989325..4e170b6 100644
+index 19574864cb6a..ee1949ce9542 100644
--- a/xml2-config.in
+++ b/xml2-config.in
@@ -1,6 +1,6 @@
@@ -21,6 +21,3 @@ index 2989325..4e170b6 100644
exec_prefix=@exec_prefix@
includedir=@includedir@
libdir=@libdir@
---
-1.7.1
-
diff --git a/patches/libxml2-2.9.2/series b/patches/libxml2-2.9.2/series
new file mode 100644
index 0000000..e8eef47
--- /dev/null
+++ b/patches/libxml2-2.9.2/series
@@ -0,0 +1,8 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+#tag:upstream --start-number 1
+0001-Revert-Missing-initialization-for-the-catalog-module.patch
+0002-Fix-missing-entities-after-CVE-2014-3660-fix.patch
+#tag:ptx --start-number 200
+0200-xml2-config-is-not-SYSROOT-aware.patch
+# 42924c0b78c90f6e07e0a460d25ef885 - git-ptx-patches magic
diff --git a/rules/host-libxml2.make b/rules/host-libxml2.make
index c4a4b4b..e731e2c 100644
--- a/rules/host-libxml2.make
+++ b/rules/host-libxml2.make
@@ -32,6 +32,9 @@ HOST_LIBXML2_ENV := $(HOST_ENV)
HOST_LIBXML2_AUTOCONF := \
$(HOST_AUTOCONF) \
--disable-static \
- --without-iconv
+ --without-iconv \
+ --without-icu \
+ --without-python \
+ --without-lzma
# vim: syntax=make
diff --git a/rules/libxml2.in b/rules/libxml2.in
index 72c1725..bfbbf4d 100644
--- a/rules/libxml2.in
+++ b/rules/libxml2.in
@@ -6,6 +6,7 @@ menuconfig LIBXML2
select LIBC_M
select LIBC_DL if LIBXML2_MODULES
select ZLIB if LIBXML2_ZLIB
+ select XZ if LIBXML2_LZMA
select PYTHON if LIBXML2_PYTHON
help
Libxml2 is a XML C parser and toolkit. XML itself is a
@@ -264,4 +265,10 @@ config LIBXML2_ZLIB
default y
prompt "zlib (compression) support"
+config LIBXML2_LZMA
+ bool
+ prompt "lzma (compression) support"
+ help
+ LZMA (compression) support with liblzma from XZ tools.
+
endif
diff --git a/rules/libxml2.make b/rules/libxml2.make
index 36450ea..1b1b042 100644
--- a/rules/libxml2.make
+++ b/rules/libxml2.make
@@ -18,8 +18,8 @@ PACKAGES-$(PTXCONF_LIBXML2) += libxml2
#
# Paths and names
#
-LIBXML2_VERSION := 2.7.7
-LIBXML2_MD5 := 9abc9959823ca9ff904f1fbcf21df066
+LIBXML2_VERSION := 2.9.2
+LIBXML2_MD5 := 9e6a9aca9d155737868b3dc5fd82f788
LIBXML2 := libxml2-$(LIBXML2_VERSION)
LIBXML2_SUFFIX := tar.gz
LIBXML2_SOURCE := $(SRCDIR)/$(LIBXML2).$(LIBXML2_SUFFIX)
@@ -54,8 +54,10 @@ LIBXML2_AUTOCONF := \
--$(call ptx/wwo, PTXCONF_LIBXML2_HISTORY)-history \
--$(call ptx/wwo, PTXCONF_LIBXML2_HTML)-html \
--$(call ptx/wwo, PTXCONF_LIBXML2_HTTP)-http \
+ --without-icu \
--$(call ptx/wwo, PTXCONF_LIBXML2_ISO8859X)-iso8859x \
--$(call ptx/wwo, PTXCONF_LIBXML2_LEGACY)-legacy \
+ --$(call ptx/wwo, PTXCONF_LIBXML2_LZMA)-lzma \
--$(call ptx/wwo, PTXCONF_LIBXML2_MEM_DEBUG)-mem-debug \
--$(call ptx/wwo, PTXCONF_LIBXML2_MINIMUM)-minimum \
--$(call ptx/wwo, PTXCONF_LIBXML2_OUTPUT)-output \
--
1.7.10.4
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [ptxdist] [PATCHv3 0/2] libxml/libxslt update
2014-11-24 11:25 ` [ptxdist] [PATCHv3 0/2] libxml/libxslt update Alexander Dahl
2014-11-24 11:25 ` [ptxdist] [PATCHv3 1/2] libxslt: add --without-python to host package Alexander Dahl
2014-11-24 11:25 ` [ptxdist] [PATCHv3 2/2] libxml2: update to 2.9.2 Alexander Dahl
@ 2014-11-26 9:58 ` Michael Olbrich
2014-11-26 10:20 ` Alexander Dahl
2 siblings, 1 reply; 22+ messages in thread
From: Michael Olbrich @ 2014-11-26 9:58 UTC (permalink / raw)
To: ptxdist
Hi,
On Mon, Nov 24, 2014 at 12:25:46PM +0100, Alexander Dahl wrote:
> I made a third series, squashed the libxml2 stuff into one patch and
> added anoter patch for host-libxslt to avoid problems on system
> without python dev headers installed. I hope I got it right this
> time. Agreed on the general request for cleanup. O:-)
Both patches look good, but the Signed-off-by: is missing.
Michael
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [ptxdist] [PATCHv3 0/2] libxml/libxslt update
2014-11-26 9:58 ` [ptxdist] [PATCHv3 0/2] libxml/libxslt update Michael Olbrich
@ 2014-11-26 10:20 ` Alexander Dahl
2014-11-26 15:24 ` Michael Olbrich
0 siblings, 1 reply; 22+ messages in thread
From: Alexander Dahl @ 2014-11-26 10:20 UTC (permalink / raw)
To: ptxdist
Hei hei,
Am 2014-11-26 10:58, schrieb Michael Olbrich:
> On Mon, Nov 24, 2014 at 12:25:46PM +0100, Alexander Dahl wrote:
>> I made a third series, squashed the libxml2 stuff into one patch and
>> added anoter patch for host-libxslt to avoid problems on system
>> without python dev headers installed. I hope I got it right this
>> time. Agreed on the general request for cleanup. O:-)
>
> Both patches look good, but the Signed-off-by: is missing.
I guess this is because I send this from another machine where I didn't
setup those git stuff right yet. *sigh*
You'll get it later this week. :-)
Greets
Alex
--
»With the first link, the chain is forged. The first speech censured,
the first thought forbidden, the first freedom denied, chains us all
irrevocably.« (Jean-Luc Picard, quoting Judge Aaron Satie)
*** GnuPG-FP: 02C8 A590 7FE5 CA5F 3601 D1D5 8FBA 7744 CC87 10D0 ***
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [ptxdist] [PATCHv3 0/2] libxml/libxslt update
2014-11-26 10:20 ` Alexander Dahl
@ 2014-11-26 15:24 ` Michael Olbrich
2014-11-26 17:43 ` [ptxdist] [PATCHv3 1/2] libxslt: add --without-python to host package Alexander Dahl
0 siblings, 1 reply; 22+ messages in thread
From: Michael Olbrich @ 2014-11-26 15:24 UTC (permalink / raw)
To: ptxdist
On Wed, Nov 26, 2014 at 11:20:07AM +0100, Alexander Dahl wrote:
> Am 2014-11-26 10:58, schrieb Michael Olbrich:
> > On Mon, Nov 24, 2014 at 12:25:46PM +0100, Alexander Dahl wrote:
> >> I made a third series, squashed the libxml2 stuff into one patch and
> >> added anoter patch for host-libxslt to avoid problems on system
> >> without python dev headers installed. I hope I got it right this
> >> time. Agreed on the general request for cleanup. O:-)
> >
> > Both patches look good, but the Signed-off-by: is missing.
>
> I guess this is because I send this from another machine where I didn't
> setup those git stuff right yet. *sigh*
>
> You'll get it later this week. :-)
I can add the Signed-off-by: myself, when I apply the patches, but I need
your explicit ok for that.
Michael
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 22+ messages in thread
* [ptxdist] [PATCHv3 1/2] libxslt: add --without-python to host package
2014-11-26 15:24 ` Michael Olbrich
@ 2014-11-26 17:43 ` Alexander Dahl
2014-11-26 17:43 ` [ptxdist] [PATCHv3 2/2] libxml2: update to 2.9.2 Alexander Dahl
0 siblings, 1 reply; 22+ messages in thread
From: Alexander Dahl @ 2014-11-26 17:43 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Alexander Dahl <post@lespocky.de>
---
rules/host-libxslt.make | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/rules/host-libxslt.make b/rules/host-libxslt.make
index d78b58d..bb5ed8b 100644
--- a/rules/host-libxslt.make
+++ b/rules/host-libxslt.make
@@ -32,6 +32,7 @@ HOST_LIBXSLT_ENV := $(HOST_ENV)
HOST_LIBXSLT_AUTOCONF := \
$(HOST_AUTOCONF) \
--disable-static \
- --without-crypto
+ --without-crypto \
+ --without-python
# vim: syntax=make
--
1.7.10.4
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 22+ messages in thread
* [ptxdist] [PATCHv3 2/2] libxml2: update to 2.9.2
2014-11-26 17:43 ` [ptxdist] [PATCHv3 1/2] libxslt: add --without-python to host package Alexander Dahl
@ 2014-11-26 17:43 ` Alexander Dahl
2014-11-27 8:59 ` Michael Olbrich
0 siblings, 1 reply; 22+ messages in thread
From: Alexander Dahl @ 2014-11-26 17:43 UTC (permalink / raw)
To: ptxdist
Also integrated two changes from upstream fixing two minor issues.
Build successfully tested against all ptxdist packages requiring
libxml2, no runtime tests.
Signed-off-by: Alexander Dahl <post@lespocky.de>
---
patches/libxml2-2.7.7/series | 3 ---
...ing-initialization-for-the-catalog-module.patch | 25 ++++++++++++++++++
...-missing-entities-after-CVE-2014-3660-fix.patch | 27 ++++++++++++++++++++
.../0200-xml2-config-is-not-SYSROOT-aware.patch} | 7 ++---
patches/libxml2-2.9.2/series | 8 ++++++
rules/host-libxml2.make | 5 +++-
rules/libxml2.in | 7 +++++
rules/libxml2.make | 6 +++--
8 files changed, 77 insertions(+), 11 deletions(-)
delete mode 100644 patches/libxml2-2.7.7/series
create mode 100644 patches/libxml2-2.9.2/0001-Revert-Missing-initialization-for-the-catalog-module.patch
create mode 100644 patches/libxml2-2.9.2/0002-Fix-missing-entities-after-CVE-2014-3660-fix.patch
rename patches/{libxml2-2.7.7/0001-xml2-config-is-not-SYSROOT-aware.patch => libxml2-2.9.2/0200-xml2-config-is-not-SYSROOT-aware.patch} (84%)
create mode 100644 patches/libxml2-2.9.2/series
diff --git a/patches/libxml2-2.7.7/series b/patches/libxml2-2.7.7/series
deleted file mode 100644
index 404fb88..0000000
--- a/patches/libxml2-2.7.7/series
+++ /dev/null
@@ -1,3 +0,0 @@
-# generated by git-ptx-patches
-0001-xml2-config-is-not-SYSROOT-aware.patch
-# 39e3efe4b37f5ed3cf17be9609775022 - git-ptx-patches magic
diff --git a/patches/libxml2-2.9.2/0001-Revert-Missing-initialization-for-the-catalog-module.patch b/patches/libxml2-2.9.2/0001-Revert-Missing-initialization-for-the-catalog-module.patch
new file mode 100644
index 0000000..9377a64
--- /dev/null
+++ b/patches/libxml2-2.9.2/0001-Revert-Missing-initialization-for-the-catalog-module.patch
@@ -0,0 +1,25 @@
+From: Daniel Veillard <veillard@redhat.com>
+Date: Fri, 17 Oct 2014 17:13:41 +0800
+Subject: [PATCH] Revert "Missing initialization for the catalog module"
+
+This reverts commit 054c716ea1bf001544127a4ab4f4346d1b9947e7.
+As this break xmlcatalog command
+https://bugzilla.redhat.com/show_bug.cgi?id=1153753
+---
+ parser.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/parser.c b/parser.c
+index 1d9396786ba7..67c9dfd9ad9f 100644
+--- a/parser.c
++++ b/parser.c
+@@ -14830,9 +14830,6 @@ xmlInitParser(void) {
+ #ifdef LIBXML_XPATH_ENABLED
+ xmlXPathInit();
+ #endif
+-#ifdef LIBXML_CATALOG_ENABLED
+- xmlInitializeCatalog();
+-#endif
+ xmlParserInitialized = 1;
+ #ifdef LIBXML_THREAD_ENABLED
+ }
diff --git a/patches/libxml2-2.9.2/0002-Fix-missing-entities-after-CVE-2014-3660-fix.patch b/patches/libxml2-2.9.2/0002-Fix-missing-entities-after-CVE-2014-3660-fix.patch
new file mode 100644
index 0000000..845610a
--- /dev/null
+++ b/patches/libxml2-2.9.2/0002-Fix-missing-entities-after-CVE-2014-3660-fix.patch
@@ -0,0 +1,27 @@
+From: Daniel Veillard <veillard@redhat.com>
+Date: Thu, 23 Oct 2014 11:35:36 +0800
+Subject: [PATCH] Fix missing entities after CVE-2014-3660 fix
+
+For https://bugzilla.gnome.org/show_bug.cgi?id=738805
+
+The fix for CVE-2014-3660 introduced a regression in some case
+where entity substitution is required and the entity is used
+first in anotther entity referenced from an attribute value
+---
+ parser.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/parser.c b/parser.c
+index 67c9dfd9ad9f..a8d1b6731681 100644
+--- a/parser.c
++++ b/parser.c
+@@ -7235,7 +7235,8 @@ xmlParseReference(xmlParserCtxtPtr ctxt) {
+ * far more secure as the parser will only process data coming from
+ * the document entity by default.
+ */
+- if ((ent->checked == 0) &&
++ if (((ent->checked == 0) ||
++ ((ent->children == NULL) && (ctxt->options & XML_PARSE_NOENT))) &&
+ ((ent->etype != XML_EXTERNAL_GENERAL_PARSED_ENTITY) ||
+ (ctxt->options & (XML_PARSE_NOENT | XML_PARSE_DTDVALID)))) {
+ unsigned long oldnbent = ctxt->nbentities;
diff --git a/patches/libxml2-2.7.7/0001-xml2-config-is-not-SYSROOT-aware.patch b/patches/libxml2-2.9.2/0200-xml2-config-is-not-SYSROOT-aware.patch
similarity index 84%
rename from patches/libxml2-2.7.7/0001-xml2-config-is-not-SYSROOT-aware.patch
rename to patches/libxml2-2.9.2/0200-xml2-config-is-not-SYSROOT-aware.patch
index 817c0b9..d096e3c 100644
--- a/patches/libxml2-2.7.7/0001-xml2-config-is-not-SYSROOT-aware.patch
+++ b/patches/libxml2-2.9.2/0200-xml2-config-is-not-SYSROOT-aware.patch
@@ -7,10 +7,10 @@ This patch adds $SYSROOT support to xml2-config.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
xml2-config.in | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/xml2-config.in b/xml2-config.in
-index 2989325..4e170b6 100644
+index 19574864cb6a..ee1949ce9542 100644
--- a/xml2-config.in
+++ b/xml2-config.in
@@ -1,6 +1,6 @@
@@ -21,6 +21,3 @@ index 2989325..4e170b6 100644
exec_prefix=@exec_prefix@
includedir=@includedir@
libdir=@libdir@
---
-1.7.1
-
diff --git a/patches/libxml2-2.9.2/series b/patches/libxml2-2.9.2/series
new file mode 100644
index 0000000..e8eef47
--- /dev/null
+++ b/patches/libxml2-2.9.2/series
@@ -0,0 +1,8 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+#tag:upstream --start-number 1
+0001-Revert-Missing-initialization-for-the-catalog-module.patch
+0002-Fix-missing-entities-after-CVE-2014-3660-fix.patch
+#tag:ptx --start-number 200
+0200-xml2-config-is-not-SYSROOT-aware.patch
+# 42924c0b78c90f6e07e0a460d25ef885 - git-ptx-patches magic
diff --git a/rules/host-libxml2.make b/rules/host-libxml2.make
index c4a4b4b..e731e2c 100644
--- a/rules/host-libxml2.make
+++ b/rules/host-libxml2.make
@@ -32,6 +32,9 @@ HOST_LIBXML2_ENV := $(HOST_ENV)
HOST_LIBXML2_AUTOCONF := \
$(HOST_AUTOCONF) \
--disable-static \
- --without-iconv
+ --without-iconv \
+ --without-icu \
+ --without-python \
+ --without-lzma
# vim: syntax=make
diff --git a/rules/libxml2.in b/rules/libxml2.in
index 72c1725..bfbbf4d 100644
--- a/rules/libxml2.in
+++ b/rules/libxml2.in
@@ -6,6 +6,7 @@ menuconfig LIBXML2
select LIBC_M
select LIBC_DL if LIBXML2_MODULES
select ZLIB if LIBXML2_ZLIB
+ select XZ if LIBXML2_LZMA
select PYTHON if LIBXML2_PYTHON
help
Libxml2 is a XML C parser and toolkit. XML itself is a
@@ -264,4 +265,10 @@ config LIBXML2_ZLIB
default y
prompt "zlib (compression) support"
+config LIBXML2_LZMA
+ bool
+ prompt "lzma (compression) support"
+ help
+ LZMA (compression) support with liblzma from XZ tools.
+
endif
diff --git a/rules/libxml2.make b/rules/libxml2.make
index 36450ea..1b1b042 100644
--- a/rules/libxml2.make
+++ b/rules/libxml2.make
@@ -18,8 +18,8 @@ PACKAGES-$(PTXCONF_LIBXML2) += libxml2
#
# Paths and names
#
-LIBXML2_VERSION := 2.7.7
-LIBXML2_MD5 := 9abc9959823ca9ff904f1fbcf21df066
+LIBXML2_VERSION := 2.9.2
+LIBXML2_MD5 := 9e6a9aca9d155737868b3dc5fd82f788
LIBXML2 := libxml2-$(LIBXML2_VERSION)
LIBXML2_SUFFIX := tar.gz
LIBXML2_SOURCE := $(SRCDIR)/$(LIBXML2).$(LIBXML2_SUFFIX)
@@ -54,8 +54,10 @@ LIBXML2_AUTOCONF := \
--$(call ptx/wwo, PTXCONF_LIBXML2_HISTORY)-history \
--$(call ptx/wwo, PTXCONF_LIBXML2_HTML)-html \
--$(call ptx/wwo, PTXCONF_LIBXML2_HTTP)-http \
+ --without-icu \
--$(call ptx/wwo, PTXCONF_LIBXML2_ISO8859X)-iso8859x \
--$(call ptx/wwo, PTXCONF_LIBXML2_LEGACY)-legacy \
+ --$(call ptx/wwo, PTXCONF_LIBXML2_LZMA)-lzma \
--$(call ptx/wwo, PTXCONF_LIBXML2_MEM_DEBUG)-mem-debug \
--$(call ptx/wwo, PTXCONF_LIBXML2_MINIMUM)-minimum \
--$(call ptx/wwo, PTXCONF_LIBXML2_OUTPUT)-output \
--
1.7.10.4
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [ptxdist] [PATCHv3 2/2] libxml2: update to 2.9.2
2014-11-26 17:43 ` [ptxdist] [PATCHv3 2/2] libxml2: update to 2.9.2 Alexander Dahl
@ 2014-11-27 8:59 ` Michael Olbrich
0 siblings, 0 replies; 22+ messages in thread
From: Michael Olbrich @ 2014-11-27 8:59 UTC (permalink / raw)
To: ptxdist
On Wed, Nov 26, 2014 at 06:43:51PM +0100, Alexander Dahl wrote:
> Also integrated two changes from upstream fixing two minor issues.
> Build successfully tested against all ptxdist packages requiring
> libxml2, no runtime tests.
>
> Signed-off-by: Alexander Dahl <post@lespocky.de>
Thanks, both applied.
Michael
> ---
> patches/libxml2-2.7.7/series | 3 ---
> ...ing-initialization-for-the-catalog-module.patch | 25 ++++++++++++++++++
> ...-missing-entities-after-CVE-2014-3660-fix.patch | 27 ++++++++++++++++++++
> .../0200-xml2-config-is-not-SYSROOT-aware.patch} | 7 ++---
> patches/libxml2-2.9.2/series | 8 ++++++
> rules/host-libxml2.make | 5 +++-
> rules/libxml2.in | 7 +++++
> rules/libxml2.make | 6 +++--
> 8 files changed, 77 insertions(+), 11 deletions(-)
> delete mode 100644 patches/libxml2-2.7.7/series
> create mode 100644 patches/libxml2-2.9.2/0001-Revert-Missing-initialization-for-the-catalog-module.patch
> create mode 100644 patches/libxml2-2.9.2/0002-Fix-missing-entities-after-CVE-2014-3660-fix.patch
> rename patches/{libxml2-2.7.7/0001-xml2-config-is-not-SYSROOT-aware.patch => libxml2-2.9.2/0200-xml2-config-is-not-SYSROOT-aware.patch} (84%)
> create mode 100644 patches/libxml2-2.9.2/series
>
> diff --git a/patches/libxml2-2.7.7/series b/patches/libxml2-2.7.7/series
> deleted file mode 100644
> index 404fb88..0000000
> --- a/patches/libxml2-2.7.7/series
> +++ /dev/null
> @@ -1,3 +0,0 @@
> -# generated by git-ptx-patches
> -0001-xml2-config-is-not-SYSROOT-aware.patch
> -# 39e3efe4b37f5ed3cf17be9609775022 - git-ptx-patches magic
> diff --git a/patches/libxml2-2.9.2/0001-Revert-Missing-initialization-for-the-catalog-module.patch b/patches/libxml2-2.9.2/0001-Revert-Missing-initialization-for-the-catalog-module.patch
> new file mode 100644
> index 0000000..9377a64
> --- /dev/null
> +++ b/patches/libxml2-2.9.2/0001-Revert-Missing-initialization-for-the-catalog-module.patch
> @@ -0,0 +1,25 @@
> +From: Daniel Veillard <veillard@redhat.com>
> +Date: Fri, 17 Oct 2014 17:13:41 +0800
> +Subject: [PATCH] Revert "Missing initialization for the catalog module"
> +
> +This reverts commit 054c716ea1bf001544127a4ab4f4346d1b9947e7.
> +As this break xmlcatalog command
> +https://bugzilla.redhat.com/show_bug.cgi?id=1153753
> +---
> + parser.c | 3 ---
> + 1 file changed, 3 deletions(-)
> +
> +diff --git a/parser.c b/parser.c
> +index 1d9396786ba7..67c9dfd9ad9f 100644
> +--- a/parser.c
> ++++ b/parser.c
> +@@ -14830,9 +14830,6 @@ xmlInitParser(void) {
> + #ifdef LIBXML_XPATH_ENABLED
> + xmlXPathInit();
> + #endif
> +-#ifdef LIBXML_CATALOG_ENABLED
> +- xmlInitializeCatalog();
> +-#endif
> + xmlParserInitialized = 1;
> + #ifdef LIBXML_THREAD_ENABLED
> + }
> diff --git a/patches/libxml2-2.9.2/0002-Fix-missing-entities-after-CVE-2014-3660-fix.patch b/patches/libxml2-2.9.2/0002-Fix-missing-entities-after-CVE-2014-3660-fix.patch
> new file mode 100644
> index 0000000..845610a
> --- /dev/null
> +++ b/patches/libxml2-2.9.2/0002-Fix-missing-entities-after-CVE-2014-3660-fix.patch
> @@ -0,0 +1,27 @@
> +From: Daniel Veillard <veillard@redhat.com>
> +Date: Thu, 23 Oct 2014 11:35:36 +0800
> +Subject: [PATCH] Fix missing entities after CVE-2014-3660 fix
> +
> +For https://bugzilla.gnome.org/show_bug.cgi?id=738805
> +
> +The fix for CVE-2014-3660 introduced a regression in some case
> +where entity substitution is required and the entity is used
> +first in anotther entity referenced from an attribute value
> +---
> + parser.c | 3 ++-
> + 1 file changed, 2 insertions(+), 1 deletion(-)
> +
> +diff --git a/parser.c b/parser.c
> +index 67c9dfd9ad9f..a8d1b6731681 100644
> +--- a/parser.c
> ++++ b/parser.c
> +@@ -7235,7 +7235,8 @@ xmlParseReference(xmlParserCtxtPtr ctxt) {
> + * far more secure as the parser will only process data coming from
> + * the document entity by default.
> + */
> +- if ((ent->checked == 0) &&
> ++ if (((ent->checked == 0) ||
> ++ ((ent->children == NULL) && (ctxt->options & XML_PARSE_NOENT))) &&
> + ((ent->etype != XML_EXTERNAL_GENERAL_PARSED_ENTITY) ||
> + (ctxt->options & (XML_PARSE_NOENT | XML_PARSE_DTDVALID)))) {
> + unsigned long oldnbent = ctxt->nbentities;
> diff --git a/patches/libxml2-2.7.7/0001-xml2-config-is-not-SYSROOT-aware.patch b/patches/libxml2-2.9.2/0200-xml2-config-is-not-SYSROOT-aware.patch
> similarity index 84%
> rename from patches/libxml2-2.7.7/0001-xml2-config-is-not-SYSROOT-aware.patch
> rename to patches/libxml2-2.9.2/0200-xml2-config-is-not-SYSROOT-aware.patch
> index 817c0b9..d096e3c 100644
> --- a/patches/libxml2-2.7.7/0001-xml2-config-is-not-SYSROOT-aware.patch
> +++ b/patches/libxml2-2.9.2/0200-xml2-config-is-not-SYSROOT-aware.patch
> @@ -7,10 +7,10 @@ This patch adds $SYSROOT support to xml2-config.
> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
> ---
> xml2-config.in | 2 +-
> - 1 files changed, 1 insertions(+), 1 deletions(-)
> + 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/xml2-config.in b/xml2-config.in
> -index 2989325..4e170b6 100644
> +index 19574864cb6a..ee1949ce9542 100644
> --- a/xml2-config.in
> +++ b/xml2-config.in
> @@ -1,6 +1,6 @@
> @@ -21,6 +21,3 @@ index 2989325..4e170b6 100644
> exec_prefix=@exec_prefix@
> includedir=@includedir@
> libdir=@libdir@
> ---
> -1.7.1
> -
> diff --git a/patches/libxml2-2.9.2/series b/patches/libxml2-2.9.2/series
> new file mode 100644
> index 0000000..e8eef47
> --- /dev/null
> +++ b/patches/libxml2-2.9.2/series
> @@ -0,0 +1,8 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +#tag:upstream --start-number 1
> +0001-Revert-Missing-initialization-for-the-catalog-module.patch
> +0002-Fix-missing-entities-after-CVE-2014-3660-fix.patch
> +#tag:ptx --start-number 200
> +0200-xml2-config-is-not-SYSROOT-aware.patch
> +# 42924c0b78c90f6e07e0a460d25ef885 - git-ptx-patches magic
> diff --git a/rules/host-libxml2.make b/rules/host-libxml2.make
> index c4a4b4b..e731e2c 100644
> --- a/rules/host-libxml2.make
> +++ b/rules/host-libxml2.make
> @@ -32,6 +32,9 @@ HOST_LIBXML2_ENV := $(HOST_ENV)
> HOST_LIBXML2_AUTOCONF := \
> $(HOST_AUTOCONF) \
> --disable-static \
> - --without-iconv
> + --without-iconv \
> + --without-icu \
> + --without-python \
> + --without-lzma
>
> # vim: syntax=make
> diff --git a/rules/libxml2.in b/rules/libxml2.in
> index 72c1725..bfbbf4d 100644
> --- a/rules/libxml2.in
> +++ b/rules/libxml2.in
> @@ -6,6 +6,7 @@ menuconfig LIBXML2
> select LIBC_M
> select LIBC_DL if LIBXML2_MODULES
> select ZLIB if LIBXML2_ZLIB
> + select XZ if LIBXML2_LZMA
> select PYTHON if LIBXML2_PYTHON
> help
> Libxml2 is a XML C parser and toolkit. XML itself is a
> @@ -264,4 +265,10 @@ config LIBXML2_ZLIB
> default y
> prompt "zlib (compression) support"
>
> +config LIBXML2_LZMA
> + bool
> + prompt "lzma (compression) support"
> + help
> + LZMA (compression) support with liblzma from XZ tools.
> +
> endif
> diff --git a/rules/libxml2.make b/rules/libxml2.make
> index 36450ea..1b1b042 100644
> --- a/rules/libxml2.make
> +++ b/rules/libxml2.make
> @@ -18,8 +18,8 @@ PACKAGES-$(PTXCONF_LIBXML2) += libxml2
> #
> # Paths and names
> #
> -LIBXML2_VERSION := 2.7.7
> -LIBXML2_MD5 := 9abc9959823ca9ff904f1fbcf21df066
> +LIBXML2_VERSION := 2.9.2
> +LIBXML2_MD5 := 9e6a9aca9d155737868b3dc5fd82f788
> LIBXML2 := libxml2-$(LIBXML2_VERSION)
> LIBXML2_SUFFIX := tar.gz
> LIBXML2_SOURCE := $(SRCDIR)/$(LIBXML2).$(LIBXML2_SUFFIX)
> @@ -54,8 +54,10 @@ LIBXML2_AUTOCONF := \
> --$(call ptx/wwo, PTXCONF_LIBXML2_HISTORY)-history \
> --$(call ptx/wwo, PTXCONF_LIBXML2_HTML)-html \
> --$(call ptx/wwo, PTXCONF_LIBXML2_HTTP)-http \
> + --without-icu \
> --$(call ptx/wwo, PTXCONF_LIBXML2_ISO8859X)-iso8859x \
> --$(call ptx/wwo, PTXCONF_LIBXML2_LEGACY)-legacy \
> + --$(call ptx/wwo, PTXCONF_LIBXML2_LZMA)-lzma \
> --$(call ptx/wwo, PTXCONF_LIBXML2_MEM_DEBUG)-mem-debug \
> --$(call ptx/wwo, PTXCONF_LIBXML2_MINIMUM)-minimum \
> --$(call ptx/wwo, PTXCONF_LIBXML2_OUTPUT)-output \
> --
> 1.7.10.4
>
>
> --
> ptxdist mailing list
> ptxdist@pengutronix.de
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 22+ messages in thread
end of thread, other threads:[~2014-11-27 8:59 UTC | newest]
Thread overview: 22+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-10-27 20:11 [ptxdist] update libxml2 and libxslt Alexander Dahl
2014-10-27 20:11 ` [ptxdist] [PATCH 1/2] libxslt: update to 1.1.28 Alexander Dahl
2014-11-13 16:49 ` Michael Olbrich
2014-10-27 20:11 ` [ptxdist] [PATCH 2/2] libxml2: update to 2.9.2 Alexander Dahl
2014-11-13 16:50 ` Michael Olbrich
2014-11-14 15:01 ` Alexander Dahl
2014-11-18 15:02 ` Alexander Dahl
2014-11-19 10:20 ` Michael Olbrich
2014-11-19 11:16 ` Alexander Dahl
2014-11-19 11:51 ` Michael Olbrich
2014-11-21 7:00 ` [ptxdist] [PATCH 1/2] " Alexander Dahl
2014-11-21 7:00 ` [ptxdist] [PATCH 2/2] libxml2: handle new ./configure options Alexander Dahl
2014-11-21 14:44 ` Michael Olbrich
2014-11-24 11:25 ` [ptxdist] [PATCHv3 0/2] libxml/libxslt update Alexander Dahl
2014-11-24 11:25 ` [ptxdist] [PATCHv3 1/2] libxslt: add --without-python to host package Alexander Dahl
2014-11-24 11:25 ` [ptxdist] [PATCHv3 2/2] libxml2: update to 2.9.2 Alexander Dahl
2014-11-26 9:58 ` [ptxdist] [PATCHv3 0/2] libxml/libxslt update Michael Olbrich
2014-11-26 10:20 ` Alexander Dahl
2014-11-26 15:24 ` Michael Olbrich
2014-11-26 17:43 ` [ptxdist] [PATCHv3 1/2] libxslt: add --without-python to host package Alexander Dahl
2014-11-26 17:43 ` [ptxdist] [PATCHv3 2/2] libxml2: update to 2.9.2 Alexander Dahl
2014-11-27 8:59 ` Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox