From 63e4df52f2187caa85a7e6b827f700ad9fa514a9 Mon Sep 17 00:00:00 2001 From: Jason Schonberg Date: Fri, 17 Jan 2025 15:10:13 -0500 Subject: xrdp: upgrade 0.9.19 -> 0.9.20 Patches updated with devtool Changelog: https://github.com/neutrinolabs/xrdp/releases/tag/v0.9.20 Signed-off-by: Jason Schonberg Signed-off-by: Khem Raj --- ...istinguished_name-in-etc-xrdp-openssl.con.patch | 7 +- .../xrdp/xrdp/0001-Fix-the-compile-error.patch | 12 +-- .../0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch | 9 +-- .../0001-mark-count-with-unused-attribute.patch | 9 +-- meta-oe/recipes-support/xrdp/xrdp_0.9.19.bb | 94 ---------------------- meta-oe/recipes-support/xrdp/xrdp_0.9.20.bb | 94 ++++++++++++++++++++++ 6 files changed, 108 insertions(+), 117 deletions(-) delete mode 100644 meta-oe/recipes-support/xrdp/xrdp_0.9.19.bb create mode 100644 meta-oe/recipes-support/xrdp/xrdp_0.9.20.bb (limited to 'meta-oe/recipes-support') 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 05803266cb..926ad93bbe 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 @@ -1,7 +1,7 @@ -From d705b1d666cb8713d86ea6fb2fc45c424128285a Mon Sep 17 00:00:00 2001 +From abdfa0fddeceab843ab6eabe31c7763c8719642b Mon Sep 17 00:00:00 2001 From: Lei Maohui Date: Fri, 1 Dec 2017 10:24:50 +0900 -Subject: [PATCH] Added req_distinguished_name in /etc/xrdp/openssl.conf, +Subject: [PATCH] Added req_distinguished_name in /etc/xrdp/openssl.conf, otherwise, cert.pem can't be created. Signed-off-by: Lei Maohui @@ -30,6 +30,3 @@ index 09db6c2..f077d72 100644 [v3_ca] # Extensions for a typical CA - PKIX recommendation. --- -1.8.4.2 - 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 e8b4ffa6bf..1bb84001f3 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 @@ -1,3 +1,6 @@ +From 2fa575c3171688ceb0dc867a52628046b3f60d91 Mon Sep 17 00:00:00 2001 +From: Zheng Ruoqin +Date: Tue, 12 Dec 2017 22:36:50 +0800 Subject: [PATCH] Fix the make error Fix the compile error: @@ -11,10 +14,10 @@ Upstream-Status: Pending 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xrdp/Makefile.am b/xrdp/Makefile.am -index a259ef3..d5505b2 100644 +index 71d0f76..f41751b 100644 --- a/xrdp/Makefile.am +++ b/xrdp/Makefile.am -@@ -23,7 +23,7 @@ endif +@@ -21,7 +21,7 @@ XRDP_EXTRA_LIBS = if XRDP_RFXCODEC AM_CPPFLAGS += -DXRDP_RFXCODEC AM_CPPFLAGS += -I$(top_srcdir)/librfxcodec/include @@ -23,7 +26,7 @@ index a259ef3..d5505b2 100644 endif if XRDP_PIXMAN -@@ -35,7 +35,7 @@ endif +@@ -33,7 +33,7 @@ endif if XRDP_PAINTER AM_CPPFLAGS += -DXRDP_PAINTER AM_CPPFLAGS += -I$(top_srcdir)/libpainter/include @@ -32,6 +35,3 @@ index a259ef3..d5505b2 100644 endif sbin_PROGRAMS = \ --- -2.7.4 - 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 index ea3eb11f0a..01449e2a5f 100644 --- 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 @@ -1,4 +1,4 @@ -From 5958db649855bfb2ada7c0ed22a00f839b9a1161 Mon Sep 17 00:00:00 2001 +From 71e8fd272a4609cf3b6a0802cee82e2861a1fa0c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 12 Mar 2021 21:40:35 -0800 Subject: [PATCH] arch: Define NO_NEED_ALIGN on ppc64 @@ -10,10 +10,10 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/arch.h b/common/arch.h -index 617feb5e..6edb39db 100644 +index ec0aa05..f574656 100644 --- a/common/arch.h +++ b/common/arch.h -@@ -85,7 +85,7 @@ typedef int bool_t; +@@ -86,7 +86,7 @@ typedef int bool_t; #define NEED_ALIGN #elif defined(__x86__) || defined(__x86_64__) || \ defined(__AMD64__) || defined(_M_IX86) || defined (_M_AMD64) || \ @@ -22,6 +22,3 @@ index 617feb5e..6edb39db 100644 defined(__PPC__) || defined(__LITTLE_ENDIAN__) || \ defined(__s390__) || defined (__s390x__) || \ defined(__riscv) --- -2.31.1 - 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 index 77a394d556..2559ab7b31 100644 --- 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 @@ -1,4 +1,4 @@ -From 492f74dbea1d9a15fbc3e870e78ab52e7fc5583b Mon Sep 17 00:00:00 2001 +From 23638d0ec23c2658a4e98321c20a4a2ac9294fb2 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 31 Aug 2022 20:19:32 -0700 Subject: [PATCH] mark count with unused attribute @@ -14,7 +14,7 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sesman/chansrv/chansrv.c b/sesman/chansrv/chansrv.c -index 4452d998..b818bff3 100644 +index d66310b..eeb5921 100644 --- a/sesman/chansrv/chansrv.c +++ b/sesman/chansrv/chansrv.c @@ -195,7 +195,7 @@ check_timeout(void) @@ -24,8 +24,5 @@ index 4452d998..b818bff3 100644 - int count; + int count __attribute__((unused)); tui32 now; - + UNUSED_VAR(count); LOG_DEVEL(LOG_LEVEL_DEBUG, "check_timeout:"); --- -2.37.3 - diff --git a/meta-oe/recipes-support/xrdp/xrdp_0.9.19.bb b/meta-oe/recipes-support/xrdp/xrdp_0.9.19.bb deleted file mode 100644 index 7c85697d4f..0000000000 --- a/meta-oe/recipes-support/xrdp/xrdp_0.9.19.bb +++ /dev/null @@ -1,94 +0,0 @@ -SUMMARY = "An open source remote desktop protocol(rdp) server." - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=72cfbe4e7bd33a0a1de9630c91195c21 \ -" - -inherit features_check autotools pkgconfig useradd systemd - -DEPENDS = "openssl virtual/libx11 libxfixes libxrandr libpam nasm-native imlib2 pixman libsm" - -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[sha256sum] = "94017d30e475c6d7a24f651e16791551862ae46f82d8de62385e63393f5f93d0" - -UPSTREAM_CHECK_URI = "https://github.com/neutrinolabs/xrdp/releases" -UPSTREAM_CHECK_REGEX = "releases/tag/v(?P\d+(\.\d+)+)" - -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 \ - --no-create-home --shell /bin/false 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 " - -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() { - cd ${S} - ./bootstrap - cd - -} - -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() { - - # deal with systemd unit files - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${S}/instfiles/xrdp.service.in ${D}${systemd_unitdir}/system/xrdp.service - install -m 0644 ${S}/instfiles/xrdp-sesman.service.in ${D}${systemd_unitdir}/system/xrdp-sesman.service - sed -i -e 's,@localstatedir@,${localstatedir},g' ${D}${systemd_unitdir}/system/xrdp.service ${D}${systemd_unitdir}/system/xrdp-sesman.service - 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}/keygen/openssl.conf ${D}${sysconfdir}/xrdp/ - install -m 0644 ${UNPACKDIR}/xrdp.sysconfig ${D}${sysconfdir}/sysconfig/xrdp/ - chown xrdp:xrdp ${D}${sysconfdir}/xrdp -} - -SYSTEMD_SERVICE:${PN} = "xrdp.service xrdp-sesman.service" - -pkg_postinst:${PN}() { - if test -z "$D" - then - if test -x ${bindir}/xrdp-keygen - then - ${bindir}/xrdp-keygen xrdp ${sysconfdir}/xrdp/rsakeys.ini >/dev/null - fi - if test ! -s ${sysconfdir}/xrdp/cert.pem - then - openssl req -x509 -newkey rsa:2048 -sha256 -nodes -days 3652 \ - -keyout ${sysconfdir}/xrdp/key.pem \ - -out ${sysconfdir}/xrdp/cert.pem \ - -config ${sysconfdir}/xrdp/openssl.conf >/dev/null 2>&1 - chmod 400 ${sysconfdir}/xrdp/key.pem - fi - fi -} diff --git a/meta-oe/recipes-support/xrdp/xrdp_0.9.20.bb b/meta-oe/recipes-support/xrdp/xrdp_0.9.20.bb new file mode 100644 index 0000000000..a60c125d06 --- /dev/null +++ b/meta-oe/recipes-support/xrdp/xrdp_0.9.20.bb @@ -0,0 +1,94 @@ +SUMMARY = "An open source remote desktop protocol(rdp) server." + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=72cfbe4e7bd33a0a1de9630c91195c21 \ +" + +inherit features_check autotools pkgconfig useradd systemd + +DEPENDS = "openssl virtual/libx11 libxfixes libxrandr libpam nasm-native imlib2 pixman libsm" + +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[sha256sum] = "db693401da95b71b4d4e4c99aeb569a546dbdbde343f6d3302b0c47653277abb" + +UPSTREAM_CHECK_URI = "https://github.com/neutrinolabs/xrdp/releases" +UPSTREAM_CHECK_REGEX = "releases/tag/v(?P\d+(\.\d+)+)" + +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 \ + --no-create-home --shell /bin/false 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 " + +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() { + cd ${S} + ./bootstrap + cd - +} + +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() { + + # deal with systemd unit files + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${S}/instfiles/xrdp.service.in ${D}${systemd_unitdir}/system/xrdp.service + install -m 0644 ${S}/instfiles/xrdp-sesman.service.in ${D}${systemd_unitdir}/system/xrdp-sesman.service + sed -i -e 's,@localstatedir@,${localstatedir},g' ${D}${systemd_unitdir}/system/xrdp.service ${D}${systemd_unitdir}/system/xrdp-sesman.service + 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}/keygen/openssl.conf ${D}${sysconfdir}/xrdp/ + install -m 0644 ${UNPACKDIR}/xrdp.sysconfig ${D}${sysconfdir}/sysconfig/xrdp/ + chown xrdp:xrdp ${D}${sysconfdir}/xrdp +} + +SYSTEMD_SERVICE:${PN} = "xrdp.service xrdp-sesman.service" + +pkg_postinst:${PN}() { + if test -z "$D" + then + if test -x ${bindir}/xrdp-keygen + then + ${bindir}/xrdp-keygen xrdp ${sysconfdir}/xrdp/rsakeys.ini >/dev/null + fi + if test ! -s ${sysconfdir}/xrdp/cert.pem + then + openssl req -x509 -newkey rsa:2048 -sha256 -nodes -days 3652 \ + -keyout ${sysconfdir}/xrdp/key.pem \ + -out ${sysconfdir}/xrdp/cert.pem \ + -config ${sysconfdir}/xrdp/openssl.conf >/dev/null 2>&1 + chmod 400 ${sysconfdir}/xrdp/key.pem + fi + fi +} -- cgit v1.2.3-54-g00ecf