Created attachment 233418 [details] Update to 2.6.1 Tested on 12.3 amd64. https://github.com/FreeRDP/FreeRDP/releases/tag/2.6.1 # 2022-03-07 Version 2.6.1 Noteworthy changes: * Decreased logging verbosity, now freerdp is much less verbose by default Fixed issues: * Backported freerdp_abort_connect during freerdp_connect fix (#7700) * Backported improved version dection see docs/version_detection.md for details * Backported various rdpsnd fixes (#7695)
Committed!
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=a08e76c0d3629183f7a0a6e8d29bb0fc9912a431 commit a08e76c0d3629183f7a0a6e8d29bb0fc9912a431 Author: VVD <vvd@unislabs.com> AuthorDate: 2022-04-23 19:28:21 +0000 Commit: Neel Chauhan <nc@FreeBSD.org> CommitDate: 2022-04-23 19:28:21 +0000 net/freerdp: Update to 2.6.1 Changes: https://github.com/FreeRDP/FreeRDP/blob/2.6.1/ChangeLog PR: 263490 net/freerdp/Makefile | 3 +-- net/freerdp/distinfo | 8 +++----- 2 files changed, 4 insertions(+), 7 deletions(-)
(In reply to Neel Chauhan from comment #1) Thanks, but you missed lines: -PATCH_SITES= https://github.com/FreeRDP/FreeRDP/commit/ -PATCHFILES+= b0768032196b.patch:-p1 # https://github.com/FreeRDP/FreeRDP/pull/7678
(In reply to VVD from comment #3) Now fails with patch error. ===> Extracting for freerdp-2.6.1 => SHA256 Checksum OK for freerdp-2.6.1.tar.gz. => SHA256 Checksum OK for b0768032196b.patch. ===> Patching for freerdp-2.6.1 ===> Applying distribution patches for freerdp-2.6.1 Ignoring previously applied (or reversed) patch. 1 out of 1 hunks ignored--saving rejects to libfreerdp/codec/h264_openh264.c.rej ===> FAILED Applying distribution patch b0768032196b.patch with -p1 *** Error code 1 Stop. make[1]: stopped in /usr/ports/net/freerdp *** Error code 1 Stop. make: stopped in /usr/ports/net/freerdp Contents of $WRKSRC/libfreerdp/codec/h264_openh264.c.rej: @@ -115,6 +115,21 @@ } } + if (state != dsErrorFree) + { + WLog_Print(h264->log, WLOG_WARN, "DecodeFrame2 state: 0x%02X", s tate); + return -2003; + } + +#if OPENH264_MAJOR >= 2 + state = (*sys->pDecoder)->FlushFrame(sys->pDecoder, pYUVData, &sBufferIn fo); + if (state != dsErrorFree) + { + WLog_Print(h264->log, WLOG_WARN, "FlushFrame state: 0x%02X", sta te); + return -2003; + } +#endif + pSystemBuffer = &sBufferInfo.UsrData.sSystemBuffer; iStride[0] = pSystemBuffer->iStride[0]; iStride[1] = pSystemBuffer->iStride[1];
(In reply to Tomoaki AOKI from comment #4) Check my patch attached to this issue. Commited incorrect patch.
This doesn't build for me, it fails to patch: =======================<phase: patch >============================ ===> Patching for freerdp-2.6.1 ===> Applying distribution patches for freerdp-2.6.1 Ignoring previously applied (or reversed) patch. 1 out of 1 hunks ignored--saving rejects to libfreerdp/codec/h264_openh264.c.rej ===> FAILED Applying distribution patch b0768032196b.patch with -p1 *** Error code 1 Removing PATCHFILES from the Makefile seems to solve this. (And I see now that this change is in the patch/attachment for this PR.)
*** Bug 263500 has been marked as a duplicate of this bug. ***
VVD@, please check: [00:01:27] ====> Running Q/A tests (stage-qa) [00:01:28] Warning: Possible REINPLACE_CMD issues: [00:01:28] - - REINPLACE_CMD ran, but did not modify file contents: client/CMakeLists.txt [00:01:28] - - REINPLACE_CMD ran, but did not modify file contents: winpr/CMakeLists.txt [00:01:28] - - REINPLACE_CMD ran, but did not modify file contents: uwac/CMakeLists.txt [00:01:28] - - REINPLACE_CMD ran, but did not modify file contents: server/CMakeLists.txt [00:01:28] - - REINPLACE_CMD ran, but did not modify file contents: server/shadow/CMakeLists.txt [00:01:28] - - REINPLACE_CMD ran, but did not modify file contents: libfreerdp/CMakeLists.txt
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=338ebccab9039e125e9393c45e73ada94864720b commit 338ebccab9039e125e9393c45e73ada94864720b Author: Matthias Andree <mandree@FreeBSD.org> AuthorDate: 2022-04-24 22:44:29 +0000 Commit: Matthias Andree <mandree@FreeBSD.org> CommitDate: 2022-04-24 22:48:32 +0000 net/freerdp: remove obsolete patch removal was missed in nc's commit a08e76c0d. Approved by: vvd@unislabs.com (maintainer) Pointy hat to: nc@ PR: 263490 PR: 263500 net/freerdp/Makefile | 1 - 1 file changed, 1 deletion(-)
(In reply to Matthias Andree from comment #8) I'll check, thanks.
Note that the patch/attachment also removed PATCH_SITES but is still in present in the Makefile.
Yup. I had left that one line in because it seemed generic enough that it might be reused later, and it does not hurt. But I can also remove it. VVD@?
Created attachment 233490 [details] Update to 2.7.0 https://github.com/FreeRDP/FreeRDP/blob/2.7.0/ChangeLog Noteworthy changes: Backported OpenSSL3 gateway support (#7822) Backported various NTLM fixes Backported WINPR_ASSERT to ease future backports Fixed issues: Backported #6786: Use /network:auto by default Backported #7714: Workaround for broken surface frame marker Backported #7733: Support 10bit X11 color (BGRX32 only) Backported #7745: GFX progressive double free Backported #7808: Disable websockets with /gt:rpc Backported #7815: RAIL expect LOGON_MSG_SESSION_CONTINUE
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=7783dde8566e63fe91508b61dced7e54c721cbaa commit 7783dde8566e63fe91508b61dced7e54c721cbaa Author: VVD <vvd@unislabs.com> AuthorDate: 2022-04-26 18:55:38 +0000 Commit: Matthias Andree <mandree@FreeBSD.org> CommitDate: 2022-04-26 18:59:07 +0000 net/freerdp: update to 2.7.0 [maintainer] https://github.com/FreeRDP/FreeRDP/blob/2.7.0/ChangeLog Noteworthy changes: Backported OpenSSL3 gateway support (#7822) Backported various NTLM fixes Backported WINPR_ASSERT to ease future backports Fixed issues: Backported #6786: Use /network:auto by default Backported #7714: Workaround for broken surface frame marker Backported #7733: Support 10bit X11 color (BGRX32 only) Backported #7745: GFX progressive double free Backported #7808: Disable websockets with /gt:rpc Backported #7815: RAIL expect LOGON_MSG_SESSION_CONTINUE PR: 263490 MFH: 2022Q2 net/freerdp/Makefile | 18 ++---------------- net/freerdp/distinfo | 8 +++----- net/freerdp/pkg-plist | 1 + 3 files changed, 6 insertions(+), 21 deletions(-)
A commit in branch 2022Q2 references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=4941a32d46be02db600c4caab96df35a4060faeb commit 4941a32d46be02db600c4caab96df35a4060faeb Author: VVD <vvd@unislabs.com> AuthorDate: 2022-04-26 19:09:12 +0000 Commit: Matthias Andree <mandree@FreeBSD.org> CommitDate: 2022-04-26 19:11:50 +0000 net/freerdp: update to 2.7.0 [maintainer] https://github.com/FreeRDP/FreeRDP/blob/2.7.0/ChangeLog Noteworthy changes: Backported OpenSSL3 gateway support (#7822) Backported various NTLM fixes Backported WINPR_ASSERT to ease future backports Fixed issues: Backported #6786: Use /network:auto by default Backported #7714: Workaround for broken surface frame marker Backported #7733: Support 10bit X11 color (BGRX32 only) Backported #7745: GFX progressive double free Backported #7808: Disable websockets with /gt:rpc Backported #7815: RAIL expect LOGON_MSG_SESSION_CONTINUE PR: 263490 MFH: 2022Q2 four cherry-picks squashed into one to reduce churn: (cherry picked from commit a08e76c0d3629183f7a0a6e8d29bb0fc9912a431) (cherry picked from commit 1bf5531c2ca9e3802494c0690ff11586215ca8fe) (cherry picked from commit 338ebccab9039e125e9393c45e73ada94864720b) (cherry picked from commit 7783dde8566e63fe91508b61dced7e54c721cbaa) net/freerdp/Makefile | 20 ++------------------ net/freerdp/distinfo | 8 +++----- net/freerdp/pkg-plist | 1 + 3 files changed, 6 insertions(+), 23 deletions(-)
vvd@, the release is dubbed a "security" release, can you please also add an entry for security/vuxml? Just enter the port, type "make newentry", then edit, then type "make validate", refine, and submit to a PR? Thanks in advance.
(In reply to Matthias Andree from comment #16) Tried… I don't have information for this… https://github.com/FreeRDP/FreeRDP/issues/7745
well, if they backported it to 2.7.0, and given the versions we have in ports, I would mark all versions <le>2.7.0</le> affected. Even if we do not fully understand the implications, we should tell people to upgrade via VuXML.