Overview

Request 1796 (revoked)

fix for setup-kolab

Submit package home:tpokorra:branches:Kolab:16 / pykolab to package Kolab:16 / pykolab

pykolab.spec Changed
x
 
1
@@ -2,10 +2,6 @@
2
 #!BuildIgnore:  systemd
3
 %endif
4
 
5
-%if 0%{?fedora} || 0%{?rhel} >= 8
6
-%global py2 2
7
-%endif
8
-
9
 %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
10
 
11
 %if 0%{?suse_version} || 0%{?fedora} > 17 || 0%{?rhel} > 6
12
@@ -33,7 +29,7 @@
13
 
14
 Summary:            Kolab Groupware Solution
15
 Name:               pykolab
16
-Version:            0.8.23
17
+Version:            0.8.4
18
 Release:            1%{?dist}
19
 License:            GPLv3+
20
 Group:              Applications/System
21
@@ -42,7 +38,8 @@
22
 Source0:            pykolab-%{version}.tar.gz
23
 Source1:            pykolab.logrotate
24
 
25
-Patch0001:          0001-Add-footer_sender_exceptions-option-T850567.patch
26
+Patch0001:          pykolab-0.8-patch-out-manticore.patch
27
+Patch0002:          pykolab-0.8.4-patch-freshclam-subprocess.patch
28
 
29
 BuildRoot:          %{_tmppath}/%{name}-%{version}-%{release}-root
30
 BuildArch:          noarch
31
@@ -68,33 +65,44 @@
32
 BuildRequires:      MySQL-python
33
 %endif
34
 
35
-BuildRequires:      python%{?py2}
36
-BuildRequires:      python%{?py2}-augeas
37
-BuildRequires:      python%{?py2}-gnupg
38
-BuildRequires:      python%{?py2}-icalendar
39
-BuildRequires:      python%{?py2}-kolab >= 2.0
40
-BuildRequires:      python%{?py2}-kolabformat
41
-BuildRequires:      python%{?py2}-ldap
42
-BuildRequires:      python%{?py2}-nose
43
-BuildRequires:      python%{?py2}-pep8
44
-BuildRequires:      python%{?py2}-pyasn1
45
-BuildRequires:      python%{?py2}-pyasn1-modules
46
-%if 0%{?rhel} < 8 && 0%{?fedora} < 1
47
+BuildRequires:      python
48
+BuildRequires:      python-augeas
49
+BuildRequires:      python-gnupg
50
+BuildRequires:      python-icalendar
51
+BuildRequires:      python-kolab
52
+BuildRequires:      python-kolabformat
53
+BuildRequires:      python-ldap
54
+BuildRequires:      python-nose
55
+BuildRequires:      python-pep8
56
+BuildRequires:      python-pyasn1
57
+BuildRequires:      python-pyasn1-modules
58
+
59
+%if 0%{?suse_version}
60
+BuildRequires:      python-pytz
61
+%else
62
 BuildRequires:      pytz
63
+%endif
64
+
65
+BuildRequires:      python-sievelib
66
+BuildRequires:      python-sqlalchemy
67
+
68
+%if 0%{?fedora} >= 23
69
+# Fedora 23 has python2-twisted and python-twisted
70
+BuildRequires:      python-twisted
71
 %else
72
-BuildRequires:      python%{?py2}-pytz
73
+BuildRequires:      python-twisted-core
74
+%endif
75
+BuildRequires:      python-tzlocal
76
+
77
+%if 0%{?fedora} >= 21
78
+# Fedora 21 has qca2 and qca, qca2 has been renamed to qca, required by kdelibs
79
+BuildRequires:      qca
80
 %endif
81
-BuildRequires:      python%{?py2}-sievelib
82
-BuildRequires:      python%{?py2}-six
83
-BuildRequires:      python%{?py2}-sqlalchemy
84
-BuildRequires:      python%{?py2}-twisted-core
85
-BuildRequires:      python%{?py2}-tzlocal
86
 
87
 Requires:           kolab-cli = %{version}-%{release}
88
-Requires:           python%{?py2}-ldap >= 2.4
89
-Requires:           python%{?py2}-pyasn1
90
-Requires:           python%{?py2}-pyasn1-modules
91
-Requires:           python%{?py2}-six
92
+Requires:           python-ldap >= 2.4
93
+Requires:           python-pyasn1
94
+Requires:           python-pyasn1-modules
95
 Requires(pre):      /usr/sbin/useradd
96
 Requires(pre):      /usr/sbin/usermod
97
 Requires(pre):      /usr/sbin/groupadd
98
@@ -234,7 +242,11 @@
99
 %prep
100
 %setup -q
101
 
102
+%if 0%{?kolab_enterprise}
103
 %patch0001 -p1
104
+%endif
105
+
106
+%patch0002 -p1
107
 
108
 %build
109
 autoreconf -v || automake --add-missing && autoreconf -v
110
@@ -571,66 +583,6 @@
111
 %attr(0700,%{kolab_user},%{kolab_group}) %dir %{_var}/spool/pykolab/wallace
112
 
113
 %changelog
114
-* Tue Feb  8 2022 Jeroen van Meeuwen <vanmeeuwen@apheleia-it.ch> - 0.8.23-1
115
-- Release of version 0.8.23
116
-
117
-* Fri Feb  4 2022 Jeroen van Meeuwen <vanmeeuwen@apheleia-it.ch> - 0.8.22-1
118
-- Release of version 0.8.22
119
-
120
-* Thu Feb  3 2022 Christoph Erhardt <kolab@sicherha.de> - 0.8.20-2
121
-- Fix TypeError in logger
122
-
123
-* Thu Feb  3 2022 Jeroen van Meeuwen <vanmeeuwen@apheleia-it.ch> - 0.8.20-1
124
-- Release of version 0.8.20
125
-
126
-* Mon Mar  2 2020 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.8.18-1
127
-- Release of version 0.8.18
128
-
129
-* Wed Dec  4 2019 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.8.17-1
130
-- Release of version 0.8.17
131
-- Require python-six
132
-
133
-* Mon Nov 18 2019 Daniel Hoffend <dh@dotlan.net> - 0.8.16-2
134
-- roundcubemail plugin owncload is no longer part of roundcubemail-plugins-kolab
135
-- Fixes T5665: kolabd should now terminate its child processes on exit
136
-- restore system umask after fork (fix T5659)
137
-
138
-* Mon Nov 18 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.8.16-1
139
-- Release of version 0.8.16
140
-
141
-* Tue Sep 24 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.8.15-1
142
-- Release of version 0.8.15
143
-
144
-* Fri Aug 16 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.8.14-1
145
-* Release of version 0.8.14
146
-
147
-* Tue Jun  4 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.8.12-1
148
-- Release of version 0.8.12
149
-
150
-* Tue May 21 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.8.11-1
151
-- Release of version 0.8.11
152
-
153
-* Fri Jul 27 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.8.10-1
154
-- Release of version 0.8.10
155
-
156
-* Thu May 17 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.8.9-1
157
-- Release of version 0.8.9
158
-
159
-* Thu Mar  8 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.8.8-1
160
-- Release of version 0.8.8
161
-
162
-* Tue Dec 13 2016 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.8.7-1
163
-- Release of version 0.8.7
164
-
165
-* Fri Nov 18 2016 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.8.6-1
166
-- Release of version 0.8.6
167
-
168
-* Thu Oct 06 2016 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.8.5-1
169
-- Release of version 0.8.5
170
-
171
-* Wed Oct 05 2016 Timotheus Pokorra <tp@tbits.net> - 0.8.4-3
172
-- Add a patch for T1414: Set LDAP TIMEOUT option only on "immediate" connection
173
-
174
 * Tue Oct 04 2016 Timotheus Pokorra <tp@tbits.net> - 0.8.4-2
175
 - Add a patch that fixes setup-kolab again, error in call of subprocess for freshclam
176
 
177
0001-Add-footer_sender_exceptions-option-T850567.patch Deleted
51
 
1
@@ -1,49 +0,0 @@
2
-From a9f988dad24b43d3af1da6a009cb4d14a22c9204 Mon Sep 17 00:00:00 2001
3
-From: Aleksander Machniak <machniak@kolabsys.com>
4
-Date: Wed, 26 Jul 2023 15:27:42 +0200
5
-Subject: PATCH 1/6 Add footer_sender_exceptions option (T850567)
6
-
7
-Summary: Example: `footer_sender_exceptions = NONE, *.kolab.ch, kolab.ch`
8
-
9
-Reviewers: #pykolab_developers, mollekopf
10
-
11
-Reviewed By: #pykolab_developers, mollekopf
12
-
13
-Subscribers: mollekopf, #pykolab_developers
14
-
15
-Differential Revision: https://git.kolab.org/D4463
16
----
17
- wallace/module_footer.py | 17 +++++++++++++++++
18
- 1 file changed, 17 insertions(+)
19
-
20
-diff --git a/wallace/module_footer.py b/wallace/module_footer.py
21
-index 96e8cf6..75b7029 100644
22
---- a/wallace/module_footer.py
23
-+++ b/wallace/module_footer.py
24
-@@ -114,6 +114,23 @@ def execute(*args, **kw):
25
-     footer_position = conf.get('wallace', 'footer_position')
26
-     footer_html_file = conf.get('wallace', 'footer_html')
27
-     footer_text_file = conf.get('wallace', 'footer_text')
28
-+    sender_exceptions = conf.get('wallace', 'footer_sender_exceptions')
29
-+
30
-+    if sender_exceptions:
31
-+        sender = message.get("X-Kolab-From")
32
-+        log.debug("Checking sender %r" % (sender), level=8)
33
-+
34
-+        if sender:
35
-+            for item in sender_exceptions.split(','):
36
-+                item = item.strip()
37
-+                regex = '@' + item.replace('*', '^@+').replace('.', '\\.') + '$'
38
-+                if item == 'NONE':
39
-+                    regex = '^<>$'
40
-+
41
-+                if re.search(regex, sender):
42
-+                    log.debug("Sender matches exception %s" % (item), level=8)
43
-+                    exec('modules.cb_action_%s(%r, %r)' % ('ACCEPT','footer', filepath))
44
-+                    return
45
- 
46
-     if not os.path.isfile(footer_text_file) and not os.path.isfile(footer_html_file):
47
-         log.warning(_("No contents configured for footer module"))
48
--- 
49
-2.41.0
50
-
51
cyrus-imapd.conf-cert-paths.patch Changed
37
 
1
@@ -1,27 +1,6 @@
2
-diff -ur pykolab-0.8.6.orig/share/templates/guam.sys.config.tpl pykolab-0.8.6/share/templates/guam.sys.config.tpl
3
---- pykolab-0.8.6.orig/share/templates/guam.sys.config.tpl 2016-11-18 12:24:34.000000000 +0100
4
-+++ pykolab-0.8.6/share/templates/guam.sys.config.tpl  2016-11-18 13:35:14.350503922 +0100
5
-@@ -26,7 +26,7 @@
6
-                             },
7
-                             {
8
-                                 tls_config, 
9
--                                    { certfile, "/etc/pki/cyrus-imapd/cyrus-imapd.pem" }
10
-+                                    { certfile, "/etc/ssl/private/cyrus-imapd.pem" }
11
-                                 
12
-                             }
13
-                         
14
-@@ -43,7 +43,7 @@
15
-                             },
16
-                             {
17
-                                 tls_config, 
18
--                                    { certfile, "/etc/pki/cyrus-imapd/cyrus-imapd.pem" }
19
-+                                    { certfile, "/etc/ssl/private/cyrus-imapd.pem" }
20
-                                 
21
-                             }
22
-                         
23
-diff -ur pykolab-0.8.6.orig/share/templates/imapd.conf.tpl pykolab-0.8.6/share/templates/imapd.conf.tpl
24
---- pykolab-0.8.6.orig/share/templates/imapd.conf.tpl  2016-11-18 12:24:34.000000000 +0100
25
-+++ pykolab-0.8.6/share/templates/imapd.conf.tpl   2016-11-18 13:34:48.872221218 +0100
26
+diff -ur pykolab-0.7.12.orig/share/templates/imapd.conf.tpl pykolab-0.7.12/share/templates/imapd.conf.tpl
27
+--- pykolab-0.7.12.orig/share/templates/imapd.conf.tpl 2015-05-13 14:52:54.000000000 +0200
28
++++ pykolab-0.7.12/share/templates/imapd.conf.tpl  2015-05-13 15:35:12.623343019 +0200
29
 @@ -6,8 +6,8 @@
30
  sasl_pwcheck_method: saslauthd
31
  sasl_mech_list: PLAIN LOGIN
32
@@ -33,3 +12,4 @@
33
  # uncomment this if you're operating in a DSCP environment (RFC-4594)
34
  # qosmarking: af13
35
  auth_mech: pts
36
+Only in pykolab-0.7.12/share/templates: imapd.conf.tpl.orig
37
pykolab-0.8-patch-out-manticore.patch Added
13
 
1
@@ -0,0 +1,11 @@
2
+diff --git a/share/templates/roundcubemail/config.inc.php.tpl b/share/templates/roundcubemail/config.inc.php.tpl
3
+index 87afb2d..7bb627e 100644
4
+--- a/share/templates/roundcubemail/config.inc.php.tpl
5
++++ b/share/templates/roundcubemail/config.inc.php.tpl
6
+@@ -246,6 +246,4 @@
7
+                 )
8
+         );
9
+ 
10
+-    \$config'fileapi_manticore' = 'http://' . \$_SERVER'HTTP_HOST' . ':8080';
11
+-
12
+ ?>
13
pykolab-0.8.4-patch-freshclam-subprocess.patch Added
20
 
1
@@ -0,0 +1,18 @@
2
+diff --git a/pykolab/setup/setup_mta.py b/pykolab/setup/setup_mta.py
3
+index 53293cf..0a13fc3 100644
4
+--- a/pykolab/setup/setup_mta.py
5
++++ b/pykolab/setup/setup_mta.py
6
+@@ -472,11 +472,11 @@ result_format = "shared+%%s"
7
+         log.error(_("Could not find a ClamAV update configuration file"))
8
+ 
9
+     if os.path.isfile('/etc/freshclam.conf'):
10
+-        subprocess.call(
11
++        subprocess.call(
12
+                 '/usr/bin/freshclam',
13
+                 '--quiet',
14
+                 '--datadir="/var/lib/clamav"'
15
+-            )
16
++            )
17
+ 
18
+     amavisservice = 'amavisd.service'
19
+     clamavservice = 'clamd@amavisd.service'
20
debian.changelog Changed
159
 
1
@@ -1,157 +1,3 @@
2
-pykolab (0.8.23-0~kolab1) unstable; urgency=low
3
-
4
-  * Release of version 0.8.23
5
-
6
- -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>  Tue,  8 Feb 2022 01:49:00 +0100
7
-
8
-pykolab (0.8.22-0~kolab1) unstable; urgency=low
9
-
10
-  * Release of version 0.8.22
11
-
12
- -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>  Fri,  4 Feb 2022 01:49:00 +0100
13
-
14
-pykolab (0.8.20-0~kolab2) unstable; urgency=low
15
-
16
-  * Fix TypeError in logger
17
-
18
- -- Christoph Erhardt <kolab@sicherha.de>  Thu, 03 Feb 2022 19:07:22 +0100
19
-
20
-pykolab (0.8.20-0~kolab1) unstable; urgency=low
21
-
22
-  * Release of version 0.8.20
23
-
24
- -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>  Thu,  3 Feb 2022 01:49:00 +0100
25
-
26
-pykolab (0.8.19-0~kolab1) unstable; urgency=low
27
-
28
-  * Release of version 0.8.19
29
-
30
- -- Christian Mollekopf <mollekopf@kolabsys.com>  Wed,  30 Sep 2020 01:49:00 +0100
31
-
32
-pykolab (0.8.18-0~kolab2) unstable; urgency=low
33
-
34
-  * Release of version 0.8.18
35
-
36
- -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>  Mon,  2 Mar 2020 01:49:00 +0100
37
-
38
-pykolab (0.8.17-0~kolab2) unstable; urgency=low
39
-
40
-  * Require python-six
41
-
42
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Wed,  4 Dec 2019 01:49:00 +0100
43
-
44
-pykolab (0.8.16-0~kolab1) unstable; urgency=low
45
-
46
-  * Release of version 0.8.16
47
-  * roundcubemail plugin owncload is no longer part of roundcubemail-plugins-kolab
48
-  * Fixes T5665: kolabd should now terminate its child processes on exit
49
-  * restore system umask after fork (fix T5659)
50
-
51
- -- Daniel Hoffend <dh@dotlan.net>  Mon, 18 Nov 2019 16:56:02 +0100
52
-
53
-pykolab (0.8.15-0~kolab2) unstable; urgency=low
54
-
55
-  * Fix init scripts for kolab-saslauthd and wallace
56
-
57
- -- Daniel Hoffend <dh@dotlan.net>  Fri, 15 Nov 2019 01:35:13 +0100
58
-
59
-pykolab (0.8.15-0~kolab1) unstable; urgency=low
60
-
61
-  * Release of version 0.8.15
62
-
63
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Tue, 24 Sep 2019 01:49:00 +0100
64
-
65
-pykolab (0.8.14-0~kolab2) unstable; urgency=low
66
-
67
-  * Release of version 0.8.14
68
-
69
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Fri, 16 Aug 2019 01:49:00 +0100
70
-
71
-pykolab (0.8.13-0~kolab5) unstable; urgency=low
72
-
73
-  * Require both python-pymysql and python-mysqldb
74
-  * Fix PHP setup on Xenial
75
-  * Fix MySQL setup on Bionic
76
-
77
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Mon, 29 Jul 2019 01:49:00 +0100
78
-
79
-pykolab (0.8.13-0~kolab3) unstable; urgency=low
80
-
81
-  * Release of version 0.8.13
82
-
83
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu, 20 Jun 2019 01:49:00 +0100
84
-
85
-pykolab (0.8.12-0~kolab5) unstable; urgency=low
86
-
87
-  * Release of version 0.8.12
88
-
89
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Tue,  4 Jun 2019 01:49:00 +0100
90
-
91
-pykolab (0.8.11-0~kolab5) unstable; urgency=low
92
-
93
-  * Fix unicode templates for roundcube
94
-
95
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Tue, 21 May 2019 01:49:00 +0100
96
-
97
-pykolab (0.8.11-0~kolab3) unstable; urgency=low
98
-
99
-  * Add hotfix for rejection of all senders (T5363)
100
-
101
- -- Christoph Erhardt <kolab@sicherha.de>  Sun, 19 May 2019 09:54:51 +0200
102
-
103
-pykolab (0.8.11-0~kolab2) unstable; urgency=low
104
-
105
-  * Release of version 0.8.11
106
-
107
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Fri, 17 May 2019 01:49:00 +0100
108
-
109
-pykolab (0.8.10-0~kolab2) unstable; urgency=low
110
-
111
-  * Correct dependencies for Ubuntu 18.04
112
-
113
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Wed,  3 Oct 2018 01:49:00 +0100
114
-
115
-pykolab (0.8.10-0~kolab1) unstable; urgency=low
116
-
117
-  * Upstream release of version 0.8.10
118
-
119
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Fri, 27 Jul 2018 01:49:00 +0100
120
-
121
-pykolab (0.8.9-0~kolab1) unstable; urgency=low
122
-
123
-  * Upstream release of version 0.8.9
124
-
125
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu, 17 May 2018 01:49:00 +0100
126
-
127
-pykolab (0.8.8-0~kolab1) unstable; urgency=low
128
-
129
-  * Upstream release of version 0.8.8
130
-
131
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu,  8 Mar 2018 01:49:00 +0100
132
-
133
-pykolab (0.8.7-0~kolab2) unstable; urgency=low
134
-
135
-  * pykolab requires now python-pymysql because /usr/lib/postfix/kolab_smtp_access_policy needs module pymysql on Ubuntu Xenial
136
-
137
- -- Timotheus Pokorra <tp@tbits.net>  Thu, 25 May 2017 01:49:00 +0100
138
-
139
-pykolab (0.8.7-0~kolab1) unstable; urgency=low
140
-
141
-  * Upstream release of version 0.8.7
142
-
143
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Tue, 13 Dec 2016 01:49:00 +0100
144
-
145
-pykolab (0.8.6-0~kolab1) unstable; urgency=low
146
-
147
-  * Upstream release of version 0.8.6
148
-
149
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Fri, 18 Nov 2016 01:49:00 +0100
150
-
151
-pykolab (0.8.5-0~kolab1) unstable; urgency=low
152
-
153
-  * Upstream release of version 0.8.5
154
-
155
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu,  6 Oct 2016 01:49:00 +0100
156
 
157
 pykolab (0.8.4-0~kolab1) unstable; urgency=low
158
 
159
debian.control Changed
33
 
1
@@ -9,12 +9,13 @@
2
                 gawk,
3
                 gettext,
4
                 intltool,
5
+                libcroco3,
6
                 libexpat1,
7
                 libglib2.0-0,
8
                 libglib2.0-dev,
9
                 libpcre3,
10
                 libssl-dev,
11
-                libunistring2 | libunistring0,
12
+                libunistring0,
13
                 libxml-parser-perl,
14
                 libxml2,
15
                 mime-support,
16
@@ -22,7 +23,6 @@
17
                 python-icalendar,
18
                 python-minimal,
19
                 python-nose,
20
-                python-six,
21
                 python-tzlocal,
22
                 univention-config-dev | bash (>= 1.0)
23
 Standards-Version: 3.9.3
24
@@ -41,8 +41,6 @@
25
             python-ldap,
26
             python-pyasn1,
27
             python-pyasn1-modules,
28
-            python-pymysql,
29
-            python-six,
30
             python-sqlalchemy,
31
             ${misc:Depends},
32
             ${shlibs:Depends},
33
debian.series Changed
4
 
1
@@ -1,1 +1,2 @@
2
 cyrus-imapd.conf-cert-paths.patch -p1
3
+pykolab-0.8.4-patch-freshclam-subprocess.patch -p1
4
debian.tar.gz/kolab-saslauthd.init Changed
9
 
1
@@ -103,7 +103,6 @@
2
          --stop \
3
          --quiet \
4
          --retry=TERM/30/KILL/5 \
5
-         --user $USER \
6
          --startas $DAEMON \
7
          --pidfile $PIDFILE
8
    RETVAL="$?"
9
debian.tar.gz/kolab-server.init Changed
9
 
1
@@ -91,7 +91,6 @@
2
           --retry=TERM/30/KILL/5 \
3
           --user $USER \
4
           --startas $DAEMON \
5
-          --pidfile $PIDFILE \
6
           --name $NAME
7
     RETVAL="$?"
8
      "$RETVAL" = 2  && return 2
9
debian.tar.gz/wallace.init Changed
18
 
1
@@ -89,7 +89,6 @@
2
           --stop \
3
           --quiet \
4
           --retry=TERM/30/KILL/5 \
5
-          --user $USER \
6
           --startas $DAEMON \
7
           --pidfile $PIDFILE \
8
           --name $PROG_NAME
9
@@ -101,7 +100,7 @@
10
     # that waits for the process to drop all resources that could be
11
     # needed by services started subsequently.  A last resort is to
12
     # sleep for some time.
13
-    start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON
14
+    start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --user $USER --exec $DAEMON
15
      "$?" = 2  && return 2
16
     # Many daemons don't delete their pidfiles when they exit.
17
     rm -f $PIDFILE
18
pykolab-0.8.23.tar.gz -> pykolab-0.8.4.tar.gz Changed
pykolab.dsc Changed
42
 
1
@@ -2,8 +2,8 @@
2
 Source: pykolab
3
 Binary: pykolab, kolab-cli, kolab-conf, kolab-saslauthd, kolab-server, kolab-telemetry, kolab-xml, wallace
4
 Architecture: all
5
-Version: 0.8.23-0~kolab1
6
-Maintainer: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>
7
+Version: 0.8.4-0~kolab1
8
+Maintainer: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>
9
 Uploaders: Paul Klos <kolab@klos2day.nl>
10
 Homepage: http://www.kolab.org
11
 Standards-Version: 3.9.3
12
@@ -14,12 +14,13 @@
13
                 gawk,
14
                 gettext,
15
                 intltool,
16
+                libcroco3,
17
                 libexpat1,
18
                 libglib2.0-0,
19
                 libglib2.0-dev,
20
                 libpcre3,
21
                 libssl-dev,
22
-                libunistring2 | libunistring0,
23
+                libunistring0,
24
                 libxml-parser-perl,
25
                 libxml2,
26
                 mime-support,
27
@@ -27,7 +28,6 @@
28
                 python-icalendar,
29
                 python-minimal,
30
                 python-nose,
31
-                python-six,
32
                 python-tzlocal,
33
                 univention-config-dev | bash (>= 1.0)
34
 Package-List:
35
@@ -40,5 +40,5 @@
36
  pykolab deb python optional
37
  wallace deb python optional
38
 Files:
39
- 00000000000000000000000000000000 0 pykolab-0.8.23.tar.gz
40
+ 00000000000000000000000000000000 0 pykolab-0.8.4.tar.gz
41
  00000000000000000000000000000000 0 debian.tar.gz
42
Refresh

No build results available

Refresh
Request History
Timotheus Pokorra (TBits)'s avatar

tpokorra created request over 8 years ago

fix for setup-kolab


Jeroen van Meeuwen's avatar

vanmeeuwen declined request over 8 years ago

No longer needed.


Jeroen van Meeuwen's avatar

vanmeeuwen declined review over 8 years ago

No longer needed.


Timotheus Pokorra (TBits)'s avatar

tpokorra revoked request about 8 years ago

thanks for upgrading pykolab to 0.8.5