From b0d9f242e0102edb3d7e090291be9357df7e17b3 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Fri, 1 Apr 2022 01:34:31 +0200 Subject: [PATCH] - updated to 0.9.19, partial PLD merge --- config.patch | 54 ++++++++++++++++++++++++++++------------------------ linker.patch | 9 +++++++++ quiet.patch | 31 +++++------------------------- xrdp.spec | 13 +++++++++---- 4 files changed, 52 insertions(+), 55 deletions(-) create mode 100644 linker.patch diff --git a/config.patch b/config.patch index 9a8ff29..02c2704 100644 --- a/config.patch +++ b/config.patch @@ -1,6 +1,6 @@ -diff -ur xrdp-0.9.15.orig/sesman/sesman.ini xrdp-0.9.15/sesman/sesman.ini ---- xrdp-0.9.15.orig/sesman/sesman.ini 2020-12-28 15:06:46.000000000 +0100 -+++ xrdp-0.9.15/sesman/sesman.ini 2021-01-04 00:09:55.106416646 +0100 +diff -ur xrdp-0.9.19.orig/sesman/sesman.ini xrdp-0.9.19/sesman/sesman.ini +--- xrdp-0.9.19.orig/sesman/sesman.ini 2022-03-17 07:21:20.000000000 +0100 ++++ xrdp-0.9.19/sesman/sesman.ini 2022-04-01 00:52:52.926266171 +0200 @@ -12,13 +12,13 @@ ReconnectScript=reconnectwm.sh @@ -16,10 +16,10 @@ diff -ur xrdp-0.9.15.orig/sesman/sesman.ini xrdp-0.9.15/sesman/sesman.ini ; if the group TerminalServerUsers is not defined. -AlwaysGroupCheck=false +AlwaysGroupCheck=true - ; When RestrictOutboundClipboard=true clipboard from the + ; When RestrictOutboundClipboard=all clipboard from the ; server is not pushed to the client. - RestrictOutboundClipboard=false -@@ -65,13 +65,13 @@ + ; In addition, you can control text/file/image transfer restrictions +@@ -80,13 +80,13 @@ [Logging] ; Note: Log levels can be any of: core, error, warning, info, debug, or trace @@ -37,8 +37,8 @@ diff -ur xrdp-0.9.15.orig/sesman/sesman.ini xrdp-0.9.15/sesman/sesman.ini +EnableProcessId=false [LoggingPerLogger] - ; Note: per logger configuration is only used in XRDP_DEBUG builds of XRDP. -@@ -101,8 +101,8 @@ + ; Note: per logger configuration is only used if xrdp is built with +@@ -117,8 +117,8 @@ param=-noreset param=-nolisten param=tcp @@ -49,9 +49,9 @@ diff -ur xrdp-0.9.15.orig/sesman/sesman.ini xrdp-0.9.15/sesman/sesman.ini [Xvnc] param=Xvnc -diff -ur xrdp-0.9.15.orig/xrdp/xrdp.ini xrdp-0.9.15/xrdp/xrdp.ini ---- xrdp-0.9.15.orig/xrdp/xrdp.ini 2020-12-28 15:06:46.000000000 +0100 -+++ xrdp-0.9.15/xrdp/xrdp.ini 2021-01-04 00:10:37.448416646 +0100 +diff -ur xrdp-0.9.19.orig/xrdp/xrdp.ini xrdp-0.9.19/xrdp/xrdp.ini +--- xrdp-0.9.19.orig/xrdp/xrdp.ini 2022-03-17 07:16:35.000000000 +0100 ++++ xrdp-0.9.19/xrdp/xrdp.ini 2022-04-01 00:53:37.547367844 +0200 @@ -5,6 +5,9 @@ ; fork a new process for each incoming connection fork=true @@ -62,7 +62,7 @@ diff -ur xrdp-0.9.15.orig/xrdp/xrdp.ini xrdp-0.9.15/xrdp/xrdp.ini ; ports to listen on, number alone means listen on all interfaces ; 0.0.0.0 or :: if ipv6 is configured ; space between multiple occurrences -@@ -151,13 +154,13 @@ +@@ -178,13 +181,13 @@ [Logging] ; Note: Log levels can be any of: core, error, warning, info, debug, or trace @@ -80,8 +80,8 @@ diff -ur xrdp-0.9.15.orig/xrdp/xrdp.ini xrdp-0.9.15/xrdp/xrdp.ini +EnableProcessId=false [LoggingPerLogger] - ; Note: per logger configuration is only used in XRDP_DEBUG builds of XRDP. -@@ -193,14 +196,15 @@ + ; Note: per logger configuration is only used if xrdp is built with +@@ -218,14 +221,15 @@ ; Some session types such as Xorg, X11rdp and Xvnc start a display server. ; Startup command-line parameters for the display server are configured ; in sesman.ini. See and configure also sesman.ini. @@ -105,10 +105,10 @@ diff -ur xrdp-0.9.15.orig/xrdp/xrdp.ini xrdp-0.9.15/xrdp/xrdp.ini [Xvnc] name=Xvnc -@@ -216,25 +220,25 @@ - #disabled_encodings_mask=0 - - +@@ -247,13 +251,13 @@ + ; Generic VNC Proxy + ; Tailor this to specific hosts and VNC instances by specifying an ip + ; and port and setting a suitable name. -[vnc-any] -name=vnc-any -lib=libvnc.so @@ -126,22 +126,26 @@ diff -ur xrdp-0.9.15.orig/xrdp/xrdp.ini xrdp-0.9.15/xrdp/xrdp.ini #pamusername=asksame #pampassword=asksame #pamsessionmng=127.0.0.1 - #delay_ms=2000 - +@@ -262,15 +266,15 @@ + ; Generic RDP proxy using NeutrinoRDP + ; Tailor this to specific hosts by specifying an ip and port and setting + ; a suitable name. -[neutrinordp-any] -name=neutrinordp-any ++#[neutrinordp-any] ++#name=neutrinordp-any + ; To use this section, you should build xrdp with configure option + ; --enable-neutrinordp. -lib=libxrdpneutrinordp.so -ip=ask -port=ask3389 -username=ask -password=ask -+#[neutrinordp-any] -+#name=neutrinordp-any +#lib=libxrdpneutrinordp.so +#ip=ask +#port=ask3389 +#username=ask +#password=ask - - ; You can override the common channel settings for each session type - #channel.rdpdr=true + ; Uncomment the following lines to enable PAM authentication for proxy + ; connections. + #pamusername=ask diff --git a/linker.patch b/linker.patch new file mode 100644 index 0000000..5811c67 --- /dev/null +++ b/linker.patch @@ -0,0 +1,9 @@ +--- xrdp-0.9.19/xrdpapi/Makefile.am~ 2020-06-26 11:13:58.000000000 +0000 ++++ xrdp-0.9.19/xrdpapi/Makefile.am 2022-03-22 05:56:04.471233246 +0000 +@@ -13,3 +13,6 @@ + libxrdpapi_la_SOURCES = \ + xrdpapi.c \ + xrdpapi.h ++ ++libxrdpapi_la_LIBADD = \ ++ $(top_builddir)/common/libcommon.la diff --git a/quiet.patch b/quiet.patch index 185ad9f..2dd9222 100644 --- a/quiet.patch +++ b/quiet.patch @@ -1,19 +1,7 @@ -diff -ur xrdp-0.9.15.orig/common/log.c xrdp-0.9.15/common/log.c ---- xrdp-0.9.15.orig/common/log.c 2020-12-28 15:03:43.000000000 +0100 -+++ xrdp-0.9.15/common/log.c 2021-01-04 00:24:03.750416646 +0100 -@@ -304,7 +304,7 @@ - lc->console_level = LOG_LEVEL_INFO; - lc->enable_syslog = 0; - lc->syslog_level = LOG_LEVEL_INFO; -- lc->dump_on_start = 1; -+ lc->dump_on_start = 0; - lc->enable_pid = 0; - - g_snprintf(section_name, 511, "%s%s", section_prefix, SESMAN_CFG_LOGGING); -diff -ur xrdp-0.9.15.orig/xrdp/xrdp.c xrdp-0.9.15/xrdp/xrdp.c ---- xrdp-0.9.15.orig/xrdp/xrdp.c 2020-12-28 15:03:43.000000000 +0100 -+++ xrdp-0.9.15/xrdp/xrdp.c 2021-01-04 00:12:20.438416646 +0100 -@@ -503,7 +503,7 @@ +diff -ur xrdp-0.9.19.orig/xrdp/xrdp.c xrdp-0.9.19/xrdp/xrdp.c +--- xrdp-0.9.19.orig/xrdp/xrdp.c 2022-03-17 07:19:24.000000000 +0100 ++++ xrdp-0.9.19/xrdp/xrdp.c 2022-04-01 00:54:41.104512664 +0200 +@@ -504,7 +504,7 @@ if (startup_params.kill) { @@ -22,7 +10,7 @@ diff -ur xrdp-0.9.15.orig/xrdp/xrdp.c xrdp-0.9.15/xrdp/xrdp.c /* read the xrdp.pid file */ fd = -1; -@@ -521,7 +521,7 @@ +@@ -522,7 +522,7 @@ g_memset(text, 0, 32); g_file_read(fd, text, 31); pid = g_atoi(text); @@ -31,12 +19,3 @@ diff -ur xrdp-0.9.15.orig/xrdp/xrdp.c xrdp-0.9.15/xrdp/xrdp.c if (pid > 0) { -@@ -626,7 +626,7 @@ - - if (0 != pid) - { -- g_writeln("daemon process %d started ok", pid); -+ /* g_writeln("daemon process %d started ok", pid); */ - /* exit, this is the main process */ - g_deinit(); - g_exit(0); diff --git a/xrdp.spec b/xrdp.spec index a1f54d9..1dcdae5 100644 --- a/xrdp.spec +++ b/xrdp.spec @@ -1,13 +1,13 @@ Summary: Remote desktop server Summary(pl.UTF-8): Serwer remote desktop Name: xrdp -Version: 0.9.15 +Version: 0.9.19 Release: 1 License: Apache v2.0 Group: X11/Applications/Networking #Source0Download: https://github.com/neutrinolabs/xrdp/releases Source0: https://github.com/neutrinolabs/xrdp/releases/download/v%{version}/%{name}-%{version}.tar.gz -# Source0-md5: e5396685a0b07900975c9a7e9b8dd6dc +# Source0-md5: 2e60a2e874f95723a4cdd0b466bbe7e4 Source1: %{name}.init Source2: %{name}.pamd Source3: %{name}.README.TLD @@ -16,6 +16,7 @@ Source5: startwm.sh Patch0: config.patch Patch1: quiet.patch Patch2: x32.patch +Patch3: linker.patch URL: http://xrdp.org/ BuildRequires: autoconf >= 2.65 BuildRequires: automake >= 1:1.7.2 @@ -104,6 +105,7 @@ Statyczne biblioteki xrdp. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 install %{SOURCE3} README.TLD install %{SOURCE4} README.TLD.pl @@ -128,7 +130,11 @@ cd .. --enable-opus \ --enable-pam-config=redhat \ --enable-pixman \ - --enable-tjpeg + --enable-tjpeg \ + --enable-painter \ + --enable-ipv6 \ + --enable-vsock \ + --with-imlib2="yes" %{__make} V=1 %install @@ -177,7 +183,6 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc *.txt %doc README.TLD %doc README.TLD.pl %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/sesman -- 2.44.0