Bug 274452 - games/moonlight-embedded Update to 2.6.1
Summary: games/moonlight-embedded Update to 2.6.1
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Robert Clausecker
URL: https://github.com/moonlight-stream/m...
Keywords:
Depends on:
Blocks:
 
Reported: 2023-10-13 14:12 UTC by Armin Zhu
Modified: 2023-10-19 07:14 UTC (History)
1 user (show)

See Also:
lisp_25689: maintainer-feedback-
fuz: merge-quarterly+


Attachments
games/moonlight-embedded Update to 2.6.1 (46.33 KB, patch)
2023-10-13 14:12 UTC, Armin Zhu
no flags Details | Diff
games/moonlight-embedded Update to 2.6.1 (46.30 KB, patch)
2023-10-16 15:23 UTC, Armin Zhu
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Armin Zhu 2023-10-13 14:12:02 UTC
Created attachment 245604 [details]
games/moonlight-embedded Update to 2.6.1

Update to version 2.6.1
 *Security fixes:
     Fixed CVE-2023-42799, CVE-2023-42800, and CVE-2023-42801
    From: https://github.com/moonlight-stream/moonlight-embedded/releases/tag/v2.6.1
 *Optimize the experience of grabing the keyboard.
     Now,Exclusive grab keyboard is the default behavior.But maybe it doesn't work on the Wayland WM.
     Use Alt+Ctrl+Shift+Z to grab or ungrab keyboard.
 *Optimize the experience of using the gamepad on FreeBSD.
     Replace the libevdev drive gamepad with SDL to ensure maximum compatibility.
     The rumble on the gamepad may not work.
 *Update man page.


Explanation for changed patch files:
 *patch-src_config.c:
 *patch-src_config.h:
 *patch-src_main.c:
 *patch-src_input_sdl.c:
 *patch-src_input_sdl.h:
      Add -nosdl option and replace the libevdev drive gamepad with SDL.

 *patch-src_input_evdev.c:
 *patch-src_input_x11.c:
 *patch-src_video_x11.c:
      Add the way to ungrab the keyboard for x11* platform.

 *patch-src_sdl.c:
 *patch-src_sdl.h:
 *patch-src_input_sdl.c:
     Add the way to ungrab the keyboard for SDL platform.

Please ignore the warning when make stage-qa for libSDL2.so.
Comment 1 Robert Clausecker freebsd_committer freebsd_triage 2023-10-16 05:15:08 UTC
These patch files are becoming quite numerous.  It would be a lot easier if you were to fork the upstream project, applied the patches to the fork, and use that as the upstream.

Would you like this update to be merged into the quarterly branch?

It's a fix for a security issue after all.

Your patch errorneously removes the pre-configure target and instead hard-codes
/usr/local as PREFIX.  This is wrong.  Users are free to compile packages with
whatever PREFIX they like and your package must use the path the user configured.  Do not assume PREFIX is /usr/local.

Please check and resubmit.
Comment 2 Armin Zhu 2023-10-16 15:23:50 UTC
Created attachment 245681 [details]
games/moonlight-embedded Update to 2.6.1

restore ${PREFFIX} from makefile
Comment 3 Armin Zhu 2023-10-16 15:26:11 UTC
(In reply to Robert Clausecker from comment #1)
Friend,you are right.
It's time to fork moonlight-embedded form upstream.
But this will be the next submission, and I'm going to refine the code for this app.
 $PREFIX replace /usr/local fix in new patch file.
Comment 4 Armin Zhu 2023-10-16 15:40:19 UTC
(In reply to Robert Clausecker from comment #1)
Merged into the quarterly branch please.
Comment 5 commit-hook freebsd_committer freebsd_triage 2023-10-19 07:09:22 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ec671703cada5b2e44de0758dc14199b2fb75596

commit ec671703cada5b2e44de0758dc14199b2fb75596
Author:     Armin Zhu <lisp_25689@163.com>
AuthorDate: 2023-10-16 14:59:48 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2023-10-19 07:07:28 +0000

    games/moonlight-embedded: update to 2.6.1

     *Security fixes:
         Fixed CVE-2023-42799, CVE-2023-42800, and CVE-2023-42801
        From: https://github.com/moonlight-stream/moonlight-embedded/releases/tag/v2.6.1
     *Optimize the experience of grabing the keyboard.
         Now,Exclusive grab keyboard is the default behavior.But maybe it doesn't work on the Wayland WM.
         Use Alt+Ctrl+Shift+Z to grab or ungrab keyboard.
     *Optimize the experience of using the gamepad on FreeBSD.
         Replace the libevdev drive gamepad with SDL to ensure maximum compatibility.
         The rumble on the gamepad may not work.
     *Update man page.

    Explanation for changed patch files:

     *patch-src_config.c:
     *patch-src_config.h:
     *patch-src_main.c:
     *patch-src_input_sdl.c:
     *patch-src_input_sdl.h:
          Add -nosdl option and replace the libevdev drive gamepad with SDL.

     *patch-src_input_evdev.c:
     *patch-src_input_x11.c:
     *patch-src_video_x11.c:
          Add the way to ungrab the keyboard for x11* platform.

     *patch-src_sdl.c:
     *patch-src_sdl.h:
     *patch-src_input_sdl.c:
         Add the way to ungrab the keyboard for SDL platform.

    PR:             274452
    MFH:            2023Q4
    Security:       f8c2f741-6be1-11ee-b33a-a04a5edf46d9

 games/moonlight-embedded/Makefile                  |   7 +-
 games/moonlight-embedded/distinfo                  |   6 +-
 .../moonlight-embedded/files/patch-docs_README.pod |  77 ++---
 .../files/patch-src_config.c (new)                 |  28 ++
 .../files/patch-src_config.h (new)                 |  10 +
 .../files/patch-src_input_evdev.c                  | 195 +++++++++++--
 .../files/patch-src_input_sdl.c (new)              | 309 +++++++++++++++++++++
 .../files/patch-src_input_sdl.h (new)              |   8 +
 .../files/patch-src_input_x11.c (new)              | 185 ++++++++++++
 games/moonlight-embedded/files/patch-src_main.c    |  59 +++-
 .../moonlight-embedded/files/patch-src_sdl.c (new) |  64 +++++
 .../moonlight-embedded/files/patch-src_sdl.h (new) |  19 ++
 .../files/patch-src_video_x11.c (new)              |  42 +++
 ...d__party_moonlight-common-c_enet_CMakeLists.txt |  30 +-
 14 files changed, 966 insertions(+), 73 deletions(-)
Comment 6 commit-hook freebsd_committer freebsd_triage 2023-10-19 07:09:35 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=243a85de6980a262b7e53e9290f4367f34a58faf

commit 243a85de6980a262b7e53e9290f4367f34a58faf
Author:     Robert Clausecker <fuz@FreeBSD.org>
AuthorDate: 2023-10-16 05:12:10 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2023-10-19 07:07:25 +0000

    security/vuxml: add games/moonlight-embedded vulnerability

    PR:             274452
    Reported by:    Armin Zhu <lisp_25689@163.com>

 security/vuxml/vuln/2023.xml | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
Comment 7 commit-hook freebsd_committer freebsd_triage 2023-10-19 07:11:47 UTC
A commit in branch 2023Q4 references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=de62baaf30158781dc326b2d3bb74c40c01bea8b

commit de62baaf30158781dc326b2d3bb74c40c01bea8b
Author:     Armin Zhu <lisp_25689@163.com>
AuthorDate: 2023-10-16 14:59:48 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2023-10-19 07:10:08 +0000

    games/moonlight-embedded: update to 2.6.1

     *Security fixes:
         Fixed CVE-2023-42799, CVE-2023-42800, and CVE-2023-42801
        From: https://github.com/moonlight-stream/moonlight-embedded/releases/tag/v2.6.1
     *Optimize the experience of grabing the keyboard.
         Now,Exclusive grab keyboard is the default behavior.But maybe it doesn't work on the Wayland WM.
         Use Alt+Ctrl+Shift+Z to grab or ungrab keyboard.
     *Optimize the experience of using the gamepad on FreeBSD.
         Replace the libevdev drive gamepad with SDL to ensure maximum compatibility.
         The rumble on the gamepad may not work.
     *Update man page.

    Explanation for changed patch files:

     *patch-src_config.c:
     *patch-src_config.h:
     *patch-src_main.c:
     *patch-src_input_sdl.c:
     *patch-src_input_sdl.h:
          Add -nosdl option and replace the libevdev drive gamepad with SDL.

     *patch-src_input_evdev.c:
     *patch-src_input_x11.c:
     *patch-src_video_x11.c:
          Add the way to ungrab the keyboard for x11* platform.

     *patch-src_sdl.c:
     *patch-src_sdl.h:
     *patch-src_input_sdl.c:
         Add the way to ungrab the keyboard for SDL platform.

    PR:             274452
    MFH:            2023Q4
    Security:       f8c2f741-6be1-11ee-b33a-a04a5edf46d9
    (cherry picked from commit ec671703cada5b2e44de0758dc14199b2fb75596)

 games/moonlight-embedded/Makefile                  |   7 +-
 games/moonlight-embedded/distinfo                  |   6 +-
 .../moonlight-embedded/files/patch-docs_README.pod |  77 ++---
 .../files/patch-src_config.c (new)                 |  28 ++
 .../files/patch-src_config.h (new)                 |  10 +
 .../files/patch-src_input_evdev.c                  | 195 +++++++++++--
 .../files/patch-src_input_sdl.c (new)              | 309 +++++++++++++++++++++
 .../files/patch-src_input_sdl.h (new)              |   8 +
 .../files/patch-src_input_x11.c (new)              | 185 ++++++++++++
 games/moonlight-embedded/files/patch-src_main.c    |  59 +++-
 .../moonlight-embedded/files/patch-src_sdl.c (new) |  64 +++++
 .../moonlight-embedded/files/patch-src_sdl.h (new) |  19 ++
 .../files/patch-src_video_x11.c (new)              |  42 +++
 ...d__party_moonlight-common-c_enet_CMakeLists.txt |  30 +-
 14 files changed, 966 insertions(+), 73 deletions(-)
Comment 8 Robert Clausecker freebsd_committer freebsd_triage 2023-10-19 07:14:49 UTC
Thank you for your contribution.