[Pkg-cyrus-sasl2-commits] [cyrus-sasl2] 05/44: Rebase patches on top of 2.1.26-69-g4c8e3f2
Ondřej Surý
ondrej at debian.org
Sat Dec 31 13:07:09 UTC 2016
This is an automated email from the git hooks/post-receive script.
ondrej pushed a commit to branch master
in repository cyrus-sasl2.
commit c6f640701666693dd9e0ef9a83d20d561f819702
Author: Ondřej Surý <ondrej at sury.org>
Date: Fri Jul 1 09:44:53 2016 +0200
Rebase patches on top of 2.1.26-69-g4c8e3f2
---
.../0001-Make-the-libsasl2-symbols-versioned.patch | 17 ++-
...onverter-2-in-sbin_PROGRAMS-and-set-defau.patch | 4 +-
debian/patches/0005-Fixes-in-library-mutexes.patch | 2 +-
...-with-libsasldb.a-instead-of-libsasldb.al.patch | 12 +-
.../0007-Enable-autoconf-maintainer-mode.patch | 20 +--
.../0008-Add-libtool-to-saslauthd-autoconf.patch | 21 ----
...N_SOURCE-in-auth_shadow.c-to-get-proper-.patch} | 4 +-
...erwrite-PIC-objects-with-non-PIC-variant.patch} | 21 +---
... 0010-Look-for-generic-Berkeley-DB-first.patch} | 8 +-
...ired-libraries-when-ld-as-needed-is-used.patch} | 22 ++--
...atch => 0012-Drop-krb5support-dependency.patch} | 12 +-
...0015-LDAP-fixes.patch => 0013-LDAP-fixes.patch} | 4 +-
...4-Don-t-use-la-files-for-opening-plugins.patch} | 0
debian/patches/0014-Several-autotools-fixes.patch | 137 ---------------------
...se-R-when-searching-for-SQLite-libraries.patch} | 14 +--
...-Revert-1.103-revision-to-unbreak-GSSAPI.patch} | 4 +-
...API.patch => 0017-Fix-segfault-in-GSSAPI.patch} | 6 +-
...patch => 0018-Fix-dovecot-authentication.patch} | 2 +-
.../patches/0019-Temporary-multiarch-fixes.patch | 22 ++++
...ce-to-LDAP_SASLAUTHD-file-to-the-saslauth.patch | 24 ++++
...AP-logout.patch => 0021-Send-IMAP-logout.patch} | 8 +-
.../patches/0021-Temporary-multiarch-fixes.patch | 36 ------
...ce-to-LDAP_SASLAUTHD-file-to-the-saslauth.patch | 40 ------
...x-canonuser-ldapdb-garbage-in-out-buffer.patch} | 4 +-
.../0023-Fix-keytab-option-for-MIT-Kerberos.patch | 66 ++++++++++
...ver-creds-when-they-are-no-longer-needed.patch} | 10 +-
.../0025-Fix-keytab-option-for-MIT-Kerberos.patch | 136 --------------------
...patch => 0025-Fix-typo-in-debugging-logs.patch} | 2 +-
.../patches/0026-Revert-upstream-soname-bump.patch | 35 ++++++
...ix-return-SASL_FAIL-in-void-sasl_dispose.patch} | 2 +-
.../0027-Include-sys-types.h-in-sasl.h.patch | 22 ----
...atch => 0028-properly-create-libsasl2.pc.patch} | 26 ++--
...-CAPABILITY-lines-in-IMAP-login-reply-v4.patch} | 10 +-
.../patches/0029-Revert-upstream-soname-bump.patch | 63 ----------
...h => 0030-Fix-early-hangup-in-ipc_unix.c.patch} | 2 +-
debian/patches/series | 51 ++++----
36 files changed, 270 insertions(+), 599 deletions(-)
diff --git a/debian/patches/0001-Make-the-libsasl2-symbols-versioned.patch b/debian/patches/0001-Make-the-libsasl2-symbols-versioned.patch
index 7419d79..fddbc94 100644
--- a/debian/patches/0001-Make-the-libsasl2-symbols-versioned.patch
+++ b/debian/patches/0001-Make-the-libsasl2-symbols-versioned.patch
@@ -5,8 +5,8 @@ Subject: Make the libsasl2 symbols versioned
---
Versions | 7 +++++++
- lib/Makefile.am | 4 ++--
- 2 files changed, 9 insertions(+), 2 deletions(-)
+ lib/Makefile.am | 3 ++-
+ 2 files changed, 9 insertions(+), 1 deletion(-)
create mode 100644 Versions
diff --git a/Versions b/Versions
@@ -23,17 +23,16 @@ index 0000000..f803d00
+HIDDEN { local: __*; _rest*; _save*; *; };
+
diff --git a/lib/Makefile.am b/lib/Makefile.am
-index b8964a8..bff8efe 100644
+index 4e68e32..36f18fa 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
-@@ -64,8 +64,8 @@ LIB_DOOR= @LIB_DOOR@
- lib_LTLIBRARIES = libsasl2.la
+@@ -73,7 +73,8 @@ libobj_la_SOURCES =
+ libobj_la_LIBADD = $(LTLIBOBJS)
libsasl2_la_SOURCES = $(common_sources) $(common_headers)
--libsasl2_la_LDFLAGS = -version-info $(sasl_version)
--libsasl2_la_DEPENDENCIES = $(LTLIBOBJS)
-+libsasl2_la_LDFLAGS = -version-info $(sasl_version) -Wl,--version-script=$(top_srcdir)/Versions
+-libsasl2_la_LDFLAGS = -version-info $(sasl_version) -no-undefined
++libsasl2_la_LDFLAGS = -version-info $(sasl_version) -no-undefined -Wl,--version-script=$(top_srcdir)/Versions
+libsasl2_la_DEPENDENCIES = $(LTLIBOBJS) $(top_srcdir)/Versions
- libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR)
+ libsasl2_la_LIBADD = libobj.la $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR)
if MACOSX
diff --git a/debian/patches/0004-Include-dbconverter-2-in-sbin_PROGRAMS-and-set-defau.patch b/debian/patches/0004-Include-dbconverter-2-in-sbin_PROGRAMS-and-set-defau.patch
index b570742..16a3f6d 100644
--- a/debian/patches/0004-Include-dbconverter-2-in-sbin_PROGRAMS-and-set-defau.patch
+++ b/debian/patches/0004-Include-dbconverter-2-in-sbin_PROGRAMS-and-set-defau.patch
@@ -11,7 +11,7 @@ database file to /etc/sasldb2.
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/utils/Makefile.am b/utils/Makefile.am
-index 7e2f983..25077e2 100644
+index cce413b..17f0457 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -45,10 +45,10 @@
@@ -28,7 +28,7 @@ index 7e2f983..25077e2 100644
if NO_SASL_DB_MANS
man_MANS =
diff --git a/utils/dbconverter-2.c b/utils/dbconverter-2.c
-index 04df2cb..4701898 100644
+index 33e18fb..06c2e9a 100644
--- a/utils/dbconverter-2.c
+++ b/utils/dbconverter-2.c
@@ -382,7 +382,7 @@ static struct sasl_callback goodsasl_cb[] = {
diff --git a/debian/patches/0005-Fixes-in-library-mutexes.patch b/debian/patches/0005-Fixes-in-library-mutexes.patch
index 0c53d70..d6eabd8 100644
--- a/debian/patches/0005-Fixes-in-library-mutexes.patch
+++ b/debian/patches/0005-Fixes-in-library-mutexes.patch
@@ -8,7 +8,7 @@ Subject: Fixes in library mutexes
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/lib/common.c b/lib/common.c
-index e0f59eb..1df5702 100644
+index 91ba4af..b83557d 100644
--- a/lib/common.c
+++ b/lib/common.c
@@ -818,7 +818,7 @@ int _sasl_common_init(sasl_global_callbacks_t *global_callbacks)
diff --git a/debian/patches/0006-Link-with-libsasldb.a-instead-of-libsasldb.al.patch b/debian/patches/0006-Link-with-libsasldb.a-instead-of-libsasldb.al.patch
index beb88da..81802dc 100644
--- a/debian/patches/0006-Link-with-libsasldb.a-instead-of-libsasldb.al.patch
+++ b/debian/patches/0006-Link-with-libsasldb.a-instead-of-libsasldb.al.patch
@@ -5,14 +5,14 @@ Subject: Link with libsasldb.a instead of libsasldb.al
support.
---
- saslauthd/configure.in | 2 +-
+ configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/saslauthd/configure.in b/saslauthd/configure.in
-index 0addcf4..8fb693c 100644
---- a/saslauthd/configure.in
-+++ b/saslauthd/configure.in
-@@ -77,7 +77,7 @@ if test "$authsasldb" != no; then
+diff --git a/configure.ac b/configure.ac
+index d3f38af..d7398bb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -617,7 +617,7 @@ if test "$authsasldb" != no; then
AC_DEFINE(AUTH_SASLDB,[],[Include SASLdb Support])
SASL_DB_PATH_CHECK()
SASL_DB_CHECK()
diff --git a/debian/patches/0007-Enable-autoconf-maintainer-mode.patch b/debian/patches/0007-Enable-autoconf-maintainer-mode.patch
index 26ba42a..6489a29 100644
--- a/debian/patches/0007-Enable-autoconf-maintainer-mode.patch
+++ b/debian/patches/0007-Enable-autoconf-maintainer-mode.patch
@@ -4,19 +4,19 @@ Date: Thu, 24 Mar 2016 11:35:03 +0100
Subject: Enable autoconf maintainer mode
---
- configure.in | 2 ++
+ configure.ac | 2 ++
1 file changed, 2 insertions(+)
-diff --git a/configure.in b/configure.in
-index 465a362..d4d250c 100644
---- a/configure.in
-+++ b/configure.in
-@@ -62,6 +62,8 @@ dnl
- AM_INIT_AUTOMAKE(cyrus-sasl, 2.1.26)
- CMU_INIT_AUTOMAKE
+diff --git a/configure.ac b/configure.ac
+index d7398bb..8f3cc1e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -69,6 +69,8 @@ AC_CANONICAL_TARGET
+
+ AM_INIT_AUTOMAKE([1.11 tar-ustar dist-xz no-dist-gzip -Wno-portability subdir-objects])
+AM_MAINTAINER_MODE
+
- # and include our config dir scripts
- ACLOCAL="$ACLOCAL -I \$(top_srcdir)/config"
+ DIRS=""
+ AC_ARG_ENABLE(cmulocal,
diff --git a/debian/patches/0008-Add-libtool-to-saslauthd-autoconf.patch b/debian/patches/0008-Add-libtool-to-saslauthd-autoconf.patch
deleted file mode 100644
index 8ac33dc..0000000
--- a/debian/patches/0008-Add-libtool-to-saslauthd-autoconf.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Debian Cyrus SASL Team
- <pkg-cyrus-sasl2-debian-devel at lists.alioth.debian.org>
-Date: Thu, 24 Mar 2016 11:35:03 +0100
-Subject: Add libtool to saslauthd autoconf
-
----
- saslauthd/configure.in | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/saslauthd/configure.in b/saslauthd/configure.in
-index 8fb693c..701dbe4 100644
---- 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
-+AC_PROG_LIBTOOL
-
- dnl Checks for build foo
- CMU_C___ATTRIBUTE__
diff --git a/debian/patches/0009-Define-_XOPEN_SOURCE-in-auth_shadow.c-to-get-proper-.patch b/debian/patches/0008-Define-_XOPEN_SOURCE-in-auth_shadow.c-to-get-proper-.patch
similarity index 95%
rename from debian/patches/0009-Define-_XOPEN_SOURCE-in-auth_shadow.c-to-get-proper-.patch
rename to debian/patches/0008-Define-_XOPEN_SOURCE-in-auth_shadow.c-to-get-proper-.patch
index 1f02d34..a5e387f 100644
--- a/debian/patches/0009-Define-_XOPEN_SOURCE-in-auth_shadow.c-to-get-proper-.patch
+++ b/debian/patches/0008-Define-_XOPEN_SOURCE-in-auth_shadow.c-to-get-proper-.patch
@@ -17,10 +17,10 @@ auth_shadow.c:183: warning: cast to pointer from integer of different size
1 file changed, 1 insertion(+)
diff --git a/saslauthd/auth_shadow.c b/saslauthd/auth_shadow.c
-index 677131b..d0efa9a 100644
+index d69e380..68d1cdd 100644
--- a/saslauthd/auth_shadow.c
+++ b/saslauthd/auth_shadow.c
-@@ -36,6 +36,7 @@
+@@ -39,6 +39,7 @@
#ifdef AUTH_SHADOW
diff --git a/debian/patches/0010-Don-t-overwrite-PIC-objects-with-non-PIC-variant.patch b/debian/patches/0009-Don-t-overwrite-PIC-objects-with-non-PIC-variant.patch
similarity index 63%
rename from debian/patches/0010-Don-t-overwrite-PIC-objects-with-non-PIC-variant.patch
rename to debian/patches/0009-Don-t-overwrite-PIC-objects-with-non-PIC-variant.patch
index 630fbf3..1e9da47 100644
--- a/debian/patches/0010-Don-t-overwrite-PIC-objects-with-non-PIC-variant.patch
+++ b/debian/patches/0009-Don-t-overwrite-PIC-objects-with-non-PIC-variant.patch
@@ -8,15 +8,14 @@ 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.
---
- lib/Makefile.am | 2 +-
- sasldb/Makefile.am | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ lib/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/Makefile.am b/lib/Makefile.am
-index bff8efe..16b14f4 100644
+index 36f18fa..2402557 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
-@@ -80,7 +80,7 @@ endif
+@@ -89,7 +89,7 @@ endif
libsasl2.a: libsasl2.la $(SASL_STATIC_OBJS)
@echo adding static plugins and dependencies
@@ -25,15 +24,3 @@ index bff8efe..16b14f4 100644
@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 \
-diff --git a/sasldb/Makefile.am b/sasldb/Makefile.am
-index 067477c..311a34b 100644
---- 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)
-- $(AR) cru .libs/$@ $(SASL_DB_BACKEND_STATIC)
-+ $(AR) cru $@ $(SASL_DB_BACKEND_STATIC)
-
-
diff --git a/debian/patches/0011-Look-for-generic-Berkeley-DB-first.patch b/debian/patches/0010-Look-for-generic-Berkeley-DB-first.patch
similarity index 79%
rename from debian/patches/0011-Look-for-generic-Berkeley-DB-first.patch
rename to debian/patches/0010-Look-for-generic-Berkeley-DB-first.patch
index 396f75f..bfd6e17 100644
--- a/debian/patches/0011-Look-for-generic-Berkeley-DB-first.patch
+++ b/debian/patches/0010-Look-for-generic-Berkeley-DB-first.patch
@@ -4,13 +4,13 @@ Date: Thu, 24 Mar 2016 11:35:03 +0100
Subject: Look for generic Berkeley DB first
---
- cmulocal/berkdb.m4 | 2 +-
+ m4/berkdb.m4 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/cmulocal/berkdb.m4 b/cmulocal/berkdb.m4
+diff --git a/m4/berkdb.m4 b/m4/berkdb.m4
index 98e8cb6..8b7d408 100644
---- a/cmulocal/berkdb.m4
-+++ b/cmulocal/berkdb.m4
+--- a/m4/berkdb.m4
++++ b/m4/berkdb.m4
@@ -213,7 +213,7 @@ AC_DEFUN([CYRUS_BERKELEY_DB_CHK_LIB],
fi
diff --git a/debian/patches/0012-Update-required-libraries-when-ld-as-needed-is-used.patch b/debian/patches/0011-Update-required-libraries-when-ld-as-needed-is-used.patch
similarity index 63%
rename from debian/patches/0012-Update-required-libraries-when-ld-as-needed-is-used.patch
rename to debian/patches/0011-Update-required-libraries-when-ld-as-needed-is-used.patch
index bbff586..e42e1ba 100644
--- a/debian/patches/0012-Update-required-libraries-when-ld-as-needed-is-used.patch
+++ b/debian/patches/0011-Update-required-libraries-when-ld-as-needed-is-used.patch
@@ -10,30 +10,28 @@ it.
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/saslauthd/Makefile.am b/saslauthd/Makefile.am
-index ce1e92b..a07281d 100644
+index f38097c..bcc5226 100644
--- a/saslauthd/Makefile.am
+++ b/saslauthd/Makefile.am
-@@ -16,7 +16,7 @@ EXTRA_saslauthd_sources = getaddrinfo.c getnameinfo.c
- saslauthd_DEPENDENCIES = saslauthd-main.o @LTLIBOBJS@
+@@ -19,7 +19,7 @@ EXTRA_saslauthd_sources = getaddrinfo.c getnameinfo.c
+ saslauthd_DEPENDENCIES = saslauthd-main.o $(LTLIBOBJS_FULL)
saslauthd_LDADD = @SASL_KRB_LIB@ \
- @GSSAPIBASE_LIBS@ @GSSAPI_LIBS@ @LIB_CRYPT@ @LIB_SIA@ \
-- @LIB_SOCKET@ @SASL_DB_LIB@ @LIB_PAM@ @LDAP_LIBS@ @LTLIBOBJS@
-+ @LIB_SOCKET@ ../sasldb/libsasldb.la @LIB_PAM@ @LDAP_LIBS@ @LTLIBOBJS@
+ @GSSAPIBASE_LIBS@ @LIB_CRYPT@ @LIB_SIA@ \
+- @LIB_SOCKET@ @SASL_DB_LIB@ @LIB_PAM@ @LDAP_LIBS@ $(LTLIBOBJS_FULL)
++ @LIB_SOCKET@ ../sasldb/libsasldb.la @LIB_PAM@ @LDAP_LIBS@ $(LTLIBOBJS_FULL)
testsaslauthd_SOURCES = testsaslauthd.c utils.c
testsaslauthd_LDADD = @LIB_SOCKET@
diff --git a/sasldb/Makefile.am b/sasldb/Makefile.am
-index 311a34b..6d7ce0c 100644
+index 497ee25..a27645f 100644
--- a/sasldb/Makefile.am
+++ b/sasldb/Makefile.am
-@@ -55,8 +55,8 @@ noinst_LIBRARIES = libsasldb.a
+@@ -54,6 +54,6 @@ noinst_LTLIBRARIES = libsasldb.la
libsasldb_la_SOURCES = allockey.c sasldb.h
EXTRA_libsasldb_la_SOURCES = $(extra_common_sources)
-libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND)
--libsasldb_la_LIBADD = $(SASL_DB_BACKEND)
+-libsasldb_la_LIBADD = $(SASL_DB_BACKEND)
+libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND) $(SASL_DB_LIB)
+libsasldb_la_LIBADD = $(SASL_DB_BACKEND) $(SASL_DB_LIB)
-
- # Prevent make dist stupidity
- libsasldb_a_SOURCES =
+ libsasldb_la_LDFLAGS = -no-undefined
diff --git a/debian/patches/0013-Drop-krb5support-dependency.patch b/debian/patches/0012-Drop-krb5support-dependency.patch
similarity index 75%
rename from debian/patches/0013-Drop-krb5support-dependency.patch
rename to debian/patches/0012-Drop-krb5support-dependency.patch
index a592a3e..4526f92 100644
--- a/debian/patches/0013-Drop-krb5support-dependency.patch
+++ b/debian/patches/0012-Drop-krb5support-dependency.patch
@@ -4,14 +4,14 @@ Date: Thu, 24 Mar 2016 11:35:04 +0100
Subject: Drop krb5support dependency
---
- cmulocal/sasl2.m4 | 3 ---
+ m4/sasl2.m4 | 3 ---
1 file changed, 3 deletions(-)
-diff --git a/cmulocal/sasl2.m4 b/cmulocal/sasl2.m4
-index 3c2841a..62af6ab 100644
---- a/cmulocal/sasl2.m4
-+++ b/cmulocal/sasl2.m4
-@@ -112,9 +112,6 @@ if test "$gssapi" != no; then
+diff --git a/m4/sasl2.m4 b/m4/sasl2.m4
+index dd0ec69..3fdba93 100644
+--- a/m4/sasl2.m4
++++ b/m4/sasl2.m4
+@@ -110,9 +110,6 @@ if test "$gssapi" != no; then
fi
if test "$gss_impl" = "auto" -o "$gss_impl" = "mit"; then
diff --git a/debian/patches/0015-LDAP-fixes.patch b/debian/patches/0013-LDAP-fixes.patch
similarity index 85%
rename from debian/patches/0015-LDAP-fixes.patch
rename to debian/patches/0013-LDAP-fixes.patch
index be5c96e..b429103 100644
--- a/debian/patches/0015-LDAP-fixes.patch
+++ b/debian/patches/0013-LDAP-fixes.patch
@@ -8,10 +8,10 @@ Subject: LDAP fixes
1 file changed, 2 insertions(+)
diff --git a/plugins/ldapdb.c b/plugins/ldapdb.c
-index ddead7f..b74dc9e 100644
+index 2016210..789a38c 100644
--- a/plugins/ldapdb.c
+++ b/plugins/ldapdb.c
-@@ -251,6 +251,8 @@ static int ldapdb_auxprop_lookup(void *glob_context,
+@@ -252,6 +252,8 @@ static int ldapdb_auxprop_lookup(void *glob_context,
#if defined(LDAP_PROXY_AUTHZ_FAILURE)
case LDAP_PROXY_AUTHZ_FAILURE:
diff --git a/debian/patches/0016-Don-t-use-la-files-for-opening-plugins.patch b/debian/patches/0014-Don-t-use-la-files-for-opening-plugins.patch
similarity index 100%
rename from debian/patches/0016-Don-t-use-la-files-for-opening-plugins.patch
rename to debian/patches/0014-Don-t-use-la-files-for-opening-plugins.patch
diff --git a/debian/patches/0014-Several-autotools-fixes.patch b/debian/patches/0014-Several-autotools-fixes.patch
deleted file mode 100644
index 250efb2..0000000
--- a/debian/patches/0014-Several-autotools-fixes.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-From: Debian Cyrus SASL Team
- <pkg-cyrus-sasl2-debian-devel at lists.alioth.debian.org>
-Date: Thu, 24 Mar 2016 11:35:04 +0100
-Subject: Several autotools fixes
-
----
- Makefile.am | 2 ++
- config/kerberos_v4.m4 | 8 ++++----
- configure.in | 2 ++
- saslauthd/Makefile.am | 2 ++
- saslauthd/configure.in | 33 +++++++++++++++++----------------
- 5 files changed, 27 insertions(+), 20 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 2091dd1..220565f 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -43,6 +43,8 @@ AUTOMAKE_OPTIONS = 1.7
- #
- ################################################################
-
-+ACLOCAL_AMFLAGS = -I cmulocal -I config
-+
- if SASLAUTHD
- SAD = saslauthd
- else
-diff --git a/config/kerberos_v4.m4 b/config/kerberos_v4.m4
-index 7884743..0e9b58c 100644
---- a/config/kerberos_v4.m4
-+++ b/config/kerberos_v4.m4
-@@ -89,18 +89,18 @@ AC_DEFUN([SASL_KERBEROS_V4_CHK], [
- dnl if we were ambitious, we would look more aggressively for the
- dnl krb4 install
- if test -d ${krb4}; then
-- AC_CACHE_CHECK(for Kerberos includes, cyrus_krbinclude, [
-+ AC_CACHE_CHECK(for Kerberos includes, cyrus_cv_krbinclude, [
- for krbhloc in include/kerberosIV include/kerberos include
- do
- if test -f ${krb4}/${krbhloc}/krb.h ; then
-- cyrus_krbinclude=${krb4}/${krbhloc}
-+ cyrus_cv_krbinclude=${krb4}/${krbhloc}
- break
- fi
- done
- ])
-
-- if test -n "${cyrus_krbinclude}"; then
-- CPPFLAGS="$CPPFLAGS -I${cyrus_krbinclude}"
-+ if test -n "${cyrus_cv_krbinclude}"; then
-+ CPPFLAGS="$CPPFLAGS -I${cyrus_cv_krbinclude}"
- fi
- LDFLAGS="$LDFLAGS -L$krb4/lib"
- fi
-diff --git a/configure.in b/configure.in
-index d4d250c..d9fead6 100644
---- a/configure.in
-+++ b/configure.in
-@@ -44,6 +44,8 @@ dnl
- AC_INIT(lib/saslint.h)
- AC_PREREQ([2.54])
-
-+AC_CONFIG_MACRO_DIRS([cmulocal] [config])
-+
- dnl use ./config.cache as the default cache file.
- dnl we require a cache file to successfully configure our build.
- if test $cache_file = "/dev/null"; then
-diff --git a/saslauthd/Makefile.am b/saslauthd/Makefile.am
-index a07281d..18c1630 100644
---- a/saslauthd/Makefile.am
-+++ b/saslauthd/Makefile.am
-@@ -1,4 +1,6 @@
- AUTOMAKE_OPTIONS = 1.7
-+ACLOCAL_AMFLAGS = -I ../cmulocal -I ../config
-+
- sbin_PROGRAMS = saslauthd testsaslauthd
- EXTRA_PROGRAMS = saslcache
-
-diff --git a/saslauthd/configure.in b/saslauthd/configure.in
-index 701dbe4..8643544 100644
---- a/saslauthd/configure.in
-+++ b/saslauthd/configure.in
-@@ -1,7 +1,8 @@
- AC_INIT(mechanisms.h)
- AC_PREREQ([2.54])
-
--AC_CONFIG_AUX_DIR(config)
-+AC_CONFIG_MACRO_DIRS([../cmulocal] [../config])
-+AC_CONFIG_AUX_DIR([config])
- AC_CANONICAL_HOST
-
- dnl Should we enable SASLAUTHd at all?
-@@ -164,30 +165,30 @@ AC_SUBST(LTLIBOBJS)
-
- dnl Checks for which function macros exist
- AC_MSG_CHECKING(whether $CC implements __func__)
--AC_CACHE_VAL(have_func,
-+AC_CACHE_VAL(_cv_have_func,
- [AC_TRY_LINK([#include <stdio.h>],[printf("%s", __func__);],
--have_func=yes,
--have_func=no)])
--AC_MSG_RESULT($have_func)
--if test "$have_func" = yes; then
-+_cv_have_func=yes,
-+_cv_have_func=no)])
-+AC_MSG_RESULT($_cv_have_func)
-+if test "$_cv_have_func" = yes; then
- AC_DEFINE(HAVE_FUNC,[],[Does the compiler understand __func__])
- else
- AC_MSG_CHECKING(whether $CC implements __PRETTY_FUNCTION__)
-- AC_CACHE_VAL(have_pretty_function,
-+ AC_CACHE_VAL(_cv_have_pretty_function,
- [AC_TRY_LINK([#include <stdio.h>],[printf("%s", __PRETTY_FUNCTION__);],
-- have_pretty_function=yes,
-- have_pretty_function=no)])
-- AC_MSG_RESULT($have_pretty_function)
-- if test "$have_pretty_function" = yes; then
-+ _cv_have_pretty_function=yes,
-+ _cv_have_pretty_function=no)])
-+ AC_MSG_RESULT($_cv_have_pretty_function)
-+ if test "$_cv_have_pretty_function" = yes; then
- AC_DEFINE(HAVE_PRETTY_FUNCTION,[],[Does compiler understand __PRETTY_FUNCTION__])
- else
- AC_MSG_CHECKING(whether $CC implements __FUNCTION__)
-- AC_CACHE_VAL(have_function,
-+ AC_CACHE_VAL(_cv_have_function,
- [AC_TRY_LINK([#include <stdio.h>],[printf("%s", __FUNCTION__);],
-- have_function=yes,
-- have_function=no)])
-- AC_MSG_RESULT($have_function)
-- if test "$have_function" = yes; then
-+ _cv_have_function=yes,
-+ _cv_have_function=no)])
-+ AC_MSG_RESULT($_cv_have_function)
-+ if test "$_cv_have_function" = yes; then
- AC_DEFINE(HAVE_FUNCTION,[],[Does compiler understand __FUNCTION__])
- fi
- fi
diff --git a/debian/patches/0017-Don-t-use-R-when-searching-for-SQLite-libraries.patch b/debian/patches/0015-Don-t-use-R-when-searching-for-SQLite-libraries.patch
similarity index 81%
rename from debian/patches/0017-Don-t-use-R-when-searching-for-SQLite-libraries.patch
rename to debian/patches/0015-Don-t-use-R-when-searching-for-SQLite-libraries.patch
index 48e823a..deef457 100644
--- a/debian/patches/0017-Don-t-use-R-when-searching-for-SQLite-libraries.patch
+++ b/debian/patches/0015-Don-t-use-R-when-searching-for-SQLite-libraries.patch
@@ -4,14 +4,14 @@ Date: Thu, 24 Mar 2016 11:35:04 +0100
Subject: Don't use -R when searching for SQLite libraries
---
- configure.in | 8 ++++----
+ configure.ac | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
-diff --git a/configure.in b/configure.in
-index d9fead6..9fcc80c 100644
---- a/configure.in
-+++ b/configure.in
-@@ -865,9 +865,9 @@ case "$with_sqlite" in
+diff --git a/configure.ac b/configure.ac
+index 8f3cc1e..dd599ca 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -978,9 +978,9 @@ case "$with_sqlite" in
notfound) AC_WARN([SQLite Library not found]); true;;
*)
if test -d ${with_sqlite}/lib; then
@@ -23,7 +23,7 @@ index d9fead6..9fcc80c 100644
fi
LIB_SQLITE_DIR=$LIB_SQLITE
-@@ -917,9 +917,9 @@ case "$with_sqlite3" in
+@@ -1030,9 +1030,9 @@ case "$with_sqlite3" in
notfound) AC_WARN([SQLite3 Library not found]); true;;
*)
if test -d ${with_sqlite3}/lib; then
diff --git a/debian/patches/0018-Revert-1.103-revision-to-unbreak-GSSAPI.patch b/debian/patches/0016-Revert-1.103-revision-to-unbreak-GSSAPI.patch
similarity index 90%
rename from debian/patches/0018-Revert-1.103-revision-to-unbreak-GSSAPI.patch
rename to debian/patches/0016-Revert-1.103-revision-to-unbreak-GSSAPI.patch
index 2a16842..8bd1503 100644
--- a/debian/patches/0018-Revert-1.103-revision-to-unbreak-GSSAPI.patch
+++ b/debian/patches/0016-Revert-1.103-revision-to-unbreak-GSSAPI.patch
@@ -8,10 +8,10 @@ Subject: Revert 1.103 revision to unbreak GSSAPI
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/plugins/gssapi.c b/plugins/gssapi.c
-index 2fd1b3b..ec9f7aa 100644
+index 5204e54..a33f8a3 100644
--- a/plugins/gssapi.c
+++ b/plugins/gssapi.c
-@@ -1583,10 +1583,10 @@ static int gssapi_client_mech_step(void *conn_context,
+@@ -1624,10 +1624,10 @@ static int gssapi_client_mech_step(void *conn_context,
}
/* Setup req_flags properly */
diff --git a/debian/patches/0019-Fix-segfault-in-GSSAPI.patch b/debian/patches/0017-Fix-segfault-in-GSSAPI.patch
similarity index 85%
rename from debian/patches/0019-Fix-segfault-in-GSSAPI.patch
rename to debian/patches/0017-Fix-segfault-in-GSSAPI.patch
index 72ce4ab..6fef1e9 100644
--- a/debian/patches/0019-Fix-segfault-in-GSSAPI.patch
+++ b/debian/patches/0017-Fix-segfault-in-GSSAPI.patch
@@ -8,10 +8,10 @@ Subject: Fix segfault in GSSAPI
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/plugins/gssapi.c b/plugins/gssapi.c
-index ec9f7aa..348801b 100644
+index a33f8a3..da94663 100644
--- a/plugins/gssapi.c
+++ b/plugins/gssapi.c
-@@ -376,6 +376,7 @@ sasl_gss_encode(void *context, const struct iovec *invec, unsigned numiov,
+@@ -389,6 +389,7 @@ sasl_gss_encode(void *context, const struct iovec *invec, unsigned numiov,
}
if (output_token->value && output) {
@@ -19,7 +19,7 @@ index ec9f7aa..348801b 100644
unsigned char * p;
ret = _plug_buf_alloc(text->utils,
-@@ -392,11 +393,8 @@ sasl_gss_encode(void *context, const struct iovec *invec, unsigned numiov,
+@@ -405,11 +406,8 @@ sasl_gss_encode(void *context, const struct iovec *invec, unsigned numiov,
p = (unsigned char *) text->encode_buf;
diff --git a/debian/patches/0020-Fix-dovecot-authentication.patch b/debian/patches/0018-Fix-dovecot-authentication.patch
similarity index 96%
rename from debian/patches/0020-Fix-dovecot-authentication.patch
rename to debian/patches/0018-Fix-dovecot-authentication.patch
index 45a525f..80f939b 100644
--- a/debian/patches/0020-Fix-dovecot-authentication.patch
+++ b/debian/patches/0018-Fix-dovecot-authentication.patch
@@ -8,7 +8,7 @@ Subject: Fix dovecot authentication
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/lib/checkpw.c b/lib/checkpw.c
-index d371f3f..4e61a19 100644
+index c38dffc..7250aba 100644
--- a/lib/checkpw.c
+++ b/lib/checkpw.c
@@ -587,16 +587,14 @@ static int read_wait(int fd, unsigned delta)
diff --git a/debian/patches/0019-Temporary-multiarch-fixes.patch b/debian/patches/0019-Temporary-multiarch-fixes.patch
new file mode 100644
index 0000000..cc8123e
--- /dev/null
+++ b/debian/patches/0019-Temporary-multiarch-fixes.patch
@@ -0,0 +1,22 @@
+From: Debian Cyrus SASL Team
+ <pkg-cyrus-sasl2-debian-devel at lists.alioth.debian.org>
+Date: Thu, 24 Mar 2016 11:35:04 +0100
+Subject: Temporary multiarch fixes
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index dd599ca..d18016e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -281,7 +281,7 @@ AC_ARG_WITH(pam, [ --with-pam=DIR use PAM (rooted in DIR) [[yes]] ],
+ if test "$with_pam" != no; then
+ if test -d $with_pam; then
+ CPPFLAGS="$CPPFLAGS -I${with_pam}/include"
+- LDFLAGS="$LDFLAGS -L${with_pam}/lib"
++ LDFLAGS="$LDFLAGS -L${with_pam}/$DEB_HOST_MULTIARCH/lib"
+ fi
+ AC_CHECK_HEADERS(security/pam_appl.h pam/pam_appl.h)
+ cmu_save_LIBS="$LIBS"
diff --git a/debian/patches/0020-Add-reference-to-LDAP_SASLAUTHD-file-to-the-saslauth.patch b/debian/patches/0020-Add-reference-to-LDAP_SASLAUTHD-file-to-the-saslauth.patch
new file mode 100644
index 0000000..ada3af6
--- /dev/null
+++ b/debian/patches/0020-Add-reference-to-LDAP_SASLAUTHD-file-to-the-saslauth.patch
@@ -0,0 +1,24 @@
+From: Debian Cyrus SASL Team
+ <pkg-cyrus-sasl2-debian-devel at lists.alioth.debian.org>
+Date: Thu, 24 Mar 2016 11:35:04 +0100
+Subject: Add reference to LDAP_SASLAUTHD file to the saslauthd documentation
+
+---
+ saslauthd/saslauthd.mdoc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/saslauthd/saslauthd.mdoc b/saslauthd/saslauthd.mdoc
+index 5b0230d..0e84e6f 100644
+--- a/saslauthd/saslauthd.mdoc
++++ b/saslauthd/saslauthd.mdoc
+@@ -222,8 +222,8 @@ instead.
+ .Pp
+ Authenticate against an ldap server. The ldap configuration parameters are
+ read from /etc/saslauthd.conf. The location of this file can be
+-changed with the -O parameter. See the LDAP_SASLAUTHD file included with the
+-distribution for the list of available parameters.
++changed with the -O parameter. See the LDAP_SASLAUTHD file included in the
++cyrus-sasl2-doc package for the list of available parameters.
+ .It Li sia
+ .Em (Digital UNIX)
+ .Pp
diff --git a/debian/patches/0023-Send-IMAP-logout.patch b/debian/patches/0021-Send-IMAP-logout.patch
similarity index 91%
rename from debian/patches/0023-Send-IMAP-logout.patch
rename to debian/patches/0021-Send-IMAP-logout.patch
index e666690..6bef69e 100644
--- a/debian/patches/0023-Send-IMAP-logout.patch
+++ b/debian/patches/0021-Send-IMAP-logout.patch
@@ -8,10 +8,10 @@ Subject: Send IMAP logout
1 file changed, 21 insertions(+)
diff --git a/saslauthd/auth_rimap.c b/saslauthd/auth_rimap.c
-index 2c3870f..bb8eccb 100644
+index bdf89b3..e9d8da5 100644
--- a/saslauthd/auth_rimap.c
+++ b/saslauthd/auth_rimap.c
-@@ -90,6 +90,7 @@ static struct addrinfo *ai = NULL; /* remote authentication host */
+@@ -100,6 +100,7 @@ static struct addrinfo *ai = NULL; /* remote authentication host */
service we connect to. */
#define TAG "saslauthd" /* IMAP command tag */
#define LOGIN_CMD (TAG " LOGIN ") /* IMAP login command (with tag) */
@@ -19,7 +19,7 @@ index 2c3870f..bb8eccb 100644
#define NETWORK_IO_TIMEOUT 30 /* network I/O timeout (seconds) */
#define RESP_LEN 1000 /* size of read response buffer */
-@@ -307,10 +308,12 @@ auth_rimap (
+@@ -317,10 +318,12 @@ auth_rimap (
int s=-1; /* socket to remote auth host */
struct addrinfo *r; /* remote socket address info */
struct iovec iov[5]; /* for sending LOGIN command */
@@ -32,7 +32,7 @@ index 2c3870f..bb8eccb 100644
char rbuf[RESP_LEN]; /* response read buffer */
char hbuf[NI_MAXHOST], pbuf[NI_MAXSERV];
int saved_errno;
-@@ -505,6 +508,24 @@ auth_rimap (
+@@ -515,6 +518,24 @@ auth_rimap (
}
}
}
diff --git a/debian/patches/0021-Temporary-multiarch-fixes.patch b/debian/patches/0021-Temporary-multiarch-fixes.patch
deleted file mode 100644
index d6e1ee5..0000000
--- a/debian/patches/0021-Temporary-multiarch-fixes.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Debian Cyrus SASL Team
- <pkg-cyrus-sasl2-debian-devel at lists.alioth.debian.org>
-Date: Thu, 24 Mar 2016 11:35:04 +0100
-Subject: Temporary multiarch fixes
-
----
- configure.in | 2 +-
- saslauthd/configure.in | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 9fcc80c..694a734 100644
---- a/configure.in
-+++ b/configure.in
-@@ -277,7 +277,7 @@ AC_ARG_WITH(pam, [ --with-pam=DIR use PAM (rooted in DIR) [[yes]] ],
- if test "$with_pam" != no; then
- if test -d $with_pam; then
- CPPFLAGS="$CPPFLAGS -I${with_pam}/include"
-- LDFLAGS="$LDFLAGS -L${with_pam}/lib"
-+ LDFLAGS="$LDFLAGS -L${with_pam}/$DEB_HOST_MULTIARCH/lib"
- fi
- AC_CHECK_HEADERS(security/pam_appl.h pam/pam_appl.h)
- cmu_save_LIBS="$LIBS"
-diff --git a/saslauthd/configure.in b/saslauthd/configure.in
-index 8643544..4233017 100644
---- a/saslauthd/configure.in
-+++ b/saslauthd/configure.in
-@@ -95,7 +95,7 @@ AC_ARG_WITH(pam, [ --with-pam=DIR use PAM (rooted in DIR) [yes] ],
- if test "$with_pam" != no; then
- if test -d $with_pam; then
- CPPFLAGS="$CPPFLAGS -I${with_pam}/include"
-- LDFLAGS="$LDFLAGS -L${with_pam}/lib"
-+ LDFLAGS="$LDFLAGS -L${with_pam}/$DEB_HOST_MULTIARCH/lib"
- fi
- cmu_save_LIBS="$LIBS"
- AC_CHECK_LIB(pam, pam_start, [
diff --git a/debian/patches/0022-Add-reference-to-LDAP_SASLAUTHD-file-to-the-saslauth.patch b/debian/patches/0022-Add-reference-to-LDAP_SASLAUTHD-file-to-the-saslauth.patch
deleted file mode 100644
index cbe14a9..0000000
--- a/debian/patches/0022-Add-reference-to-LDAP_SASLAUTHD-file-to-the-saslauth.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Debian Cyrus SASL Team
- <pkg-cyrus-sasl2-debian-devel at lists.alioth.debian.org>
-Date: Thu, 24 Mar 2016 11:35:04 +0100
-Subject: Add reference to LDAP_SASLAUTHD file to the saslauthd documentation
-
----
- saslauthd/saslauthd.8 | 4 ++--
- saslauthd/saslauthd.mdoc | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/saslauthd/saslauthd.8 b/saslauthd/saslauthd.8
-index 843edb0..8a35732 100644
---- a/saslauthd/saslauthd.8
-+++ b/saslauthd/saslauthd.8
-@@ -158,8 +158,8 @@ AAUUTTHHEENNTTIICCAATTIIOONN MMEECCHHAANNIISSMMSS
- Authenticate against an ldap server. The ldap configuration
- parameters are read from /usr/local/etc/saslauthd.conf. The
- location of this file can be changed with the -O parameter.
-- See the LDAP_SASLAUTHD file included with the distribution for
-- the list of available parameters.
-+ See the LDAP_SASLAUTHD file included in the cyrus-sasl2-doc
-+ package for the list of available parameters.
-
- sia _(_D_i_g_i_t_a_l _U_N_I_X_)
-
-diff --git a/saslauthd/saslauthd.mdoc b/saslauthd/saslauthd.mdoc
-index 5b0230d..0e84e6f 100644
---- a/saslauthd/saslauthd.mdoc
-+++ b/saslauthd/saslauthd.mdoc
-@@ -222,8 +222,8 @@ instead.
- .Pp
- Authenticate against an ldap server. The ldap configuration parameters are
- read from /etc/saslauthd.conf. The location of this file can be
--changed with the -O parameter. See the LDAP_SASLAUTHD file included with the
--distribution for the list of available parameters.
-+changed with the -O parameter. See the LDAP_SASLAUTHD file included in the
-+cyrus-sasl2-doc package for the list of available parameters.
- .It Li sia
- .Em (Digital UNIX)
- .Pp
diff --git a/debian/patches/0024-Fix-canonuser-ldapdb-garbage-in-out-buffer.patch b/debian/patches/0022-Fix-canonuser-ldapdb-garbage-in-out-buffer.patch
similarity index 84%
rename from debian/patches/0024-Fix-canonuser-ldapdb-garbage-in-out-buffer.patch
rename to debian/patches/0022-Fix-canonuser-ldapdb-garbage-in-out-buffer.patch
index 88060b7..c158954 100644
--- a/debian/patches/0024-Fix-canonuser-ldapdb-garbage-in-out-buffer.patch
+++ b/debian/patches/0022-Fix-canonuser-ldapdb-garbage-in-out-buffer.patch
@@ -8,10 +8,10 @@ Subject: Fix canonuser ldapdb garbage in out buffer
1 file changed, 1 insertion(+)
diff --git a/plugins/ldapdb.c b/plugins/ldapdb.c
-index b74dc9e..730f129 100644
+index 789a38c..d09985d 100644
--- a/plugins/ldapdb.c
+++ b/plugins/ldapdb.c
-@@ -406,6 +406,7 @@ ldapdb_canon_server(void *glob_context,
+@@ -407,6 +407,7 @@ ldapdb_canon_server(void *glob_context,
if ( len > out_max )
len = out_max;
memcpy(out, bvals[0]->bv_val, len);
diff --git a/debian/patches/0023-Fix-keytab-option-for-MIT-Kerberos.patch b/debian/patches/0023-Fix-keytab-option-for-MIT-Kerberos.patch
new file mode 100644
index 0000000..bde86ae
--- /dev/null
+++ b/debian/patches/0023-Fix-keytab-option-for-MIT-Kerberos.patch
@@ -0,0 +1,66 @@
+From: Debian Cyrus SASL Team
+ <pkg-cyrus-sasl2-debian-devel at lists.alioth.debian.org>
+Date: Thu, 24 Mar 2016 11:35:05 +0100
+Subject: Fix keytab option for MIT Kerberos
+
+---
+ m4/sasl2.m4 | 1 +
+ plugins/gssapi.c | 11 ++++++++---
+ 2 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/m4/sasl2.m4 b/m4/sasl2.m4
+index 3fdba93..922d072 100644
+--- a/m4/sasl2.m4
++++ b/m4/sasl2.m4
+@@ -275,6 +275,7 @@ if test "$gssapi" != no; then
+ ])
+ fi
+ fi
++ AC_CHECK_FUNCS(krb5_gss_register_acceptor_identity)
+ AC_CHECK_FUNCS(gss_decapsulate_token)
+ AC_CHECK_FUNCS(gss_encapsulate_token)
+ AC_CHECK_FUNCS(gss_oid_equal)
+diff --git a/plugins/gssapi.c b/plugins/gssapi.c
+index da94663..9c4aa79 100644
+--- a/plugins/gssapi.c
++++ b/plugins/gssapi.c
+@@ -1406,7 +1406,7 @@ static sasl_server_plug_t gssapi_server_plugins[] =
+ };
+
+ int gssapiv2_server_plug_init(
+-#ifndef HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY
++#if !defined(HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY) && !defined(HAVE_KRB5_GSS_REGISTER_ACCEPTOR_IDENTITY)
+ const sasl_utils_t *utils __attribute__((unused)),
+ #else
+ const sasl_utils_t *utils,
+@@ -1416,7 +1416,7 @@ int gssapiv2_server_plug_init(
+ sasl_server_plug_t **pluglist,
+ int *plugcount)
+ {
+-#ifdef HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY
++#if defined(HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY) || defined(HAVE_KRB5_GSS_REGISTER_ACCEPTOR_IDENTITY)
+ const char *keytab = NULL;
+ char keytab_path[1024];
+ unsigned int rl;
+@@ -1426,7 +1426,7 @@ int gssapiv2_server_plug_init(
+ return SASL_BADVERS;
+ }
+
+-#ifdef HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY
++#if defined(HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY) || defined(HAVE_KRB5_GSS_REGISTER_ACCEPTOR_IDENTITY)
+ /* unfortunately, we don't check for readability of keytab if it's
+ the standard one, since we don't know where it is */
+
+@@ -1449,7 +1449,12 @@ int gssapiv2_server_plug_init(
+
+ strncpy(keytab_path, keytab, 1024);
+
++#ifdef HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY
+ gsskrb5_register_acceptor_identity(keytab_path);
++#endif
++#ifdef HAVE_KRB5_GSS_REGISTER_ACCEPTOR_IDENTITY
++ krb5_gss_register_acceptor_identity(keytab_path);
++#endif
+ }
+ #endif
+
diff --git a/debian/patches/0026-Release-server-creds-when-they-are-no-longer-needed.patch b/debian/patches/0024-Release-server-creds-when-they-are-no-longer-needed.patch
similarity index 75%
rename from debian/patches/0026-Release-server-creds-when-they-are-no-longer-needed.patch
rename to debian/patches/0024-Release-server-creds-when-they-are-no-longer-needed.patch
index 02fc9bf..68204ed 100644
--- a/debian/patches/0026-Release-server-creds-when-they-are-no-longer-needed.patch
+++ b/debian/patches/0024-Release-server-creds-when-they-are-no-longer-needed.patch
@@ -8,12 +8,12 @@ Subject: Release server creds when they are no longer needed
1 file changed, 6 insertions(+)
diff --git a/plugins/gssapi.c b/plugins/gssapi.c
-index 5102bfc..a959e06 100644
+index 9c4aa79..fb2f0df 100644
--- a/plugins/gssapi.c
+++ b/plugins/gssapi.c
-@@ -945,6 +945,12 @@ gssapi_server_mech_authneg(context_t *text,
- ret = SASL_CONTINUE;
- }
+@@ -978,6 +978,12 @@ gssapi_server_mech_authneg(context_t *text,
+ text->server_creds = GSS_C_NO_CREDENTIAL;
+ }
+ /* Release server creds which are no longer needed */
+ if ( text->server_creds != GSS_C_NO_CREDENTIAL) {
@@ -22,5 +22,5 @@ index 5102bfc..a959e06 100644
+ }
+
cleanup:
- if (client_name_MN) {
+ if (text->server_creds != GSS_C_NO_CREDENTIAL) {
GSS_LOCK_MUTEX(params->utils);
diff --git a/debian/patches/0025-Fix-keytab-option-for-MIT-Kerberos.patch b/debian/patches/0025-Fix-keytab-option-for-MIT-Kerberos.patch
deleted file mode 100644
index 4bb751b..0000000
--- a/debian/patches/0025-Fix-keytab-option-for-MIT-Kerberos.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-From: Debian Cyrus SASL Team
- <pkg-cyrus-sasl2-debian-devel at lists.alioth.debian.org>
-Date: Thu, 24 Mar 2016 11:35:05 +0100
-Subject: Fix keytab option for MIT Kerberos
-
----
- cmulocal/sasl2.m4 | 1 +
- config.h.in | 4 ++++
- configure | 2 +-
- plugins/gssapi.c | 14 +++++++++++---
- saslauthd/configure | 2 +-
- saslauthd/saslauthd.h.in | 4 ++++
- 6 files changed, 22 insertions(+), 5 deletions(-)
-
-diff --git a/cmulocal/sasl2.m4 b/cmulocal/sasl2.m4
-index 62af6ab..6a34b7a 100644
---- a/cmulocal/sasl2.m4
-+++ b/cmulocal/sasl2.m4
-@@ -266,6 +266,7 @@ if test "$gssapi" != no; then
- cmu_save_LIBS="$LIBS"
- LIBS="$LIBS $GSSAPIBASE_LIBS"
- AC_CHECK_FUNCS(gsskrb5_register_acceptor_identity)
-+ AC_CHECK_FUNCS(krb5_gss_register_acceptor_identity)
- AC_CHECK_FUNCS(gss_decapsulate_token)
- AC_CHECK_FUNCS(gss_encapsulate_token)
- AC_CHECK_FUNCS(gss_oid_equal)
-diff --git a/config.h.in b/config.h.in
-index 6794af9..af13c25 100644
---- a/config.h.in
-+++ b/config.h.in
-@@ -126,6 +126,10 @@
- */
- #undef HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY
-
-+/* Define to 1 if you have the `krb5_gss_register_acceptor_identity' function.
-+ */
-+#undef HAVE_KRB5_GSS_REGISTER_ACCEPTOR_IDENTITY
-+
- /* Define if your GSSAPI implementation defines GSS_C_NT_HOSTBASED_SERVICE */
- #undef HAVE_GSS_C_NT_HOSTBASED_SERVICE
-
-diff --git a/configure b/configure
-index 93fee28..c31ba83 100755
---- a/configure
-+++ b/configure
-@@ -13367,7 +13367,7 @@ fi
- cmu_save_LIBS="$LIBS"
- LIBS="$LIBS $GSSAPIBASE_LIBS"
-
--for ac_func in gsskrb5_register_acceptor_identity
-+for ac_func in gsskrb5_register_acceptor_identity krb5_gss_regster_acceptor_identity
- do
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
- { $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-diff --git a/plugins/gssapi.c b/plugins/gssapi.c
-index 348801b..5102bfc 100644
---- a/plugins/gssapi.c
-+++ b/plugins/gssapi.c
-@@ -50,6 +50,9 @@
- #else
- #include <gssapi/gssapi.h>
- #endif
-+#ifdef HAVE_KRB5_GSS_REGISTER_ACCEPTOR_IDENTITY
-+#include <gssapi/gssapi_krb5.h>
-+#endif
-
- #ifdef WIN32
- # include <winsock2.h>
-@@ -1365,7 +1368,7 @@ static sasl_server_plug_t gssapi_server_plugins[] =
- };
-
- int gssapiv2_server_plug_init(
--#ifndef HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY
-+#if !defined(HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY) && !defined(HAVE_KRB5_GSS_REGISTER_ACCEPTOR_IDENTITY)
- const sasl_utils_t *utils __attribute__((unused)),
- #else
- const sasl_utils_t *utils,
-@@ -1375,7 +1378,7 @@ int gssapiv2_server_plug_init(
- sasl_server_plug_t **pluglist,
- int *plugcount)
- {
--#ifdef HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY
-+#if defined(HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY) || defined(HAVE_KRB5_GSS_REGISTER_ACCEPTOR_IDENTITY)
- const char *keytab = NULL;
- char keytab_path[1024];
- unsigned int rl;
-@@ -1385,7 +1388,7 @@ int gssapiv2_server_plug_init(
- return SASL_BADVERS;
- }
-
--#ifdef HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY
-+#if defined(HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY) || defined(HAVE_KRB5_GSS_REGISTER_ACCEPTOR_IDENTITY)
- /* unfortunately, we don't check for readability of keytab if it's
- the standard one, since we don't know where it is */
-
-@@ -1408,7 +1411,12 @@ int gssapiv2_server_plug_init(
-
- strncpy(keytab_path, keytab, 1024);
-
-+#ifdef HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY
- gsskrb5_register_acceptor_identity(keytab_path);
-+#endif
-+#ifdef HAVE_KRB5_GSS_REGISTER_ACCEPTOR_IDENTITY
-+ krb5_gss_register_acceptor_identity(keytab_path);
-+#endif
- }
- #endif
-
-diff --git a/saslauthd/configure b/saslauthd/configure
-index 04cb414..c856644 100755
---- a/saslauthd/configure
-+++ b/saslauthd/configure
-@@ -9116,7 +9116,7 @@ fi
- cmu_save_LIBS="$LIBS"
- LIBS="$LIBS $GSSAPIBASE_LIBS"
-
--for ac_func in gsskrb5_register_acceptor_identity
-+for ac_func in gsskrb5_register_acceptor_identity krb5_gss_regster_acceptor_identity
- do
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
- { $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-diff --git a/saslauthd/saslauthd.h.in b/saslauthd/saslauthd.h.in
-index a61f3ba..c83e4a9 100644
---- a/saslauthd/saslauthd.h.in
-+++ b/saslauthd/saslauthd.h.in
-@@ -62,6 +62,10 @@
- */
- #undef HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY
-
-+/* Define to 1 if you have the `krb5_gss_register_acceptor_identity' function.
-+ */
-+#undef HAVE_KRB5_GSS_REGISTER_ACCEPTOR_IDENTITY
-+
- /* Define if your GSSAPI implementation defines GSS_C_NT_HOSTBASED_SERVICE */
- #undef HAVE_GSS_C_NT_HOSTBASED_SERVICE
-
diff --git a/debian/patches/0028-Fix-typo-in-debugging-logs.patch b/debian/patches/0025-Fix-typo-in-debugging-logs.patch
similarity index 97%
rename from debian/patches/0028-Fix-typo-in-debugging-logs.patch
rename to debian/patches/0025-Fix-typo-in-debugging-logs.patch
index c508964..c0f9901 100644
--- a/debian/patches/0028-Fix-typo-in-debugging-logs.patch
+++ b/debian/patches/0025-Fix-typo-in-debugging-logs.patch
@@ -8,7 +8,7 @@ Subject: Fix typo in debugging logs
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/saslauthd/cache.c b/saslauthd/cache.c
-index 2b78464..b13171d 100644
+index 543e176..62a4daa 100644
--- a/saslauthd/cache.c
+++ b/saslauthd/cache.c
@@ -264,7 +264,7 @@ int cache_lookup(const char *user, const char *realm, const char *service, const
diff --git a/debian/patches/0026-Revert-upstream-soname-bump.patch b/debian/patches/0026-Revert-upstream-soname-bump.patch
new file mode 100644
index 0000000..96a58fa
--- /dev/null
+++ b/debian/patches/0026-Revert-upstream-soname-bump.patch
@@ -0,0 +1,35 @@
+From: =?utf-8?q?Ond=C5=99ej_Sur=C3=BD?= <ondrej at debian.org>
+Date: Thu, 24 Mar 2016 11:35:05 +0100
+Subject: Revert upstream soname bump
+
+---
+ lib/Makefile.am | 2 +-
+ plugins/Makefile.am | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/Makefile.am b/lib/Makefile.am
+index 2402557..7eac924 100644
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -43,7 +43,7 @@
+ # Library version info - here at the top, for sanity
+ # See <http://www.gnu.org/software/libtool/manual/libtool.html#Versioning>
+ # CURRENT:REVISION:AGE
+-sasl_version = 3:0:0
++sasl_version = 2:25:0
+
+ AM_CPPFLAGS=-DLIBSASL_EXPORTS=1 -I$(top_srcdir)/include -I$(top_srcdir)/plugins -I$(top_builddir)/include -I$(top_srcdir)/sasldb
+
+diff --git a/plugins/Makefile.am b/plugins/Makefile.am
+index 452596e..6f755e1 100644
+--- a/plugins/Makefile.am
++++ b/plugins/Makefile.am
+@@ -47,7 +47,7 @@
+ # Library version info - here at the top, for sanity
+ # See <http://www.gnu.org/software/libtool/manual/libtool.html#Versioning>
+ # CURRENT:REVISION:AGE
+-plugin_version = 3:0:0
++plugin_version = 2:25:0
+
+ AM_CPPFLAGS=-I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/sasldb -I$(top_builddir)/include
+ AM_LDFLAGS = -module -export-dynamic -rpath $(plugindir) -version-info $(plugin_version) -no-undefined
diff --git a/debian/patches/0030-Fix-return-SASL_FAIL-in-void-sasl_dispose.patch b/debian/patches/0027-Fix-return-SASL_FAIL-in-void-sasl_dispose.patch
similarity index 95%
rename from debian/patches/0030-Fix-return-SASL_FAIL-in-void-sasl_dispose.patch
rename to debian/patches/0027-Fix-return-SASL_FAIL-in-void-sasl_dispose.patch
index f0cf603..7aebaf5 100644
--- a/debian/patches/0030-Fix-return-SASL_FAIL-in-void-sasl_dispose.patch
+++ b/debian/patches/0027-Fix-return-SASL_FAIL-in-void-sasl_dispose.patch
@@ -8,7 +8,7 @@ Subject: Fix 'return SASL_FAIL;' in void sasl_dispose()
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/common.c b/lib/common.c
-index 1df5702..74ebac8 100644
+index b83557d..8e9ae09 100644
--- a/lib/common.c
+++ b/lib/common.c
@@ -841,7 +841,7 @@ void sasl_dispose(sasl_conn_t **pconn)
diff --git a/debian/patches/0027-Include-sys-types.h-in-sasl.h.patch b/debian/patches/0027-Include-sys-types.h-in-sasl.h.patch
deleted file mode 100644
index 24f43e4..0000000
--- a/debian/patches/0027-Include-sys-types.h-in-sasl.h.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Debian Cyrus SASL Team
- <pkg-cyrus-sasl2-debian-devel at lists.alioth.debian.org>
-Date: Thu, 24 Mar 2016 11:35:05 +0100
-Subject: Include sys/types.h in sasl.h
-
----
- include/sasl.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/include/sasl.h b/include/sasl.h
-index fef4d51..d52269f 100755
---- a/include/sasl.h
-+++ b/include/sasl.h
-@@ -223,6 +223,8 @@ extern "C" {
- * they must be called before all other SASL functions:
- */
-
-+#include <sys/types.h>
-+
- /* memory allocation functions which may optionally be replaced:
- */
- typedef void *sasl_malloc_t(size_t);
diff --git a/debian/patches/0031-properly-create-libsasl2.pc.patch b/debian/patches/0028-properly-create-libsasl2.pc.patch
similarity index 67%
rename from debian/patches/0031-properly-create-libsasl2.pc.patch
rename to debian/patches/0028-properly-create-libsasl2.pc.patch
index bb1c624..39ba0b2 100644
--- a/debian/patches/0031-properly-create-libsasl2.pc.patch
+++ b/debian/patches/0028-properly-create-libsasl2.pc.patch
@@ -5,14 +5,14 @@ Subject: properly create libsasl2.pc
---
Makefile.am | 10 ++++++++++
- configure.in | 1 -
+ configure.ac | 1 -
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
-index 220565f..4055bf8 100644
+index f72bb26..a47540f 100644
--- a/Makefile.am
+++ b/Makefile.am
-@@ -43,6 +43,12 @@ AUTOMAKE_OPTIONS = 1.7
+@@ -44,6 +44,12 @@ ACLOCAL_AMFLAGS = -I m4
#
################################################################
@@ -22,10 +22,10 @@ index 220565f..4055bf8 100644
+ -e 's,[@]VERSION[@],$(VERSION),g' \
+ -e 's,[@]libdir[@],$(libdir),g'
+
- ACLOCAL_AMFLAGS = -I cmulocal -I config
-
if SASLAUTHD
-@@ -78,6 +84,10 @@ EXTRA_DIST=config cmulocal win32 mac dlcompat-20010505 NTMakefile INSTALL.TXT \
+ SAD = saslauthd
+ else
+@@ -77,6 +83,10 @@ EXTRA_DIST=config win32 mac dlcompat-20010505 NTMakefile INSTALL.TXT \
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libsasl2.pc
@@ -36,15 +36,15 @@ index 220565f..4055bf8 100644
dist-hook:
@find $(distdir) -exec chmod o+w {} ';'
@find $(distdir) -name CVS -print | xargs -t rm -rf
-diff --git a/configure.in b/configure.in
-index 694a734..ea24213 100644
---- a/configure.in
-+++ b/configure.in
-@@ -1419,7 +1419,6 @@ inline static unsigned int sleep(unsigned int seconds) {
- AM_CONFIG_HEADER(config.h)
+diff --git a/configure.ac b/configure.ac
+index d18016e..d28005a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1544,7 +1544,6 @@ extern int asprintf(char **str, const char *fmt, ...);
+ AC_CONFIG_HEADERS(config.h)
AC_OUTPUT(Makefile
-libsasl2.pc
include/Makefile
+ saslauthd/Makefile
sasldb/Makefile
- plugins/Makefile
diff --git a/debian/patches/0032-2.1.26-Allow-CAPABILITY-lines-in-IMAP-login-reply-v4.patch b/debian/patches/0029-2.1.26-Allow-CAPABILITY-lines-in-IMAP-login-reply-v4.patch
similarity index 95%
rename from debian/patches/0032-2.1.26-Allow-CAPABILITY-lines-in-IMAP-login-reply-v4.patch
rename to debian/patches/0029-2.1.26-Allow-CAPABILITY-lines-in-IMAP-login-reply-v4.patch
index fccdd30..09b62a4 100644
--- a/debian/patches/0032-2.1.26-Allow-CAPABILITY-lines-in-IMAP-login-reply-v4.patch
+++ b/debian/patches/0029-2.1.26-Allow-CAPABILITY-lines-in-IMAP-login-reply-v4.patch
@@ -7,7 +7,7 @@ Subject: 2.1.26: Allow "* CAPABILITY" lines in IMAP login reply (v4)
1 file changed, 111 insertions(+), 14 deletions(-)
diff --git a/saslauthd/auth_rimap.c b/saslauthd/auth_rimap.c
-index bb8eccb..06341d7 100644
+index e9d8da5..3fcfbd4 100644
--- a/saslauthd/auth_rimap.c
+++ b/saslauthd/auth_rimap.c
@@ -3,6 +3,7 @@
@@ -18,7 +18,7 @@ index bb8eccb..06341d7 100644
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
-@@ -91,6 +92,9 @@ static struct addrinfo *ai = NULL; /* remote authentication host */
+@@ -101,6 +102,9 @@ static struct addrinfo *ai = NULL; /* remote authentication host */
#define TAG "saslauthd" /* IMAP command tag */
#define LOGIN_CMD (TAG " LOGIN ") /* IMAP login command (with tag) */
#define LOGOUT_CMD (TAG " LOGOUT ") /* IMAP logout command (with tag)*/
@@ -28,7 +28,7 @@ index bb8eccb..06341d7 100644
#define NETWORK_IO_TIMEOUT 30 /* network I/O timeout (seconds) */
#define RESP_LEN 1000 /* size of read response buffer */
-@@ -278,6 +282,109 @@ auth_rimap_init (
+@@ -288,6 +292,109 @@ auth_rimap_init (
/* END FUNCTION: auth_rimap_init */
@@ -138,7 +138,7 @@ index bb8eccb..06341d7 100644
/* FUNCTION: auth_rimap */
/* SYNOPSIS
-@@ -318,6 +425,7 @@ auth_rimap (
+@@ -328,6 +435,7 @@ auth_rimap (
char hbuf[NI_MAXHOST], pbuf[NI_MAXSERV];
int saved_errno;
int niflags;
@@ -146,7 +146,7 @@ index bb8eccb..06341d7 100644
/* END VARIABLES */
/* sanity checks */
-@@ -533,25 +641,14 @@ auth_rimap (
+@@ -543,25 +651,14 @@ auth_rimap (
}
rbuf[rc] = '\0'; /* tie off response */
diff --git a/debian/patches/0029-Revert-upstream-soname-bump.patch b/debian/patches/0029-Revert-upstream-soname-bump.patch
deleted file mode 100644
index 9260699..0000000
--- a/debian/patches/0029-Revert-upstream-soname-bump.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From: =?utf-8?q?Ond=C5=99ej_Sur=C3=BD?= <ondrej at debian.org>
-Date: Thu, 24 Mar 2016 11:35:05 +0100
-Subject: Revert upstream soname bump
-
----
- lib/Makefile.am | 2 +-
- lib/Makefile.in | 2 +-
- plugins/Makefile.am | 2 +-
- plugins/Makefile.in | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/lib/Makefile.am b/lib/Makefile.am
-index 16b14f4..9777457 100644
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -43,7 +43,7 @@
- # Library version info - here at the top, for sanity
- # See <http://www.gnu.org/software/libtool/manual/libtool.html#Versioning>
- # CURRENT:REVISION:AGE
--sasl_version = 3:0:0
-+sasl_version = 2:25:0
-
- INCLUDES=-DLIBSASL_EXPORTS=1 -I$(top_srcdir)/include -I$(top_srcdir)/plugins -I$(top_builddir)/include -I$(top_srcdir)/sasldb
-
-diff --git a/lib/Makefile.in b/lib/Makefile.in
-index c1fefd8..629947b 100644
---- a/lib/Makefile.in
-+++ b/lib/Makefile.in
-@@ -319,7 +319,7 @@ top_srcdir = @top_srcdir@
- # Library version info - here at the top, for sanity
- # See <http://www.gnu.org/software/libtool/manual/libtool.html#Versioning>
- # CURRENT:REVISION:AGE
--sasl_version = 3:0:0
-+sasl_version = 2:25:0
- INCLUDES = -DLIBSASL_EXPORTS=1 -I$(top_srcdir)/include -I$(top_srcdir)/plugins -I$(top_builddir)/include -I$(top_srcdir)/sasldb
- EXTRA_DIST = windlopen.c staticopen.h NTMakefile
- EXTRA_LIBRARIES = libsasl2.a
-diff --git a/plugins/Makefile.am b/plugins/Makefile.am
-index d570de1..ce1af46 100644
---- a/plugins/Makefile.am
-+++ b/plugins/Makefile.am
-@@ -47,7 +47,7 @@
- # Library version info - here at the top, for sanity
- # See <http://www.gnu.org/software/libtool/manual/libtool.html#Versioning>
- # CURRENT:REVISION:AGE
--plugin_version = 3:0:0
-+plugin_version = 2:25:0
-
- INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/sasldb -I$(top_builddir)/include
- AM_LDFLAGS = -module -export-dynamic -rpath $(plugindir) -version-info $(plugin_version)
-diff --git a/plugins/Makefile.in b/plugins/Makefile.in
-index da7956f..4c96dea 100644
---- a/plugins/Makefile.in
-+++ b/plugins/Makefile.in
-@@ -362,7 +362,7 @@ top_srcdir = @top_srcdir@
- # Library version info - here at the top, for sanity
- # See <http://www.gnu.org/software/libtool/manual/libtool.html#Versioning>
- # CURRENT:REVISION:AGE
--plugin_version = 3:0:0
-+plugin_version = 2:25:0
- INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/sasldb -I$(top_builddir)/include
- AM_LDFLAGS = -module -export-dynamic -rpath $(plugindir) -version-info $(plugin_version)
- COMPAT_OBJS = @LTGETADDRINFOOBJS@ @LTGETNAMEINFOOBJS@ @LTSNPRINTFOBJS@
diff --git a/debian/patches/0033-Fix-early-hangup-in-ipc_unix.c.patch b/debian/patches/0030-Fix-early-hangup-in-ipc_unix.c.patch
similarity index 96%
rename from debian/patches/0033-Fix-early-hangup-in-ipc_unix.c.patch
rename to debian/patches/0030-Fix-early-hangup-in-ipc_unix.c.patch
index 9dcf747..8b40a93 100644
--- a/debian/patches/0033-Fix-early-hangup-in-ipc_unix.c.patch
+++ b/debian/patches/0030-Fix-early-hangup-in-ipc_unix.c.patch
@@ -8,7 +8,7 @@ Subject: Fix early hangup in ipc_unix.c
1 file changed, 5 insertions(+)
diff --git a/saslauthd/ipc_unix.c b/saslauthd/ipc_unix.c
-index f82a245..7ef7912 100644
+index 58a1fa6..63eca3e 100644
--- a/saslauthd/ipc_unix.c
+++ b/saslauthd/ipc_unix.c
@@ -217,6 +217,7 @@ void ipc_loop() {
diff --git a/debian/patches/series b/debian/patches/series
index 6697ec8..a252468 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,31 +5,26 @@
0005-Fixes-in-library-mutexes.patch
0006-Link-with-libsasldb.a-instead-of-libsasldb.al.patch
0007-Enable-autoconf-maintainer-mode.patch
-0008-Add-libtool-to-saslauthd-autoconf.patch
-0009-Define-_XOPEN_SOURCE-in-auth_shadow.c-to-get-proper-.patch
-0010-Don-t-overwrite-PIC-objects-with-non-PIC-variant.patch
-0011-Look-for-generic-Berkeley-DB-first.patch
-0012-Update-required-libraries-when-ld-as-needed-is-used.patch
-0013-Drop-krb5support-dependency.patch
-0014-Several-autotools-fixes.patch
-0015-LDAP-fixes.patch
-0016-Don-t-use-la-files-for-opening-plugins.patch
-0017-Don-t-use-R-when-searching-for-SQLite-libraries.patch
-0018-Revert-1.103-revision-to-unbreak-GSSAPI.patch
-0019-Fix-segfault-in-GSSAPI.patch
-0020-Fix-dovecot-authentication.patch
-0021-Temporary-multiarch-fixes.patch
-0022-Add-reference-to-LDAP_SASLAUTHD-file-to-the-saslauth.patch
-0023-Send-IMAP-logout.patch
-0024-Fix-canonuser-ldapdb-garbage-in-out-buffer.patch
-0025-Fix-keytab-option-for-MIT-Kerberos.patch
-0026-Release-server-creds-when-they-are-no-longer-needed.patch
-0027-Include-sys-types.h-in-sasl.h.patch
-0028-Fix-typo-in-debugging-logs.patch
-0029-Revert-upstream-soname-bump.patch
-0030-Fix-return-SASL_FAIL-in-void-sasl_dispose.patch
-0031-properly-create-libsasl2.pc.patch
-0032-2.1.26-Allow-CAPABILITY-lines-in-IMAP-login-reply-v4.patch
-0033-Fix-early-hangup-in-ipc_unix.c.patch
-0034-Handle-NULL-returns-from-glibc-2.17-crypt.patch
-0035-Fix-auth_rimap-infinite-loop-hang-when-IMAP-server-c.patch
+0008-Define-_XOPEN_SOURCE-in-auth_shadow.c-to-get-proper-.patch
+0009-Don-t-overwrite-PIC-objects-with-non-PIC-variant.patch
+0010-Look-for-generic-Berkeley-DB-first.patch
+0011-Update-required-libraries-when-ld-as-needed-is-used.patch
+0012-Drop-krb5support-dependency.patch
+0013-LDAP-fixes.patch
+0014-Don-t-use-la-files-for-opening-plugins.patch
+0015-Don-t-use-R-when-searching-for-SQLite-libraries.patch
+0016-Revert-1.103-revision-to-unbreak-GSSAPI.patch
+0017-Fix-segfault-in-GSSAPI.patch
+0018-Fix-dovecot-authentication.patch
+0019-Temporary-multiarch-fixes.patch
+0020-Add-reference-to-LDAP_SASLAUTHD-file-to-the-saslauth.patch
+0021-Send-IMAP-logout.patch
+0022-Fix-canonuser-ldapdb-garbage-in-out-buffer.patch
+0023-Fix-keytab-option-for-MIT-Kerberos.patch
+0024-Release-server-creds-when-they-are-no-longer-needed.patch
+0025-Fix-typo-in-debugging-logs.patch
+0026-Revert-upstream-soname-bump.patch
+0027-Fix-return-SASL_FAIL-in-void-sasl_dispose.patch
+0028-properly-create-libsasl2.pc.patch
+0029-2.1.26-Allow-CAPABILITY-lines-in-IMAP-login-reply-v4.patch
+0030-Fix-early-hangup-in-ipc_unix.c.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cyrus-sasl2/cyrus-sasl2.git
More information about the Pkg-cyrus-sasl2-commits
mailing list