Rebase patches on top of 2.1.27~101-g0780600+dfsg
Ondřej Surý
7 years ago
7 | 7 | 1 file changed, 2 insertions(+) |
8 | 8 | |
9 | 9 | diff --git a/configure.ac b/configure.ac |
10 | index 199d93e..07fd933 100644 | |
10 | index 7dbe02d..770e45c 100644 | |
11 | 11 | --- a/configure.ac |
12 | 12 | +++ b/configure.ac |
13 | 13 | @@ -69,6 +69,8 @@ AC_CANONICAL_TARGET |
14 | 14 | |
15 | AM_INIT_AUTOMAKE([1.11 tar-ustar dist-xz no-dist-gzip -Wno-portability subdir-objects]) | |
15 | AM_INIT_AUTOMAKE([1.11 tar-ustar dist-bzip2 -Wno-portability subdir-objects]) | |
16 | 16 | |
17 | 17 | +AM_MAINTAINER_MODE |
18 | 18 | + |
9 | 9 | 2 files changed, 3 insertions(+), 3 deletions(-) |
10 | 10 | |
11 | 11 | diff --git a/saslauthd/Makefile.am b/saslauthd/Makefile.am |
12 | index f38097c..bcc5226 100644 | |
12 | index 75dc105..3314433 100644 | |
13 | 13 | --- a/saslauthd/Makefile.am |
14 | 14 | +++ b/saslauthd/Makefile.am |
15 | 15 | @@ -19,7 +19,7 @@ EXTRA_saslauthd_sources = getaddrinfo.c getnameinfo.c |
7 | 7 | 1 file changed, 4 insertions(+), 4 deletions(-) |
8 | 8 | |
9 | 9 | diff --git a/configure.ac b/configure.ac |
10 | index 07fd933..0336812 100644 | |
10 | index 770e45c..8936d93 100644 | |
11 | 11 | --- a/configure.ac |
12 | 12 | +++ b/configure.ac |
13 | 13 | @@ -978,9 +978,9 @@ case "$with_sqlite" in |
7 | 7 | 1 file changed, 1 insertion(+), 1 deletion(-) |
8 | 8 | |
9 | 9 | diff --git a/configure.ac b/configure.ac |
10 | index 0336812..a386cfc 100644 | |
10 | index 8936d93..39c0240 100644 | |
11 | 11 | --- a/configure.ac |
12 | 12 | +++ b/configure.ac |
13 | 13 | @@ -281,7 +281,7 @@ AC_ARG_WITH(pam, [ --with-pam=DIR use PAM (rooted in DIR) [[yes]] ], |
39 | 39 | @find $(distdir) -exec chmod o+w {} ';' |
40 | 40 | @find $(distdir) -name CVS -print | xargs -t rm -rf |
41 | 41 | diff --git a/configure.ac b/configure.ac |
42 | index a386cfc..77f75e4 100644 | |
42 | index 39c0240..fce5075 100644 | |
43 | 43 | --- a/configure.ac |
44 | 44 | +++ b/configure.ac |
45 | @@ -1544,7 +1544,6 @@ extern int asprintf(char **str, const char *fmt, ...); | |
45 | @@ -1563,7 +1563,6 @@ extern int asprintf(char **str, const char *fmt, ...); | |
46 | 46 | AC_CONFIG_HEADERS(config.h) |
47 | 47 | |
48 | 48 | AC_OUTPUT(Makefile |
7 | 7 | 2 files changed, 2 insertions(+), 7 deletions(-) |
8 | 8 | |
9 | 9 | diff --git a/configure.ac b/configure.ac |
10 | index 77f75e4..f3569bd 100644 | |
10 | index fce5075..c6deaf0 100644 | |
11 | 11 | --- a/configure.ac |
12 | 12 | +++ b/configure.ac |
13 | 13 | @@ -612,14 +612,9 @@ AC_ARG_ENABLE(auth-sasldb, [ --enable-auth-sasldb enable experimental SASLdb |
8 | 8 | 3 files changed, 7 insertions(+), 25 deletions(-) |
9 | 9 | |
10 | 10 | diff --git a/configure.ac b/configure.ac |
11 | index f3569bd..7afb96d 100644 | |
11 | index c6deaf0..708cfca 100644 | |
12 | 12 | --- a/configure.ac |
13 | 13 | +++ b/configure.ac |
14 | 14 | @@ -55,6 +55,7 @@ AC_INIT([cyrus-sasl], |
96 | 96 | if MACOSX |
97 | 97 | framedir = /Library/Frameworks/SASL2.framework |
98 | 98 | diff --git a/saslauthd/Makefile.am b/saslauthd/Makefile.am |
99 | index bcc5226..e6809c2 100644 | |
99 | index 3314433..9d299d9 100644 | |
100 | 100 | --- a/saslauthd/Makefile.am |
101 | 101 | +++ b/saslauthd/Makefile.am |
102 | 102 | @@ -2,8 +2,7 @@ AUTOMAKE_OPTIONS = 1.7 |
111 | 111 | mechanisms.h auth_dce.c auth_dce.h auth_getpwent.c \ |
112 | 112 | @@ -16,10 +15,10 @@ saslauthd_SOURCES = mechanisms.c globals.h \ |
113 | 113 | ipc_unix.c ipc_doors.c saslauthd-main.c saslauthd-main.h \ |
114 | md5.c saslauthd_md5.h md5global.h | |
114 | md5.c saslauthd_md5.h | |
115 | 115 | EXTRA_saslauthd_sources = getaddrinfo.c getnameinfo.c |
116 | 116 | -saslauthd_DEPENDENCIES = saslauthd-main.o $(LTLIBOBJS_FULL) |
117 | 117 | +saslauthd_DEPENDENCIES = saslauthd-main.o |