Merging debian version 3.5.1+dfsg1-2.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

9 files changed, 131 insertions, 15 deletions

diff --git a/debian/changelog b/debian/changelog
index 270fc56..9f05fdc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+freerdp3 (3.5.1+dfsg1-2) experimental; urgency=medium
+
+  * Enable proxy support
+  * Enable the SDL client
+
+ -- Bernhard Miklautz <bernhard.miklautz@shacknet.at>  Mon, 29 Apr 2024 15:07:11 -0400
+
 freerdp3 (3.5.1+dfsg1-1~progress7.99u1) graograman-backports; urgency=high
 
   * Uploading to graograman-backports, remaining changes:
@@ -14,11 +21,11 @@ freerdp3 (3.5.1+dfsg1-1) unstable; urgency=high
 
   [ Jeremy Bícha ]
   * New upstream release (Closes: #1069752)
-    - CVE-2024-32658
-    - CVE-2024-32659
-    - CVE-2024-32660
-    - CVE-2024-32661
-    - CVE-2024-32662
+    - CVE-2024-32658 [Low] ExtractRunLengthRegular* out of bound read
+    - CVE-2024-32659 [Low] freerdp_image_copy out of bound read
+    - CVE-2024-32660 [Low] zgfx_decompress out of memory
+    - CVE-2024-32661 [Low] rdp_write_logon_info_v1 NULL access
+    - CVE-2024-32662 [Low] rdp_redirection_read_base64_wchar out of bound read
   * Fix typo in enabling smartcard emulation
   * Update symbols files
   * Set symbols check level to 4
diff --git a/debian/control b/debian/control
index 28431d8..9ede29c 100644
--- a/debian/control
+++ b/debian/control
@@ -30,6 +30,9 @@ Build-Depends:
  libpkcs11-helper1-dev,
  libpng-dev,
  libpulse-dev,
+ libsdl2-dev,
+ libsdl2-image-dev,
+ libsdl2-ttf-dev,
  libssl-dev,
  libswresample-dev,
  libswscale-dev,
@@ -196,6 +199,7 @@ Package: freerdp3-dev
 Section: devel
 Architecture: any
 Depends:
+ libfreerdp-server-proxy3-3 (= ${binary:Version}),
  libfreerdp-client3-3 (= ${binary:Version}),
  libfreerdp-server3-3 (= ${binary:Version}),
  libfreerdp-shadow-subsystem3-3 (= ${binary:Version}),
@@ -300,3 +304,73 @@ Description: RDP client for Windows Terminal Services (wayland client)
   * Windows 10
  .
  This package contains the wayland based client.
+
+Package: freerdp3-sdl
+Architecture: any
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+ libfreerdp-client3-3 (= ${binary:Version}),
+Description: RDP client for Windows Terminal Services (SDL client)
+ FreeRDP is a libre client/server implementation of the Remote
+ Desktop Protocol (RDP).
+ .
+ Currently, the FreeRDP client supports the following Windows Versions:
+ .
+  * Windows NT Server
+  * Windows 2000 Terminal Server
+  * Windows XP
+  * Windows 2003 Server
+  * Windows Vista
+  * Windows 2008/2008r2/2011SBS Server
+  * Windows 7
+  * Windows 2012/2012r2 Server
+  * Windows 8
+  * Windows 10
+ .
+ This package contains the SDL based client.
+
+Package: libfreerdp-server-proxy3-3
+Architecture: any
+Section: libs
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+ libfreerdp3-3 (= ${binary:Version}),
+ libfreerdp-client3-3 (= ${binary:Version}),
+ libwinpr3-3 (= ${binary:Version}),
+Multi-Arch: same
+Description: Free Remote Desktop Protocol library (proxy library)
+ FreeRDP is a libre client/server implementation of the Remote
+ Desktop Protocol (RDP).
+ .
+ This package contains the shared library for proxying RDP connections.
+
+Package: freerdp3-proxy-modules
+Architecture: any
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+ libfreerdp-server-proxy3-3 (= ${binary:Version}),
+Description: FreeRDP Remote Desktop Protocol proxy module libraries
+ FreeRDP is a libre client/server implementation of the Remote
+ Desktop Protocol (RDP).
+ .
+ This package contains the modules for the proxy.
+
+Package: freerdp3-proxy
+Architecture: any
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+ libfreerdp-server-proxy3-3 (= ${binary:Version}),
+ libfreerdp3-3 (= ${binary:Version}),
+ libwinpr3-3 (= ${binary:Version}),
+Suggests:
+ freerdp3-proxy-modules,
+Description: FreeRDP proxy server
+ FreeRDP is a libre client/server implementation of the Remote
+ Desktop Protocol (RDP).
+ .
+ This package contains the proxy server that can be used
+ as man in the middle proxy for RDP connections.
diff --git a/debian/freerdp3-dev.install b/debian/freerdp3-dev.install
index 702b102..6ea13d0 100644
--- a/debian/freerdp3-dev.install
+++ b/debian/freerdp3-dev.install
@@ -7,4 +7,5 @@ usr/lib/*/libfreerdp-server3.so
 usr/lib/*/libfreerdp-shadow-subsystem3.so
 usr/lib/*/libfreerdp-shadow3.so
 usr/lib/*/libfreerdp3.so
+usr/lib/*/libfreerdp-server-proxy3.so
 usr/lib/*/pkgconfig/freerdp*.pc
diff --git a/debian/freerdp3-proxy-modules.install b/debian/freerdp3-proxy-modules.install
new file mode 100644
index 0000000..81156a5
--- /dev/null
+++ b/debian/freerdp3-proxy-modules.install
@@ -0,0 +1 @@
+usr/lib/*/freerdp3/proxy/*.so
diff --git a/debian/freerdp3-proxy.install b/debian/freerdp3-proxy.install
new file mode 100644
index 0000000..add2012
--- /dev/null
+++ b/debian/freerdp3-proxy.install
@@ -0,0 +1,2 @@
+usr/bin/freerdp-proxy3
+usr/share/man/man1/freerdp-proxy3.1
diff --git a/debian/freerdp3-sdl.install b/debian/freerdp3-sdl.install
new file mode 100644
index 0000000..5ac875e
--- /dev/null
+++ b/debian/freerdp3-sdl.install
@@ -0,0 +1,2 @@
+usr/bin/sdl-freerdp3
+usr/share/man/man1/sdl-freerdp3.1
diff --git a/debian/libfreerdp-server-proxy3-3.install b/debian/libfreerdp-server-proxy3-3.install
new file mode 100644
index 0000000..faf310f
--- /dev/null
+++ b/debian/libfreerdp-server-proxy3-3.install
@@ -0,0 +1 @@
+usr/lib/*/libfreerdp-server-proxy3.so.*
diff --git a/debian/libfreerdp-server-proxy3-3.symbols b/debian/libfreerdp-server-proxy3-3.symbols
new file mode 100644
index 0000000..ea2cae6
--- /dev/null
+++ b/debian/libfreerdp-server-proxy3-3.symbols
@@ -0,0 +1,33 @@
+libfreerdp-server-proxy3.so.3 libfreerdp-server-proxy3-3 #MINVER#
+* Build-Depends-Package: freerdp3-dev
+ intercept_context_entry_free@Base 3.0.0
+ pf_config_clone@Base 3.0.0
+ pf_config_get@Base 3.0.0
+ pf_config_modules@Base 3.0.0
+ pf_config_modules_count@Base 3.0.0
+ pf_config_plugin@Base 3.0.0
+ pf_config_required_plugin@Base 3.0.0
+ pf_config_required_plugins_count@Base 3.0.0
+ pf_context_copy_settings@Base 3.0.0
+ pf_context_create_client_context@Base 3.0.0
+ pf_context_init_server_context@Base 3.0.0
+ pf_server_add_module@Base 3.0.0
+ pf_server_config_dump@Base 3.0.0
+ pf_server_config_free@Base 3.0.0
+ pf_server_config_load_buffer@Base 3.0.0
+ pf_server_config_load_file@Base 3.0.0
+ pf_server_config_print@Base 3.0.0
+ pf_server_free@Base 3.0.0
+ pf_server_new@Base 3.0.0
+ pf_server_run@Base 3.0.0
+ pf_server_start@Base 3.0.0
+ pf_server_start_from_socket@Base 3.0.0
+ pf_server_start_with_peer_socket@Base 3.0.0
+ pf_server_stop@Base 3.0.0
+ proxy_data_abort_connect@Base 3.0.0
+ proxy_data_free@Base 3.0.0
+ proxy_data_new@Base 3.0.0
+ proxy_data_set_client_context@Base 3.0.0
+ proxy_data_set_server_context@Base 3.0.0
+ proxy_data_shall_disconnect@Base 3.0.0
+ server_config_load_ini@Base 3.0.0
diff --git a/debian/rules b/debian/rules
index b222f40..f443767 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,10 +23,13 @@ DEB_CMAKE_EXTRA_FLAGS = \
     -DWITH_DEBUG_ALL=OFF \
     -DBUILD_TESTING=OFF \
     -DWITH_CHANNELS=ON \
-    -DBUILTIN_CHANNELS=ON \
     -DWITH_SERVER=ON \
-    -DWITH_PROXY=OFF \
+    -DWITH_PROXY=ON \
+    -DWITH_PROXY_MODULES=ON \
     -DWITH_CLIENT_INTERFACE=OFF \
+    -DWITH_CLIENT_SDL=ON \
+    -DWITH_SDL_IMAGE_DIALOGS=ON \
+    -DWITH_WEBVIEW=OFF \
     -DWITH_PULSE=ON \
     -DWITH_ICU=ON \
     -DWITH_CUPS=ON \
@@ -116,14 +119,6 @@ override_dh_auto_configure:
 	    -e "s$(xSEDx)$${o}=[^=]+=\. $(xSEDx)$(xSEDx)g;" \
 	    -e "s$(xSEDx) $${o}=[^=]+=\.$(xSEDx)$(xSEDx)g;" \
 	obj-$(DEB_HOST_GNU_TYPE)/winpr/include/winpr/buildflags.h
-	# remove unused config define (not packaging freerdp-proxy so far).
-	# fixes build path leakage.
-	# NB: mangle that define to something like
-	#   /usr/lib/$(DEB_HOST_MULTIARCH)/freerdp/proxy-plugins
-	# if you consider to package freerdp-proxy.
-	sed -i \
-	    -e '/FREERDP_PROXY_PLUGINDIR/d' \
-	    obj-$(DEB_HOST_GNU_TYPE)/include/freerdp/build-config.h
 
 # NB debhelper 13+: convert to execute_before_dh_install
 override_dh_install: TMP_LIB = debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)