Package: apparmor / 2.13.4-3

debian/dont-include-site-local-with-dovecot.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
From: Jamie Strandboge <jamie@canonical.com>
Date: Mon, 25 May 2020 08:11:06 +0000
Subject: Don't include /etc/apparmor.d/local in the dovecot extra profiles

since the directory may not exist (breaks QRT)
Forwarded: no
---
 profiles/apparmor.d/usr.lib.dovecot.anvil             | 2 +-
 profiles/apparmor.d/usr.lib.dovecot.auth              | 2 +-
 profiles/apparmor.d/usr.lib.dovecot.config            | 2 +-
 profiles/apparmor.d/usr.lib.dovecot.deliver           | 2 +-
 profiles/apparmor.d/usr.lib.dovecot.dict              | 2 +-
 profiles/apparmor.d/usr.lib.dovecot.dovecot-auth      | 2 +-
 profiles/apparmor.d/usr.lib.dovecot.dovecot-lda       | 2 +-
 profiles/apparmor.d/usr.lib.dovecot.imap              | 2 +-
 profiles/apparmor.d/usr.lib.dovecot.imap-login        | 2 +-
 profiles/apparmor.d/usr.lib.dovecot.lmtp              | 2 +-
 profiles/apparmor.d/usr.lib.dovecot.log               | 2 +-
 profiles/apparmor.d/usr.lib.dovecot.managesieve       | 2 +-
 profiles/apparmor.d/usr.lib.dovecot.managesieve-login | 2 +-
 profiles/apparmor.d/usr.lib.dovecot.pop3              | 2 +-
 profiles/apparmor.d/usr.lib.dovecot.pop3-login        | 2 +-
 profiles/apparmor.d/usr.lib.dovecot.ssl-params        | 2 +-
 profiles/apparmor.d/usr.lib.dovecot.stats             | 2 +-
 profiles/apparmor.d/usr.sbin.dovecot                  | 2 +-
 18 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/profiles/apparmor.d/usr.lib.dovecot.anvil b/profiles/apparmor.d/usr.lib.dovecot.anvil
index 5b0fba6..558a1a5 100644
--- a/profiles/apparmor.d/usr.lib.dovecot.anvil
+++ b/profiles/apparmor.d/usr.lib.dovecot.anvil
@@ -25,5 +25,5 @@
   /usr/lib/dovecot/anvil mr,
 
   # Site-specific additions and overrides. See local/README for details.
-  #include <local/usr.lib.dovecot.anvil>
+  ## include <local/usr.lib.dovecot.anvil>
 }
diff --git a/profiles/apparmor.d/usr.lib.dovecot.auth b/profiles/apparmor.d/usr.lib.dovecot.auth
index 2545ede..eb48ec3 100644
--- a/profiles/apparmor.d/usr.lib.dovecot.auth
+++ b/profiles/apparmor.d/usr.lib.dovecot.auth
@@ -53,5 +53,5 @@
   /var/spool/postfix/private/auth rw,
 
   # Site-specific additions and overrides. See local/README for details.
-  #include <local/usr.lib.dovecot.auth>
+  ## include <local/usr.lib.dovecot.auth>
 }
diff --git a/profiles/apparmor.d/usr.lib.dovecot.config b/profiles/apparmor.d/usr.lib.dovecot.config
index 9368675..96eea78 100644
--- a/profiles/apparmor.d/usr.lib.dovecot.config
+++ b/profiles/apparmor.d/usr.lib.dovecot.config
@@ -28,5 +28,5 @@
   /var/lib/dovecot/ssl-parameters.dat r,
 
   # Site-specific additions and overrides. See local/README for details.
-  #include <local/usr.lib.dovecot.config>
+  ## include <local/usr.lib.dovecot.config>
 }
diff --git a/profiles/apparmor.d/usr.lib.dovecot.deliver b/profiles/apparmor.d/usr.lib.dovecot.deliver
index dcfcdbe..aad8f15 100644
--- a/profiles/apparmor.d/usr.lib.dovecot.deliver
+++ b/profiles/apparmor.d/usr.lib.dovecot.deliver
@@ -33,5 +33,5 @@
   /usr/lib/dovecot/deliver mr,
 
   # Site-specific additions and overrides. See local/README for details.
-  #include <local/usr.lib.dovecot.deliver>
+  ## include <local/usr.lib.dovecot.deliver>
 }
diff --git a/profiles/apparmor.d/usr.lib.dovecot.dict b/profiles/apparmor.d/usr.lib.dovecot.dict
index cd56e6c..fcb8980 100644
--- a/profiles/apparmor.d/usr.lib.dovecot.dict
+++ b/profiles/apparmor.d/usr.lib.dovecot.dict
@@ -27,5 +27,5 @@
   /usr/lib/dovecot/dict mr,
 
   # Site-specific additions and overrides. See local/README for details.
-  #include <local/usr.lib.dovecot.dict>
+  ## include <local/usr.lib.dovecot.dict>
 }
diff --git a/profiles/apparmor.d/usr.lib.dovecot.dovecot-auth b/profiles/apparmor.d/usr.lib.dovecot.dovecot-auth
index 041e46b..653e5ea 100644
--- a/profiles/apparmor.d/usr.lib.dovecot.dovecot-auth
+++ b/profiles/apparmor.d/usr.lib.dovecot.dovecot-auth
@@ -29,5 +29,5 @@
   /var/spool/postfix/private/dovecot-auth w,
 
   # Site-specific additions and overrides. See local/README for details.
-  #include <local/usr.lib.dovecot.dovecot-auth>
+  ## include <local/usr.lib.dovecot.dovecot-auth>
 }
diff --git a/profiles/apparmor.d/usr.lib.dovecot.dovecot-lda b/profiles/apparmor.d/usr.lib.dovecot.dovecot-lda
index 50a75e9..79c6f9d 100644
--- a/profiles/apparmor.d/usr.lib.dovecot.dovecot-lda
+++ b/profiles/apparmor.d/usr.lib.dovecot.dovecot-lda
@@ -34,7 +34,7 @@
   /usr/share/dovecot/protocols.d/** r,
 
   # Site-specific additions and overrides. See local/README for details.
-  #include <local/usr.lib.dovecot.dovecot-lda>
+  ## include <local/usr.lib.dovecot.dovecot-lda>
 
 
   profile sendmail /usr/{bin,sbin}/sendmail flags=(attach_disconnected) {
diff --git a/profiles/apparmor.d/usr.lib.dovecot.imap b/profiles/apparmor.d/usr.lib.dovecot.imap
index 7bc94c3..817add6 100644
--- a/profiles/apparmor.d/usr.lib.dovecot.imap
+++ b/profiles/apparmor.d/usr.lib.dovecot.imap
@@ -42,5 +42,5 @@
   /{,var/}run/dovecot/mounts r,
 
   # Site-specific additions and overrides. See local/README for details.
-  #include <local/usr.lib.dovecot.imap>
+  ## include <local/usr.lib.dovecot.imap>
 }
diff --git a/profiles/apparmor.d/usr.lib.dovecot.imap-login b/profiles/apparmor.d/usr.lib.dovecot.imap-login
index 9b7ed74..29d8873 100644
--- a/profiles/apparmor.d/usr.lib.dovecot.imap-login
+++ b/profiles/apparmor.d/usr.lib.dovecot.imap-login
@@ -31,5 +31,5 @@
   /{,var/}run/dovecot/login/* rw,
 
   # Site-specific additions and overrides. See local/README for details.
-  #include <local/usr.lib.dovecot.imap-login>
+  ## include <local/usr.lib.dovecot.imap-login>
 }
diff --git a/profiles/apparmor.d/usr.lib.dovecot.lmtp b/profiles/apparmor.d/usr.lib.dovecot.lmtp
index 8dd15b8..47a31cc 100644
--- a/profiles/apparmor.d/usr.lib.dovecot.lmtp
+++ b/profiles/apparmor.d/usr.lib.dovecot.lmtp
@@ -35,5 +35,5 @@
   /{var/,}run/dovecot/mounts r,
 
   # Site-specific additions and overrides. See local/README for details.
-  #include <local/usr.lib.dovecot.lmtp>
+  ## include <local/usr.lib.dovecot.lmtp>
 }
diff --git a/profiles/apparmor.d/usr.lib.dovecot.log b/profiles/apparmor.d/usr.lib.dovecot.log
index 3108606..e58b41c 100644
--- a/profiles/apparmor.d/usr.lib.dovecot.log
+++ b/profiles/apparmor.d/usr.lib.dovecot.log
@@ -18,5 +18,5 @@
   /usr/lib/dovecot/log mr,
 
   # Site-specific additions and overrides. See local/README for details.
-  #include <local/usr.lib.dovecot.log>
+  ## include <local/usr.lib.dovecot.log>
 }
diff --git a/profiles/apparmor.d/usr.lib.dovecot.managesieve b/profiles/apparmor.d/usr.lib.dovecot.managesieve
index 8ce9fae..6ba5a71 100644
--- a/profiles/apparmor.d/usr.lib.dovecot.managesieve
+++ b/profiles/apparmor.d/usr.lib.dovecot.managesieve
@@ -30,5 +30,5 @@
   /usr/lib/dovecot/managesieve mrix,
 
   # Site-specific additions and overrides. See local/README for details.
-  #include <local/usr.lib.dovecot.managesieve>
+  ## include <local/usr.lib.dovecot.managesieve>
 }
diff --git a/profiles/apparmor.d/usr.lib.dovecot.managesieve-login b/profiles/apparmor.d/usr.lib.dovecot.managesieve-login
index 4504fd9..b5bfaad 100644
--- a/profiles/apparmor.d/usr.lib.dovecot.managesieve-login
+++ b/profiles/apparmor.d/usr.lib.dovecot.managesieve-login
@@ -33,5 +33,5 @@
   /{,var/}run/dovecot/login/* rw,
 
   # Site-specific additions and overrides. See local/README for details.
-  #include <local/usr.lib.dovecot.managesieve-login>
+  ## include <local/usr.lib.dovecot.managesieve-login>
 }
diff --git a/profiles/apparmor.d/usr.lib.dovecot.pop3 b/profiles/apparmor.d/usr.lib.dovecot.pop3
index ae3d73a..dbe10d2 100644
--- a/profiles/apparmor.d/usr.lib.dovecot.pop3
+++ b/profiles/apparmor.d/usr.lib.dovecot.pop3
@@ -27,5 +27,5 @@
   /usr/lib/dovecot/pop3 mr,
 
   # Site-specific additions and overrides. See local/README for details.
-  #include <local/usr.lib.dovecot.pop3>
+  ## include <local/usr.lib.dovecot.pop3>
 }
diff --git a/profiles/apparmor.d/usr.lib.dovecot.pop3-login b/profiles/apparmor.d/usr.lib.dovecot.pop3-login
index 7d6cbed..a509736 100644
--- a/profiles/apparmor.d/usr.lib.dovecot.pop3-login
+++ b/profiles/apparmor.d/usr.lib.dovecot.pop3-login
@@ -31,5 +31,5 @@
   /{,var/}run/dovecot/login/* rw,
 
   # Site-specific additions and overrides. See local/README for details.
-  #include <local/usr.lib.dovecot.pop3-login>
+  ## include <local/usr.lib.dovecot.pop3-login>
 }
diff --git a/profiles/apparmor.d/usr.lib.dovecot.ssl-params b/profiles/apparmor.d/usr.lib.dovecot.ssl-params
index b6cb8dc..b66ed65 100644
--- a/profiles/apparmor.d/usr.lib.dovecot.ssl-params
+++ b/profiles/apparmor.d/usr.lib.dovecot.ssl-params
@@ -22,5 +22,5 @@
   /var/lib/dovecot/ssl-parameters.dat.tmp rwk,
 
   # Site-specific additions and overrides. See local/README for details.
-  #include <local/usr.lib.dovecot.ssl-params>
+  ## include <local/usr.lib.dovecot.ssl-params>
 }
diff --git a/profiles/apparmor.d/usr.lib.dovecot.stats b/profiles/apparmor.d/usr.lib.dovecot.stats
index 151e4ed..2942d6d 100644
--- a/profiles/apparmor.d/usr.lib.dovecot.stats
+++ b/profiles/apparmor.d/usr.lib.dovecot.stats
@@ -21,5 +21,5 @@
   /usr/lib/dovecot/stats mr,
 
   # Site-specific additions and overrides. See local/README for details.
-  #include <local/usr.lib.dovecot.stats>
+  ## include <local/usr.lib.dovecot.stats>
 }
diff --git a/profiles/apparmor.d/usr.sbin.dovecot b/profiles/apparmor.d/usr.sbin.dovecot
index 6f57f0c..9cff945 100644
--- a/profiles/apparmor.d/usr.sbin.dovecot
+++ b/profiles/apparmor.d/usr.sbin.dovecot
@@ -70,5 +70,5 @@ profile dovecot /usr/{bin,sbin}/dovecot flags=(attach_disconnected) {
   link /{,var/}run/dovecot/** -> /var/lib/dovecot/**,
 
   # Site-specific additions and overrides. See local/README for details.
-  #include <local/usr.sbin.dovecot>
+  ## include <local/usr.sbin.dovecot>
 }