pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/net/freerdp2
Module Name: pkgsrc
Committed By: markd
Date: Thu Aug 15 20:41:32 UTC 2024
Modified Files:
pkgsrc/net/freerdp2: Makefile PLIST
pkgsrc/net/freerdp2/patches: patch-client_Wayland_wlfreerdp.c
Added Files:
pkgsrc/net/freerdp2/patches:
patch-channels_ainput_server_ainput__main.c
patch-client_X11_xf__graphics.c patch-libfreerdp_core_info.c
patch-libfreerdp_core_redirection.c
Log Message:
freerdp2: update to 2.11.7
# 2024-04-22 Version 2.11.7
Noteworthy changes:
* Backported oss-fuzz fixes
# 2024-04-17 Version 2.11.6
CVE:
CVE-2024-32041 [Low[ OutOfBound Read in zgfx_decompress_segment
CVE-2024-32039 [Moderate] Integer overflow & OutOfBound Write in
clear_decompress_residual_data
CVE-2024-32040 [Low] integer underflow in nsc_rle_decode
CVE-2024-32458 [Low] OutOfBound Read in planar_skip_plane_rle
CVE-2024-32459 [Low] OutOfBound Read in ncrush_decompress
CVE-2024-32460 [Low] OutOfBound Read in interleaved_decompress
# 2024-01-19 Version 2.11.5
Noteworthy changes:
* Fix integer overflow in progressive decoder
* Update OpenSSL API usage for compatiblility with newer versions
* Prevent NULL dereference for single thread decoder
# 2023-12-14 Version 2.11.4
Notworthy changes:
* fix a typo in unicode commit
# 2023-12-14 Version 2.11.3
Notworthy changes:
* Disabled windows MEDIA FOUNDATION h264 decoder due to reported issues
* Fix issues with drive redirection
* Use endian safe ICU string converter
* Improve AAC support
* Fix swiss german keyboard layout
* Enable rfx-mode:image
# 2023-09-20 Version 2.11.2
Notworthy changes:
* backported wArrayList (optional) copy on insert
* backported certificate algorithm detection
# 2023-09-04 Version 2.11.1
Notworthy changes:
* Backported #9356: Fix issues with order updates
# 2023-08-28 Version 2.11.0
Noteworthy changes:
* Various input validation fixes
* Added various CMake options
* LibreSSL build fixes
Fixed issues:
* Backported: Big endian support
* Backported: Mouse grabbing support
* Backported: wayland scrolling fix
* Backported: Update h264 to use new FFMPEG API
* Backported: early bail from update_read_window_state_order breaks protocol
* Backported: rdpecam/server: Remove wrong assertion
* Backported: bounds checks for gdi/gfx rectangles
* Backported: enforce rdpdr client side state checks
* Backported: deactivate mouse grabbing by default
* Cherry-pick out of #9172: channels/cliprdr: Fix writing incorrect
PDU type for unlock PDUs
# 2023-02-16 Version 2.10.0
Noteworthy changes:
* Fix android build scripts, use CMake from SDK
* Fix connection negotiation with mstsc/msrdc
* [ntlm]: use rfc5929 binding hash algorithm
* [channels,printer] Fixed reference counting
* Fix uwac pixman
* Fix Rdp security
* [client,x11] Detect key autorepeat
* [build] add channel path to RPATH
* Fix build with BUILTIN_CHANNELS=OFF
* revert changes so that the osmajortype/osminortype is not overwritten
* [uwac] do not use iso C functions
* [winpr,sam] fix inalid NULL arguments
* Fix incompatible function pointer types
Fixed issues:
* Backported: Ignore data PDUs for DVCs that were not opened successfully
* Backported: [channel,urbdrc] fix type of usb hotplug callback
* Backported: Extended info enforce limits
* Backported: [core] add missing redirection fields
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 pkgsrc/net/freerdp2/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/freerdp2/PLIST
cvs rdiff -u -r0 -r1.1 \
pkgsrc/net/freerdp2/patches/patch-channels_ainput_server_ainput__main.c \
pkgsrc/net/freerdp2/patches/patch-client_X11_xf__graphics.c \
pkgsrc/net/freerdp2/patches/patch-libfreerdp_core_info.c \
pkgsrc/net/freerdp2/patches/patch-libfreerdp_core_redirection.c
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/net/freerdp2/patches/patch-client_Wayland_wlfreerdp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/net/freerdp2/Makefile
diff -u pkgsrc/net/freerdp2/Makefile:1.46 pkgsrc/net/freerdp2/Makefile:1.47
--- pkgsrc/net/freerdp2/Makefile:1.46 Wed May 29 16:33:51 2024
+++ pkgsrc/net/freerdp2/Makefile Thu Aug 15 20:41:32 2024
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.46 2024/05/29 16:33:51 adam Exp $
+# $NetBSD: Makefile,v 1.47 2024/08/15 20:41:32 markd Exp $
-DISTNAME= freerdp-2.9.0
+DISTNAME= freerdp-2.11.7
PKGNAME= ${DISTNAME:S/freerdp-/freerdp2-/1}
-PKGREVISION= 12
CATEGORIES= net
MASTER_SITES= https://pub.freerdp.com/releases/
@@ -14,7 +13,8 @@ LICENSE= apache-2.0
TOOL_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
-USE_CMAKE= yes
+.include "../../devel/cmake/build.mk"
+
USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++
@@ -52,7 +52,7 @@ post-install:
.include "options.mk"
.include "../../devel/libusb1/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
-.include "../../multimedia/ffmpeg5/buildlink3.mk"
+.include "../../multimedia/ffmpeg6/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../mk/jpeg.buildlink3.mk"
.if defined(OPSYS_HAS_KQUEUE)
Index: pkgsrc/net/freerdp2/PLIST
diff -u pkgsrc/net/freerdp2/PLIST:1.5 pkgsrc/net/freerdp2/PLIST:1.6
--- pkgsrc/net/freerdp2/PLIST:1.5 Mon Jan 16 19:20:15 2023
+++ pkgsrc/net/freerdp2/PLIST Thu Aug 15 20:41:32 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2023/01/16 19:20:15 markd Exp $
+@comment $NetBSD: PLIST,v 1.6 2024/08/15 20:41:32 markd Exp $
bin/freerdp-proxy
bin/freerdp-shadow-cli
bin/winpr-hash
@@ -149,6 +149,7 @@ include/freerdp2/freerdp/utils/pcap.h
include/freerdp2/freerdp/utils/profiler.h
include/freerdp2/freerdp/utils/ringbuffer.h
include/freerdp2/freerdp/utils/signal.h
+include/freerdp2/freerdp/utils/string.h
include/freerdp2/freerdp/utils/stopwatch.h
include/freerdp2/freerdp/version.h
include/freerdp2/freerdp/window.h
@@ -166,6 +167,7 @@ include/winpr2/winpr/credentials.h
include/winpr2/winpr/credui.h
include/winpr2/winpr/crt.h
include/winpr2/winpr/crypto.h
+include/winpr2/winpr/custom-crypto.h
include/winpr2/winpr/debug.h
include/winpr2/winpr/dsparse.h
include/winpr2/winpr/endian.h
@@ -215,6 +217,7 @@ include/winpr2/winpr/timezone.h
include/winpr2/winpr/tools/makecert.h
include/winpr2/winpr/user.h
include/winpr2/winpr/version.h
+include/winpr2/winpr/wincrypt.h
include/winpr2/winpr/windows.h
include/winpr2/winpr/winhttp.h
include/winpr2/winpr/winpr.h
@@ -264,7 +267,7 @@ lib/libfreerdp2.so.2
lib/libfreerdp2.so.${PKGVERSION}
${PLIST.wayland}lib/libuwac0.so
${PLIST.wayland}lib/libuwac0.so.0
-${PLIST.wayland}lib/libuwac0.so.0.1.1
+${PLIST.wayland}lib/libuwac0.so.0.2.0
lib/libwinpr-tools2.so
lib/libwinpr-tools2.so.2
lib/libwinpr-tools2.so.${PKGVERSION}
Index: pkgsrc/net/freerdp2/patches/patch-client_Wayland_wlfreerdp.c
diff -u pkgsrc/net/freerdp2/patches/patch-client_Wayland_wlfreerdp.c:1.1 pkgsrc/net/freerdp2/patches/patch-client_Wayland_wlfreerdp.c:1.2
--- pkgsrc/net/freerdp2/patches/patch-client_Wayland_wlfreerdp.c:1.1 Sat Aug 6 08:02:27 2022
+++ pkgsrc/net/freerdp2/patches/patch-client_Wayland_wlfreerdp.c Thu Aug 15 20:41:32 2024
@@ -1,8 +1,10 @@
-$NetBSD: patch-client_Wayland_wlfreerdp.c,v 1.1 2022/08/06 08:02:27 nia Exp $
+$NetBSD: patch-client_Wayland_wlfreerdp.c,v 1.2 2024/08/15 20:41:32 markd Exp $
Support building Wayland components on non-Linux.
---- client/Wayland/wlfreerdp.c.orig 2021-03-15 12:29:35.000000000 +0000
+gcc14 (incompatible pointer types)
+
+--- client/Wayland/wlfreerdp.c.orig 2024-04-22 09:26:59.000000000 +0000
+++ client/Wayland/wlfreerdp.c
@@ -31,7 +31,9 @@
#include <freerdp/utils/signal.h>
@@ -14,3 +16,12 @@ Support building Wayland components on n
#include <uwac/uwac.h>
+@@ -634,7 +636,7 @@ static BOOL wlf_client_new(freerdp* inst
+ return FALSE;
+
+ obj = ArrayList_Object(wfl->events);
+- obj->fnObjectNew = uwac_event_clone;
++ obj->fnObjectNew = (OBJECT_NEW_FN) uwac_event_clone;
+ obj->fnObjectFree = free;
+
+ InitializeCriticalSection(&wfl->critical);
Added files:
Index: pkgsrc/net/freerdp2/patches/patch-channels_ainput_server_ainput__main.c
diff -u /dev/null pkgsrc/net/freerdp2/patches/patch-channels_ainput_server_ainput__main.c:1.1
--- /dev/null Thu Aug 15 20:41:32 2024
+++ pkgsrc/net/freerdp2/patches/patch-channels_ainput_server_ainput__main.c Thu Aug 15 20:41:32 2024
@@ -0,0 +1,33 @@
+$NetBSD: patch-channels_ainput_server_ainput__main.c,v 1.1 2024/08/15 20:41:32 markd Exp $
+
+gcc14 (incompatible pointer types)
+
+--- channels/ainput/server/ainput_main.c.orig 2024-04-22 09:26:59.000000000 +0000
++++ channels/ainput/server/ainput_main.c
+@@ -222,7 +222,7 @@ static HANDLE ainput_server_get_channel_
+
+ WINPR_ASSERT(ainput);
+
+- if (WTSVirtualChannelQuery(ainput->ainput_channel, WTSVirtualEventHandle, &buffer,
++ if (WTSVirtualChannelQuery(ainput->ainput_channel, WTSVirtualEventHandle, (PVOID*) &buffer,
+ &BytesReturned) == TRUE)
+ {
+ if (BytesReturned == sizeof(HANDLE))
+@@ -416,7 +416,7 @@ ainput_server_context* ainput_server_con
+ goto fail;
+ return &ainput->context;
+ fail:
+- ainput_server_context_free(ainput);
++ ainput_server_context_free((ainput_server_context*) ainput);
+ return NULL;
+ }
+
+@@ -539,7 +539,7 @@ UINT ainput_server_context_poll_int(ainp
+ BYTE* buffer = NULL;
+ DWORD BytesReturned = 0;
+
+- if (WTSVirtualChannelQuery(ainput->ainput_channel, WTSVirtualChannelReady, &buffer,
++ if (WTSVirtualChannelQuery(ainput->ainput_channel, WTSVirtualChannelReady, (PVOID*) &buffer,
+ &BytesReturned) != TRUE)
+ {
+ WLog_ERR(TAG, "WTSVirtualChannelReady failed,");
Index: pkgsrc/net/freerdp2/patches/patch-client_X11_xf__graphics.c
diff -u /dev/null pkgsrc/net/freerdp2/patches/patch-client_X11_xf__graphics.c:1.1
--- /dev/null Thu Aug 15 20:41:32 2024
+++ pkgsrc/net/freerdp2/patches/patch-client_X11_xf__graphics.c Thu Aug 15 20:41:32 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-client_X11_xf__graphics.c,v 1.1 2024/08/15 20:41:32 markd Exp $
+
+gcc14 (int conversion)
+
+--- client/X11/xf_graphics.c.orig 2024-04-22 09:26:59.000000000 +0000
++++ client/X11/xf_graphics.c
+@@ -438,7 +438,7 @@ static BOOL xf_Pointer_New(rdpContext* c
+
+ #endif
+ fail:
+- WLog_DBG(TAG, "%s: %ld", __func__, rc ? pointer : -1);
++ WLog_DBG(TAG, "%s: %ld", __func__, rc ? (long) pointer : -1);
+ return rc;
+ }
+
Index: pkgsrc/net/freerdp2/patches/patch-libfreerdp_core_info.c
diff -u /dev/null pkgsrc/net/freerdp2/patches/patch-libfreerdp_core_info.c:1.1
--- /dev/null Thu Aug 15 20:41:32 2024
+++ pkgsrc/net/freerdp2/patches/patch-libfreerdp_core_info.c Thu Aug 15 20:41:32 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-libfreerdp_core_info.c,v 1.1 2024/08/15 20:41:32 markd Exp $
+
+gcc14 (incompatible pointer type)
+
+--- libfreerdp/core/info.c.orig 2024-04-22 09:26:59.000000000 +0000
++++ libfreerdp/core/info.c
+@@ -85,7 +85,7 @@ static BOOL rdp_read_info_null_string(co
+
+ if (cbLen > 0)
+ {
+- const WCHAR* domain = Stream_Pointer(s);
++ const WCHAR* domain = (const WCHAR*)Stream_Pointer(s);
+
+ if (isNullTerminated && (max > 0))
+ max -= nullSize;
Index: pkgsrc/net/freerdp2/patches/patch-libfreerdp_core_redirection.c
diff -u /dev/null pkgsrc/net/freerdp2/patches/patch-libfreerdp_core_redirection.c:1.1
--- /dev/null Thu Aug 15 20:41:32 2024
+++ pkgsrc/net/freerdp2/patches/patch-libfreerdp_core_redirection.c Thu Aug 15 20:41:32 2024
@@ -0,0 +1,24 @@
+$NetBSD: patch-libfreerdp_core_redirection.c,v 1.1 2024/08/15 20:41:32 markd Exp $
+
+gcc14 (incompatible pointer types)
+
+--- libfreerdp/core/redirection.c.orig 2024-04-22 09:26:59.000000000 +0000
++++ libfreerdp/core/redirection.c
+@@ -86,7 +86,7 @@ static void redirection_free_data(BYTE**
+ *str = NULL;
+ }
+
+-static BOOL redirection_copy_data(char** dst, UINT32* plen, const char* str, UINT32 len)
++static BOOL redirection_copy_data(BYTE** dst, UINT32* plen, const char* str, UINT32 len)
+ {
+ redirection_free_data(dst, plen);
+
+@@ -109,7 +109,7 @@ static BOOL freerdp_settings_set_pointer
+ switch (id)
+ {
+ case FreeRDP_TargetNetAddress:
+- pdata = &settings->TargetNetAddress;
++ pdata = (BYTE**) &settings->TargetNetAddress;
+ plen = &settings->TargetNetAddressCount;
+ break;
+ case FreeRDP_LoadBalanceInfo:
Home |
Main Index |
Thread Index |
Old Index