Patches updated with devtool Changelog: https://github.com/neutrinolabs/xrdp/releases/tag/v0.9.20
Signed-off-by: Jason Schonberg <[email protected]> --- ..._distinguished_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 +++------ .../xrdp/0001-mark-count-with-unused-attribute.patch | 9 +++------ .../xrdp/{xrdp_0.9.19.bb => xrdp_0.9.20.bb} | 2 +- 5 files changed, 15 insertions(+), 24 deletions(-) rename meta-oe/recipes-support/xrdp/{xrdp_0.9.19.bb => xrdp_0.9.20.bb} (97%) 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 05803266c..926ad93bb 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 <[email protected]> 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 <[email protected]> @@ -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 e8b4ffa6b..1bb84001f 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 <[email protected]> +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 ea3eb11f0..01449e2a5 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 <[email protected]> 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 <[email protected]> 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 77a394d55..2559ab7b3 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 <[email protected]> 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 <[email protected]> 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.20.bb similarity index 97% rename from meta-oe/recipes-support/xrdp/xrdp_0.9.19.bb rename to meta-oe/recipes-support/xrdp/xrdp_0.9.20.bb index 7c85697d4..a60c125d0 100644 --- a/meta-oe/recipes-support/xrdp/xrdp_0.9.19.bb +++ b/meta-oe/recipes-support/xrdp/xrdp_0.9.20.bb @@ -18,7 +18,7 @@ SRC_URI = "https://github.com/neutrinolabs/${BPN}/releases/download/v${PV}/${BPN file://0001-mark-count-with-unused-attribute.patch \ " -SRC_URI[sha256sum] = "94017d30e475c6d7a24f651e16791551862ae46f82d8de62385e63393f5f93d0" +SRC_URI[sha256sum] = "db693401da95b71b4d4e4c99aeb569a546dbdbde343f6d3302b0c47653277abb" UPSTREAM_CHECK_URI = "https://github.com/neutrinolabs/xrdp/releases"; UPSTREAM_CHECK_REGEX = "releases/tag/v(?P<pver>\d+(\.\d+)+)" -- 2.43.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#114933): https://lists.openembedded.org/g/openembedded-devel/message/114933 Mute This Topic: https://lists.openembedded.org/mt/110673350/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
