diff --git a/debian/patches/0006-Enable-autoconf-maintainer-mode.patch b/debian/patches/0006-Enable-autoconf-maintainer-mode.patch index 0e793c9..ac1c3ab 100644 --- a/debian/patches/0006-Enable-autoconf-maintainer-mode.patch +++ b/debian/patches/0006-Enable-autoconf-maintainer-mode.patch @@ -8,12 +8,12 @@ 1 file changed, 2 insertions(+) diff --git a/configure.ac b/configure.ac -index 199d93e..07fd933 100644 +index 7dbe02d..770e45c 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_INIT_AUTOMAKE([1.11 tar-ustar dist-bzip2 -Wno-portability subdir-objects]) +AM_MAINTAINER_MODE + diff --git a/debian/patches/0010-Update-required-libraries-when-ld-as-needed-is-used.patch b/debian/patches/0010-Update-required-libraries-when-ld-as-needed-is-used.patch index e42e1ba..ee9f5e4 100644 --- a/debian/patches/0010-Update-required-libraries-when-ld-as-needed-is-used.patch +++ b/debian/patches/0010-Update-required-libraries-when-ld-as-needed-is-used.patch @@ -10,7 +10,7 @@ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/saslauthd/Makefile.am b/saslauthd/Makefile.am -index f38097c..bcc5226 100644 +index 75dc105..3314433 100644 --- a/saslauthd/Makefile.am +++ b/saslauthd/Makefile.am @@ -19,7 +19,7 @@ EXTRA_saslauthd_sources = getaddrinfo.c getnameinfo.c diff --git a/debian/patches/0014-Don-t-use-R-when-searching-for-SQLite-libraries.patch b/debian/patches/0014-Don-t-use-R-when-searching-for-SQLite-libraries.patch index 9738f30..1f09e62 100644 --- a/debian/patches/0014-Don-t-use-R-when-searching-for-SQLite-libraries.patch +++ b/debian/patches/0014-Don-t-use-R-when-searching-for-SQLite-libraries.patch @@ -8,7 +8,7 @@ 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac -index 07fd933..0336812 100644 +index 770e45c..8936d93 100644 --- a/configure.ac +++ b/configure.ac @@ -978,9 +978,9 @@ case "$with_sqlite" in diff --git a/debian/patches/0018-Temporary-multiarch-fixes.patch b/debian/patches/0018-Temporary-multiarch-fixes.patch index 5177ff3..7dc96eb 100644 --- a/debian/patches/0018-Temporary-multiarch-fixes.patch +++ b/debian/patches/0018-Temporary-multiarch-fixes.patch @@ -8,7 +8,7 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 0336812..a386cfc 100644 +index 8936d93..39c0240 100644 --- a/configure.ac +++ b/configure.ac @@ -281,7 +281,7 @@ AC_ARG_WITH(pam, [ --with-pam=DIR use PAM (rooted in DIR) [[yes]] ], diff --git a/debian/patches/0027-properly-create-libsasl2.pc.patch b/debian/patches/0027-properly-create-libsasl2.pc.patch index ec34f32..fd5876c 100644 --- a/debian/patches/0027-properly-create-libsasl2.pc.patch +++ b/debian/patches/0027-properly-create-libsasl2.pc.patch @@ -40,10 +40,10 @@ @find $(distdir) -exec chmod o+w {} ';' @find $(distdir) -name CVS -print | xargs -t rm -rf diff --git a/configure.ac b/configure.ac -index a386cfc..77f75e4 100644 +index 39c0240..fce5075 100644 --- a/configure.ac +++ b/configure.ac -@@ -1544,7 +1544,6 @@ extern int asprintf(char **str, const char *fmt, ...); +@@ -1563,7 +1563,6 @@ extern int asprintf(char **str, const char *fmt, ...); AC_CONFIG_HEADERS(config.h) AC_OUTPUT(Makefile diff --git a/debian/patches/0030-Change-linking-from-sasldb-.libs-libsasldb.al-to-sas.patch b/debian/patches/0030-Change-linking-from-sasldb-.libs-libsasldb.al-to-sas.patch index 2672922..7c97d60 100644 --- a/debian/patches/0030-Change-linking-from-sasldb-.libs-libsasldb.al-to-sas.patch +++ b/debian/patches/0030-Change-linking-from-sasldb-.libs-libsasldb.al-to-sas.patch @@ -8,7 +8,7 @@ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac -index 77f75e4..f3569bd 100644 +index fce5075..c6deaf0 100644 --- a/configure.ac +++ b/configure.ac @@ -612,14 +612,9 @@ AC_ARG_ENABLE(auth-sasldb, [ --enable-auth-sasldb enable experimental SASLdb diff --git a/debian/patches/0031-Cleanup-for-modern-autotools.patch b/debian/patches/0031-Cleanup-for-modern-autotools.patch index c4d49e1..a642010 100644 --- a/debian/patches/0031-Cleanup-for-modern-autotools.patch +++ b/debian/patches/0031-Cleanup-for-modern-autotools.patch @@ -9,7 +9,7 @@ 3 files changed, 7 insertions(+), 25 deletions(-) diff --git a/configure.ac b/configure.ac -index f3569bd..7afb96d 100644 +index c6deaf0..708cfca 100644 --- a/configure.ac +++ b/configure.ac @@ -55,6 +55,7 @@ AC_INIT([cyrus-sasl], @@ -97,7 +97,7 @@ if MACOSX framedir = /Library/Frameworks/SASL2.framework diff --git a/saslauthd/Makefile.am b/saslauthd/Makefile.am -index bcc5226..e6809c2 100644 +index 3314433..9d299d9 100644 --- a/saslauthd/Makefile.am +++ b/saslauthd/Makefile.am @@ -2,8 +2,7 @@ AUTOMAKE_OPTIONS = 1.7 @@ -112,7 +112,7 @@ mechanisms.h auth_dce.c auth_dce.h auth_getpwent.c \ @@ -16,10 +15,10 @@ saslauthd_SOURCES = mechanisms.c globals.h \ ipc_unix.c ipc_doors.c saslauthd-main.c saslauthd-main.h \ - md5.c saslauthd_md5.h md5global.h + md5.c saslauthd_md5.h EXTRA_saslauthd_sources = getaddrinfo.c getnameinfo.c -saslauthd_DEPENDENCIES = saslauthd-main.o $(LTLIBOBJS_FULL) +saslauthd_DEPENDENCIES = saslauthd-main.o diff --git a/debian/patches/0032-Add-with_pgsql-include-postgresql-to-include-path.patch b/debian/patches/0032-Add-with_pgsql-include-postgresql-to-include-path.patch index 2dfb178..f69403e 100644 --- a/debian/patches/0032-Add-with_pgsql-include-postgresql-to-include-path.patch +++ b/debian/patches/0032-Add-with_pgsql-include-postgresql-to-include-path.patch @@ -7,7 +7,7 @@ 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 7afb96d..3b38803 100644 +index 708cfca..e9f451d 100644 --- a/configure.ac +++ b/configure.ac @@ -919,7 +919,9 @@ case "$with_pgsql" in