Refresh patches to the new release
Ondřej Surý
12 years ago
2 | 2 |
instead of ./sasldb as default path for the sasldb database file.
|
3 | 3 |
--- a/utils/testsuite.c
|
4 | 4 |
+++ b/utils/testsuite.c
|
5 | |
@@ -464,9 +464,9 @@ int good_getopt(void *context __attribut
|
|
5 |
@@ -462,9 +462,9 @@ int good_getopt(void *context __attribut
|
6 | 6 |
*len = (unsigned) strlen("sasldb");
|
7 | 7 |
return SASL_OK;
|
8 | 8 |
} else if (!strcmp(option, "sasldb_path")) {
|
|
14 | 14 |
return SASL_OK;
|
15 | 15 |
} else if (!strcmp(option, "canon_user_plugin")) {
|
16 | 16 |
*result = cu_plugin;
|
17 | |
@@ -2926,7 +2926,7 @@ void notes(void)
|
|
17 |
@@ -2924,7 +2924,7 @@ void notes(void)
|
18 | 18 |
void usage(void)
|
19 | 19 |
{
|
20 | 20 |
printf("Usage:\n" \
|
2 | 2 |
--- a/configure.in
|
3 | 3 |
+++ b/configure.in
|
4 | 4 |
@@ -62,6 +62,8 @@ dnl
|
5 | |
AM_INIT_AUTOMAKE(cyrus-sasl, 2.1.24)
|
|
5 |
AM_INIT_AUTOMAKE(cyrus-sasl, 2.1.25)
|
6 | 6 |
CMU_INIT_AUTOMAKE
|
7 | 7 |
|
8 | 8 |
+AM_MAINTAINER_MODE
|
0 | 0 |
--- a/configure.in
|
1 | 1 |
+++ b/configure.in
|
2 | |
@@ -856,9 +856,9 @@ case "$with_sqlite" in
|
|
2 |
@@ -865,9 +865,9 @@ case "$with_sqlite" in
|
3 | 3 |
notfound) AC_WARN([SQLite Library not found]); true;;
|
4 | 4 |
*)
|
5 | 5 |
if test -d ${with_sqlite}/lib; then
|
|
11 | 11 |
fi
|
12 | 12 |
|
13 | 13 |
LIB_SQLITE_DIR=$LIB_SQLITE
|
14 | |
@@ -908,9 +908,9 @@ case "$with_sqlite3" in
|
|
14 |
@@ -917,9 +917,9 @@ case "$with_sqlite3" in
|
15 | 15 |
notfound) AC_WARN([SQLite3 Library not found]); true;;
|
16 | 16 |
*)
|
17 | 17 |
if test -d ${with_sqlite3}/lib; then
|