diff --git a/debian/changelog b/debian/changelog index 579b278..6971f91 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ qt6-base (6.6.2+dfsg-1) UNRELEASED; urgency=medium [ Patrick Franz ] * New upstream release (6.6.2). * Update ABI to 6.6.2. + * Refresh patches and remove patches that have been applied upstream. -- Debian Qt/KDE Maintainers Thu, 15 Feb 2024 18:14:07 +0100 diff --git a/debian/patches/cross.patch b/debian/patches/cross.patch index 36a1b28..2a66e8f 100644 --- a/debian/patches/cross.patch +++ b/debian/patches/cross.patch @@ -1,19 +1,7 @@ --- - cmake/QtBuildInternals/QtBuildInternalsConfig.cmake | 2 -- examples/sql/CMakeLists.txt | 2 +- src/tools/configure.cmake | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) - ---- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake -+++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake -@@ -170,8 +170,6 @@ function(qt_build_internals_disable_pkg_ - set(FEATURE_pkg_config "${pkg_config_enabled}" CACHE STRING "Using pkg-config") - if(NOT pkg_config_enabled) - qt_build_internals_disable_pkg_config() -- else() -- unset(PKG_CONFIG_EXECUTABLE CACHE) - endif() - endfunction() --- a/src/tools/configure.cmake +++ b/src/tools/configure.cmake diff --git a/debian/patches/cve-2023-51714.diff b/debian/patches/cve-2023-51714.diff deleted file mode 100644 index 5232285..0000000 --- a/debian/patches/cve-2023-51714.diff +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/network/access/http2/hpacktable.cpp b/src/network/access/http2/hpacktable.cpp -index 0b69ee86a9..f20ec92d4c 100644 ---- a/src/network/access/http2/hpacktable.cpp -+++ b/src/network/access/http2/hpacktable.cpp -@@ -26,8 +26,10 @@ HeaderSize entry_size(QByteArrayView name, QByteArrayView value) - // for counting the number of references to the name and value would have - // 32 octets of overhead." - -- const unsigned sum = unsigned(name.size() + value.size()); -- if (std::numeric_limits::max() - 32 < sum) -+ size_t sum; -+ if (qAddOverflow(size_t(name.size()), size_t(value.size()), &sum)) -+ return HeaderSize(); -+ if (sum > (std::numeric_limits::max() - 32)) - return HeaderSize(); - return HeaderSize(true, quint32(sum + 32)); - } diff --git a/debian/patches/remove_rpath_from_examples.patch b/debian/patches/remove_rpath_from_examples.patch index a94cc81..067ad36 100644 --- a/debian/patches/remove_rpath_from_examples.patch +++ b/debian/patches/remove_rpath_from_examples.patch @@ -3,20 +3,20 @@ Description: remove RPATH/RUNPATH from examples' binaries. need to set RPATH/RUNPATH. Author: Lisandro Damián Nicanor Pérez Meyer Forwarded: not-needed -Last-Update: 2023-10-10 +Last-Update: 2024-02-15 --- cmake/QtBuildInternals/QtBuildInternalsConfig.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake -+++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake -@@ -979,7 +979,7 @@ macro(qt_examples_build_begin) +--- a/cmake/QtBuildRepoExamplesHelpers.cmake ++++ b/cmake/QtBuildRepoExamplesHelpers.cmake +@@ -97,7 +97,7 @@ macro(qt_examples_build_begin) # This means that installed examples are not relocatable at the moment. We would need to # annotate where each example is installed to, to be able to derive a relative rpath, and it # seems there's no way to query such information from CMake itself. - set(CMAKE_INSTALL_RPATH "${_default_install_rpath}") + #set(CMAKE_INSTALL_RPATH "${_default_install_rpath}") - + install(CODE " # Backup CMAKE_INSTALL_PREFIX because we're going to change it in each example subdirectory diff --git a/debian/patches/series b/debian/patches/series index 30f7d28..8c4cb48 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,3 @@ -# fixed in 6.6.2 -cve-2023-51714.diff - # Needs to be fixed upstream. Add-SH-detection.patch