Request 843 (accepted)

Overview

Request 843 (accepted)

No description set

Created by dhoffend over 9 years ago
In state accepted
Open review for Admin

Submit pykolab

Submit package Kolab:Development / pykolab to package Kolab:3.4 / pykolab

pykolab.spec Changed

@@ -29,12 +29,14 @@
 Summary:            Kolab Groupware Solution
 Name:               pykolab
 Version:            0.7.9
-Release:            1%{?dist}
+Release:            2%{?dist}
 License:            GPLv3+
 Group:              Applications/System
 URL:                http://kolab.org/
 
 Source0:            http://files.kolab.org/releases/%{name}-%{version}.tar.gz
+Patch0:             fix_wallace_pid_location_centos7.patch
+Patch1:             0001-set-default-kolab_freebusy_server-to-freebusy.patch
 
 BuildRoot:          %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch:          noarch
@@ -200,6 +202,9 @@
 %prep
 %setup -q
 
+%patch0 -p1
+%patch1 -p1
+
 %build
 autoreconf -v || automake --add-missing && autoreconf -v
 %configure
@@ -522,6 +527,12 @@
 %attr(0700,%{kolab_user},%{kolab_group}) %dir %{_var}/spool/pykolab/wallace
 
 %changelog
+* Mon Feb 23 2015 Daniel Hoffend <dh@dotlan.net> - 0.7.9-2
+- set default kolab_freebusy_server to /freebusy
+
+* Mon Feb 23 2015 Timotheus Pokorra (TBits.net) <tp@tbits.net>
+- fix for wallace, pid file location, #4673
+
 * Mon Feb 23 2015 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.7.9-1
 - Release of version 0.7.9, see;

0001-set-default-kolab_freebusy_server-to-freebusy.patch Added

@@ -0,0 +1,24 @@
+From c031071888487b5ab2d3d4501e8583e15f7ed6ce Mon Sep 17 00:00:00 2001
+From: Daniel Hoffend <dh@dotlan.net>
+Date: Tue, 24 Feb 2015 10:41:54 +0100
+Subject: [PATCH] set default kolab_freebusy_server to /freebusy
+
+---
+ share/templates/roundcubemail/libkolab.inc.php.tpl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/share/templates/roundcubemail/libkolab.inc.php.tpl b/share/templates/roundcubemail/libkolab.inc.php.tpl
+index 1e5ff60..cd34d07 100644
+--- a/share/templates/roundcubemail/libkolab.inc.php.tpl
++++ b/share/templates/roundcubemail/libkolab.inc.php.tpl
+@@ -1,6 +1,6 @@
+ <?php
+ 
+-    \$config['kolab_freebusy_server'] = 'http://' . \$_SERVER["HTTP_HOST"] . '/freebusy';
++    \$config['kolab_freebusy_server'] = '/freebusy';
+ 
+     if (file_exists(RCUBE_CONFIG_DIR . '/' . \$_SERVER["HTTP_HOST"] . '/' . basename(__FILE__))) {
+         include_once(RCUBE_CONFIG_DIR . '/' . \$_SERVER["HTTP_HOST"] . '/' . basename(__FILE__));
+-- 
+1.9.1
+

fix_wallace_pid_location_centos7.patch Added

@@ -0,0 +1,40 @@
+From 2560d642b84828e6feba4d934b3b7f8e589d141a Mon Sep 17 00:00:00 2001
+From: Timotheus Pokorra <tp@tbits.net>
+Date: Mon, 23 Feb 2015 07:31:21 +0100
+Subject: [PATCH] CentOS7 systemd: use /run/wallaced as location for the pid file (#4673)
+ instead of a mix of /var/run/wallaced and /run/wallaced
+
+---
+ wallace/wallace.systemd         |    4 ++--
+ wallace/wallace.tmpfiles.d.conf |    2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/wallace/wallace.systemd b/wallace/wallace.systemd
+index 38a6604..c033269 100644
+--- a/wallace/wallace.systemd
++++ b/wallace/wallace.systemd
+@@ -4,11 +4,11 @@ After=syslog.target network.target
+ 
+ [Service]
+ Type=forking
+-PIDFile=/var/run/wallaced/wallaced.pid
++PIDFile=/run/wallaced/wallaced.pid
+ User=kolab
+ Group=kolab
+ EnvironmentFile=/etc/sysconfig/wallace
+-ExecStart=/usr/sbin/wallaced $FLAGS
++ExecStart=/usr/sbin/wallaced $FLAGS --pid-file /run/wallaced/wallaced.pid
+ ExecReload=/bin/kill -HUP $MAINPID
+ ExecStop=/bin/kill -TERM $MAINPID
+ 
+diff --git a/wallace/wallace.tmpfiles.d.conf b/wallace/wallace.tmpfiles.d.conf
+index 7dd659a..b072311 100644
+--- a/wallace/wallace.tmpfiles.d.conf
++++ b/wallace/wallace.tmpfiles.d.conf
+@@ -1,2 +1,2 @@
+-d /var/run/wallaced   750   kolab kolab
++d /run/wallaced   750   kolab kolab
+ 
+-- 
+1.7.1
+

debian.changelog Changed

debian.series Changed

pykolab.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 843 0

Request History

dhoffend created request over 9 years ago

vanmeeuwen accepted review over 9 years ago

timotheus accepted request over 9 years ago

looks good