[packages/xrdp] - up to 0.9.18.1, problem with unresolved symbols
mrozowik
mrozowik at pld-linux.org
Mon Feb 28 12:35:24 CET 2022
commit 39298ec762440c251773fa0c01fbc455b33c5e24
Author: Krzysztof Mrozowicz <mrozowik at pld-linux.org>
Date: Mon Feb 28 11:34:42 2022 +0000
- up to 0.9.18.1, problem with unresolved symbols
config.patch | 78 +++++++++++++++++++++++++++++-----------------------------
openssl3.patch | 8 +++---
quiet.patch | 37 ++++------------------------
xrdp.spec | 9 ++++---
4 files changed, 53 insertions(+), 79 deletions(-)
---
diff --git a/xrdp.spec b/xrdp.spec
index de20497..40306c3 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.14
-Release: 3
+Version: 0.9.18.1
+Release: 0.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: 6066c2d8d2bb0883f14ab2fafb968404
+# Source0-md5: 5cd5817d02e1ad038d2870542f603709
Source1: %{name}.init
Source2: %{name}.pamd
Source3: %{name}.README.PLD
@@ -26,6 +26,7 @@ BuildRequires: lame-libs-devel
BuildRequires: libfuse-devel >= 2.6
BuildRequires: libjpeg-turbo-devel
BuildRequires: libtool
+BuildRequires: nasm
BuildRequires: openssl-devel >= 0.9.8
BuildRequires: opus-devel
BuildRequires: pam-devel
@@ -109,7 +110,7 @@ Statyczne biblioteki xrdp.
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
+#%patch3 -p1
%patch4 -p1
install %{SOURCE3} README.PLD
diff --git a/config.patch b/config.patch
index 15fd951..00fc840 100644
--- a/config.patch
+++ b/config.patch
@@ -1,7 +1,6 @@
-diff -urNp -x '*.orig' xrdp-0.9.14.org/sesman/sesman.ini xrdp-0.9.14/sesman/sesman.ini
---- xrdp-0.9.14.org/sesman/sesman.ini 2020-08-31 08:33:40.000000000 +0200
-+++ xrdp-0.9.14/sesman/sesman.ini 2021-10-03 00:01:41.525736996 +0200
-@@ -12,13 +12,13 @@ DefaultWindowManager=startwm.sh
+--- xrdp-0.9.18.1/sesman/sesman.ini~ 2022-02-07 13:41:18.000000000 +0000
++++ xrdp-0.9.18.1/sesman/sesman.ini 2022-02-22 17:17:33.978363685 +0000
+@@ -12,13 +12,13 @@
ReconnectScript=reconnectwm.sh
[Security]
@@ -19,21 +18,20 @@ diff -urNp -x '*.orig' xrdp-0.9.14.org/sesman/sesman.ini xrdp-0.9.14/sesman/sesm
; When RestrictOutboundClipboard=true clipboard from the
; server is not pushed to the client.
RestrictOutboundClipboard=false
-@@ -64,10 +64,10 @@ IdleTimeLimit=0
- Policy=Default
+@@ -65,10 +65,10 @@
[Logging]
+ ; Note: Log levels can be any of: core, error, warning, info, debug, or trace
-LogFile=xrdp-sesman.log
--LogLevel=DEBUG
+LogFile=/dev/null
-+LogLevel=INFO
- EnableSyslog=1
--SyslogLevel=DEBUG
+ LogLevel=INFO
+ EnableSyslog=true
+-#SyslogLevel=INFO
+SyslogLevel=INFO
-
- ;
- ; Session definitions - startup command-line parameters for each session type
-@@ -92,8 +92,8 @@ param=xrdp/xorg.conf
+ #EnableConsole=false
+ #ConsoleLevel=INFO
+ #EnableProcessId=false
+@@ -102,8 +102,8 @@
param=-noreset
param=-nolisten
param=tcp
@@ -44,10 +42,9 @@ diff -urNp -x '*.orig' xrdp-0.9.14.org/sesman/sesman.ini xrdp-0.9.14/sesman/sesm
[Xvnc]
param=Xvnc
-diff -urNp -x '*.orig' xrdp-0.9.14.org/xrdp/xrdp.ini xrdp-0.9.14/xrdp/xrdp.ini
---- xrdp-0.9.14.org/xrdp/xrdp.ini 2020-08-31 08:33:40.000000000 +0200
-+++ xrdp-0.9.14/xrdp/xrdp.ini 2021-10-03 00:01:41.525736996 +0200
-@@ -4,6 +4,8 @@ ini_version=1
+--- xrdp-0.9.18.1/xrdp/xrdp.ini~ 2022-02-07 13:41:27.000000000 +0000
++++ xrdp-0.9.18.1/xrdp/xrdp.ini 2022-02-22 17:22:28.239696963 +0000
+@@ -4,6 +4,8 @@
; fork a new process for each incoming connection
fork=true
@@ -56,21 +53,20 @@ diff -urNp -x '*.orig' xrdp-0.9.14.org/xrdp/xrdp.ini xrdp-0.9.14/xrdp/xrdp.ini
; ports to listen on, number alone means listen on all interfaces
; 0.0.0.0 or :: if ipv6 is configured
-@@ -143,10 +145,10 @@ ls_btn_cancel_width=85
- ls_btn_cancel_height=30
+@@ -178,10 +180,10 @@
[Logging]
+ ; Note: Log levels can be any of: core, error, warning, info, debug, or trace
-LogFile=xrdp.log
--LogLevel=DEBUG
+LogFile=/dev/null
-+LogLevel=INFO
+ LogLevel=INFO
EnableSyslog=true
--SyslogLevel=DEBUG
+-#SyslogLevel=INFO
+SyslogLevel=INFO
- ; LogLevel and SysLogLevel could by any of: core, error, warning, info or debug
-
- [Channels]
-@@ -178,14 +180,14 @@ tcutils=true
+ #EnableConsole=false
+ #ConsoleLevel=INFO
+ #EnableProcessId=false
+@@ -218,14 +220,14 @@
; 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.
@@ -89,14 +85,14 @@ diff -urNp -x '*.orig' xrdp-0.9.14.org/xrdp/xrdp.ini xrdp-0.9.14/xrdp/xrdp.ini
+#password=ask
+#ip=127.0.0.1
+#port=-1
-+#portcode=20
++#code=20
[Xvnc]
name=Xvnc
-@@ -201,25 +203,25 @@ port=-1
- #disabled_encodings_mask=0
-
-
+@@ -247,13 +249,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
@@ -114,22 +110,26 @@ diff -urNp -x '*.orig' xrdp-0.9.14.org/xrdp/xrdp.ini xrdp-0.9.14/xrdp/xrdp.ini
#pamusername=asksame
#pampassword=asksame
#pamsessionmng=127.0.0.1
- #delay_ms=2000
-
+@@ -262,15 +264,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/openssl3.patch b/openssl3.patch
index 15288c5..6df72d8 100644
--- a/openssl3.patch
+++ b/openssl3.patch
@@ -1,12 +1,12 @@
---- xrdp-0.9.14/configure.ac~ 2020-08-31 08:06:13.000000000 +0200
-+++ xrdp-0.9.14/configure.ac 2021-10-03 00:18:09.863644956 +0200
-@@ -156,9 +156,6 @@
+--- xrdp-0.9.18.1/configure.ac~ 2022-02-07 13:26:33.000000000 +0000
++++ xrdp-0.9.18.1/configure.ac 2022-02-22 17:53:14.649764980 +0000
+@@ -182,9 +182,6 @@
AX_CFLAGS_WARN_ALL
AX_APPEND_COMPILE_FLAGS([-Wwrite-strings])
-AM_COND_IF([LINUX],
- [AX_APPEND_COMPILE_FLAGS([-Werror])]) # bsd has warnings that have not been fixed yet
-
- AM_COND_IF([XRDP_DEBUG],
+ AM_COND_IF([DEVEL_DEBUG],
[AX_APPEND_COMPILE_FLAGS([-g -O0])],
[AX_APPEND_COMPILE_FLAGS([-O2])])
diff --git a/quiet.patch b/quiet.patch
index 949d5e1..487d246 100644
--- a/quiet.patch
+++ b/quiet.patch
@@ -1,33 +1,15 @@
-diff -ur xrdp-0.9.7.orig/common/log.c xrdp-0.9.7/common/log.c
---- xrdp-0.9.7.orig/common/log.c 2018-06-04 15:01:57.000000000 +0000
-+++ xrdp-0.9.7/common/log.c 2018-07-04 15:24:35.592840196 +0000
-@@ -382,11 +382,11 @@
- /* try to create path if not exist */
- g_create_path(lc->log_file);
+--- xrdp-0.9.18.1/xrdp/xrdp.c~ 2022-02-07 07:10:38.000000000 +0000
++++ xrdp-0.9.18.1/xrdp/xrdp.c 2022-02-22 17:35:31.774377966 +0000
+@@ -506,7 +506,7 @@
-- g_printf("logging configuration:\r\n");
-+ /*g_printf("logging configuration:\r\n");
- g_printf("\tLogFile: %s\r\n", lc->log_file);
- g_printf("\tLogLevel: %i\r\n", lc->log_level);
- g_printf("\tEnableSyslog: %i\r\n", lc->enable_syslog);
-- g_printf("\tSyslogLevel: %i\r\n", lc->syslog_level);
-+ g_printf("\tSyslogLevel: %i\r\n", lc->syslog_level);*/
- return LOG_STARTUP_OK;
- }
-
-diff -ur xrdp-0.9.7.orig/xrdp/xrdp.c xrdp-0.9.7/xrdp/xrdp.c
---- xrdp-0.9.7.orig/xrdp/xrdp.c 2018-06-29 08:06:27.000000000 +0000
-+++ xrdp-0.9.7/xrdp/xrdp.c 2018-07-04 15:26:48.163832295 +0000
-@@ -475,7 +475,7 @@
-
- if (startup_params->kill)
+ if (startup_params.kill)
{
- g_writeln("stopping xrdp");
+ /*g_writeln("stopping xrdp");*/
/* read the xrdp.pid file */
fd = -1;
-@@ -493,7 +493,7 @@
+@@ -524,7 +524,7 @@
g_memset(text, 0, 32);
g_file_read(fd, text, 31);
pid = g_atoi(text);
@@ -36,12 +18,3 @@ diff -ur xrdp-0.9.7.orig/xrdp/xrdp.c xrdp-0.9.7/xrdp/xrdp.c
if (pid > 0)
{
-@@ -597,7 +597,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);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xrdp.git/commitdiff/39298ec762440c251773fa0c01fbc455b33c5e24
More information about the pld-cvs-commit
mailing list