| diff -up cyrus-sasl-2.1.26/include/Makefile.am.md5global.h cyrus-sasl-2.1.26/include/Makefile.am |
| |
| |
| @@ -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 |
| |
| -noinst_PROGRAMS = makemd5 |
| - |
| -makemd5_SOURCES = makemd5.c |
| - |
| -md5global.h: makemd5 |
| - -rm -f md5global.h |
| - ./makemd5 md5global.h |
| - |
| EXTRA_DIST = NTMakefile |
| -DISTCLEANFILES = md5global.h |
| |
| 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 |
| |
| |
| @@ -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 @@ |
| ################################################################ |
| |
| |
| - |
| VPATH = @srcdir@ |
| pkgdatadir = $(datadir)/@PACKAGE@ |
| pkgincludedir = $(includedir)/@PACKAGE@ |
| @@ -81,48 +80,19 @@ 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 \ |
| - $(top_srcdir)/cmulocal/berkdb.m4 \ |
| - $(top_srcdir)/cmulocal/bsd_sockets.m4 \ |
| - $(top_srcdir)/cmulocal/c-attribute.m4 \ |
| - $(top_srcdir)/cmulocal/common.m4 \ |
| - $(top_srcdir)/cmulocal/cyrus.m4 \ |
| - $(top_srcdir)/cmulocal/init_automake.m4 \ |
| - $(top_srcdir)/cmulocal/ipv6.m4 \ |
| - $(top_srcdir)/cmulocal/openldap.m4 \ |
| - $(top_srcdir)/cmulocal/openssl.m4 \ |
| - $(top_srcdir)/cmulocal/sasl2.m4 $(top_srcdir)/configure.in |
| +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 |
| CONFIG_HEADER = $(top_builddir)/config.h |
| CONFIG_CLEAN_FILES = |
| CONFIG_CLEAN_VPATH_FILES = |
| -PROGRAMS = $(noinst_PROGRAMS) |
| -am_makemd5_OBJECTS = makemd5.$(OBJEXT) |
| -makemd5_OBJECTS = $(am_makemd5_OBJECTS) |
| -makemd5_LDADD = $(LDADD) |
| -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) |
| -CCLD = $(CC) |
| -LINK = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ |
| - $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ |
| -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@ |
| CC = @CC@ |
| CCDEPMODE = @CCDEPMODE@ |
| CFLAGS = @CFLAGS@ |
| -CMU_LIB_SUBDIR = @CMU_LIB_SUBDIR@ |
| 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@ |
| 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@ |
| PACKAGE_VERSION = @PACKAGE_VERSION@ |
| PASSDSS_LIBS = @PASSDSS_LIBS@ |
| PATH_SEPARATOR = @PATH_SEPARATOR@ |
| -PLAIN_LIBS = @PLAIN_LIBS@ |
| PURECOV = @PURECOV@ |
| PURIFY = @PURIFY@ |
| PWCHECKMETH = @PWCHECKMETH@ |
| RANLIB = @RANLIB@ |
| -SASL_DB_BACKEND = @SASL_DB_BACKEND@ |
| -SASL_DB_BACKEND_STATIC = @SASL_DB_BACKEND_STATIC@ |
| -SASL_DB_INC = @SASL_DB_INC@ |
| -SASL_DB_LIB = @SASL_DB_LIB@ |
| -SASL_DB_MANS = @SASL_DB_MANS@ |
| -SASL_DB_UTILS = @SASL_DB_UTILS@ |
| SASL_DL_LIB = @SASL_DL_LIB@ |
| -SASL_KRB_LIB = @SASL_KRB_LIB@ |
| 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@ |
| libexecdir = @libexecdir@ |
| localedir = @localedir@ |
| localstatedir = @localstatedir@ |
| +lt_ECHO = @lt_ECHO@ |
| mandir = @mandir@ |
| mkdir_p = @mkdir_p@ |
| oldincludedir = @oldincludedir@ |
| @@ -311,16 +280,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 |
| -makemd5_SOURCES = makemd5.c |
| EXTRA_DIST = NTMakefile |
| -DISTCLEANFILES = md5global.h |
| @MACOSX_TRUE@framedir = /Library/Frameworks/SASL2.framework |
| @MACOSX_TRUE@frameheaderdir = $(framedir)/Versions/A/Headers |
| @MACOSX_TRUE@frameheader_DATA = $(saslinclude_HEADERS) |
| all: all-am |
| |
| .SUFFIXES: |
| -.SUFFIXES: .c .lo .o .obj |
| $(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) |
| cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
| $(am__aclocal_m4_deps): |
| |
| -clean-noinstPROGRAMS: |
| - @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ |
| - echo " rm -f" $$list; \ |
| - rm -f $$list || exit $$?; \ |
| - test -n "$(EXEEXT)" || exit 0; \ |
| - 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) |
| - @rm -f makemd5$(EXEEXT) |
| - $(LINK) $(makemd5_OBJECTS) $(makemd5_LDADD) $(LIBS) |
| - |
| -mostlyclean-compile: |
| - -rm -f *.$(OBJEXT) |
| - |
| -distclean-compile: |
| - -rm -f *.tab.c |
| - |
| -@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@ |
| -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
| -@am__fastdepCC_FALSE@ $(COMPILE) -c $< |
| - |
| -.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@ |
| -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
| -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(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@ |
| -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
| -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< |
| - |
| mostlyclean-libtool: |
| -rm -f *.lo |
| |
| @@ -523,7 +448,7 @@ distdir: $(DISTFILES) |
| done |
| check-am: all-am |
| check: check-am |
| -all-am: Makefile $(PROGRAMS) $(DATA) $(HEADERS) |
| +all-am: Makefile $(DATA) $(HEADERS) |
| installdirs: |
| for dir in "$(DESTDIR)$(frameheaderdir)" "$(DESTDIR)$(saslincludedir)"; do \ |
| test -z "$$dir" || $(MKDIR_P) "$$dir"; \ |
| @@ -549,21 +474,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) |
| - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) |
| |
| maintainer-clean-generic: |
| @echo "This command is intended for maintainers to use" |
| @echo "it deletes files that may require special tools to rebuild." |
| clean: clean-am |
| |
| -clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \ |
| - mostlyclean-am |
| +clean-am: clean-generic clean-libtool mostlyclean-am |
| |
| distclean: distclean-am |
| - -rm -rf ./$(DEPDIR) |
| -rm -f Makefile |
| -distclean-am: clean-am distclean-compile distclean-generic \ |
| - distclean-tags |
| +distclean-am: clean-am distclean-generic distclean-tags |
| |
| dvi: dvi-am |
| |
| @@ -606,14 +527,12 @@ install-ps-am: |
| installcheck-am: |
| |
| maintainer-clean: maintainer-clean-am |
| - -rm -rf ./$(DEPDIR) |
| -rm -f Makefile |
| maintainer-clean-am: distclean-am maintainer-clean-generic |
| |
| mostlyclean: mostlyclean-am |
| |
| -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ |
| - mostlyclean-libtool |
| +mostlyclean-am: mostlyclean-generic mostlyclean-libtool |
| |
| 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 |
| |
| |
| -md5global.h: makemd5 |
| - -rm -f md5global.h |
| - ./makemd5 md5global.h |
| - |
| # 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 |
| |
| |
| @@ -15,14 +15,17 @@ The following makes PROTOTYPES default t |
| /* POINTER defines a generic pointer type */ |
| typedef unsigned char *POINTER; |
| |
| -typedef signed char INT1; /* 8 bits */ |
| -typedef short INT2; /* 16 bits */ |
| -typedef int INT4; /* 32 bits */ |
| -/* There is no 64 bit type */ |
| -typedef unsigned char UINT1; /* 8 bits */ |
| -typedef unsigned short UINT2; /* 16 bits */ |
| -typedef unsigned int UINT4; /* 32 bits */ |
| -/* There is no 64 bit type */ |
| +/* We try to define integer types for our use */ |
| +#include <inttypes.h> |
| + |
| +typedef int8_t INT1; /* 8 bits */ |
| +typedef int16_t INT2; /* 16 bits */ |
| +typedef int32_t INT4; /* 32 bits */ |
| +typedef int64_t INT8; /* 64 bits */ |
| +typedef uint8_t UINT1; /* 8 bits */ |
| +typedef uint16_t UINT2; /* 16 bits */ |
| +typedef uint32_t UINT4; /* 32 bits */ |
| +typedef uint64_t UINT8; /* 64 bits */ |
| |
| /* PROTO_LIST is defined depending on how PROTOTYPES is defined above. |
| If using PROTOTYPES, then PROTO_LIST returns the list, otherwise it |