Bug#1115471: bookworm-pu: package vtk9/9.1.0+really9.1.0+dfsg2-5+deb12u1
Hello.
As a followup: I made a team upload from this and I'm attaching the
real debdiff which I've already uploaded.
Thanks.
diff -Nru vtk9-9.1.0+really9.1.0+dfsg2/debian/changelog vtk9-9.1.0+really9.1.0+dfsg2/debian/changelog
--- vtk9-9.1.0+really9.1.0+dfsg2/debian/changelog 2023-02-25 09:59:35.000000000 +0100
+++ vtk9-9.1.0+really9.1.0+dfsg2/debian/changelog 2025-09-16 19:50:00.000000000 +0200
@@ -1,3 +1,12 @@
+vtk9 (9.1.0+really9.1.0+dfsg2-5+deb12u1) bookworm; urgency=medium
+
+ * Team upload.
+ [ Markus Blatt ]
+ * Cherry-pick patch from upstream to fix issue with newer expat and
+ appended data. (Closes: 1114938)
+
+ -- Santiago Vila <sanvila@debian.org> Tue, 16 Sep 2025 19:50:00 +0200
+
vtk9 (9.1.0+really9.1.0+dfsg2-5) unstable; urgency=medium
[ Elvis Stansvik ]
diff -Nru vtk9-9.1.0+really9.1.0+dfsg2/debian/patches/09_newer_expat.patch vtk9-9.1.0+really9.1.0+dfsg2/debian/patches/09_newer_expat.patch
--- vtk9-9.1.0+really9.1.0+dfsg2/debian/patches/09_newer_expat.patch 1970-01-01 01:00:00.000000000 +0100
+++ vtk9-9.1.0+really9.1.0+dfsg2/debian/patches/09_newer_expat.patch 2025-09-16 19:50:00.000000000 +0200
@@ -0,0 +1,64 @@
+From: Ben Boeckel <ben.boeckel@kitware.com>
+Date: Mon, 15 Apr 2024 22:22:22 -0400
+Subject: vtkXMLDataParser: track `AppendedData` state explicitly
+Bug-Debian: https://bugs.debian.org/1064762
+Origin: upstream,https://gitlab.kitware.com/vtk/vtk/-/commit/3efa07ad277efe5c1d11a2ef2b907c095f68bbef
+Forwarded: not-needed
+
+Newer `libexpat` doesn't like being given the appended data after the
+artificially ended document anymore. Avoid pushing it through to its
+parser.
+
+---
+ IO/XMLParser/vtkXMLDataParser.cxx | 6 +++++-
+ IO/XMLParser/vtkXMLDataParser.h | 3 +++
+ 2 files changed, 8 insertions(+), 1 deletion(-)
+
+--- vtk9.orig/IO/XMLParser/vtkXMLDataParser.cxx
++++ vtk9/IO/XMLParser/vtkXMLDataParser.cxx
+@@ -47,6 +47,7 @@
+ this->RootElement = nullptr;
+ this->AppendedDataPosition = 0;
+ this->AppendedDataMatched = 0;
++ this->AppendedDataFound = false;
+ this->DataStream = nullptr;
+ this->InlineDataStream = vtkBase64InputStream::New();
+ this->AppendedDataStream = vtkBase64InputStream::New();
+@@ -99,6 +100,7 @@
+ {
+ this->Superclass::PrintSelf(os, indent);
+ os << indent << "AppendedDataPosition: " << this->AppendedDataPosition << "\n";
++ os << indent << "AppendedDataFound: " << this->AppendedDataFound << "\n";
+ if (this->RootElement)
+ {
+ this->RootElement->PrintXML(os, indent);
+@@ -227,7 +229,7 @@
+ // If we have reached the appended data section, we stop parsing.
+ // This prevents the XML parser from having to walk over the entire
+ // appended data section.
+- if (this->AppendedDataPosition)
++ if (this->AppendedDataPosition || this->AppendedDataFound)
+ {
+ return 1;
+ }
+@@ -448,6 +450,8 @@
+ {
+ return 0;
+ }
++
++ this->AppendedDataFound = true;
+ }
+
+ return 1;
+--- vtk9.orig/IO/XMLParser/vtkXMLDataParser.h
++++ vtk9/IO/XMLParser/vtkXMLDataParser.h
+@@ -215,6 +215,9 @@
+ // How much of the string "<AppendedData" has been matched in input.
+ int AppendedDataMatched;
+
++ // Whether AppendedData has been dealt with or not.
++ bool AppendedDataFound;
++
+ // The byte order of the binary input.
+ int ByteOrder;
+
diff -Nru vtk9-9.1.0+really9.1.0+dfsg2/debian/patches/series vtk9-9.1.0+really9.1.0+dfsg2/debian/patches/series
--- vtk9-9.1.0+really9.1.0+dfsg2/debian/patches/series 2023-02-25 09:49:31.000000000 +0100
+++ vtk9-9.1.0+really9.1.0+dfsg2/debian/patches/series 2025-09-16 19:50:00.000000000 +0200
@@ -1,3 +1,4 @@
+09_newer_expat.patch
10_matplotlib.patch
20_do_not_link_against_socket.patch
30_drop_medical_example.patch
Reply to: