Get rid of unused or obsolete patches and rebase to latest version

2015-11-23 15:15:50 +01:00 · 2015-11-23 15:15:50 +01:00 · afec5218b7
parent 9257446cc4
commit afec5218b7
6 changed files with 263 additions and 1467 deletions
--- 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
+ [1mFILES[0m
 -     /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
--- a/cyrus-sasl-2.1.21-sizes.patch
+++ b/cyrus-sasl-2.1.21-sizes.patch
@ -1,9 +1,7 @@
-Prefer types in <inttypes.h> 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);
 
--- 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 <inttypes.h>
 +
--- 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);
--- a/cyrus-sasl-2.1.26-sql.patch
+++ b/cyrus-sasl-2.1.26-sql.patch
--- 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