diff options
Diffstat (limited to 'meta-oe/recipes-support/xrdp')
| -rw-r--r-- | meta-oe/recipes-support/xrdp/xrdp/0001-Added-req_distinguished_name-in-etc-xrdp-openssl.con.patch | 2 | ||||
| -rw-r--r-- | meta-oe/recipes-support/xrdp/xrdp/0001-Fix-the-compile-error.patch | 2 | ||||
| -rw-r--r-- | meta-oe/recipes-support/xrdp/xrdp/0001-Fixed-compiler-warnings-about-snprintf-truncations.patch | 28 | ||||
| -rw-r--r-- | meta-oe/recipes-support/xrdp/xrdp/0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch | 27 | ||||
| -rw-r--r-- | meta-oe/recipes-support/xrdp/xrdp/0001-correct-the-location-of-errno.h.patch | 30 | ||||
| -rw-r--r-- | meta-oe/recipes-support/xrdp/xrdp/0001-mark-count-with-unused-attribute.patch | 31 | ||||
| -rw-r--r-- | meta-oe/recipes-support/xrdp/xrdp/0001-riscv-doesn-t-require-pointers-to-be-aligned.patch | 28 | ||||
| -rw-r--r-- | meta-oe/recipes-support/xrdp/xrdp_0.9.19.bb (renamed from meta-oe/recipes-support/xrdp/xrdp_0.9.14.bb) | 47 |
8 files changed, 83 insertions, 112 deletions
diff --git a/meta-oe/recipes-support/xrdp/xrdp/0001-Added-req_distinguished_name-in-etc-xrdp-openssl.con.patch b/meta-oe/recipes-support/xrdp/xrdp/0001-Added-req_distinguished_name-in-etc-xrdp-openssl.con.patch index 5e7fca02a5..05803266cb 100644 --- a/meta-oe/recipes-support/xrdp/xrdp/0001-Added-req_distinguished_name-in-etc-xrdp-openssl.con.patch +++ b/meta-oe/recipes-support/xrdp/xrdp/0001-Added-req_distinguished_name-in-etc-xrdp-openssl.con.patch @@ -6,6 +6,8 @@ Subject: [PATCH] Added req_distinguished_name in /etc/xrdp/openssl.conf, Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> --- +Upstream-Status: Pending + keygen/openssl.conf | 8 ++++++++ 1 file changed, 8 insertions(+) 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 index 82b2790856..e8b4ffa6bf 100644 --- 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 @@ -5,6 +5,8 @@ Fix the compile error: Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> --- +Upstream-Status: Pending + xrdp/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/xrdp/xrdp/0001-Fixed-compiler-warnings-about-snprintf-truncations.patch b/meta-oe/recipes-support/xrdp/xrdp/0001-Fixed-compiler-warnings-about-snprintf-truncations.patch deleted file mode 100644 index 5b9315cfb4..0000000000 --- a/meta-oe/recipes-support/xrdp/xrdp/0001-Fixed-compiler-warnings-about-snprintf-truncations.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 9de23a9199d26e64ab6b5be2bb74f260200b2dc5 Mon Sep 17 00:00:00 2001 -From: matt335672 <30179339+matt335672@users.noreply.github.com> -Date: Fri, 21 Aug 2020 12:20:31 +0100 -Subject: [PATCH] Fixed compiler warnings about snprintf truncations - -Upstream-Status: Backport [https://github.com/neutrinolabs/xrdp/pull/1659] ---- - common/log.c | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/common/log.c b/common/log.c -index 4a0bd2f3..8686789d 100644 ---- a/common/log.c -+++ b/common/log.c -@@ -555,9 +555,7 @@ log_message(const enum logLevels lvl, const char *msg, ...) - now_t = time(&now_t); - now = localtime(&now_t); - -- snprintf(buff, 21, "[%.4d%.2d%.2d-%.2d:%.2d:%.2d] ", now->tm_year + 1900, -- now->tm_mon + 1, now->tm_mday, now->tm_hour, now->tm_min, -- now->tm_sec); -+ strftime(buff, 21, "[%Y%m%d-%H:%M:%S] ", now); - - internal_log_lvl2str(lvl, buff + 20); - --- -2.29.2 - diff --git a/meta-oe/recipes-support/xrdp/xrdp/0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch b/meta-oe/recipes-support/xrdp/xrdp/0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch new file mode 100644 index 0000000000..ea3eb11f0a --- /dev/null +++ b/meta-oe/recipes-support/xrdp/xrdp/0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch @@ -0,0 +1,27 @@ +From 5958db649855bfb2ada7c0ed22a00f839b9a1161 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 12 Mar 2021 21:40:35 -0800 +Subject: [PATCH] arch: Define NO_NEED_ALIGN on ppc64 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + common/arch.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/common/arch.h b/common/arch.h +index 617feb5e..6edb39db 100644 +--- a/common/arch.h ++++ b/common/arch.h +@@ -85,7 +85,7 @@ typedef int bool_t; + #define NEED_ALIGN + #elif defined(__x86__) || defined(__x86_64__) || \ + defined(__AMD64__) || defined(_M_IX86) || defined (_M_AMD64) || \ +- defined(__i386__) || defined(__aarch64__) || \ ++ defined(__i386__) || defined(__aarch64__) || defined(__powerpc64__) || \ + defined(__PPC__) || defined(__LITTLE_ENDIAN__) || \ + defined(__s390__) || defined (__s390x__) || \ + defined(__riscv) +-- +2.31.1 + diff --git a/meta-oe/recipes-support/xrdp/xrdp/0001-correct-the-location-of-errno.h.patch b/meta-oe/recipes-support/xrdp/xrdp/0001-correct-the-location-of-errno.h.patch deleted file mode 100644 index b06077bf02..0000000000 --- a/meta-oe/recipes-support/xrdp/xrdp/0001-correct-the-location-of-errno.h.patch +++ /dev/null @@ -1,30 +0,0 @@ -From c8d3df40ece7d659ccc8212b18de916d28f4398a Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 22 Dec 2020 23:10:52 -0800 -Subject: [PATCH] correct the location of errno.h - -Fixes build on musl - -Upstream-Status: Submitted [https://github.com/neutrinolabs/xrdp/pull/1761] - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - sesman/chansrv/sound.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sesman/chansrv/sound.c b/sesman/chansrv/sound.c -index b0480d33..45e17307 100644 ---- a/sesman/chansrv/sound.c -+++ b/sesman/chansrv/sound.c -@@ -23,7 +23,7 @@ - #include <stdio.h> - #include <sys/types.h> - #include <sys/socket.h> --#include <sys/errno.h> -+#include <errno.h> - #include <signal.h> - #include <sys/un.h> - --- -2.29.2 - diff --git a/meta-oe/recipes-support/xrdp/xrdp/0001-mark-count-with-unused-attribute.patch b/meta-oe/recipes-support/xrdp/xrdp/0001-mark-count-with-unused-attribute.patch new file mode 100644 index 0000000000..77a394d556 --- /dev/null +++ b/meta-oe/recipes-support/xrdp/xrdp/0001-mark-count-with-unused-attribute.patch @@ -0,0 +1,31 @@ +From 492f74dbea1d9a15fbc3e870e78ab52e7fc5583b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 31 Aug 2022 20:19:32 -0700 +Subject: [PATCH] mark count with unused attribute + +This may throw a warning when devel logs are disabled +Fixed +../../../xrdp-0.9.19/sesman/chansrv/chansrv.c:198:9: error: variable 'count' set but not used [-Werror,-Wunused-but-set-variable] int count; ^ 1 error generated. + +Upstream-Status: Submitted [https://github.com/neutrinolabs/xrdp/pull/2353] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + sesman/chansrv/chansrv.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sesman/chansrv/chansrv.c b/sesman/chansrv/chansrv.c +index 4452d998..b818bff3 100644 +--- a/sesman/chansrv/chansrv.c ++++ b/sesman/chansrv/chansrv.c +@@ -195,7 +195,7 @@ check_timeout(void) + struct timeout_obj *tobj; + struct timeout_obj *last_tobj; + struct timeout_obj *temp_tobj; +- int count; ++ int count __attribute__((unused)); + tui32 now; + + LOG_DEVEL(LOG_LEVEL_DEBUG, "check_timeout:"); +-- +2.37.3 + diff --git a/meta-oe/recipes-support/xrdp/xrdp/0001-riscv-doesn-t-require-pointers-to-be-aligned.patch b/meta-oe/recipes-support/xrdp/xrdp/0001-riscv-doesn-t-require-pointers-to-be-aligned.patch deleted file mode 100644 index 4cd26df04c..0000000000 --- a/meta-oe/recipes-support/xrdp/xrdp/0001-riscv-doesn-t-require-pointers-to-be-aligned.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 229206aa5e55a6e26a074a54a1b50139ab794b36 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 22 Dec 2020 23:01:13 -0800 -Subject: [PATCH] riscv doesn't require pointers to be aligned - -Upstream-Status: Submitted [https://github.com/neutrinolabs/xrdp/pull/1761] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - common/arch.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/common/arch.h b/common/arch.h -index ccccfa5a..8c2ac1a4 100644 ---- a/common/arch.h -+++ b/common/arch.h -@@ -84,7 +84,8 @@ typedef int bool_t; - #define NEED_ALIGN - #elif defined(__x86__) || defined(__x86_64__) || \ - defined(__AMD64__) || defined(_M_IX86) || defined (_M_AMD64) || \ -- defined(__i386__) || defined(__aarch64__) -+ defined(__i386__) || defined(__aarch64__) || \ -+ defined(__riscv) - #define NO_NEED_ALIGN - #else - #warning unknown arch --- -2.29.2 - diff --git a/meta-oe/recipes-support/xrdp/xrdp_0.9.14.bb b/meta-oe/recipes-support/xrdp/xrdp_0.9.19.bb index 078e23c6ed..b839a68294 100644 --- a/meta-oe/recipes-support/xrdp/xrdp_0.9.14.bb +++ b/meta-oe/recipes-support/xrdp/xrdp_0.9.19.bb @@ -6,56 +6,54 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=72cfbe4e7bd33a0a1de9630c91195c21 \ inherit features_check autotools pkgconfig useradd systemd -DEPENDS = "openssl virtual/libx11 libxfixes libxrandr libpam nasm-native" +DEPENDS = "openssl virtual/libx11 libxfixes libxrandr libpam nasm-native imlib2 pixman libsm" REQUIRED_DISTRO_FEATURES = "x11 pam" -SRC_URI = "git://github.com/neutrinolabs/xrdp.git;branch=devel \ +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-riscv-doesn-t-require-pointers-to-be-aligned.patch \ - file://0001-correct-the-location-of-errno.h.patch \ - file://0001-Fixed-compiler-warnings-about-snprintf-truncations.patch \ + file://0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch \ + file://0001-mark-count-with-unused-attribute.patch \ " -SRCREV = "1469d659dbccd6d042ac44f0afc4e1309788dc9d" -S = "${WORKDIR}/git" +SRC_URI[sha256sum] = "94017d30e475c6d7a24f651e16791551862ae46f82d8de62385e63393f5f93d0" + +CFLAGS += " -Wno-deprecated-declarations" PACKAGECONFIG ??= "" PACKAGECONFIG[fuse] = " --enable-fuse, --disable-fuse, fuse" USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "--system xrdp" -USERADD_PARAM_${PN} = "--system --home /var/run/xrdp -g xrdp \ +GROUPADD_PARAM:${PN} = "--system xrdp" +USERADD_PARAM:${PN} = "--system --home /var/run/xrdp -g xrdp \ --no-create-home --shell /bin/false xrdp" -FILES_${PN} += "${datadir}/dbus-1/services/*.service \ +FILES:${PN} += "${datadir}/dbus-1/services/*.service \ ${datadir}/dbus-1/accessibility-services/*.service " -FILES_${PN}-dev += "${libdir}/xrdp/libcommon.so \ +FILES:${PN}-dev += "${libdir}/xrdp/libcommon.so \ ${libdir}/xrdp/libxrdp.so \ ${libdir}/xrdp/libscp.so \ ${libdir}/xrdp/libxrdpapi.so " -EXTRA_OECONF = "--enable-pam-config=suse" +EXTRA_OECONF = "--enable-pam-config=suse --enable-fuse \ + --enable-pixman --enable-painter --enable-vsock \ + --enable-ipv6 --with-imlib2 --with-socketdir=${localstatedir}/run/${PN}" -do_configure_prepend() { +do_configure:prepend() { cd ${S} ./bootstrap cd - } -do_compile_prepend() { +do_compile:prepend() { sed -i 's/(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am/(MAKE) $(AM_MAKEFLAGS) install-exec-am/g' ${S}/keygen/Makefile.in + echo "" > ${B}/xrdp_configure_options.h } - -do_install_append() { - install -d ${D}${sysconfdir} - install -d ${D}${sysconfdir}/xrdp - install -d ${D}${sysconfdir}/xrdp/pam.d - install -d ${D}${sysconfdir}/sysconfig/xrdp +do_install:append() { # deal with systemd unit files install -d ${D}${systemd_unitdir}/system @@ -65,19 +63,16 @@ do_install_append() { sed -i -e 's,@sysconfdir@,${sysconfdir},g' ${D}${systemd_unitdir}/system/xrdp.service ${D}${systemd_unitdir}/system/xrdp-sesman.service sed -i -e 's,@sbindir@,${sbindir},g' ${D}${systemd_unitdir}/system/xrdp.service ${D}${systemd_unitdir}/system/xrdp-sesman.service + install -d ${D}${sysconfdir}/sysconfig/xrdp install -m 0644 ${S}/instfiles/*.ini ${D}${sysconfdir}/xrdp/ - install -m 0644 ${S}/sesman/sesman.ini.in ${D}${sysconfdir}/xrdp/ - install -m 0644 ${S}/sesman/startwm.sh ${D}${sysconfdir}/xrdp/ - install -m 0644 ${S}/xrdp/xrdp.ini.in ${D}${sysconfdir}/xrdp/ - install -m 0644 ${S}/xrdp/xrdp_keyboard.ini ${D}${sysconfdir}/xrdp/ install -m 0644 ${S}/keygen/openssl.conf ${D}${sysconfdir}/xrdp/ install -m 0644 ${WORKDIR}/xrdp.sysconfig ${D}${sysconfdir}/sysconfig/xrdp/ chown xrdp:xrdp ${D}${sysconfdir}/xrdp } -SYSTEMD_SERVICE_${PN} = "xrdp.service xrdp-sesman.service" +SYSTEMD_SERVICE:${PN} = "xrdp.service xrdp-sesman.service" -pkg_postinst_${PN}() { +pkg_postinst:${PN}() { if test -z "$D" then if test -x ${bindir}/xrdp-keygen |