Bump up to 0.9.2.

This commit is contained in:
Bojan Smojver 2017-03-31 11:37:08 +11:00
parent 84a28878e6
commit 19dd11b67f
4 changed files with 49 additions and 57 deletions

View File

@ -1,15 +0,0 @@
diff --git a/libxrdp/xrdp_rdp.c b/libxrdp/xrdp_rdp.c
index dd6e6d3..219c026 100644
--- a/libxrdp/xrdp_rdp.c
+++ b/libxrdp/xrdp_rdp.c
@@ -782,9 +782,9 @@ xrdp_rdp_send_data_update_sync(struct xrdp_rdp *self)
return 1;
}
out_uint16_le(s, RDP_UPDATE_SYNCHRONIZE);
+ out_uint16_le(s, 0); /* pad */
}
- out_uint16_le(s, 0); /* pad */
s_mark_end(s);
if (self->client_info.use_fast_path & 1) /* fastpath output supported */

View File

@ -2,10 +2,10 @@ diff -ur xrdp-0.9.1/instfiles/xrdp.service xrdp-0.9.1.service/instfiles/xrdp.ser
--- xrdp-0.9.1/instfiles/xrdp.service 2016-12-22 09:02:47.000000000 -0800 --- xrdp-0.9.1/instfiles/xrdp.service 2016-12-22 09:02:47.000000000 -0800
+++ xrdp-0.9.1.service/instfiles/xrdp.service 2017-01-19 23:35:06.000000000 -0800 +++ xrdp-0.9.1.service/instfiles/xrdp.service 2017-01-19 23:35:06.000000000 -0800
@@ -1,15 +1,11 @@ @@ -1,15 +1,11 @@
[Unit]
Description=xrdp daemon Description=xrdp daemon
Documentation=man:xrdp(8) man:xrdp.ini(5)
Requires=xrdp-sesman.service Requires=xrdp-sesman.service
-After=syslog.target network.target xrdp-sesman.service -After=network.target xrdp-sesman.service
+After=xrdp-sesman.service +After=xrdp-sesman.service
[Service] [Service]
@ -23,15 +23,14 @@ diff -ur xrdp-0.9.1/instfiles/xrdp.service xrdp-0.9.1.service/instfiles/xrdp.ser
diff -ur xrdp-0.9.1/instfiles/xrdp-sesman.service xrdp-0.9.1.service/instfiles/xrdp-sesman.service diff -ur xrdp-0.9.1/instfiles/xrdp-sesman.service xrdp-0.9.1.service/instfiles/xrdp-sesman.service
--- xrdp-0.9.1/instfiles/xrdp-sesman.service 2016-12-22 09:02:47.000000000 -0800 --- xrdp-0.9.1/instfiles/xrdp-sesman.service 2016-12-22 09:02:47.000000000 -0800
+++ xrdp-0.9.1.service/instfiles/xrdp-sesman.service 2017-01-22 11:39:23.000000000 -0800 +++ xrdp-0.9.1.service/instfiles/xrdp-sesman.service 2017-01-22 11:39:23.000000000 -0800
@@ -1,16 +1,13 @@ @@ -2,16 +2,13 @@
[Unit]
Description=xrdp session manager Description=xrdp session manager
-After=syslog.target network.target Documentation=man:xrdp-sesman(8) man:sesman.ini(5)
-After=network.target
+Wants=network-online.target nss-lookup.target nss-user-lookup.target +Wants=network-online.target nss-lookup.target nss-user-lookup.target
+After=network-online.target nss-lookup.target nss-user-lookup.target +After=network-online.target nss-lookup.target nss-user-lookup.target
StopWhenUnneeded=true StopWhenUnneeded=true
-BindTo=xrdp.service BindsTo=xrdp.service
+BindsTo=xrdp.service
[Service] [Service]
-Type=forking -Type=forking

View File

@ -1,11 +1,11 @@
--- xrdp-0.9.1/xrdp/xrdp.ini.orig 2016-12-23 04:02:47.000000000 +1100 --- xrdp-0.9.2/xrdp/xrdp.ini.orig 2017-03-30 17:18:55.000000000 +1100
+++ xrdp-0.9.1/xrdp/xrdp.ini 2017-03-14 15:31:47.212193727 +1100 +++ xrdp-0.9.2/xrdp/xrdp.ini 2017-03-31 10:19:59.977547714 +1100
@@ -147,15 +147,15 @@ @@ -148,72 +148,72 @@
; Session types ; Session types
; ;
-[X11rdp] -[Xorg]
-name=X11rdp -name=Xorg
-lib=libxup.so -lib=libxup.so
+[Xvnc] +[Xvnc]
+name=Xvnc +name=Xvnc
@ -14,16 +14,22 @@
password=ask password=ask
ip=127.0.0.1 ip=127.0.0.1
port=-1 port=-1
-xserverbpp=24 -code=20
-code=10
+#xserverbpp=24 +#xserverbpp=24
+#delay_ms=2000 +#delay_ms=2000
[Xorg] -[X11rdp]
name=Xorg -name=X11rdp
@@ -166,59 +166,53 @@ +[Xorg]
+name=Xorg
lib=libxup.so
username=ask
password=ask
ip=127.0.0.1
port=-1 port=-1
code=20 -xserverbpp=24
-code=10
+code=20
-[Xvnc] -[Xvnc]
-name=Xvnc -name=Xvnc
@ -41,8 +47,7 @@
+#port=-1 +#port=-1
#xserverbpp=24 #xserverbpp=24
-#delay_ms=2000 -#delay_ms=2000
+#code=10 -
-[console] -[console]
-name=console -name=console
-lib=libvnc.so -lib=libvnc.so
@ -50,6 +55,16 @@
-port=5900 -port=5900
-username=na -username=na
-password=ask -password=ask
-#delay_ms=2000
+#code=10
-[vnc-any]
-name=vnc-any
-lib=libvnc.so
-ip=ask
-port=ask5900
-username=na
-password=ask
+#[console] +#[console]
+#name=console +#name=console
+#lib=libvnc.so +#lib=libvnc.so
@ -57,15 +72,8 @@
+#port=5900 +#port=5900
+#username=na +#username=na
+#password=ask +#password=ask
#delay_ms=2000 +##delay_ms=2000
+
-[vnc-any]
-name=vnc-any
-lib=libvnc.so
-ip=ask
-port=ask5900
-username=na
-password=ask
+#[vnc-any] +#[vnc-any]
+#name=vnc-any +#name=vnc-any
+#lib=libvnc.so +#lib=libvnc.so
@ -94,12 +102,6 @@
+#password=ask +#password=ask
#delay_ms=2000 #delay_ms=2000
-[rdp-any]
-name=rdp-any
-lib=librdp.so
-ip=ask
-port=ask3389
-
-[neutrinordp-any] -[neutrinordp-any]
-name=neutrinordp-any -name=neutrinordp-any
-lib=libxrdpneutrinordp.so -lib=libxrdpneutrinordp.so

View File

@ -3,8 +3,8 @@
Summary: Open source remote desktop protocol (RDP) server Summary: Open source remote desktop protocol (RDP) server
Name: xrdp Name: xrdp
Epoch: 1 Epoch: 1
Version: 0.9.1 Version: 0.9.2
Release: 8%{?dist} Release: 1%{?dist}
License: ASL 2.0 License: ASL 2.0
Group: Applications/Internet Group: Applications/Internet
URL: http://www.xrdp.org/ URL: http://www.xrdp.org/
@ -14,9 +14,8 @@ Source2: xrdp.sysconfig
Source3: xrdp.logrotate Source3: xrdp.logrotate
Source4: openssl.conf Source4: openssl.conf
Patch0: xrdp-0.9.1-sesman.patch Patch0: xrdp-0.9.1-sesman.patch
Patch1: xrdp-0.9.1-xrdp-ini.patch Patch1: xrdp-0.9.2-xrdp-ini.patch
Patch2: xrdp-0.9.1-service.patch Patch2: xrdp-0.9.2-service.patch
Patch3: xrdp-0.9.1-fastpath.patch
BuildRequires: libX11-devel BuildRequires: libX11-devel
BuildRequires: libXfixes-devel BuildRequires: libXfixes-devel
@ -149,7 +148,6 @@ systemctl try-restart xrdp.service >/dev/null 2>&1 || :
%{_sbindir}/xrdp-chansrv %{_sbindir}/xrdp-chansrv
%{_sbindir}/xrdp %{_sbindir}/xrdp
%{_sbindir}/xrdp-sesman %{_sbindir}/xrdp-sesman
%{_sbindir}/xrdp-sessvc
%{_datadir}/xrdp/ad256.bmp %{_datadir}/xrdp/ad256.bmp
%{_datadir}/xrdp/cursor0.cur %{_datadir}/xrdp/cursor0.cur
%{_datadir}/xrdp/cursor1.cur %{_datadir}/xrdp/cursor1.cur
@ -161,10 +159,11 @@ systemctl try-restart xrdp.service >/dev/null 2>&1 || :
%{_mandir}/man5/* %{_mandir}/man5/*
%{_mandir}/man8/* %{_mandir}/man8/*
%{_mandir}/man1/* %{_mandir}/man1/*
%{_libdir}/lib*.so.*
%exclude %{_libdir}/librfxencode.so
%{_libdir}/xrdp/lib*.so.* %{_libdir}/xrdp/lib*.so.*
%exclude %{_libdir}/xrdp/libcommon.so %exclude %{_libdir}/xrdp/libcommon.so
%{_libdir}/xrdp/libmc.so %{_libdir}/xrdp/libmc.so
%{_libdir}/xrdp/librdp.so
%exclude %{_libdir}/xrdp/libscp.so %exclude %{_libdir}/xrdp/libscp.so
%{_libdir}/xrdp/libvnc.so %{_libdir}/xrdp/libvnc.so
%exclude %{_libdir}/xrdp/libxrdp.so %exclude %{_libdir}/xrdp/libxrdp.so
@ -176,6 +175,8 @@ systemctl try-restart xrdp.service >/dev/null 2>&1 || :
%exclude %{_includedir}/painter.h %exclude %{_includedir}/painter.h
%exclude %{_libdir}/libpainter.* %exclude %{_libdir}/libpainter.*
%exclude %{_libdir}/pkgconfig/libpainter.pc %exclude %{_libdir}/pkgconfig/libpainter.pc
%exclude %{_libdir}/*.a
%exclude %{_libdir}/*.la
%exclude %{_libdir}/xrdp/*.a %exclude %{_libdir}/xrdp/*.a
%exclude %{_libdir}/xrdp/*.la %exclude %{_libdir}/xrdp/*.la
%ghost %{_localstatedir}/log/xrdp.log %ghost %{_localstatedir}/log/xrdp.log
@ -183,9 +184,14 @@ systemctl try-restart xrdp.service >/dev/null 2>&1 || :
%files devel %files devel
%{_includedir}/xrdp* %{_includedir}/xrdp*
%{_includedir}/rfxcodec_*.h
%{_libdir}/pkgconfig/xrdp.pc %{_libdir}/pkgconfig/xrdp.pc
%{_libdir}/pkgconfig/rfxcodec.pc
%changelog %changelog
* Fri Mar 31 2017 Bojan Smojver <bojan@rexurive.com> - 1:0.9.2-1
- Bump up to 0.9.2
* Tue Mar 14 2017 Bojan Smojver <bojan@rexurive.com> - 1:0.9.1-8 * Tue Mar 14 2017 Bojan Smojver <bojan@rexurive.com> - 1:0.9.1-8
- Require tigervnc-server-minimal again, make it default - Require tigervnc-server-minimal again, make it default
- Comment out references to X11rdp - Comment out references to X11rdp