diffstat for veyon-4.9.7+repack1 veyon-4.9.7+repack1

 changelog                                                  |    8 +++
 patches/0001-WebApiController-fix-build-with-Qt-6.10.patch |   30 +++++++++++++
 patches/2001_debian-hardening.patch                        |   18 +++++++
 patches/series                                             |    2 
 4 files changed, 58 insertions(+)

diff -Nru veyon-4.9.7+repack1/debian/changelog veyon-4.9.7+repack1/debian/changelog
--- veyon-4.9.7+repack1/debian/changelog	2025-08-12 13:20:08.000000000 +0300
+++ veyon-4.9.7+repack1/debian/changelog	2026-04-20 09:19:33.000000000 +0300
@@ -1,3 +1,11 @@
+veyon (4.9.7+repack1-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Backport upstream fix for FTBFS with Qt 6.10. (Closes: #1131593)
+  * Rely on the dpkg hardening flags only.
+
+ -- Adrian Bunk <bunk@debian.org>  Mon, 20 Apr 2026 09:19:33 +0300
+
 veyon (4.9.7+repack1-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru veyon-4.9.7+repack1/debian/patches/0001-WebApiController-fix-build-with-Qt-6.10.patch veyon-4.9.7+repack1/debian/patches/0001-WebApiController-fix-build-with-Qt-6.10.patch
--- veyon-4.9.7+repack1/debian/patches/0001-WebApiController-fix-build-with-Qt-6.10.patch	1970-01-01 02:00:00.000000000 +0200
+++ veyon-4.9.7+repack1/debian/patches/0001-WebApiController-fix-build-with-Qt-6.10.patch	2026-04-20 09:19:05.000000000 +0300
@@ -0,0 +1,30 @@
+From d97309db86ae2bf7cf72be2aa9248aa5255a0151 Mon Sep 17 00:00:00 2001
+From: Tobias Junghans <tobydox@veyon.io>
+Date: Wed, 10 Dec 2025 12:06:18 +0100
+Subject: WebApiController: fix build with Qt 6.10
+
+Cast QAtomicInts to ints explicitly.
+---
+ plugins/webapi/WebApiController.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/plugins/webapi/WebApiController.cpp b/plugins/webapi/WebApiController.cpp
+index 763d0600a..175cc2cfc 100644
+--- a/plugins/webapi/WebApiController.cpp
++++ b/plugins/webapi/WebApiController.cpp
+@@ -475,9 +475,9 @@ QString WebApiController::getStatistics()
+ {
+ 	QReadLocker connectionsLocker{&m_connectionsLock};
+ 
+-	return QStringLiteral("Total API requests: %1 (%2/s in the past %3 s)\n<br/>").arg(m_apiTotalRequestsCounter).arg(m_apiTotalRequestsPerSecond).arg(StatisticsUpdateIntervalSeconds) +
+-			QStringLiteral("Framebuffer requests: %1 (%2/s in the past %3 s)\n<br/>").arg(m_framebufferRequestsCounter).arg(m_framebufferRequestsPerSecond).arg(StatisticsUpdateIntervalSeconds) +
+-			QStringLiteral("VNC framebuffer updates: %1 (%2/s in the past %3 s)\n<br/>").arg(m_vncFramebufferUpdatesCounter).arg(m_vncFramebufferUpdatesPerSecond).arg(StatisticsUpdateIntervalSeconds) +
++	return QStringLiteral("Total API requests: %1 (%2/s in the past %3 s)\n<br/>").arg(int(m_apiTotalRequestsCounter)).arg(int(m_apiTotalRequestsPerSecond)).arg(int(StatisticsUpdateIntervalSeconds)) +
++			QStringLiteral("Framebuffer requests: %1 (%2/s in the past %3 s)\n<br/>").arg(int(m_framebufferRequestsCounter)).arg(int(m_framebufferRequestsPerSecond)).arg(int(StatisticsUpdateIntervalSeconds)) +
++			QStringLiteral("VNC framebuffer updates: %1 (%2/s in the past %3 s)\n<br/>").arg(int(m_vncFramebufferUpdatesCounter)).arg(int(m_vncFramebufferUpdatesPerSecond)).arg(int(StatisticsUpdateIntervalSeconds)) +
+ 			QStringLiteral("Number of client connections: %1<br/>\n").arg(m_connections.count());
+ }
+ 
+-- 
+2.47.3
+
diff -Nru veyon-4.9.7+repack1/debian/patches/2001_debian-hardening.patch veyon-4.9.7+repack1/debian/patches/2001_debian-hardening.patch
--- veyon-4.9.7+repack1/debian/patches/2001_debian-hardening.patch	1970-01-01 02:00:00.000000000 +0200
+++ veyon-4.9.7+repack1/debian/patches/2001_debian-hardening.patch	2026-04-20 09:19:33.000000000 +0300
@@ -0,0 +1,18 @@
+Description: Don't add manual hardening flags
+ Leave hardening to dpkg-buildflags, which already adds
+ -fstack-protector-strong by default.
+Author: Adrian Bunk <bunk@debian.org>
+
+--- veyon-4.9.7+repack1.orig/CMakeLists.txt
++++ veyon-4.9.7+repack1/CMakeLists.txt
+@@ -181,8 +181,8 @@ else()
+ 	set(CMAKE_LINK_OPTIONS_PIE "-fPIC")
+ endif()
+ 
+-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector-strong ${CFLAGS}")
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-strong -fno-exceptions ${CXXFLAGS}")
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CFLAGS}")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions ${CXXFLAGS}")
+ 
+ if(VEYON_DEBUG)
+ 	add_definitions(-DVEYON_DEBUG)
diff -Nru veyon-4.9.7+repack1/debian/patches/series veyon-4.9.7+repack1/debian/patches/series
--- veyon-4.9.7+repack1/debian/patches/series	2025-08-12 13:20:08.000000000 +0300
+++ veyon-4.9.7+repack1/debian/patches/series	2026-04-20 09:19:33.000000000 +0300
@@ -1,2 +1,4 @@
+0001-WebApiController-fix-build-with-Qt-6.10.patch
 2001_disable-CPackDefinitions-cmake.patch
 2001_disable-upstream-Git-version-detection.patch
+2001_debian-hardening.patch