commit f278caaa42b1dddbee8056b655cf785ac1a4e5b2 Author: Tim Biermann <tbier@posteo.de> Date: Sat Jan 28 15:02:31 2023 +0100 libvisio: pulled patch from libreoffice diff --git a/libvisio/.signature b/libvisio/.signature index 0a9004f87..14e6648ec 100644 --- a/libvisio/.signature +++ b/libvisio/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF38xAoCr3M4kLPeMqcY3qks5C4mlYHI4ZMKg4Hz8HSjBl7PaxGUhWtzQPAsW9WKEp0qU+ljmP2KnVTlfhEIOyVwE= -SHA256 (Pkgfile) = d73dcad5613deeed2ecf53f1aa4b42449f7bc97bc6f679657580e6d509aaacee +RWSagIOpLGJF38HfaFmOJ6GJcnXJ7EPU/FNxFq/vkb2e3ZItBV8JxLg0VdDCMR2k8fgwCjv2FhkjXHR8c5CBk7l3RIoORL+K0gE= +SHA256 (Pkgfile) = 96a9181edb74c738e876238557dc807919f443a565d1d6e31ab84f5b0d6ca909 SHA256 (.footprint) = e13f1879f10c08a937d39005070957ecad750fb8ea4ac435d1cc3f4c1062f2b1 SHA256 (libvisio-0.1.7.tar.xz) = 8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c +SHA256 (ubsan.patch) = 8205a3c2157a1eaeb6bb17d813333142c84229e17efd006222a7be74a2d26aae diff --git a/libvisio/Pkgfile b/libvisio/Pkgfile index 353826b2e..6ac58bb3e 100644 --- a/libvisio/Pkgfile +++ b/libvisio/Pkgfile @@ -5,11 +5,15 @@ name=libvisio version=0.1.7 -release=2 -source=(https://dev-www.libreoffice.org/src/$name/$name-$version.tar.xz) +release=3 +source=(https://dev-www.libreoffice.org/src/$name/$name-$version.tar.xz + ubsan.patch) build() { cd $name-$version + + patch -Np0 -i $SRC/ubsan.patch + ./configure --prefix=/usr \ --without-docs make diff --git a/libvisio/ubsan.patch b/libvisio/ubsan.patch new file mode 100644 index 000000000..c9ffbd98f --- /dev/null +++ b/libvisio/ubsan.patch @@ -0,0 +1,11 @@ +--- src/lib/VSDContentCollector.cpp ++++ src/lib/VSDContentCollector.cpp +@@ -3220,7 +3220,7 @@ + } + if (U_SUCCESS(status) && conv) + { +- const auto *src = (const char *)&characters[0]; ++ const auto *src = (const char *)characters.data(); + const char *srcLimit = (const char *)src + characters.size(); + while (src < srcLimit) + {