metalefty/xrdp-next
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Bump up to 0.9.7.

Browse Source
This commit is contained in:
Bojan Smojver 2018-07-04 16:38:17 +10:00
parent 02f845c1b8
commit e5ba9c447b
7 changed files with 77 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -9,3 +9,4 @@ xrdp-cvs-03-17-2010.tar.gz
/xrdp-0.9.4.tar.gz
/xrdp-0.9.5.tar.gz
/xrdp-0.9.6.tar.gz
/xrdp-0.9.7.tar.gz

2
sources
View File

@ -1 +1 @@
SHA512 (xrdp-0.9.6.tar.gz) = 6ff3172da8d36e1a43aff426b10dff0bef26c983402f21cac5c29b9831aad6c9c43186cb375b35dd888c037b1d43f09f53cdecdfabb71cff8474100508ab845d
SHA512 (xrdp-0.9.7.tar.gz) = e45b26a930dc6b1149772ea35ebf4b0d0cc84c8bb83c38f42416ae607b40e9a2adf9696800d544208aaf402cfdd2224e5268bf5d5b22df232a489c815ef26643

31
xrdp-0.9.5-sesman.patch
View File

@ -1,31 +0,0 @@
diff -ruN xrdp-0.9.5-v/sesman/sesman.ini xrdp-0.9.5/sesman/sesman.ini
--- xrdp-0.9.5-v/sesman/sesman.ini 2017-12-28 01:30:25.000000000 +1100
+++ xrdp-0.9.5/sesman/sesman.ini 2017-12-30 18:08:03.726887379 +1100
@@ -3,7 +3,7 @@
ListenPort=3350
EnableUserWindowManager=true
UserWindowManager=startwm.sh
-DefaultWindowManager=startwm.sh
+DefaultWindowManager=startwm-bash.sh
[Security]
AllowRootLogin=true
@@ -78,12 +78,12 @@
param=-logfile
param=.xorgxrdp.%s.log
-[X11rdp]
-param=X11rdp
-param=-bs
-param=-nolisten
-param=tcp
-param=-uds
+#[X11rdp]
+#param=X11rdp
+#param=-bs
+#param=-nolisten
+#param=tcp
+#param=-uds
[Xvnc]
param=Xvnc

21
xrdp-0.9.6-scripts-libexec.patch
View File

@ -1,21 +0,0 @@
diff -ruN xrdp-0.9.6-v/sesman/session.c xrdp-0.9.6/sesman/session.c
--- xrdp-0.9.6-v/sesman/session.c 2018-03-26 15:29:21.000000000 +1100
+++ xrdp-0.9.6/sesman/session.c 2018-03-27 10:19:36.421340397 +1100
@@ -575,7 +575,7 @@
}
/* if we're here something happened to g_execlp3
so we try running the default window manager */
- g_sprintf(text, "%s/%s", XRDP_CFG_PATH, g_cfg->default_wm);
+ g_sprintf(text, "%s/%s", "/usr/libexec/xrdp", g_cfg->default_wm);
g_execlp3(text, g_cfg->default_wm, 0);
log_message(LOG_LEVEL_ALWAYS, "error starting default "
@@ -877,7 +877,7 @@
display,
g_cfg->env_names,
g_cfg->env_values);
- g_snprintf(text, 255, "%s/%s", XRDP_CFG_PATH, "reconnectwm.sh");
+ g_snprintf(text, 255, "%s/%s", "/usr/libexec/xrdp", "reconnectwm.sh");
if (g_file_exist(text))
{

37
xrdp-0.9.7-scripts-libexec.patch Normal file
View File

@ -0,0 +1,37 @@
diff -ruN xrdp-0.9.7-v/sesman/config.c xrdp-0.9.7/sesman/config.c
--- xrdp-0.9.7-v/sesman/config.c 2018-06-29 18:06:27.000000000 +1000
+++ xrdp-0.9.7/sesman/config.c 2018-07-04 16:21:43.009286795 +1000
@@ -181,13 +181,13 @@
g_free(cf->default_wm);
cf->default_wm = g_strdup("startwm.sh");
}
- /* if default_wm doesn't begin with '/', it's a relative path to XRDP_CFG_PATH */
+ /* if default_wm doesn't begin with '/', it's a relative path to /usr/libexec/xrdp */
if (cf->default_wm[0] != '/')
{
/* sizeof operator returns string length including null terminator */
- length = sizeof(XRDP_CFG_PATH) + g_strlen(g_cfg->default_wm) + 1; /* '/' */
+ length = sizeof("/usr/libexec/xrdp") + g_strlen(g_cfg->default_wm) + 1; /* '/' */
buf = (char *)g_malloc(length, 0);
- g_sprintf(buf, "%s/%s", XRDP_CFG_PATH, g_cfg->default_wm);
+ g_sprintf(buf, "%s/%s", "/usr/libexec/xrdp", g_cfg->default_wm);
g_free(g_cfg->default_wm);
g_cfg->default_wm = g_strdup(buf);
g_free(buf);
@@ -202,13 +202,13 @@
g_free(cf->reconnect_sh);
cf->reconnect_sh = g_strdup("reconnectwm.sh");
}
- /* if reconnect_sh doesn't begin with '/', it's a relative path to XRDP_CFG_PATH */
+ /* if reconnect_sh doesn't begin with '/', it's a relative path to /usr/libexec/xrdp */
if (cf->reconnect_sh[0] != '/')
{
/* sizeof operator returns string length including null terminator */
- length = sizeof(XRDP_CFG_PATH) + g_strlen(g_cfg->reconnect_sh) + 1; /* '/' */
+ length = sizeof("/usr/libexec/xrdp") + g_strlen(g_cfg->reconnect_sh) + 1; /* '/' */
buf = (char *)g_malloc(length, 0);
- g_sprintf(buf, "%s/%s", XRDP_CFG_PATH, g_cfg->reconnect_sh);
+ g_sprintf(buf, "%s/%s", "/usr/libexec/xrdp", g_cfg->reconnect_sh);
g_free(g_cfg->reconnect_sh);
g_cfg->reconnect_sh = g_strdup(buf);
g_free(buf);

31
xrdp-0.9.7-sesman.patch Normal file
View File

@ -0,0 +1,31 @@
diff -ruN xrdp-0.9.7-v/sesman/sesman.ini xrdp-0.9.7/sesman/sesman.ini
--- xrdp-0.9.7-v/sesman/sesman.ini 2018-06-29 18:18:27.000000000 +1000
+++ xrdp-0.9.7/sesman/sesman.ini 2018-07-04 16:08:24.160560353 +1000
@@ -7,7 +7,7 @@
; Give in relative path to user's home directory
UserWindowManager=startwm.sh
; Give in full path or relative path to /etc/xrdp
-DefaultWindowManager=startwm.sh
+DefaultWindowManager=startwm-bash.sh
; Give in full path or relative path to /etc/xrdp
ReconnectScript=reconnectwm.sh
@@ -84,12 +84,12 @@
param=-logfile
param=.xorgxrdp.%s.log
-[X11rdp]
-param=X11rdp
-param=-bs
-param=-nolisten
-param=tcp
-param=-uds
+#[X11rdp]
+#param=X11rdp
+#param=-bs
+#param=-nolisten
+#param=tcp
+#param=-uds
[Xvnc]
param=Xvnc

11
xrdp.spec
View File

@ -6,8 +6,8 @@
Summary: Open source remote desktop protocol (RDP) server
Name: xrdp
Epoch: 1
Version: 0.9.6
Release: 4%{?dist}
Version: 0.9.7
Release: 1%{?dist}
License: ASL 2.0
Group: Applications/Internet
URL: http://www.xrdp.org/
@ -18,11 +18,11 @@ Source3: xrdp.logrotate
Source4: openssl.conf
Source5: README.Fedora
Source6: xrdp.te
Patch0: xrdp-0.9.5-sesman.patch
Patch0: xrdp-0.9.7-sesman.patch
Patch1: xrdp-0.9.5-xrdp-ini.patch
Patch2: xrdp-0.9.4-service.patch
Patch3: xrdp-0.9.2-setpriv.patch
Patch4: xrdp-0.9.6-scripts-libexec.patch
Patch4: xrdp-0.9.7-scripts-libexec.patch
Patch5: xrdp-0.9.6-script-interpreter.patch
BuildRequires: gcc
@ -264,6 +264,9 @@ fi
%{_datadir}/selinux/*/%{name}.pp
%changelog
* Wed Jul 4 2018 Bojan Smojver <bojan@rexurive.com> - 1:0.9.7-1
- Bump up to 0.9.7
* Mon Apr 23 2018 Bojan Smojver <bojan@rexurive.com> - 1:0.9.6-4
- mark files in /etc/xrdp/pulse as configs
- add null command on postun, so that it is never empty