[Buildroot] [PATCH 1/3] package/libxslt: bump to version 1.1.39

[Buildroot] [PATCH 1/3] package/libxslt: bump to version 1.1.39

[Bernd Kuhls]

Release notes:
https://download.gnome.org/sources/libxslt/1.1/libxslt-1.1.39.news

Fixes:
http://autobuild.buildroot.net/results/8dc/8dc9b1fb68c196deace94951ed81a9a520f98973//

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
 package/libxslt/libxslt.hash | 4 ++--
 package/libxslt/libxslt.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/libxslt/libxslt.hash b/package/libxslt/libxslt.hash
index 458c1388d3..7597e7954d 100644
--- a/package/libxslt/libxslt.hash
+++ b/package/libxslt/libxslt.hash
@@ -1,5 +1,5 @@
-# From https://download.gnome.org/sources/libxslt/1.1/libxslt-1.1.38.sha256sum
-sha256  1f32450425819a09acaff2ab7a5a7f8a2ec7956e505d7beeb45e843d0e1ecab1  libxslt-1.1.38.tar.xz
+# From https://download.gnome.org/sources/libxslt/1.1/libxslt-1.1.39.sha256sum
+sha256  2a20ad621148339b0759c4d4e96719362dee64c9a096dbba625ba053846349f0  libxslt-1.1.39.tar.xz
 
 # Hash for license file:
 sha256  7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819  COPYING
diff --git a/package/libxslt/libxslt.mk b/package/libxslt/libxslt.mk
index ec066fbfa2..8098937ef3 100644
--- a/package/libxslt/libxslt.mk
+++ b/package/libxslt/libxslt.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBXSLT_VERSION = 1.1.38
+LIBXSLT_VERSION = 1.1.39
 LIBXSLT_SOURCE = libxslt-$(LIBXSLT_VERSION).tar.xz
 LIBXSLT_SITE = https://download.gnome.org/sources/libxslt/1.1
 LIBXSLT_INSTALL_STAGING = YES
-- 
2.39.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 2/3] package/apache: fix build with libxml2-2.12

[Bernd Kuhls]

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
 ...emove-dependency-on-xmlstring-header.patch | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 package/apache/0004-mod_xml2enc-remove-dependency-on-xmlstring-header.patch

diff --git a/package/apache/0004-mod_xml2enc-remove-dependency-on-xmlstring-header.patch b/package/apache/0004-mod_xml2enc-remove-dependency-on-xmlstring-header.patch
new file mode 100644
index 0000000000..8ff7076589
--- /dev/null
+++ b/package/apache/0004-mod_xml2enc-remove-dependency-on-xmlstring-header.patch
@@ -0,0 +1,47 @@
+From 27a68e54b7c6d2ae80dca396fd2727852897dab1 Mon Sep 17 00:00:00 2001
+From: Eric Covener <covener@apache.org>
+Date: Tue, 21 Nov 2023 12:58:47 +0000
+Subject: [PATCH] mod_xml2enc: remove dependency on xmlstring header
+
+Submitted by: ttachi <tachihara@hotmail.com>
+
+Github: closes #393
+
+git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1914013 13f79535-47bb-0310-9956-ffa450edef68
+
+Upstream: https://github.com/apache/httpd/commit/27a68e54b7c6d2ae80dca396fd2727852897dab1
+
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
+---
+ changes-entries/xmlchar.txt   | 2 ++
+ modules/filters/mod_xml2enc.c | 6 +++---
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+ create mode 100644 changes-entries/xmlchar.txt
+
+diff --git a/changes-entries/xmlchar.txt b/changes-entries/xmlchar.txt
+new file mode 100644
+index 00000000000..d0e06300411
+--- /dev/null
++++ b/changes-entries/xmlchar.txt
+@@ -0,0 +1,2 @@
++ *) mod_xml2enc: Tolerate libxml2 2.12.0 and later.
++    [ttachi <tachihara AT hotmail.com>]
+diff --git a/modules/filters/mod_xml2enc.c b/modules/filters/mod_xml2enc.c
+index 34f8e8ee090..e8ee2647955 100644
+--- a/modules/filters/mod_xml2enc.c
++++ b/modules/filters/mod_xml2enc.c
+@@ -206,11 +206,11 @@ static void sniff_encoding(request_rec* r, xml2ctx* ctx)
+             }
+         }
+     }
+-  
++
+     /* to sniff, first we look for BOM */
+     if (ctx->xml2enc == XML_CHAR_ENCODING_NONE) {
+-        ctx->xml2enc = xmlDetectCharEncoding((const xmlChar*)ctx->buf,
+-                                             ctx->bytes); 
++        ctx->xml2enc = xmlDetectCharEncoding((const unsigned char*)ctx->buf,
++                                             ctx->bytes);
+         if (HAVE_ENCODING(ctx->xml2enc)) {
+             ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(01432)
+                           "Got charset from XML rules.") ;
-- 
2.39.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 3/3] package/php: fix build with libxml2-2.12

[Bernd Kuhls]

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
 ...bxml2-2.12.0-issue-building-from-src.patch | 56 +++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 package/php/0007-Fix-GH-12702-libxml2-2.12.0-issue-building-from-src.patch

diff --git a/package/php/0007-Fix-GH-12702-libxml2-2.12.0-issue-building-from-src.patch b/package/php/0007-Fix-GH-12702-libxml2-2.12.0-issue-building-from-src.patch
new file mode 100644
index 0000000000..2f1bce3973
--- /dev/null
+++ b/package/php/0007-Fix-GH-12702-libxml2-2.12.0-issue-building-from-src.patch
@@ -0,0 +1,56 @@
+From 8a95e616b91ac0eeedba90a61e36e652919763f2 Mon Sep 17 00:00:00 2001
+From: Niels Dossche <7771979+nielsdos@users.noreply.github.com>
+Date: Fri, 17 Nov 2023 19:45:40 +0100
+Subject: [PATCH] Fix GH-12702: libxml2 2.12.0 issue building from src
+
+Fixes GH-12702.
+
+Co-authored-by: nono303 <github@nono303.net>
+
+Upstream: https://github.com/php/php-src/commit/8a95e616b91ac0eeedba90a61e36e652919763f2
+
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
+---
+ NEWS                    | 3 +++
+ ext/dom/document.c      | 1 +
+ ext/libxml/php_libxml.h | 1 +
+ 3 files changed, 5 insertions(+)
+
+diff --git a/NEWS b/NEWS
+index dff47b02fb671..247a124e51293 100644
+--- a/NEWS
++++ b/NEWS
+@@ -5,6 +5,9 @@ PHP                                                                        NEWS
+ - Intl:
+   . Fixed bug GH-12635 (Test bug69398.phpt fails with ICU 74.1). (nielsdos)
+ 
++- LibXML:
++  . Fixed bug GH-12702 (libxml2 2.12.0 issue building from src). (nono303)
++
+ - PCRE:
+   . Fixed bug GH-12628 (The gh11374 test fails on Alpinelinux). (nielsdos)
+ 
+diff --git a/ext/dom/document.c b/ext/dom/document.c
+index 59f00897a69aa..8312d6c59399f 100644
+--- a/ext/dom/document.c
++++ b/ext/dom/document.c
+@@ -23,6 +23,7 @@
+ #if defined(HAVE_LIBXML) && defined(HAVE_DOM)
+ #include "php_dom.h"
+ #include <libxml/SAX.h>
++#include <libxml/xmlsave.h>
+ #ifdef LIBXML_SCHEMAS_ENABLED
+ #include <libxml/relaxng.h>
+ #include <libxml/xmlschemas.h>
+diff --git a/ext/libxml/php_libxml.h b/ext/libxml/php_libxml.h
+index af1cc7d6ac8c5..b484568bb1b0a 100644
+--- a/ext/libxml/php_libxml.h
++++ b/ext/libxml/php_libxml.h
+@@ -35,6 +35,7 @@ extern zend_module_entry libxml_module_entry;
+ 
+ #include "zend_smart_str.h"
+ #include <libxml/tree.h>
++#include <libxml/parser.h>
+ 
+ #define LIBXML_SAVE_NOEMPTYTAG 1<<2
+ 
-- 
2.39.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/3] package/libxslt: bump to version 1.1.39

[Thomas Petazzoni via buildroot]

On Sun, 24 Dec 2023 09:15:10 +0100
Bernd Kuhls <bernd@kuhls.net> wrote:

> Release notes:
> https://download.gnome.org/sources/libxslt/1.1/libxslt-1.1.39.news
> 
> Fixes:
> http://autobuild.buildroot.net/results/8dc/8dc9b1fb68c196deace94951ed81a9a520f98973//
> 
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
> ---
>  package/libxslt/libxslt.hash | 4 ++--
>  package/libxslt/libxslt.mk   | 2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 2/3] package/apache: fix build with libxml2-2.12

[Thomas Petazzoni via buildroot]

On Sun, 24 Dec 2023 09:15:11 +0100
Bernd Kuhls <bernd@kuhls.net> wrote:

> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
> ---
>  ...emove-dependency-on-xmlstring-header.patch | 47 +++++++++++++++++++
>  1 file changed, 47 insertions(+)
>  create mode 100644 package/apache/0004-mod_xml2enc-remove-dependency-on-xmlstring-header.patch

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot