From: Gyorgy Sarvari <[email protected]> Contains fixes for the following vulnerabilities: CVE-2022-23468, CVE-2022-23477, CVE-2022-23478, CVE-2022-23479, CVE-2022-23480, CVE-2022-23481, CVE-2022-23482, CVE-2022-23483, CVE-2022-23484, CVE-2022-23493, CVE-2023-40184, CVE-2023-42822, CVE-2024-39917
Added a new patch to fix compiling with musl. Dropped 0001-Fix-the-compile-error.patch: it's an 8 years old patch, claiming to fix a compile error. I did not see an error when I removed it (tried glibc and musl, gcc and clang). Changelogs: 0.10.4.1: https://github.com/neutrinolabs/xrdp/releases/tag/v0.10.4.1 0.10.4: https://github.com/neutrinolabs/xrdp/releases/tag/v0.10.4 0.10.3: https://github.com/neutrinolabs/xrdp/releases/tag/v0.10.3 0.10.2: https://github.com/neutrinolabs/xrdp/releases/tag/v0.10.2 0.10.1: https://github.com/neutrinolabs/xrdp/releases/tag/v0.10.1 0.10.0: https://github.com/neutrinolabs/xrdp/releases/tag/v0.10.0 Signed-off-by: Gyorgy Sarvari <[email protected]> Signed-off-by: Khem Raj <[email protected]> (cherry picked from commit 07c05145faa1a6112bde05a1f316b602cedd7029) Signed-off-by: Ankur Tyagi <[email protected]> --- .../xrdp/0001-Fix-the-compile-error.patch | 37 ------------------- .../xrdp/xrdp/fix-compiling-with-musl.patch | 27 ++++++++++++++ .../xrdp/{xrdp_0.9.20.bb => xrdp_0.10.4.1.bb} | 20 ++++++---- 3 files changed, 39 insertions(+), 45 deletions(-) delete mode 100644 meta-oe/recipes-support/xrdp/xrdp/0001-Fix-the-compile-error.patch create mode 100644 meta-oe/recipes-support/xrdp/xrdp/fix-compiling-with-musl.patch rename meta-oe/recipes-support/xrdp/{xrdp_0.9.20.bb => xrdp_0.10.4.1.bb} (87%) diff --git a/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-the-compile-error.patch b/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-the-compile-error.patch deleted file mode 100644 index 1bb84001f3..0000000000 --- a/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-the-compile-error.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 2fa575c3171688ceb0dc867a52628046b3f60d91 Mon Sep 17 00:00:00 2001 -From: Zheng Ruoqin <[email protected]> -Date: Tue, 12 Dec 2017 22:36:50 +0800 -Subject: [PATCH] Fix the make error - -Fix the compile error: - *** No rule to make target '../librfxcodec/src/.libs/librfxencode.a', needed by 'xrdp'. Stop.. - -Signed-off-by: Zheng Ruoqin <[email protected]> ---- -Upstream-Status: Pending - - xrdp/Makefile.am | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/xrdp/Makefile.am b/xrdp/Makefile.am -index 71d0f76..f41751b 100644 ---- a/xrdp/Makefile.am -+++ b/xrdp/Makefile.am -@@ -21,7 +21,7 @@ XRDP_EXTRA_LIBS = - if XRDP_RFXCODEC - AM_CPPFLAGS += -DXRDP_RFXCODEC - AM_CPPFLAGS += -I$(top_srcdir)/librfxcodec/include --XRDP_EXTRA_LIBS += $(top_builddir)/librfxcodec/src/.libs/librfxencode.a -+XRDP_EXTRA_LIBS += $(top_builddir)/librfxcodec/src/.libs/librfxencode.la - endif - - if XRDP_PIXMAN -@@ -33,7 +33,7 @@ endif - if XRDP_PAINTER - AM_CPPFLAGS += -DXRDP_PAINTER - AM_CPPFLAGS += -I$(top_srcdir)/libpainter/include --XRDP_EXTRA_LIBS += $(top_builddir)/libpainter/src/.libs/libpainter.a -+XRDP_EXTRA_LIBS += $(top_builddir)/libpainter/src/.libs/libpainter.la - endif - - sbin_PROGRAMS = \ diff --git a/meta-oe/recipes-support/xrdp/xrdp/fix-compiling-with-musl.patch b/meta-oe/recipes-support/xrdp/xrdp/fix-compiling-with-musl.patch new file mode 100644 index 0000000000..c716229ab6 --- /dev/null +++ b/meta-oe/recipes-support/xrdp/xrdp/fix-compiling-with-musl.patch @@ -0,0 +1,27 @@ + +sys/signal.h does almost the same in both glibc and musl: it includes "signal.h" + +However with musl there is also a warning macro about this, which is interpreted as +an error during building. + +Fixes error: + +| In file included from ../../sources/xrdp-0.10.4.1/waitforx/waitforx.c:5: +| <...>/usr/include/sys/signal.h:1:2: error: #warning redirecting incorrect #include <sys/signal.h> to <signal.h> [-Werror=cpp] +| 1 | #warning redirecting incorrect #include <sys/signal.h> to <signal.h> +| | ^~~~~~~ +| cc1: all warnings being treated as errors + +Upstream-Status: Submitted [https://github.com/neutrinolabs/xrdp/pull/3678] +Signed-off-by: Gyorgy Sarvari <[email protected]> + +--- ./waitforx/waitforx.c.orig 2025-11-25 14:38:46.464337398 +0100 ++++ ./waitforx/waitforx.c 2025-11-25 14:38:52.007441093 +0100 +@@ -2,7 +2,6 @@ + #include <signal.h> + #include <stdio.h> + #include <stdlib.h> +-#include <sys/signal.h> + #include <unistd.h> + + #include "config_ac.h" diff --git a/meta-oe/recipes-support/xrdp/xrdp_0.9.20.bb b/meta-oe/recipes-support/xrdp/xrdp_0.10.4.1.bb similarity index 87% rename from meta-oe/recipes-support/xrdp/xrdp_0.9.20.bb rename to meta-oe/recipes-support/xrdp/xrdp_0.10.4.1.bb index a60c125d06..cd45d27fe4 100644 --- a/meta-oe/recipes-support/xrdp/xrdp_0.9.20.bb +++ b/meta-oe/recipes-support/xrdp/xrdp_0.10.4.1.bb @@ -13,20 +13,20 @@ REQUIRED_DISTRO_FEATURES = "x11 pam" SRC_URI = "https://github.com/neutrinolabs/${BPN}/releases/download/v${PV}/${BPN}-${PV}.tar.gz \ file://xrdp.sysconfig \ file://0001-Added-req_distinguished_name-in-etc-xrdp-openssl.con.patch \ - file://0001-Fix-the-compile-error.patch \ file://0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch \ file://0001-mark-count-with-unused-attribute.patch \ " +SRC_URI:append:libc-musl = " file://fix-compiling-with-musl.patch" -SRC_URI[sha256sum] = "db693401da95b71b4d4e4c99aeb569a546dbdbde343f6d3302b0c47653277abb" +SRC_URI[sha256sum] = "52eadf3e86c57be0de0b9d5c184b52a7946a070746d3eb04b5089dd6d42f8f5f" UPSTREAM_CHECK_URI = "https://github.com/neutrinolabs/xrdp/releases"; UPSTREAM_CHECK_REGEX = "releases/tag/v(?P<pver>\d+(\.\d+)+)" CFLAGS += " -Wno-deprecated-declarations" -PACKAGECONFIG ??= "" -PACKAGECONFIG[fuse] = " --enable-fuse, --disable-fuse, fuse" +PACKAGECONFIG ??= "fuse" +PACKAGECONFIG[fuse] = " --enable-fuse, --disable-fuse, fuse3" USERADD_PACKAGES = "${PN}" GROUPADD_PARAM:${PN} = "--system xrdp" @@ -36,10 +36,14 @@ USERADD_PARAM:${PN} = "--system --home /var/run/xrdp -g xrdp \ FILES:${PN} += "${datadir}/dbus-1/services/*.service \ ${datadir}/dbus-1/accessibility-services/*.service " -FILES:${PN}-dev += "${libdir}/xrdp/libcommon.so \ - ${libdir}/xrdp/libxrdp.so \ - ${libdir}/xrdp/libscp.so \ - ${libdir}/xrdp/libxrdpapi.so " +FILES:${PN}-dev += " \ + ${libdir}/xrdp/libcommon.so \ + ${libdir}/xrdp/libxrdp.so \ + ${libdir}/xrdp/libxrdpapi.so \ + ${libdir}/xrdp/libtoml.so \ + ${libdir}/xrdp/libsesman.so \ + ${libdir}/xrdp/libipm.so \ + " EXTRA_OECONF = "--enable-pam-config=suse --enable-fuse \ --enable-pixman --enable-painter --enable-vsock \
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#122514): https://lists.openembedded.org/g/openembedded-devel/message/122514 Mute This Topic: https://lists.openembedded.org/mt/116710834/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
