This request supersedes:
request 2902
(Show diff)
Overview
Request 2904 (accepted)
Fix TypeError in logger
- Created by sicherha about 3 years ago
- In state accepted
- Supersedes 2902
-
Open review for
Admin
-
Open review for
pykolab.spec
Changed
x
1
2
Summary: Kolab Groupware Solution3
Name: pykolab4
Version: 0.8.205
-Release: 1%{?dist}6
+Release: 2%{?dist}7
License: GPLv3+8
Group: Applications/System9
URL: http://kolab.org/10
11
Source0: pykolab-%{version}.tar.gz12
Source1: pykolab.logrotate13
14
+Patch0: 0001-Python-3-Use-0o-prefix-for-octal-numbers.patch15
+16
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root17
BuildArch: noarch18
19
20
21
%prep22
%setup -q23
+%patch0 -p124
25
%build26
autoreconf -v || automake --add-missing && autoreconf -v27
28
%attr(0700,%{kolab_user},%{kolab_group}) %dir %{_var}/spool/pykolab/wallace29
30
%changelog31
+* Thu Feb 3 2022 Christoph Erhardt <kolab@sicherha.de> - 0.8.20-232
+- Fix TypeError in logger33
+34
* Thu Feb 3 2022 Jeroen van Meeuwen <vanmeeuwen@apheleia-it.ch> - 0.8.20-135
- Release of version 0.8.2036
37
0001-Python-3-Use-0o-prefix-for-octal-numbers.patch
Added
123
1
2
+From 7750671314e6da19f65aaa95bb1095963fdc175a Mon Sep 17 00:00:00 20013
+Message-Id: <7750671314e6da19f65aaa95bb1095963fdc175a.1643911242.git.kolab@sicherha.de>4
+From: Christoph Erhardt <kolab@sicherha.de>5
+Date: Fri, 4 Jun 2021 16:16:55 +02006
+Subject: [PATCH] [Python 3] Use 0o prefix for octal numbers7
+8
+Summary:9
+The new 0o prefix was introduced in Python 2.6; the old 0 prefix was10
+deprecated in Python 3.0.11
+12
+Reviewers: machniak, mollekopf13
+14
+Reviewed By: mollekopf15
+16
+Subscribers: mollekopf17
+18
+Differential Revision: https://git.kolab.org/D322619
+---20
+ pykolab/auth/ldap/syncrepl.py | 2 +-21
+ pykolab/logger.py | 2 +-22
+ pykolab/setup/setup_mta.py | 2 +-23
+ pykolab/setup/setup_mysql.py | 2 +-24
+ pykolab/setup/setup_roundcube.py | 2 +-25
+ pykolab/setup/setup_syncroton.py | 2 +-26
+ saslauthd/__init__.py | 2 +-27
+ 7 files changed, 7 insertions(+), 7 deletions(-)28
+29
+diff --git a/pykolab/auth/ldap/syncrepl.py b/pykolab/auth/ldap/syncrepl.py30
+index 03ab5ae..72f5f37 10064431
+--- a/pykolab/auth/ldap/syncrepl.py32
++++ b/pykolab/auth/ldap/syncrepl.py33
+@@ -22,7 +22,7 @@ class DNSync(ldap.ldapobject.LDAPObject,ldap.syncrepl.SyncreplConsumer):34
+ del kwargs['callback']35
+ 36
+ ldap.ldapobject.LDAPObject.__init__(self, *args, **kwargs)37
+- self.__db = anydbm.open(filename, 'c', 0640)38
++ self.__db = anydbm.open(filename, 'c', 0o640)39
+ self.__presentUUIDs = {}40
+ 41
+ def syncrepl_set_cookie(self,cookie):42
+diff --git a/pykolab/logger.py b/pykolab/logger.py43
+index c2237cb..8e9c9b6 10064444
+--- a/pykolab/logger.py45
++++ b/pykolab/logger.py46
+@@ -213,7 +213,7 @@ class Logger(logging.Logger):47
+ group_gid48
+ )49
+ 50
+- os.chmod(self.logfile, '0660')51
++ os.chmod(self.logfile, 0o660)52
+ 53
+ except Exception as errmsg:54
+ self.error(55
+diff --git a/pykolab/setup/setup_mta.py b/pykolab/setup/setup_mta.py56
+index c3c4154..903acd7 10064457
+--- a/pykolab/setup/setup_mta.py58
++++ b/pykolab/setup/setup_mta.py59
+@@ -243,7 +243,7 @@ result_format = "shared+%%s"60
+ )61
+ 62
+ if not os.path.isdir('/etc/postfix/ldap'):63
+- os.mkdir('/etc/postfix/ldap/', 0770)64
++ os.mkdir('/etc/postfix/ldap/', 0o770)65
+ 66
+ for filename in files.keys():67
+ fp = open(filename, 'w')68
+diff --git a/pykolab/setup/setup_mysql.py b/pykolab/setup/setup_mysql.py69
+index 08b7b7c..73c2245 10064470
+--- a/pykolab/setup/setup_mysql.py71
++++ b/pykolab/setup/setup_mysql.py72
+@@ -256,7 +256,7 @@ host=%s73
+ 74
+ 75
+ fp = open('/tmp/kolab-setup-my.cnf', 'w')76
+- os.chmod('/tmp/kolab-setup-my.cnf', 0600)77
++ os.chmod('/tmp/kolab-setup-my.cnf', 0o600)78
+ fp.write(data)79
+ fp.close()80
+ 81
+diff --git a/pykolab/setup/setup_roundcube.py b/pykolab/setup/setup_roundcube.py82
+index 47ac8fc..869533f 10064483
+--- a/pykolab/setup/setup_roundcube.py84
++++ b/pykolab/setup/setup_roundcube.py85
+@@ -259,7 +259,7 @@ host=%s86
+ """ % (mysql_root_password, conf.mysqlhost)87
+ 88
+ fp = open('/tmp/kolab-setup-my.cnf', 'w')89
+- os.chmod('/tmp/kolab-setup-my.cnf', 0600)90
++ os.chmod('/tmp/kolab-setup-my.cnf', 0o600)91
+ fp.write(data)92
+ fp.close()93
+ 94
+diff --git a/pykolab/setup/setup_syncroton.py b/pykolab/setup/setup_syncroton.py95
+index c7c03ce..1cccd0e 10064496
+--- a/pykolab/setup/setup_syncroton.py97
++++ b/pykolab/setup/setup_syncroton.py98
+@@ -109,7 +109,7 @@ host=%s99
+ """ % (mysql_root_password, conf.mysqlhost)100
+ 101
+ fp = open('/tmp/kolab-setup-my.cnf', 'w')102
+- os.chmod('/tmp/kolab-setup-my.cnf', 0600)103
++ os.chmod('/tmp/kolab-setup-my.cnf', 0o600)104
+ fp.write(data)105
+ fp.close()106
+ 107
+diff --git a/saslauthd/__init__.py b/saslauthd/__init__.py108
+index 30e8189..e11296b 100644109
+--- a/saslauthd/__init__.py110
++++ b/saslauthd/__init__.py111
+@@ -204,7 +204,7 @@ class SASLAuthDaemon(object):112
+ pass113
+ 114
+ s.bind(conf.socketfile)115
+- os.chmod(conf.socketfile, 0777)116
++ os.chmod(conf.socketfile, 0o777)117
+ 118
+ s.listen(5)119
+ 120
+-- 121
+2.34.1122
+123
debian.changelog
Changed
11
1
2
+pykolab (0.8.20-0~kolab2) unstable; urgency=low3
+4
+ * Fix TypeError in logger5
+6
+ -- Christoph Erhardt <kolab@sicherha.de> Thu, 03 Feb 2022 19:07:22 +01007
+8
pykolab (0.8.20-0~kolab1) unstable; urgency=low9
10
* Release of version 0.8.2011
debian.control
Changed
9
1
2
gawk,3
gettext,4
intltool,5
- libcroco3,6
libexpat1,7
libglib2.0-0,8
libglib2.0-dev,9
debian.series
Changed
4
1
2
cyrus-imapd.conf-cert-paths.patch -p13
+0001-Python-3-Use-0o-prefix-for-octal-numbers.patch -p14
pykolab.dsc
Changed
18
1
2
Source: pykolab3
Binary: pykolab, kolab-cli, kolab-conf, kolab-saslauthd, kolab-server, kolab-telemetry, kolab-xml, wallace4
Architecture: all5
-Version: 0.8.20-0~kolab16
+Version: 0.8.20-0~kolab27
Maintainer: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>8
Uploaders: Paul Klos <kolab@klos2day.nl>9
Homepage: http://www.kolab.org10
11
gawk,12
gettext,13
intltool,14
- libcroco3,15
libexpat1,16
libglib2.0-0,17
libglib2.0-dev,18
Refresh
Refresh
Login required, please
login
in order to comment
Request History
sicherha created request about 3 years ago
Fix TypeError in logger
sicherha accepted request about 3 years ago