From afec5218b7add2c29170f007307eaa257857e015 Mon Sep 17 00:00:00 2001 From: Jakub Jelen Date: Mar 05 2018 11:37:21 +0000 Subject: Get rid of unused or obsolete patches and rebase to latest version --- diff --git a/cyrus-sasl-2.1.20-saslauthd.conf-path.patch b/cyrus-sasl-2.1.20-saslauthd.conf-path.patch index 8e025d2..b85af08 100644 --- a/cyrus-sasl-2.1.20-saslauthd.conf-path.patch +++ b/cyrus-sasl-2.1.20-saslauthd.conf-path.patch @@ -1,19 +1,19 @@ -diff -up cyrus-sasl-2.1.25/saslauthd/saslauthd.8.path cyrus-sasl-2.1.25/saslauthd/saslauthd.8 ---- cyrus-sasl-2.1.25/saslauthd/saslauthd.8.path 2012-02-08 17:02:25.143783451 +0100 -+++ cyrus-sasl-2.1.25/saslauthd/saslauthd.8 2012-02-08 17:04:31.775795190 +0100 -@@ -177,7 +177,7 @@ NNOOTTEESS +diff -up cyrus-sasl-2.1.27/saslauthd/saslauthd.8.path cyrus-sasl-2.1.27/saslauthd/saslauthd.8 +--- cyrus-sasl-2.1.27/saslauthd/saslauthd.8.path 2015-11-20 15:05:30.421377527 +0100 ++++ cyrus-sasl-2.1.27/saslauthd/saslauthd.8 2015-11-20 15:06:58.779178999 +0100 +@@ -179,7 +179,7 @@ SASLAUTHD(8) BSD System Man anyway.) - FFIILLEESS + FILES - /var/run/saslauthd/mux The default communications socket. + /run/saslauthd/mux The default communications socket. /usr/local/etc/saslauthd.conf The default configuration file for ldap support. -diff -up cyrus-sasl-2.1.25/saslauthd/saslauthd.mdoc.path cyrus-sasl-2.1.25/saslauthd/saslauthd.mdoc ---- cyrus-sasl-2.1.25/saslauthd/saslauthd.mdoc.path 2009-12-03 20:07:03.000000000 +0100 -+++ cyrus-sasl-2.1.25/saslauthd/saslauthd.mdoc 2012-02-08 17:01:39.400986561 +0100 -@@ -216,7 +216,7 @@ instead. +diff -up cyrus-sasl-2.1.27/saslauthd/saslauthd.mdoc.path cyrus-sasl-2.1.27/saslauthd/saslauthd.mdoc +--- cyrus-sasl-2.1.27/saslauthd/saslauthd.mdoc.path 2015-10-15 15:44:43.000000000 +0200 ++++ cyrus-sasl-2.1.27/saslauthd/saslauthd.mdoc 2015-11-20 15:05:30.421377527 +0100 +@@ -221,7 +221,7 @@ instead. .Em (All platforms that support OpenLDAP 2.0 or higher) .Pp Authenticate against an ldap server. The ldap configuration parameters are @@ -22,7 +22,7 @@ diff -up cyrus-sasl-2.1.25/saslauthd/saslauthd.mdoc.path cyrus-sasl-2.1.25/sasla changed with the -O parameter. See the LDAP_SASLAUTHD file included with the distribution for the list of available parameters. .It Li sia -@@ -246,10 +246,10 @@ these ticket files can cause serious per +@@ -251,10 +251,10 @@ these ticket files can cause serious per servers. (Kerberos was never intended to be used in this manner, anyway.) .Sh FILES diff --git a/cyrus-sasl-2.1.21-sizes.patch b/cyrus-sasl-2.1.21-sizes.patch index 45f1800..0ef890f 100644 --- a/cyrus-sasl-2.1.21-sizes.patch +++ b/cyrus-sasl-2.1.21-sizes.patch @@ -1,9 +1,7 @@ -Prefer types in to our own, because it removes file content -conflicts between 32- and 64-bit architectures. RFEd as #2829. - ---- cyrus-sasl-2.1.21/configure.in 2006-05-16 07:37:52.000000000 -0400 -+++ cyrus-sasl-2.1.21/configure.in 2006-05-16 07:37:52.000000000 -0400 -@@ -1083,6 +1083,10 @@ +diff -up cyrus-sasl-2.1.27/configure.ac.sizes cyrus-sasl-2.1.27/configure.ac +--- cyrus-sasl-2.1.27/configure.ac.sizes 2015-11-18 09:46:24.000000000 +0100 ++++ cyrus-sasl-2.1.27/configure.ac 2015-11-20 15:11:20.474588247 +0100 +@@ -1197,6 +1197,10 @@ AC_HEADER_STDC AC_HEADER_DIRENT AC_HEADER_SYS_WAIT AC_CHECK_HEADERS(des.h dlfcn.h fcntl.h limits.h malloc.h paths.h strings.h sys/file.h sys/time.h syslog.h unistd.h inttypes.h sys/uio.h sys/param.h sysexits.h stdarg.h varargs.h) @@ -14,10 +12,10 @@ conflicts between 32- and 64-bit architectures. RFEd as #2829. IPv6_CHECK_SS_FAMILY() IPv6_CHECK_SA_LEN() -diff -up cyrus-sasl-2.1.26/configure.sizes cyrus-sasl-2.1.26/configure ---- cyrus-sasl-2.1.26/configure.sizes 2013-11-13 16:40:44.492792539 +0100 -+++ cyrus-sasl-2.1.26/configure 2013-11-13 16:40:47.489777836 +0100 -@@ -18166,6 +18166,124 @@ fi +diff -up cyrus-sasl-2.1.27/configure.sizes cyrus-sasl-2.1.27/configure +--- cyrus-sasl-2.1.27/configure.sizes 2015-11-20 15:11:20.476588242 +0100 ++++ cyrus-sasl-2.1.27/configure 2015-11-20 15:14:23.293175552 +0100 +@@ -18624,6 +18624,124 @@ fi done @@ -141,10 +139,10 @@ diff -up cyrus-sasl-2.1.26/configure.sizes cyrus-sasl-2.1.26/configure + - { $as_echo "$as_me:$LINENO: checking whether you have ss_family in struct sockaddr_storage" >&5 -diff -up cyrus-sasl-2.1.26/include/makemd5.c.sizes cyrus-sasl-2.1.26/include/makemd5.c ---- cyrus-sasl-2.1.26/include/makemd5.c.sizes 2012-01-28 00:31:36.000000000 +0100 -+++ cyrus-sasl-2.1.26/include/makemd5.c 2013-11-13 16:22:24.195981512 +0100 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether you have ss_family in struct sockaddr_storage" >&5 +diff -up cyrus-sasl-2.1.27/include/makemd5.c.sizes cyrus-sasl-2.1.27/include/makemd5.c +--- cyrus-sasl-2.1.27/include/makemd5.c.sizes 2015-10-15 15:44:43.000000000 +0200 ++++ cyrus-sasl-2.1.27/include/makemd5.c 2015-11-20 15:11:20.477588240 +0100 @@ -82,12 +82,19 @@ */ @@ -165,7 +163,7 @@ diff -up cyrus-sasl-2.1.26/include/makemd5.c.sizes cyrus-sasl-2.1.26/include/mak static void my_strupr(char *s) -@@ -122,6 +129,18 @@ +@@ -122,6 +129,18 @@ my_strupr(char *s) static void try_signed(FILE *f, int len) { @@ -184,7 +182,7 @@ diff -up cyrus-sasl-2.1.26/include/makemd5.c.sizes cyrus-sasl-2.1.26/include/mak BITSIZE(signed char); BITSIZE(short); BITSIZE(int); -@@ -135,6 +154,18 @@ +@@ -135,6 +154,18 @@ try_signed(FILE *f, int len) static void try_unsigned(FILE *f, int len) { @@ -203,7 +201,7 @@ diff -up cyrus-sasl-2.1.26/include/makemd5.c.sizes cyrus-sasl-2.1.26/include/mak BITSIZE(unsigned char); BITSIZE(unsigned short); BITSIZE(unsigned int); -@@ -165,6 +196,11 @@ +@@ -165,6 +196,11 @@ static int print_pre(FILE *f) "/* POINTER defines a generic pointer type */\n" "typedef unsigned char *POINTER;\n" "\n" @@ -215,7 +213,7 @@ diff -up cyrus-sasl-2.1.26/include/makemd5.c.sizes cyrus-sasl-2.1.26/include/mak ); return 1; } -@@ -212,31 +248,15 @@ +@@ -212,31 +248,15 @@ int main(int argc, char **argv) print_pre(f); diff --git a/cyrus-sasl-2.1.26-md5global.patch b/cyrus-sasl-2.1.26-md5global.patch index 744962f..7019525 100644 --- a/cyrus-sasl-2.1.26-md5global.patch +++ b/cyrus-sasl-2.1.26-md5global.patch @@ -1,6 +1,6 @@ -diff -up cyrus-sasl-2.1.26/include/Makefile.am.md5global.h cyrus-sasl-2.1.26/include/Makefile.am ---- cyrus-sasl-2.1.26/include/Makefile.am.md5global.h 2012-01-28 00:31:36.000000000 +0100 -+++ cyrus-sasl-2.1.26/include/Makefile.am 2013-09-03 13:12:17.623999149 +0200 +diff -up cyrus-sasl-2.1.27/include/Makefile.am.md5global.h cyrus-sasl-2.1.27/include/Makefile.am +--- cyrus-sasl-2.1.27/include/Makefile.am.md5global.h 2015-10-15 15:44:43.000000000 +0200 ++++ cyrus-sasl-2.1.27/include/Makefile.am 2015-11-20 15:28:25.930263088 +0100 @@ -47,16 +47,7 @@ noinst_HEADERS = gai.h exits.h saslincludedir = $(includedir)/sasl saslinclude_HEADERS = hmac-md5.h md5.h md5global.h sasl.h saslplug.h saslutil.h prop.h @@ -18,35 +18,29 @@ diff -up cyrus-sasl-2.1.26/include/Makefile.am.md5global.h cyrus-sasl-2.1.26/inc if MACOSX framedir = /Library/Frameworks/SASL2.framework -diff -up cyrus-sasl-2.1.26/include/Makefile.in.md5global.h cyrus-sasl-2.1.26/include/Makefile.in ---- cyrus-sasl-2.1.26/include/Makefile.in.md5global.h 2013-09-03 13:09:27.860999892 +0200 -+++ cyrus-sasl-2.1.26/include/Makefile.in 2013-09-03 13:12:21.726000002 +0200 -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -60,7 +60,6 @@ +diff -up cyrus-sasl-2.1.27/include/Makefile.in.md5global.h cyrus-sasl-2.1.27/include/Makefile.in +--- cyrus-sasl-2.1.27/include/Makefile.in.md5global.h 2015-11-18 09:47:06.000000000 +0100 ++++ cyrus-sasl-2.1.27/include/Makefile.in 2015-11-20 15:34:55.524369694 +0100 +@@ -59,7 +59,6 @@ ################################################################ - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ -@@ -81,48 +80,19 @@ POST_UNINSTALL = : + am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ +@@ -135,27 +134,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -noinst_PROGRAMS = makemd5$(EXEEXT) subdir = include - DIST_COMMON = $(noinst_HEADERS) $(saslinclude_HEADERS) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/config/kerberos_v4.m4 \ -- $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/plain.m4 \ -- $(top_srcdir)/config/sasldb.m4 \ +-am__aclocal_m4_deps = $(top_srcdir)/config/libtool.m4 \ +- $(top_srcdir)/config/ltoptions.m4 \ +- $(top_srcdir)/config/ltsugar.m4 \ +- $(top_srcdir)/config/ltversion.m4 \ +- $(top_srcdir)/config/lt~obsolete.m4 \ - $(top_srcdir)/cmulocal/berkdb.m4 \ - $(top_srcdir)/cmulocal/bsd_sockets.m4 \ - $(top_srcdir)/cmulocal/c-attribute.m4 \ @@ -54,13 +48,17 @@ diff -up cyrus-sasl-2.1.26/include/Makefile.in.md5global.h cyrus-sasl-2.1.26/inc - $(top_srcdir)/cmulocal/cyrus.m4 \ - $(top_srcdir)/cmulocal/init_automake.m4 \ - $(top_srcdir)/cmulocal/ipv6.m4 \ +- $(top_srcdir)/cmulocal/kerberos_v4.m4 \ - $(top_srcdir)/cmulocal/openldap.m4 \ - $(top_srcdir)/cmulocal/openssl.m4 \ -- $(top_srcdir)/cmulocal/sasl2.m4 $(top_srcdir)/configure.in +- $(top_srcdir)/cmulocal/plain.m4 \ +- $(top_srcdir)/cmulocal/sasl2.m4 \ +- $(top_srcdir)/cmulocal/sasldb.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs + DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \ +@@ -164,50 +145,8 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -68,34 +66,52 @@ diff -up cyrus-sasl-2.1.26/include/Makefile.in.md5global.h cyrus-sasl-2.1.26/inc -am_makemd5_OBJECTS = makemd5.$(OBJEXT) -makemd5_OBJECTS = $(am_makemd5_OBJECTS) -makemd5_LDADD = $(LDADD) +-AM_V_lt = $(am__v_lt_@AM_V@) +-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +-am__v_lt_0 = --silent +-am__v_lt_1 = +-AM_V_P = $(am__v_P_@AM_V@) +-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +-am__v_P_0 = false +-am__v_P_1 = : +-AM_V_GEN = $(am__v_GEN_@AM_V@) +-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +-am__v_GEN_0 = @echo " GEN " $@; +-am__v_GEN_1 = +-AM_V_at = $(am__v_at_@AM_V@) +-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +-am__v_at_0 = @ +-am__v_at_1 = -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/config/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ +- $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) +-AM_V_CC = $(am__v_CC_@AM_V@) +-am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +-am__v_CC_0 = @echo " CC " $@; +-am__v_CC_1 = -CCLD = $(CC) --LINK = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ -- $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ +- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-AM_V_CCLD = $(am__v_CCLD_@AM_V@) +-am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +-am__v_CCLD_0 = @echo " CCLD " $@; +-am__v_CCLD_1 = -SOURCES = $(makemd5_SOURCES) -DIST_SOURCES = $(makemd5_SOURCES) +SOURCES = +DIST_SOURCES = - am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; - am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -@@ -153,6 +123,7 @@ CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ - AUTOMAKE = @AUTOMAKE@ -@@ -160,7 +131,6 @@ AWK = @AWK@ + am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ +@@ -276,7 +215,6 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -103,63 +119,15 @@ diff -up cyrus-sasl-2.1.26/include/Makefile.in.md5global.h cyrus-sasl-2.1.26/inc CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ -@@ -168,17 +138,18 @@ DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DIRS = @DIRS@ - DMALLOC_LIBS = @DMALLOC_LIBS@ -+DSYMUTIL = @DSYMUTIL@ -+DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ - EXEEXT = @EXEEXT@ -+FGREP = @FGREP@ - GETADDRINFOOBJS = @GETADDRINFOOBJS@ +@@ -297,7 +235,6 @@ GETADDRINFOOBJS = @GETADDRINFOOBJS@ GETNAMEINFOOBJS = @GETNAMEINFOOBJS@ GETSUBOPT = @GETSUBOPT@ GREP = @GREP@ -GSSAPIBASE_LIBS = @GSSAPIBASE_LIBS@ --GSSAPI_LIBS = @GSSAPI_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -190,19 +161,18 @@ JAVADOC = @JAVADOC@ - JAVAH = @JAVAH@ - JAVAROOT = @JAVAROOT@ - JAVA_INCLUDES = @JAVA_INCLUDES@ -+LD = @LD@ - LDFLAGS = @LDFLAGS@ - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ - LIBTOOL = @LIBTOOL@ --LIB_CRYPT = @LIB_CRYPT@ --LIB_DES = @LIB_DES@ - LIB_DOOR = @LIB_DOOR@ - LIB_LDAP = @LIB_LDAP@ - LIB_MYSQL = @LIB_MYSQL@ - LIB_PGSQL = @LIB_PGSQL@ --LIB_SOCKET = @LIB_SOCKET@ - LIB_SQLITE = @LIB_SQLITE@ - LIB_SQLITE3 = @LIB_SQLITE3@ -+LIPO = @LIPO@ - LN_S = @LN_S@ - LTGETADDRINFOOBJS = @LTGETADDRINFOOBJS@ - LTGETNAMEINFOOBJS = @LTGETNAMEINFOOBJS@ -@@ -211,8 +181,12 @@ LTSNPRINTFOBJS = @LTSNPRINTFOBJS@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ -+NMEDIT = @NMEDIT@ - NTLM_LIBS = @NTLM_LIBS@ -+OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -+OTOOL = @OTOOL@ -+OTOOL64 = @OTOOL64@ - OTP_LIBS = @OTP_LIBS@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -222,19 +196,11 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +@@ -350,19 +287,11 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PASSDSS_LIBS = @PASSDSS_LIBS@ PATH_SEPARATOR = @PATH_SEPARATOR@ @@ -179,23 +147,7 @@ diff -up cyrus-sasl-2.1.26/include/Makefile.in.md5global.h cyrus-sasl-2.1.26/inc SASL_MECHS = @SASL_MECHS@ SASL_STATIC_LIBS = @SASL_STATIC_LIBS@ SASL_STATIC_OBJS = @SASL_STATIC_OBJS@ -@@ -242,6 +208,7 @@ SASL_STATIC_SRCS = @SASL_STATIC_SRCS@ - SASL_UTIL_HEADERS_EXTRA = @SASL_UTIL_HEADERS_EXTRA@ - SASL_UTIL_LIBS_EXTRA = @SASL_UTIL_LIBS_EXTRA@ - SCRAM_LIBS = @SCRAM_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SFIO_INC_FLAGS = @SFIO_INC_FLAGS@ - SFIO_LIB_FLAGS = @SFIO_LIB_FLAGS@ -@@ -256,6 +223,7 @@ abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ - ac_ct_CC = @ac_ct_CC@ -+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -@@ -287,6 +255,7 @@ libdir = @libdir@ +@@ -418,6 +347,7 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ @@ -203,7 +155,7 @@ diff -up cyrus-sasl-2.1.26/include/Makefile.in.md5global.h cyrus-sasl-2.1.26/inc mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ -@@ -311,16 +280,13 @@ top_srcdir = @top_srcdir@ +@@ -442,16 +372,13 @@ top_srcdir = @top_srcdir@ noinst_HEADERS = gai.h exits.h saslincludedir = $(includedir)/sasl saslinclude_HEADERS = hmac-md5.h md5.h md5global.h sasl.h saslplug.h saslutil.h prop.h @@ -220,7 +172,7 @@ diff -up cyrus-sasl-2.1.26/include/Makefile.in.md5global.h cyrus-sasl-2.1.26/inc $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ -@@ -352,47 +318,6 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) +@@ -482,48 +409,6 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): @@ -232,9 +184,10 @@ diff -up cyrus-sasl-2.1.26/include/Makefile.in.md5global.h cyrus-sasl-2.1.26/inc - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list --makemd5$(EXEEXT): $(makemd5_OBJECTS) $(makemd5_DEPENDENCIES) +- +-makemd5$(EXEEXT): $(makemd5_OBJECTS) $(makemd5_DEPENDENCIES) $(EXTRA_makemd5_DEPENDENCIES) - @rm -f makemd5$(EXEEXT) -- $(LINK) $(makemd5_OBJECTS) $(makemd5_LDADD) $(LIBS) +- $(AM_V_CCLD)$(LINK) $(makemd5_OBJECTS) $(makemd5_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) @@ -245,30 +198,30 @@ diff -up cyrus-sasl-2.1.26/include/Makefile.in.md5global.h cyrus-sasl-2.1.26/inc -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/makemd5.Po@am__quote@ - -.c.o: --@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c $< +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< - -.c.obj: --@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.c.lo: --@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< - mostlyclean-libtool: -rm -f *.lo -@@ -523,7 +448,7 @@ distdir: $(DISTFILES) +@@ -656,7 +541,7 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am @@ -277,7 +230,7 @@ diff -up cyrus-sasl-2.1.26/include/Makefile.in.md5global.h cyrus-sasl-2.1.26/inc installdirs: for dir in "$(DESTDIR)$(frameheaderdir)" "$(DESTDIR)$(saslincludedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -@@ -549,21 +474,17 @@ clean-generic: +@@ -687,21 +572,17 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) @@ -301,7 +254,7 @@ diff -up cyrus-sasl-2.1.26/include/Makefile.in.md5global.h cyrus-sasl-2.1.26/inc dvi: dvi-am -@@ -606,14 +527,12 @@ install-ps-am: +@@ -744,14 +625,12 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am @@ -317,34 +270,8 @@ diff -up cyrus-sasl-2.1.26/include/Makefile.in.md5global.h cyrus-sasl-2.1.26/inc pdf: pdf-am -@@ -628,26 +547,21 @@ uninstall-am: uninstall-frameheaderDATA - .MAKE: install-am install-strip - - .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-noinstPROGRAMS ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am \ -- install-frameheaderDATA install-html install-html-am \ -- install-info install-info-am install-man install-pdf \ -- install-pdf-am install-ps install-ps-am \ -+ clean-libtool ctags distclean distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-frameheaderDATA install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ - install-saslincludeHEADERS install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-frameheaderDATA \ -+ maintainer-clean-generic mostlyclean mostlyclean-generic \ -+ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ -+ uninstall-am uninstall-frameheaderDATA \ - uninstall-saslincludeHEADERS +@@ -784,10 +663,6 @@ uninstall-am: uninstall-frameheaderDATA + .PRECIOUS: Makefile -md5global.h: makemd5 @@ -354,9 +281,9 @@ diff -up cyrus-sasl-2.1.26/include/Makefile.in.md5global.h cyrus-sasl-2.1.26/inc # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: -diff -up cyrus-sasl-2.1.26/include/md5global.h.md5global.h cyrus-sasl-2.1.26/include/md5global.h ---- cyrus-sasl-2.1.26/include/md5global.h.md5global.h 2012-10-15 20:17:34.000000000 +0200 -+++ cyrus-sasl-2.1.26/include/md5global.h 2013-09-03 13:09:19.562000004 +0200 +diff -up cyrus-sasl-2.1.27/include/md5global.h.md5global.h cyrus-sasl-2.1.27/include/md5global.h +--- cyrus-sasl-2.1.27/include/md5global.h.md5global.h 2015-11-20 15:28:25.932263083 +0100 ++++ cyrus-sasl-2.1.27/include/md5global.h 2015-11-20 15:36:16.380184280 +0100 @@ -15,14 +15,17 @@ The following makes PROTOTYPES default t /* POINTER defines a generic pointer type */ typedef unsigned char *POINTER; @@ -364,11 +291,11 @@ diff -up cyrus-sasl-2.1.26/include/md5global.h.md5global.h cyrus-sasl-2.1.26/inc -typedef signed char INT1; /* 8 bits */ -typedef short INT2; /* 16 bits */ -typedef int INT4; /* 32 bits */ --/* There is no 64 bit type */ +-typedef long INT8; /* 64 bits */ -typedef unsigned char UINT1; /* 8 bits */ -typedef unsigned short UINT2; /* 16 bits */ -typedef unsigned int UINT4; /* 32 bits */ --/* There is no 64 bit type */ +-typedef unsigned long UINT8; /* 64 bits */ +/* We try to define integer types for our use */ +#include + diff --git a/cyrus-sasl-2.1.26-release-server_creds.patch b/cyrus-sasl-2.1.26-release-server_creds.patch index a84bf9f..8309f03 100644 --- a/cyrus-sasl-2.1.26-release-server_creds.patch +++ b/cyrus-sasl-2.1.26-release-server_creds.patch @@ -1,6 +1,6 @@ -diff -up cyrus-sasl-2.1.26/plugins/gssapi.c.release-server_creds cyrus-sasl-2.1.26/plugins/gssapi.c ---- cyrus-sasl-2.1.26/plugins/gssapi.c.release-server_creds 2012-12-20 17:17:37.000000000 +0100 -+++ cyrus-sasl-2.1.26/plugins/gssapi.c 2012-12-20 17:42:11.498138999 +0100 +diff -up cyrus-sasl-2.1.27/plugins/gssapi.c.release-server_creds cyrus-sasl-2.1.27/plugins/gssapi.c +--- cyrus-sasl-2.1.27/plugins/gssapi.c.release-server_creds 2015-11-20 15:24:57.706740573 +0100 ++++ cyrus-sasl-2.1.27/plugins/gssapi.c 2015-11-20 15:26:00.310597014 +0100 @@ -945,6 +945,12 @@ gssapi_server_mech_authneg(context_t *te ret = SASL_CONTINUE; } @@ -12,5 +12,5 @@ diff -up cyrus-sasl-2.1.26/plugins/gssapi.c.release-server_creds cyrus-sasl-2.1. + } + cleanup: - if (client_name_MN) { + if (text->server_creds != GSS_C_NO_CREDENTIAL) { GSS_LOCK_MUTEX(params->utils); diff --git a/cyrus-sasl-2.1.26-sql.patch b/cyrus-sasl-2.1.26-sql.patch index b7f3db4..2140733 100644 --- a/cyrus-sasl-2.1.26-sql.patch +++ b/cyrus-sasl-2.1.26-sql.patch @@ -1,7 +1,7 @@ -diff -up ./configure.in.sql ./configure.in ---- ./configure.in.sql 2013-11-14 13:19:19.231000002 +0100 -+++ ./configure.in 2013-11-14 14:10:44.728997789 +0100 -@@ -729,7 +729,18 @@ LIB_MYSQL="" +diff -up cyrus-sasl-2.1.27/configure.ac.sql cyrus-sasl-2.1.27/configure.ac +--- cyrus-sasl-2.1.27/configure.ac.sql 2015-11-20 15:36:43.343122451 +0100 ++++ cyrus-sasl-2.1.27/configure.ac 2015-11-20 15:37:01.409081023 +0100 +@@ -730,7 +730,18 @@ LIB_MYSQL="" case "$with_mysql" in no) true;; @@ -21,7 +21,7 @@ diff -up ./configure.in.sql ./configure.in *) if test -d ${with_mysql}/lib/mysql; then CMU_ADD_LIBPATH_TO(${with_mysql}/lib/mysql, LIB_MYSQL) -@@ -750,6 +761,8 @@ case "$with_mysql" in +@@ -751,6 +762,8 @@ case "$with_mysql" in CPPFLAGS="${CPPFLAGS} -I${with_mysql}/mysql/include" elif test -d ${with_mysql}/include; then CPPFLAGS="${CPPFLAGS} -I${with_mysql}/include" @@ -30,7 +30,7 @@ diff -up ./configure.in.sql ./configure.in else CPPFLAGS="${CPPFLAGS} -I${with_mysql}" fi -@@ -793,7 +806,17 @@ LIB_PGSQL="" +@@ -794,7 +807,17 @@ LIB_PGSQL="" case "$with_pgsql" in no) true;; @@ -49,7 +49,7 @@ diff -up ./configure.in.sql ./configure.in *) if test -d ${with_pgsql}/lib/pgsql; then CMU_ADD_LIBPATH_TO(${with_pgsql}/lib/pgsql, LIB_PGSQL) -@@ -814,6 +837,8 @@ case "$with_pgsql" in +@@ -815,6 +838,8 @@ case "$with_pgsql" in CPPFLAGS="${CPPFLAGS} -I${with_pgsql}/pgsql/include" elif test -d ${with_pgsql}/include; then CPPFLAGS="${CPPFLAGS} -I${with_pgsql}/include" @@ -58,27 +58,23 @@ diff -up ./configure.in.sql ./configure.in else CPPFLAGS="${CPPFLAGS} -I${with_pgsql}" fi -diff -up ./configure.sql ./configure ---- ./configure.sql 2013-11-14 13:19:19.177000002 +0100 -+++ ./configure 2013-11-14 14:10:50.848000001 +0100 -@@ -4340,116 +4340,8 @@ $as_echo "$ac_cv___attribute__" >&6; } +diff -up cyrus-sasl-2.1.27/configure.sql cyrus-sasl-2.1.27/configure +--- cyrus-sasl-2.1.27/configure.sql 2015-11-20 15:36:43.345122446 +0100 ++++ cyrus-sasl-2.1.27/configure 2015-11-20 15:43:36.312173025 +0100 +@@ -4712,59 +4712,8 @@ $as_echo "$ac_cv___attribute__" >&6; } # CMU GUESS RUNPATH SWITCH -- { $as_echo "$as_me:$LINENO: checking for runpath switch" >&5 +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for runpath switch" >&5 -$as_echo_n "checking for runpath switch... " >&6; } --if test "${andrew_cv_runpath_switch+set}" = set; then +-if ${andrew_cv_runpath_switch+:} false; then : - $as_echo_n "(cached) " >&6 -else - - # first, try -R - SAVE_LDFLAGS="${LDFLAGS}" - LDFLAGS="-R /usr/lib" -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int @@ -89,39 +85,12 @@ diff -up ./configure.sql ./configure - return 0; -} -_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then +-if ac_fn_c_try_link "$LINENO"; then : - andrew_cv_runpath_switch="-R" -else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- - - LDFLAGS="-Wl,-rpath,/usr/lib" -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int @@ -132,1003 +101,36 @@ diff -up ./configure.sql ./configure - return 0; -} -_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then +-if ac_fn_c_try_link "$LINENO"; then : - andrew_cv_runpath_switch="-Wl,-rpath," -else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- andrew_cv_runpath_switch="none" --fi -- --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext -- --fi -- --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext -- LDFLAGS="${SAVE_LDFLAGS}" -+ andrew_runpath_switch="none" - +- andrew_cv_runpath_switch="none" -fi --{ $as_echo "$as_me:$LINENO: result: $andrew_cv_runpath_switch" >&5 --$as_echo "$andrew_cv_runpath_switch" >&6; } - - - # Check whether --with-staticsasl was given. -@@ -4784,7 +4676,7 @@ test x"$silent" = xyes && libtool_flags= - case "$lt_target" in - *-*-irix6*) - # Find out which ABI we are using. -- echo '#line 4787 "configure"' > conftest.$ac_ext -+ echo '#line 4679 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -@@ -11239,7 +11131,6 @@ $as_echo "$cyrus_krbinclude" >&6; } - if test -n "${cyrus_krbinclude}"; then - CPPFLAGS="$CPPFLAGS -I${cyrus_krbinclude}" - fi -- LDFLAGS="$LDFLAGS -L$krb4/lib" - fi - - if test "$with_des" != no; then -@@ -13467,69 +13358,43 @@ _ACEOF - fi - done - -+ if test "$ac_cv_func_gsskrb5_register_acceptor_identity" = no ; then - --for ac_func in gss_decapsulate_token -+for ac_header in gssapi/gssapi_krb5.h - do --as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 --$as_echo_n "checking for $ac_func... " >&6; } --if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -+fi -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } - else -- cat >conftest.$ac_ext <<_ACEOF -+ # Is the header compilable? -+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+$as_echo_n "checking $ac_header usability... " >&6; } -+cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --/* Define $ac_func to an innocuous variant, in case declares $ac_func. -- For example, HP-UX 11i declares gettimeofday. */ --#define $ac_func innocuous_$ac_func -- --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char $ac_func (); below. -- Prefer to if __STDC__ is defined, since -- exists even on freestanding compilers. */ -- --#ifdef __STDC__ --# include --#else --# include --#endif -- --#undef $ac_func -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char $ac_func (); --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined __stub_$ac_func || defined __stub___$ac_func --choke me --#endif -- --int --main () --{ --return $ac_func (); -- ; -- return 0; --} -+$ac_includes_default -+#include <$ac_header> - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac - eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" - $as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 -@@ -13538,139 +13403,178 @@ $as_echo "$ac_try_echo") >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- eval "$as_ac_var=yes" -+ } && test -s conftest.$ac_objext; then -+ ac_header_compiler=yes - else - $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- eval "$as_ac_var=no" --fi -- --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext --fi --ac_res=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --as_val=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -- cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 --_ACEOF -- -+ ac_header_compiler=no - fi --done - -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } - --for ac_func in gss_encapsulate_token --do --as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 --$as_echo_n "checking for $ac_func... " >&6; } --if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 --else -- cat >conftest.$ac_ext <<_ACEOF -+# Is the header present? -+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+$as_echo_n "checking $ac_header presence... " >&6; } -+cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --/* Define $ac_func to an innocuous variant, in case declares $ac_func. -- For example, HP-UX 11i declares gettimeofday. */ --#define $ac_func innocuous_$ac_func -- --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char $ac_func (); below. -- Prefer to if __STDC__ is defined, since -- exists even on freestanding compilers. */ -- --#ifdef __STDC__ --# include --#else --# include --#endif -- --#undef $ac_func -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char $ac_func (); --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined __stub_$ac_func || defined __stub___$ac_func --choke me --#endif -- --int --main () --{ --return $ac_func (); -- ; -- return 0; --} -+#include <$ac_header> - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" -+if { (ac_try="$ac_cpp conftest.$ac_ext" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac - eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" - $as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext - }; then -- eval "$as_ac_var=yes" -+ ac_header_preproc=yes - else - $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- eval "$as_ac_var=no" -+ ac_header_preproc=no - fi - --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+$as_echo "$ac_header_preproc" >&6; } -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ -+ ;; -+esac -+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ $as_echo_n "(cached) " >&6 -+else -+ eval "$as_ac_Header=\$ac_header_preproc" - fi --ac_res=`eval 'as_val=${'$as_ac_var'} -+ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 - $as_echo "$ac_res" >&6; } --as_val=`eval 'as_val=${'$as_ac_var'} -+ -+fi -+as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF - - fi -+ - done - -+ if test "$ac_cv_header_gssapi_gssapi_krb5_h" = "yes"; then -+ { $as_echo "$as_me:$LINENO: checking whether gsskrb5_register_acceptor_identity is declared" >&5 -+$as_echo_n "checking whether gsskrb5_register_acceptor_identity is declared... " >&6; } -+if test "${ac_cv_have_decl_gsskrb5_register_acceptor_identity+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+ $ac_includes_default -+ #include - --for ac_func in gss_oid_equal -+ -+int -+main () -+{ -+#ifndef gsskrb5_register_acceptor_identity -+ (void) gsskrb5_register_acceptor_identity; -+#endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_cv_have_decl_gsskrb5_register_acceptor_identity=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_have_decl_gsskrb5_register_acceptor_identity=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_gsskrb5_register_acceptor_identity" >&5 -+$as_echo "$ac_cv_have_decl_gsskrb5_register_acceptor_identity" >&6; } -+if test "x$ac_cv_have_decl_gsskrb5_register_acceptor_identity" = x""yes; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY 1 -+_ACEOF -+ -+fi -+ -+ fi -+ fi -+ -+for ac_func in gss_decapsulate_token - do - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` - { $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -@@ -13770,12 +13674,8 @@ _ACEOF - fi - done - -- LIBS="$cmu_save_LIBS" -- -- cmu_save_LIBS="$LIBS" -- LIBS="$LIBS $GSSAPIBASE_LIBS" - --for ac_func in gss_get_name_attribute -+for ac_func in gss_encapsulate_token - do - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` - { $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -@@ -13875,20 +13775,14 @@ _ACEOF - fi - done - -- LIBS="$cmu_save_LIBS" - -- cmu_save_LIBS="$LIBS" -- LIBS="$LIBS $GSSAPIBASE_LIBS" -- { $as_echo "$as_me:$LINENO: checking for SPNEGO support in GSSAPI libraries" >&5 --$as_echo_n "checking for SPNEGO support in GSSAPI libraries... " >&6; } -- if test "$cross_compiling" = yes; then -- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling --See \`config.log' for more details." >&5 --$as_echo "$as_me: error: cannot run test program while cross compiling --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; }; } -+for ac_func in gss_oid_equal -+do -+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -+$as_echo_n "checking for $ac_func... " >&6; } -+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -13896,30 +13790,46 @@ _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -+/* Define $ac_func to an innocuous variant, in case declares $ac_func. -+ For example, HP-UX 11i declares gettimeofday. */ -+#define $ac_func innocuous_$ac_func - --#ifdef HAVE_GSSAPI_H --#include -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char $ac_func (); below. -+ Prefer to if __STDC__ is defined, since -+ exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include - #else --#include -+# include - #endif - --int main(void) --{ -- gss_OID_desc spnego_oid = { 6, (void *) "\x2b\x06\x01\x05\x05\x02" }; -- gss_OID_set mech_set; -- OM_uint32 min_stat; -- int have_spnego = 0; -+#undef $ac_func - -- if (gss_indicate_mechs(&min_stat, &mech_set) == GSS_S_COMPLETE) { -- gss_test_oid_set_member(&min_stat, &spnego_oid, mech_set, &have_spnego); -- gss_release_oid_set(&min_stat, &mech_set); -- } -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char $ac_func (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_$ac_func || defined __stub___$ac_func -+choke me -+#endif - -- return (!have_spnego); // 0 = success, 1 = failure -+int -+main () -+{ -+return $ac_func (); -+ ; -+ return 0; - } -- - _ACEOF --rm -f conftest$ac_exeext -+rm -f conftest.$ac_objext conftest$ac_exeext - if { (ac_try="$ac_link" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -@@ -13927,63 +13837,259 @@ case "(($ac_try" in - esac - eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" - $as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_try") 2>&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- --cat >>confdefs.h <<\_ACEOF --#define HAVE_GSS_SPNEGO /**/ --_ACEOF -- -- { $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; } -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ eval "$as_ac_var=yes" - else -- $as_echo "$as_me: program exited with status $ac_status" >&5 --$as_echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --( exit $ac_status ) --{ $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ eval "$as_ac_var=no" - fi -+ - rm -rf conftest.dSYM --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext - fi -+ac_res=`eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+as_val=`eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` -+ if test "x$as_val" = x""yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+_ACEOF - -- -- LIBS="$cmu_save_LIBS" -- --else -- { $as_echo "$as_me:$LINENO: result: disabled" >&5 --$as_echo "disabled" >&6; } - fi -+done - -+ LIBS="$cmu_save_LIBS" - -+ cmu_save_LIBS="$LIBS" -+ LIBS="$LIBS $GSSAPIBASE_LIBS" - -- --if test "$gssapi" != "no"; then -- --cat >>confdefs.h <<\_ACEOF --#define STATIC_GSSAPIV2 /**/ --_ACEOF -- -- mutex_default="no" -- if test "$gss_impl" = "mit"; then -- mutex_default="yes" -- fi -- { $as_echo "$as_me:$LINENO: checking to use mutexes aroung GSS calls" >&5 --$as_echo_n "checking to use mutexes aroung GSS calls... " >&6; } -+for ac_func in gss_get_name_attribute -+do -+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -+$as_echo_n "checking for $ac_func... " >&6; } -+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -+ $as_echo_n "(cached) " >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define $ac_func to an innocuous variant, in case declares $ac_func. -+ For example, HP-UX 11i declares gettimeofday. */ -+#define $ac_func innocuous_$ac_func -+ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char $ac_func (); below. -+ Prefer to if __STDC__ is defined, since -+ exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif -+ -+#undef $ac_func -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char $ac_func (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_$ac_func || defined __stub___$ac_func -+choke me -+#endif -+ -+int -+main () -+{ -+return $ac_func (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ eval "$as_ac_var=yes" -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ eval "$as_ac_var=no" -+fi -+ -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+fi -+ac_res=`eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+as_val=`eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` -+ if test "x$as_val" = x""yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+_ACEOF -+ -+fi -+done -+ -+ LIBS="$cmu_save_LIBS" -+ -+ cmu_save_LIBS="$LIBS" -+ LIBS="$LIBS $GSSAPIBASE_LIBS" -+ { $as_echo "$as_me:$LINENO: checking for SPNEGO support in GSSAPI libraries" >&5 -+$as_echo_n "checking for SPNEGO support in GSSAPI libraries... " >&6; } -+ if test "$cross_compiling" = yes; then -+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling -+See \`config.log' for more details." >&5 -+$as_echo "$as_me: error: cannot run test program while cross compiling -+See \`config.log' for more details." >&2;} -+ { (exit 1); exit 1; }; }; } -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+#ifdef HAVE_GSSAPI_H -+#include -+#else -+#include -+#endif -+ -+int main(void) -+{ -+ gss_OID_desc spnego_oid = { 6, (void *) "\x2b\x06\x01\x05\x05\x02" }; -+ gss_OID_set mech_set; -+ OM_uint32 min_stat; -+ int have_spnego = 0; -+ -+ if (gss_indicate_mechs(&min_stat, &mech_set) == GSS_S_COMPLETE) { -+ gss_test_oid_set_member(&min_stat, &spnego_oid, mech_set, &have_spnego); -+ gss_release_oid_set(&min_stat, &mech_set); -+ } -+ -+ return (!have_spnego); // 0 = success, 1 = failure -+} -+ -+_ACEOF -+rm -f conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -+ { (case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_try") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_GSS_SPNEGO /**/ -+_ACEOF -+ -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } -+else -+ $as_echo "$as_me: program exited with status $ac_status" >&5 -+$as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+( exit $ac_status ) -+{ $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+rm -rf conftest.dSYM -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+fi -+ -+ -+ LIBS="$cmu_save_LIBS" -+ -+else -+ { $as_echo "$as_me:$LINENO: result: disabled" >&5 -+$as_echo "disabled" >&6; } -+fi -+ -+ -+ -+ -+if test "$gssapi" != "no"; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define STATIC_GSSAPIV2 /**/ -+_ACEOF -+ -+ mutex_default="no" -+ if test "$gss_impl" = "mit"; then -+ mutex_default="yes" -+ fi -+ { $as_echo "$as_me:$LINENO: checking to use mutexes aroung GSS calls" >&5 -+$as_echo_n "checking to use mutexes aroung GSS calls... " >&6; } - # Check whether --enable-gss_mutexes was given. - if test "${enable_gss_mutexes+set}" = set; then - enableval=$enable_gss_mutexes; use_gss_mutexes=$enableval -@@ -14246,44 +14352,127 @@ LIB_MYSQL="" - - case "$with_mysql" in - no) true;; -- notfound) { $as_echo "$as_me:$LINENO: WARNING: MySQL Library not found" >&5 --$as_echo "$as_me: WARNING: MySQL Library not found" >&2;}; true;; -- *) -- if test -d ${with_mysql}/lib/mysql; then -- -- # this is CMU ADD LIBPATH TO -- if test "$andrew_cv_runpath_switch" = "none" ; then -- LIB_MYSQL="-L${with_mysql}/lib/mysql ${LIB_MYSQL}" -- else -- LIB_MYSQL="-L${with_mysql}/lib/mysql ${LIB_MYSQL} $andrew_cv_runpath_switch${with_mysql}/lib/mysql" -- fi -- -- elif test -d ${with_mysql}/mysql/lib; then -- -- # this is CMU ADD LIBPATH TO -- if test "$andrew_cv_runpath_switch" = "none" ; then -- LIB_MYSQL="-L${with_mysql}/mysql/lib ${LIB_MYSQL}" -- else -- LIB_MYSQL="-L${with_mysql}/mysql/lib ${LIB_MYSQL} $andrew_cv_runpath_switch${with_mysql}/mysql/lib" -- fi -- -- elif test -d ${with_mysql}/lib; then -- -- # this is CMU ADD LIBPATH TO -- if test "$andrew_cv_runpath_switch" = "none" ; then -- LIB_MYSQL="-L${with_mysql}/lib ${LIB_MYSQL}" -- else -- LIB_MYSQL="-L${with_mysql}/lib ${LIB_MYSQL} $andrew_cv_runpath_switch${with_mysql}/lib" -- fi -- -- else -+ notfound) -+ save_LDFLAGS=$LDFLAGS -+ LIB_MYSQL=`mysql_config --libs` -+ LIB_MYSQL="-lmysqlclient" -+ LDFLAGS="$LDFLAGS $LIB_MYSQL" -+ # CPPFLAGS="${CPPFLAGS} `mysql_config --include`" -+ { $as_echo "$as_me:$LINENO: checking for mysql_select_db in -lmysqlclient" >&5 -+$as_echo_n "checking for mysql_select_db in -lmysqlclient... " >&6; } -+if test "${ac_cv_lib_mysqlclient_mysql_select_db+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lmysqlclient $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - -- # this is CMU ADD LIBPATH TO -- if test "$andrew_cv_runpath_switch" = "none" ; then -- LIB_MYSQL="-L${with_mysql} ${LIB_MYSQL}" -- else -- LIB_MYSQL="-L${with_mysql} ${LIB_MYSQL} $andrew_cv_runpath_switch${with_mysql}" -- fi -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char mysql_select_db (); -+int -+main () -+{ -+return mysql_select_db (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_lib_mysqlclient_mysql_select_db=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_lib_mysqlclient_mysql_select_db=no -+fi -+ -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mysqlclient_mysql_select_db" >&5 -+$as_echo "$ac_cv_lib_mysqlclient_mysql_select_db" >&6; } -+if test "x$ac_cv_lib_mysqlclient_mysql_select_db" = x""yes; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_MYSQL /**/ -+_ACEOF -+ -+else -+ { $as_echo "$as_me:$LINENO: WARNING: MySQL library mysqlclient does not work" >&5 -+$as_echo "$as_me: WARNING: MySQL library mysqlclient does not work" >&2;} -+ with_mysql=no -+fi -+ -+ LDFLAGS=$save_LDFLAGS -+ ;; -+ *) -+ if test -d ${with_mysql}/lib/mysql; then -+ -+ # this is CMU ADD LIBPATH TO -+ if test "$andrew_cv_runpath_switch" = "none" ; then -+ LIB_MYSQL="-L${with_mysql}/lib/mysql ${LIB_MYSQL}" -+ else -+ LIB_MYSQL="-L${with_mysql}/lib/mysql ${LIB_MYSQL} $andrew_cv_runpath_switch${with_mysql}/lib/mysql" -+ fi -+ -+ elif test -d ${with_mysql}/mysql/lib; then -+ -+ # this is CMU ADD LIBPATH TO -+ if test "$andrew_cv_runpath_switch" = "none" ; then -+ LIB_MYSQL="-L${with_mysql}/mysql/lib ${LIB_MYSQL}" -+ else -+ LIB_MYSQL="-L${with_mysql}/mysql/lib ${LIB_MYSQL} $andrew_cv_runpath_switch${with_mysql}/mysql/lib" -+ fi -+ -+ elif test -d ${with_mysql}/lib; then -+ -+ # this is CMU ADD LIBPATH TO -+ if test "$andrew_cv_runpath_switch" = "none" ; then -+ LIB_MYSQL="-L${with_mysql}/lib ${LIB_MYSQL}" -+ else -+ LIB_MYSQL="-L${with_mysql}/lib ${LIB_MYSQL} $andrew_cv_runpath_switch${with_mysql}/lib" -+ fi -+ -+ else -+ -+ # this is CMU ADD LIBPATH TO -+ if test "$andrew_cv_runpath_switch" = "none" ; then -+ LIB_MYSQL="-L${with_mysql} ${LIB_MYSQL}" -+ else -+ LIB_MYSQL="-L${with_mysql} ${LIB_MYSQL} $andrew_cv_runpath_switch${with_mysql}" -+ fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +- +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +- LDFLAGS="${SAVE_LDFLAGS}" +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $andrew_cv_runpath_switch" >&5 +-$as_echo "$andrew_cv_runpath_switch" >&6; } - fi ++ andrew_runpath_switch="none" -@@ -14296,6 +14485,8 @@ $as_echo "$as_me: WARNING: MySQL Library + # Check whether --with-staticsasl was given. + if test "${with_staticsasl+set}" = set; then : +@@ -15265,7 +15214,6 @@ $as_echo "$cyrus_cv_krbinclude" >&6; } + if test -n "${cyrus_cv_krbinclude}"; then + CPPFLAGS="$CPPFLAGS -I${cyrus_cv_krbinclude}" + fi +- LDFLAGS="$LDFLAGS -L$krb4/lib" + fi + + if test "$with_des" != no; then +@@ -16693,6 +16641,8 @@ $as_echo "$as_me: WARNING: MySQL Library CPPFLAGS="${CPPFLAGS} -I${with_mysql}/mysql/include" elif test -d ${with_mysql}/include; then CPPFLAGS="${CPPFLAGS} -I${with_mysql}/include" @@ -1137,100 +139,7 @@ diff -up ./configure.sql ./configure else CPPFLAGS="${CPPFLAGS} -I${with_mysql}" fi -@@ -14416,8 +14607,90 @@ LIB_PGSQL="" - - case "$with_pgsql" in - no) true;; -- notfound) { $as_echo "$as_me:$LINENO: WARNING: PostgreSQL Library not found" >&5 --$as_echo "$as_me: WARNING: PostgreSQL Library not found" >&2;}; true;; -+ notfound) -+ LIB_PGSQL="-lpq" -+ # CPPFLAGS="${CPPFLAGS} -I`pg_config --includedir`" -+ save_LDFLAGS=$LDFLAGS -+ LDFLAGS="$LDFLAGS $LIB_PGSQL" -+ { $as_echo "$as_me:$LINENO: checking for PQsetdbLogin in -lpq" >&5 -+$as_echo_n "checking for PQsetdbLogin in -lpq... " >&6; } -+if test "${ac_cv_lib_pq_PQsetdbLogin+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lpq $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char PQsetdbLogin (); -+int -+main () -+{ -+return PQsetdbLogin (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_lib_pq_PQsetdbLogin=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_lib_pq_PQsetdbLogin=no -+fi -+ -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQsetdbLogin" >&5 -+$as_echo "$ac_cv_lib_pq_PQsetdbLogin" >&6; } -+if test "x$ac_cv_lib_pq_PQsetdbLogin" = x""yes; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_PGSQL /**/ -+_ACEOF -+ -+else -+ { $as_echo "$as_me:$LINENO: WARNING: PostgreSQL Library pq does not work" >&5 -+$as_echo "$as_me: WARNING: PostgreSQL Library pq does not work" >&2;} -+ with_pgsql=no -+fi -+ -+ LDFLAGS=$save_LDFLAGS -+ ;; - *) - if test -d ${with_pgsql}/lib/pgsql; then - -@@ -14466,6 +14739,8 @@ $as_echo "$as_me: WARNING: PostgreSQL Li +@@ -16832,6 +16782,8 @@ $as_echo "$as_me: WARNING: PostgreSQL Li CPPFLAGS="${CPPFLAGS} -I${with_pgsql}/pgsql/include" elif test -d ${with_pgsql}/include; then CPPFLAGS="${CPPFLAGS} -I${with_pgsql}/include" @@ -1239,19 +148,11 @@ diff -up ./configure.sql ./configure else CPPFLAGS="${CPPFLAGS} -I${with_pgsql}" fi -@@ -18166,116 +18441,989 @@ fi +@@ -18624,12 +18576,109 @@ fi done -ac_fn_c_check_type "$LINENO" "long long" "ac_cv_type_long_long" " --#ifdef HAVE_INTTYPES_H --#include --#endif --" --if test "x$ac_cv_type_long_long" = xyes; then : -- --cat >>confdefs.h <<_ACEOF --#define HAVE_LONG_LONG 1 +{ $as_echo "$as_me:$LINENO: checking for long long" >&5 +$as_echo_n "checking for long long... " >&6; } +if test "${ac_cv_type_long_long+set}" = set; then @@ -1260,22 +161,17 @@ diff -up ./configure.sql ./configure + ac_cv_type_long_long=no +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ - _ACEOF ++_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ - -- --fi --ac_fn_c_check_type "$LINENO" "int8_t" "ac_cv_type_int8_t" " ++ #ifdef HAVE_INTTYPES_H #include #endif -" --if test "x$ac_cv_type_int8_t" = xyes; then : - --cat >>confdefs.h <<_ACEOF --#define HAVE_INT8_T 1 +-if test "x$ac_cv_type_long_long" = xyes; then : ++ +int +main () +{ @@ -1284,19 +180,7 @@ diff -up ./configure.sql ./configure + ; + return 0; +} - _ACEOF -- -- --fi --ac_fn_c_check_type "$LINENO" "uint8_t" "ac_cv_type_uint8_t" " --#ifdef HAVE_INTTYPES_H --#include --#endif --" --if test "x$ac_cv_type_uint8_t" = xyes; then : -- --cat >>confdefs.h <<_ACEOF --#define HAVE_UINT8_T 1 ++_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in @@ -1317,22 +201,15 @@ diff -up ./configure.sql ./configure + } && test -s conftest.$ac_objext; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ - _ACEOF ++_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ - -- --fi --ac_fn_c_check_type "$LINENO" "int16_t" "ac_cv_type_int16_t" " - #ifdef HAVE_INTTYPES_H - #include - #endif --" --if test "x$ac_cv_type_int16_t" = xyes; then : - --cat >>confdefs.h <<_ACEOF --#define HAVE_INT16_T 1 ++ ++#ifdef HAVE_INTTYPES_H ++#include ++#endif ++ +int +main () +{ @@ -1341,19 +218,7 @@ diff -up ./configure.sql ./configure + ; + return 0; +} - _ACEOF -- -- --fi --ac_fn_c_check_type "$LINENO" "uint16_t" "ac_cv_type_uint16_t" " --#ifdef HAVE_INTTYPES_H --#include --#endif --" --if test "x$ac_cv_type_uint16_t" = xyes; then : -- --cat >>confdefs.h <<_ACEOF --#define HAVE_UINT16_T 1 ++_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in @@ -1393,14 +258,14 @@ diff -up ./configure.sql ./configure +{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5 +$as_echo "$ac_cv_type_long_long" >&6; } +if test "x$ac_cv_type_long_long" = x""yes; then -+ -+cat >>confdefs.h <<_ACEOF -+#define HAVE_LONG_LONG 1 - _ACEOF + + cat >>confdefs.h <<_ACEOF + #define HAVE_LONG_LONG 1 +@@ -18637,12 +18686,109 @@ _ACEOF fi --ac_fn_c_check_type "$LINENO" "int32_t" "ac_cv_type_int32_t" " +-ac_fn_c_check_type "$LINENO" "int8_t" "ac_cv_type_int8_t" " +{ $as_echo "$as_me:$LINENO: checking for int8_t" >&5 +$as_echo_n "checking for int8_t... " >&6; } +if test "${ac_cv_type_int8_t+set}" = set; then @@ -1418,10 +283,8 @@ diff -up ./configure.sql ./configure #include #endif -" --if test "x$ac_cv_type_int32_t" = xyes; then : - --cat >>confdefs.h <<_ACEOF --#define HAVE_INT32_T 1 +-if test "x$ac_cv_type_int8_t" = xyes; then : ++ +int +main () +{ @@ -1430,7 +293,7 @@ diff -up ./configure.sql ./configure + ; + return 0; +} - _ACEOF ++_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in @@ -1455,15 +318,10 @@ diff -up ./configure.sql ./configure +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ - -- --fi --ac_fn_c_check_type "$LINENO" "uint32_t" "ac_cv_type_uint32_t" " - #ifdef HAVE_INTTYPES_H - #include - #endif --" --if test "x$ac_cv_type_uint32_t" = xyes; then : ++ ++#ifdef HAVE_INTTYPES_H ++#include ++#endif + +int +main () @@ -1515,13 +373,12 @@ diff -up ./configure.sql ./configure +if test "x$ac_cv_type_int8_t" = x""yes; then cat >>confdefs.h <<_ACEOF --#define HAVE_UINT32_T 1 -+#define HAVE_INT8_T 1 - _ACEOF + #define HAVE_INT8_T 1 +@@ -18650,12 +18796,109 @@ _ACEOF fi --ac_fn_c_check_type "$LINENO" "int64_t" "ac_cv_type_int64_t" " +-ac_fn_c_check_type "$LINENO" "uint8_t" "ac_cv_type_uint8_t" " +{ $as_echo "$as_me:$LINENO: checking for uint8_t" >&5 +$as_echo_n "checking for uint8_t... " >&6; } +if test "${ac_cv_type_uint8_t+set}" = set; then @@ -1539,7 +396,7 @@ diff -up ./configure.sql ./configure #include #endif -" --if test "x$ac_cv_type_int64_t" = xyes; then : +-if test "x$ac_cv_type_uint8_t" = xyes; then : + +int +main () @@ -1629,13 +486,12 @@ diff -up ./configure.sql ./configure +if test "x$ac_cv_type_uint8_t" = x""yes; then cat >>confdefs.h <<_ACEOF --#define HAVE_INT64_T 1 -+#define HAVE_UINT8_T 1 - _ACEOF + #define HAVE_UINT8_T 1 +@@ -18663,12 +18906,109 @@ _ACEOF fi --ac_fn_c_check_type "$LINENO" "uint64_t" "ac_cv_type_uint64_t" " +-ac_fn_c_check_type "$LINENO" "int16_t" "ac_cv_type_int16_t" " +{ $as_echo "$as_me:$LINENO: checking for int16_t" >&5 +$as_echo_n "checking for int16_t... " >&6; } +if test "${ac_cv_type_int16_t+set}" = set; then @@ -1649,11 +505,9 @@ diff -up ./configure.sql ./configure +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + - #ifdef HAVE_INTTYPES_H - #include - #endif --" --if test "x$ac_cv_type_uint64_t" = xyes; then : ++#ifdef HAVE_INTTYPES_H ++#include ++#endif + +int +main () @@ -1689,9 +543,11 @@ diff -up ./configure.sql ./configure +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + -+#ifdef HAVE_INTTYPES_H -+#include -+#endif + #ifdef HAVE_INTTYPES_H + #include + #endif +-" +-if test "x$ac_cv_type_int16_t" = xyes; then : + +int +main () @@ -1741,13 +597,14 @@ diff -up ./configure.sql ./configure +{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_int16_t" >&5 +$as_echo "$ac_cv_type_int16_t" >&6; } +if test "x$ac_cv_type_int16_t" = x""yes; then -+ -+cat >>confdefs.h <<_ACEOF -+#define HAVE_INT16_T 1 -+_ACEOF -+ -+ -+fi + + cat >>confdefs.h <<_ACEOF + #define HAVE_INT16_T 1 +@@ -18676,12 +19016,109 @@ _ACEOF + + + fi +-ac_fn_c_check_type "$LINENO" "uint16_t" "ac_cv_type_uint16_t" " +{ $as_echo "$as_me:$LINENO: checking for uint16_t" >&5 +$as_echo_n "checking for uint16_t... " >&6; } +if test "${ac_cv_type_uint16_t+set}" = set; then @@ -1761,9 +618,11 @@ diff -up ./configure.sql ./configure +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + -+#ifdef HAVE_INTTYPES_H -+#include -+#endif + #ifdef HAVE_INTTYPES_H + #include + #endif +-" +-if test "x$ac_cv_type_uint16_t" = xyes; then : + +int +main () @@ -1851,13 +710,14 @@ diff -up ./configure.sql ./configure +{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uint16_t" >&5 +$as_echo "$ac_cv_type_uint16_t" >&6; } +if test "x$ac_cv_type_uint16_t" = x""yes; then -+ -+cat >>confdefs.h <<_ACEOF -+#define HAVE_UINT16_T 1 -+_ACEOF -+ -+ -+fi + + cat >>confdefs.h <<_ACEOF + #define HAVE_UINT16_T 1 +@@ -18689,12 +19126,109 @@ _ACEOF + + + fi +-ac_fn_c_check_type "$LINENO" "int32_t" "ac_cv_type_int32_t" " +{ $as_echo "$as_me:$LINENO: checking for int32_t" >&5 +$as_echo_n "checking for int32_t... " >&6; } +if test "${ac_cv_type_int32_t+set}" = set; then @@ -1871,9 +731,11 @@ diff -up ./configure.sql ./configure +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + -+#ifdef HAVE_INTTYPES_H -+#include -+#endif + #ifdef HAVE_INTTYPES_H + #include + #endif +-" +-if test "x$ac_cv_type_int32_t" = xyes; then : + +int +main () @@ -1961,13 +823,14 @@ diff -up ./configure.sql ./configure +{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_int32_t" >&5 +$as_echo "$ac_cv_type_int32_t" >&6; } +if test "x$ac_cv_type_int32_t" = x""yes; then -+ -+cat >>confdefs.h <<_ACEOF -+#define HAVE_INT32_T 1 -+_ACEOF -+ -+ -+fi + + cat >>confdefs.h <<_ACEOF + #define HAVE_INT32_T 1 +@@ -18702,12 +19236,109 @@ _ACEOF + + + fi +-ac_fn_c_check_type "$LINENO" "uint32_t" "ac_cv_type_uint32_t" " +{ $as_echo "$as_me:$LINENO: checking for uint32_t" >&5 +$as_echo_n "checking for uint32_t... " >&6; } +if test "${ac_cv_type_uint32_t+set}" = set; then @@ -1981,9 +844,11 @@ diff -up ./configure.sql ./configure +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + -+#ifdef HAVE_INTTYPES_H -+#include -+#endif + #ifdef HAVE_INTTYPES_H + #include + #endif +-" +-if test "x$ac_cv_type_uint32_t" = xyes; then : + +int +main () @@ -2071,13 +936,14 @@ diff -up ./configure.sql ./configure +{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uint32_t" >&5 +$as_echo "$ac_cv_type_uint32_t" >&6; } +if test "x$ac_cv_type_uint32_t" = x""yes; then -+ -+cat >>confdefs.h <<_ACEOF -+#define HAVE_UINT32_T 1 -+_ACEOF -+ -+ -+fi + + cat >>confdefs.h <<_ACEOF + #define HAVE_UINT32_T 1 +@@ -18715,12 +19346,109 @@ _ACEOF + + + fi +-ac_fn_c_check_type "$LINENO" "int64_t" "ac_cv_type_int64_t" " +{ $as_echo "$as_me:$LINENO: checking for int64_t" >&5 +$as_echo_n "checking for int64_t... " >&6; } +if test "${ac_cv_type_int64_t+set}" = set; then @@ -2129,9 +995,11 @@ diff -up ./configure.sql ./configure +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + -+#ifdef HAVE_INTTYPES_H -+#include -+#endif + #ifdef HAVE_INTTYPES_H + #include + #endif +-" +-if test "x$ac_cv_type_int64_t" = xyes; then : + +int +main () @@ -2181,13 +1049,14 @@ diff -up ./configure.sql ./configure +{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_int64_t" >&5 +$as_echo "$ac_cv_type_int64_t" >&6; } +if test "x$ac_cv_type_int64_t" = x""yes; then -+ -+cat >>confdefs.h <<_ACEOF -+#define HAVE_INT64_T 1 -+_ACEOF -+ -+ -+fi + + cat >>confdefs.h <<_ACEOF + #define HAVE_INT64_T 1 +@@ -18728,12 +19456,109 @@ _ACEOF + + + fi +-ac_fn_c_check_type "$LINENO" "uint64_t" "ac_cv_type_uint64_t" " +{ $as_echo "$as_me:$LINENO: checking for uint64_t" >&5 +$as_echo_n "checking for uint64_t... " >&6; } +if test "${ac_cv_type_uint64_t+set}" = set; then @@ -2201,9 +1070,11 @@ diff -up ./configure.sql ./configure +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + -+#ifdef HAVE_INTTYPES_H -+#include -+#endif + #ifdef HAVE_INTTYPES_H + #include + #endif +-" +-if test "x$ac_cv_type_uint64_t" = xyes; then : + +int +main () diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec index 686b301..c3f4045 100644 --- a/cyrus-sasl.spec +++ b/cyrus-sasl.spec @@ -7,8 +7,8 @@ Summary: The Cyrus SASL library Name: cyrus-sasl -Version: 2.1.26 -Release: 37%{?dist} +Version: 2.1.27 +Release: 1%{?dist} License: BSD with advertising Group: System Environment/Libraries # Source0 originally comes from https://www.cyrusimap.org/releases/; @@ -197,23 +197,23 @@ chmod -x include/*.h %patch15 -p1 -b .path %patch23 -p1 -b .man %patch24 -p1 -b .sizes -%patch31 -p1 -b .krb4 +#%patch31 -p1 -b .krb4 %patch32 -p1 -b .warnings -%patch34 -p1 -b .ldap-timeout -%patch43 -p1 -b .null-crypt +#%patch34 -p1 -b .ldap-timeout +#%patch43 -p1 -b .null-crypt %patch44 -p1 -b .release-server_creds -%patch45 -p1 -b .obsolete-macro +#%patch45 -p1 -b .obsolete-macro %patch46 -p1 -b .size_t -%patch47 -p1 -b .ppc +#%patch47 -p1 -b .ppc %patch48 -p1 -b .keytab %patch49 -p1 -b .md5global.h %patch50 -p1 -b .gssapi %patch51 -p1 -b .sql -%patch52 -p1 -b .configerr -%patch53 -p1 -b .sha1vsplain -%patch54 -p1 -b .leak +#%patch52 -p1 -b .configerr +#%patch53 -p1 -b .sha1vsplain +#%patch54 -p1 -b .leak %patch55 -p1 -b .man-unprivileged -%patch56 -p1 -b .too-much-logging +#%patch56 -p1 -b .too-much-logging %patch57 -p1 -b .openssl110 %patch58 -p1 -b .spnego %patch59 -p1 -b .mutex