upload to bullseye (debian/2.3.0+dfsg1-2+deb11u1)

(cherry picked from commit f726052dd4)

debian/changelog

@@ -1,3 +1,16 @@
+freerdp2 (2.3.0+dfsg1-2+deb11u1) bullseye; urgency=medium
+
+  [ Bernhard Miklautz ]
+  * debian/rules:
+    + Disable additional debug logging. (Closes: #1006683).
+
+  [ Mike Gabriel ]
+  * debian/patches:
+    + Add 1001_keep-symbol-DumpThreadHandles-if-debugging-is-disabled.patch.
+      Keep DumpThreadHandles as a symbol even if WITH_DEBUG_THREADS is OFF.
+
+ -- Mike Gabriel <sunweaver@debian.org>  Tue, 08 Mar 2022 08:45:48 +0100
+
 freerdp2 (2.3.0+dfsg1-2) unstable; urgency=medium
 
   * debian/watch:

debian/patches/1001_keep-symbol-DumpThreadHandles-if-debugging-is-disabled.patch

@@ -0,0 +1,38 @@
+Description: Keep DumpThreadHandles as a symbol even if WITH_DEBUG_THREADS is OFF.
+Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Forwarded: https://github.com/FreeRDP/FreeRDP/pull/7708
+
+--- a/winpr/libwinpr/thread/thread.c
++++ b/winpr/libwinpr/thread/thread.c
+@@ -760,9 +760,9 @@
+ 	return TRUE;
+ }
+ 
+-#if defined(WITH_DEBUG_THREADS)
+ VOID DumpThreadHandles(void)
+ {
++#if defined(WITH_DEBUG_THREADS)
+ 	char** msg;
+ 	size_t used, i;
+ 	void* stack = winpr_backtrace(20);
+@@ -823,6 +823,6 @@
+ 	}
+ 
+ 	WLog_DBG(TAG, "---------------- End Dumping thread handles -------------");
+-}
+ #endif
++}
+ #endif
+--- a/winpr/include/winpr/thread.h
++++ b/winpr/include/winpr/thread.h
+@@ -245,10 +245,7 @@
+ 	/* CommandLineToArgvA is not present in the original Windows API, WinPR always exports it */
+ 
+ 	WINPR_API LPSTR* CommandLineToArgvA(LPCSTR lpCmdLine, int* pNumArgs);
+-
+-#if defined(WITH_DEBUG_THREADS)
+ 	WINPR_API VOID DumpThreadHandles(void);
+-#endif
+ 
+ #ifdef __cplusplus
+ }

debian/patches/series

@@ -22,3 +22,4 @@
 0033-Reverted-winpr_BinToHexString-argument-change.patch
 0034-Fixed-6938-Remote-app-mode-clipboard-fix.patch
 0035-Fixed-6989-Use-X509_STORE_set_default_paths.patch
+1001_keep-symbol-DumpThreadHandles-if-debugging-is-disabled.patch

debian/rules

@@ -19,7 +19,7 @@ DEB_CMAKE_EXTRA_FLAGS = \
     -DCMAKE_SKIP_RPATH=FALSE \
     -DCMAKE_SKIP_INSTALL_RPATH=TRUE \
     -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-    -DWITH_DEBUG_ALL=ON \
+    -DWITH_DEBUG_ALL=OFF \
     -DBUILD_TESTING=OFF \
     -DWITH_CHANNELS=ON \
     -DBUILTIN_CHANNELS=ON \