added my Recipes
This commit is contained in:
@@ -0,0 +1,33 @@
|
||||
From d705b1d666cb8713d86ea6fb2fc45c424128285a Mon Sep 17 00:00:00 2001
|
||||
From: Lei Maohui <leimaohui@cn.fujitsu.com>
|
||||
Date: Fri, 1 Dec 2017 10:24:50 +0900
|
||||
Subject: [PATCH] Added req_distinguished_name in /etc/xrdp/openssl.conf,
|
||||
otherwise, cert.pem can't be created.
|
||||
|
||||
Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
|
||||
---
|
||||
keygen/openssl.conf | 8 ++++++++
|
||||
1 file changed, 8 insertions(+)
|
||||
|
||||
diff --git a/keygen/openssl.conf b/keygen/openssl.conf
|
||||
index 09db6c2..f077d72 100644
|
||||
--- a/keygen/openssl.conf
|
||||
+++ b/keygen/openssl.conf
|
||||
@@ -4,6 +4,14 @@ distinguished_name = req_distinguished_name
|
||||
x509_extensions = v3_ca
|
||||
|
||||
[req_distinguished_name]
|
||||
+# Certificate subject
|
||||
+#countryName = US
|
||||
+#stateOrProvinceName = CA
|
||||
+#localityName = Sunnyvale
|
||||
+#organizationName = xrdp
|
||||
+#organizationalUnitName =
|
||||
+commonName = XRDP
|
||||
+#emailAddress =
|
||||
|
||||
[v3_ca]
|
||||
# Extensions for a typical CA - PKIX recommendation.
|
||||
--
|
||||
1.8.4.2
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
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 <zhengrq.fnst@cn.fujitsu.com>
|
||||
---
|
||||
xrdp/Makefile.am | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/xrdp/Makefile.am b/xrdp/Makefile.am
|
||||
index a259ef3..d5505b2 100644
|
||||
--- a/xrdp/Makefile.am
|
||||
+++ b/xrdp/Makefile.am
|
||||
@@ -23,7 +23,7 @@ endif
|
||||
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
|
||||
@@ -35,7 +35,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 = \
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
# put some options here
|
||||
|
||||
XRDP_OPTIONS=""
|
||||
SESMAN_OPTIONS=""
|
||||
@@ -0,0 +1,91 @@
|
||||
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"
|
||||
|
||||
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 ${WORKDIR}/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
|
||||
}
|
||||
Reference in New Issue
Block a user