[Pkg-cyrus-sasl2-commits] [cyrus-sasl2] 18/44: Rebase patches on top of 2.1.26-72-g88d82a3+dfsg
Ondřej Surý
ondrej at debian.org
Sat Dec 31 13:07:11 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 bf3020de9a004f4a0c30ef17e17e5b3f34574d22
Author: Ondřej Surý <ondrej at sury.org>
Date: Mon Oct 24 17:39:41 2016 +0200
Rebase patches on top of 2.1.26-72-g88d82a3+dfsg
---
... => 0006-Enable-autoconf-maintainer-mode.patch} | 2 +-
...-with-libsasldb.a-instead-of-libsasldb.al.patch | 23 -----------
...N_SOURCE-in-auth_shadow.c-to-get-proper-.patch} | 0
...erwrite-PIC-objects-with-non-PIC-variant.patch} | 0
... 0009-Look-for-generic-Berkeley-DB-first.patch} | 0
...ired-libraries-when-ld-as-needed-is-used.patch} | 0
...atch => 0011-Drop-krb5support-dependency.patch} | 0
...0013-LDAP-fixes.patch => 0012-LDAP-fixes.patch} | 0
...3-Don-t-use-la-files-for-opening-plugins.patch} | 0
...se-R-when-searching-for-SQLite-libraries.patch} | 2 +-
...-Revert-1.103-revision-to-unbreak-GSSAPI.patch} | 0
...API.patch => 0016-Fix-segfault-in-GSSAPI.patch} | 0
...patch => 0017-Fix-dovecot-authentication.patch} | 0
....patch => 0018-Temporary-multiarch-fixes.patch} | 2 +-
...e-to-LDAP_SASLAUTHD-file-to-the-saslauth.patch} | 0
...AP-logout.patch => 0020-Send-IMAP-logout.patch} | 0
...x-canonuser-ldapdb-garbage-in-out-buffer.patch} | 0
... 0022-Fix-keytab-option-for-MIT-Kerberos.patch} | 0
...ver-creds-when-they-are-no-longer-needed.patch} | 0
...patch => 0024-Fix-typo-in-debugging-logs.patch} | 0
...atch => 0025-Revert-upstream-soname-bump.patch} | 0
...ix-return-SASL_FAIL-in-void-sasl_dispose.patch} | 0
...atch => 0027-properly-create-libsasl2.pc.patch} | 2 +-
...-CAPABILITY-lines-in-IMAP-login-reply-v4.patch} | 0
...h => 0029-Fix-early-hangup-in-ipc_unix.c.patch} | 0
debian/patches/series | 48 +++++++++++-----------
26 files changed, 28 insertions(+), 51 deletions(-)
diff --git a/debian/patches/0007-Enable-autoconf-maintainer-mode.patch b/debian/patches/0006-Enable-autoconf-maintainer-mode.patch
similarity index 94%
rename from debian/patches/0007-Enable-autoconf-maintainer-mode.patch
rename to debian/patches/0006-Enable-autoconf-maintainer-mode.patch
index 6489a29..0e793c9 100644
--- a/debian/patches/0007-Enable-autoconf-maintainer-mode.patch
+++ b/debian/patches/0006-Enable-autoconf-maintainer-mode.patch
@@ -8,7 +8,7 @@ Subject: Enable autoconf maintainer mode
1 file changed, 2 insertions(+)
diff --git a/configure.ac b/configure.ac
-index d7398bb..8f3cc1e 100644
+index 199d93e..07fd933 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,6 +69,8 @@ AC_CANONICAL_TARGET
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
deleted file mode 100644
index 81802dc..0000000
--- a/debian/patches/0006-Link-with-libsasldb.a-instead-of-libsasldb.al.patch
+++ /dev/null
@@ -1,23 +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: Link with libsasldb.a instead of libsasldb.al
-
-support.
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-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()
-- SASL_DB_LIB="$SASL_DB_LIB ../sasldb/.libs/libsasldb.al"
-+ SASL_DB_LIB="$SASL_DB_LIB ../sasldb/.libs/libsasldb.a"
- fi
-
- AC_ARG_ENABLE(httpform, [ --enable-httpform enable HTTP form authentication [[no]] ],
diff --git a/debian/patches/0008-Define-_XOPEN_SOURCE-in-auth_shadow.c-to-get-proper-.patch b/debian/patches/0007-Define-_XOPEN_SOURCE-in-auth_shadow.c-to-get-proper-.patch
similarity index 100%
rename from debian/patches/0008-Define-_XOPEN_SOURCE-in-auth_shadow.c-to-get-proper-.patch
rename to debian/patches/0007-Define-_XOPEN_SOURCE-in-auth_shadow.c-to-get-proper-.patch
diff --git a/debian/patches/0009-Don-t-overwrite-PIC-objects-with-non-PIC-variant.patch b/debian/patches/0008-Don-t-overwrite-PIC-objects-with-non-PIC-variant.patch
similarity index 100%
rename from debian/patches/0009-Don-t-overwrite-PIC-objects-with-non-PIC-variant.patch
rename to debian/patches/0008-Don-t-overwrite-PIC-objects-with-non-PIC-variant.patch
diff --git a/debian/patches/0010-Look-for-generic-Berkeley-DB-first.patch b/debian/patches/0009-Look-for-generic-Berkeley-DB-first.patch
similarity index 100%
rename from debian/patches/0010-Look-for-generic-Berkeley-DB-first.patch
rename to debian/patches/0009-Look-for-generic-Berkeley-DB-first.patch
diff --git a/debian/patches/0011-Update-required-libraries-when-ld-as-needed-is-used.patch b/debian/patches/0010-Update-required-libraries-when-ld-as-needed-is-used.patch
similarity index 100%
rename from debian/patches/0011-Update-required-libraries-when-ld-as-needed-is-used.patch
rename to debian/patches/0010-Update-required-libraries-when-ld-as-needed-is-used.patch
diff --git a/debian/patches/0012-Drop-krb5support-dependency.patch b/debian/patches/0011-Drop-krb5support-dependency.patch
similarity index 100%
rename from debian/patches/0012-Drop-krb5support-dependency.patch
rename to debian/patches/0011-Drop-krb5support-dependency.patch
diff --git a/debian/patches/0013-LDAP-fixes.patch b/debian/patches/0012-LDAP-fixes.patch
similarity index 100%
rename from debian/patches/0013-LDAP-fixes.patch
rename to debian/patches/0012-LDAP-fixes.patch
diff --git a/debian/patches/0014-Don-t-use-la-files-for-opening-plugins.patch b/debian/patches/0013-Don-t-use-la-files-for-opening-plugins.patch
similarity index 100%
rename from debian/patches/0014-Don-t-use-la-files-for-opening-plugins.patch
rename to debian/patches/0013-Don-t-use-la-files-for-opening-plugins.patch
diff --git a/debian/patches/0015-Don-t-use-R-when-searching-for-SQLite-libraries.patch b/debian/patches/0014-Don-t-use-R-when-searching-for-SQLite-libraries.patch
similarity index 97%
rename from debian/patches/0015-Don-t-use-R-when-searching-for-SQLite-libraries.patch
rename to debian/patches/0014-Don-t-use-R-when-searching-for-SQLite-libraries.patch
index deef457..9738f30 100644
--- a/debian/patches/0015-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 @@ Subject: Don't use -R when searching for SQLite libraries
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 8f3cc1e..dd599ca 100644
+index 07fd933..0336812 100644
--- a/configure.ac
+++ b/configure.ac
@@ -978,9 +978,9 @@ case "$with_sqlite" in
diff --git a/debian/patches/0016-Revert-1.103-revision-to-unbreak-GSSAPI.patch b/debian/patches/0015-Revert-1.103-revision-to-unbreak-GSSAPI.patch
similarity index 100%
rename from debian/patches/0016-Revert-1.103-revision-to-unbreak-GSSAPI.patch
rename to debian/patches/0015-Revert-1.103-revision-to-unbreak-GSSAPI.patch
diff --git a/debian/patches/0017-Fix-segfault-in-GSSAPI.patch b/debian/patches/0016-Fix-segfault-in-GSSAPI.patch
similarity index 100%
rename from debian/patches/0017-Fix-segfault-in-GSSAPI.patch
rename to debian/patches/0016-Fix-segfault-in-GSSAPI.patch
diff --git a/debian/patches/0018-Fix-dovecot-authentication.patch b/debian/patches/0017-Fix-dovecot-authentication.patch
similarity index 100%
rename from debian/patches/0018-Fix-dovecot-authentication.patch
rename to debian/patches/0017-Fix-dovecot-authentication.patch
diff --git a/debian/patches/0019-Temporary-multiarch-fixes.patch b/debian/patches/0018-Temporary-multiarch-fixes.patch
similarity index 95%
rename from debian/patches/0019-Temporary-multiarch-fixes.patch
rename to debian/patches/0018-Temporary-multiarch-fixes.patch
index cc8123e..5177ff3 100644
--- a/debian/patches/0019-Temporary-multiarch-fixes.patch
+++ b/debian/patches/0018-Temporary-multiarch-fixes.patch
@@ -8,7 +8,7 @@ Subject: Temporary multiarch fixes
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
-index dd599ca..d18016e 100644
+index 0336812..a386cfc 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/0020-Add-reference-to-LDAP_SASLAUTHD-file-to-the-saslauth.patch b/debian/patches/0019-Add-reference-to-LDAP_SASLAUTHD-file-to-the-saslauth.patch
similarity index 100%
rename from debian/patches/0020-Add-reference-to-LDAP_SASLAUTHD-file-to-the-saslauth.patch
rename to debian/patches/0019-Add-reference-to-LDAP_SASLAUTHD-file-to-the-saslauth.patch
diff --git a/debian/patches/0021-Send-IMAP-logout.patch b/debian/patches/0020-Send-IMAP-logout.patch
similarity index 100%
rename from debian/patches/0021-Send-IMAP-logout.patch
rename to debian/patches/0020-Send-IMAP-logout.patch
diff --git a/debian/patches/0022-Fix-canonuser-ldapdb-garbage-in-out-buffer.patch b/debian/patches/0021-Fix-canonuser-ldapdb-garbage-in-out-buffer.patch
similarity index 100%
rename from debian/patches/0022-Fix-canonuser-ldapdb-garbage-in-out-buffer.patch
rename to debian/patches/0021-Fix-canonuser-ldapdb-garbage-in-out-buffer.patch
diff --git a/debian/patches/0023-Fix-keytab-option-for-MIT-Kerberos.patch b/debian/patches/0022-Fix-keytab-option-for-MIT-Kerberos.patch
similarity index 100%
rename from debian/patches/0023-Fix-keytab-option-for-MIT-Kerberos.patch
rename to debian/patches/0022-Fix-keytab-option-for-MIT-Kerberos.patch
diff --git a/debian/patches/0024-Release-server-creds-when-they-are-no-longer-needed.patch b/debian/patches/0023-Release-server-creds-when-they-are-no-longer-needed.patch
similarity index 100%
rename from debian/patches/0024-Release-server-creds-when-they-are-no-longer-needed.patch
rename to debian/patches/0023-Release-server-creds-when-they-are-no-longer-needed.patch
diff --git a/debian/patches/0025-Fix-typo-in-debugging-logs.patch b/debian/patches/0024-Fix-typo-in-debugging-logs.patch
similarity index 100%
rename from debian/patches/0025-Fix-typo-in-debugging-logs.patch
rename to debian/patches/0024-Fix-typo-in-debugging-logs.patch
diff --git a/debian/patches/0026-Revert-upstream-soname-bump.patch b/debian/patches/0025-Revert-upstream-soname-bump.patch
similarity index 100%
rename from debian/patches/0026-Revert-upstream-soname-bump.patch
rename to debian/patches/0025-Revert-upstream-soname-bump.patch
diff --git a/debian/patches/0027-Fix-return-SASL_FAIL-in-void-sasl_dispose.patch b/debian/patches/0026-Fix-return-SASL_FAIL-in-void-sasl_dispose.patch
similarity index 100%
rename from debian/patches/0027-Fix-return-SASL_FAIL-in-void-sasl_dispose.patch
rename to debian/patches/0026-Fix-return-SASL_FAIL-in-void-sasl_dispose.patch
diff --git a/debian/patches/0028-properly-create-libsasl2.pc.patch b/debian/patches/0027-properly-create-libsasl2.pc.patch
similarity index 97%
rename from debian/patches/0028-properly-create-libsasl2.pc.patch
rename to debian/patches/0027-properly-create-libsasl2.pc.patch
index 39ba0b2..f84001e 100644
--- a/debian/patches/0028-properly-create-libsasl2.pc.patch
+++ b/debian/patches/0027-properly-create-libsasl2.pc.patch
@@ -37,7 +37,7 @@ index f72bb26..a47540f 100644
@find $(distdir) -exec chmod o+w {} ';'
@find $(distdir) -name CVS -print | xargs -t rm -rf
diff --git a/configure.ac b/configure.ac
-index d18016e..d28005a 100644
+index a386cfc..77f75e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1544,7 +1544,6 @@ extern int asprintf(char **str, const char *fmt, ...);
diff --git a/debian/patches/0029-2.1.26-Allow-CAPABILITY-lines-in-IMAP-login-reply-v4.patch b/debian/patches/0028-2.1.26-Allow-CAPABILITY-lines-in-IMAP-login-reply-v4.patch
similarity index 100%
rename from debian/patches/0029-2.1.26-Allow-CAPABILITY-lines-in-IMAP-login-reply-v4.patch
rename to debian/patches/0028-2.1.26-Allow-CAPABILITY-lines-in-IMAP-login-reply-v4.patch
diff --git a/debian/patches/0030-Fix-early-hangup-in-ipc_unix.c.patch b/debian/patches/0029-Fix-early-hangup-in-ipc_unix.c.patch
similarity index 100%
rename from debian/patches/0030-Fix-early-hangup-in-ipc_unix.c.patch
rename to debian/patches/0029-Fix-early-hangup-in-ipc_unix.c.patch
diff --git a/debian/patches/series b/debian/patches/series
index 771de07..64c96dd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,27 +3,27 @@
0003-Update-saslauthd.conf-location-in-documentation.patch
0004-Include-dbconverter-2-in-sbin_PROGRAMS-and-set-defau.patch
0005-Fixes-in-library-mutexes.patch
-0007-Enable-autoconf-maintainer-mode.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
+0006-Enable-autoconf-maintainer-mode.patch
+0007-Define-_XOPEN_SOURCE-in-auth_shadow.c-to-get-proper-.patch
+0008-Don-t-overwrite-PIC-objects-with-non-PIC-variant.patch
+0009-Look-for-generic-Berkeley-DB-first.patch
+0010-Update-required-libraries-when-ld-as-needed-is-used.patch
+0011-Drop-krb5support-dependency.patch
+0012-LDAP-fixes.patch
+0013-Don-t-use-la-files-for-opening-plugins.patch
+0014-Don-t-use-R-when-searching-for-SQLite-libraries.patch
+0015-Revert-1.103-revision-to-unbreak-GSSAPI.patch
+0016-Fix-segfault-in-GSSAPI.patch
+0017-Fix-dovecot-authentication.patch
+0018-Temporary-multiarch-fixes.patch
+0019-Add-reference-to-LDAP_SASLAUTHD-file-to-the-saslauth.patch
+0020-Send-IMAP-logout.patch
+0021-Fix-canonuser-ldapdb-garbage-in-out-buffer.patch
+0022-Fix-keytab-option-for-MIT-Kerberos.patch
+0023-Release-server-creds-when-they-are-no-longer-needed.patch
+0024-Fix-typo-in-debugging-logs.patch
+0025-Revert-upstream-soname-bump.patch
+0026-Fix-return-SASL_FAIL-in-void-sasl_dispose.patch
+0027-properly-create-libsasl2.pc.patch
+0028-2.1.26-Allow-CAPABILITY-lines-in-IMAP-login-reply-v4.patch
+0029-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