Codebase list cyrus-sasl2 / 8cd74cd
Update patches to new release Ondřej Surý 12 years ago
19 changed file(s) with 64 addition(s) and 751 deletion(s). Raw diff Collapse all Expand all
+7
-7
debian/patches/0006_library_mutexes.diff less more
00 Author: Fabian Fagerholm <fabbe@debian.org>
11 Description: Exact description unknown; make sure mutex-related code works.
2 --- trunk.orig/lib/common.c
3 +++ trunk/lib/common.c
4 @@ -771,7 +771,7 @@
2 --- a/lib/common.c
3 +++ b/lib/common.c
4 @@ -818,7 +818,7 @@ int _sasl_common_init(sasl_global_callba
55 result = sasl_canonuser_add_plugin("INTERNAL", internal_canonuser_init);
66 if(result != SASL_OK) return result;
77
8 - if (!free_mutex)
9 + if (!free_mutex || free_mutex == 0x1)
8 - if (!free_mutex) {
9 + if (!free_mutex || free_mutex == 0x1) {
1010 free_mutex = sasl_MUTEX_ALLOC();
11 }
1112 if (!free_mutex) return SASL_FAIL;
12
13 @@ -790,6 +790,11 @@
13 @@ -838,6 +838,11 @@ void sasl_dispose(sasl_conn_t **pconn)
1414
1515 /* serialize disposes. this is necessary because we can't
1616 dispose of conn->mutex if someone else is locked on it */
+0
-475
debian/patches/0007_manpages_section.diff less more
0 Author: Fabian Fagerholm <fabbe@debian.org>
1 Description: Put man pages in correct section.
2 --- trunk.orig/man/sasl.3
3 +++ trunk/man/sasl.3
4 @@ -38,7 +38,7 @@
5 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
6 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
7 .\"
8 -.TH SASL "10 July 2001" SASL "SASL man pages"
9 +.TH SASL 3 "10 July 2001" SASL "SASL man pages"
10 .SH NAME
11 SASL \- SASL authentication library
12 .SH DESCRIPTION
13 --- trunk.orig/man/sasl_authorize_t.3
14 +++ trunk/man/sasl_authorize_t.3
15 @@ -38,7 +38,7 @@
16 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
17 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
18 .\"
19 -.TH sasl_authorize_t "10 July 2001" SASL "SASL man pages"
20 +.TH sasl_authorize_t 3 "10 July 2001" SASL "SASL man pages"
21 .SH NAME
22 sasl_authorize_t \- The SASL authorization callback
23
24 --- trunk.orig/man/sasl_auxprop.3
25 +++ trunk/man/sasl_auxprop.3
26 @@ -38,7 +38,7 @@
27 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
28 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
29 .\"
30 -.TH sasl_auxprop "10 July 2001" SASL "SASL man pages"
31 +.TH sasl_auxprop 3 "10 July 2001" SASL "SASL man pages"
32 .SH NAME
33 sasl_auxprop \- How to work with SASL auxiliary properties
34
35 --- trunk.orig/man/sasl_auxprop_getctx.3
36 +++ trunk/man/sasl_auxprop_getctx.3
37 @@ -38,7 +38,7 @@
38 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
39 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
40 .\"
41 -.TH sasl_auxprop_getctx "10 July 2001" SASL "SASL man pages"
42 +.TH sasl_auxprop_getctx 3 "10 July 2001" SASL "SASL man pages"
43 .SH NAME
44 sasl_auxprop_getctx \- Acquire an auxiliary property context
45
46 --- trunk.orig/man/sasl_auxprop_request.3
47 +++ trunk/man/sasl_auxprop_request.3
48 @@ -38,7 +38,7 @@
49 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
50 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
51 .\"
52 -.TH sasl_auxprop_request "10 July 2001" SASL "SASL man pages"
53 +.TH sasl_auxprop_request 3 "10 July 2001" SASL "SASL man pages"
54 .SH NAME
55 sasl_auxprop_request \- Request Auxiliary Properties from SASL
56
57 --- trunk.orig/man/sasl_callbacks.3
58 +++ trunk/man/sasl_callbacks.3
59 @@ -38,7 +38,7 @@
60 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
61 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
62 .\"
63 -.TH sasl_callbacks "12 February 2006" SASL "SASL man pages"
64 +.TH sasl_callbacks 3 "12 February 2006" SASL "SASL man pages"
65 .SH NAME
66 sasl_callbacks \- How to work with SASL callbacks
67
68 --- trunk.orig/man/sasl_canon_user_t.3
69 +++ trunk/man/sasl_canon_user_t.3
70 @@ -38,7 +38,7 @@
71 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
72 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
73 .\"
74 -.TH sasl_server_userdb_checkpass_t "10 July 2001" SASL "SASL man pages"
75 +.TH sasl_server_userdb_checkpass_t 3 "10 July 2001" SASL "SASL man pages"
76 .SH NAME
77 sasl_server_userdb_checkpass_t \- Plaintext Password Verification Callback
78
79 --- trunk.orig/man/sasl_chalprompt_t.3
80 +++ trunk/man/sasl_chalprompt_t.3
81 @@ -38,7 +38,7 @@
82 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
83 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
84 .\"
85 -.TH sasl_chalprompt_t "10 July 2001" SASL "SASL man pages"
86 +.TH sasl_chalprompt_t 3 "10 July 2001" SASL "SASL man pages"
87 .SH NAME
88 sasl_chalprompt_t \- Realm Acquisition Callback
89
90 --- trunk.orig/man/sasl_checkapop.3
91 +++ trunk/man/sasl_checkapop.3
92 @@ -38,7 +38,7 @@
93 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
94 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
95 .\"
96 -.TH sasl_checkapop "29 June 2001" SASL "SASL man pages"
97 +.TH sasl_checkapop 3 "29 June 2001" SASL "SASL man pages"
98 .SH NAME
99 sasl_checkapop \- Check an APOP challenge/response
100 .SH SYNOPSIS
101 --- trunk.orig/man/sasl_checkpass.3
102 +++ trunk/man/sasl_checkpass.3
103 @@ -38,7 +38,7 @@
104 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
105 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
106 .\"
107 -.TH sasl_checkpass "10 July 2001" SASL "SASL man pages"
108 +.TH sasl_checkpass 3 "10 July 2001" SASL "SASL man pages"
109 .SH NAME
110 sasl_checkpass \- Check a plaintext password
111 .SH SYNOPSIS
112 --- trunk.orig/man/sasl_client_init.3
113 +++ trunk/man/sasl_client_init.3
114 @@ -38,7 +38,7 @@
115 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
116 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
117 .\"
118 -.TH sasl_client_init "21 June 2001" SASL "SASL man pages"
119 +.TH sasl_client_init 3 "21 June 2001" SASL "SASL man pages"
120 .SH NAME
121 sasl_client_init \- SASL client authentication initialization
122
123 --- trunk.orig/man/sasl_client_new.3
124 +++ trunk/man/sasl_client_new.3
125 @@ -38,7 +38,7 @@
126 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
127 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
128 .\"
129 -.TH sasl_client_new "21 June 2001" SASL "SASL man pages"
130 +.TH sasl_client_new 3 "21 June 2001" SASL "SASL man pages"
131 .SH NAME
132 sasl_client_new \- Create a new client authentication object
133
134 --- trunk.orig/man/sasl_client_start.3
135 +++ trunk/man/sasl_client_start.3
136 @@ -38,7 +38,7 @@
137 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
138 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
139 .\"
140 -.TH sasl_client_start "10 July 2001" SASL "SASL man pages"
141 +.TH sasl_client_start 3 "10 July 2001" SASL "SASL man pages"
142 .SH NAME
143 sasl_client_start \- Begin an authentication negotiation
144 .SH SYNOPSIS
145 --- trunk.orig/man/sasl_client_step.3
146 +++ trunk/man/sasl_client_step.3
147 @@ -38,7 +38,7 @@
148 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
149 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
150 .\"
151 -.TH sasl_client_step "10 July 2001" SASL "SASL man pages"
152 +.TH sasl_client_step 3 "10 July 2001" SASL "SASL man pages"
153 .SH NAME
154 sasl_client_step \- Perform a step in the authentication negotiation
155
156 --- trunk.orig/man/sasl_decode.3
157 +++ trunk/man/sasl_decode.3
158 @@ -38,7 +38,7 @@
159 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
160 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
161 .\"
162 -.TH sasl_decode "10 July 2001" SASL "SASL man pages"
163 +.TH sasl_decode 3 "10 July 2001" SASL "SASL man pages"
164 .SH NAME
165 sasl_decode \- Decode data received
166
167 --- trunk.orig/man/sasl_dispose.3
168 +++ trunk/man/sasl_dispose.3
169 @@ -38,7 +38,7 @@
170 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
171 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
172 .\"
173 -.TH sasl_dispose "10 July 2001" SASL "SASL man pages"
174 +.TH sasl_dispose 3 "10 July 2001" SASL "SASL man pages"
175 .SH NAME
176 sasl_dispose \- Dispose of a SASL connection object
177
178 --- trunk.orig/man/sasl_done.3
179 +++ trunk/man/sasl_done.3
180 @@ -38,7 +38,7 @@
181 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
182 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
183 .\"
184 -.TH sasl_done "10 July 2001" SASL "SASL man pages"
185 +.TH sasl_done 3 "10 July 2001" SASL "SASL man pages"
186 .SH NAME
187 sasl_done \- Dispose of a SASL connection object
188
189 --- trunk.orig/man/sasl_encode.3
190 +++ trunk/man/sasl_encode.3
191 @@ -38,7 +38,7 @@
192 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
193 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
194 .\"
195 -.TH sasl_encode "10 July 2001" SASL "SASL man pages"
196 +.TH sasl_encode 3 "10 July 2001" SASL "SASL man pages"
197 .SH NAME
198 sasl_encode \- Encode data for transport to authenticated host
199
200 --- trunk.orig/man/sasl_encodev.3
201 +++ trunk/man/sasl_encodev.3
202 @@ -38,7 +38,7 @@
203 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
204 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
205 .\"
206 -.TH sasl_encode "10 July 2001" SASL "SASL man pages"
207 +.TH sasl_encode 3 "10 July 2001" SASL "SASL man pages"
208 .SH NAME
209 sasl_encode \- Encode data for transport to authenticated host
210
211 --- trunk.orig/man/sasl_errdetail.3
212 +++ trunk/man/sasl_errdetail.3
213 @@ -38,7 +38,7 @@
214 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
215 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
216 .\"
217 -.TH sasl_errdetail "10 July 2001" SASL "SASL man pages"
218 +.TH sasl_errdetail 3 "10 July 2001" SASL "SASL man pages"
219 .SH NAME
220 sasl_errdetail \- Retrieve detailed information about an error
221
222 --- trunk.orig/man/sasl_errors.3
223 +++ trunk/man/sasl_errors.3
224 @@ -38,7 +38,7 @@
225 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
226 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
227 .\"
228 -.TH sasl_errors "10 July 2001" SASL "SASL man pages"
229 +.TH sasl_errors 3 "10 July 2001" SASL "SASL man pages"
230 .SH NAME
231 sasl_errors \- SASL error codes
232
233 --- trunk.orig/man/sasl_errstring.3
234 +++ trunk/man/sasl_errstring.3
235 @@ -38,7 +38,7 @@
236 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
237 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
238 .\"
239 -.TH sasl_errstring "10 July 2001" SASL "SASL man pages"
240 +.TH sasl_errstring 3 "10 July 2001" SASL "SASL man pages"
241 .SH NAME
242 sasl_errstring \- Translate a SASL return code to a human-readable form
243
244 --- trunk.orig/man/sasl_getconfpath_t.3
245 +++ trunk/man/sasl_getconfpath_t.3
246 @@ -38,7 +38,7 @@
247 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
248 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
249 .\"
250 -.TH sasl_getconfpath_t "12 February 2006" SASL "SASL man pages"
251 +.TH sasl_getconfpath_t 3 "12 February 2006" SASL "SASL man pages"
252 .SH NAME
253 sasl_getconfpath_t \- The SASL callback to indicate location of the config files
254
255 --- trunk.orig/man/sasl_getopt_t.3
256 +++ trunk/man/sasl_getopt_t.3
257 @@ -38,7 +38,7 @@
258 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
259 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
260 .\"
261 -.TH sasl_getopt_t "10 July 2001" SASL "SASL man pages"
262 +.TH sasl_getopt_t 3 "10 July 2001" SASL "SASL man pages"
263 .SH NAME
264 sasl_getopt_t \- The SASL get option callback
265
266 --- trunk.orig/man/sasl_getpath_t.3
267 +++ trunk/man/sasl_getpath_t.3
268 @@ -38,7 +38,7 @@
269 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
270 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
271 .\"
272 -.TH sasl_getpath_t "10 July 2001" SASL "SASL man pages"
273 +.TH sasl_getpath_t 3 "10 July 2001" SASL "SASL man pages"
274 .SH NAME
275 sasl_getpath_t \- The SASL callback to indicate location of the mechanism drivers
276
277 --- trunk.orig/man/sasl_getprop.3
278 +++ trunk/man/sasl_getprop.3
279 @@ -38,7 +38,7 @@
280 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
281 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
282 .\"
283 -.TH sasl_getprop "10 July 2001" SASL "SASL man pages"
284 +.TH sasl_getprop 3 "10 July 2001" SASL "SASL man pages"
285 .SH NAME
286 sasl_getprop \- Get a SASL property
287
288 --- trunk.orig/man/sasl_getrealm_t.3
289 +++ trunk/man/sasl_getrealm_t.3
290 @@ -38,7 +38,7 @@
291 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
292 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
293 .\"
294 -.TH sasl_getrealm_t "10 July 2001" SASL "SASL man pages"
295 +.TH sasl_getrealm_t 3 "10 July 2001" SASL "SASL man pages"
296 .SH NAME
297 sasl_getrealm_t \- Realm Acquisition Callback
298
299 --- trunk.orig/man/sasl_getsecret_t.3
300 +++ trunk/man/sasl_getsecret_t.3
301 @@ -38,7 +38,7 @@
302 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
303 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
304 .\"
305 -.TH sasl_getsecret_t "10 July 2001" SASL "SASL man pages"
306 +.TH sasl_getsecret_t 3 "10 July 2001" SASL "SASL man pages"
307 .SH NAME
308 sasl_getsecret_t \- The SASL callback for secrets (passwords)
309
310 --- trunk.orig/man/sasl_getsimple_t.3
311 +++ trunk/man/sasl_getsimple_t.3
312 @@ -38,7 +38,7 @@
313 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
314 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
315 .\"
316 -.TH sasl_getsimple_t "10 July 2001" SASL "SASL man pages"
317 +.TH sasl_getsimple_t 3 "10 July 2001" SASL "SASL man pages"
318 .SH NAME
319 sasl_getsimple_t \- The SASL callback for username/authname/realm
320
321 --- trunk.orig/man/sasl_global_listmech.3
322 +++ trunk/man/sasl_global_listmech.3
323 @@ -38,7 +38,7 @@
324 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
325 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
326 .\"
327 -.TH sasl_listmech "10 July 2001" SASL "SASL man pages"
328 +.TH sasl_listmech 3 "10 July 2001" SASL "SASL man pages"
329 .SH NAME
330 sasl_listmech \- Retrieve a list of the supported SASL mechanisms
331 .SH SYNOPSIS
332 --- trunk.orig/man/sasl_idle.3
333 +++ trunk/man/sasl_idle.3
334 @@ -38,7 +38,7 @@
335 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
336 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
337 .\"
338 -.TH sasl_idle "10 July 2001" SASL "SASL man pages"
339 +.TH sasl_idle 3 "10 July 2001" SASL "SASL man pages"
340 .SH NAME
341 sasl_idle \- Perform precalculations during an idle period
342
343 --- trunk.orig/man/sasl_listmech.3
344 +++ trunk/man/sasl_listmech.3
345 @@ -38,7 +38,7 @@
346 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
347 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
348 .\"
349 -.TH sasl_listmech "10 July 2001" SASL "SASL man pages"
350 +.TH sasl_listmech 3 "10 July 2001" SASL "SASL man pages"
351 .SH NAME
352 sasl_listmech \- Retrieve a list of the supported SASL mechanisms
353 .SH SYNOPSIS
354 --- trunk.orig/man/sasl_log_t.3
355 +++ trunk/man/sasl_log_t.3
356 @@ -38,7 +38,7 @@
357 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
358 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
359 .\"
360 -.TH sasl_log_t "10 July 2001" SASL "SASL man pages"
361 +.TH sasl_log_t 3 "10 July 2001" SASL "SASL man pages"
362 .SH NAME
363 sasl_log_t \- The SASL logging callback
364
365 --- trunk.orig/man/sasl_server_init.3
366 +++ trunk/man/sasl_server_init.3
367 @@ -38,7 +38,7 @@
368 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
369 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
370 .\"
371 -.TH sasl_server_init "10 July 2001" SASL "SASL man pages"
372 +.TH sasl_server_init 3 "10 July 2001" SASL "SASL man pages"
373 .SH NAME
374 sasl_server_init \- SASL server authentication initialization
375
376 --- trunk.orig/man/sasl_server_new.3
377 +++ trunk/man/sasl_server_new.3
378 @@ -38,7 +38,7 @@
379 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
380 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
381 .\"
382 -.TH sasl_server_new "16 May 2001" SASL "SASL man pages"
383 +.TH sasl_server_new 3 "16 May 2001" SASL "SASL man pages"
384 .SH NAME
385 sasl_server_new \- Create a new server authentication object
386
387 --- trunk.orig/man/sasl_server_start.3
388 +++ trunk/man/sasl_server_start.3
389 @@ -38,7 +38,7 @@
390 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
391 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
392 .\"
393 -.TH sasl_server_start "10 July 2001" SASL "SASL man pages"
394 +.TH sasl_server_start 3 "10 July 2001" SASL "SASL man pages"
395 .SH NAME
396 sasl_server_start \- Begin an authentication negotiation
397
398 --- trunk.orig/man/sasl_server_step.3
399 +++ trunk/man/sasl_server_step.3
400 @@ -38,7 +38,7 @@
401 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
402 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
403 .\"
404 -.TH sasl_server_step "10 July 2001" SASL "SASL man pages"
405 +.TH sasl_server_step 3 "10 July 2001" SASL "SASL man pages"
406 .SH NAME
407 sasl_server_step \- Perform a step in the authentication negotiation
408
409 --- trunk.orig/man/sasl_server_userdb_checkpass_t.3
410 +++ trunk/man/sasl_server_userdb_checkpass_t.3
411 @@ -38,7 +38,7 @@
412 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
413 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
414 .\"
415 -.TH sasl_server_userdb_checkpass_t "10 July 2001" SASL "SASL man pages"
416 +.TH sasl_server_userdb_checkpass_t 3 "10 July 2001" SASL "SASL man pages"
417 .SH NAME
418 sasl_server_userdb_checkpass_t \- Plaintext Password Verification Callback
419
420 --- trunk.orig/man/sasl_server_userdb_setpass_t.3
421 +++ trunk/man/sasl_server_userdb_setpass_t.3
422 @@ -38,7 +38,7 @@
423 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
424 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
425 .\"
426 -.TH sasl_server_userdb_setpass_t "10 July 2001" SASL "SASL man pages"
427 +.TH sasl_server_userdb_setpass_t 3 "10 July 2001" SASL "SASL man pages"
428 .SH NAME
429 sasl_server_userdb_setpass_t \- UserDB Plaintext Password Setting Callback
430
431 --- trunk.orig/man/sasl_setpass.3
432 +++ trunk/man/sasl_setpass.3
433 @@ -38,7 +38,7 @@
434 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
435 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
436 .\"
437 -.TH sasl_setpass "10 July 2001" SASL "SASL man pages"
438 +.TH sasl_setpass 3 "10 July 2001" SASL "SASL man pages"
439 .SH NAME
440 sasl_setpass \- Check a plaintext password
441 .SH SYNOPSIS
442 --- trunk.orig/man/sasl_setprop.3
443 +++ trunk/man/sasl_setprop.3
444 @@ -38,7 +38,7 @@
445 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
446 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
447 .\"
448 -.TH sasl_setprop "10 July 2001" SASL "SASL man pages"
449 +.TH sasl_setprop 3 "10 July 2001" SASL "SASL man pages"
450 .SH NAME
451 sasl_setprop \- Set a SASL property
452 .SH SYNOPSIS
453 --- trunk.orig/man/sasl_user_exists.3
454 +++ trunk/man/sasl_user_exists.3
455 @@ -38,7 +38,7 @@
456 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
457 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
458 .\"
459 -.TH sasl_user_exists "10 July 2001" SASL "SASL man pages"
460 +.TH sasl_user_exists 3 "10 July 2001" SASL "SASL man pages"
461 .SH NAME
462 sasl_user_exists \- Check if a user exists on server
463
464 --- trunk.orig/man/sasl_verifyfile_t.3
465 +++ trunk/man/sasl_verifyfile_t.3
466 @@ -38,7 +38,7 @@
467 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
468 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
469 .\"
470 -.TH sasl_verifyfile_t "10 July 2001" SASL "SASL man pages"
471 +.TH sasl_verifyfile_t 3 "10 July 2001" SASL "SASL man pages"
472 .SH NAME
473 sasl_verifyfile_t \- The SASL file verification
474
+0
-67
debian/patches/0008_one_time_sasl_set_alloc.diff less more
0 Author: Fabian Fagerholm <fabbe@debian.org>
1 Description: Make sasl_set_alloc a one-time function.
2 This patch will divert all allocations to whomever called
3 sasl_set_alloc first, hopefully that will be the application. If
4 not, we sure *hope* the library doing stupid things has sane
5 sasl_set_alloc semantics...
6 It will also deny any futher tries to sasl_set_alloc after one
7 of the _init functions are called.
8 This patch was introduced and works fine in SASL 1.5, and no
9 applications started behaving in insane ways, so chances are it
10 will also work with SASL 2.1
11 Reference: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=139568
12 Reference: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=274087
13 Reference: https://bugzilla.andrew.cmu.edu/show_bug.cgi?id=2525
14 --- trunk.orig/lib/client.c
15 +++ trunk/lib/client.c
16 @@ -202,6 +202,9 @@
17 { NULL, NULL }
18 };
19
20 + /* lock allocation type */
21 + _sasl_allocation_locked++;
22 +
23 if(_sasl_client_active) {
24 /* We're already active, just increase our refcount */
25 /* xxx do something with the callback structure? */
26 --- trunk.orig/lib/common.c
27 +++ trunk/lib/common.c
28 @@ -107,6 +107,7 @@
29 (sasl_realloc_t *) &realloc,
30 (sasl_free_t *) &free
31 };
32 +int _sasl_allocation_locked = 0;
33
34 #define SASL_ENCODEV_EXTRA 4096
35
36 @@ -637,6 +638,8 @@
37 sasl_realloc_t *r,
38 sasl_free_t *f)
39 {
40 + if (_sasl_allocation_locked++) return;
41 +
42 _sasl_allocation_utils.malloc=m;
43 _sasl_allocation_utils.calloc=c;
44 _sasl_allocation_utils.realloc=r;
45 --- trunk.orig/lib/saslint.h
46 +++ trunk/lib/saslint.h
47 @@ -300,6 +300,7 @@
48
49 extern sasl_allocation_utils_t _sasl_allocation_utils;
50 extern sasl_mutex_utils_t _sasl_mutex_utils;
51 +extern int _sasl_allocation_locked;
52
53 /*
54 * checkpw.c
55 --- trunk.orig/lib/server.c
56 +++ trunk/lib/server.c
57 @@ -698,6 +698,9 @@
58 { NULL, NULL }
59 };
60
61 + /* lock allocation type */
62 + _sasl_allocation_locked++;
63 +
64 /* we require the appname (if present) to be short enough to be a path */
65 if (appname != NULL && strlen(appname) >= PATH_MAX)
66 return SASL_BADPARAM;
+4
-4
debian/patches/0010_maintainer_mode.diff less more
00 Author: Fabian Fagerholm <fabbe@debian.org>
11 Description: Enable maintainer mode to avoid auto* problems.
2 --- trunk.orig/configure.in
3 +++ trunk/configure.in
4 @@ -62,6 +62,8 @@
5 AM_INIT_AUTOMAKE(cyrus-sasl, 2.1.23)
2 --- a/configure.in
3 +++ b/configure.in
4 @@ -62,6 +62,8 @@ dnl
5 AM_INIT_AUTOMAKE(cyrus-sasl, 2.1.24)
66 CMU_INIT_AUTOMAKE
77
88 +AM_MAINTAINER_MODE
+3
-3
debian/patches/0011_saslauthd_ac_prog_libtool.diff less more
00 Author: Fabian Fagerholm <fabbe@debian.org>
11 Description: Enable libtool use.
2 --- trunk.orig/saslauthd/configure.in
3 +++ trunk/saslauthd/configure.in
4 @@ -25,6 +25,7 @@
2 --- a/saslauthd/configure.in
3 +++ b/saslauthd/configure.in
4 @@ -25,6 +25,7 @@ AC_PROG_AWK
55 AC_PROG_MAKE_SET
66 AC_PROG_LN_S
77 AC_PROG_INSTALL
+7
-4
debian/patches/0012_xopen_crypt_prototype.diff less more
55 for build log lines such as the following:
66 auth_shadow.c:183: warning: implicit declaration of function ‘crypt’
77 auth_shadow.c:183: warning: cast to pointer from integer of different size
8 --- trunk.orig/saslauthd/auth_shadow.c
9 +++ trunk/saslauthd/auth_shadow.c
10 @@ -1,3 +1,4 @@
8 --- a/saslauthd/auth_shadow.c
9 +++ b/saslauthd/auth_shadow.c
10 @@ -36,6 +36,7 @@
11
12 #ifdef AUTH_SHADOW
13
1114 +#define _XOPEN_SOURCE
1215 #define PWBUFSZ 256 /***SWB***/
1316
14 /* MODULE: auth_shadow */
17 # include <unistd.h>
+0
-13
debian/patches/0013_fix_hurd_build.diff less more
0 Author: Michael Banck <mbanck@debian.org>
1 Description: Include config.h so that MAXHOSTNAMELEN is available when
2 building on hurd-i386.
3 --- trunk.orig/saslauthd/auth_sasldb.c
4 +++ trunk/saslauthd/auth_sasldb.c
5 @@ -41,6 +41,7 @@
6 #include <string.h>
7 #include <stdlib.h>
8 #include <pwd.h>
9 +#include <config.h>
10 /* END PUBLIC DEPENDENCIES */
11
12 #define RETURN(x) return strdup(x)
+6
-6
debian/patches/0014_avoid_pic_overwrite.diff less more
33 which is created out of PIC objects. The PIC version is placed in .libs, and
44 the non-PIC version in the current directory. This ensures that both non-PIC
55 and PIC versions are available in the correct locations.
6 --- trunk.orig/lib/Makefile.am
7 +++ trunk/lib/Makefile.am
8 @@ -76,7 +76,7 @@
6 --- a/lib/Makefile.am
7 +++ b/lib/Makefile.am
8 @@ -78,7 +78,7 @@ endif
99
1010 libsasl2.a: libsasl2.la $(SASL_STATIC_OBJS)
1111 @echo adding static plugins and dependencies
1414 @for i in ./libsasl2.la ../sasldb/libsasldb.la ../plugins/lib*.la; do \
1515 if test ! -f $$i; then continue; fi; . $$i; \
1616 for j in $$dependency_libs foo; do \
17 --- trunk.orig/sasldb/Makefile.am
18 +++ trunk/sasldb/Makefile.am
19 @@ -63,6 +63,6 @@
17 --- a/sasldb/Makefile.am
18 +++ b/sasldb/Makefile.am
19 @@ -63,6 +63,6 @@ libsasldb_a_SOURCES =
2020 EXTRA_libsasldb_a_SOURCES =
2121
2222 libsasldb.a: libsasldb.la $(SASL_DB_BACKEND_STATIC)
+0
-24
debian/patches/0016_pid_file_lock_creation_mask.diff less more
0 Author: Sam Hocevar <sam@zoy.org>
1 Description: pid_file_lock is created with a mask of 644 instead of 0644. This
2 patch fixes this octal/decimal confusion as well as the (harmless) one in the
3 previous umask() call.
4 --- trunk.orig/saslauthd/saslauthd-main.c
5 +++ trunk/saslauthd/saslauthd-main.c
6 @@ -276,7 +276,7 @@
7 exit(1);
8 }
9
10 - umask(077);
11 + umask(0077);
12
13 pid_file_size = strlen(run_path) + sizeof(PID_FILE_LOCK) + 1;
14 if ((pid_file_lock = malloc(pid_file_size)) == NULL) {
15 @@ -287,7 +287,7 @@
16 strlcpy(pid_file_lock, run_path, pid_file_size);
17 strlcat(pid_file_lock, PID_FILE_LOCK, pid_file_size);
18
19 - if ((pid_file_lock_fd = open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 644)) < 0) {
20 + if ((pid_file_lock_fd = open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 0644)) < 0) {
21 rc = errno;
22 logger(L_ERR, L_FUNC, "could not open pid lock file: %s", pid_file_lock);
23 logger(L_ERR, L_FUNC, "open: %s", strerror(rc));
+18
-18
debian/patches/0017_db4.8.diff less more
00 Author: Fabian Fagerholm <fabbe@debian.org>
11 Description: Support and build against db4.8.
2 --- trunk.orig/aclocal.m4
3 +++ trunk/aclocal.m4
4 @@ -1741,7 +1741,7 @@
2 --- a/aclocal.m4
3 +++ b/aclocal.m4
4 @@ -1741,7 +1741,7 @@ AC_DEFUN([CYRUS_BERKELEY_DB_CHK_LIB],
55 fi
66
77 saved_LIBS=$LIBS
8 - for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
9 + for dbname in db-4.8 db4.8 db48 db-4.7 db4.7 db47 db-4.6 db4.6 db46 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
8 - for dbname in ${with_bdb} db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
9 + for dbname in db
1010 do
1111 LIBS="$saved_LIBS -l$dbname"
12 AC_TRY_LINK([#include <db.h>],
13 --- trunk.orig/cmulocal/berkdb.m4
14 +++ trunk/cmulocal/berkdb.m4
15 @@ -213,7 +213,7 @@
12 AC_TRY_LINK([#include <stdio.h>
13 --- a/cmulocal/berkdb.m4
14 +++ b/cmulocal/berkdb.m4
15 @@ -213,7 +213,7 @@ AC_DEFUN([CYRUS_BERKELEY_DB_CHK_LIB],
1616 fi
1717
1818 saved_LIBS=$LIBS
19 - for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
20 + for dbname in db-4.8 db4.8 db48 db-4.7 db4.7 db47 db-4.6 db4.6 db46 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
19 - for dbname in ${with_bdb} db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
20 + for dbname in db
2121 do
2222 LIBS="$saved_LIBS -l$dbname"
23 AC_TRY_LINK([#include <db.h>],
24 --- trunk.orig/saslauthd/aclocal.m4
25 +++ trunk/saslauthd/aclocal.m4
26 @@ -2066,7 +2066,7 @@
23 AC_TRY_LINK([#include <stdio.h>
24 --- a/saslauthd/aclocal.m4
25 +++ b/saslauthd/aclocal.m4
26 @@ -2068,7 +2068,7 @@ AC_DEFUN([CYRUS_BERKELEY_DB_CHK_LIB],
2727 fi
2828
2929 saved_LIBS=$LIBS
30 - for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
31 + for dbname in db-4.8 db4.8 db48 db-4.7 db4.7 db47 db-4.6 db4.6 db46 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
30 - for dbname in ${with_bdb} db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
31 + for dbname in db
3232 do
3333 LIBS="$saved_LIBS -l$dbname"
34 AC_TRY_LINK([#include <db.h>],
34 AC_TRY_LINK([#include <stdio.h>
+0
-32
debian/patches/0018_auth_rimap_quotes.diff less more
0 Author: Fabian Fagerholm <fabbe@debian.org>
1 Description: Avoid infinite loop when username/password has a double quote
2 character.
3 Upstream change: https://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/sasl/saslauthd/auth_rimap.c.diff?r1=1.12;r2=1.13
4 --- trunk.orig/saslauthd/auth_rimap.c
5 +++ trunk/saslauthd/auth_rimap.c
6 @@ -162,6 +162,7 @@
7 num_quotes = 0;
8 p1 = s;
9 while ((p1 = strchr(p1, '"')) != NULL) {
10 + p1++;
11 num_quotes++;
12 }
13
14 @@ -438,7 +439,7 @@
15 syslog(LOG_WARNING, "auth_rimap: writev: %m");
16 memset(qlogin, 0, strlen(qlogin));
17 free(qlogin);
18 - memset(qpass, 0, strlen(qlogin));
19 + memset(qpass, 0, strlen(qpass));
20 free(qpass);
21 (void)close(s);
22 return strdup(RESP_IERROR);
23 @@ -447,7 +448,7 @@
24 /* don't need these any longer */
25 memset(qlogin, 0, strlen(qlogin));
26 free(qlogin);
27 - memset(qpass, 0, strlen(qlogin));
28 + memset(qpass, 0, strlen(qpass));
29 free(qpass);
30
31 /* read and parse the LOGIN response */
+0
-18
debian/patches/0019_ldap_deprecated.diff less more
0 Author: Dann Frazier <dannf@debian.org>
1 Description: The function ldap_get_values, used in saslauthd/lak.c, is
2 deprecated. Therefore, its prototype is not included by default when compiling
3 against the ldap.h headers. As a result, the compiler cannot know the return
4 type of the function at compile time, and will implicitly convert to a pointer.
5 This has implications on 64-bit systems. This patch sets the deprecation mode
6 on, so that the function prototype gets included when compiling.
7 (Description by Fabian Fagerholm <fabbe@debian.org>)
8 --- trunk.orig/saslauthd/lak.c
9 +++ trunk/saslauthd/lak.c
10 @@ -55,6 +55,7 @@
11 #include <openssl/des.h>
12 #endif
13
14 +#define LDAP_DEPRECATED 1
15 #include <ldap.h>
16 #include <lber.h>
17 #include <sasl.h>
+0
-19
debian/patches/0021_no_mutex_changes_after_init.diff less more
0 Author: Fabian Fagerholm <fabbe@paniq.net>
1 Description: Disallow mutex function changes once sasl_client_init and/or
2 sasl_server_init is called. Hand-picked and applied change from upstream CVS
3 revision 1.117.
4 --- trunk.orig/lib/common.c
5 +++ trunk/lib/common.c
6 @@ -153,6 +153,12 @@
7 void sasl_set_mutex(sasl_mutex_alloc_t *n, sasl_mutex_lock_t *l,
8 sasl_mutex_unlock_t *u, sasl_mutex_free_t *d)
9 {
10 + /* Disallow mutex function changes once sasl_client_init
11 + and/or sasl_server_init is called */
12 + if (_sasl_server_cleanup_hook || _sasl_client_cleanup_hook) {
13 + return;
14 + }
15 +
16 _sasl_mutex_utils.alloc=n;
17 _sasl_mutex_utils.lock=l;
18 _sasl_mutex_utils.unlock=u;
+0
-23
debian/patches/0022_gcc4.4_preprocessor_syntax.diff less more
0 Author: Fabian Fagerholm <fabbe@paniq.net>
1 Description: The #elif preprocessor directive requires a test condition.
2 GCC 4.4 enforces this rule.
3 --- trunk.orig/plugins/digestmd5.c
4 +++ trunk/plugins/digestmd5.c
5 @@ -2715,7 +2715,7 @@
6 "DIGEST-MD5", /* mech_name */
7 #ifdef WITH_RC4
8 128, /* max_ssf */
9 -#elif WITH_DES
10 +#elif defined(WITH_DES)
11 112,
12 #else
13 1,
14 @@ -4034,7 +4034,7 @@
15 "DIGEST-MD5",
16 #ifdef WITH_RC4 /* mech_name */
17 128, /* max ssf */
18 -#elif WITH_DES
19 +#elif defined(WITH_DES)
20 112,
21 #else
22 1,
+3
-3
debian/patches/0024_allow_detection_of_heimdal.diff less more
00 Author: Roberto C. Sanchez <roberto@connexer.com>
11 Description: A patch to allow recognition of Heimdal with the heimdal-multidev
22 package
3 --- trunk.orig/plugins/gssapi.c
4 +++ trunk/plugins/gssapi.c
5 @@ -86,7 +86,7 @@
3 --- a/plugins/gssapi.c
4 +++ b/plugins/gssapi.c
5 @@ -86,7 +86,7 @@ static const char plugin_id[] = "$Id: gs
66
77 static const char * GSSAPI_BLANK_STRING = "";
88
+6
-6
debian/patches/0025_ld_as_needed.diff less more
00 Author: Matthias Klose <doko@ubuntu.com>
11 Desription: Fix FTBFS, add $(SASL_DB_LIB) as dependency to libsasldb, and use
22 it.
3 --- trunk.orig/saslauthd/Makefile.am
4 +++ trunk/saslauthd/Makefile.am
5 @@ -16,7 +16,7 @@
3 --- a/saslauthd/Makefile.am
4 +++ b/saslauthd/Makefile.am
5 @@ -16,7 +16,7 @@ EXTRA_saslauthd_sources = getaddrinfo.c
66 saslauthd_DEPENDENCIES = saslauthd-main.o @LTLIBOBJS@
77 saslauthd_LDADD = @SASL_KRB_LIB@ \
88 @GSSAPIBASE_LIBS@ @GSSAPI_LIBS@ @LIB_CRYPT@ @LIB_SIA@ \
1111
1212 testsaslauthd_SOURCES = testsaslauthd.c utils.c
1313 testsaslauthd_LDADD = @LIB_SOCKET@
14 --- trunk.orig/sasldb/Makefile.am
15 +++ trunk/sasldb/Makefile.am
16 @@ -55,8 +55,8 @@
14 --- a/sasldb/Makefile.am
15 +++ b/sasldb/Makefile.am
16 @@ -55,8 +55,8 @@ noinst_LIBRARIES = libsasldb.a
1717
1818 libsasldb_la_SOURCES = allockey.c sasldb.h
1919 EXTRA_libsasldb_la_SOURCES = $(extra_common_sources)
+9
-9
debian/patches/0026_drop_krb5support_dependency.diff less more
00 Author: Roberto C. Sanchez <roberto@connexer.com>
11 Description: Drop gratuitous dependency on krb5support
2 --- trunk.orig/aclocal.m4
3 +++ trunk/aclocal.m4
4 @@ -2924,9 +2924,6 @@
2 --- a/aclocal.m4
3 +++ b/aclocal.m4
4 @@ -2928,9 +2928,6 @@ if test "$gssapi" != no; then
55 fi
66
77 if test "$gss_impl" = "auto" -o "$gss_impl" = "mit"; then
1111 gss_failed=0
1212 AC_CHECK_LIB(gssapi_krb5,gss_unwrap,gss_impl="mit",gss_failed=1,
1313 ${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP} ${LIB_SOCKET})
14 --- trunk.orig/cmulocal/sasl2.m4
15 +++ trunk/cmulocal/sasl2.m4
16 @@ -110,9 +110,6 @@
14 --- a/cmulocal/sasl2.m4
15 +++ b/cmulocal/sasl2.m4
16 @@ -112,9 +112,6 @@ if test "$gssapi" != no; then
1717 fi
1818
1919 if test "$gss_impl" = "auto" -o "$gss_impl" = "mit"; then
2323 gss_failed=0
2424 AC_CHECK_LIB(gssapi_krb5,gss_unwrap,gss_impl="mit",gss_failed=1,
2525 ${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP} ${LIB_SOCKET})
26 --- trunk.orig/saslauthd/aclocal.m4
27 +++ trunk/saslauthd/aclocal.m4
28 @@ -1333,9 +1333,6 @@
26 --- a/saslauthd/aclocal.m4
27 +++ b/saslauthd/aclocal.m4
28 @@ -1335,9 +1335,6 @@ if test "$gssapi" != no; then
2929 fi
3030
3131 if test "$gss_impl" = "auto" -o "$gss_impl" = "mit"; then
+1
-12
debian/patches/0027_db5_support.diff less more
11 Description: Support newer Berkeley DB versions
22 --- a/sasldb/db_berkeley.c
33 +++ b/sasldb/db_berkeley.c
4 @@ -100,7 +100,7 @@ static int berkeleydb_open(const sasl_ut
4 @@ -101,7 +101,7 @@ static int berkeleydb_open(const sasl_ut
55 ret = db_create(mbdb, NULL, 0);
66 if (ret == 0 && *mbdb != NULL)
77 {
2121 ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664);
2222 #else
2323 ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664);
24 --- a/cmulocal/berkdb.m4
25 +++ b/cmulocal/berkdb.m4
26 @@ -213,7 +213,7 @@ AC_DEFUN([CYRUS_BERKELEY_DB_CHK_LIB],
27 fi
28
29 saved_LIBS=$LIBS
30 - for dbname in db-4.8 db4.8 db48 db-4.7 db4.7 db47 db-4.6 db4.6 db46 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
31 + for dbname in db
32 do
33 LIBS="$saved_LIBS -l$dbname"
34 AC_TRY_LINK([#include <db.h>],
+0
-8
debian/patches/series less more
33 0004_missing_man_pages.diff
44 0005_dbconverter.diff
55 0006_library_mutexes.diff
6 0007_manpages_section.diff
7 0008_one_time_sasl_set_alloc.diff
86 0009_sasldb_al.diff
97 0010_maintainer_mode.diff
108 0011_saslauthd_ac_prog_libtool.diff
119 0012_xopen_crypt_prototype.diff
12 0013_fix_hurd_build.diff
1310 0014_avoid_pic_overwrite.diff
14 0016_pid_file_lock_creation_mask.diff
1511 0017_db4.8.diff
16 0018_auth_rimap_quotes.diff
17 0019_ldap_deprecated.diff
18 0021_no_mutex_changes_after_init.diff
19 0022_gcc4.4_preprocessor_syntax.diff
2012 0024_allow_detection_of_heimdal.diff
2113 0025_ld_as_needed.diff
2214 0026_drop_krb5support_dependency.diff