mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-04 14:39:54 +00:00
Code Issues Projects Releases Wiki Activity

xrdp: Upgrade to 0.9.15

Browse Source 
Remove upstreamed patches
Add patch to support ppc64le

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2021-03-12 21:42:37 -08:00
parent 797c3d1e08
commit 7698c5cf51
5 changed files with 24 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-support/xrdp/xrdp/0001-Fixed-compiler-warnings-about-snprintf-truncations.patch
-28
View File
@@ -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
meta-oe/recipes-support/xrdp/xrdp/0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch
+22
View File
@@ -0,0 +1,22 @@
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(-)
--- a/common/arch.h
+++ b/common/arch.h
@@ -84,7 +84,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(__riscv)
#define NO_NEED_ALIGN
#else
meta-oe/recipes-support/xrdp/xrdp/0001-correct-the-location-of-errno.h.patch
-30
View File
@@ -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
meta-oe/recipes-support/xrdp/xrdp/0001-riscv-doesn-t-require-pointers-to-be-aligned.patch
-28
View File
@@ -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
meta-oe/recipes-support/xrdp/xrdp_0.9.14.bb → meta-oe/recipes-support/xrdp/xrdp_0.9.15.bb
+2 -4
View File
@@ -14,11 +14,9 @@ SRC_URI = "git://github.com/neutrinolabs/xrdp.git;branch=devel \
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 \
"
SRCREV = "1469d659dbccd6d042ac44f0afc4e1309788dc9d"
SRCREV = "f24b7b7988140b18202908654db3289659303772"
S = "${WORKDIR}/git"