Codebase list cyrus-sasl2 / 9a40e5f
Rebase patches on top of 2.1.27~101-g0780600+dfsg Ondřej Surý 7 years ago
8 changed file(s) with 12 addition(s) and 12 deletion(s). Raw diff Collapse all Expand all
77 1 file changed, 2 insertions(+)
88
99 diff --git a/configure.ac b/configure.ac
10 index 199d93e..07fd933 100644
10 index 7dbe02d..770e45c 100644
1111 --- a/configure.ac
1212 +++ b/configure.ac
1313 @@ -69,6 +69,8 @@ AC_CANONICAL_TARGET
1414
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])
1616
1717 +AM_MAINTAINER_MODE
1818 +
99 2 files changed, 3 insertions(+), 3 deletions(-)
1010
1111 diff --git a/saslauthd/Makefile.am b/saslauthd/Makefile.am
12 index f38097c..bcc5226 100644
12 index 75dc105..3314433 100644
1313 --- a/saslauthd/Makefile.am
1414 +++ b/saslauthd/Makefile.am
1515 @@ -19,7 +19,7 @@ EXTRA_saslauthd_sources = getaddrinfo.c getnameinfo.c
77 1 file changed, 4 insertions(+), 4 deletions(-)
88
99 diff --git a/configure.ac b/configure.ac
10 index 07fd933..0336812 100644
10 index 770e45c..8936d93 100644
1111 --- a/configure.ac
1212 +++ b/configure.ac
1313 @@ -978,9 +978,9 @@ case "$with_sqlite" in
77 1 file changed, 1 insertion(+), 1 deletion(-)
88
99 diff --git a/configure.ac b/configure.ac
10 index 0336812..a386cfc 100644
10 index 8936d93..39c0240 100644
1111 --- a/configure.ac
1212 +++ b/configure.ac
1313 @@ -281,7 +281,7 @@ AC_ARG_WITH(pam, [ --with-pam=DIR use PAM (rooted in DIR) [[yes]] ],
3939 @find $(distdir) -exec chmod o+w {} ';'
4040 @find $(distdir) -name CVS -print | xargs -t rm -rf
4141 diff --git a/configure.ac b/configure.ac
42 index a386cfc..77f75e4 100644
42 index 39c0240..fce5075 100644
4343 --- a/configure.ac
4444 +++ 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, ...);
4646 AC_CONFIG_HEADERS(config.h)
4747
4848 AC_OUTPUT(Makefile
77 2 files changed, 2 insertions(+), 7 deletions(-)
88
99 diff --git a/configure.ac b/configure.ac
10 index 77f75e4..f3569bd 100644
10 index fce5075..c6deaf0 100644
1111 --- a/configure.ac
1212 +++ b/configure.ac
1313 @@ -612,14 +612,9 @@ AC_ARG_ENABLE(auth-sasldb, [ --enable-auth-sasldb enable experimental SASLdb
88 3 files changed, 7 insertions(+), 25 deletions(-)
99
1010 diff --git a/configure.ac b/configure.ac
11 index f3569bd..7afb96d 100644
11 index c6deaf0..708cfca 100644
1212 --- a/configure.ac
1313 +++ b/configure.ac
1414 @@ -55,6 +55,7 @@ AC_INIT([cyrus-sasl],
9696 if MACOSX
9797 framedir = /Library/Frameworks/SASL2.framework
9898 diff --git a/saslauthd/Makefile.am b/saslauthd/Makefile.am
99 index bcc5226..e6809c2 100644
99 index 3314433..9d299d9 100644
100100 --- a/saslauthd/Makefile.am
101101 +++ b/saslauthd/Makefile.am
102102 @@ -2,8 +2,7 @@ AUTOMAKE_OPTIONS = 1.7
111111 mechanisms.h auth_dce.c auth_dce.h auth_getpwent.c \
112112 @@ -16,10 +15,10 @@ saslauthd_SOURCES = mechanisms.c globals.h \
113113 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
115115 EXTRA_saslauthd_sources = getaddrinfo.c getnameinfo.c
116116 -saslauthd_DEPENDENCIES = saslauthd-main.o $(LTLIBOBJS_FULL)
117117 +saslauthd_DEPENDENCIES = saslauthd-main.o
66 1 file changed, 3 insertions(+), 1 deletion(-)
77
88 diff --git a/configure.ac b/configure.ac
9 index 7afb96d..3b38803 100644
9 index 708cfca..e9f451d 100644
1010 --- a/configure.ac
1111 +++ b/configure.ac
1212 @@ -919,7 +919,9 @@ case "$with_pgsql" in