[xrdp] - fix logrotate to not restart xrdp and drop all open connections

Itamar Reis Peixoto itamarjp at fedoraproject.org
Thu Nov 18 02:36:21 UTC 2010


commit 5a536b60cf847a56419a9b285b80e69b9e004bde
Author: Itamar Reis Peixoto <itamar at ispbrasil.com.br>
Date:   Thu Nov 18 00:36:13 2010 -0200

    - fix logrotate to not restart xrdp and drop all open connections

 sources        |    1 -
 xrdp.logrotate |    4 ++--
 xrdp.spec      |    8 +++++++-
 3 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/xrdp.logrotate b/xrdp.logrotate
index 46a0bdd..3ecd25a 100644
--- a/xrdp.logrotate
+++ b/xrdp.logrotate
@@ -1,9 +1,9 @@
-/var/log/xrdp/sesman.log {
+/var/log/xrdp-sesman.log {
     create 644 root root
     daily
     compress
     missingok
     postrotate
-    /etc/rc.d/init.d/xrdp restart > /dev/null 2>/dev/null || :
+        /bin/kill -HUP `cat  /var/run/xrdp-sesman.pid 2>/dev/null` 2> /dev/null || true
     endscript
 }
diff --git a/xrdp.spec b/xrdp.spec
index 507cccb..3cb7071 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -4,7 +4,7 @@
 Summary:   Open source remote desktop protocol (RDP) server
 Name:      xrdp
 Version:   0.5.0
-Release:   0.11.%{cvs}%{?dist}
+Release:   0.12.%{cvs}%{?dist}
 License:   GPLv2+ with exceptions
 Group:     Applications/Internet
 URL:       http://xrdp.sourceforge.net/
@@ -27,6 +27,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0: xrdp-pam-auth.patch
 Patch1: environmnet.patch
 Patch2: 05-default-keymap.patch
+Patch3: limit-x-to-localhost.patch
 
 Source1: xrdp.init
 Source2: xrdp.sysconfig
@@ -64,6 +65,8 @@ terminal server / remote desktop clients.
 %patch1 -p2
 #fix keymap
 %patch2 -p1
+%patch3 -p1
+
 
 
 # remove unused modules from xrdp login combobox
@@ -181,6 +184,9 @@ rm -rf %{buildroot}
 %attr(0600,root,root) %verify(not size md5 mtime) %{_sysconfdir}/xrdp/rsakeys.ini
 
 %changelog
+* Thu Nov 18 2010 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-0.12.03172010
+- fix logrotate to not restart xrdp and drop all open connections
+
 * Mon Oct 04 2010 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-0.11.03172010
 - Load a default keymap when current keymap doesnt exist
 


More information about the scm-commits mailing list