Kolab Groupware OBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 14

pykolab.spec Changed

@@ -7,6 +7,7 @@
 %if 0%{?suse_version} || 0%{?fedora} > 17 || 0%{?rhel} > 6
 %global with_systemd 1
 %{!?_unitdir:   %global _unitdir /usr/lib/systemd/system/}
+%{!?_rundir:    %global _rundir  %{_localstatedir}/run}
 %else
 %global with_systemd 0
 %endif
@@ -28,7 +29,7 @@
 
 Summary:            Kolab Groupware Solution
 Name:               pykolab
-Version:            0.8.3
+Version:            0.8.4
 Release:            1%{?dist}
 License:            GPLv3+
 Group:              Applications/System
@@ -83,7 +84,14 @@
 
 BuildRequires:      python-sievelib
 BuildRequires:      python-sqlalchemy
+
+%if 0%{?fedora} >= 23
+# Fedora 23 has python2-twisted and python-twisted
+BuildRequires:      python-twisted
+%else
 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
@@ -144,6 +152,7 @@
 Requires:           python-icalendar
 Requires:           python-kolab
 Requires:           python-kolabformat >= 0.5
+Requires:           python-tzlocal
 
 %description xml
 Kolab Format XML bindings wrapper for %{name}
@@ -223,6 +232,7 @@
 %endif
 Requires:           python-gnupg
 Requires:           python-icalendar >= 3.0
+Requires:           python-tzlocal
 Requires:           %{name}-xml = %{version}-%{release}
 
 %description -n wallace
@@ -355,6 +365,7 @@
 if [ "$1" == "1" ] ; then
 %if 0%{?with_systemd}
     /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+    systemd-tmpfiles --create
 %else
     /sbin/chkconfig --add kolabd
 %endif
@@ -379,6 +390,7 @@
 if [ "$1" == "1" ] ; then
 %if 0%{?with_systemd}
     /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+    systemd-tmpfiles --create
 %else
     chkconfig --add wallace
 %endif
@@ -498,8 +510,8 @@
 %{_sbindir}/kolab-saslauthd
 %{python_sitelib}/saslauthd/
 %if 0%{?suse_version} > 0 || 0%{?fedora} > 17 || 0%{?rhel} > 6
-%ghost %dir %{_localstatedir}/run/kolab-saslauthd
-%ghost %dir %{_localstatedir}/run/saslauthd
+%ghost %dir %{_rundir}/kolab-saslauthd
+%ghost %dir %{_rundir}/saslauthd
 %else
 %dir %{_localstatedir}/run/kolab-saslauthd
 %dir %{_localstatedir}/run/saslauthd
@@ -528,7 +540,7 @@
 %{_sbindir}/kolabd
 %{python_sitelib}/kolabd/
 %if 0%{?suse_version} > 0 || 0%{?fedora} > 17 || 0%{?rhel} > 6
-%ghost %dir %{_localstatedir}/run/kolabd
+%ghost %dir %{_rundir}/kolabd
 %else
 %attr(0770,kolab,kolab) %dir %{_localstatedir}/run/kolabd
 %endif
@@ -549,7 +561,11 @@
 %dir %{_prefix}/lib/tmpfiles.d/
 %endif
 %{_prefix}/lib/tmpfiles.d/wallace.conf
+%if 0%{?suse_version} > 0 || 0%{?fedora} > 17 || 0%{?rhel} > 6
+%ghost %dir %{_rundir}/wallaced
+%else
 %attr(0700,%{kolab_user},%{kolab_group}) %dir /run/wallaced
+%endif
 %else
 %{_initrddir}/wallace
 %endif
@@ -564,6 +580,16 @@
 %attr(0700,%{kolab_user},%{kolab_group}) %dir %{_var}/spool/pykolab/wallace
 
 %changelog
+* Fri Sep 30 2016 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.8.4-1
+- Release of version 0.8.4
+
+* Tue Sep 20 2016 Timotheus Pokorra <tp@tbits.net> - 0.8.3-3
+- Fix for Fedora 23 and higher, python-twisted buildrequires
+- Create /run directories for kolabd and wallaced services 
+
+* Wed Jul 27 2016 Dominique Leuenberger (openSUSE) <dimstar@opensuse.org> - 0.8.3-2
+- Fix build on openSUSE systems: use %_rundir instead of /var/run
+
 * Fri Jul 22 2016 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.8.3-1
 - Release of version 0.8.3

debian.changelog Changed

debian.control Changed

pykolab-0.8.3.tar.gz/configure.ac -> pykolab-0.8.4.tar.gz/configure.ac Changed

pykolab-0.8.3.tar.gz/po/POTFILES.skip -> pykolab-0.8.4.tar.gz/po/POTFILES.skip Changed

pykolab-0.8.3.tar.gz/po/de.po -> pykolab-0.8.4.tar.gz/po/de.po Changed

@@ -5,6 +5,7 @@
 # Translators:
 # Christoph Wickert <christoph.wickert@gmail.com>, 2015
 # Christoph Wickert <christoph.wickert@gmail.com>, 2011
+# Colja Vendel <vendel.colja@googlemail.com>, 2016
 # Dirk Marschner <info@marschner.cx>, 2015
 # Dirk Marschner <info@marschner.cx>, 2015
 # Ettore Atalan <atalanttore@googlemail.com>, 2014-2016
@@ -22,8 +23,8 @@
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-07-22 15:31+0200\n"
-"PO-Revision-Date: 2016-07-22 13:31+0000\n"
-"Last-Translator: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>\n"
+"PO-Revision-Date: 2016-09-27 07:33+0000\n"
+"Last-Translator: Mads <mads@batmads.com>\n"
 "Language-Team: German (http://www.transifex.com/kolab/kolab/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -364,7 +365,7 @@
 #: ../saslauthd/__init__.py:170 ../saslauthd/__init__.py:179
 #: ../wallace/__init__.py:469 ../wallace/__init__.py:478
 msgid "Traceback occurred, please report a bug at https://issues.kolab.org"
-msgstr ""
+msgstr "Traceback Softwarefehler aufgetreten, bitte auf https://issues.kolab.org einen Fehlerreport erstellen."
 
 #: ../kolabd/__init__.py:226 ../saslauthd/__init__.py:175
 #: ../wallace/__init__.py:474
@@ -514,7 +515,7 @@
 #: ../pykolab/auth/ldap/__init__.py:1467 ../pykolab/auth/ldap/__init__.py:3066
 #, python-format
 msgid "LDAP server unavailable: %r"
-msgstr ""
+msgstr "LDAP-Server nicht erreichbar: %r"
 
 #: ../pykolab/auth/ldap/__init__.py:230 ../pykolab/auth/ldap/__init__.py:237
 #: ../pykolab/auth/ldap/__init__.py:1316 ../pykolab/auth/ldap/__init__.py:1442
@@ -527,41 +528,41 @@
 #: ../pykolab/auth/ldap/__init__.py:236
 #, python-format
 msgid "Exception occurred: %r"
-msgstr ""
+msgstr "Ausnahme aufgetreten: %r"
 
 #: ../pykolab/auth/ldap/__init__.py:243
 #, python-format
 msgid "Length of entries found: %r"
-msgstr ""
+msgstr "Länge der gefundenen Einträge: %r"
 
 #: ../pykolab/auth/ldap/__init__.py:255
 #, python-format
 msgid "Authentication for %r failed (multiple entries)"
-msgstr ""
+msgstr "Authentifizierung für %r fehlgeschlagen (mehrfache Einträge)"
 
 #: ../pykolab/auth/ldap/__init__.py:269
 #, python-format
 msgid "Authentication for %r failed (no entry)"
-msgstr ""
+msgstr "Authentifizierung für %r fehlgeschlagen (kein Eintrag)"
 
 #: ../pykolab/auth/ldap/__init__.py:282
 #, python-format
 msgid "Authentication for %r failed (LDAP error?)"
-msgstr ""
+msgstr "Authentifizierung für %r fehlgeschlagen (LDAP-Fehler?)"
 
 #: ../pykolab/auth/ldap/__init__.py:300 ../pykolab/auth/ldap/__init__.py:354
 #, python-format
 msgid "Authentication for %r succeeded"
-msgstr ""
+msgstr "Authentifizierung für %r erfolgreich"
 
 #: ../pykolab/auth/ldap/__init__.py:311
 #, python-format
 msgid "Authentication for %r failed (error)"
-msgstr ""
+msgstr "Authentifizierung für %r fehlgeschlagen (Fehler)"
 
 #: ../pykolab/auth/ldap/__init__.py:328
 msgid "Authentication failed, LDAP server unavailable"
-msgstr ""
+msgstr "Authentifizierung fehlgeschlagen, LDAP-Server nicht erreichbar"
 
 #: ../pykolab/auth/ldap/__init__.py:336 ../pykolab/auth/ldap/__init__.py:391
 #, python-format
@@ -571,7 +572,7 @@
 #: ../pykolab/auth/ldap/__init__.py:357
 #, python-format
 msgid "Authentication for %r failed (password)"
-msgstr ""
+msgstr "Authentifizierung für %r fehlgeschlagen (Passwort)"
 
 #: ../pykolab/auth/ldap/__init__.py:369
 #, python-format
@@ -697,7 +698,7 @@
 #: ../pykolab/auth/ldap/__init__.py:1071
 #, python-format
 msgid "1 result for address %s found, verifying..."
-msgstr ""
+msgstr "1 Ergebnis für Adresse %s gefunden, wird überprüft..."
 
 #: ../pykolab/auth/ldap/__init__.py:1082
 #, python-format
@@ -804,7 +805,7 @@
 #: ../pykolab/auth/ldap/__init__.py:1686
 #, python-format
 msgid "Entry %s attribute value: %r"
-msgstr ""
+msgstr "Eintrag %s Attributwert: %r"
 
 #: ../pykolab/auth/ldap/__init__.py:1694
 #, python-format
@@ -814,7 +815,7 @@
 #: ../pykolab/auth/ldap/__init__.py:1755
 #, python-format
 msgid "An error occured: %r"
-msgstr ""
+msgstr "Ein Fehler ist aufgetreten: %r"
 
 #: ../pykolab/auth/ldap/__init__.py:1993 ../pykolab/auth/ldap/__init__.py:2187
 #, python-format
@@ -906,7 +907,7 @@
 
 #: ../pykolab/auth/ldap/__init__.py:3068
 msgid "-- reconnecting in 10 seconds."
-msgstr ""
+msgstr "-- erneuter Verbindungsaufbau in 10 Sekunden."
 
 #: ../pykolab/auth/ldap/__init__.py:3076
 #, python-format
@@ -1052,7 +1053,7 @@
 
 #: ../pykolab/cli/cmd_check_quota.py:57
 msgid "Compare existing IMAP quota with LDAP quota."
-msgstr ""
+msgstr "Vorhandenes IMAP-Kontingent mit LDAP-Kontingent vergleichen."
 
 #: ../pykolab/cli/cmd_check_quota.py:84 ../pykolab/cli/cmd_user_info.py:51
 #, python-format
@@ -1062,7 +1063,7 @@
 #: ../pykolab/cli/cmd_check_quota.py:98
 #, python-format
 msgid "No quota for user %s"
-msgstr ""
+msgstr "Kein Kontingent für Benutzer %s"
 
 #: ../pykolab/cli/cmd_check_quota.py:105
 #, python-format
@@ -1153,7 +1154,7 @@
 
 #: ../pykolab/cli/cmd_export_mailbox.py:38
 msgid "All folders this user has access to"
-msgstr ""
+msgstr "Alle Ordner auf die der Benutzer zugriff hat"
 
 #: ../pykolab/cli/cmd_export_mailbox.py:108
 #, python-format
@@ -1319,7 +1320,7 @@
 #: ../pykolab/cli/cmd_remove_user_subscription.py:86
 #, python-format
 msgid "Successfully unsubscribed user %s from the following folders:"
-msgstr ""
+msgstr "Für Benutzer %s wurde das Abonnement folgender Ordner erfolgreich beendet:"
 
 #: ../pykolab/cli/cmd_remove_user_subscription.py:92
 #, python-format
@@ -1866,12 +1867,12 @@
 #: ../pykolab/imap/cyrus.py:294 ../pykolab/imap/dovecot.py:311
 #, python-format
 msgid "Setting quota for folder %s to %s"
-msgstr "Setze Quota für Verzeichnis %s auf %s"
+msgstr "Kontingent für Ordner %s auf %s wird festgelegt"
 
 #: ../pykolab/imap/cyrus.py:305 ../pykolab/imap/dovecot.py:315
 #, python-format
 msgid "Could not set quota for mailfolder %s"
-msgstr "Konnte Quota für Verzeichnis %s nicht setzen"
+msgstr "Kontingent für Mailordner %s konnte nicht festgelegt werden"
 
 #: ../pykolab/imap/cyrus.py:319 ../pykolab/imap/dovecot.py:320
 #, python-format
@@ -2081,7 +2082,7 @@
 #: ../pykolab/imap/__init__.py:750
 #, python-format
 msgid "Could not set quota on %s"
-msgstr ""
+msgstr "Kontingent auf %s konnte nicht festgelegt werden"
 
 #: ../pykolab/imap/__init__.py:757
 #, python-format
@@ -2148,7 +2149,7 @@
 #: ../pykolab/imap/__init__.py:981
 #, python-format
 msgid "Cannot get current IMAP quota for folder %s"
-msgstr "Kann aktuelles IMAP Kontingent für den Ordner %s nicht bekommen"
+msgstr "Kann aktuelles IMAP-Kontingent für den Ordner %s nicht holen"
 
 #: ../pykolab/imap/__init__.py:994

pykolab-0.8.3.tar.gz/po/de_DE.po -> pykolab-0.8.4.tar.gz/po/de_DE.po Changed

@@ -4,6 +4,7 @@
 # 
 # Translators:
 # Christoph Wickert <christoph.wickert@gmail.com>, 2012
+# Colja Vendel <vendel.colja@googlemail.com>, 2016
 # Torsten Grote <grote@kolabsys.com>, 2012
 # Thomas Bruederli <roundcube@gmail.com>, 2014
 msgid ""
@@ -11,8 +12,8 @@
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-07-22 15:31+0200\n"
-"PO-Revision-Date: 2016-07-22 13:31+0000\n"
-"Last-Translator: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>\n"
+"PO-Revision-Date: 2016-09-16 12:28+0000\n"
+"Last-Translator: Colja Vendel <vendel.colja@googlemail.com>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/kolab/kolab/language/de_DE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -3083,7 +3084,7 @@
 #: ../tests/functional/test_wallace/test_007_invitationpolicy.py:914
 #: ../tests/functional/test_wallace/test_007_invitationpolicy.py:926
 msgid "Pending"
-msgstr ""
+msgstr "Ausstehend"
 
 #: ../pykolab/xml/attendee.py:133 ../pykolab/xml/attendee.py:155
 msgid "Not a valid attendee"
@@ -3927,7 +3928,7 @@
 #: ../wallace/module_invitationpolicy.py:1284
 #, python-format
 msgid "The assignment for '%(summary)s' has been cancelled by %(organizer)s."
-msgstr ""
+msgstr "Die Zuweisung für '%(summary)s' wurde von %(organizer)s zurückgezogen."
 
 #: ../wallace/module_invitationpolicy.py:1289
 msgid "The copy in your tasklist has been removed accordingly."
@@ -3941,7 +3942,7 @@
 #, python-format
 msgid ""
 "The event '%(summary)s' at %(start)s has been cancelled by %(organizer)s."
-msgstr ""
+msgstr "Der Termin '%(summary)s' am/um %(start)s wurde von %(organizer)s abgesagt."
 
 #: ../wallace/module_invitationpolicy.py:1299
 msgid "The copy in your calendar has been removed accordingly."

pykolab-0.8.3.tar.gz/po/fr.po -> pykolab-0.8.4.tar.gz/po/fr.po Changed

@@ -13,7 +13,7 @@
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-07-22 15:31+0200\n"
-"PO-Revision-Date: 2016-07-22 13:31+0000\n"
+"PO-Revision-Date: 2016-07-22 13:51+0000\n"
 "Last-Translator: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>\n"
 "Language-Team: French (http://www.transifex.com/kolab/kolab/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -621,7 +621,7 @@
 #: ../pykolab/auth/ldap/__init__.py:869
 #, python-format
 msgid "Not applying recipient policy for %s (disabled through configuration)"
-msgstr ""
+msgstr "La politique de récepteur n'applique pas pour %s (désactivé à travers la configuration)"
 
 #: ../pykolab/auth/ldap/__init__.py:879
 #, python-format
@@ -674,7 +674,7 @@
 #: ../pykolab/auth/ldap/__init__.py:994
 #, python-format
 msgid "Too bad, primary email address %s already in use for %s (we are %s)"
-msgstr ""
+msgstr "Désolé, l'adresse e-mail principale %s déjà utilisé pour %s (nous sommes %s)"
 
 #: ../pykolab/auth/ldap/__init__.py:1005 ../pykolab/auth/ldap/__init__.py:1094
 msgid "Address assigned to us"
@@ -688,12 +688,12 @@
 #: ../pykolab/auth/ldap/__init__.py:1071
 #, python-format
 msgid "1 result for address %s found, verifying..."
-msgstr ""
+msgstr "1 résultat trouvé pour l'adresse %s, en vérification..."
 
 #: ../pykolab/auth/ldap/__init__.py:1082
 #, python-format
 msgid "Too bad, secondary email address %s already in use for %s (we are %s)"
-msgstr ""
+msgstr "Désolé, l'adresse e-mail secondaire %s déjà utilisé pour %s (nous sommes %s)"
 
 #: ../pykolab/auth/ldap/__init__.py:1109
 #, python-format
@@ -711,7 +711,7 @@
 msgid ""
 "Avoiding the duplication of the primary mail address %r in the list of "
 "secondary mail addresses"
-msgstr ""
+msgstr "Évitant la duplication d'adresse mail principal %r dans la liste d'adresses mail secondaire"
 
 #: ../pykolab/auth/ldap/__init__.py:1142
 #, python-format
@@ -721,7 +721,7 @@
 #: ../pykolab/auth/ldap/__init__.py:1150
 #, python-format
 msgid "Entry did not have any secondary mail addresses in %r"
-msgstr ""
+msgstr "Entré n'as aucune adresses mail secondaire dans %r"
 
 #: ../pykolab/auth/ldap/__init__.py:1167 ../pykolab/auth/ldap/__init__.py:1173
 #, python-format
@@ -950,7 +950,7 @@
 #: ../pykolab/cli/cmd_add_alias.py:97
 msgid ""
 "Environment is not configured for users to hold secondary mail attributes"
-msgstr ""
+msgstr "Environnement n'est pas configuré pour supporter des attribues de mail secondaire pour utilisateurs"
 
 #: ../pykolab/cli/cmd_add_alias.py:105
 #, python-format
@@ -989,7 +989,7 @@
 msgid ""
 "Could not find credentials with sufficient permissionsto add a domain name "
 "space."
-msgstr ""
+msgstr "Impossible de trouver les références avec les autorisations suffisantes pour ajouter un espace de nom de domaine. "
 
 #: ../pykolab/cli/cmd_add_domain.py:67 ../pykolab/cli/cmd_delete_domain.py:67
 #: ../pykolab/cli/cmd_find_domain.py:56
@@ -1599,7 +1599,7 @@
 #: ../pykolab/conf/entitlement.py:262
 #, python-format
 msgid "Invalid entitlement verification certificate at %s"
-msgstr ""
+msgstr "Licence de vérification invalide au %s"
 
 #: ../pykolab/conf/entitlement.py:120 ../pykolab/conf/entitlement.py:123
 msgid "Invalid entitlement certificate"
@@ -2976,7 +2976,7 @@
 
 #: ../pykolab/utils.py:74
 msgid "Incorrect confirmation. Please try again."
-msgstr ""
+msgstr "Confirmation incorrecte. Veuillez réessayer."
 
 #: ../pykolab/utils.py:79 ../pykolab/utils.py:84
 #, python-format
@@ -3085,7 +3085,7 @@
 #: ../tests/functional/test_wallace/test_007_invitationpolicy.py:914
 #: ../tests/functional/test_wallace/test_007_invitationpolicy.py:926
 msgid "Pending"
-msgstr ""
+msgstr "En attente"
 
 #: ../pykolab/xml/attendee.py:133 ../pykolab/xml/attendee.py:155
 msgid "Not a valid attendee"
@@ -4298,7 +4298,7 @@
 #: ../wallace/module_resources.py:1092
 #, python-format
 msgid "The following resources are being referred to in the iTip: %r"
-msgstr ""
+msgstr "Les ressources suivantes sont mentionnées dans le iTip: %"
 
 #: ../wallace/module_resources.py:1219
 #, python-format

pykolab-0.8.3.tar.gz/pykolab/setup/setup_mta.py -> pykolab-0.8.4.tar.gz/pykolab/setup/setup_mta.py Changed

@@ -261,9 +261,9 @@
             "smtp_tls_security_level": "may",
             "smtpd_sasl_auth_enable": "yes",
             "smtpd_sender_login_maps": "$local_recipient_maps",
-            "smtpd_sender_restrictions": "permit_mynetworks, reject_sender_login_mismatch",
+            "smtpd_data_restrictions": "permit_mynetworks, check_policy_service unix:private/recipient_policy_incoming",
             "smtpd_recipient_restrictions": "permit_mynetworks, reject_unauth_pipelining, reject_rbl_client zen.spamhaus.org, reject_non_fqdn_recipient, reject_invalid_helo_hostname, reject_unknown_recipient_domain, reject_unauth_destination, check_policy_service unix:private/recipient_policy_incoming, permit",
-            "smtpd_sender_restrictions": "permit_mynetworks, check_policy_service unix:private/sender_policy_incoming",
+            "smtpd_sender_restrictions": "permit_mynetworks, reject_sender_login_mismatch, check_policy_service unix:private/sender_policy_incoming",
             "submission_recipient_restrictions": "check_policy_service unix:private/submission_policy, permit_sasl_authenticated, reject",
             "submission_sender_restrictions": "reject_non_fqdn_sender, check_policy_service unix:private/submission_policy, permit_sasl_authenticated, reject",
             "submission_data_restrictions": "check_policy_service unix:private/submission_policy",
@@ -456,6 +456,28 @@
         with open('/etc/systemd/system/clamd@.service', 'wb') as f:
             unitfile.write(f)
 
+    log.info(_("Configuring and refreshing Anti-Virus..."))
+
+    if os.path.isfile('/etc/kolab/templates/freshclam.conf.tpl'):
+        shutil.copy(
+                '/etc/kolab/templates/freshclam.conf.tpl',
+                '/etc/freshclam.conf'
+            )
+    elif os.path.isfile('/usr/share/kolab/templates/freshclam.conf.tpl'):
+        shutil.copy(
+                '/usr/share/kolab/templates/freshclam.conf.tpl',
+                '/etc/freshclam.conf'
+            )
+    else:
+        log.error(_("Could not find a ClamAV update configuration file"))
+
+    if os.path.isfile('/etc/freshclam.conf'):
+        subprocess.call(
+                '/usr/bin/freshclam',
+                '--quiet',
+                '--datadir="/var/lib/clamav"'
+            )
+
     amavisservice = 'amavisd.service'
     clamavservice = 'clamd@amavisd.service'
     if os.path.isfile('/usr/lib/systemd/system/amavis.service'):

pykolab-0.8.3.tar.gz/pykolab/setup/setup_roundcube.py -> pykolab-0.8.4.tar.gz/pykolab/setup/setup_roundcube.py Changed

@@ -265,6 +265,8 @@
 
     root_uid = 0
 
+    webserver_gid = None
+
     for webserver_group in [ 'apache', 'www-data', 'www' ]:
         try:
             (a,b,webserver_gid,c) = grp.getgrnam(webserver_group)
@@ -272,10 +274,18 @@
         except Exception, errmsg:
             pass
 
-    if not rccpath == None:
-        for root, directories, filenames in os.walk(rccpath):
-            for filename in filenames:
-                os.chown(os.path.join(root, filename), root_uid, webserver_gid)
+    if webserver_gid is not None:
+        if rccpath is not None:
+            for root, directories, filenames in os.walk(rccpath):
+                for filename in filenames:
+                    try:
+                        os.chown(
+                                os.path.join(root, filename),
+                                root_uid,
+                                webserver_gid
+                            )
+                    except Exception, errmsg:
+                        pass
 
     httpservice = 'httpd.service'
     if os.path.isfile('/usr/lib/systemd/system/apache2.service'):

pykolab-0.8.4.tar.gz/share/templates/freshclam.conf.tpl Added

@@ -0,0 +1,230 @@
+##
+## Example config file for freshclam
+## Please read the freshclam.conf(5) manual before editing this file.
+##
+
+# Path to the database directory.
+# WARNING: It must match clamd.conf's directive!
+# Default: hardcoded (depends on installation options)
+DatabaseDirectory /var/lib/clamav
+
+# Path to the log file (make sure it has proper permissions)
+# Default: disabled
+UpdateLogFile /var/log/clamav/freshclam.log
+
+# Maximum size of the log file.
+# Value of 0 disables the limit.
+# You may use 'M' or 'm' for megabytes (1M = 1m = 1048576 bytes)
+# and 'K' or 'k' for kilobytes (1K = 1k = 1024 bytes).
+# in bytes just don't use modifiers. If LogFileMaxSize is enabled,
+# log rotation (the LogRotate option) will always be enabled.
+# Default: 1M
+#LogFileMaxSize 2M
+
+# Log time with each message.
+# Default: no
+#LogTime yes
+
+# Enable verbose logging.
+# Default: no
+#LogVerbose yes
+
+# Use system logger (can work together with UpdateLogFile).
+# Default: no
+LogSyslog yes
+
+# Specify the type of syslog messages - please refer to 'man syslog'
+# for facility names.
+# Default: LOG_LOCAL6
+LogFacility LOG_MAIL
+
+# Enable log rotation. Always enabled when LogFileMaxSize is enabled.
+# Default: no
+#LogRotate yes
+
+# This option allows you to save the process identifier of the daemon
+# Default: disabled
+#PidFile /var/run/freshclam.pid
+
+# By default when started freshclam drops privileges and switches to the
+# "clamav" user. This directive allows you to change the database owner.
+# Default: clamav (may depend on installation options)
+DatabaseOwner clam
+
+# Initialize supplementary group access (freshclam must be started by root).
+# Default: no
+#AllowSupplementaryGroups yes
+
+# Use DNS to verify virus database version. Freshclam uses DNS TXT records
+# to verify database and software versions. With this directive you can change
+# the database verification domain.
+# WARNING: Do not touch it unless you're configuring freshclam to use your
+# own database verification domain.
+# Default: current.cvd.clamav.net
+#DNSDatabaseInfo current.cvd.clamav.net
+
+# Uncomment the following line and replace XY with your country
+# code. See http://www.iana.org/cctld/cctld-whois.htm for the full list.
+# You can use db.XY.ipv6.clamav.net for IPv6 connections.
+#DatabaseMirror db.XY.clamav.net
+
+# database.clamav.net is a round-robin record which points to our most
+# reliable mirrors. It's used as a fall back in case db.XY.clamav.net is
+# not working. DO NOT TOUCH the following line unless you know what you
+# are doing.
+DatabaseMirror db.ch.clamav.net
+DatabaseMirror db.local.clamav.net
+
+# How many attempts to make before giving up.
+# Default: 3 (per mirror)
+#MaxAttempts 5
+
+# With this option you can control scripted updates. It's highly recommended
+# to keep it enabled.
+# Default: yes
+#ScriptedUpdates yes
+
+# By default freshclam will keep the local databases (.cld) uncompressed to
+# make their handling faster. With this option you can enable the compression;
+# the change will take effect with the next database update.
+# Default: no
+#CompressLocalDatabase no
+
+# With this option you can provide custom sources (http:// or file://) for
+# database files. This option can be used multiple times.
+# Default: no custom URLs
+#DatabaseCustomURL http://myserver.com/mysigs.ndb
+#DatabaseCustomURL file:///mnt/nfs/local.hdb
+
+# This option allows you to easily point freshclam to private mirrors.
+# If PrivateMirror is set, freshclam does not attempt to use DNS
+# to determine whether its databases are out-of-date, instead it will
+# use the If-Modified-Since request or directly check the headers of the
+# remote database files. For each database, freshclam first attempts
+# to download the CLD file. If that fails, it tries to download the
+# CVD file. This option overrides DatabaseMirror, DNSDatabaseInfo
+# and ScriptedUpdates. It can be used multiple times to provide
+# fall-back mirrors.
+# Default: disabled
+#PrivateMirror mirror1.mynetwork.com
+#PrivateMirror mirror2.mynetwork.com
+
+# Number of database checks per day.
+# Default: 12 (every two hours)
+#Checks 24
+
+# Proxy settings
+# Default: disabled
+#HTTPProxyServer myproxy.com
+#HTTPProxyPort 1234
+#HTTPProxyUsername myusername
+#HTTPProxyPassword mypass
+
+# If your servers are behind a firewall/proxy which applies User-Agent
+# filtering you can use this option to force the use of a different
+# User-Agent header.
+# Default: clamav/version_number
+#HTTPUserAgent SomeUserAgentIdString
+
+# Use aaa.bbb.ccc.ddd as client address for downloading databases. Useful for
+# multi-homed systems.
+# Default: Use OS'es default outgoing IP address.
+#LocalIPAddress aaa.bbb.ccc.ddd
+
+# Send the RELOAD command to clamd.
+# Default: no
+#NotifyClamd /path/to/clamd.conf
+
+# Run command after successful database update.
+# Default: disabled
+#OnUpdateExecute command
+
+# Run command when database update process fails.
+# Default: disabled
+#OnErrorExecute command
+
+# Run command when freshclam reports outdated version.
+# In the command string %v will be replaced by the new version number.
+# Default: disabled
+#OnOutdatedExecute command
+
+# Don't fork into background.
+# Default: no
+#Foreground yes
+
+# Enable debug messages in libclamav.
+# Default: no
+#Debug yes
+
+# Timeout in seconds when connecting to database server.
+# Default: 30
+#ConnectTimeout 60
+
+# Timeout in seconds when reading from database server.
+# Default: 30
+#ReceiveTimeout 60
+
+# With this option enabled, freshclam will attempt to load new
+# databases into memory to make sure they are properly handled
+# by libclamav before replacing the old ones.
+# Default: yes
+#TestDatabases yes
+
+# When enabled freshclam will submit statistics to the ClamAV Project about
+# the latest virus detections in your environment. The ClamAV maintainers
+# will then use this data to determine what types of malware are the most
+# detected in the field and in what geographic area they are.
+# Freshclam will connect to clamd in order to get recent statistics.
+# Default: no
+#SubmitDetectionStats /path/to/clamd.conf
+
+# Country of origin of malware/detection statistics (for statistical
+# purposes only). The statistics collector at ClamAV.net will look up
+# your IP address to determine the geographical origin of the malware
+# reported by your installation. If this installation is mainly used to
+# scan data which comes from a different location, please enable this
+# option and enter a two-letter code (see http://www.iana.org/domains/root/db/)
+# of the country of origin.
+# Default: disabled
+#DetectionStatsCountry country-code
+
+# This option enables support for our "Personal Statistics" service. 
+# When this option is enabled, the information on malware detected by
+# your clamd installation is made available to you through our website.
+# To get your HostID, log on http://www.stats.clamav.net and add a new
+# host to your host list. Once you have the HostID, uncomment this option
+# and paste the HostID here. As soon as your freshclam starts submitting
+# information to our stats collecting service, you will be able to view
+# the statistics of this clamd installation by logging into
+# http://www.stats.clamav.net with the same credentials you used to

pykolab.dsc Changed