Overview
Request 3062 (accepted)
Fix Debian build
- Created by sicherha over 2 years ago
- In state accepted
-
Open review for
Admin
-
Open review for
vanmeeuwen
-
Open review for
mollekopf
-
Open review for
kolab-developers
cyrus-imapd.conf-cert-paths.patch
Changed
x
1
2
diff -ur pykolab-0.8.6.orig/share/templates/imapd.conf.tpl pykolab-0.8.6/share/templates/imapd.conf.tpl
3
--- pykolab-0.8.6.orig/share/templates/imapd.conf.tpl 2016-11-18 12:24:34.000000000 +0100
4
+++ pykolab-0.8.6/share/templates/imapd.conf.tpl 2016-11-18 13:34:48.872221218 +0100
5
-@@ -6,8 +6,8 @@
6
+@@ -7,8 +7,8 @@
7
sasl_pwcheck_method: saslauthd
8
sasl_mech_list: PLAIN LOGIN
9
allowplaintext: no
10
-tls_server_cert: /etc/pki/cyrus-imapd/cyrus-imapd.pem
11
--tls_server_key: /etc/pki/cyrus-imapd/cyrus-imapd.pem
12
+-tls_server_key: $tls_server_key
13
+tls_server_cert: /etc/ssl/private/cyrus-imapd.pem
14
+tls_server_key: /etc/ssl/private/cyrus-imapd.pem
15
# uncomment this if you're operating in a DSCP environment (RFC-4594)
16
debian.control
Changed
139
1
2
Build-Depends: autotools-dev,
3
debhelper (>= 7.0.50~),
4
dh-autoreconf,
5
+ dh-python,
6
gawk,
7
gettext,
8
intltool,
9
10
libxml-parser-perl,
11
libxml2,
12
mime-support,
13
- python (>= 2.6~),
14
- python-icalendar,
15
- python-minimal,
16
- python-nose,
17
- python-six,
18
- python-tzlocal,
19
+ python3,
20
+ python3-icalendar,
21
+ python3-minimal,
22
+ python3-nose,
23
+ python3-six,
24
+ python3-tzlocal,
25
univention-config-dev | bash (>= 1.0)
26
Standards-Version: 3.9.3
27
Homepage: http://www.kolab.org
28
29
Package: pykolab
30
Architecture: all
31
Depends: adduser (>= 3.11),
32
- libpython2.7 | libpython2.6,
33
- python,
34
- python-icalendar,
35
- python-mysqldb,
36
- python-kolab,
37
- python-ldap,
38
- python-pyasn1,
39
- python-pyasn1-modules,
40
- python-pymysql,
41
- python-six,
42
- python-sqlalchemy,
43
+ libpython3.11 | libpython3.10 | libpython3.9,
44
+ python3,
45
+ python3-icalendar,
46
+ python3-mysqldb,
47
+ python3-kolab,
48
+ python3-ldap,
49
+ python3-pyasn1,
50
+ python3-pyasn1-modules,
51
+ python3-pymysql,
52
+ python3-six,
53
+ python3-sqlalchemy,
54
${misc:Depends},
55
${shlibs:Depends},
56
${ucs:Depends}
57
58
Package: kolab-cli
59
Architecture: all
60
Depends: pykolab (= ${binary:Version}),
61
- python,
62
- python-augeas,
63
- python-cheetah,
64
+ python3,
65
+ python3-augeas,
66
+ python3-cheetah,
67
${misc:Depends},
68
${ucs:Depends}
69
Description: Command-line utilities for Kolab
70
71
72
Package: kolab-conf
73
Architecture: all
74
-Depends: pykolab (= ${binary:Version}), kolab-ldap, ${python:Depends}, python, ${misc:Depends}, python-augeas, python-cheetah
75
+Depends: pykolab (= ${binary:Version}), kolab-ldap, ${python3:Depends}, python3, ${misc:Depends}, python3-augeas, python3-cheetah
76
Description: Configuration management for Kolab
77
This package includes configuration management utilities for
78
Kolab Groupware
79
80
Architecture: all
81
Depends: lsb-base (>= 3.0-6),
82
pykolab (= ${binary:Version}),
83
- python,
84
+ python3,
85
sasl2-bin,
86
${misc:Depends}
87
Description: SASL Authentication Daemon for Kolab
88
89
90
Package: kolab-server
91
Architecture: all
92
-Depends: pykolab (= ${binary:Version}), python, ${misc:Depends}, lsb-base (>= 3.0-6)
93
+Depends: pykolab (= ${binary:Version}), python3, ${misc:Depends}, lsb-base (>= 3.0-6)
94
Description: Kolab Groupware Server
95
Server daemon synchronizing the mutations between various
96
Kolab Groupware components.
97
98
Package: kolab-telemetry
99
Architecture: all
100
-Depends: kolab-cli (= ${binary:Version}), python, ${misc:Depends}
101
+Depends: kolab-cli (= ${binary:Version}), python3, ${misc:Depends}
102
Description: Kolab Telemetry Logging Capabilities
103
Cyrus IMAP Telemetry logging handling capabilities for Kolab Groupware
104
105
Package: kolab-xml
106
Architecture: all
107
Depends: pykolab (= ${binary:Version}),
108
- python,
109
- python-kolabformat,
110
+ python3,
111
+ python3-kolabformat,
112
${misc:Depends},
113
- python-icalendar,
114
- python-tzlocal
115
+ python3-icalendar,
116
+ python3-tzlocal
117
Description: Kolab XML format wrapper for pykolab
118
Kolab Format XML bindings wrapper for pykolab
119
120
121
Architecture: all
122
Depends: pykolab (= ${binary:Version}),
123
kolab-xml (= ${binary:Version}),
124
- python-gnupg,
125
- python,
126
+ python3-gnupg,
127
+ python3,
128
${misc:Depends},
129
lsb-base (>= 3.0-6),
130
- python-dateutil,
131
- python-icalendar,
132
- python-tzlocal
133
+ python3-dateutil,
134
+ python3-icalendar,
135
+ python3-tzlocal
136
Replaces: kolab-content-filter
137
Provides: kolab-content-filter
138
Description: Kolab Content-Filter
139
debian.rules
Changed
21
1
2
export DH_VERBOSE=1
3
4
%:
5
- dh $@ --with python2 --with autotools-dev --with autoreconf
6
+ dh $@ --with python3 --with autotools-dev --with autoreconf
7
8
override_dh_auto_test:
9
dh_auto_test || echo “ignoring test failure”
10
11
if -x "$$(which univention-install-config-registry 2>/dev/null)" ; then \
12
echo "usr/lib*/python*/*-packages/pykolab/plugins/sievemgmt/__init__.py" >> $(CURDIR)/debian/pykolab.install ; \
13
echo "usr/lib*/python*/*-packages/pykolab/cli/sieve/" >> $(CURDIR)/debian/kolab-cli.install ; \
14
- echo "ucs:Depends=python-sievelib" >> $(CURDIR)/debian/pykolab.substvars ; \
15
- echo "ucs:Depends=python-sievelib" >> $(CURDIR)/debian/kolab-cli.substvars ; \
16
+ echo "ucs:Depends=python3-sievelib" >> $(CURDIR)/debian/pykolab.substvars ; \
17
+ echo "ucs:Depends=python3-sievelib" >> $(CURDIR)/debian/kolab-cli.substvars ; \
18
fi
19
dh_install
20
if -x "$$(which univention-install-config-registry 2>/dev/null)" ; then \
21
debian.tar.gz/compat
Changed
4
1
2
-7
3
+8
4
pykolab.dsc
Changed
28
1
2
Build-Depends: autotools-dev,
3
debhelper (>= 7.0.50~),
4
dh-autoreconf,
5
+ dh-python,
6
gawk,
7
gettext,
8
intltool,
9
10
libxml-parser-perl,
11
libxml2,
12
mime-support,
13
- python (>= 2.6~),
14
- python-icalendar,
15
- python-minimal,
16
- python-nose,
17
- python-six,
18
- python-tzlocal,
19
+ python3,
20
+ python3-icalendar,
21
+ python3-minimal,
22
+ python3-nose,
23
+ python3-six,
24
+ python3-tzlocal,
25
univention-config-dev | bash (>= 1.0)
26
Package-List:
27
kolab-cli deb python optional
28
Refresh
Refresh
Login required, please
login
in order to comment
Request History
sicherha created request over 2 years ago
Fix Debian build
mollekopf accepted request over 2 years ago