gentoo auto-resync : 29:03:2025 - 00:32:15

4 files changed, 0 insertions, 307 deletions

diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
index 32228ea1a9a1..e0a210b46a87 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -1,7 +1,4 @@
 AUX libxslt-1.1.39-libxml2-2.11-tests.patch 911 BLAKE2B b9240d9720044ec75fff2ca73abb5b5192f8a0262d5cc51cd5e3bc5b8e07af45486a257d4eb5098cf0c7263d1324a7a9995cce38210245d5b53afc5fe7f4d224 SHA512 26f8664c3cc2bf2579eb236cb771d9fbc0ee528472a44ea55e7975fa0182e63c12a1b7d30c9c01b2e848f9ec91dded5ec4a59c60a7eea2bb283bd120c3e0fedc
-AUX libxslt-1.1.41-deprecated-xmlCharEncodingHandler.patch 3803 BLAKE2B 54246d50bddf4287b535e55d6d65c790fd027d8d1c290ec77483ea998ae4bb85e27b5440ca8198850128a226a901477580bdc1ecaa3245ccaab9fa4c62712033 SHA512 e80f48c80e68a46697c45b501c426815ed21199eedfc1093f9885689e9a1321192d4ebb546cda62c1290508bbc2ddb8862d6875c00b8e08663eaea76bec8bbff
-AUX libxslt-1.1.41-extensions-xmlCheckFilename-older-libxml2.patch 1189 BLAKE2B cbc164f593c4e46a959d801d5d81502e4599aa9456a7a4b72686325f36f96b75892df519118222ec79335da91dff5aafe695cadf37fd3f31cc43a6828f761afd SHA512 4fbb4969505837c7ca842b2192270a40aca14f69ba74dc763253a1c5f9475ad8e904e06b109181ca80bc7bb719b6fb5055d791a15e1c24e9da0007435464aef1
-AUX libxslt-1.1.41-libxml2-2.13.patch 5457 BLAKE2B 4fa71f28d253592be63e0b8b93002d359b21b40f15fe043c7602ee593600f91dfefa86ae4076096b09fa5df9834e58b62fd5ee4bc997967388c10aa3acfa12d5 SHA512 e1e546efbe08ebf37b02d55770d3b11efd6b97646cc7a8d3b23b06b438cf8c2ee8c3d892037e41fe7dca46a4d20cbc9dc0f2591b924d94c93456726672aa71c2
 DIST libxslt-1.1.39.tar.xz 1578216 BLAKE2B 7c87b769d345fc99a966bea6b4e94533fa211dc3a987ce013a03eefb05dde73ef75526bdecf7d32d8c77112232096fb22d8ec4f0a781b9f59d0422a2db75df01 SHA512 c0c99dc63f8b2acb6cc3ad7ad684ffa2a427ee8d1740495cbf8a7c9b9c8679f96351b4b676c73ccc191014db4cb4ab42b9a0070f6295565f39dbc665c5c16f89
 DIST libxslt-1.1.42.tar.xz 1573668 BLAKE2B 91b2ca38807ae21b6629b8e19f4ab9d7d19bc0af17f2546e1cf278b2f2fff62b86bbbd996085fff322f3d5ae6c2b20bcfc4e9fb501c301d3fd5d56cf5b205ede SHA512 02a2189b6cd65fa1fb929fc0e6868bc046bdd8827849f0048cdf9267ed9450745158cef0f2713a833e28fb520b312ff86dc5754dd423ce768c457bfd8812bdc7
 DIST libxslt-1.1.43.tar.xz 1518364 BLAKE2B 84d1cff32c78c4eeff4db614214ee1808bcf958d55711b08e7e2191a4343fb61d38d6b3d9b43f6f12be2dc909fced0a5b5905fa2c5ec7761c83125007e1ce265 SHA512 96110b0397a8f5791f489127574e2143845feb61bea0581d7b7e3c1101fd0718483bae81a7ce417b971bd678293bfd95daddad0dadd3e256c87d41a69faed85a
diff --git a/dev-libs/libxslt/files/libxslt-1.1.41-deprecated-xmlCharEncodingHandler.patch b/dev-libs/libxslt/files/libxslt-1.1.41-deprecated-xmlCharEncodingHandler.patch
deleted file mode 100644
index 86c779c3c7cf..000000000000
--- a/dev-libs/libxslt/files/libxslt-1.1.41-deprecated-xmlCharEncodingHandler.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-https://gitlab.gnome.org/GNOME/libxslt/-/commit/8d456f03b6b6661edfb0a3f1bc5abdc9597f60e7
-
-From 8d456f03b6b6661edfb0a3f1bc5abdc9597f60e7 Mon Sep 17 00:00:00 2001
-From: Nick Wellnhofer <wellnhofer@aevum.de>
-Date: Tue, 2 Jul 2024 22:27:02 +0200
-Subject: [PATCH] utils: Don't use deprecated xmlCharEncodingHandler member
-
----
- libxslt/xsltutils.c | 44 ++++++++++++++++++++------------------------
- 1 file changed, 20 insertions(+), 24 deletions(-)
-
-diff --git a/libxslt/xsltutils.c b/libxslt/xsltutils.c
-index 3705d28f..d493905b 100644
---- a/libxslt/xsltutils.c
-+++ b/libxslt/xsltutils.c
-@@ -1750,13 +1750,12 @@ xsltSaveResultToFilename(const char *URL, xmlDocPtr result,
- 
-     XSLT_GET_IMPORT_PTR(encoding, style, encoding)
-     if (encoding != NULL) {
--	xmlCharEncodingHandlerPtr encoder;
-+	xmlCharEncodingHandlerPtr encoder = NULL;
- 
--	encoder = xmlFindCharEncodingHandler((char *)encoding);
--	if ((encoder != NULL) &&
--	    (xmlStrEqual((const xmlChar *)encoder->name,
--			 (const xmlChar *) "UTF-8")))
--	    encoder = NULL;
-+        /* Don't use UTF-8 dummy encoder */
-+        if ((xmlStrcasecmp(encoding, BAD_CAST "UTF-8") != 0) &&
-+            (xmlStrcasecmp(encoding, BAD_CAST "UTF8") != 0))
-+	    encoder = xmlFindCharEncodingHandler((char *) encoding);
- 	buf = xmlOutputBufferCreateFilename(URL, encoder, compression);
-     } else {
- 	buf = xmlOutputBufferCreateFilename(URL, NULL, compression);
-@@ -1793,13 +1792,12 @@ xsltSaveResultToFile(FILE *file, xmlDocPtr result, xsltStylesheetPtr style) {
- 
-     XSLT_GET_IMPORT_PTR(encoding, style, encoding)
-     if (encoding != NULL) {
--	xmlCharEncodingHandlerPtr encoder;
-+	xmlCharEncodingHandlerPtr encoder = NULL;
- 
--	encoder = xmlFindCharEncodingHandler((char *)encoding);
--	if ((encoder != NULL) &&
--	    (xmlStrEqual((const xmlChar *)encoder->name,
--			 (const xmlChar *) "UTF-8")))
--	    encoder = NULL;
-+        /* Don't use UTF-8 dummy encoder */
-+        if ((xmlStrcasecmp(encoding, BAD_CAST "UTF-8") != 0) &&
-+            (xmlStrcasecmp(encoding, BAD_CAST "UTF8") != 0))
-+	    encoder = xmlFindCharEncodingHandler((char *) encoding);
- 	buf = xmlOutputBufferCreateFile(file, encoder);
-     } else {
- 	buf = xmlOutputBufferCreateFile(file, NULL);
-@@ -1837,13 +1835,12 @@ xsltSaveResultToFd(int fd, xmlDocPtr result, xsltStylesheetPtr style) {
- 
-     XSLT_GET_IMPORT_PTR(encoding, style, encoding)
-     if (encoding != NULL) {
--	xmlCharEncodingHandlerPtr encoder;
-+	xmlCharEncodingHandlerPtr encoder = NULL;
- 
--	encoder = xmlFindCharEncodingHandler((char *)encoding);
--	if ((encoder != NULL) &&
--	    (xmlStrEqual((const xmlChar *)encoder->name,
--			 (const xmlChar *) "UTF-8")))
--	    encoder = NULL;
-+        /* Don't use UTF-8 dummy encoder */
-+        if ((xmlStrcasecmp(encoding, BAD_CAST "UTF-8") != 0) &&
-+            (xmlStrcasecmp(encoding, BAD_CAST "UTF8") != 0))
-+	    encoder = xmlFindCharEncodingHandler((char *) encoding);
- 	buf = xmlOutputBufferCreateFd(fd, encoder);
-     } else {
- 	buf = xmlOutputBufferCreateFd(fd, NULL);
-@@ -1880,13 +1877,12 @@ xsltSaveResultToString(xmlChar **doc_txt_ptr, int * doc_txt_len,
- 
-     XSLT_GET_IMPORT_PTR(encoding, style, encoding)
-     if (encoding != NULL) {
--	xmlCharEncodingHandlerPtr encoder;
-+	xmlCharEncodingHandlerPtr encoder = NULL;
- 
--	encoder = xmlFindCharEncodingHandler((char *)encoding);
--	if ((encoder != NULL) &&
--	    (xmlStrEqual((const xmlChar *)encoder->name,
--			 (const xmlChar *) "UTF-8")))
--	    encoder = NULL;
-+        /* Don't use UTF-8 dummy encoder */
-+        if ((xmlStrcasecmp(encoding, BAD_CAST "UTF-8") != 0) &&
-+            (xmlStrcasecmp(encoding, BAD_CAST "UTF8") != 0))
-+	    encoder = xmlFindCharEncodingHandler((char *) encoding);
- 	buf = xmlAllocOutputBuffer(encoder);
-         if (buf == NULL)
-             xmlCharEncCloseFunc(encoder);
--- 
-GitLab
diff --git a/dev-libs/libxslt/files/libxslt-1.1.41-extensions-xmlCheckFilename-older-libxml2.patch b/dev-libs/libxslt/files/libxslt-1.1.41-extensions-xmlCheckFilename-older-libxml2.patch
deleted file mode 100644
index bdf39460af2a..000000000000
--- a/dev-libs/libxslt/files/libxslt-1.1.41-extensions-xmlCheckFilename-older-libxml2.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-https://gitlab.gnome.org/GNOME/libxslt/-/commit/a85bd17ec52793b33074f0f785c3d989feb20170
-
-From a85bd17ec52793b33074f0f785c3d989feb20170 Mon Sep 17 00:00:00 2001
-From: Nick Wellnhofer <wellnhofer@aevum.de>
-Date: Fri, 21 Jun 2024 15:07:18 +0200
-Subject: [PATCH] extensions: Readd call to xmlCheckFilename with older libxml2
-
-Fix spurious warning with libxml2 before 2.13.0 caused by 014b2892.
-
-Fixes #113.
----
- libxslt/extensions.c | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/libxslt/extensions.c b/libxslt/extensions.c
-index 05cdf354..d3d61543 100644
---- a/libxslt/extensions.c
-+++ b/libxslt/extensions.c
-@@ -415,6 +415,19 @@ xsltExtModuleRegisterDynamic(const xmlChar * URI)
-                      module_filename, URI);
- #endif
- 
-+#if LIBXML_VERSION < 21300
-+    if (1 != xmlCheckFilename(module_filename)) {
-+
-+#ifdef WITH_XSLT_DEBUG_EXTENSIONS
-+	xsltGenericDebug(xsltGenericDebugContext,
-+                     "xmlCheckFilename failed for plugin: %s\n", module_filename);
-+#endif
-+
-+        xmlFree(ext_name);
-+        return (-1);
-+    }
-+#endif
-+
-     /* attempt to open the module */
-     m = xmlModuleOpen(module_filename, 0);
-     if (NULL == m) {
--- 
-GitLab
diff --git a/dev-libs/libxslt/files/libxslt-1.1.41-libxml2-2.13.patch b/dev-libs/libxslt/files/libxslt-1.1.41-libxml2-2.13.patch
deleted file mode 100644
index 99b89ae08f74..000000000000
--- a/dev-libs/libxslt/files/libxslt-1.1.41-libxml2-2.13.patch
+++ /dev/null
@@ -1,171 +0,0 @@
-https://gitlab.gnome.org/GNOME/libxslt/-/issues/116
-https://gitlab.gnome.org/GNOME/libxslt/-/commit/081cd6e97a620d035ed7df35e998e2d288bc7862
-
-From 081cd6e97a620d035ed7df35e998e2d288bc7862 Mon Sep 17 00:00:00 2001
-From: Nick Wellnhofer <wellnhofer@aevum.de>
-Date: Mon, 1 Jul 2024 13:21:14 +0200
-Subject: [PATCH] transform: Handle filesystem paths after libxml2 changes
-
-After changes in libxml2 2.13, base URIs and resolved URIs can be
-filesystem paths.
-
-Check for invalid URIs and remove fragment before resolving URI in
-xsltDocumentFunction.
-
-Handle filesystem paths in xsltCheckRead.
-
-Should fix #116.
----
- libxslt/functions.c | 64 ++++++++++++++++++++++++++-------------------
- libxslt/security.c  | 13 +++++++++
- 2 files changed, 50 insertions(+), 27 deletions(-)
-
-diff --git a/libxslt/functions.c b/libxslt/functions.c
-index 0c9dec43..d54f8f48 100644
---- a/libxslt/functions.c
-+++ b/libxslt/functions.c
-@@ -96,11 +96,10 @@ xsltXPathFunctionLookup (void *vctxt,
-  ************************************************************************/
- 
- static void
--xsltDocumentFunctionLoadDocument(xmlXPathParserContextPtr ctxt, xmlChar* URI)
-+xsltDocumentFunctionLoadDocument(xmlXPathParserContextPtr ctxt,
-+                                 const xmlChar* URI, const xmlChar *fragment)
- {
-     xsltTransformContextPtr tctxt;
--    xmlURIPtr uri;
--    xmlChar *fragment = NULL;
-     xsltDocumentPtr idoc; /* document info */
-     xmlDocPtr doc;
-     xmlXPathContextPtr xptrctxt = NULL;
-@@ -115,26 +114,7 @@ xsltDocumentFunctionLoadDocument(xmlXPathParserContextPtr ctxt, xmlChar* URI)
-         goto out_fragment;
-     }
- 
--    uri = xmlParseURI((const char *) URI);
--    if (uri == NULL) {
--	xsltTransformError(tctxt, NULL, NULL,
--	    "document() : failed to parse URI\n");
--        goto out_fragment;
--    }
--
--    /*
--     * check for and remove fragment identifier
--     */
--    fragment = (xmlChar *)uri->fragment;
--    if (fragment != NULL) {
--        xmlChar *newURI;
--	uri->fragment = NULL;
--	newURI = xmlSaveUri(uri);
--	idoc = xsltLoadDocument(tctxt, newURI);
--	xmlFree(newURI);
--    } else
--	idoc = xsltLoadDocument(tctxt, URI);
--    xmlFreeURI(uri);
-+    idoc = xsltLoadDocument(tctxt, URI);
- 
-     if (idoc == NULL) {
- 	if ((URI == NULL) ||
-@@ -194,7 +174,6 @@ out_fragment:
-     if (resObj == NULL)
-         resObj = xmlXPathNewNodeSet(NULL);
-     valuePush(ctxt, resObj);
--    xmlFree(fragment);
- }
- 
- /**
-@@ -210,7 +189,8 @@ xsltDocumentFunction(xmlXPathParserContextPtr ctxt, int nargs)
- {
-     xmlXPathObjectPtr obj, obj2 = NULL;
-     xmlChar *base = NULL, *URI;
--
-+    xmlChar *newURI = NULL;
-+    xmlChar *fragment = NULL;
- 
-     if ((nargs < 1) || (nargs > 2)) {
-         xsltTransformError(xsltXPathGetTransformContext(ctxt), NULL, NULL,
-@@ -292,7 +272,32 @@ xsltDocumentFunction(xmlXPathParserContextPtr ctxt, int nargs)
-         valuePush(ctxt, xmlXPathNewNodeSet(NULL));
-     } else {
-         xsltTransformContextPtr tctxt;
-+        xmlURIPtr uri;
-+        const xmlChar *url;
-+
-         tctxt = xsltXPathGetTransformContext(ctxt);
-+
-+        url = obj->stringval;
-+
-+        uri = xmlParseURI((const char *) url);
-+        if (uri == NULL) {
-+            xsltTransformError(tctxt, NULL, NULL,
-+                "document() : failed to parse URI '%s'\n", url);
-+            valuePush(ctxt, xmlXPathNewNodeSet(NULL));
-+            goto error;
-+        }
-+
-+        /*
-+         * check for and remove fragment identifier
-+         */
-+        fragment = (xmlChar *)uri->fragment;
-+        if (fragment != NULL) {
-+            uri->fragment = NULL;
-+            newURI = xmlSaveUri(uri);
-+            url = newURI;
-+        }
-+        xmlFreeURI(uri);
-+
-         if ((obj2 != NULL) && (obj2->nodesetval != NULL) &&
-             (obj2->nodesetval->nodeNr > 0) &&
-             IS_XSLT_REAL_NODE(obj2->nodesetval->nodeTab[0])) {
-@@ -313,7 +318,8 @@ xsltDocumentFunction(xmlXPathParserContextPtr ctxt, int nargs)
-                                       (xmlNodePtr) tctxt->style->doc);
-             }
-         }
--        URI = xmlBuildURI(obj->stringval, base);
-+
-+        URI = xmlBuildURI(url, base);
-         if (base != NULL)
-             xmlFree(base);
-         if (URI == NULL) {
-@@ -326,10 +332,14 @@ xsltDocumentFunction(xmlXPathParserContextPtr ctxt, int nargs)
-                 valuePush(ctxt, xmlXPathNewNodeSet(NULL));
-             }
-         } else {
--	    xsltDocumentFunctionLoadDocument( ctxt, URI );
-+	    xsltDocumentFunctionLoadDocument(ctxt, URI, fragment);
- 	    xmlFree(URI);
- 	}
-     }
-+
-+error:
-+    xmlFree(newURI);
-+    xmlFree(fragment);
-     xmlXPathFreeObject(obj);
-     if (obj2 != NULL)
-         xmlXPathFreeObject(obj2);
-diff --git a/libxslt/security.c b/libxslt/security.c
-index 001ee6e4..3a66594f 100644
---- a/libxslt/security.c
-+++ b/libxslt/security.c
-@@ -422,6 +422,19 @@ xsltCheckRead(xsltSecurityPrefsPtr sec,
-     xmlURIPtr uri;
-     xsltSecurityCheck check;
- 
-+    if (xmlStrstr(URL, BAD_CAST "://") == NULL) {
-+	check = xsltGetSecurityPrefs(sec, XSLT_SECPREF_READ_FILE);
-+	if (check != NULL) {
-+            ret = check(sec, ctxt, (const char *) URL);
-+            if (ret == 0) {
-+                xsltTransformError(ctxt, NULL, NULL,
-+                             "Local file read for %s refused\n", URL);
-+                return(0);
-+            }
-+        }
-+        return(1);
-+    }
-+
-     uri = xmlParseURI((const char *)URL);
-     if (uri == NULL) {
- 	xsltTransformError(ctxt, NULL, NULL,
--- 
-GitLab