diff --git a/xrdp-0.9.0git.1401423964.tar.xz b/xrdp-0.9.0git.1401423964.tar.xz deleted file mode 100644 index 5f4761a..0000000 --- a/xrdp-0.9.0git.1401423964.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:28b43f605906b994c1ac4e7d499afbd3a0990c039017a4f4141c210a743371e3 -size 1682816 diff --git a/xrdp-0.9.0git.1420692256.tar.xz b/xrdp-0.9.0git.1420692256.tar.xz new file mode 100644 index 0000000..9e08311 --- /dev/null +++ b/xrdp-0.9.0git.1420692256.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:41ac83d15bdfc4fbd8526302369278876b7fb025b9d2c96f780de44ee434ef24 +size 1498600 diff --git a/xrdp-default-config.patch b/xrdp-default-config.patch new file mode 100644 index 0000000..7677b67 --- /dev/null +++ b/xrdp-default-config.patch @@ -0,0 +1,160 @@ +diff -ur a/instfiles/xrdp.service b/instfiles/xrdp.service +--- a/instfiles/xrdp.service 2015-10-03 19:58:45.000000000 +0530 ++++ b/instfiles/xrdp.service 2015-10-03 20:03:22.000000000 +0530 +@@ -1,14 +1,13 @@ + [Unit] + Description=xrdp daemon +-Requires=xrdp-sesman.service +-After=syslog.target network.target xrdp-sesman.service ++After=syslog.target network.target + + [Service] + Type=forking + PIDFile=/var/run/xrdp.pid + EnvironmentFile=/etc/sysconfig/xrdp +-ExecStart=/usr/sbin/xrdp $XRDP_OPTIONS --nodaemon +-ExecStop=/usr/sbin/xrdp $XRDP_OPTIONS --kill ++ExecStart=/etc/xrdp/xrdp.sh start ++ExecStop=/etc/xrdp/xrdp.sh stop + + [Install] + WantedBy=multi-user.target +diff -ur a/instfiles/xrdp.sh b/instfiles/xrdp.sh +--- a/instfiles/xrdp.sh 2015-10-03 19:58:45.000000000 +0530 ++++ b/instfiles/xrdp.sh 2015-10-03 19:59:17.000000000 +0530 +@@ -17,8 +17,8 @@ + # Description: starts xrdp + ### END INIT INFO + +-SBINDIR=/usr/local/sbin +-LOG=/dev/null ++SBINDIR=/usr/sbin ++LOG=/var/log/xrdp.log + CFGDIR=/etc/xrdp + + if ! test -x $SBINDIR/xrdp +diff -ur a/sesman/sesman.ini b/sesman/sesman.ini +--- a/sesman/sesman.ini 2015-10-03 19:58:45.000000000 +0530 ++++ b/sesman/sesman.ini 2015-10-03 19:59:17.000000000 +0530 +@@ -58,16 +58,9 @@ + + [Logging] + LogFile=xrdp-sesman.log +-LogLevel=DEBUG +-EnableSyslog=1 +-SyslogLevel=DEBUG +- +-[X11rdp] +-param1=-bs +-param2=-ac +-param3=-nolisten +-param4=tcp +-param5=-uds ++LogLevel=ERROR ++EnableSyslog=0 ++SyslogLevel=ERROR + + [Xvnc] + param1=-bs +diff -ur a/xrdp/xrdp.ini b/xrdp/xrdp.ini +--- a/xrdp/xrdp.ini 2015-10-03 19:58:45.000000000 +0530 ++++ b/xrdp/xrdp.ini 2015-10-03 19:59:17.000000000 +0530 +@@ -70,7 +70,8 @@ + #ls_title=My Login Title + + # top level window background color in RGB format +-ls_top_window_bg_color=009cb5 ++#ls_top_window_bg_color=009cb5 ++ls_top_window_bg_color=000000 + + # width and height of login screen + ls_width=350 +@@ -84,7 +85,7 @@ + + # logo + # full path to bmp-file or file in shared folder +-ls_logo_filename= ++ls_logo_filename=/usr/share/xrdp/openSUSE.bmp + ls_logo_x_pos=55 + ls_logo_y_pos=50 + +@@ -113,9 +114,9 @@ + + [Logging] + LogFile=xrdp.log +-LogLevel=DEBUG +-EnableSyslog=1 +-SyslogLevel=DEBUG ++LogLevel=ERROR ++EnableSyslog=0 ++SyslogLevel=ERROR + # LogLevel and SysLogLevel could by any of: core, error, warning, info or debug + + [channels] +@@ -140,16 +141,6 @@ + # chansrvport=/tmp/.xrdp/xrdp_chansrv_socket_7210 + + [xrdp1] +-name=sesman-X11rdp +-lib=libxup.so +-username=ask +-password=ask +-ip=127.0.0.1 +-port=-1 +-xserverbpp=24 +-code=10 +- +-[xrdp2] + name=sesman-Xvnc + lib=libvnc.so + username=ask +@@ -158,7 +149,7 @@ + port=-1 + #delay_ms=2000 + +-[xrdp3] ++[xrdp2] + name=console + lib=libvnc.so + ip=127.0.0.1 +@@ -167,40 +158,6 @@ + password=ask + #delay_ms=2000 + +-[xrdp4] +-name=vnc-any +-lib=libvnc.so +-ip=ask +-port=ask5900 +-username=na +-password=ask +-#pamusername=asksame +-#pampassword=asksame +-#pamsessionmng=127.0.0.1 +-#delay_ms=2000 +- +-[xrdp5] +-name=sesman-any +-lib=libvnc.so +-ip=ask +-port=-1 +-username=ask +-password=ask +-#delay_ms=2000 +- +-[xrdp6] +-name=rdp-any +-lib=librdp.so +-ip=ask +-port=ask3389 +- +-[xrdp7] +-name=neutrinordp-any +-lib=libxrdpneutrinordp.so +-ip=ask +-port=ask3389 +-username=ask +-password=ask + + [Session manager] + name=Session manager diff --git a/xrdp-get-it-working.patch b/xrdp-get-it-working.patch deleted file mode 100644 index 7bcc33c..0000000 --- a/xrdp-get-it-working.patch +++ /dev/null @@ -1,129 +0,0 @@ -diff -ur a/instfiles/pam.d/xrdp-sesman b/instfiles/pam.d/xrdp-sesman ---- a/instfiles/pam.d/xrdp-sesman 2014-06-09 18:53:00.000000000 +0530 -+++ b/instfiles/pam.d/xrdp-sesman 2014-06-09 18:53:26.000000000 +0530 -@@ -1,5 +1,6 @@ - #%PAM-1.0 --@include common-auth --@include common-account --@include common-session --@include common-password -+auth include common-auth -+account include common-account -+password include common-password -+session required pam_loginuid.so -+session include common-session -diff -ur a/sesman/sesman.ini b/sesman/sesman.ini ---- a/sesman/sesman.ini 2014-06-09 18:53:00.000000000 +0530 -+++ b/sesman/sesman.ini 2014-06-09 18:53:26.000000000 +0530 -@@ -28,16 +28,9 @@ - - [Logging] - LogFile=xrdp-sesman.log --LogLevel=DEBUG --EnableSyslog=1 --SyslogLevel=DEBUG -- --[X11rdp] --param1=-bs --param2=-ac --param3=-nolisten --param4=tcp --param5=-uds -+LogLevel=ERROR -+EnableSyslog=0 -+SyslogLevel=ERROR - - [Xvnc] - param1=-bs -diff -ur a/xrdp/xrdp.ini b/xrdp/xrdp.ini ---- a/xrdp/xrdp.ini 2014-06-09 18:52:59.000000000 +0530 -+++ b/xrdp/xrdp.ini 2014-06-09 18:56:57.000000000 +0530 -@@ -55,7 +55,8 @@ - # - - # top level window background color in RGB format --ls_top_window_bg_color=009cb5 -+#ls_top_window_bg_color=009cb5 -+ls_top_window_bg_color=000000 - - # width and height of login screen - ls_width=350 -@@ -65,7 +66,7 @@ - ls_bg_color=dedede - - # logo --ls_logo_filename= -+ls_logo_filename=/usr/share/xrdp/openSUSE.bmp - ls_logo_x_pos=55 - ls_logo_y_pos=50 - -@@ -94,9 +95,9 @@ - - [Logging] - LogFile=xrdp.log --LogLevel=DEBUG --EnableSyslog=1 --SyslogLevel=DEBUG -+LogLevel=ERROR -+EnableSyslog=0 -+SyslogLevel=ERROR - # LogLevel and SysLogLevel could by any of: core, error, warning, info or debug - - [channels] -@@ -119,16 +120,6 @@ - # for debugging xrdp, add following line to section xrdp1 - # chansrvport=/tmp/.xrdp/xrdp_chansrv_socket_7210 - --[xrdp1] --name=sesman-X11rdp --lib=libxup.so --username=ask --password=ask --ip=127.0.0.1 --port=-1 --xserverbpp=24 --code=10 -- - [xrdp2] - name=sesman-Xvnc - lib=libvnc.so -@@ -145,39 +136,6 @@ - username=na - password=ask - --[xrdp4] --name=vnc-any --lib=libvnc.so --ip=ask --port=ask5900 --username=na --password=ask --#pamusername=asksame --#pampassword=asksame --#pamsessionmng=127.0.0.1 -- --[xrdp5] --name=sesman-any --lib=libvnc.so --ip=ask --port=-1 --username=ask --password=ask -- --[xrdp6] --name=rdp-any --lib=librdp.so --ip=ask --port=ask3389 -- --[xrdp7] --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 - #channel.rdpsnd=true diff --git a/xrdp-implicit-definitions.patch b/xrdp-implicit-definitions.patch new file mode 100644 index 0000000..21058ab --- /dev/null +++ b/xrdp-implicit-definitions.patch @@ -0,0 +1,11 @@ +diff -ur a/xrdp/xrdp.h b/xrdp/xrdp.h +--- a/xrdp/xrdp.h 2015-10-03 15:43:22.000000000 +0530 ++++ b/xrdp/xrdp.h 2015-10-03 15:45:12.000000000 +0530 +@@ -37,6 +37,7 @@ + #include "file.h" + #include "file_loc.h" + #include "xrdp_client_info.h" ++#include "string.h" + + /* xrdp.c */ + long APP_CC diff --git a/xrdp.changes b/xrdp.changes index dc663ce..76dca60 100644 --- a/xrdp.changes +++ b/xrdp.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Mon Oct 5 08:35:34 UTC 2015 - cyberorg@opensuse.org + +- fix rsakeys generation test + +------------------------------------------------------------------- +Mon Oct 5 05:11:43 UTC 2015 - cyberorg@opensuse.org + +- remove pam patch, using the one provided by the package + +------------------------------------------------------------------- +Sat Oct 3 13:24:19 UTC 2015 - cyberorg@opensuse.org + +- fetch new tarball version 1420692256 +- fixes boo #944739 +- Split patch into more patches with descriptive names +- Add Requires: xorg-x11-Xvnc + ------------------------------------------------------------------- Mon Dec 1 12:01:00 UTC 2014 - rmilasan@suse.com diff --git a/xrdp.spec b/xrdp.spec index ab7cd45..fc8b619 100644 --- a/xrdp.spec +++ b/xrdp.spec @@ -23,7 +23,7 @@ %endif Name: xrdp -Version: 0.9.0git.1401423964 +Version: 0.9.0git.1420692256 Release: 0 Summary: An open source RDP server License: Apache-2.0 @@ -33,8 +33,10 @@ Source0: %{name}-%{version}.tar.xz Source1: sysconfig.%{name} Source2: openSUSE.bmp Source100: %{name}-rpmlintrc +# PATCH-FIX-SUSE -- get rid of implicit-definitions warning +Patch0: %{name}-implicit-definitions.patch # PATCH-FIX-SUSE -- Adjust default settings to openSUSE standards -Patch0: %{name}-get-it-working.patch +Patch1: %{name}-default-config.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: fuse-devel @@ -45,6 +47,7 @@ BuildRequires: pkg-config BuildRequires: libX11-devel BuildRequires: libXfixes-devel BuildRequires: libXrandr-devel +Requires: xorg-x11-Xvnc BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?with_systemd} == 1 @@ -68,6 +71,7 @@ Microsoft's own terminal server / remote desktop clients. cp sesman/sesman.ini sesman/sesman.ini.example cp xrdp/xrdp.ini xrdp/xrdp.ini.example %patch0 -p1 +%patch1 -p1 %build ./bootstrap @@ -97,7 +101,6 @@ cp xrdp/xrdp.ini xrdp/xrdp.ini.example %{__make} install DESTDIR=%{buildroot} %if 0%{?with_systemd} == 1 -rm -r %{buildroot}%{_initrddir} %if 0%{?suse_version} >= 1230 %{__ln_s} %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name} %{__ln_s} %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}-sesman @@ -113,7 +116,7 @@ rm -r %{buildroot}%{_initrddir} install -d %{buildroot}%{_localstatedir}/adm/fillup-templates install %{SOURCE1} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name} install %{SOURCE2} %{buildroot}%{_datadir}/%{name}/ - +install instfiles/pam.d/xrdp-sesman.other %{buildroot}%{_sysconfdir}/pam.d/%{name}-sesman # remove libtool cruft find %{buildroot}%{_libdir}/%{name} -name *.la -delete @@ -143,7 +146,7 @@ find %{buildroot}%{_libdir}/%{name} -name *.la -delete # generate a keypair used to perform authentication to the remote client if [ ! -e %{_sysconfdir}/%{name}/rsakeys.ini ]; then xrdp-keygen xrdp %{_sysconfdir}/%{name}/rsakeys.ini - if [ $? -eq 0 ]; then + if [ $? != 0 ]; then echo "Could not generate rsakeys.ini, please check manually!" fi fi @@ -163,16 +166,12 @@ exit 0 %files %defattr(-, root, root, -) %doc COPYING sesman/sesman.ini.example xrdp/xrdp.ini.example -%config %{_sysconfdir}/default/%{name} %config %{_sysconfdir}/pam.d/%{name}-sesman %dir %{_sysconfdir}/%{name} -%config %{_sysconfdir}/%{name}/km-0407.ini -%config %{_sysconfdir}/%{name}/km-0409.ini -%config %{_sysconfdir}/%{name}/km-040c.ini -%config %{_sysconfdir}/%{name}/km-0410.ini -%config %{_sysconfdir}/%{name}/km-0419.ini -%config %{_sysconfdir}/%{name}/km-041d.ini -%config %{_sysconfdir}/%{name}/km-0816.ini +%dir %{_sysconfdir}/%{name}/pulse +%config %{_sysconfdir}/%{name}/pulse/default.pa +%config %{_sysconfdir}/%{name}/km-*.ini +%config %{_sysconfdir}/%{name}/xrdp_keyboard.ini %ghost %config(noreplace) %{_sysconfdir}/%{name}/rsakeys.ini %config(noreplace) %{_sysconfdir}/%{name}/sesman.ini %config(noreplace) %{_sysconfdir}/%{name}/startwm.sh