diff --git a/debian/patches/0006_library_mutexes.diff b/debian/patches/0006_library_mutexes.diff index 539bc06..59e26e8 100644 --- a/debian/patches/0006_library_mutexes.diff +++ b/debian/patches/0006_library_mutexes.diff @@ -1,17 +1,17 @@ Author: Fabian Fagerholm Description: Exact description unknown; make sure mutex-related code works. ---- trunk.orig/lib/common.c -+++ trunk/lib/common.c -@@ -771,7 +771,7 @@ +--- a/lib/common.c ++++ b/lib/common.c +@@ -818,7 +818,7 @@ int _sasl_common_init(sasl_global_callba result = sasl_canonuser_add_plugin("INTERNAL", internal_canonuser_init); if(result != SASL_OK) return result; -- if (!free_mutex) -+ if (!free_mutex || free_mutex == 0x1) +- if (!free_mutex) { ++ if (!free_mutex || free_mutex == 0x1) { free_mutex = sasl_MUTEX_ALLOC(); + } if (!free_mutex) return SASL_FAIL; - -@@ -790,6 +790,11 @@ +@@ -838,6 +838,11 @@ void sasl_dispose(sasl_conn_t **pconn) /* serialize disposes. this is necessary because we can't dispose of conn->mutex if someone else is locked on it */ diff --git a/debian/patches/0007_manpages_section.diff b/debian/patches/0007_manpages_section.diff deleted file mode 100644 index 62caea6..0000000 --- a/debian/patches/0007_manpages_section.diff +++ /dev/null @@ -1,475 +0,0 @@ -Author: Fabian Fagerholm -Description: Put man pages in correct section. ---- trunk.orig/man/sasl.3 -+++ trunk/man/sasl.3 -@@ -38,7 +38,7 @@ - .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - .\" --.TH SASL "10 July 2001" SASL "SASL man pages" -+.TH SASL 3 "10 July 2001" SASL "SASL man pages" - .SH NAME - SASL \- SASL authentication library - .SH DESCRIPTION ---- trunk.orig/man/sasl_authorize_t.3 -+++ trunk/man/sasl_authorize_t.3 -@@ -38,7 +38,7 @@ - .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - .\" --.TH sasl_authorize_t "10 July 2001" SASL "SASL man pages" -+.TH sasl_authorize_t 3 "10 July 2001" SASL "SASL man pages" - .SH NAME - sasl_authorize_t \- The SASL authorization callback - ---- trunk.orig/man/sasl_auxprop.3 -+++ trunk/man/sasl_auxprop.3 -@@ -38,7 +38,7 @@ - .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - .\" --.TH sasl_auxprop "10 July 2001" SASL "SASL man pages" -+.TH sasl_auxprop 3 "10 July 2001" SASL "SASL man pages" - .SH NAME - sasl_auxprop \- How to work with SASL auxiliary properties - ---- trunk.orig/man/sasl_auxprop_getctx.3 -+++ trunk/man/sasl_auxprop_getctx.3 -@@ -38,7 +38,7 @@ - .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - .\" --.TH sasl_auxprop_getctx "10 July 2001" SASL "SASL man pages" -+.TH sasl_auxprop_getctx 3 "10 July 2001" SASL "SASL man pages" - .SH NAME - sasl_auxprop_getctx \- Acquire an auxiliary property context - ---- trunk.orig/man/sasl_auxprop_request.3 -+++ trunk/man/sasl_auxprop_request.3 -@@ -38,7 +38,7 @@ - .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - .\" --.TH sasl_auxprop_request "10 July 2001" SASL "SASL man pages" -+.TH sasl_auxprop_request 3 "10 July 2001" SASL "SASL man pages" - .SH NAME - sasl_auxprop_request \- Request Auxiliary Properties from SASL - ---- trunk.orig/man/sasl_callbacks.3 -+++ trunk/man/sasl_callbacks.3 -@@ -38,7 +38,7 @@ - .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - .\" --.TH sasl_callbacks "12 February 2006" SASL "SASL man pages" -+.TH sasl_callbacks 3 "12 February 2006" SASL "SASL man pages" - .SH NAME - sasl_callbacks \- How to work with SASL callbacks - ---- trunk.orig/man/sasl_canon_user_t.3 -+++ trunk/man/sasl_canon_user_t.3 -@@ -38,7 +38,7 @@ - .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - .\" --.TH sasl_server_userdb_checkpass_t "10 July 2001" SASL "SASL man pages" -+.TH sasl_server_userdb_checkpass_t 3 "10 July 2001" SASL "SASL man pages" - .SH NAME - sasl_server_userdb_checkpass_t \- Plaintext Password Verification Callback - ---- trunk.orig/man/sasl_chalprompt_t.3 -+++ trunk/man/sasl_chalprompt_t.3 -@@ -38,7 +38,7 @@ - .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - .\" --.TH sasl_chalprompt_t "10 July 2001" SASL "SASL man pages" -+.TH sasl_chalprompt_t 3 "10 July 2001" SASL "SASL man pages" - .SH NAME - sasl_chalprompt_t \- Realm Acquisition Callback - ---- trunk.orig/man/sasl_checkapop.3 -+++ trunk/man/sasl_checkapop.3 -@@ -38,7 +38,7 @@ - .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - .\" --.TH sasl_checkapop "29 June 2001" SASL "SASL man pages" -+.TH sasl_checkapop 3 "29 June 2001" SASL "SASL man pages" - .SH NAME - sasl_checkapop \- Check an APOP challenge/response - .SH SYNOPSIS ---- trunk.orig/man/sasl_checkpass.3 -+++ trunk/man/sasl_checkpass.3 -@@ -38,7 +38,7 @@ - .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - .\" --.TH sasl_checkpass "10 July 2001" SASL "SASL man pages" -+.TH sasl_checkpass 3 "10 July 2001" SASL "SASL man pages" - .SH NAME - sasl_checkpass \- Check a plaintext password - .SH SYNOPSIS ---- trunk.orig/man/sasl_client_init.3 -+++ trunk/man/sasl_client_init.3 -@@ -38,7 +38,7 @@ - .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - .\" --.TH sasl_client_init "21 June 2001" SASL "SASL man pages" -+.TH sasl_client_init 3 "21 June 2001" SASL "SASL man pages" - .SH NAME - sasl_client_init \- SASL client authentication initialization - ---- trunk.orig/man/sasl_client_new.3 -+++ trunk/man/sasl_client_new.3 -@@ -38,7 +38,7 @@ - .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - .\" --.TH sasl_client_new "21 June 2001" SASL "SASL man pages" -+.TH sasl_client_new 3 "21 June 2001" SASL "SASL man pages" - .SH NAME - sasl_client_new \- Create a new client authentication object - ---- trunk.orig/man/sasl_client_start.3 -+++ trunk/man/sasl_client_start.3 -@@ -38,7 +38,7 @@ - .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - .\" --.TH sasl_client_start "10 July 2001" SASL "SASL man pages" -+.TH sasl_client_start 3 "10 July 2001" SASL "SASL man pages" - .SH NAME - sasl_client_start \- Begin an authentication negotiation - .SH SYNOPSIS ---- trunk.orig/man/sasl_client_step.3 -+++ trunk/man/sasl_client_step.3 -@@ -38,7 +38,7 @@ - .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - .\" --.TH sasl_client_step "10 July 2001" SASL "SASL man pages" -+.TH sasl_client_step 3 "10 July 2001" SASL "SASL man pages" - .SH NAME - sasl_client_step \- Perform a step in the authentication negotiation - ---- trunk.orig/man/sasl_decode.3 -+++ trunk/man/sasl_decode.3 -@@ -38,7 +38,7 @@ - .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - .\" --.TH sasl_decode "10 July 2001" SASL "SASL man pages" -+.TH sasl_decode 3 "10 July 2001" SASL "SASL man pages" - .SH NAME - sasl_decode \- Decode data received - ---- trunk.orig/man/sasl_dispose.3 -+++ trunk/man/sasl_dispose.3 -@@ -38,7 +38,7 @@ - .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - .\" --.TH sasl_dispose "10 July 2001" SASL "SASL man pages" -+.TH sasl_dispose 3 "10 July 2001" SASL "SASL man pages" - .SH NAME - sasl_dispose \- Dispose of a SASL connection object - ---- trunk.orig/man/sasl_done.3 -+++ trunk/man/sasl_done.3 -@@ -38,7 +38,7 @@ - .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - .\" --.TH sasl_done "10 July 2001" SASL "SASL man pages" -+.TH sasl_done 3 "10 July 2001" SASL "SASL man pages" - .SH NAME - sasl_done \- Dispose of a SASL connection object - ---- trunk.orig/man/sasl_encode.3 -+++ trunk/man/sasl_encode.3 -@@ -38,7 +38,7 @@ - .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - .\" --.TH sasl_encode "10 July 2001" SASL "SASL man pages" -+.TH sasl_encode 3 "10 July 2001" SASL "SASL man pages" - .SH NAME - sasl_encode \- Encode data for transport to authenticated host - ---- trunk.orig/man/sasl_encodev.3 -+++ trunk/man/sasl_encodev.3 -@@ -38,7 +38,7 @@ - .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - .\" --.TH sasl_encode "10 July 2001" SASL "SASL man pages" -+.TH sasl_encode 3 "10 July 2001" SASL "SASL man pages" - .SH NAME - sasl_encode \- Encode data for transport to authenticated host - ---- trunk.orig/man/sasl_errdetail.3 -+++ trunk/man/sasl_errdetail.3 -@@ -38,7 +38,7 @@ - .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - .\" --.TH sasl_errdetail "10 July 2001" SASL "SASL man pages" -+.TH sasl_errdetail 3 "10 July 2001" SASL "SASL man pages" - .SH NAME - sasl_errdetail \- Retrieve detailed information about an error - ---- trunk.orig/man/sasl_errors.3 -+++ trunk/man/sasl_errors.3 -@@ -38,7 +38,7 @@ - .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - .\" --.TH sasl_errors "10 July 2001" SASL "SASL man pages" -+.TH sasl_errors 3 "10 July 2001" SASL "SASL man pages" - .SH NAME - sasl_errors \- SASL error codes - ---- trunk.orig/man/sasl_errstring.3 -+++ trunk/man/sasl_errstring.3 -@@ -38,7 +38,7 @@ - .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - .\" --.TH sasl_errstring "10 July 2001" SASL "SASL man pages" -+.TH sasl_errstring 3 "10 July 2001" SASL "SASL man pages" - .SH NAME - sasl_errstring \- Translate a SASL return code to a human-readable form - ---- trunk.orig/man/sasl_getconfpath_t.3 -+++ trunk/man/sasl_getconfpath_t.3 -@@ -38,7 +38,7 @@ - .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - .\" --.TH sasl_getconfpath_t "12 February 2006" SASL "SASL man pages" -+.TH sasl_getconfpath_t 3 "12 February 2006" SASL "SASL man pages" - .SH NAME - sasl_getconfpath_t \- The SASL callback to indicate location of the config files - ---- trunk.orig/man/sasl_getopt_t.3 -+++ trunk/man/sasl_getopt_t.3 -@@ -38,7 +38,7 @@ - .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - .\" --.TH sasl_getopt_t "10 July 2001" SASL "SASL man pages" -+.TH sasl_getopt_t 3 "10 July 2001" SASL "SASL man pages" - .SH NAME - sasl_getopt_t \- The SASL get option callback - ---- trunk.orig/man/sasl_getpath_t.3 -+++ trunk/man/sasl_getpath_t.3 -@@ -38,7 +38,7 @@ - .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - .\" --.TH sasl_getpath_t "10 July 2001" SASL "SASL man pages" -+.TH sasl_getpath_t 3 "10 July 2001" SASL "SASL man pages" - .SH NAME - sasl_getpath_t \- The SASL callback to indicate location of the mechanism drivers - ---- trunk.orig/man/sasl_getprop.3 -+++ trunk/man/sasl_getprop.3 -@@ -38,7 +38,7 @@ - .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - .\" --.TH sasl_getprop "10 July 2001" SASL "SASL man pages" -+.TH sasl_getprop 3 "10 July 2001" SASL "SASL man pages" - .SH NAME - sasl_getprop \- Get a SASL property - ---- trunk.orig/man/sasl_getrealm_t.3 -+++ trunk/man/sasl_getrealm_t.3 -@@ -38,7 +38,7 @@ - .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - .\" --.TH sasl_getrealm_t "10 July 2001" SASL "SASL man pages" -+.TH sasl_getrealm_t 3 "10 July 2001" SASL "SASL man pages" - .SH NAME - sasl_getrealm_t \- Realm Acquisition Callback - ---- trunk.orig/man/sasl_getsecret_t.3 -+++ trunk/man/sasl_getsecret_t.3 -@@ -38,7 +38,7 @@ - .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - .\" --.TH sasl_getsecret_t "10 July 2001" SASL "SASL man pages" -+.TH sasl_getsecret_t 3 "10 July 2001" SASL "SASL man pages" - .SH NAME - sasl_getsecret_t \- The SASL callback for secrets (passwords) - ---- trunk.orig/man/sasl_getsimple_t.3 -+++ trunk/man/sasl_getsimple_t.3 -@@ -38,7 +38,7 @@ - .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - .\" --.TH sasl_getsimple_t "10 July 2001" SASL "SASL man pages" -+.TH sasl_getsimple_t 3 "10 July 2001" SASL "SASL man pages" - .SH NAME - sasl_getsimple_t \- The SASL callback for username/authname/realm - ---- trunk.orig/man/sasl_global_listmech.3 -+++ trunk/man/sasl_global_listmech.3 -@@ -38,7 +38,7 @@ - .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - .\" --.TH sasl_listmech "10 July 2001" SASL "SASL man pages" -+.TH sasl_listmech 3 "10 July 2001" SASL "SASL man pages" - .SH NAME - sasl_listmech \- Retrieve a list of the supported SASL mechanisms - .SH SYNOPSIS ---- trunk.orig/man/sasl_idle.3 -+++ trunk/man/sasl_idle.3 -@@ -38,7 +38,7 @@ - .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - .\" --.TH sasl_idle "10 July 2001" SASL "SASL man pages" -+.TH sasl_idle 3 "10 July 2001" SASL "SASL man pages" - .SH NAME - sasl_idle \- Perform precalculations during an idle period - ---- trunk.orig/man/sasl_listmech.3 -+++ trunk/man/sasl_listmech.3 -@@ -38,7 +38,7 @@ - .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - .\" --.TH sasl_listmech "10 July 2001" SASL "SASL man pages" -+.TH sasl_listmech 3 "10 July 2001" SASL "SASL man pages" - .SH NAME - sasl_listmech \- Retrieve a list of the supported SASL mechanisms - .SH SYNOPSIS ---- trunk.orig/man/sasl_log_t.3 -+++ trunk/man/sasl_log_t.3 -@@ -38,7 +38,7 @@ - .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - .\" --.TH sasl_log_t "10 July 2001" SASL "SASL man pages" -+.TH sasl_log_t 3 "10 July 2001" SASL "SASL man pages" - .SH NAME - sasl_log_t \- The SASL logging callback - ---- trunk.orig/man/sasl_server_init.3 -+++ trunk/man/sasl_server_init.3 -@@ -38,7 +38,7 @@ - .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - .\" --.TH sasl_server_init "10 July 2001" SASL "SASL man pages" -+.TH sasl_server_init 3 "10 July 2001" SASL "SASL man pages" - .SH NAME - sasl_server_init \- SASL server authentication initialization - ---- trunk.orig/man/sasl_server_new.3 -+++ trunk/man/sasl_server_new.3 -@@ -38,7 +38,7 @@ - .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - .\" --.TH sasl_server_new "16 May 2001" SASL "SASL man pages" -+.TH sasl_server_new 3 "16 May 2001" SASL "SASL man pages" - .SH NAME - sasl_server_new \- Create a new server authentication object - ---- trunk.orig/man/sasl_server_start.3 -+++ trunk/man/sasl_server_start.3 -@@ -38,7 +38,7 @@ - .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - .\" --.TH sasl_server_start "10 July 2001" SASL "SASL man pages" -+.TH sasl_server_start 3 "10 July 2001" SASL "SASL man pages" - .SH NAME - sasl_server_start \- Begin an authentication negotiation - ---- trunk.orig/man/sasl_server_step.3 -+++ trunk/man/sasl_server_step.3 -@@ -38,7 +38,7 @@ - .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - .\" --.TH sasl_server_step "10 July 2001" SASL "SASL man pages" -+.TH sasl_server_step 3 "10 July 2001" SASL "SASL man pages" - .SH NAME - sasl_server_step \- Perform a step in the authentication negotiation - ---- trunk.orig/man/sasl_server_userdb_checkpass_t.3 -+++ trunk/man/sasl_server_userdb_checkpass_t.3 -@@ -38,7 +38,7 @@ - .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - .\" --.TH sasl_server_userdb_checkpass_t "10 July 2001" SASL "SASL man pages" -+.TH sasl_server_userdb_checkpass_t 3 "10 July 2001" SASL "SASL man pages" - .SH NAME - sasl_server_userdb_checkpass_t \- Plaintext Password Verification Callback - ---- trunk.orig/man/sasl_server_userdb_setpass_t.3 -+++ trunk/man/sasl_server_userdb_setpass_t.3 -@@ -38,7 +38,7 @@ - .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - .\" --.TH sasl_server_userdb_setpass_t "10 July 2001" SASL "SASL man pages" -+.TH sasl_server_userdb_setpass_t 3 "10 July 2001" SASL "SASL man pages" - .SH NAME - sasl_server_userdb_setpass_t \- UserDB Plaintext Password Setting Callback - ---- trunk.orig/man/sasl_setpass.3 -+++ trunk/man/sasl_setpass.3 -@@ -38,7 +38,7 @@ - .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - .\" --.TH sasl_setpass "10 July 2001" SASL "SASL man pages" -+.TH sasl_setpass 3 "10 July 2001" SASL "SASL man pages" - .SH NAME - sasl_setpass \- Check a plaintext password - .SH SYNOPSIS ---- trunk.orig/man/sasl_setprop.3 -+++ trunk/man/sasl_setprop.3 -@@ -38,7 +38,7 @@ - .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - .\" --.TH sasl_setprop "10 July 2001" SASL "SASL man pages" -+.TH sasl_setprop 3 "10 July 2001" SASL "SASL man pages" - .SH NAME - sasl_setprop \- Set a SASL property - .SH SYNOPSIS ---- trunk.orig/man/sasl_user_exists.3 -+++ trunk/man/sasl_user_exists.3 -@@ -38,7 +38,7 @@ - .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - .\" --.TH sasl_user_exists "10 July 2001" SASL "SASL man pages" -+.TH sasl_user_exists 3 "10 July 2001" SASL "SASL man pages" - .SH NAME - sasl_user_exists \- Check if a user exists on server - ---- trunk.orig/man/sasl_verifyfile_t.3 -+++ trunk/man/sasl_verifyfile_t.3 -@@ -38,7 +38,7 @@ - .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - .\" --.TH sasl_verifyfile_t "10 July 2001" SASL "SASL man pages" -+.TH sasl_verifyfile_t 3 "10 July 2001" SASL "SASL man pages" - .SH NAME - sasl_verifyfile_t \- The SASL file verification - diff --git a/debian/patches/0008_one_time_sasl_set_alloc.diff b/debian/patches/0008_one_time_sasl_set_alloc.diff deleted file mode 100644 index e252bab..0000000 --- a/debian/patches/0008_one_time_sasl_set_alloc.diff +++ /dev/null @@ -1,67 +0,0 @@ -Author: Fabian Fagerholm -Description: Make sasl_set_alloc a one-time function. -This patch will divert all allocations to whomever called -sasl_set_alloc first, hopefully that will be the application. If -not, we sure *hope* the library doing stupid things has sane -sasl_set_alloc semantics... -It will also deny any futher tries to sasl_set_alloc after one -of the _init functions are called. -This patch was introduced and works fine in SASL 1.5, and no -applications started behaving in insane ways, so chances are it -will also work with SASL 2.1 -Reference: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=139568 -Reference: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=274087 -Reference: https://bugzilla.andrew.cmu.edu/show_bug.cgi?id=2525 ---- trunk.orig/lib/client.c -+++ trunk/lib/client.c -@@ -202,6 +202,9 @@ - { NULL, NULL } - }; - -+ /* lock allocation type */ -+ _sasl_allocation_locked++; -+ - if(_sasl_client_active) { - /* We're already active, just increase our refcount */ - /* xxx do something with the callback structure? */ ---- trunk.orig/lib/common.c -+++ trunk/lib/common.c -@@ -107,6 +107,7 @@ - (sasl_realloc_t *) &realloc, - (sasl_free_t *) &free - }; -+int _sasl_allocation_locked = 0; - - #define SASL_ENCODEV_EXTRA 4096 - -@@ -637,6 +638,8 @@ - sasl_realloc_t *r, - sasl_free_t *f) - { -+ if (_sasl_allocation_locked++) return; -+ - _sasl_allocation_utils.malloc=m; - _sasl_allocation_utils.calloc=c; - _sasl_allocation_utils.realloc=r; ---- trunk.orig/lib/saslint.h -+++ trunk/lib/saslint.h -@@ -300,6 +300,7 @@ - - extern sasl_allocation_utils_t _sasl_allocation_utils; - extern sasl_mutex_utils_t _sasl_mutex_utils; -+extern int _sasl_allocation_locked; - - /* - * checkpw.c ---- trunk.orig/lib/server.c -+++ trunk/lib/server.c -@@ -698,6 +698,9 @@ - { NULL, NULL } - }; - -+ /* lock allocation type */ -+ _sasl_allocation_locked++; -+ - /* we require the appname (if present) to be short enough to be a path */ - if (appname != NULL && strlen(appname) >= PATH_MAX) - return SASL_BADPARAM; diff --git a/debian/patches/0010_maintainer_mode.diff b/debian/patches/0010_maintainer_mode.diff index 14d4456..a51b8dd 100644 --- a/debian/patches/0010_maintainer_mode.diff +++ b/debian/patches/0010_maintainer_mode.diff @@ -1,9 +1,9 @@ Author: Fabian Fagerholm Description: Enable maintainer mode to avoid auto* problems. ---- trunk.orig/configure.in -+++ trunk/configure.in -@@ -62,6 +62,8 @@ - AM_INIT_AUTOMAKE(cyrus-sasl, 2.1.23) +--- a/configure.in ++++ b/configure.in +@@ -62,6 +62,8 @@ dnl + AM_INIT_AUTOMAKE(cyrus-sasl, 2.1.24) CMU_INIT_AUTOMAKE +AM_MAINTAINER_MODE diff --git a/debian/patches/0011_saslauthd_ac_prog_libtool.diff b/debian/patches/0011_saslauthd_ac_prog_libtool.diff index e9b92a4..da1a49f 100644 --- a/debian/patches/0011_saslauthd_ac_prog_libtool.diff +++ b/debian/patches/0011_saslauthd_ac_prog_libtool.diff @@ -1,8 +1,8 @@ Author: Fabian Fagerholm Description: Enable libtool use. ---- trunk.orig/saslauthd/configure.in -+++ trunk/saslauthd/configure.in -@@ -25,6 +25,7 @@ +--- a/saslauthd/configure.in ++++ b/saslauthd/configure.in +@@ -25,6 +25,7 @@ AC_PROG_AWK AC_PROG_MAKE_SET AC_PROG_LN_S AC_PROG_INSTALL diff --git a/debian/patches/0012_xopen_crypt_prototype.diff b/debian/patches/0012_xopen_crypt_prototype.diff index d9daad7..0b4e22e 100644 --- a/debian/patches/0012_xopen_crypt_prototype.diff +++ b/debian/patches/0012_xopen_crypt_prototype.diff @@ -6,10 +6,13 @@ for build log lines such as the following: auth_shadow.c:183: warning: implicit declaration of function ‘crypt’ auth_shadow.c:183: warning: cast to pointer from integer of different size ---- trunk.orig/saslauthd/auth_shadow.c -+++ trunk/saslauthd/auth_shadow.c -@@ -1,3 +1,4 @@ +--- a/saslauthd/auth_shadow.c ++++ b/saslauthd/auth_shadow.c +@@ -36,6 +36,7 @@ + + #ifdef AUTH_SHADOW + +#define _XOPEN_SOURCE #define PWBUFSZ 256 /***SWB***/ - /* MODULE: auth_shadow */ + # include diff --git a/debian/patches/0013_fix_hurd_build.diff b/debian/patches/0013_fix_hurd_build.diff deleted file mode 100644 index f30bef6..0000000 --- a/debian/patches/0013_fix_hurd_build.diff +++ /dev/null @@ -1,13 +0,0 @@ -Author: Michael Banck -Description: Include config.h so that MAXHOSTNAMELEN is available when -building on hurd-i386. ---- trunk.orig/saslauthd/auth_sasldb.c -+++ trunk/saslauthd/auth_sasldb.c -@@ -41,6 +41,7 @@ - #include - #include - #include -+#include - /* END PUBLIC DEPENDENCIES */ - - #define RETURN(x) return strdup(x) diff --git a/debian/patches/0014_avoid_pic_overwrite.diff b/debian/patches/0014_avoid_pic_overwrite.diff index ffc69b7..2e5b175 100644 --- a/debian/patches/0014_avoid_pic_overwrite.diff +++ b/debian/patches/0014_avoid_pic_overwrite.diff @@ -4,9 +4,9 @@ which is created out of PIC objects. The PIC version is placed in .libs, and the non-PIC version in the current directory. This ensures that both non-PIC and PIC versions are available in the correct locations. ---- trunk.orig/lib/Makefile.am -+++ trunk/lib/Makefile.am -@@ -76,7 +76,7 @@ +--- a/lib/Makefile.am ++++ b/lib/Makefile.am +@@ -78,7 +78,7 @@ endif libsasl2.a: libsasl2.la $(SASL_STATIC_OBJS) @echo adding static plugins and dependencies @@ -15,9 +15,9 @@ @for i in ./libsasl2.la ../sasldb/libsasldb.la ../plugins/lib*.la; do \ if test ! -f $$i; then continue; fi; . $$i; \ for j in $$dependency_libs foo; do \ ---- trunk.orig/sasldb/Makefile.am -+++ trunk/sasldb/Makefile.am -@@ -63,6 +63,6 @@ +--- a/sasldb/Makefile.am ++++ b/sasldb/Makefile.am +@@ -63,6 +63,6 @@ libsasldb_a_SOURCES = EXTRA_libsasldb_a_SOURCES = libsasldb.a: libsasldb.la $(SASL_DB_BACKEND_STATIC) diff --git a/debian/patches/0016_pid_file_lock_creation_mask.diff b/debian/patches/0016_pid_file_lock_creation_mask.diff deleted file mode 100644 index a80ca06..0000000 --- a/debian/patches/0016_pid_file_lock_creation_mask.diff +++ /dev/null @@ -1,24 +0,0 @@ -Author: Sam Hocevar -Description: pid_file_lock is created with a mask of 644 instead of 0644. This -patch fixes this octal/decimal confusion as well as the (harmless) one in the -previous umask() call. ---- trunk.orig/saslauthd/saslauthd-main.c -+++ trunk/saslauthd/saslauthd-main.c -@@ -276,7 +276,7 @@ - exit(1); - } - -- umask(077); -+ umask(0077); - - pid_file_size = strlen(run_path) + sizeof(PID_FILE_LOCK) + 1; - if ((pid_file_lock = malloc(pid_file_size)) == NULL) { -@@ -287,7 +287,7 @@ - strlcpy(pid_file_lock, run_path, pid_file_size); - strlcat(pid_file_lock, PID_FILE_LOCK, pid_file_size); - -- if ((pid_file_lock_fd = open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 644)) < 0) { -+ if ((pid_file_lock_fd = open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 0644)) < 0) { - rc = errno; - logger(L_ERR, L_FUNC, "could not open pid lock file: %s", pid_file_lock); - logger(L_ERR, L_FUNC, "open: %s", strerror(rc)); diff --git a/debian/patches/0017_db4.8.diff b/debian/patches/0017_db4.8.diff index c8cca3c..8179073 100644 --- a/debian/patches/0017_db4.8.diff +++ b/debian/patches/0017_db4.8.diff @@ -1,35 +1,35 @@ Author: Fabian Fagerholm Description: Support and build against db4.8. ---- trunk.orig/aclocal.m4 -+++ trunk/aclocal.m4 -@@ -1741,7 +1741,7 @@ +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -1741,7 +1741,7 @@ AC_DEFUN([CYRUS_BERKELEY_DB_CHK_LIB], fi saved_LIBS=$LIBS -- 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 -+ 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 +- 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 ++ for dbname in db do LIBS="$saved_LIBS -l$dbname" - AC_TRY_LINK([#include ], ---- trunk.orig/cmulocal/berkdb.m4 -+++ trunk/cmulocal/berkdb.m4 -@@ -213,7 +213,7 @@ + AC_TRY_LINK([#include +--- a/cmulocal/berkdb.m4 ++++ b/cmulocal/berkdb.m4 +@@ -213,7 +213,7 @@ AC_DEFUN([CYRUS_BERKELEY_DB_CHK_LIB], fi saved_LIBS=$LIBS -- 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 -+ 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 +- 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 ++ for dbname in db do LIBS="$saved_LIBS -l$dbname" - AC_TRY_LINK([#include ], ---- trunk.orig/saslauthd/aclocal.m4 -+++ trunk/saslauthd/aclocal.m4 -@@ -2066,7 +2066,7 @@ + AC_TRY_LINK([#include +--- a/saslauthd/aclocal.m4 ++++ b/saslauthd/aclocal.m4 +@@ -2068,7 +2068,7 @@ AC_DEFUN([CYRUS_BERKELEY_DB_CHK_LIB], fi saved_LIBS=$LIBS -- 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 -+ 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 +- 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 ++ for dbname in db do LIBS="$saved_LIBS -l$dbname" - AC_TRY_LINK([#include ], + AC_TRY_LINK([#include diff --git a/debian/patches/0018_auth_rimap_quotes.diff b/debian/patches/0018_auth_rimap_quotes.diff deleted file mode 100644 index 13a7920..0000000 --- a/debian/patches/0018_auth_rimap_quotes.diff +++ /dev/null @@ -1,32 +0,0 @@ -Author: Fabian Fagerholm -Description: Avoid infinite loop when username/password has a double quote -character. -Upstream change: https://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/sasl/saslauthd/auth_rimap.c.diff?r1=1.12;r2=1.13 ---- trunk.orig/saslauthd/auth_rimap.c -+++ trunk/saslauthd/auth_rimap.c -@@ -162,6 +162,7 @@ - num_quotes = 0; - p1 = s; - while ((p1 = strchr(p1, '"')) != NULL) { -+ p1++; - num_quotes++; - } - -@@ -438,7 +439,7 @@ - syslog(LOG_WARNING, "auth_rimap: writev: %m"); - memset(qlogin, 0, strlen(qlogin)); - free(qlogin); -- memset(qpass, 0, strlen(qlogin)); -+ memset(qpass, 0, strlen(qpass)); - free(qpass); - (void)close(s); - return strdup(RESP_IERROR); -@@ -447,7 +448,7 @@ - /* don't need these any longer */ - memset(qlogin, 0, strlen(qlogin)); - free(qlogin); -- memset(qpass, 0, strlen(qlogin)); -+ memset(qpass, 0, strlen(qpass)); - free(qpass); - - /* read and parse the LOGIN response */ diff --git a/debian/patches/0019_ldap_deprecated.diff b/debian/patches/0019_ldap_deprecated.diff deleted file mode 100644 index 5c47e77..0000000 --- a/debian/patches/0019_ldap_deprecated.diff +++ /dev/null @@ -1,18 +0,0 @@ -Author: Dann Frazier -Description: The function ldap_get_values, used in saslauthd/lak.c, is -deprecated. Therefore, its prototype is not included by default when compiling -against the ldap.h headers. As a result, the compiler cannot know the return -type of the function at compile time, and will implicitly convert to a pointer. -This has implications on 64-bit systems. This patch sets the deprecation mode -on, so that the function prototype gets included when compiling. -(Description by Fabian Fagerholm ) ---- trunk.orig/saslauthd/lak.c -+++ trunk/saslauthd/lak.c -@@ -55,6 +55,7 @@ - #include - #endif - -+#define LDAP_DEPRECATED 1 - #include - #include - #include diff --git a/debian/patches/0021_no_mutex_changes_after_init.diff b/debian/patches/0021_no_mutex_changes_after_init.diff deleted file mode 100644 index 8b592b0..0000000 --- a/debian/patches/0021_no_mutex_changes_after_init.diff +++ /dev/null @@ -1,19 +0,0 @@ -Author: Fabian Fagerholm -Description: Disallow mutex function changes once sasl_client_init and/or -sasl_server_init is called. Hand-picked and applied change from upstream CVS -revision 1.117. ---- trunk.orig/lib/common.c -+++ trunk/lib/common.c -@@ -153,6 +153,12 @@ - void sasl_set_mutex(sasl_mutex_alloc_t *n, sasl_mutex_lock_t *l, - sasl_mutex_unlock_t *u, sasl_mutex_free_t *d) - { -+ /* Disallow mutex function changes once sasl_client_init -+ and/or sasl_server_init is called */ -+ if (_sasl_server_cleanup_hook || _sasl_client_cleanup_hook) { -+ return; -+ } -+ - _sasl_mutex_utils.alloc=n; - _sasl_mutex_utils.lock=l; - _sasl_mutex_utils.unlock=u; diff --git a/debian/patches/0022_gcc4.4_preprocessor_syntax.diff b/debian/patches/0022_gcc4.4_preprocessor_syntax.diff deleted file mode 100644 index 531d815..0000000 --- a/debian/patches/0022_gcc4.4_preprocessor_syntax.diff +++ /dev/null @@ -1,23 +0,0 @@ -Author: Fabian Fagerholm -Description: The #elif preprocessor directive requires a test condition. -GCC 4.4 enforces this rule. ---- trunk.orig/plugins/digestmd5.c -+++ trunk/plugins/digestmd5.c -@@ -2715,7 +2715,7 @@ - "DIGEST-MD5", /* mech_name */ - #ifdef WITH_RC4 - 128, /* max_ssf */ --#elif WITH_DES -+#elif defined(WITH_DES) - 112, - #else - 1, -@@ -4034,7 +4034,7 @@ - "DIGEST-MD5", - #ifdef WITH_RC4 /* mech_name */ - 128, /* max ssf */ --#elif WITH_DES -+#elif defined(WITH_DES) - 112, - #else - 1, diff --git a/debian/patches/0024_allow_detection_of_heimdal.diff b/debian/patches/0024_allow_detection_of_heimdal.diff index 64c2dd8..7c58b9b 100644 --- a/debian/patches/0024_allow_detection_of_heimdal.diff +++ b/debian/patches/0024_allow_detection_of_heimdal.diff @@ -1,9 +1,9 @@ Author: Roberto C. Sanchez Description: A patch to allow recognition of Heimdal with the heimdal-multidev package ---- trunk.orig/plugins/gssapi.c -+++ trunk/plugins/gssapi.c -@@ -86,7 +86,7 @@ +--- a/plugins/gssapi.c ++++ b/plugins/gssapi.c +@@ -86,7 +86,7 @@ static const char plugin_id[] = "$Id: gs static const char * GSSAPI_BLANK_STRING = ""; diff --git a/debian/patches/0025_ld_as_needed.diff b/debian/patches/0025_ld_as_needed.diff index 4fb8cf7..67b48b4 100644 --- a/debian/patches/0025_ld_as_needed.diff +++ b/debian/patches/0025_ld_as_needed.diff @@ -1,9 +1,9 @@ Author: Matthias Klose Desription: Fix FTBFS, add $(SASL_DB_LIB) as dependency to libsasldb, and use it. ---- trunk.orig/saslauthd/Makefile.am -+++ trunk/saslauthd/Makefile.am -@@ -16,7 +16,7 @@ +--- a/saslauthd/Makefile.am ++++ b/saslauthd/Makefile.am +@@ -16,7 +16,7 @@ EXTRA_saslauthd_sources = getaddrinfo.c saslauthd_DEPENDENCIES = saslauthd-main.o @LTLIBOBJS@ saslauthd_LDADD = @SASL_KRB_LIB@ \ @GSSAPIBASE_LIBS@ @GSSAPI_LIBS@ @LIB_CRYPT@ @LIB_SIA@ \ @@ -12,9 +12,9 @@ testsaslauthd_SOURCES = testsaslauthd.c utils.c testsaslauthd_LDADD = @LIB_SOCKET@ ---- trunk.orig/sasldb/Makefile.am -+++ trunk/sasldb/Makefile.am -@@ -55,8 +55,8 @@ +--- a/sasldb/Makefile.am ++++ b/sasldb/Makefile.am +@@ -55,8 +55,8 @@ noinst_LIBRARIES = libsasldb.a libsasldb_la_SOURCES = allockey.c sasldb.h EXTRA_libsasldb_la_SOURCES = $(extra_common_sources) diff --git a/debian/patches/0026_drop_krb5support_dependency.diff b/debian/patches/0026_drop_krb5support_dependency.diff index 4df6a5a..1a6d927 100644 --- a/debian/patches/0026_drop_krb5support_dependency.diff +++ b/debian/patches/0026_drop_krb5support_dependency.diff @@ -1,8 +1,8 @@ Author: Roberto C. Sanchez Description: Drop gratuitous dependency on krb5support ---- trunk.orig/aclocal.m4 -+++ trunk/aclocal.m4 -@@ -2924,9 +2924,6 @@ +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -2928,9 +2928,6 @@ if test "$gssapi" != no; then fi if test "$gss_impl" = "auto" -o "$gss_impl" = "mit"; then @@ -12,9 +12,9 @@ gss_failed=0 AC_CHECK_LIB(gssapi_krb5,gss_unwrap,gss_impl="mit",gss_failed=1, ${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP} ${LIB_SOCKET}) ---- trunk.orig/cmulocal/sasl2.m4 -+++ trunk/cmulocal/sasl2.m4 -@@ -110,9 +110,6 @@ +--- a/cmulocal/sasl2.m4 ++++ b/cmulocal/sasl2.m4 +@@ -112,9 +112,6 @@ if test "$gssapi" != no; then fi if test "$gss_impl" = "auto" -o "$gss_impl" = "mit"; then @@ -24,9 +24,9 @@ gss_failed=0 AC_CHECK_LIB(gssapi_krb5,gss_unwrap,gss_impl="mit",gss_failed=1, ${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP} ${LIB_SOCKET}) ---- trunk.orig/saslauthd/aclocal.m4 -+++ trunk/saslauthd/aclocal.m4 -@@ -1333,9 +1333,6 @@ +--- a/saslauthd/aclocal.m4 ++++ b/saslauthd/aclocal.m4 +@@ -1335,9 +1335,6 @@ if test "$gssapi" != no; then fi if test "$gss_impl" = "auto" -o "$gss_impl" = "mit"; then diff --git a/debian/patches/0027_db5_support.diff b/debian/patches/0027_db5_support.diff index 98cafdf..5228240 100644 --- a/debian/patches/0027_db5_support.diff +++ b/debian/patches/0027_db5_support.diff @@ -2,7 +2,7 @@ Description: Support newer Berkeley DB versions --- a/sasldb/db_berkeley.c +++ b/sasldb/db_berkeley.c -@@ -100,7 +100,7 @@ static int berkeleydb_open(const sasl_ut +@@ -101,7 +101,7 @@ static int berkeleydb_open(const sasl_ut ret = db_create(mbdb, NULL, 0); if (ret == 0 && *mbdb != NULL) { @@ -22,14 +22,3 @@ ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664); #else ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664); ---- a/cmulocal/berkdb.m4 -+++ b/cmulocal/berkdb.m4 -@@ -213,7 +213,7 @@ AC_DEFUN([CYRUS_BERKELEY_DB_CHK_LIB], - fi - - saved_LIBS=$LIBS -- 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 -+ for dbname in db - do - LIBS="$saved_LIBS -l$dbname" - AC_TRY_LINK([#include ], diff --git a/debian/patches/series b/debian/patches/series index ac468ca..19c68c6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,20 +4,12 @@ 0004_missing_man_pages.diff 0005_dbconverter.diff 0006_library_mutexes.diff -0007_manpages_section.diff -0008_one_time_sasl_set_alloc.diff 0009_sasldb_al.diff 0010_maintainer_mode.diff 0011_saslauthd_ac_prog_libtool.diff 0012_xopen_crypt_prototype.diff -0013_fix_hurd_build.diff 0014_avoid_pic_overwrite.diff -0016_pid_file_lock_creation_mask.diff 0017_db4.8.diff -0018_auth_rimap_quotes.diff -0019_ldap_deprecated.diff -0021_no_mutex_changes_after_init.diff -0022_gcc4.4_preprocessor_syntax.diff 0024_allow_detection_of_heimdal.diff 0025_ld_as_needed.diff 0026_drop_krb5support_dependency.diff