* [ptxdist] [PATCH 0/2] libxml2/libxslt version bumps
@ 2021-05-17 16:04 Alexander Dahl
2021-05-17 16:04 ` [ptxdist] [PATCH 1/2] libxml2: version bump 2.9.10 -> 2.9.12 Alexander Dahl
2021-05-17 16:04 ` [ptxdist] [PATCH 2/2] libxslt: version bump 1.1.29 -> 1.1.34 Alexander Dahl
0 siblings, 2 replies; 5+ messages in thread
From: Alexander Dahl @ 2021-05-17 16:04 UTC (permalink / raw)
To: ptxdist; +Cc: Alexander Dahl
Hei hei,
libxml2 2.9.11 and 2.9.12 were released just recently, containing an
important security fix and lots of other fixes. libxslt had to be
updated then to fix a build failure against the new libxml2.
Greets
Alex
Alexander Dahl (2):
libxml2: version bump 2.9.10 -> 2.9.12
libxslt: version bump 1.1.29 -> 1.1.34
...e-loop-in-xmlStringLenDecodeEntities.patch | 28 ------------------
...mory-leak-in-xmlSchemaValidateStream.patch | 29 -------------------
patches/libxml2-2.9.10/series | 8 -----
...200-xml2-config-is-not-SYSROOT-aware.patch | 0
patches/libxml2-2.9.12/series | 6 ++++
patches/libxslt-1.1.29/series | 4 ---
...ml2-config-check-in-configure-script.patch | 23 +++++++++++++++
...200-xslt-config-add-SYSROOT-support.patch} | 4 +--
patches/libxslt-1.1.34/autogen.sh | 1 +
patches/libxslt-1.1.34/series | 7 +++++
rules/libxml2.make | 6 ++--
rules/libxslt.make | 10 ++++---
12 files changed, 48 insertions(+), 78 deletions(-)
delete mode 100644 patches/libxml2-2.9.10/0001-Fix-infinite-loop-in-xmlStringLenDecodeEntities.patch
delete mode 100644 patches/libxml2-2.9.10/0002-Fix-memory-leak-in-xmlSchemaValidateStream.patch
delete mode 100644 patches/libxml2-2.9.10/series
rename patches/{libxml2-2.9.10 => libxml2-2.9.12}/0200-xml2-config-is-not-SYSROOT-aware.patch (100%)
create mode 100644 patches/libxml2-2.9.12/series
delete mode 100644 patches/libxslt-1.1.29/series
create mode 100644 patches/libxslt-1.1.34/0001-Fix-xml2-config-check-in-configure-script.patch
rename patches/{libxslt-1.1.29/0001-xslt-config-add-SYSROOT-support.patch => libxslt-1.1.34/0200-xslt-config-add-SYSROOT-support.patch} (87%)
create mode 120000 patches/libxslt-1.1.34/autogen.sh
create mode 100644 patches/libxslt-1.1.34/series
base-commit: e999e3a92a2fb0ec9ae249bd1f043f05d74dea90
--
2.20.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 5+ messages in thread
* [ptxdist] [PATCH 1/2] libxml2: version bump 2.9.10 -> 2.9.12
2021-05-17 16:04 [ptxdist] [PATCH 0/2] libxml2/libxslt version bumps Alexander Dahl
@ 2021-05-17 16:04 ` Alexander Dahl
2021-05-27 6:45 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-05-17 16:04 ` [ptxdist] [PATCH 2/2] libxslt: version bump 1.1.29 -> 1.1.34 Alexander Dahl
1 sibling, 1 reply; 5+ messages in thread
From: Alexander Dahl @ 2021-05-17 16:04 UTC (permalink / raw)
To: ptxdist; +Cc: Alexander Dahl, Zhipeng Xie
Fixes quite some security and other issues. License text change was a
small typo only. Two patches removed have gone upstream.
Signed-off-by: Alexander Dahl <ada@thorsis.com>
Link: https://mail.gnome.org/archives/xml/2021-May/msg00000.html
Link: https://mail.gnome.org/archives/xml/2021-May/msg00003.html
---
...e-loop-in-xmlStringLenDecodeEntities.patch | 28 ------------------
...mory-leak-in-xmlSchemaValidateStream.patch | 29 -------------------
patches/libxml2-2.9.10/series | 8 -----
...200-xml2-config-is-not-SYSROOT-aware.patch | 0
patches/libxml2-2.9.12/series | 6 ++++
rules/libxml2.make | 6 ++--
6 files changed, 9 insertions(+), 68 deletions(-)
delete mode 100644 patches/libxml2-2.9.10/0001-Fix-infinite-loop-in-xmlStringLenDecodeEntities.patch
delete mode 100644 patches/libxml2-2.9.10/0002-Fix-memory-leak-in-xmlSchemaValidateStream.patch
delete mode 100644 patches/libxml2-2.9.10/series
rename patches/{libxml2-2.9.10 => libxml2-2.9.12}/0200-xml2-config-is-not-SYSROOT-aware.patch (100%)
create mode 100644 patches/libxml2-2.9.12/series
diff --git a/patches/libxml2-2.9.10/0001-Fix-infinite-loop-in-xmlStringLenDecodeEntities.patch b/patches/libxml2-2.9.10/0001-Fix-infinite-loop-in-xmlStringLenDecodeEntities.patch
deleted file mode 100644
index 59c864731..000000000
--- a/patches/libxml2-2.9.10/0001-Fix-infinite-loop-in-xmlStringLenDecodeEntities.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Zhipeng Xie <xiezhipeng1@huawei.com>
-Date: Thu, 12 Dec 2019 17:30:55 +0800
-Subject: [PATCH] Fix infinite loop in xmlStringLenDecodeEntities
-
-When ctxt->instate == XML_PARSER_EOF,xmlParseStringEntityRef
-return NULL which cause a infinite loop in xmlStringLenDecodeEntities
-
-Found with libFuzzer.
-
-Signed-off-by: Zhipeng Xie <xiezhipeng1@huawei.com>
----
- parser.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/parser.c b/parser.c
-index d1c319631fc9..a34bb6cdd81b 100644
---- a/parser.c
-+++ b/parser.c
-@@ -2646,7 +2646,8 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len,
- else
- c = 0;
- while ((c != 0) && (c != end) && /* non input consuming loop */
-- (c != end2) && (c != end3)) {
-+ (c != end2) && (c != end3) &&
-+ (ctxt->instate != XML_PARSER_EOF)) {
-
- if (c == 0) break;
- if ((c == '&') && (str[1] == '#')) {
diff --git a/patches/libxml2-2.9.10/0002-Fix-memory-leak-in-xmlSchemaValidateStream.patch b/patches/libxml2-2.9.10/0002-Fix-memory-leak-in-xmlSchemaValidateStream.patch
deleted file mode 100644
index 1ca086217..000000000
--- a/patches/libxml2-2.9.10/0002-Fix-memory-leak-in-xmlSchemaValidateStream.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Zhipeng Xie <xiezhipeng1@huawei.com>
-Date: Tue, 20 Aug 2019 16:33:06 +0800
-Subject: [PATCH] Fix memory leak in xmlSchemaValidateStream
-
-When ctxt->schema is NULL, xmlSchemaSAXPlug->xmlSchemaPreRun
-alloc a new schema for ctxt->schema and set vctxt->xsiAssemble
-to 1. Then xmlSchemaVStart->xmlSchemaPreRun initialize
-vctxt->xsiAssemble to 0 again which cause the alloced schema
-can not be freed anymore.
-
-Found with libFuzzer.
-
-Signed-off-by: Zhipeng Xie <xiezhipeng1@huawei.com>
----
- xmlschemas.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/xmlschemas.c b/xmlschemas.c
-index d19de6df5f50..59495c2738ab 100644
---- a/xmlschemas.c
-+++ b/xmlschemas.c
-@@ -28095,7 +28095,6 @@ xmlSchemaPreRun(xmlSchemaValidCtxtPtr vctxt) {
- vctxt->nberrors = 0;
- vctxt->depth = -1;
- vctxt->skipDepth = -1;
-- vctxt->xsiAssemble = 0;
- vctxt->hasKeyrefs = 0;
- #ifdef ENABLE_IDC_NODE_TABLES_TEST
- vctxt->createIDCNodeTables = 1;
diff --git a/patches/libxml2-2.9.10/series b/patches/libxml2-2.9.10/series
deleted file mode 100644
index fed72960d..000000000
--- a/patches/libxml2-2.9.10/series
+++ /dev/null
@@ -1,8 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-#tag:upstream --start-number 1
-0001-Fix-infinite-loop-in-xmlStringLenDecodeEntities.patch
-0002-Fix-memory-leak-in-xmlSchemaValidateStream.patch
-#tag:ptx --start-number 200
-0200-xml2-config-is-not-SYSROOT-aware.patch
-# d6f49636e8813a3a9e46758f352fc667 - git-ptx-patches magic
diff --git a/patches/libxml2-2.9.10/0200-xml2-config-is-not-SYSROOT-aware.patch b/patches/libxml2-2.9.12/0200-xml2-config-is-not-SYSROOT-aware.patch
similarity index 100%
rename from patches/libxml2-2.9.10/0200-xml2-config-is-not-SYSROOT-aware.patch
rename to patches/libxml2-2.9.12/0200-xml2-config-is-not-SYSROOT-aware.patch
diff --git a/patches/libxml2-2.9.12/series b/patches/libxml2-2.9.12/series
new file mode 100644
index 000000000..05ba5ddea
--- /dev/null
+++ b/patches/libxml2-2.9.12/series
@@ -0,0 +1,6 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+#tag:upstream --start-number 1
+#tag:ptx --start-number 200
+0200-xml2-config-is-not-SYSROOT-aware.patch
+# b6720be956d1b4619bc1c347a0ceb1dd - git-ptx-patches magic
diff --git a/rules/libxml2.make b/rules/libxml2.make
index 1da248307..9eb1993b0 100644
--- a/rules/libxml2.make
+++ b/rules/libxml2.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LIBXML2) += libxml2
#
# Paths and names
#
-LIBXML2_VERSION := 2.9.10
-LIBXML2_MD5 := 10942a1dc23137a8aa07f0639cbfece5
+LIBXML2_VERSION := 2.9.12
+LIBXML2_MD5 := f433a39be087a9f0b197eb2307ad9f75
LIBXML2 := libxml2-$(LIBXML2_VERSION)
LIBXML2_SUFFIX := tar.gz
LIBXML2_SOURCE := $(SRCDIR)/$(LIBXML2).$(LIBXML2_SUFFIX)
@@ -26,7 +26,7 @@ LIBXML2_LICENSE := MIT AND ISC
# The file 'COPYING' is just a symlink on the file 'Copyright'
LIBXML2_LICENSE_FILES := \
file://Copyright;md5=2044417e2e5006b65a8b9067b683fcf1 \
- file://hash.c;startline=6;endline=15;md5=96f7296605eae807670fb08947829969
+ file://hash.c;startline=6;endline=15;md5=e77f77b12cb69e203d8b4090a0eee879
LIBXML2_URL := \
ftp://xmlsoft.org/libxml2/$(LIBXML2).$(LIBXML2_SUFFIX) \
--
2.20.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 5+ messages in thread
* [ptxdist] [PATCH 2/2] libxslt: version bump 1.1.29 -> 1.1.34
2021-05-17 16:04 [ptxdist] [PATCH 0/2] libxml2/libxslt version bumps Alexander Dahl
2021-05-17 16:04 ` [ptxdist] [PATCH 1/2] libxml2: version bump 2.9.10 -> 2.9.12 Alexander Dahl
@ 2021-05-17 16:04 ` Alexander Dahl
2021-05-27 6:45 ` [ptxdist] [APPLIED] " Michael Olbrich
1 sibling, 1 reply; 5+ messages in thread
From: Alexander Dahl @ 2021-05-17 16:04 UTC (permalink / raw)
To: ptxdist; +Cc: Alexander Dahl
Build failed after libxml2 upgrade to 2.9.12, thus this version bump
including an upstream post 1.1.34 patch fixing the build failure.
Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
patches/libxslt-1.1.29/series | 4 ----
...ml2-config-check-in-configure-script.patch | 23 +++++++++++++++++++
...200-xslt-config-add-SYSROOT-support.patch} | 4 ++--
patches/libxslt-1.1.34/autogen.sh | 1 +
patches/libxslt-1.1.34/series | 7 ++++++
rules/libxslt.make | 10 ++++----
6 files changed, 39 insertions(+), 10 deletions(-)
delete mode 100644 patches/libxslt-1.1.29/series
create mode 100644 patches/libxslt-1.1.34/0001-Fix-xml2-config-check-in-configure-script.patch
rename patches/{libxslt-1.1.29/0001-xslt-config-add-SYSROOT-support.patch => libxslt-1.1.34/0200-xslt-config-add-SYSROOT-support.patch} (87%)
create mode 120000 patches/libxslt-1.1.34/autogen.sh
create mode 100644 patches/libxslt-1.1.34/series
diff --git a/patches/libxslt-1.1.29/series b/patches/libxslt-1.1.29/series
deleted file mode 100644
index 04dc8b07e..000000000
--- a/patches/libxslt-1.1.29/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# 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/patches/libxslt-1.1.34/0001-Fix-xml2-config-check-in-configure-script.patch b/patches/libxslt-1.1.34/0001-Fix-xml2-config-check-in-configure-script.patch
new file mode 100644
index 000000000..ab7227344
--- /dev/null
+++ b/patches/libxslt-1.1.34/0001-Fix-xml2-config-check-in-configure-script.patch
@@ -0,0 +1,23 @@
+From: Nick Wellnhofer <wellnhofer@aevum.de>
+Date: Fri, 15 Nov 2019 11:53:11 +0100
+Subject: [PATCH] Fix xml2-config check in configure script
+
+A 'print' option has never been supported. After a recent change to
+libxml2, invalid options cause xml2-config to fail.
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 325a7bea0dcf..d6b5594ad477 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -546,7 +546,7 @@ dnl make sure xml2-config is executable,
+ dnl test version and init our variables
+ dnl
+
+-if test "x$LIBXML_LIBS" = "x" && ${XML_CONFIG} --libs print > /dev/null 2>&1
++if test "x$LIBXML_LIBS" = "x" && ${XML_CONFIG} --libs > /dev/null 2>&1
+ then
+ AC_MSG_CHECKING(for libxml libraries >= $LIBXML_REQUIRED_VERSION)
+ XMLVERS=`$XML_CONFIG --version`
diff --git a/patches/libxslt-1.1.29/0001-xslt-config-add-SYSROOT-support.patch b/patches/libxslt-1.1.34/0200-xslt-config-add-SYSROOT-support.patch
similarity index 87%
rename from patches/libxslt-1.1.29/0001-xslt-config-add-SYSROOT-support.patch
rename to patches/libxslt-1.1.34/0200-xslt-config-add-SYSROOT-support.patch
index dacc3eeb3..1f124a8d6 100644
--- a/patches/libxslt-1.1.29/0001-xslt-config-add-SYSROOT-support.patch
+++ b/patches/libxslt-1.1.34/0200-xslt-config-add-SYSROOT-support.patch
@@ -4,11 +4,11 @@ Subject: [PATCH] xslt-config: add SYSROOT support
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
- xslt-config.in | 2 +-
+ xslt-config.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/xslt-config.in b/xslt-config.in
-index 45c3e28f2f12..5c009c4f4ad2 100644
+index 1d376b66d89a..4951187533bb 100644
--- a/xslt-config.in
+++ b/xslt-config.in
@@ -1,6 +1,6 @@
diff --git a/patches/libxslt-1.1.34/autogen.sh b/patches/libxslt-1.1.34/autogen.sh
new file mode 120000
index 000000000..9f8a4cb7d
--- /dev/null
+++ b/patches/libxslt-1.1.34/autogen.sh
@@ -0,0 +1 @@
+../autogen.sh
\ No newline at end of file
diff --git a/patches/libxslt-1.1.34/series b/patches/libxslt-1.1.34/series
new file mode 100644
index 000000000..1ede19a8c
--- /dev/null
+++ b/patches/libxslt-1.1.34/series
@@ -0,0 +1,7 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+#tag:upstream --start-number 1
+0001-Fix-xml2-config-check-in-configure-script.patch
+#tag:ptx --start-number 200
+0200-xslt-config-add-SYSROOT-support.patch
+# c8a532c629ee7654cb91733eefc0814b - git-ptx-patches magic
diff --git a/rules/libxslt.make b/rules/libxslt.make
index 74aef587a..0ea879ead 100644
--- a/rules/libxslt.make
+++ b/rules/libxslt.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIBXSLT) += libxslt
#
# Paths and names
#
-LIBXSLT_VERSION := 1.1.29
-LIBXSLT_MD5 := a129d3c44c022de3b9dcf6d6f288d72e
+LIBXSLT_VERSION := 1.1.34
+LIBXSLT_MD5 := db8765c8d076f1b6caafd9f2542a304a
LIBXSLT := libxslt-$(LIBXSLT_VERSION)
LIBXSLT_SUFFIX := tar.gz
LIBXSLT_SOURCE := $(SRCDIR)/$(LIBXSLT).$(LIBXSLT_SUFFIX)
@@ -43,9 +43,11 @@ LIBXSLT_AUTOCONF := \
--disable-static \
--without-python \
--$(call ptx/wwo, PTXCONF_LIBXSLT_CRYPTO)-crypto \
- --$(call ptx/wwo, PTXCONF_LIBXSLT_PLUGINS)-plugins \
--$(call ptx/wwo, PTXCONF_LIBXSLT_DEBUG)-debug \
- --$(call ptx/wwo, PTXCONF_LIBXSLT_DEBUG)-debugger
+ --$(call ptx/wwo, PTXCONF_LIBXSLT_DEBUG)-mem-debug \
+ --$(call ptx/wwo, PTXCONF_LIBXSLT_DEBUG)-debugger \
+ --without-profiler \
+ --$(call ptx/wwo, PTXCONF_LIBXSLT_PLUGINS)-plugins
# ----------------------------------------------------------------------------
# Target-Install
--
2.20.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [ptxdist] [APPLIED] libxml2: version bump 2.9.10 -> 2.9.12
2021-05-17 16:04 ` [ptxdist] [PATCH 1/2] libxml2: version bump 2.9.10 -> 2.9.12 Alexander Dahl
@ 2021-05-27 6:45 ` Michael Olbrich
0 siblings, 0 replies; 5+ messages in thread
From: Michael Olbrich @ 2021-05-27 6:45 UTC (permalink / raw)
To: ptxdist; +Cc: Alexander Dahl
Thanks, applied as 03aeef516da3c961a26de8b56d0b8e0596a4f62a.
Michael
[sent from post-receive hook]
On Thu, 27 May 2021 08:45:47 +0200, Alexander Dahl <ada@thorsis.com> wrote:
> Fixes quite some security and other issues. License text change was a
> small typo only. Two patches removed have gone upstream.
>
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> Link: https://mail.gnome.org/archives/xml/2021-May/msg00000.html
> Link: https://mail.gnome.org/archives/xml/2021-May/msg00003.html
> Message-Id: <20210517160447.95609-2-ada@thorsis.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/patches/libxml2-2.9.10/0001-Fix-infinite-loop-in-xmlStringLenDecodeEntities.patch b/patches/libxml2-2.9.10/0001-Fix-infinite-loop-in-xmlStringLenDecodeEntities.patch
> deleted file mode 100644
> index 59c8647310bb..000000000000
> --- a/patches/libxml2-2.9.10/0001-Fix-infinite-loop-in-xmlStringLenDecodeEntities.patch
> +++ /dev/null
> @@ -1,28 +0,0 @@
> -From: Zhipeng Xie <xiezhipeng1@huawei.com>
> -Date: Thu, 12 Dec 2019 17:30:55 +0800
> -Subject: [PATCH] Fix infinite loop in xmlStringLenDecodeEntities
> -
> -When ctxt->instate == XML_PARSER_EOF,xmlParseStringEntityRef
> -return NULL which cause a infinite loop in xmlStringLenDecodeEntities
> -
> -Found with libFuzzer.
> -
> -Signed-off-by: Zhipeng Xie <xiezhipeng1@huawei.com>
> ----
> - parser.c | 3 ++-
> - 1 file changed, 2 insertions(+), 1 deletion(-)
> -
> -diff --git a/parser.c b/parser.c
> -index d1c319631fc9..a34bb6cdd81b 100644
> ---- a/parser.c
> -+++ b/parser.c
> -@@ -2646,7 +2646,8 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len,
> - else
> - c = 0;
> - while ((c != 0) && (c != end) && /* non input consuming loop */
> -- (c != end2) && (c != end3)) {
> -+ (c != end2) && (c != end3) &&
> -+ (ctxt->instate != XML_PARSER_EOF)) {
> -
> - if (c == 0) break;
> - if ((c == '&') && (str[1] == '#')) {
> diff --git a/patches/libxml2-2.9.10/0002-Fix-memory-leak-in-xmlSchemaValidateStream.patch b/patches/libxml2-2.9.10/0002-Fix-memory-leak-in-xmlSchemaValidateStream.patch
> deleted file mode 100644
> index 1ca08621799a..000000000000
> --- a/patches/libxml2-2.9.10/0002-Fix-memory-leak-in-xmlSchemaValidateStream.patch
> +++ /dev/null
> @@ -1,29 +0,0 @@
> -From: Zhipeng Xie <xiezhipeng1@huawei.com>
> -Date: Tue, 20 Aug 2019 16:33:06 +0800
> -Subject: [PATCH] Fix memory leak in xmlSchemaValidateStream
> -
> -When ctxt->schema is NULL, xmlSchemaSAXPlug->xmlSchemaPreRun
> -alloc a new schema for ctxt->schema and set vctxt->xsiAssemble
> -to 1. Then xmlSchemaVStart->xmlSchemaPreRun initialize
> -vctxt->xsiAssemble to 0 again which cause the alloced schema
> -can not be freed anymore.
> -
> -Found with libFuzzer.
> -
> -Signed-off-by: Zhipeng Xie <xiezhipeng1@huawei.com>
> ----
> - xmlschemas.c | 1 -
> - 1 file changed, 1 deletion(-)
> -
> -diff --git a/xmlschemas.c b/xmlschemas.c
> -index d19de6df5f50..59495c2738ab 100644
> ---- a/xmlschemas.c
> -+++ b/xmlschemas.c
> -@@ -28095,7 +28095,6 @@ xmlSchemaPreRun(xmlSchemaValidCtxtPtr vctxt) {
> - vctxt->nberrors = 0;
> - vctxt->depth = -1;
> - vctxt->skipDepth = -1;
> -- vctxt->xsiAssemble = 0;
> - vctxt->hasKeyrefs = 0;
> - #ifdef ENABLE_IDC_NODE_TABLES_TEST
> - vctxt->createIDCNodeTables = 1;
> diff --git a/patches/libxml2-2.9.10/series b/patches/libxml2-2.9.10/series
> deleted file mode 100644
> index fed72960d3b0..000000000000
> --- a/patches/libxml2-2.9.10/series
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -#tag:upstream --start-number 1
> -0001-Fix-infinite-loop-in-xmlStringLenDecodeEntities.patch
> -0002-Fix-memory-leak-in-xmlSchemaValidateStream.patch
> -#tag:ptx --start-number 200
> -0200-xml2-config-is-not-SYSROOT-aware.patch
> -# d6f49636e8813a3a9e46758f352fc667 - git-ptx-patches magic
> diff --git a/patches/libxml2-2.9.10/0200-xml2-config-is-not-SYSROOT-aware.patch b/patches/libxml2-2.9.12/0200-xml2-config-is-not-SYSROOT-aware.patch
> similarity index 100%
> rename from patches/libxml2-2.9.10/0200-xml2-config-is-not-SYSROOT-aware.patch
> rename to patches/libxml2-2.9.12/0200-xml2-config-is-not-SYSROOT-aware.patch
> diff --git a/patches/libxml2-2.9.12/series b/patches/libxml2-2.9.12/series
> new file mode 100644
> index 000000000000..05ba5ddea3dd
> --- /dev/null
> +++ b/patches/libxml2-2.9.12/series
> @@ -0,0 +1,6 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +#tag:upstream --start-number 1
> +#tag:ptx --start-number 200
> +0200-xml2-config-is-not-SYSROOT-aware.patch
> +# b6720be956d1b4619bc1c347a0ceb1dd - git-ptx-patches magic
> diff --git a/rules/libxml2.make b/rules/libxml2.make
> index 1da248307b18..9eb1993b07c1 100644
> --- a/rules/libxml2.make
> +++ b/rules/libxml2.make
> @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LIBXML2) += libxml2
> #
> # Paths and names
> #
> -LIBXML2_VERSION := 2.9.10
> -LIBXML2_MD5 := 10942a1dc23137a8aa07f0639cbfece5
> +LIBXML2_VERSION := 2.9.12
> +LIBXML2_MD5 := f433a39be087a9f0b197eb2307ad9f75
> LIBXML2 := libxml2-$(LIBXML2_VERSION)
> LIBXML2_SUFFIX := tar.gz
> LIBXML2_SOURCE := $(SRCDIR)/$(LIBXML2).$(LIBXML2_SUFFIX)
> @@ -26,7 +26,7 @@ LIBXML2_LICENSE := MIT AND ISC
> # The file 'COPYING' is just a symlink on the file 'Copyright'
> LIBXML2_LICENSE_FILES := \
> file://Copyright;md5=2044417e2e5006b65a8b9067b683fcf1 \
> - file://hash.c;startline=6;endline=15;md5=96f7296605eae807670fb08947829969
> + file://hash.c;startline=6;endline=15;md5=e77f77b12cb69e203d8b4090a0eee879
>
> LIBXML2_URL := \
> ftp://xmlsoft.org/libxml2/$(LIBXML2).$(LIBXML2_SUFFIX) \
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [ptxdist] [APPLIED] libxslt: version bump 1.1.29 -> 1.1.34
2021-05-17 16:04 ` [ptxdist] [PATCH 2/2] libxslt: version bump 1.1.29 -> 1.1.34 Alexander Dahl
@ 2021-05-27 6:45 ` Michael Olbrich
0 siblings, 0 replies; 5+ messages in thread
From: Michael Olbrich @ 2021-05-27 6:45 UTC (permalink / raw)
To: ptxdist; +Cc: Alexander Dahl
Thanks, applied as 1940c3646f2ff915a6b9cd51973f7a4041e2c4b2.
Michael
[sent from post-receive hook]
On Thu, 27 May 2021 08:45:49 +0200, Alexander Dahl <ada@thorsis.com> wrote:
> Build failed after libxml2 upgrade to 2.9.12, thus this version bump
> including an upstream post 1.1.34 patch fixing the build failure.
>
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> Message-Id: <20210517160447.95609-3-ada@thorsis.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/patches/libxslt-1.1.29/series b/patches/libxslt-1.1.29/series
> deleted file mode 100644
> index 04dc8b07ed73..000000000000
> --- a/patches/libxslt-1.1.29/series
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -# 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/patches/libxslt-1.1.34/0001-Fix-xml2-config-check-in-configure-script.patch b/patches/libxslt-1.1.34/0001-Fix-xml2-config-check-in-configure-script.patch
> new file mode 100644
> index 000000000000..ab722734438a
> --- /dev/null
> +++ b/patches/libxslt-1.1.34/0001-Fix-xml2-config-check-in-configure-script.patch
> @@ -0,0 +1,23 @@
> +From: Nick Wellnhofer <wellnhofer@aevum.de>
> +Date: Fri, 15 Nov 2019 11:53:11 +0100
> +Subject: [PATCH] Fix xml2-config check in configure script
> +
> +A 'print' option has never been supported. After a recent change to
> +libxml2, invalid options cause xml2-config to fail.
> +---
> + configure.ac | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/configure.ac b/configure.ac
> +index 325a7bea0dcf..d6b5594ad477 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -546,7 +546,7 @@ dnl make sure xml2-config is executable,
> + dnl test version and init our variables
> + dnl
> +
> +-if test "x$LIBXML_LIBS" = "x" && ${XML_CONFIG} --libs print > /dev/null 2>&1
> ++if test "x$LIBXML_LIBS" = "x" && ${XML_CONFIG} --libs > /dev/null 2>&1
> + then
> + AC_MSG_CHECKING(for libxml libraries >= $LIBXML_REQUIRED_VERSION)
> + XMLVERS=`$XML_CONFIG --version`
> diff --git a/patches/libxslt-1.1.29/0001-xslt-config-add-SYSROOT-support.patch b/patches/libxslt-1.1.34/0200-xslt-config-add-SYSROOT-support.patch
> similarity index 87%
> rename from patches/libxslt-1.1.29/0001-xslt-config-add-SYSROOT-support.patch
> rename to patches/libxslt-1.1.34/0200-xslt-config-add-SYSROOT-support.patch
> index dacc3eeb3f8c..1f124a8d6b4b 100644
> --- a/patches/libxslt-1.1.29/0001-xslt-config-add-SYSROOT-support.patch
> +++ b/patches/libxslt-1.1.34/0200-xslt-config-add-SYSROOT-support.patch
> @@ -4,11 +4,11 @@ Subject: [PATCH] xslt-config: add SYSROOT support
>
> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
> ---
> - xslt-config.in | 2 +-
> + xslt-config.in | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/xslt-config.in b/xslt-config.in
> -index 45c3e28f2f12..5c009c4f4ad2 100644
> +index 1d376b66d89a..4951187533bb 100644
> --- a/xslt-config.in
> +++ b/xslt-config.in
> @@ -1,6 +1,6 @@
> diff --git a/patches/libxslt-1.1.34/autogen.sh b/patches/libxslt-1.1.34/autogen.sh
> new file mode 120000
> index 000000000000..9f8a4cb7ddcb
> --- /dev/null
> +++ b/patches/libxslt-1.1.34/autogen.sh
> @@ -0,0 +1 @@
> +../autogen.sh
> \ No newline at end of file
> diff --git a/patches/libxslt-1.1.34/series b/patches/libxslt-1.1.34/series
> new file mode 100644
> index 000000000000..1ede19a8c3fb
> --- /dev/null
> +++ b/patches/libxslt-1.1.34/series
> @@ -0,0 +1,7 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +#tag:upstream --start-number 1
> +0001-Fix-xml2-config-check-in-configure-script.patch
> +#tag:ptx --start-number 200
> +0200-xslt-config-add-SYSROOT-support.patch
> +# c8a532c629ee7654cb91733eefc0814b - git-ptx-patches magic
> diff --git a/rules/libxslt.make b/rules/libxslt.make
> index 74aef587a1e2..0ea879ead228 100644
> --- a/rules/libxslt.make
> +++ b/rules/libxslt.make
> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIBXSLT) += libxslt
> #
> # Paths and names
> #
> -LIBXSLT_VERSION := 1.1.29
> -LIBXSLT_MD5 := a129d3c44c022de3b9dcf6d6f288d72e
> +LIBXSLT_VERSION := 1.1.34
> +LIBXSLT_MD5 := db8765c8d076f1b6caafd9f2542a304a
> LIBXSLT := libxslt-$(LIBXSLT_VERSION)
> LIBXSLT_SUFFIX := tar.gz
> LIBXSLT_SOURCE := $(SRCDIR)/$(LIBXSLT).$(LIBXSLT_SUFFIX)
> @@ -43,9 +43,11 @@ LIBXSLT_AUTOCONF := \
> --disable-static \
> --without-python \
> --$(call ptx/wwo, PTXCONF_LIBXSLT_CRYPTO)-crypto \
> - --$(call ptx/wwo, PTXCONF_LIBXSLT_PLUGINS)-plugins \
> --$(call ptx/wwo, PTXCONF_LIBXSLT_DEBUG)-debug \
> - --$(call ptx/wwo, PTXCONF_LIBXSLT_DEBUG)-debugger
> + --$(call ptx/wwo, PTXCONF_LIBXSLT_DEBUG)-mem-debug \
> + --$(call ptx/wwo, PTXCONF_LIBXSLT_DEBUG)-debugger \
> + --without-profiler \
> + --$(call ptx/wwo, PTXCONF_LIBXSLT_PLUGINS)-plugins
>
> # ----------------------------------------------------------------------------
> # Target-Install
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-05-27 6:47 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-17 16:04 [ptxdist] [PATCH 0/2] libxml2/libxslt version bumps Alexander Dahl
2021-05-17 16:04 ` [ptxdist] [PATCH 1/2] libxml2: version bump 2.9.10 -> 2.9.12 Alexander Dahl
2021-05-27 6:45 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-05-17 16:04 ` [ptxdist] [PATCH 2/2] libxslt: version bump 1.1.29 -> 1.1.34 Alexander Dahl
2021-05-27 6:45 ` [ptxdist] [APPLIED] " Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox