Request 1796 (revoked)

pykolab.spec Changed

@@ -2,10 +2,6 @@
 #!BuildIgnore:  systemd
 %endif
 
-%if 0%{?fedora} || 0%{?rhel} >= 8
-%global py2 2
-%endif
-
 %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 %if 0%{?suse_version} || 0%{?fedora} > 17 || 0%{?rhel} > 6
@@ -33,7 +29,7 @@
 
 Summary:            Kolab Groupware Solution
 Name:               pykolab
-Version:            0.8.23
+Version:            0.8.4
 Release:            1%{?dist}
 License:            GPLv3+
 Group:              Applications/System
@@ -42,7 +38,8 @@
 Source0:            pykolab-%{version}.tar.gz
 Source1:            pykolab.logrotate
 
-Patch0001:          0001-Add-footer_sender_exceptions-option-T850567.patch
+Patch0001:          pykolab-0.8-patch-out-manticore.patch
+Patch0002:          pykolab-0.8.4-patch-freshclam-subprocess.patch
 
 BuildRoot:          %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch:          noarch
@@ -68,33 +65,44 @@
 BuildRequires:      MySQL-python
 %endif
 
-BuildRequires:      python%{?py2}
-BuildRequires:      python%{?py2}-augeas
-BuildRequires:      python%{?py2}-gnupg
-BuildRequires:      python%{?py2}-icalendar
-BuildRequires:      python%{?py2}-kolab >= 2.0
-BuildRequires:      python%{?py2}-kolabformat
-BuildRequires:      python%{?py2}-ldap
-BuildRequires:      python%{?py2}-nose
-BuildRequires:      python%{?py2}-pep8
-BuildRequires:      python%{?py2}-pyasn1
-BuildRequires:      python%{?py2}-pyasn1-modules
-%if 0%{?rhel} < 8 && 0%{?fedora} < 1
+BuildRequires:      python
+BuildRequires:      python-augeas
+BuildRequires:      python-gnupg
+BuildRequires:      python-icalendar
+BuildRequires:      python-kolab
+BuildRequires:      python-kolabformat
+BuildRequires:      python-ldap
+BuildRequires:      python-nose
+BuildRequires:      python-pep8
+BuildRequires:      python-pyasn1
+BuildRequires:      python-pyasn1-modules
+
+%if 0%{?suse_version}
+BuildRequires:      python-pytz
+%else
 BuildRequires:      pytz
+%endif
+
+BuildRequires:      python-sievelib
+BuildRequires:      python-sqlalchemy
+
+%if 0%{?fedora} >= 23
+# Fedora 23 has python2-twisted and python-twisted
+BuildRequires:      python-twisted
 %else
-BuildRequires:      python%{?py2}-pytz
+BuildRequires:      python-twisted-core
+%endif
+BuildRequires:      python-tzlocal
+
+%if 0%{?fedora} >= 21
+# Fedora 21 has qca2 and qca, qca2 has been renamed to qca, required by kdelibs
+BuildRequires:      qca
 %endif
-BuildRequires:      python%{?py2}-sievelib
-BuildRequires:      python%{?py2}-six
-BuildRequires:      python%{?py2}-sqlalchemy
-BuildRequires:      python%{?py2}-twisted-core
-BuildRequires:      python%{?py2}-tzlocal
 
 Requires:           kolab-cli = %{version}-%{release}
-Requires:           python%{?py2}-ldap >= 2.4
-Requires:           python%{?py2}-pyasn1
-Requires:           python%{?py2}-pyasn1-modules
-Requires:           python%{?py2}-six
+Requires:           python-ldap >= 2.4
+Requires:           python-pyasn1
+Requires:           python-pyasn1-modules
 Requires(pre):      /usr/sbin/useradd
 Requires(pre):      /usr/sbin/usermod
 Requires(pre):      /usr/sbin/groupadd
@@ -234,7 +242,11 @@
 %prep
 %setup -q
 
+%if 0%{?kolab_enterprise}
 %patch0001 -p1
+%endif
+
+%patch0002 -p1
 
 %build
 autoreconf -v || automake --add-missing && autoreconf -v
@@ -571,66 +583,6 @@
 %attr(0700,%{kolab_user},%{kolab_group}) %dir %{_var}/spool/pykolab/wallace
 
 %changelog
-* Tue Feb  8 2022 Jeroen van Meeuwen <vanmeeuwen@apheleia-it.ch> - 0.8.23-1
-- Release of version 0.8.23
-
-* Fri Feb  4 2022 Jeroen van Meeuwen <vanmeeuwen@apheleia-it.ch> - 0.8.22-1
-- Release of version 0.8.22
-
-* Thu Feb  3 2022 Christoph Erhardt <kolab@sicherha.de> - 0.8.20-2
-- Fix TypeError in logger
-
-* Thu Feb  3 2022 Jeroen van Meeuwen <vanmeeuwen@apheleia-it.ch> - 0.8.20-1
-- Release of version 0.8.20
-
-* Mon Mar  2 2020 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.8.18-1
-- Release of version 0.8.18
-
-* Wed Dec  4 2019 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.8.17-1
-- Release of version 0.8.17
-- Require python-six
-
-* Mon Nov 18 2019 Daniel Hoffend <dh@dotlan.net> - 0.8.16-2
-- roundcubemail plugin owncload is no longer part of roundcubemail-plugins-kolab
-- Fixes T5665: kolabd should now terminate its child processes on exit
-- restore system umask after fork (fix T5659)
-
-* Mon Nov 18 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.8.16-1
-- Release of version 0.8.16
-
-* Tue Sep 24 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.8.15-1
-- Release of version 0.8.15
-
-* Fri Aug 16 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.8.14-1
-* Release of version 0.8.14
-
-* Tue Jun  4 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.8.12-1
-- Release of version 0.8.12
-
-* Tue May 21 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.8.11-1
-- Release of version 0.8.11
-
-* Fri Jul 27 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.8.10-1
-- Release of version 0.8.10
-
-* Thu May 17 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.8.9-1
-- Release of version 0.8.9
-
-* Thu Mar  8 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.8.8-1
-- Release of version 0.8.8
-
-* Tue Dec 13 2016 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.8.7-1
-- Release of version 0.8.7
-
-* Fri Nov 18 2016 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.8.6-1
-- Release of version 0.8.6
-
-* Thu Oct 06 2016 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.8.5-1
-- Release of version 0.8.5
-
-* Wed Oct 05 2016 Timotheus Pokorra <tp@tbits.net> - 0.8.4-3
-- Add a patch for T1414: Set LDAP TIMEOUT option only on "immediate" connection
-
 * Tue Oct 04 2016 Timotheus Pokorra <tp@tbits.net> - 0.8.4-2
 - Add a patch that fixes setup-kolab again, error in call of subprocess for freshclam

0001-Add-footer_sender_exceptions-option-T850567.patch Deleted

@@ -1,49 +0,0 @@
-From a9f988dad24b43d3af1da6a009cb4d14a22c9204 Mon Sep 17 00:00:00 2001
-From: Aleksander Machniak <machniak@kolabsys.com>
-Date: Wed, 26 Jul 2023 15:27:42 +0200
-Subject: PATCH 1/6 Add footer_sender_exceptions option (T850567)
-
-Summary: Example: `footer_sender_exceptions = NONE, *.kolab.ch, kolab.ch`
-
-Reviewers: #pykolab_developers, mollekopf
-
-Reviewed By: #pykolab_developers, mollekopf
-
-Subscribers: mollekopf, #pykolab_developers
-
-Differential Revision: https://git.kolab.org/D4463
----
- wallace/module_footer.py | 17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
-
-diff --git a/wallace/module_footer.py b/wallace/module_footer.py
-index 96e8cf6..75b7029 100644
---- a/wallace/module_footer.py
-+++ b/wallace/module_footer.py
-@@ -114,6 +114,23 @@ def execute(*args, **kw):
-     footer_position = conf.get('wallace', 'footer_position')
-     footer_html_file = conf.get('wallace', 'footer_html')
-     footer_text_file = conf.get('wallace', 'footer_text')
-+    sender_exceptions = conf.get('wallace', 'footer_sender_exceptions')
-+
-+    if sender_exceptions:
-+        sender = message.get("X-Kolab-From")
-+        log.debug("Checking sender %r" % (sender), level=8)
-+
-+        if sender:
-+            for item in sender_exceptions.split(','):
-+                item = item.strip()
-+                regex = '@' + item.replace('*', '^@+').replace('.', '\\.') + '$'
-+                if item == 'NONE':
-+                    regex = '^<>$'
-+
-+                if re.search(regex, sender):
-+                    log.debug("Sender matches exception %s" % (item), level=8)
-+                    exec('modules.cb_action_%s(%r, %r)' % ('ACCEPT','footer', filepath))
-+                    return
- 
-     if not os.path.isfile(footer_text_file) and not os.path.isfile(footer_html_file):
-         log.warning(_("No contents configured for footer module"))
--- 
-2.41.0
-

cyrus-imapd.conf-cert-paths.patch Changed

@@ -1,27 +1,6 @@
-diff -ur pykolab-0.8.6.orig/share/templates/guam.sys.config.tpl pykolab-0.8.6/share/templates/guam.sys.config.tpl
---- pykolab-0.8.6.orig/share/templates/guam.sys.config.tpl	2016-11-18 12:24:34.000000000 +0100
-+++ pykolab-0.8.6/share/templates/guam.sys.config.tpl	2016-11-18 13:35:14.350503922 +0100
-@@ -26,7 +26,7 @@
-                             },
-                             {
-                                 tls_config, 
--                                    { certfile, "/etc/pki/cyrus-imapd/cyrus-imapd.pem" }
-+                                    { certfile, "/etc/ssl/private/cyrus-imapd.pem" }
-                                 
-                             }
-                         
-@@ -43,7 +43,7 @@
-                             },
-                             {
-                                 tls_config, 
--                                    { certfile, "/etc/pki/cyrus-imapd/cyrus-imapd.pem" }
-+                                    { certfile, "/etc/ssl/private/cyrus-imapd.pem" }
-                                 
-                             }
-                         
-diff -ur pykolab-0.8.6.orig/share/templates/imapd.conf.tpl pykolab-0.8.6/share/templates/imapd.conf.tpl
---- pykolab-0.8.6.orig/share/templates/imapd.conf.tpl	2016-11-18 12:24:34.000000000 +0100
-+++ pykolab-0.8.6/share/templates/imapd.conf.tpl	2016-11-18 13:34:48.872221218 +0100
+diff -ur pykolab-0.7.12.orig/share/templates/imapd.conf.tpl pykolab-0.7.12/share/templates/imapd.conf.tpl
+--- pykolab-0.7.12.orig/share/templates/imapd.conf.tpl	2015-05-13 14:52:54.000000000 +0200
++++ pykolab-0.7.12/share/templates/imapd.conf.tpl	2015-05-13 15:35:12.623343019 +0200
 @@ -6,8 +6,8 @@
  sasl_pwcheck_method: saslauthd
  sasl_mech_list: PLAIN LOGIN
@@ -33,3 +12,4 @@
  # uncomment this if you're operating in a DSCP environment (RFC-4594)
  # qosmarking: af13
  auth_mech: pts
+Only in pykolab-0.7.12/share/templates: imapd.conf.tpl.orig

pykolab-0.8-patch-out-manticore.patch Added

pykolab-0.8.4-patch-freshclam-subprocess.patch Added

debian.changelog Changed

@@ -1,157 +1,3 @@
-pykolab (0.8.23-0~kolab1) unstable; urgency=low
-
-  * Release of version 0.8.23
-
- -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>  Tue,  8 Feb 2022 01:49:00 +0100
-
-pykolab (0.8.22-0~kolab1) unstable; urgency=low
-
-  * Release of version 0.8.22
-
- -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>  Fri,  4 Feb 2022 01:49:00 +0100
-
-pykolab (0.8.20-0~kolab2) unstable; urgency=low
-
-  * Fix TypeError in logger
-
- -- Christoph Erhardt <kolab@sicherha.de>  Thu, 03 Feb 2022 19:07:22 +0100
-
-pykolab (0.8.20-0~kolab1) unstable; urgency=low
-
-  * Release of version 0.8.20
-
- -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>  Thu,  3 Feb 2022 01:49:00 +0100
-
-pykolab (0.8.19-0~kolab1) unstable; urgency=low
-
-  * Release of version 0.8.19
-
- -- Christian Mollekopf <mollekopf@kolabsys.com>  Wed,  30 Sep 2020 01:49:00 +0100
-
-pykolab (0.8.18-0~kolab2) unstable; urgency=low
-
-  * Release of version 0.8.18
-
- -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>  Mon,  2 Mar 2020 01:49:00 +0100
-
-pykolab (0.8.17-0~kolab2) unstable; urgency=low
-
-  * Require python-six
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Wed,  4 Dec 2019 01:49:00 +0100
-
-pykolab (0.8.16-0~kolab1) unstable; urgency=low
-
-  * Release of version 0.8.16
-  * roundcubemail plugin owncload is no longer part of roundcubemail-plugins-kolab
-  * Fixes T5665: kolabd should now terminate its child processes on exit
-  * restore system umask after fork (fix T5659)
-
- -- Daniel Hoffend <dh@dotlan.net>  Mon, 18 Nov 2019 16:56:02 +0100
-
-pykolab (0.8.15-0~kolab2) unstable; urgency=low
-
-  * Fix init scripts for kolab-saslauthd and wallace
-
- -- Daniel Hoffend <dh@dotlan.net>  Fri, 15 Nov 2019 01:35:13 +0100
-
-pykolab (0.8.15-0~kolab1) unstable; urgency=low
-
-  * Release of version 0.8.15
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Tue, 24 Sep 2019 01:49:00 +0100
-
-pykolab (0.8.14-0~kolab2) unstable; urgency=low
-
-  * Release of version 0.8.14
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Fri, 16 Aug 2019 01:49:00 +0100
-
-pykolab (0.8.13-0~kolab5) unstable; urgency=low
-
-  * Require both python-pymysql and python-mysqldb
-  * Fix PHP setup on Xenial
-  * Fix MySQL setup on Bionic
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Mon, 29 Jul 2019 01:49:00 +0100
-
-pykolab (0.8.13-0~kolab3) unstable; urgency=low
-
-  * Release of version 0.8.13
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu, 20 Jun 2019 01:49:00 +0100
-
-pykolab (0.8.12-0~kolab5) unstable; urgency=low
-
-  * Release of version 0.8.12
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Tue,  4 Jun 2019 01:49:00 +0100
-
-pykolab (0.8.11-0~kolab5) unstable; urgency=low
-
-  * Fix unicode templates for roundcube
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Tue, 21 May 2019 01:49:00 +0100
-
-pykolab (0.8.11-0~kolab3) unstable; urgency=low
-
-  * Add hotfix for rejection of all senders (T5363)
-
- -- Christoph Erhardt <kolab@sicherha.de>  Sun, 19 May 2019 09:54:51 +0200
-
-pykolab (0.8.11-0~kolab2) unstable; urgency=low
-
-  * Release of version 0.8.11
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Fri, 17 May 2019 01:49:00 +0100
-
-pykolab (0.8.10-0~kolab2) unstable; urgency=low
-
-  * Correct dependencies for Ubuntu 18.04
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Wed,  3 Oct 2018 01:49:00 +0100
-
-pykolab (0.8.10-0~kolab1) unstable; urgency=low
-
-  * Upstream release of version 0.8.10
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Fri, 27 Jul 2018 01:49:00 +0100
-
-pykolab (0.8.9-0~kolab1) unstable; urgency=low
-
-  * Upstream release of version 0.8.9
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu, 17 May 2018 01:49:00 +0100
-
-pykolab (0.8.8-0~kolab1) unstable; urgency=low
-
-  * Upstream release of version 0.8.8
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu,  8 Mar 2018 01:49:00 +0100
-
-pykolab (0.8.7-0~kolab2) unstable; urgency=low
-
-  * pykolab requires now python-pymysql because /usr/lib/postfix/kolab_smtp_access_policy needs module pymysql on Ubuntu Xenial
-
- -- Timotheus Pokorra <tp@tbits.net>  Thu, 25 May 2017 01:49:00 +0100
-
-pykolab (0.8.7-0~kolab1) unstable; urgency=low
-
-  * Upstream release of version 0.8.7
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Tue, 13 Dec 2016 01:49:00 +0100
-
-pykolab (0.8.6-0~kolab1) unstable; urgency=low
-
-  * Upstream release of version 0.8.6
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Fri, 18 Nov 2016 01:49:00 +0100
-
-pykolab (0.8.5-0~kolab1) unstable; urgency=low
-
-  * Upstream release of version 0.8.5
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu,  6 Oct 2016 01:49:00 +0100
 
 pykolab (0.8.4-0~kolab1) unstable; urgency=low

debian.control Changed

debian.series Changed

debian.tar.gz/kolab-saslauthd.init Changed

debian.tar.gz/kolab-server.init Changed

debian.tar.gz/wallace.init Changed

pykolab-0.8.23.tar.gz -> pykolab-0.8.4.tar.gz Changed

pykolab.dsc Changed

@@ -2,8 +2,8 @@
 Source: pykolab
 Binary: pykolab, kolab-cli, kolab-conf, kolab-saslauthd, kolab-server, kolab-telemetry, kolab-xml, wallace
 Architecture: all
-Version: 0.8.23-0~kolab1
-Maintainer: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>
+Version: 0.8.4-0~kolab1
+Maintainer: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>
 Uploaders: Paul Klos <kolab@klos2day.nl>
 Homepage: http://www.kolab.org
 Standards-Version: 3.9.3
@@ -14,12 +14,13 @@
                 gawk,
                 gettext,
                 intltool,
+                libcroco3,
                 libexpat1,
                 libglib2.0-0,
                 libglib2.0-dev,
                 libpcre3,
                 libssl-dev,
-                libunistring2 | libunistring0,
+                libunistring0,
                 libxml-parser-perl,
                 libxml2,
                 mime-support,
@@ -27,7 +28,6 @@
                 python-icalendar,
                 python-minimal,
                 python-nose,
-                python-six,
                 python-tzlocal,
                 univention-config-dev | bash (>= 1.0)
 Package-List:
@@ -40,5 +40,5 @@
  pykolab deb python optional
  wallace deb python optional
 Files:
- 00000000000000000000000000000000 0 pykolab-0.8.23.tar.gz
+ 00000000000000000000000000000000 0 pykolab-0.8.4.tar.gz
  00000000000000000000000000000000 0 debian.tar.gz

Overview

Request 1796 (revoked)

Request History