diff -Nru opendkim-2.6.2/Makefile.in opendkim-2.6.8/Makefile.in --- opendkim-2.6.2/Makefile.in 2012-07-02 17:59:47.000000000 +0000 +++ opendkim-2.6.8/Makefile.in 2012-10-24 21:54:41.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -20,6 +19,23 @@ # $Id: Makefile.am,v 1.61 2010/10/25 17:13:17 cm-msk Exp $ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -48,10 +64,15 @@ subdir = . DIST_COMMON = README $(am__configure_deps) $(dist_doc_DATA) \ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/build-config.h.in $(top_srcdir)/configure INSTALL \ - build-aux/README build-aux/compile build-aux/config.guess \ - build-aux/config.sub build-aux/depcomp build-aux/install-sh \ - build-aux/ltmain.sh build-aux/missing + $(srcdir)/build-config.h.in $(top_srcdir)/build-aux/compile \ + $(top_srcdir)/build-aux/config.guess \ + $(top_srcdir)/build-aux/config.sub \ + $(top_srcdir)/build-aux/install-sh \ + $(top_srcdir)/build-aux/ltmain.sh \ + $(top_srcdir)/build-aux/missing $(top_srcdir)/configure \ + INSTALL build-aux/README build-aux/compile \ + build-aux/config.guess build-aux/config.sub build-aux/depcomp \ + build-aux/install-sh build-aux/ltmain.sh build-aux/missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_pthread.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -74,6 +95,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -95,24 +121,34 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(docdir)" DATA = $(dist_doc_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir dist dist-all distcheck + cscope distdir dist dist-all distcheck ETAGS = etags CTAGS = ctags +CSCOPE = cscope DIST_SUBDIRS = libar libopendkim contrib docs libvbr librbl libdkimrep \ miltertest stats libut reputation opendkim DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) am__remove_distdir = \ - { test ! -d "$(distdir)" \ - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr "$(distdir)"; }; } + if test -d "$(distdir)"; then \ + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -rf "$(distdir)" \ + || { sleep 5 && rm -rf "$(distdir)"; }; \ + else :; fi +am__post_remove_distdir = $(am__remove_distdir) am__relativize = \ dir0=`pwd`; \ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ @@ -140,7 +176,10 @@ reldir="$$dir2" DIST_ARCHIVES = $(distdir).tar.gz GZIP_ENV = --best +DIST_TARGETS = dist-gzip distuninstallcheck_listfiles = find . -type f -print +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ ADSP_LISTS_MANNOTICE = @ADSP_LISTS_MANNOTICE@ @@ -387,7 +426,7 @@ $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: -am--refresh: +am--refresh: Makefile @: $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ @@ -423,10 +462,8 @@ $(am__aclocal_m4_deps): build-config.h: stamp-h1 - @if test ! -f $@; then \ - rm -f stamp-h1; \ - $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ - else :; fi + @if test ! -f $@; then rm -f stamp-h1; else :; fi + @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi stamp-h1: $(srcdir)/build-config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -449,8 +486,11 @@ -rm -f libtool config.lt install-dist_docDATA: $(dist_doc_DATA) @$(NORMAL_INSTALL) - test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)" @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -464,17 +504,15 @@ @$(NORMAL_UNINSTALL) @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(docdir)" && rm -f $$files + dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -484,7 +522,11 @@ done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -498,37 +540,6 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ @@ -537,6 +548,10 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done +cscopelist-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -600,8 +615,32 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscope: cscope.files + test ! -s cscope.files \ + || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) + +clean-cscope: + -rm -f cscope.files + +cscope.files: clean-cscope cscopelist-recursive cscopelist + +cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f cscope.out cscope.in.out cscope.po.out cscope.files distdir: $(DISTFILES) $(am__remove_distdir) @@ -637,13 +676,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -675,36 +711,36 @@ || chmod -R a+r "$(distdir)" dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 + $(am__post_remove_distdir) -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) +dist-lzip: distdir + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz + $(am__post_remove_distdir) dist-xz: distdir - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz - $(am__remove_distdir) + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz + $(am__post_remove_distdir) dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) + $(am__post_remove_distdir) dist-shar: distdir shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-zip: distdir -rm -f $(distdir).zip zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) + $(am__post_remove_distdir) -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) +dist dist-all: + $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' + $(am__post_remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another @@ -715,8 +751,8 @@ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.lz*) \ + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ @@ -726,7 +762,7 @@ *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) + chmod -R a-w $(distdir); chmod u+w $(distdir) mkdir $(distdir)/_build mkdir $(distdir)/_inst chmod a-w $(distdir) @@ -736,6 +772,7 @@ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ @@ -759,13 +796,21 @@ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ && cd "$$am__cwd" \ || exit 1 - $(am__remove_distdir) + $(am__post_remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: - @$(am__cd) '$(distuninstallcheck_dir)' \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + @test -n '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: trying to run $@ with an empty' \ + '$$(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + $(am__cd) '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ || { echo "ERROR: files left after uninstall:" ; \ if test -n "$(DESTDIR)"; then \ echo " (check DESTDIR support)"; \ @@ -799,10 +844,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -886,16 +936,18 @@ uninstall-am: uninstall-dist_docDATA .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ - ctags-recursive install-am install-strip tags-recursive + cscopelist-recursive ctags-recursive install-am install-strip \ + tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-am clean clean-generic \ - clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ - dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-xz \ - dist-zip distcheck distclean distclean-generic distclean-hdr \ - distclean-libtool distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am \ + all all-am am--refresh check check-am clean clean-cscope \ + clean-generic clean-libtool cscope cscopelist \ + cscopelist-recursive ctags ctags-recursive dist dist-all \ + dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar dist-tarZ \ + dist-xz dist-zip distcheck distclean distclean-generic \ + distclean-hdr distclean-libtool distclean-tags distcleancheck \ + distdir distuninstallcheck dvi dvi-am html html-am info \ + info-am install install-am install-data install-data-am \ install-dist_docDATA install-dvi install-dvi-am install-exec \ install-exec-am install-html install-html-am install-info \ install-info-am install-man install-pdf install-pdf-am \ diff -Nru opendkim-2.6.2/RELEASE_NOTES opendkim-2.6.8/RELEASE_NOTES --- opendkim-2.6.2/RELEASE_NOTES 2012-07-02 18:12:01.000000000 +0000 +++ opendkim-2.6.8/RELEASE_NOTES 2012-10-24 22:02:45.000000000 +0000 @@ -5,6 +5,59 @@ This listing shows the versions of the OpenDKIM package, the date of release, and a summary of the changes in that release. +2.6.8 2012/10/24 + Add "MinimumKeyBits" configuration file item. + LIBOPENDKIM: Feature request #SF3559744: Add library option + DKIM_OPTS_MINKEYBITS allowing one to specify a minimum + number of key bits for acceptable signatures. + +2.6.7 2012/07/23 + Fix input handling for file data sets for the macro case. Problem + noted by Allan Wind. + Ensure NULL-termination of macro value tests. + STATS: Fix hang bug in opendkim-reportstats. Problem noted by + Todd Lyons. + STATS: Fix bug #SF3547363: Fix "Top 10" and DNSSEC trend reports. + Problem noted by Andreas Schulze. + +2.6.6 2012/07/18 + LIBAR: Fix bug #SF3544522: Not all systems define a "_len" member for + the sockaddr structures. Reported by Stevan Bajic. + LIBOPENDKIM: Fix bug #SF3545490: If the body handed to the library was + missing a trailing line terminator, then dkim_canon_closebody() + would end the hashes with some data not included. Now, if + DKIM_LIBFLAGS_FIXCRLF is set, it will detect this condition + and correct it; if not, an error is returned. Problem noted + by James Erickson. + LIBOPENDKIM: If the job ID passed in during handle creation includes + slashes and temporary file creation is enabled, convert the + slashes to dots in the temporary file template. Problem + noted by James Erickson. + +2.6.5 2012/07/14 + Swap order of "header.d" and "header.i" values in + Authentication-Results fields. + BUILD: Fix bug #SF3543282: Corrections to Darwin/libar build adjustment + made in 2.6.3. Problem noted by Daniel J. Luke. + +2.6.4 2012/07/12 + Feature request #SF3542099: Include "header.d" in all + Authentication-Results fields, not just "header.i". This + makes life easier for users of OpenDMARC. + BUILD: Fix SHA256 test on some systems. Problem noted by James + Erickson. + +2.6.3 2012/07/11 + Add "ResolvConf" setting, allowing the ability to pass a + resolv.conf-like file to unbound to allow specific nameservers + to be used instead of the default. + LIBOPENDKIM: Return the correct error code when a SHA1-only library + encounters a SHA1 signature that references a SHA256-only key. + Problem noted by Andrew Birchall. + LIBAR: Add ar_resolvconf(). + BUILD: Fix bug #SF3538676: Build with -DDARWIN on MacOSX, and default + to arlib if unbound isn't selected. Patch from Daniel J. Luke. + 2.6.2 2012/07/02 Fix build confusion between _FFR_RATE_LIMIT and _FFR_RESIGN. Problem noted by Rolf Sonneveld. diff -Nru opendkim-2.6.2/aclocal.m4 opendkim-2.6.8/aclocal.m4 --- opendkim-2.6.2/aclocal.m4 2012-07-02 17:59:37.000000000 +0000 +++ opendkim-2.6.8/aclocal.m4 2012-10-24 21:54:35.000000000 +0000 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- +# generated automatically by aclocal 1.12.2 -*- Autoconf -*- + +# Copyright (C) 1996-2012 Free Software Foundation, Inc. -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,11 +13,11 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, -[m4_warning([this file was generated for autoconf 2.68. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, +[m4_warning([this file was generated for autoconf 2.69. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. -To do so, use the procedure documented by the package, typically `autoreconf'.])]) +To do so, use the procedure documented by the package, typically 'autoreconf'.])]) # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- # serial 1 (pkg-config-0.24) @@ -177,22 +177,24 @@ fi[]dnl ])# PKG_CHECK_MODULES -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2002-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 8 + # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.11' +[am__api_version='1.12' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.1], [], +m4_if([$1], [1.12.2], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -208,22 +210,24 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.1])dnl +[AM_AUTOMAKE_VERSION([1.12.2])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 2 + # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. # # Of course, Automake must honor this variable whenever it calls a # tool from the auxiliary directory. The problem is that $srcdir (and @@ -242,7 +246,7 @@ # # The reason of the latter failure is that $top_srcdir and $ac_aux_dir # are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you +# harmless because $srcdir is '.', but things will broke when you # start a VPATH build or use an absolute $srcdir. # # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, @@ -268,22 +272,21 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 9 +# serial 10 # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- # Define a conditional. AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +[AC_PREREQ([2.52])dnl + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl AC_SUBST([$1_TRUE])dnl AC_SUBST([$1_FALSE])dnl _AM_SUBST_NOTMAKE([$1_TRUE])dnl @@ -302,16 +305,15 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 10 +# serial 17 -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, # will think it sees a *use*, and therefore will trigger all it's # C support machinery. Also note that it means that autoscan, seeing @@ -321,7 +323,7 @@ # _AM_DEPENDENCIES(NAME) # ---------------------- # See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". # We try a few techniques and use that to set a single cache variable. # # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was @@ -334,12 +336,13 @@ AC_REQUIRE([AM_MAKE_INCLUDE])dnl AC_REQUIRE([AM_DEP_TRACK])dnl -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], UPC, [depcc="$UPC" am_compiler_list=], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], + [$1], [CXX], [depcc="$CXX" am_compiler_list=], + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], + [$1], [UPC], [depcc="$UPC" am_compiler_list=], + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) AC_CACHE_CHECK([dependency style of $depcc], [am_cv_$1_dependencies_compiler_type], @@ -347,8 +350,9 @@ # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -387,16 +391,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -405,16 +409,16 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -462,7 +466,7 @@ # AM_SET_DEPDIR # ------------- # Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES +# This macro is AC_REQUIREd in _AM_DEPENDENCIES. AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl @@ -472,28 +476,34 @@ # AM_DEP_TRACK # ------------ AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) +[AC_ARG_ENABLE([dependency-tracking], [dnl +AS_HELP_STRING( + [--enable-dependency-tracking], + [do not reject slow dependency extractors]) +AS_HELP_STRING( + [--disable-dependency-tracking], + [speeds up one-time build])]) if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) AC_SUBST([AMDEPBACKSLASH])dnl _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +AC_SUBST([am__nodep])dnl +_AM_SUBST_NOTMAKE([am__nodep])dnl ]) # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -#serial 5 +# serial 6 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ @@ -512,7 +522,7 @@ # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -524,21 +534,19 @@ continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` test -z "am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`AS_DIRNAME(["$file"])` @@ -556,7 +564,7 @@ # This macro should only be invoked once -- use via AC_REQUIRE. # # This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will +# is enabled. FIXME. This creates each '.P' file that we will # need in order to bootstrap the dependency handling code. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], @@ -566,14 +574,13 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 16 +# serial 19 # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -619,31 +626,41 @@ # Define the identity of the package. dnl Distinguish between old-style and new-style calls. m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl +[AC_DIAGNOSE([obsolete], +[$0: two- and three-arguments forms are deprecated. For more info, see: +http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_INIT_AUTOMAKE-invocation]) +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([VERSION], [$2])], [_AM_SET_OPTIONS([$1])dnl dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, +m4_if( + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + [ok:ok],, [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl _AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl # Some tools Automake needs. AC_REQUIRE([AM_SANITY_CHECK])dnl AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) +AM_MISSING_PROG([AUTOCONF], [autoconf]) +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) +AM_MISSING_PROG([AUTOHEADER], [autoheader]) +AM_MISSING_PROG([MAKEINFO], [makeinfo]) AC_REQUIRE([AM_PROG_INSTALL_SH])dnl AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl -AC_REQUIRE([AM_PROG_MKDIR_P])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) # We need awk for the "check" target. The system "awk" is bad on # some platforms. AC_REQUIRE([AC_PROG_AWK])dnl @@ -654,28 +671,35 @@ [_AM_PROG_TAR([v7])])]) _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl + [_AM_DEPENDENCIES([CC])], + [m4_define([AC_PROG_CC], + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl + [_AM_DEPENDENCIES([CXX])], + [m4_define([AC_PROG_CXX], + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl + [_AM_DEPENDENCIES([OBJC])], + [m4_define([AC_PROG_OBJC], + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl +dnl Support for Objective C++ was only introduced in Autoconf 2.65, +dnl but we still cater to Autoconf 2.62. +m4_ifdef([AC_PROG_OBJCXX], +[AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [_AM_DEPENDENCIES([OBJCXX])], + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])])dnl ]) _AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -dnl The `parallel-tests' driver may need to know about EXEEXT, so add the -dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro +dnl The 'parallel-tests' driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl ]) -dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further dnl mangled by Autoconf and run in a shell conditional statement. m4_define([_AC_COMPILER_EXEEXT], @@ -703,12 +727,14 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 8 + # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. @@ -722,9 +748,9 @@ install_sh="\${SHELL} $am_aux_dir/install-sh" esac fi -AC_SUBST(install_sh)]) +AC_SUBST([install_sh])]) -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2003-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -747,13 +773,13 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. +# Copyright (C) 2001-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 +# serial 5 # AM_MAKE_INCLUDE() # ----------------- @@ -772,7 +798,7 @@ _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -797,8 +823,7 @@ rm -f confinc confmf ]) -# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -834,14 +859,13 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 6 +# serial 7 # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ @@ -871,45 +895,19 @@ am_missing_run="$MISSING --run " else am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) + AC_MSG_WARN(['missing' script is too old or missing]) fi ]) -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_MKDIR_P -# --------------- -# Check for `mkdir -p'. -AC_DEFUN([AM_PROG_MKDIR_P], -[AC_PREREQ([2.60])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -dnl while keeping a definition of mkdir_p for backward compatibility. -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -dnl Makefile.ins that do not define MKDIR_P, so we do our own -dnl adjustment using top_builddir (which is defined more often than -dnl MKDIR_P). -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -case $mkdir_p in - [[\\/$]]* | ?:[[\\/]]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac -]) - # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 +# serial 6 # _AM_MANGLE_OPTION(NAME) # ----------------------- @@ -917,13 +915,13 @@ [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) # _AM_SET_OPTION(NAME) -# ------------------------------ +# -------------------- # Set option NAME. Presently that only means defining a flag for this option. AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) # _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- +# ------------------------ # OPTIONS is a space-separated list of Automake options. AC_DEFUN([_AM_SET_OPTIONS], [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) @@ -936,22 +934,18 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1996-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 +# serial 9 # AM_SANITY_CHECK # --------------- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -962,32 +956,40 @@ esac case $srcdir in *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi - + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken + alias in your environment]) + fi + if test "$[2]" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$[2]" = conftest.file ) then @@ -997,43 +999,61 @@ AC_MSG_ERROR([newly created file is older than distributed files! Check your system clock]) fi -AC_MSG_RESULT(yes)]) +AC_MSG_RESULT([yes]) +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi +AC_CONFIG_COMMANDS_PRE( + [AC_MSG_CHECKING([that generated files are newer than configure]) + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + AC_MSG_RESULT([done])]) +rm -f conftest.file +]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 2 + # AM_PROG_INSTALL_STRIP # --------------------- -# One issue with vendor `install' (even GNU) is that you can't +# One issue with vendor 'install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip # is unlikely to handle the host's binaries. # Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize +# always use install-sh in "make install-strip", and initialize # STRIPPROG with the value of the STRIP variable (set by the user). AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +# will honor the 'STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. if test "$cross_compiling" != no; then AC_CHECK_TOOL([STRIP], [strip], :) fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. +# Copyright (C) 2006-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 +# serial 3 # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- @@ -1042,24 +1062,24 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- +# -------------------------- # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2004-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 +# serial 3 # _AM_PROG_TAR(FORMAT) # -------------------- # Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. +# FORMAT should be one of 'v7', 'ustar', or 'pax'. # # Substitute a variable $(am__tar) that is a command # writing to stdout a FORMAT-tarball containing the directory @@ -1070,10 +1090,11 @@ # a tarball read from stdin. # $(am__untar) < result.tar AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [tar]) +[# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AC_SUBST([AMTAR], ['$${TAR-tar}']) m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], [m4_case([$1], [ustar],, [pax],, [m4_fatal([Unknown tar format])]) AC_MSG_CHECKING([how to create a $1 tar archive]) @@ -1081,7 +1102,7 @@ _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' _am_tools=${am_cv_prog_tar_$1-$_am_tools} # Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. +# Solaris sh will not grok spaces in the rhs of '-'. for _am_tool in $_am_tools do case $_am_tool in diff -Nru opendkim-2.6.2/build-aux/compile opendkim-2.6.8/build-aux/compile --- opendkim-2.6.2/build-aux/compile 2011-08-24 18:32:07.000000000 +0000 +++ opendkim-2.6.8/build-aux/compile 2012-10-11 07:28:57.000000000 +0000 @@ -1,10 +1,9 @@ #! /bin/sh -# Wrapper for compilers which do not understand `-c -o'. +# Wrapper for compilers which do not understand '-c -o'. -scriptversion=2009-10-06.20; # UTC +scriptversion=2012-03-05.13; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software -# Foundation, Inc. +# Copyright (C) 1999-2012 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -29,21 +28,219 @@ # bugs to or send patches to # . +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + case $1 in '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + echo "$0: No command. Try '$0 --help' for more information." 1>&2 exit 1; ;; -h | --h*) cat <<\EOF Usage: compile [--help] [--version] PROGRAM [ARGS] -Wrapper for compilers which do not understand `-c -o'. -Remove `-o dest.o' from ARGS, run PROGRAM with the remaining +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining arguments, and rename the output as expected. If you are trying to build a whole package this is not the -right script to run: please start by reading the file `INSTALL'. +right script to run: please start by reading the file 'INSTALL'. Report bugs to . EOF @@ -53,11 +250,13 @@ echo "compile $scriptversion" exit $? ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; esac ofile= cfile= -eat= for arg do @@ -66,8 +265,8 @@ else case $1 in -o) - # configure might choose to run compile as `compile cc -o foo foo.c'. - # So we strip `-o arg' only if arg is an object. + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. eat=1 case $2 in *.o | *.obj) @@ -94,10 +293,10 @@ done if test -z "$ofile" || test -z "$cfile"; then - # If no `-o' option was seen then we might have been invoked from a + # If no '-o' option was seen then we might have been invoked from a # pattern rule where we don't need one. That is ok -- this is a # normal compilation that the losing compiler can handle. If no - # `.c' file was seen then we are probably linking. That is also + # '.c' file was seen then we are probably linking. That is also # ok. exec "$@" fi @@ -106,7 +305,7 @@ cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` # Create the lock directory. -# Note: use `[/\\:.-]' here to ensure that we don't use the same name +# Note: use '[/\\:.-]' here to ensure that we don't use the same name # that we are using for the .o file. Also, base the name on the expected # object file name, since that is what matters with a parallel build. lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d diff -Nru opendkim-2.6.2/build-aux/depcomp opendkim-2.6.8/build-aux/depcomp --- opendkim-2.6.2/build-aux/depcomp 2011-08-24 18:32:08.000000000 +0000 +++ opendkim-2.6.8/build-aux/depcomp 2012-10-11 07:28:58.000000000 +0000 @@ -1,10 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2009-04-28.21; # UTC +scriptversion=2012-03-27.16; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free -# Software Foundation, Inc. +# Copyright (C) 1999-2012 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -28,7 +27,7 @@ case $1 in '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + echo "$0: No command. Try '$0 --help' for more information." 1>&2 exit 1; ;; -h | --h*) @@ -40,11 +39,11 @@ Environment variables: depmode Dependency tracking mode. - source Source file read by `PROGRAMS ARGS'. - object Object file output by `PROGRAMS ARGS'. + source Source file read by 'PROGRAMS ARGS'. + object Object file output by 'PROGRAMS ARGS'. DEPDIR directory where to store dependencies. depfile Dependency file to output. - tmpdepfile Temporary file to use when outputing dependencies. + tmpdepfile Temporary file to use when outputting dependencies. libtool Whether libtool is used (yes/no). Report bugs to . @@ -57,6 +56,12 @@ ;; esac +# A tabulation character. +tab=' ' +# A newline character. +nl=' +' + if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 exit 1 @@ -90,10 +95,24 @@ # This is just like msvisualcpp but w/o cygpath translation. # Just convert the backslash-escaped backslashes to single forward # slashes to satisfy depend.m4 - cygpath_u="sed s,\\\\\\\\,/,g" + cygpath_u='sed s,\\\\,/,g' depmode=msvisualcpp fi +if test "$depmode" = msvc7msys; then + # This is just like msvc7 but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvc7 +fi + +if test "$depmode" = xlc; then + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations. + gccflag=-qmakedep=gcc,-MF + depmode=gcc +fi + case "$depmode" in gcc3) ## gcc 3 implements dependency tracking that does exactly what @@ -148,20 +167,21 @@ ## The second -e expression handles DOS-style file names with drive letters. sed -e 's/^[^:]*: / /' \ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the `deleted header file' problem. +## This next piece of magic avoids the "deleted header file" problem. ## The problem is that when a header file which appears in a .P file ## is deleted, the dependency causes make to die (because there is ## typically no way to rebuild the header). We avoid this by adding ## dummy dependencies for each header file. Too bad gcc doesn't do ## this for us directly. - tr ' ' ' -' < "$tmpdepfile" | -## Some versions of gcc put a space before the `:'. On the theory + tr ' ' "$nl" < "$tmpdepfile" | +## Some versions of gcc put a space before the ':'. On the theory ## that the space means something, we add a space to the output as -## well. +## well. hp depmode also adds that space, but also prefixes the VPATH +## to the object. Take care to not repeat it in the output. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -193,18 +213,15 @@ # clever and replace this with sed code, as IRIX sed won't handle # lines with more than a fixed number of characters (4096 in # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like `#:fec' to the end of the + # the IRIX cc adds comments like '#:fec' to the end of the # dependency line. - tr ' ' ' -' < "$tmpdepfile" \ + tr ' ' "$nl" < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr ' -' ' ' >> "$depfile" + tr "$nl" ' ' >> "$depfile" echo >> "$depfile" # The second pass generates a dummy entry for each header file. - tr ' ' ' -' < "$tmpdepfile" \ + tr ' ' "$nl" < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ >> "$depfile" else @@ -216,10 +233,17 @@ rm -f "$tmpdepfile" ;; +xlc) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + aix) # The C for AIX Compiler uses -M and outputs the dependencies # in a .u file. In older versions, this file always lives in the - # current directory. Also, the AIX compiler puts `$object:' at the + # current directory. Also, the AIX compiler puts '$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` @@ -249,12 +273,11 @@ test -f "$tmpdepfile" && break done if test -f "$tmpdepfile"; then - # Each line is of the form `foo.o: dependent.h'. + # Each line is of the form 'foo.o: dependent.h'. # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. + # '$object: dependent.h' and one to simply 'dependent.h:'. sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else # The sourcefile does not contain any dependencies, so just # store a dummy comment line, to avoid errors with the Makefile @@ -265,23 +288,26 @@ ;; icc) - # Intel's C compiler understands `-MD -MF file'. However on - # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c + # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'. + # However on + # $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c # ICC 7.0 will fill foo.d with something like # foo.o: sub/foo.c # foo.o: sub/foo.h - # which is wrong. We want: + # which is wrong. We want # sub/foo.o: sub/foo.c # sub/foo.o: sub/foo.h # sub/foo.c: # sub/foo.h: # ICC 7.1 will output # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using \ : + # and will wrap long lines using '\': # foo.o: sub/foo.c ... \ # sub/foo.h ... \ # ... - + # tcc 0.9.26 (FIXME still under development at the moment of writing) + # will emit a similar output, but also prepend the continuation lines + # with horizontal tabulation characters. "$@" -MD -MF "$tmpdepfile" stat=$? if test $stat -eq 0; then : @@ -290,15 +316,21 @@ exit $stat fi rm -f "$depfile" - # Each line is of the form `foo.o: dependent.h', - # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. + # Each line is of the form 'foo.o: dependent.h', + # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'. # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" - # Some versions of the HPUX 10.20 sed can't process this invocation - # correctly. Breaking it into two sed invocations is a workaround. - sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | - sed -e 's/$/ :/' >> "$depfile" + # '$object: dependent.h' and one to simply 'dependent.h:'. + sed -e "s/^[ $tab][ $tab]*/ /" -e "s,^[^:]*:,$object :," \ + < "$tmpdepfile" > "$depfile" + sed ' + s/[ '"$tab"'][ '"$tab"']*/ /g + s/^ *// + s/ *\\*$// + s/^[^:]*: *// + /^$/d + /:$/d + s/$/ :/ + ' < "$tmpdepfile" >> "$depfile" rm -f "$tmpdepfile" ;; @@ -334,7 +366,7 @@ done if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" - # Add `dependent.h:' lines. + # Add 'dependent.h:' lines. sed -ne '2,${ s/^ *// s/ \\*$// @@ -349,9 +381,9 @@ tru64) # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in `foo.d' instead, so we check for that too. + # dependencies in 'foo.d' instead, so we check for that too. # Subdirectories are respected. dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` test "x$dir" = "x$object" && dir= @@ -397,14 +429,59 @@ done if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else echo "#dummy" > "$depfile" fi rm -f "$tmpdepfile" ;; +msvc7) + if test "$libtool" = yes; then + showIncludes=-Wc,-showIncludes + else + showIncludes=-showIncludes + fi + "$@" $showIncludes > "$tmpdepfile" + stat=$? + grep -v '^Note: including file: ' "$tmpdepfile" + if test "$stat" = 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" + # The first sed program below extracts the file names and escapes + # backslashes for cygpath. The second sed program outputs the file + # name when reading, but also accumulates all include files in the + # hold buffer in order to output them again at the end. This only + # works with sed implementations that can handle large buffers. + sed < "$tmpdepfile" -n ' +/^Note: including file: *\(.*\)/ { + s//\1/ + s/\\/\\\\/g + p +}' | $cygpath_u | sort -u | sed -n ' +s/ /\\ /g +s/\(.*\)/'"$tab"'\1 \\/p +s/.\(.*\) \\/\1:/ +H +$ { + s/.*/'"$tab"'/ + G + p +}' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +msvc7msys) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + #nosideeffect) # This comment above is used by automake to tell side-effect # dependency tracking mechanisms from slower ones. @@ -422,7 +499,7 @@ shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -442,15 +519,14 @@ done test -z "$dashmflag" && dashmflag=-M - # Require at least two characters before searching for `:' + # Require at least two characters before searching for ':' # in the target name. This is to cope with DOS-style filenames: - # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. + # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. "$@" $dashmflag | - sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" + sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" - tr ' ' ' -' < "$tmpdepfile" | \ + tr ' ' "$nl" < "$tmpdepfile" | \ ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" @@ -503,9 +579,10 @@ touch "$tmpdepfile" ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' ' -' | \ + # makedepend may prepend the VPATH from the source file name to the object. + # No need to regex-escape $object, excess matching of '.' is harmless. + sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" + sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \ ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" @@ -525,7 +602,7 @@ shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -594,8 +671,8 @@ sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" - sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" - echo " " >> "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile" + echo "$tab" >> "$depfile" sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" rm -f "$tmpdepfile" ;; diff -Nru opendkim-2.6.2/build-aux/install-sh opendkim-2.6.8/build-aux/install-sh --- opendkim-2.6.2/build-aux/install-sh 2011-08-24 18:32:07.000000000 +0000 +++ opendkim-2.6.8/build-aux/install-sh 2012-10-11 07:28:57.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2009-04-28.21; # UTC +scriptversion=2011-11-20.07; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -35,7 +35,7 @@ # FSF changes to this file are in the public domain. # # Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it +# 'make' implicit rules from creating a file called install from it # when there is no Makefile. # # This script is compatible with the BSD install script, but was written @@ -156,6 +156,10 @@ -s) stripcmd=$stripprog;; -t) dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac shift;; -T) no_target_directory=true;; @@ -186,6 +190,10 @@ fi shift # arg dst_arg=$arg + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac done fi @@ -194,13 +202,17 @@ echo "$0: no input file specified." >&2 exit 1 fi - # It's OK to call `install-sh -d' without argument. + # It's OK to call 'install-sh -d' without argument. # This can happen when creating conditional directories. exit 0 fi if test -z "$dir_arg"; then - trap '(exit $?); exit' 1 2 13 15 + do_exit='(exit $ret); exit $ret' + trap "ret=129; $do_exit" 1 + trap "ret=130; $do_exit" 2 + trap "ret=141; $do_exit" 13 + trap "ret=143; $do_exit" 15 # Set umask so as not to create temps with too-generous modes. # However, 'strip' requires both read and write access to temps. @@ -228,9 +240,9 @@ for src do - # Protect names starting with `-'. + # Protect names problematic for 'test' and other utilities. case $src in - -*) src=./$src;; + -* | [=\(\)!]) src=./$src;; esac if test -n "$dir_arg"; then @@ -252,12 +264,7 @@ echo "$0: no destination specified." >&2 exit 1 fi - dst=$dst_arg - # Protect names starting with `-'. - case $dst in - -*) dst=./$dst;; - esac # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. @@ -347,7 +354,7 @@ if test -z "$dir_arg" || { # Check for POSIX incompatibilities with -m. # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writeable bit of parent directory when it shouldn't. + # other-writable bit of parent directory when it shouldn't. # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. ls_ld_tmpdir=`ls -ld "$tmpdir"` case $ls_ld_tmpdir in @@ -385,7 +392,7 @@ case $dstdir in /*) prefix='/';; - -*) prefix='./';; + [-=\(\)!]*) prefix='./';; *) prefix='';; esac @@ -403,7 +410,7 @@ for d do - test -z "$d" && continue + test X"$d" = X && continue prefix=$prefix$d if test -d "$prefix"; then diff -Nru opendkim-2.6.2/build-aux/missing opendkim-2.6.8/build-aux/missing --- opendkim-2.6.2/build-aux/missing 2011-08-24 18:32:07.000000000 +0000 +++ opendkim-2.6.8/build-aux/missing 2012-10-11 07:28:57.000000000 +0000 @@ -1,10 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2009-04-28.21; # UTC +scriptversion=2012-01-06.18; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996-2012 Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -26,7 +25,7 @@ # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "Try '$0 --help' for more information" exit 1 fi @@ -34,7 +33,7 @@ sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' sed_minuso='s/.* -o \([^ ]*\).*/\1/p' -# In the cases where this matters, `missing' is being run in the +# In the cases where this matters, 'missing' is being run in the # srcdir already. if test -f configure.ac; then configure_ac=configure.ac @@ -65,7 +64,7 @@ echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an +Handle 'PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an error status if there is no known handling for PROGRAM. Options: @@ -74,21 +73,20 @@ --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' + aclocal touch file 'aclocal.m4' + autoconf touch file 'configure' + autoheader touch file 'config.h.in' autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c + automake touch all 'Makefile.in' files + bison create 'y.tab.[ch]', if possible, from existing .[ch] + flex create 'lex.yy.c', if possible, from existing .c help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c + lex create 'lex.yy.c', if possible, from existing .c makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch] + yacc create 'y.tab.[ch]', if possible, from existing .[ch] -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. Send bug reports to ." exit $? @@ -100,8 +98,8 @@ ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: Unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; @@ -122,22 +120,13 @@ # Not GNU programs, they don't have --version. ;; - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 elif test "x$2" = "x--version" || test "x$2" = "x--help"; then # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether + # running '$TOOL --version' or '$TOOL --help' to check whether # $TOOL exists and not knowing $TOOL uses missing. exit 1 fi @@ -149,27 +138,27 @@ case $program in aclocal*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from +WARNING: '$1' is $msg. You should only need it if + you modified 'acinclude.m4' or '${configure_ac}'. You might want + to install the Automake and Perl packages. Grab them from any GNU archive site." touch aclocal.m4 ;; autoconf*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU +WARNING: '$1' is $msg. You should only need it if + you modified '${configure_ac}'. You might want to install the + Autoconf and GNU m4 packages. Grab them from any GNU archive site." touch configure ;; autoheader*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them +WARNING: '$1' is $msg. You should only need it if + you modified 'acconfig.h' or '${configure_ac}'. You might want + to install the Autoconf and GNU m4 packages. Grab them from any GNU archive site." files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` test -z "$files" && files="config.h" @@ -186,9 +175,9 @@ automake*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. +WARNING: '$1' is $msg. You should only need it if + you modified 'Makefile.am', 'acinclude.m4' or '${configure_ac}'. + You might want to install the Automake and Perl packages. Grab them from any GNU archive site." find . -type f -name Makefile.am -print | sed 's/\.am$/.in/' | @@ -197,10 +186,10 @@ autom4te*) echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. +WARNING: '$1' is needed, but is $msg. You might have modified some files without having the proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU + You can get '$1' as part of Autoconf from any GNU archive site." file=`echo "$*" | sed -n "$sed_output"` @@ -220,13 +209,13 @@ bison*|yacc*) echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package +WARNING: '$1' $msg. You should only need it if + you modified a '.y' file. You may need the Bison package in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." + Bison from any GNU archive site." rm -f y.tab.c y.tab.h if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` @@ -250,13 +239,13 @@ lex*|flex*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package +WARNING: '$1' is $msg. You should only need it if + you modified a '.l' file. You may need the Flex package in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." + Flex from any GNU archive site." rm -f lex.yy.c if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` @@ -273,10 +262,10 @@ help2man*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if +WARNING: '$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." + Help2man package in order for those modifications to take + effect. You can get Help2man from any GNU archive site." file=`echo "$*" | sed -n "$sed_output"` test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` @@ -291,12 +280,12 @@ makeinfo*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file +WARNING: '$1' is $msg. You should only need it if + you modified a '.texi' or '.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." + call might also be the consequence of using a buggy 'make' (AIX, + DU, IRIX). You might want to install the Texinfo package or + the GNU make package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... file=`echo "$*" | sed -n "$sed_output"` test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` @@ -318,49 +307,14 @@ touch $file ;; - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - *) echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. +WARNING: '$1' is needed, and is $msg. You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, + proper tools for further handling them. Check the 'README' file, it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." + some other package would contain this missing '$1' program." exit 1 ;; esac diff -Nru opendkim-2.6.2/build-config.h.in opendkim-2.6.8/build-config.h.in --- opendkim-2.6.2/build-config.h.in 2012-07-02 18:01:05.000000000 +0000 +++ opendkim-2.6.8/build-config.h.in 2012-10-24 21:54:40.000000000 +0000 @@ -150,6 +150,12 @@ /* Define to 1 if your crypto library has SHA256 support */ #undef HAVE_SHA256 +/* Define if sockaddr_in6 has a sin6_len member */ +#undef HAVE_SIN6_LEN + +/* Define if sockaddr_in has a sin_len member */ +#undef HAVE_SIN_LEN + /* Define if libmilter has smfi_insheader() */ #undef HAVE_SMFI_INSHEADER diff -Nru opendkim-2.6.2/configure opendkim-2.6.8/configure --- opendkim-2.6.2/configure 2012-07-02 17:59:41.000000000 +0000 +++ opendkim-2.6.8/configure 2012-10-24 21:54:39.000000000 +0000 @@ -1,13 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for OpenDKIM 2.6.2. +# Generated by GNU Autoconf 2.69 for OpenDKIM 2.6.8. # # Report bugs to . # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -136,6 +134,31 @@ # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -169,7 +192,8 @@ else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -222,21 +246,25 @@ if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -339,6 +367,14 @@ } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -460,6 +496,10 @@ chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -494,16 +534,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -515,28 +555,8 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -570,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='OpenDKIM' PACKAGE_TARNAME='opendkim' -PACKAGE_VERSION='2.6.2' -PACKAGE_STRING='OpenDKIM 2.6.2' +PACKAGE_VERSION='2.6.8' +PACKAGE_STRING='OpenDKIM 2.6.8' PACKAGE_BUGREPORT='bugs@opendkim.org' PACKAGE_URL='' @@ -626,6 +646,8 @@ LIBERL_MANNOTICE DOMAIN domainname +USE_ARLIB_FALSE +USE_ARLIB_TRUE LIVE_TESTS_FALSE LIVE_TESTS_TRUE LIBOPENDKIM_INC @@ -713,8 +735,6 @@ GNUTLS_CFLAGS DEBUG_FALSE DEBUG_TRUE -USE_ARLIB_FALSE -USE_ARLIB_TRUE ALL_SYMBOLS_FALSE ALL_SYMBOLS_TRUE QUERY_CACHE_MANNOTICE @@ -822,6 +842,7 @@ am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE +am__nodep AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE @@ -1458,8 +1479,6 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1545,7 +1564,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures OpenDKIM 2.6.2 to adapt to many kinds of systems. +\`configure' configures OpenDKIM 2.6.8 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1615,7 +1634,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenDKIM 2.6.2:";; + short | recursive ) echo "Configuration of OpenDKIM 2.6.8:";; esac cat <<\_ACEOF @@ -1623,8 +1642,10 @@ --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors + --enable-dependency-tracking + do not reject slow dependency extractors + --disable-dependency-tracking + speeds up one-time build --enable-shared[=PKGS] build shared libraries [default=yes] --enable-static[=PKGS] build static libraries [default=yes] --enable-fast-install[=PKGS] @@ -1824,10 +1845,10 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OpenDKIM configure 2.6.2 -generated by GNU Autoconf 2.68 +OpenDKIM configure 2.6.8 +generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1903,7 +1924,7 @@ test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -2268,7 +2289,8 @@ main () { static int test_array [1 - 2 * !((($ac_type) -1 >> ($2 / 2 - 1)) >> ($2 / 2 - 1) == 3)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2403,8 +2425,8 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by OpenDKIM $as_me 2.6.2, which was -generated by GNU Autoconf 2.68. Invocation command line was +It was created by OpenDKIM $as_me 2.6.8, which was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2784,7 +2806,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -am__api_version='1.11' +am__api_version='1.12' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -2823,7 +2845,7 @@ # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -2881,9 +2903,6 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 $as_echo_n "checking whether build environment is sane... " >&6; } -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -2894,32 +2913,40 @@ esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$*" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$*" != "X $srcdir/configure conftest.file" \ - && test "$*" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - as_fn_error $? "ls -t appears to fail. Make sure there is not a broken -alias in your environment" "$LINENO" 5 - fi + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken + alias in your environment" "$LINENO" 5 + fi + if test "$2" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$2" = conftest.file ) then @@ -2931,6 +2958,16 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi + +rm -f conftest.file + test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. @@ -2957,8 +2994,8 @@ am_missing_run="$MISSING --run " else am_missing_run= - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 -$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi if test x"${install_sh}" != xset; then @@ -2970,10 +3007,10 @@ esac fi -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. +# will honor the 'STRIP' environment variable to overrule this program. if test "$cross_compiling" != no; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. @@ -2992,7 +3029,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3032,7 +3069,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3083,7 +3120,7 @@ test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir (GNU coreutils) '* | \ 'mkdir (coreutils) '* | \ @@ -3112,12 +3149,6 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 $as_echo "$MKDIR_P" >&6; } -mkdir_p="$MKDIR_P" -case $mkdir_p in - [\\/$]* | ?:[\\/]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac - for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -3136,7 +3167,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3222,7 +3253,7 @@ # Define the identity of the package. PACKAGE='opendkim' - VERSION='2.6.2' + VERSION='2.6.8' cat >>confdefs.h <<_ACEOF @@ -3250,13 +3281,19 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +mkdir_p='$(MKDIR_P)' + # We need awk for the "check" target. The system "awk" is bad on # some platforms. -# Always define AMTAR for backward compatibility. - -AMTAR=${AMTAR-"${am_missing_run}tar"} +# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AMTAR='$${TAR-tar}' -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' +am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' @@ -3271,13 +3308,13 @@ # # Hexadecimal version, for use in generating dkim.h # -HEX_VERSION=$(printf %08x $(( ((2 << 8 | 6) << 8 | 2) << 8| 0 ))) +HEX_VERSION=$(printf %08x $(( ((2 << 8 | 6) << 8 | 8) << 8| 0 ))) # # library version, passed to libtool # -LIBOPENDKIM_VERSION_INFO=$(printf %d:%d:%d 7 0 0) +LIBOPENDKIM_VERSION_INFO=$(printf %d:%d:%d 7 3 0) # @@ -3305,7 +3342,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3345,7 +3382,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3398,7 +3435,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3439,7 +3476,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -3497,7 +3534,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3541,7 +3578,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3987,8 +4024,7 @@ /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -4091,7 +4127,7 @@ _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -4124,6 +4160,7 @@ if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi if test "x$enable_dependency_tracking" != xno; then AMDEP_TRUE= @@ -4146,8 +4183,9 @@ # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -4181,16 +4219,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -4199,16 +4237,16 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -4408,7 +4446,7 @@ return 0; } _ACEOF -for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -xc99=all -qlanglvl=extc99 +for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc99 do CC="$ac_save_CC $ac_arg" if ac_fn_c_try_compile "$LINENO"; then : @@ -4752,7 +4790,7 @@ for ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue + as_fn_executable_p "$ac_path_SED" || continue # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED case `"$ac_path_SED" --version 2>&1` in @@ -4828,7 +4866,7 @@ for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -4894,7 +4932,7 @@ for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -4961,7 +4999,7 @@ for ac_prog in fgrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue + as_fn_executable_p "$ac_path_FGREP" || continue # Check for GNU ac_path_FGREP and select it if it is found. # Check for GNU $ac_path_FGREP case `"$ac_path_FGREP" --version 2>&1` in @@ -5217,7 +5255,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5261,7 +5299,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5680,7 +5718,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5720,7 +5758,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OBJDUMP="objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6026,7 +6064,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6066,7 +6104,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DLLTOOL="dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6170,7 +6208,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AR="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6214,7 +6252,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AR="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6339,7 +6377,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6379,7 +6417,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6438,7 +6476,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6478,7 +6516,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7113,7 +7151,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7153,7 +7191,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7233,7 +7271,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7273,7 +7311,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7325,7 +7363,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7365,7 +7403,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_NMEDIT="nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7417,7 +7455,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_LIPO="${ac_tool_prefix}lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7457,7 +7495,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_LIPO="lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7509,7 +7547,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL="${ac_tool_prefix}otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7549,7 +7587,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL="otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7601,7 +7639,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7641,7 +7679,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL64="otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -12120,7 +12158,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -12163,7 +12201,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -12358,7 +12396,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ax_pthread_config="yes" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -12519,7 +12557,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_PTHREAD_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -13114,60 +13152,60 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include -#ifndef bool - "error: bool is not defined" -#endif -#ifndef false - "error: false is not defined" -#endif -#if false - "error: false is not 0" -#endif -#ifndef true - "error: true is not defined" -#endif -#if true != 1 - "error: true is not 1" -#endif -#ifndef __bool_true_false_are_defined - "error: __bool_true_false_are_defined is not defined" -#endif - - struct s { _Bool s: 1; _Bool t; } s; - - char a[true == 1 ? 1 : -1]; - char b[false == 0 ? 1 : -1]; - char c[__bool_true_false_are_defined == 1 ? 1 : -1]; - char d[(bool) 0.5 == true ? 1 : -1]; - /* See body of main program for 'e'. */ - char f[(_Bool) 0.0 == false ? 1 : -1]; - char g[true]; - char h[sizeof (_Bool)]; - char i[sizeof s.t]; - enum { j = false, k = true, l = false * true, m = true * 256 }; - /* The following fails for - HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */ - _Bool n[m]; - char o[sizeof n == m * sizeof n[0] ? 1 : -1]; - char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1]; - /* Catch a bug in an HP-UX C compiler. See - http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html - http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html - */ - _Bool q = true; - _Bool *pq = &q; + #include + #ifndef bool + "error: bool is not defined" + #endif + #ifndef false + "error: false is not defined" + #endif + #if false + "error: false is not 0" + #endif + #ifndef true + "error: true is not defined" + #endif + #if true != 1 + "error: true is not 1" + #endif + #ifndef __bool_true_false_are_defined + "error: __bool_true_false_are_defined is not defined" + #endif + + struct s { _Bool s: 1; _Bool t; } s; + + char a[true == 1 ? 1 : -1]; + char b[false == 0 ? 1 : -1]; + char c[__bool_true_false_are_defined == 1 ? 1 : -1]; + char d[(bool) 0.5 == true ? 1 : -1]; + /* See body of main program for 'e'. */ + char f[(_Bool) 0.0 == false ? 1 : -1]; + char g[true]; + char h[sizeof (_Bool)]; + char i[sizeof s.t]; + enum { j = false, k = true, l = false * true, m = true * 256 }; + /* The following fails for + HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */ + _Bool n[m]; + char o[sizeof n == m * sizeof n[0] ? 1 : -1]; + char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1]; + /* Catch a bug in an HP-UX C compiler. See + http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html + http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html + */ + _Bool q = true; + _Bool *pq = &q; int main () { - bool e = &s; - *pq |= q; - *pq |= ! q; - /* Refer to every declared value, to avoid compiler optimizations. */ - return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l - + !m + !n + !o + !p + !q + !pq); + bool e = &s; + *pq |= q; + *pq |= ! q; + /* Refer to every declared value, to avoid compiler optimizations. */ + return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l + + !m + !n + !o + !p + !q + !pq); ; return 0; @@ -13182,7 +13220,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5 $as_echo "$ac_cv_header_stdbool_h" >&6; } -ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default" + ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default" if test "x$ac_cv_type__Bool" = xyes; then : cat >>confdefs.h <<_ACEOF @@ -13192,6 +13230,7 @@ fi + if test $ac_cv_header_stdbool_h = yes; then $as_echo "#define HAVE_STDBOOL_H 1" >>confdefs.h @@ -14163,6 +14202,24 @@ fi +ac_fn_c_check_member "$LINENO" "struct sockaddr_in" "sin_len" "ac_cv_member_struct_sockaddr_in_sin_len" "#include +" +if test "x$ac_cv_member_struct_sockaddr_in_sin_len" = xyes; then : + +$as_echo "#define HAVE_SIN_LEN 1" >>confdefs.h + +fi + + +ac_fn_c_check_member "$LINENO" "struct sockaddr_in6" "sin6_len" "ac_cv_member_struct_sockaddr_in6_sin6_len" "#include +" +if test "x$ac_cv_member_struct_sockaddr_in6_sin6_len" = xyes; then : + +$as_echo "#define HAVE_SIN6_LEN 1" >>confdefs.h + +fi + + # # Library feature string and macros # @@ -14949,7 +15006,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_SENDMAIL_PATH="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15024,7 +15081,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_hasgcc="yes" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15061,7 +15118,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_hascc="yes" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15107,7 +15164,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_hasgprof="yes" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15152,7 +15209,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_hasgcov="yes" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15195,7 +15252,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_haslcov="yes" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15497,25 +15554,12 @@ # Check whether --enable-arlib was given. if test "${enable_arlib+set}" = set; then : - enableval=$enable_arlib; if test "x$enable_arlib" = "xyes"; then : - - -$as_echo "#define USE_ARLIB 1" >>confdefs.h - - + enableval=$enable_arlib; fi -fi - - - if test x"$enable_arlib" = x"yes"; then - USE_ARLIB_TRUE= - USE_ARLIB_FALSE='#' -else - USE_ARLIB_TRUE='#' - USE_ARLIB_FALSE= -fi +# the AM_CONDITIONAL and AC_DEFINE for USE_ARLIB are farther below, +# after the Darwin checks # Check whether --enable-debug was given. if test "${enable_debug+set}" = set; then : @@ -16305,7 +16349,9 @@ fi - ac_fn_c_check_decl "$LINENO" "SHA256_DIGEST_LENGTH" "ac_cv_have_decl_SHA256_DIGEST_LENGTH" "#include + ac_fn_c_check_decl "$LINENO" "SHA256_DIGEST_LENGTH" "ac_cv_have_decl_SHA256_DIGEST_LENGTH" " +#include +#include " if test "x$ac_cv_have_decl_SHA256_DIGEST_LENGTH" = xyes; then : @@ -19716,10 +19762,29 @@ case "$host" in *-darwin*) - CPPFLAGS="$CPPFLAGS -DBIND_8_COMPAT" + CPPFLAGS="$CPPFLAGS -DBIND_8_COMPAT -DDARWIN" + if test x"$unboundpath" = x"no" + then + enable_arlib="yes" + fi ;; esac + if test x"$enable_arlib" = x"yes"; then + USE_ARLIB_TRUE= + USE_ARLIB_FALSE='#' +else + USE_ARLIB_TRUE='#' + USE_ARLIB_FALSE= +fi + +if test "x$enable_arlib" = "xyes" +then + +$as_echo "#define USE_ARLIB 1" >>confdefs.h + +fi + # # Determine domainname for sample configs # @@ -19749,7 +19814,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_domainname="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -19983,6 +20048,14 @@ LTLIBOBJS=$ac_ltlibobjs +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +$as_echo_n "checking that generated files are newer than configure... " >&6; } + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 +$as_echo "done" >&6; } if test -n "$EXEEXT"; then am__EXEEXT_TRUE= am__EXEEXT_FALSE='#' @@ -20059,10 +20132,6 @@ as_fn_error $? "conditional \"ALL_SYMBOLS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${USE_ARLIB_TRUE}" && test -z "${USE_ARLIB_FALSE}"; then - as_fn_error $? "conditional \"USE_ARLIB\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${DEBUG_TRUE}" && test -z "${DEBUG_FALSE}"; then as_fn_error $? "conditional \"DEBUG\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -20115,6 +20184,10 @@ as_fn_error $? "conditional \"LIVE_TESTS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${USE_ARLIB_TRUE}" && test -z "${USE_ARLIB_FALSE}"; then + as_fn_error $? "conditional \"USE_ARLIB\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${ERLANG_TRUE}" && test -z "${ERLANG_FALSE}"; then as_fn_error $? "conditional \"ERLANG\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -20417,16 +20490,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -20486,28 +20559,16 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -20528,8 +20589,8 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by OpenDKIM $as_me 2.6.2, which was -generated by GNU Autoconf 2.68. Invocation command line was +This file was extended by OpenDKIM $as_me 2.6.8, which was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -20594,11 +20655,11 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -OpenDKIM config.status 2.6.2 -configured by $0, generated by GNU Autoconf 2.68, +OpenDKIM config.status 2.6.8 +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -20689,7 +20750,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' @@ -21676,7 +21737,7 @@ # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -21710,21 +21771,19 @@ continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` test -z "am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`$as_dirname -- "$file" || diff -Nru opendkim-2.6.2/configure.ac opendkim-2.6.8/configure.ac --- opendkim-2.6.2/configure.ac 2012-07-02 17:58:53.000000000 +0000 +++ opendkim-2.6.8/configure.ac 2012-10-24 21:44:30.000000000 +0000 @@ -15,7 +15,7 @@ # m4_define([VERSION_RELEASE], 2) m4_define([VERSION_MAJOR_REV], 6) -m4_define([VERSION_MINOR_REV], 2) +m4_define([VERSION_MINOR_REV], 8) m4_define([VERSION_PATCH], 0) # @@ -24,7 +24,7 @@ # - bump "revision" with internal source code changes # m4_define([LIBVERSION_CURRENT], 7) -m4_define([LIBVERSION_REVISION], 0) +m4_define([LIBVERSION_REVISION], 3) m4_define([LIBVERSION_AGE], 0) # @@ -176,6 +176,20 @@ [], [[#include ]]) +AC_CHECK_MEMBER([struct sockaddr_in.sin_len], + AC_DEFINE([HAVE_SIN_LEN], + [1], + [Define if sockaddr_in has a sin_len member]), + [], + [[#include ]]) + +AC_CHECK_MEMBER([struct sockaddr_in6.sin6_len], + AC_DEFINE([HAVE_SIN6_LEN], + [1], + [Define if sockaddr_in6 has a sin6_len member]), + [], + [[#include ]]) + # # Library feature string and macros # @@ -474,15 +488,10 @@ AC_ARG_ENABLE([arlib], AS_HELP_STRING([--enable-arlib], - [enable provided asynchronous resolver library]), - AS_IF([test "x$enable_arlib" = "xyes"], - [ - AC_DEFINE(USE_ARLIB, 1, - [enable provided asynchronous resolver library]) - ]) -) + [enable provided asynchronous resolver library])) -AM_CONDITIONAL([USE_ARLIB], [test x"$enable_arlib" = x"yes"]) +# the AM_CONDITIONAL and AC_DEFINE for USE_ARLIB are farther below, +# after the Darwin checks AC_ARG_ENABLE([debug], AS_HELP_STRING([--enable-debug], @@ -764,7 +773,9 @@ [Define to 1 if your crypto library has SHA256 support]), AC_MSG_WARN([SHA256 is required for DKIM but is not supported with your version of OpenSSL]), - [#include ]) + [ +#include +#include ]) CFLAGS="$saved_CFLAGS" CPPFLAGS="$saved_CPPFLAGS" @@ -2238,10 +2249,20 @@ AC_CANONICAL_HOST case "$host" in *-darwin*) - CPPFLAGS="$CPPFLAGS -DBIND_8_COMPAT" + CPPFLAGS="$CPPFLAGS -DBIND_8_COMPAT -DDARWIN" + if test x"$unboundpath" = x"no" + then + enable_arlib="yes" + fi ;; esac +AM_CONDITIONAL([USE_ARLIB], [test x"$enable_arlib" = x"yes"]) +if test "x$enable_arlib" = "xyes" +then + AC_DEFINE(USE_ARLIB, 1, [enable provided asynchronous resolver library]) +fi + # # Determine domainname for sample configs # diff -Nru opendkim-2.6.2/contrib/Makefile.in opendkim-2.6.8/contrib/Makefile.in --- opendkim-2.6.2/contrib/Makefile.in 2012-07-02 17:59:42.000000000 +0000 +++ opendkim-2.6.8/contrib/Makefile.in 2012-10-24 21:54:41.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -22,6 +21,23 @@ #AUTOMAKE_OPTIONS = foreign VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -63,6 +79,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -84,6 +105,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(docdir)" DATA = $(dist_doc_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ @@ -389,8 +416,11 @@ -rm -rf .libs _libs install-dist_docDATA: $(dist_doc_DATA) @$(NORMAL_INSTALL) - test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)" @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -404,17 +434,15 @@ @$(NORMAL_UNINSTALL) @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(docdir)" && rm -f $$files + dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -424,7 +452,11 @@ done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -438,37 +470,6 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ @@ -477,6 +478,10 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done +cscopelist-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -540,6 +545,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -575,13 +594,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -619,10 +635,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -700,23 +721,24 @@ uninstall-am: uninstall-dist_docDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ + cscopelist-recursive ctags-recursive install-am install-strip \ + tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive 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-dist_docDATA install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-dist_docDATA + cscopelist cscopelist-recursive ctags ctags-recursive \ + 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-dist_docDATA \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am uninstall-dist_docDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru opendkim-2.6.2/contrib/convert/Makefile.in opendkim-2.6.8/contrib/convert/Makefile.in --- opendkim-2.6.2/contrib/convert/Makefile.in 2012-07-02 17:59:43.000000000 +0000 +++ opendkim-2.6.8/contrib/convert/Makefile.in 2012-10-24 21:54:41.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -22,6 +21,23 @@ #AUTOMAKE_OPTIONS = foreign VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,6 +72,11 @@ CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -77,6 +98,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(docdir)" DATA = $(dist_doc_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -348,8 +375,11 @@ -rm -rf .libs _libs install-dist_docDATA: $(dist_doc_DATA) @$(NORMAL_INSTALL) - test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)" @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -363,15 +393,15 @@ @$(NORMAL_UNINSTALL) @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(docdir)" && rm -f $$files + dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: ctags: CTAGS CTAGS: +cscope cscopelist: + distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -420,10 +450,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru opendkim-2.6.2/contrib/docs/Makefile.in opendkim-2.6.8/contrib/docs/Makefile.in --- opendkim-2.6.2/contrib/docs/Makefile.in 2012-07-02 17:59:43.000000000 +0000 +++ opendkim-2.6.8/contrib/docs/Makefile.in 2012-10-24 21:54:41.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -22,6 +21,23 @@ #AUTOMAKE_OPTIONS = foreign VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,6 +72,11 @@ CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -77,6 +98,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(docdir)" DATA = $(dist_doc_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -348,8 +375,11 @@ -rm -rf .libs _libs install-dist_docDATA: $(dist_doc_DATA) @$(NORMAL_INSTALL) - test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)" @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -363,15 +393,15 @@ @$(NORMAL_UNINSTALL) @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(docdir)" && rm -f $$files + dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: ctags: CTAGS CTAGS: +cscope cscopelist: + distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -420,10 +450,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru opendkim-2.6.2/contrib/init/Makefile.in opendkim-2.6.8/contrib/init/Makefile.in --- opendkim-2.6.2/contrib/init/Makefile.in 2012-07-02 17:59:43.000000000 +0000 +++ opendkim-2.6.8/contrib/init/Makefile.in 2012-10-24 21:54:41.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -19,6 +18,23 @@ # # $Id: Makefile.am,v 1.4 2010/10/25 17:13:17 cm-msk Exp $ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -59,6 +75,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -362,12 +383,12 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -377,7 +398,11 @@ done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -391,37 +416,6 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ @@ -430,6 +424,10 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done +cscopelist-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -493,6 +491,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -528,13 +540,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -569,10 +578,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -650,22 +664,23 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ + cscopelist-recursive ctags-recursive install-am install-strip \ + tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive 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-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am + cscopelist cscopelist-recursive ctags ctags-recursive \ + 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-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-recursive uninstall uninstall-am #dist_doc_DATA = README diff -Nru opendkim-2.6.2/contrib/init/generic/Makefile.in opendkim-2.6.8/contrib/init/generic/Makefile.in --- opendkim-2.6.2/contrib/init/generic/Makefile.in 2012-07-02 17:59:43.000000000 +0000 +++ opendkim-2.6.8/contrib/init/generic/Makefile.in 2012-10-24 21:54:41.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -22,6 +21,23 @@ #AUTOMAKE_OPTIONS = foreign VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,6 +72,11 @@ CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -77,6 +98,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(docdir)" DATA = $(dist_doc_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -348,8 +375,11 @@ -rm -rf .libs _libs install-dist_docDATA: $(dist_doc_DATA) @$(NORMAL_INSTALL) - test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)" @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -363,15 +393,15 @@ @$(NORMAL_UNINSTALL) @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(docdir)" && rm -f $$files + dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: ctags: CTAGS CTAGS: +cscope cscopelist: + distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -420,10 +450,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru opendkim-2.6.2/contrib/init/redhat/Makefile.in opendkim-2.6.8/contrib/init/redhat/Makefile.in --- opendkim-2.6.2/contrib/init/redhat/Makefile.in 2012-07-02 17:59:43.000000000 +0000 +++ opendkim-2.6.8/contrib/init/redhat/Makefile.in 2012-10-24 21:54:41.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -22,6 +21,23 @@ #AUTOMAKE_OPTIONS = foreign VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,6 +72,11 @@ CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -77,6 +98,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(docdir)" DATA = $(dist_doc_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -350,8 +377,11 @@ -rm -rf .libs _libs install-dist_docDATA: $(dist_doc_DATA) @$(NORMAL_INSTALL) - test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)" @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -365,15 +395,15 @@ @$(NORMAL_UNINSTALL) @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(docdir)" && rm -f $$files + dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: ctags: CTAGS CTAGS: +cscope cscopelist: + distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -422,10 +452,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru opendkim-2.6.2/contrib/init/solaris/Makefile.in opendkim-2.6.8/contrib/init/solaris/Makefile.in --- opendkim-2.6.2/contrib/init/solaris/Makefile.in 2012-07-02 17:59:43.000000000 +0000 +++ opendkim-2.6.8/contrib/init/solaris/Makefile.in 2012-10-24 21:54:41.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -22,6 +21,23 @@ #AUTOMAKE_OPTIONS = foreign VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,6 +72,11 @@ CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -77,6 +98,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(docdir)" DATA = $(dist_doc_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -348,8 +375,11 @@ -rm -rf .libs _libs install-dist_docDATA: $(dist_doc_DATA) @$(NORMAL_INSTALL) - test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)" @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -363,15 +393,15 @@ @$(NORMAL_UNINSTALL) @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(docdir)" && rm -f $$files + dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: ctags: CTAGS CTAGS: +cscope cscopelist: + distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -420,10 +450,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru opendkim-2.6.2/contrib/ldap/Makefile.in opendkim-2.6.8/contrib/ldap/Makefile.in --- opendkim-2.6.2/contrib/ldap/Makefile.in 2012-07-02 17:59:43.000000000 +0000 +++ opendkim-2.6.8/contrib/ldap/Makefile.in 2012-10-24 21:54:42.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -22,6 +21,23 @@ #AUTOMAKE_OPTIONS = foreign VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,6 +72,11 @@ CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -77,6 +98,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(docdir)" DATA = $(dist_doc_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -348,8 +375,11 @@ -rm -rf .libs _libs install-dist_docDATA: $(dist_doc_DATA) @$(NORMAL_INSTALL) - test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)" @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -363,15 +393,15 @@ @$(NORMAL_UNINSTALL) @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(docdir)" && rm -f $$files + dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: ctags: CTAGS CTAGS: +cscope cscopelist: + distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -420,10 +450,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru opendkim-2.6.2/contrib/lua/Makefile.in opendkim-2.6.8/contrib/lua/Makefile.in --- opendkim-2.6.2/contrib/lua/Makefile.in 2012-07-02 17:59:43.000000000 +0000 +++ opendkim-2.6.8/contrib/lua/Makefile.in 2012-10-24 21:54:42.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -22,6 +21,23 @@ #AUTOMAKE_OPTIONS = foreign VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,6 +72,11 @@ CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -77,6 +98,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(docdir)" DATA = $(dist_doc_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -348,8 +375,11 @@ -rm -rf .libs _libs install-dist_docDATA: $(dist_doc_DATA) @$(NORMAL_INSTALL) - test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)" @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -363,15 +393,15 @@ @$(NORMAL_UNINSTALL) @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(docdir)" && rm -f $$files + dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: ctags: CTAGS CTAGS: +cscope cscopelist: + distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -420,10 +450,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru opendkim-2.6.2/contrib/patches/Makefile.in opendkim-2.6.8/contrib/patches/Makefile.in --- opendkim-2.6.2/contrib/patches/Makefile.in 2012-07-02 17:59:43.000000000 +0000 +++ opendkim-2.6.8/contrib/patches/Makefile.in 2012-10-24 21:54:42.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -22,6 +21,23 @@ #AUTOMAKE_OPTIONS = foreign VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,6 +72,11 @@ CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -77,6 +98,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(docdir)" DATA = $(dist_doc_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -348,8 +375,11 @@ -rm -rf .libs _libs install-dist_docDATA: $(dist_doc_DATA) @$(NORMAL_INSTALL) - test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)" @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -363,15 +393,15 @@ @$(NORMAL_UNINSTALL) @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(docdir)" && rm -f $$files + dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: ctags: CTAGS CTAGS: +cscope cscopelist: + distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -420,10 +450,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru opendkim-2.6.2/contrib/spec/Makefile.in opendkim-2.6.8/contrib/spec/Makefile.in --- opendkim-2.6.2/contrib/spec/Makefile.in 2012-07-02 17:59:43.000000000 +0000 +++ opendkim-2.6.8/contrib/spec/Makefile.in 2012-10-24 21:54:42.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -20,6 +19,23 @@ # $Id: Makefile.am,v 1.4 2010/10/25 17:13:17 cm-msk Exp $ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -54,6 +70,11 @@ CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -75,6 +96,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(docdir)" DATA = $(dist_doc_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -350,8 +377,11 @@ -rm -rf .libs _libs install-dist_docDATA: $(dist_doc_DATA) @$(NORMAL_INSTALL) - test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)" @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -365,15 +395,15 @@ @$(NORMAL_UNINSTALL) @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(docdir)" && rm -f $$files + dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: ctags: CTAGS CTAGS: +cscope cscopelist: + distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -422,10 +452,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru opendkim-2.6.2/contrib/spec/opendkim.spec opendkim-2.6.8/contrib/spec/opendkim.spec --- opendkim-2.6.2/contrib/spec/opendkim.spec 2012-07-02 18:00:30.000000000 +0000 +++ opendkim-2.6.8/contrib/spec/opendkim.spec 2012-10-24 21:55:34.000000000 +0000 @@ -4,7 +4,7 @@ Summary: An open source library and milter for providing DKIM service Name: opendkim -Version: 2.6.2 +Version: 2.6.8 Release: 1 License: BSD Group: System Environment/Daemons diff -Nru opendkim-2.6.2/contrib/stats/Makefile.in opendkim-2.6.8/contrib/stats/Makefile.in --- opendkim-2.6.2/contrib/stats/Makefile.in 2012-07-02 17:59:44.000000000 +0000 +++ opendkim-2.6.8/contrib/stats/Makefile.in 2012-10-24 21:54:42.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -22,6 +21,23 @@ #AUTOMAKE_OPTIONS = foreign VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,6 +72,11 @@ CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -77,6 +98,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(docdir)" DATA = $(dist_doc_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -351,8 +378,11 @@ -rm -rf .libs _libs install-dist_docDATA: $(dist_doc_DATA) @$(NORMAL_INSTALL) - test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)" @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -366,15 +396,15 @@ @$(NORMAL_UNINSTALL) @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(docdir)" && rm -f $$files + dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: ctags: CTAGS CTAGS: +cscope cscopelist: + distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -423,10 +453,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru opendkim-2.6.2/debian/changelog opendkim-2.6.8/debian/changelog --- opendkim-2.6.2/debian/changelog 2012-11-08 05:12:13.000000000 +0000 +++ opendkim-2.6.8/debian/changelog 2012-11-08 05:12:13.000000000 +0000 @@ -1,8 +1,34 @@ -opendkim (2.6.2-1~precise1) precise-backports; urgency=low +opendkim (2.6.8-0ubuntu1~ubuntu12.04.1) precise-backports; urgency=low - * No-change backport to precise + * No-change backport to precise (LP: #1071139) - -- Scott Kitterman Sat, 14 Jul 2012 02:27:55 -0400 + -- Scott Kitterman Wed, 07 Nov 2012 23:56:05 -0500 + +opendkim (2.6.8-0ubuntu1) quantal-proposed; urgency=low + + * New upstream security release to add capability to exclude use of + insecure keys (Closes: #691394, LP: #1071139) + + -- Scott Kitterman Thu, 25 Oct 2012 01:04:27 -0400 + +opendkim (2.6.7-1) experimental; urgency=low + + * New upstream release + - Drop obsolete configure option enable-selector_header + + -- Scott Kitterman Mon, 23 Jul 2012 18:17:11 -0400 + +opendkim (2.6.6-1) experimental; urgency=low + + * New upstream release + + -- Scott Kitterman Mon, 23 Jul 2012 08:28:16 -0400 + +opendkim (2.6.4-1) experimental; urgency=low + + * New upstream release + + -- Scott Kitterman Sun, 15 Jul 2012 00:04:24 -0400 opendkim (2.6.2-1) unstable; urgency=low diff -Nru opendkim-2.6.2/debian/rules opendkim-2.6.8/debian/rules --- opendkim-2.6.2/debian/rules 2012-11-08 05:12:13.000000000 +0000 +++ opendkim-2.6.8/debian/rules 2012-11-08 05:12:13.000000000 +0000 @@ -37,7 +37,6 @@ --enable-atps \ --enable-oversign \ --enable-stats \ - --enable-selector_header \ --enable-replace_rules \ --with-unbound \ --with-openldap \ diff -Nru opendkim-2.6.2/docs/Makefile.in opendkim-2.6.8/docs/Makefile.in --- opendkim-2.6.2/docs/Makefile.in 2012-07-02 17:59:44.000000000 +0000 +++ opendkim-2.6.8/docs/Makefile.in 2012-10-24 21:54:42.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -22,6 +21,23 @@ #AUTOMAKE_OPTIONS = foreign VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,6 +72,11 @@ CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -77,6 +98,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(docdir)" DATA = $(dist_doc_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -348,8 +375,11 @@ -rm -rf .libs _libs install-dist_docDATA: $(dist_doc_DATA) @$(NORMAL_INSTALL) - test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)" @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -363,15 +393,15 @@ @$(NORMAL_UNINSTALL) @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(docdir)" && rm -f $$files + dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: ctags: CTAGS CTAGS: +cscope cscopelist: + distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -420,10 +450,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru opendkim-2.6.2/libar/Makefile.am opendkim-2.6.8/libar/Makefile.am --- opendkim-2.6.2/libar/Makefile.am 2012-06-25 03:33:43.000000000 +0000 +++ opendkim-2.6.8/libar/Makefile.am 2012-10-24 21:37:13.000000000 +0000 @@ -9,7 +9,7 @@ lib_LTLIBRARIES = libar.la libar_la_SOURCES = ar.c ar-socket.c ar-strl.c manual.c ar-socket.h ar-strl.h manual.h libar_la_LIBADD = $(PTHREAD_LIBS) $(LIBRESOLV) -libar_la_LDFLAGS = -no-undefined $(PTHREAD_CFLAGS) -version-info 2:5:0 +libar_la_LDFLAGS = -no-undefined $(PTHREAD_CFLAGS) -version-info 3:0:0 libar_la_CFLAGS = $(PTHREAD_CFLAGS) libar_la_CC = $(PTHREAD_CC) libarincludedir = $(includedir) diff -Nru opendkim-2.6.2/libar/Makefile.in opendkim-2.6.8/libar/Makefile.in --- opendkim-2.6.2/libar/Makefile.in 2012-07-02 17:59:44.000000000 +0000 +++ opendkim-2.6.8/libar/Makefile.in 2012-10-24 21:54:42.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -22,6 +21,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -43,7 +59,8 @@ @RPATH_TRUE@am__append_1 = -rpath $(libdir) subdir = libar DIST_COMMON = README $(dist_man_MANS) $(libarinclude_HEADERS) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in $(srcdir)/ar.pc.in + $(srcdir)/Makefile.am $(srcdir)/Makefile.in $(srcdir)/ar.pc.in \ + $(top_srcdir)/build-aux/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_pthread.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -76,6 +93,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man3dir)" \ "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(libarincludedir)" LTLIBRARIES = $(lib_LTLIBRARIES) @@ -109,6 +132,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac man3dir = $(mandir)/man3 NROFF = nroff MANS = $(dist_man_MANS) @@ -378,7 +406,7 @@ lib_LTLIBRARIES = libar.la libar_la_SOURCES = ar.c ar-socket.c ar-strl.c manual.c ar-socket.h ar-strl.h manual.h libar_la_LIBADD = $(PTHREAD_LIBS) $(LIBRESOLV) -libar_la_LDFLAGS = -no-undefined $(PTHREAD_CFLAGS) -version-info 2:5:0 \ +libar_la_LDFLAGS = -no-undefined $(PTHREAD_CFLAGS) -version-info 3:0:0 \ $(am__append_1) libar_la_CFLAGS = $(PTHREAD_CFLAGS) libar_la_CC = $(PTHREAD_CC) @@ -425,7 +453,6 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -433,6 +460,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ } @@ -448,13 +477,15 @@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libar.la: $(libar_la_OBJECTS) $(libar_la_DEPENDENCIES) + @list='$(lib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } +libar.la: $(libar_la_OBJECTS) $(libar_la_DEPENDENCIES) $(EXTRA_libar_la_DEPENDENCIES) $(libar_la_LINK) -rpath $(libdir) $(libar_la_OBJECTS) $(libar_la_LIBADD) $(LIBS) mostlyclean-compile: @@ -524,11 +555,18 @@ -rm -rf .libs _libs install-man3: $(dist_man_MANS) @$(NORMAL_INSTALL) - test -z "$(man3dir)" || $(MKDIR_P) "$(DESTDIR)$(man3dir)" - @list=''; test -n "$(man3dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.3[a-z]*$$/p'; \ + @list1=''; \ + list2='$(dist_man_MANS)'; \ + test -n "$(man3dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man3dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man3dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.3[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -557,13 +595,14 @@ sed -n '/\.3[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^3][0-9a-z]*$$,3,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man3dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man3dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man3dir)'; $(am__uninstall_files_from_dir) install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) - test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -577,13 +616,14 @@ @$(NORMAL_UNINSTALL) @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files + dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) install-libarincludeHEADERS: $(libarinclude_HEADERS) @$(NORMAL_INSTALL) - test -z "$(libarincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libarincludedir)" @list='$(libarinclude_HEADERS)'; test -n "$(libarincludedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libarincludedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libarincludedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -597,17 +637,15 @@ @$(NORMAL_UNINSTALL) @list='$(libarinclude_HEADERS)'; test -n "$(libarincludedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(libarincludedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(libarincludedir)" && rm -f $$files + dir='$(DESTDIR)$(libarincludedir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -617,7 +655,11 @@ done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -631,37 +673,6 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ @@ -670,6 +681,10 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done +cscopelist-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -733,6 +748,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -743,10 +772,10 @@ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ if test -n "$$list" && \ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ + echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ + echo " typically 'make maintainer-clean' will remove them" >&2; \ exit 1; \ else :; fi; \ else :; fi @@ -781,13 +810,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -825,10 +851,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -915,22 +946,23 @@ uninstall-man: uninstall-man3 -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ + cscopelist-recursive ctags-recursive install-am install-strip \ + tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool ctags ctags-recursive \ - 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-html install-html-am install-info \ - install-info-am install-libLTLIBRARIES \ - install-libarincludeHEADERS install-man install-man3 \ - install-pdf install-pdf-am install-pkgconfigDATA install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ + clean-libLTLIBRARIES clean-libtool cscopelist \ + cscopelist-recursive ctags ctags-recursive 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-html \ + install-html-am install-info install-info-am \ + install-libLTLIBRARIES install-libarincludeHEADERS install-man \ + install-man3 install-pdf install-pdf-am install-pkgconfigDATA \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-recursive uninstall uninstall-am \ diff -Nru opendkim-2.6.2/libar/ar.3 opendkim-2.6.8/libar/ar.3 --- opendkim-2.6.2/libar/ar.3 2012-06-18 14:20:09.000000000 +0000 +++ opendkim-2.6.8/libar/ar.3 2012-10-24 21:37:13.000000000 +0000 @@ -1,7 +1,7 @@ .TH libar 3 .SH NAME -.B ar_init(), ar_addquery(), ar_waitreply(), ar_cancelquery(), ar_resend(), -.B ar_recycle(), ar_shutdown() +.B ar_init(), ar_resolvconf(), ar_addquery(), ar_waitreply(), ar_cancelquery(), +.B ar_resend(), ar_recycle(), ar_shutdown() \- asynchronous DNS resolver facility .SH SYNOPSIS #include @@ -28,6 +28,14 @@ ); int +.B ar_resolvconf +(AR_LIB +.B ar, +char * +.B path +); + +int .B ar_shutdown (AR_LIB .B lib @@ -160,6 +168,14 @@ .B ar_init() is passed to later functions in order to share resources among transactions. +Upon initialization, all nameservers listed in +.I resolv.conf(5) +will be loaded and tried in order for query resolution. If some other set +of nameservers should be used, the +.B ar_resolvconf() +function can be passed a filename that will be read for "nameserver" +entries, and those will be used instead. + By default the package will not retransmit queries for which no reply has arrived until requested to do so with .B ar_resend(). @@ -375,5 +391,5 @@ .SH SEE ALSO gethostbyaddr(3), gethostbyname(3), -resolv.conf(4), +resolv.conf(5), resolver(3) diff -Nru opendkim-2.6.2/libar/ar.c opendkim-2.6.8/libar/ar.c --- opendkim-2.6.2/libar/ar.c 2012-06-25 03:33:43.000000000 +0000 +++ opendkim-2.6.8/libar/ar.c 2012-10-24 21:37:13.000000000 +0000 @@ -43,15 +43,15 @@ #include #include #include -#ifdef ARDEBUG -# include -#endif /* ARDEBUG */ +#include /* important macros */ #define AR_MAXHOSTNAMELEN 256 #define ARDEBUGOUT "/var/tmp/ardebug.out" +#define BUFRSZ 1024 + #ifndef MAXPACKET # define MAXPACKET 8192 #endif /* ! MAXPACKET */ @@ -2794,3 +2794,122 @@ return strerror(errno); } } + +/* +** AR_RESOLVCONF -- parse a resolv.conf file for nameservers to use +** +** Parameters: +** ar -- AR_LIB handle to update +** file -- path to access +** +** Return value: +** 0 -- success +** !0 -- an error occurred; check errno +** +** Notes: +** Parse errors are not reported. +** +** The default set is not modified if no "nameserver" lines are found. +*/ + +int +ar_resolvconf(AR_LIB ar, char *file) +{ + int af; + int n = 0; + FILE *f; + char *p; + char *sp; + SOCKADDR *news; + struct sockaddr_in s4; +#ifdef AF_INET6 + struct sockaddr_in6 s6; +#endif /* AF_INET6 */ + char buf[BUFRSZ]; + + assert(ar != NULL); + assert(file != NULL); + + f = fopen(file, "r"); + if (f == NULL) + return -1; + + memset(buf, '\0', sizeof buf); + + while (fgets(buf, sizeof buf - 1, f) != NULL) + { + sp = NULL; + + for (p = buf; *p != '\0'; p++) + { + if (sp == NULL && isspace(*p)) + sp = p; + + if (*p == '#' || *p == '\n') + { + *p = '\0'; + break; + } + } + + if (sp != NULL) + *sp = '\0'; + + if (strcasecmp(buf, "nameserver") != 0) + continue; + + af = -1; + if (inet_pton(AF_INET, sp + 1, &s4.sin_addr.s_addr) == 0) + af = AF_INET; +#ifdef AF_INET6 + else if (inet_pton(AF_INET6, sp + 1, + &s6.sin6_addr.s6_addr) == 0) + af = AF_INET6; +#endif /* AF_INET6 */ + + if (af == -1) + continue; + + if (n == 0) + { + news = (SOCKADDR *) malloc(MAXNS * sizeof(SOCKADDR)); + if (news == NULL) + { + fclose(f); + return -1; + } + + free(ar->ar_nsaddrs); + ar->ar_nsaddrs = news; + } + + if (af == AF_INET) + { + s4.sin_family = AF_INET; +#ifdef HAVE_SIN_LEN + s4.sin_len = sizeof s4; +#endif /* HAVE_SIN_LEN */ + memcpy(&news[n], &s4, sizeof s4); + } +#ifdef AF_INET6 + else if (af == AF_INET6) + { + s6.sin6_family = AF_INET6; +# ifdef HAVE_SIN6_LEN + s6.sin6_len = sizeof s6; +# endif /* HAVE_SIN6_LEN */ + memcpy(&news[n], &s6, sizeof s6); + } +#endif /* AF_INET6 */ + + n++; + if (n == MAXNS) + break; + } + + ar->ar_nscount = n; + + fclose(f); + + return 0; +} diff -Nru opendkim-2.6.2/libar/tests/Makefile.in opendkim-2.6.8/libar/tests/Makefile.in --- opendkim-2.6.2/libar/tests/Makefile.in 2012-07-02 17:59:44.000000000 +0000 +++ opendkim-2.6.8/libar/tests/Makefile.in 2012-10-24 21:54:42.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,6 +16,23 @@ # $Id: Makefile.am,v 1.3 2010/09/06 22:35:17 grooverdan Exp $ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -38,7 +54,8 @@ @DEBUG_TRUE@am__append_1 = -g check_PROGRAMS = ar_test00$(EXEEXT) ar_test01$(EXEEXT) subdir = libar/tests -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/build-aux/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_pthread.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -76,10 +93,17 @@ $(LDFLAGS) -o $@ SOURCES = $(ar_test00_SOURCES) $(ar_test01_SOURCES) DIST_SOURCES = $(ar_test00_SOURCES) $(ar_test01_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = $(am__tty_colors_dummy) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADSP_LISTS_MANNOTICE = @ADSP_LISTS_MANNOTICE@ @@ -358,10 +382,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -ar_test00$(EXEEXT): $(ar_test00_OBJECTS) $(ar_test00_DEPENDENCIES) +ar_test00$(EXEEXT): $(ar_test00_OBJECTS) $(ar_test00_DEPENDENCIES) $(EXTRA_ar_test00_DEPENDENCIES) @rm -f ar_test00$(EXEEXT) $(LINK) $(ar_test00_OBJECTS) $(ar_test00_LDADD) $(LIBS) -ar_test01$(EXEEXT): $(ar_test01_OBJECTS) $(ar_test01_DEPENDENCIES) +ar_test01$(EXEEXT): $(ar_test01_OBJECTS) $(ar_test01_DEPENDENCIES) $(EXTRA_ar_test01_DEPENDENCIES) @rm -f ar_test01$(EXEEXT) $(LINK) $(ar_test01_OBJECTS) $(ar_test01_LDADD) $(LIBS) @@ -450,6 +474,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -463,7 +501,7 @@ if test -f ./$$tst; then dir=./; \ elif test -f $$tst; then dir=; \ else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + if $(TESTS_ENVIRONMENT) $${dir}$$tst $(AM_TESTS_FD_REDIRECT); then \ all=`expr $$all + 1`; \ case " $(XFAIL_TESTS) " in \ *[\ \ ]$$tst[\ \ ]*) \ @@ -534,14 +572,15 @@ fi; \ dashes=`echo "$$dashes" | sed s/./=/g`; \ if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ + col="$$grn"; \ else \ - echo "$$red$$dashes"; \ + col="$$red"; \ fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ + echo "$${col}$$dashes$${std}"; \ + echo "$${col}$$banner$${std}"; \ + test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ + test -z "$$report" || echo "$${col}$$report$${std}"; \ + echo "$${col}$$dashes$${std}"; \ test "$$failed" -eq 0; \ else :; fi @@ -591,10 +630,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) @@ -681,8 +725,8 @@ .MAKE: check-am install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ - clean-checkPROGRAMS clean-generic clean-libtool ctags \ - distclean distclean-compile distclean-generic \ + clean-checkPROGRAMS clean-generic clean-libtool cscopelist \ + 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 \ diff -Nru opendkim-2.6.2/libdkimrep/Makefile.in opendkim-2.6.8/libdkimrep/Makefile.in --- opendkim-2.6.2/libdkimrep/Makefile.in 2012-07-02 17:59:44.000000000 +0000 +++ opendkim-2.6.8/libdkimrep/Makefile.in 2012-10-24 21:54:42.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -22,6 +21,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -44,7 +60,7 @@ subdir = libdkimrep DIST_COMMON = $(dist_man_MANS) $(libdkimrepinclude_HEADERS) \ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/dkim-rep.pc.in + $(srcdir)/dkim-rep.pc.in $(top_srcdir)/build-aux/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_pthread.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -77,6 +93,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man3dir)" \ "$(DESTDIR)$(pkgconfigdir)" \ "$(DESTDIR)$(libdkimrepincludedir)" @@ -111,6 +133,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac man3dir = $(mandir)/man3 NROFF = nroff MANS = $(dist_man_MANS) @@ -428,7 +455,6 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -436,6 +462,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ } @@ -451,13 +479,15 @@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libdkimrep.la: $(libdkimrep_la_OBJECTS) $(libdkimrep_la_DEPENDENCIES) + @list='$(lib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } +libdkimrep.la: $(libdkimrep_la_OBJECTS) $(libdkimrep_la_DEPENDENCIES) $(EXTRA_libdkimrep_la_DEPENDENCIES) $(libdkimrep_la_LINK) -rpath $(libdir) $(libdkimrep_la_OBJECTS) $(libdkimrep_la_LIBADD) $(LIBS) mostlyclean-compile: @@ -503,11 +533,18 @@ -rm -rf .libs _libs install-man3: $(dist_man_MANS) @$(NORMAL_INSTALL) - test -z "$(man3dir)" || $(MKDIR_P) "$(DESTDIR)$(man3dir)" - @list=''; test -n "$(man3dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.3[a-z]*$$/p'; \ + @list1=''; \ + list2='$(dist_man_MANS)'; \ + test -n "$(man3dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man3dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man3dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.3[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -536,13 +573,14 @@ sed -n '/\.3[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^3][0-9a-z]*$$,3,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man3dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man3dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man3dir)'; $(am__uninstall_files_from_dir) install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) - test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -556,13 +594,14 @@ @$(NORMAL_UNINSTALL) @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files + dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) install-libdkimrepincludeHEADERS: $(libdkimrepinclude_HEADERS) @$(NORMAL_INSTALL) - test -z "$(libdkimrepincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libdkimrepincludedir)" @list='$(libdkimrepinclude_HEADERS)'; test -n "$(libdkimrepincludedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libdkimrepincludedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libdkimrepincludedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -576,17 +615,15 @@ @$(NORMAL_UNINSTALL) @list='$(libdkimrepinclude_HEADERS)'; test -n "$(libdkimrepincludedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(libdkimrepincludedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(libdkimrepincludedir)" && rm -f $$files + dir='$(DESTDIR)$(libdkimrepincludedir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -596,7 +633,11 @@ done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -610,37 +651,6 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ @@ -649,6 +659,10 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done +cscopelist-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -712,6 +726,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -722,10 +750,10 @@ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ if test -n "$$list" && \ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ + echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ + echo " typically 'make maintainer-clean' will remove them" >&2; \ exit 1; \ else :; fi; \ else :; fi @@ -760,13 +788,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -804,10 +829,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -895,25 +925,26 @@ uninstall-man: uninstall-man3 -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ + cscopelist-recursive ctags-recursive install-am install-strip \ + tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool ctags ctags-recursive \ - 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-html install-html-am install-info \ - install-info-am install-libLTLIBRARIES \ - install-libdkimrepincludeHEADERS install-man install-man3 \ - install-pdf install-pdf-am install-pkgconfigDATA install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am \ + clean-libLTLIBRARIES clean-libtool cscopelist \ + cscopelist-recursive ctags ctags-recursive 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-html \ + install-html-am install-info install-info-am \ + install-libLTLIBRARIES install-libdkimrepincludeHEADERS \ + install-man install-man3 install-pdf install-pdf-am \ + install-pkgconfigDATA install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ uninstall-libLTLIBRARIES uninstall-libdkimrepincludeHEADERS \ uninstall-man uninstall-man3 uninstall-pkgconfigDATA diff -Nru opendkim-2.6.2/libdkimrep/tests/Makefile.in opendkim-2.6.8/libdkimrep/tests/Makefile.in --- opendkim-2.6.2/libdkimrep/tests/Makefile.in 2012-07-02 17:59:44.000000000 +0000 +++ opendkim-2.6.8/libdkimrep/tests/Makefile.in 2012-10-24 21:54:43.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,6 +16,23 @@ # $Id: Makefile.am,v 1.3 2010/09/06 22:35:17 grooverdan Exp $ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -40,7 +56,8 @@ @USE_ARLIB_TRUE@am__append_3 = $(PTHREAD_CFLAGS) check_PROGRAMS = dr_test00$(EXEEXT) subdir = libdkimrep/tests -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/build-aux/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_pthread.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -73,10 +90,17 @@ $(LDFLAGS) -o $@ SOURCES = $(dr_test00_SOURCES) DIST_SOURCES = $(dr_test00_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = $(am__tty_colors_dummy) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADSP_LISTS_MANNOTICE = @ADSP_LISTS_MANNOTICE@ @@ -355,7 +379,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -dr_test00$(EXEEXT): $(dr_test00_OBJECTS) $(dr_test00_DEPENDENCIES) +dr_test00$(EXEEXT): $(dr_test00_OBJECTS) $(dr_test00_DEPENDENCIES) $(EXTRA_dr_test00_DEPENDENCIES) @rm -f dr_test00$(EXEEXT) $(LINK) $(dr_test00_OBJECTS) $(dr_test00_LDADD) $(LIBS) @@ -443,6 +467,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -456,7 +494,7 @@ if test -f ./$$tst; then dir=./; \ elif test -f $$tst; then dir=; \ else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + if $(TESTS_ENVIRONMENT) $${dir}$$tst $(AM_TESTS_FD_REDIRECT); then \ all=`expr $$all + 1`; \ case " $(XFAIL_TESTS) " in \ *[\ \ ]$$tst[\ \ ]*) \ @@ -527,14 +565,15 @@ fi; \ dashes=`echo "$$dashes" | sed s/./=/g`; \ if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ + col="$$grn"; \ else \ - echo "$$red$$dashes"; \ + col="$$red"; \ fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ + echo "$${col}$$dashes$${std}"; \ + echo "$${col}$$banner$${std}"; \ + test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ + test -z "$$report" || echo "$${col}$$report$${std}"; \ + echo "$${col}$$dashes$${std}"; \ test "$$failed" -eq 0; \ else :; fi @@ -584,10 +623,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) @@ -674,8 +718,8 @@ .MAKE: check-am install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ - clean-checkPROGRAMS clean-generic clean-libtool ctags \ - distclean distclean-compile distclean-generic \ + clean-checkPROGRAMS clean-generic clean-libtool cscopelist \ + 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 \ diff -Nru opendkim-2.6.2/libopendkim/Makefile.in opendkim-2.6.8/libopendkim/Makefile.in --- opendkim-2.6.2/libopendkim/Makefile.in 2012-07-02 17:59:44.000000000 +0000 +++ opendkim-2.6.8/libopendkim/Makefile.in 2012-10-24 21:54:43.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -22,6 +21,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,7 +69,7 @@ subdir = libopendkim DIST_COMMON = README $(libopendkim_include_HEADERS) \ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/opendkim.pc.in + $(srcdir)/opendkim.pc.in $(top_srcdir)/build-aux/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_pthread.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -86,6 +102,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" \ "$(DESTDIR)$(libopendkim_includedir)" LTLIBRARIES = $(lib_LTLIBRARIES) @@ -127,6 +149,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(pkgconfig_DATA) HEADERS = $(libopendkim_include_HEADERS) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ @@ -447,7 +474,6 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -455,6 +481,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ } @@ -470,13 +498,15 @@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libopendkim.la: $(libopendkim_la_OBJECTS) $(libopendkim_la_DEPENDENCIES) + @list='$(lib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } +libopendkim.la: $(libopendkim_la_OBJECTS) $(libopendkim_la_DEPENDENCIES) $(EXTRA_libopendkim_la_DEPENDENCIES) $(libopendkim_la_LINK) -rpath $(libdir) $(libopendkim_la_OBJECTS) $(libopendkim_la_LIBADD) $(LIBS) mostlyclean-compile: @@ -642,8 +672,11 @@ -rm -rf .libs _libs install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) - test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -657,13 +690,14 @@ @$(NORMAL_UNINSTALL) @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files + dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) install-libopendkim_includeHEADERS: $(libopendkim_include_HEADERS) @$(NORMAL_INSTALL) - test -z "$(libopendkim_includedir)" || $(MKDIR_P) "$(DESTDIR)$(libopendkim_includedir)" @list='$(libopendkim_include_HEADERS)'; test -n "$(libopendkim_includedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libopendkim_includedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libopendkim_includedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -677,17 +711,15 @@ @$(NORMAL_UNINSTALL) @list='$(libopendkim_include_HEADERS)'; test -n "$(libopendkim_includedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(libopendkim_includedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(libopendkim_includedir)" && rm -f $$files + dir='$(DESTDIR)$(libopendkim_includedir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -697,7 +729,11 @@ done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -711,37 +747,6 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ @@ -750,6 +755,10 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done +cscopelist-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -813,6 +822,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -848,13 +871,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -892,10 +912,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) @@ -982,26 +1007,28 @@ uninstall-am: uninstall-libLTLIBRARIES \ uninstall-libopendkim_includeHEADERS uninstall-pkgconfigDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ + cscopelist-recursive ctags-recursive install-am install-strip \ + tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool ctags ctags-recursive \ - 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-html install-html-am install-info \ - install-info-am install-libLTLIBRARIES \ - install-libopendkim_includeHEADERS install-man install-pdf \ - install-pdf-am install-pkgconfigDATA install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-libLTLIBRARIES \ - uninstall-libopendkim_includeHEADERS uninstall-pkgconfigDATA + clean-libLTLIBRARIES clean-libtool cscopelist \ + cscopelist-recursive ctags ctags-recursive 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-html \ + install-html-am install-info install-info-am \ + install-libLTLIBRARIES install-libopendkim_includeHEADERS \ + install-man install-pdf install-pdf-am install-pkgconfigDATA \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am \ + uninstall-libLTLIBRARIES uninstall-libopendkim_includeHEADERS \ + uninstall-pkgconfigDATA symbols.map: $(libopendkim_include_HEADERS) diff -Nru opendkim-2.6.2/libopendkim/dkim-canon.c opendkim-2.6.8/libopendkim/dkim-canon.c --- opendkim-2.6.2/libopendkim/dkim-canon.c 2012-06-18 14:20:09.000000000 +0000 +++ opendkim-2.6.8/libopendkim/dkim-canon.c 2012-10-24 21:37:13.000000000 +0000 @@ -2,7 +2,7 @@ ** Copyright (c) 2007-2009 Sendmail, Inc. and its suppliers. ** All rights reserved. ** -** Copyright (c) 2009-2011 The OpenDKIM Project. All rights reserved. +** Copyright (c) 2009-2012, The OpenDKIM Project. All rights reserved. */ #ifndef lint @@ -900,11 +900,9 @@ new->canon_hdrlist = hdrlist; new->canon_buf = NULL; new->canon_next = NULL; - new->canon_done = FALSE; new->canon_blankline = TRUE; new->canon_blanks = 0; new->canon_bodystate = 0; - new->canon_wrote = 0; new->canon_hashbuflen = 0; new->canon_hashbufsize = 0; new->canon_hashbuf = NULL; @@ -1924,6 +1922,23 @@ if (cur->canon_done || cur->canon_hdr) continue; + /* handle unprocessed content */ + if (dkim_dstring_len(cur->canon_buf) > 0) + { + if ((dkim->dkim_libhandle->dkiml_flags & DKIM_LIBFLAGS_FIXCRLF) != 0) + { + dkim_canon_buffer(cur, + dkim_dstring_get(cur->canon_buf), + dkim_dstring_len(cur->canon_buf)); + dkim_canon_buffer(cur, CRLF, 2); + } + else + { + dkim_error(dkim, "CRLF at end of body missing"); + return DKIM_STAT_SYNTAX; + } + } + /* "simple" canonicalization must include at least a CRLF */ if (cur->canon_canon == DKIM_CANON_SIMPLE && cur->canon_wrote == 0) diff -Nru opendkim-2.6.2/libopendkim/dkim-tables.c opendkim-2.6.8/libopendkim/dkim-tables.c --- opendkim-2.6.2/libopendkim/dkim-tables.c 2012-06-18 14:20:09.000000000 +0000 +++ opendkim-2.6.8/libopendkim/dkim-tables.c 2012-10-24 21:40:40.000000000 +0000 @@ -202,6 +202,7 @@ { "unable to apply public key", DKIM_SIGERROR_KEYDECODE }, { "version missing", DKIM_SIGERROR_MISSING_V }, { "version empty", DKIM_SIGERROR_EMPTY_V }, + { "signing key too small", DKIM_SIGERROR_KEYTOOSMALL }, { NULL, -1 }, }; struct nametable *sigerrors = prv_sigerrors; diff -Nru opendkim-2.6.2/libopendkim/dkim-types.h opendkim-2.6.8/libopendkim/dkim-types.h --- opendkim-2.6.2/libopendkim/dkim-types.h 2012-06-18 14:20:09.000000000 +0000 +++ opendkim-2.6.8/libopendkim/dkim-types.h 2012-10-24 21:41:36.000000000 +0000 @@ -351,6 +351,7 @@ u_int dkiml_callback_int; u_int dkiml_flsize; u_int dkiml_nalwayshdrs; + u_int dkiml_minkeybits; uint64_t dkiml_fixedtime; uint64_t dkiml_sigttl; uint64_t dkiml_clockdrift; diff -Nru opendkim-2.6.2/libopendkim/dkim-util.c opendkim-2.6.8/libopendkim/dkim-util.c --- opendkim-2.6.2/libopendkim/dkim-util.c 2012-06-18 14:20:09.000000000 +0000 +++ opendkim-2.6.8/libopendkim/dkim-util.c 2012-10-24 21:37:13.000000000 +0000 @@ -2,7 +2,7 @@ ** Copyright (c) 2007-2009 Sendmail, Inc. and its suppliers. ** All rights reserved. ** -** Copyright (c) 2009, The OpenDKIM Project. All rights reserved. +** Copyright (c) 2009, 2012, The OpenDKIM Project. All rights reserved. */ #ifndef lint @@ -133,6 +133,7 @@ dkim_tmpfile(DKIM *dkim, int *fp, _Bool keep) { int fd; + char *p; char path[MAXPATHLEN + 1]; assert(dkim != NULL); @@ -149,6 +150,14 @@ dkim->dkim_libhandle->dkiml_tmpdir); } + for (p = path + strlen(dkim->dkim_libhandle->dkiml_tmpdir) + 1; + *p != '\0'; + p++) + { + if (*p == '/') + *p = '.'; + } + fd = mkstemp(path); if (fd == -1) { diff -Nru opendkim-2.6.2/libopendkim/dkim.c opendkim-2.6.8/libopendkim/dkim.c --- opendkim-2.6.2/libopendkim/dkim.c 2012-06-18 14:20:09.000000000 +0000 +++ opendkim-2.6.8/libopendkim/dkim.c 2012-10-24 21:52:25.000000000 +0000 @@ -132,6 +132,7 @@ #define SP " " #define DEFCLOCKDRIFT 300 +#define DEFMINKEYBITS 1024 #define DEFTIMEOUT 10 #define MINSIGLEN 8 @@ -1277,11 +1278,13 @@ */ static _Bool -dkim_key_hashesok(u_char *hashlist) +dkim_key_hashesok(DKIM_LIB *lib, u_char *hashlist) { u_char *x, *y; u_char tmp[BUFRSZ + 1]; + assert(lib != NULL); + if (hashlist == NULL) return TRUE; @@ -1295,10 +1298,17 @@ { if (x != NULL) { + int hashcode; + strlcpy((char *) tmp, (char *) x, sizeof tmp); tmp[y - x] = '\0'; - if (dkim_name_to_code(hashes, - (char *) tmp) != -1) + + hashcode = dkim_name_to_code(hashes, + (char *) tmp); + + if (hashcode != -1 && + (hashcode != DKIM_HASHTYPE_SHA256 || + dkim_libfeature(lib, DKIM_FEATURE_SHA256))) return TRUE; } @@ -2255,7 +2265,7 @@ ** delim -- delimiter ** ** Return value: -** Number of bytes written to "dstr", or 0 on error. +** Number of bytes written to "dstr", or <= 0 on error. */ static size_t @@ -2288,7 +2298,7 @@ { always = DKIM_MALLOC(dkim, n); if (always == NULL) - return (size_t) -1; + return 0; memset(always, '\0', n); } @@ -2394,7 +2404,14 @@ memset(b64hash, '\0', sizeof b64hash); - (void) dkim_canon_closebody(dkim); + status = dkim_canon_closebody(dkim); + if (status != DKIM_STAT_OK) + { + if (always != NULL) + (void) DKIM_FREE(dkim, always); + return 0; + } + status = dkim_canon_getfinal(sig->sig_bodycanon, &hash, &hashlen); if (status != DKIM_STAT_OK) { @@ -3025,7 +3042,7 @@ /* then make sure the hash type is something we can handle */ p = dkim_param_get(set, (u_char *) "h"); - if (!dkim_key_hashesok(p)) + if (!dkim_key_hashesok(dkim->dkim_libhandle, p)) { dkim_error(dkim, "unknown hash '%s'", p); sig->sig_error = DKIM_SIGERROR_KEYUNKNOWNHASH; @@ -3700,7 +3717,9 @@ #endif /* _FFR_RESIGN */ /* finalize body canonicalizations */ - (void) dkim_canon_closebody(dkim); + status = dkim_canon_closebody(dkim); + if (status != DKIM_STAT_OK) + return status; dkim->dkim_bodydone = TRUE; @@ -3748,6 +3767,16 @@ sig->sig_signature = dkim->dkim_keydata; sig->sig_flags |= DKIM_SIGFLAG_KEYLOADED; + if (sig->sig_keybits < dkim->dkim_libhandle->dkiml_minkeybits) + { + sig->sig_error = DKIM_SIGERROR_KEYTOOSMALL; + dkim_error(dkim, + "private key too small (%d bits, need at least %d)", + sig->sig_keybits, + dkim->dkim_libhandle->dkiml_minkeybits); + return DKIM_STAT_INVALID; + } + switch (sig->sig_signalg) { case DKIM_SIGN_RSASHA1: @@ -3964,7 +3993,9 @@ return DKIM_STAT_INVALID; /* finalize body canonicalizations */ - (void) dkim_canon_closebody(dkim); + ret = dkim_canon_closebody(dkim); + if (ret != DKIM_STAT_OK) + return ret; dkim->dkim_bodydone = TRUE; @@ -4086,6 +4117,19 @@ continue; } + /* + ** If the signature has fewer than the + ** minimum number of key bits required by + ** configuration, the signature is invalid. + */ + + if (sig->sig_error == 0 && + sig->sig_keybits < lib->dkiml_minkeybits) + { + sig->sig_error = DKIM_SIGERROR_KEYTOOSMALL; + sig->sig_flags &= ~DKIM_SIGFLAG_PASSED; + } + /* pass and bh match? */ if ((sig->sig_flags & DKIM_SIGFLAG_PASSED) != 0 && sig->sig_bh == DKIM_SIGBH_MATCH) @@ -4107,8 +4151,7 @@ } /* - ** If still none, we're going to fail so just use the - ** first one. + ** If still none, we're going to fail so just use the first one. */ if (sig == NULL) @@ -4356,6 +4399,7 @@ libhandle->dkiml_fixedtime = 0; libhandle->dkiml_sigttl = 0; libhandle->dkiml_clockdrift = DEFCLOCKDRIFT; + libhandle->dkiml_minkeybits = DEFMINKEYBITS; libhandle->dkiml_key_lookup = NULL; libhandle->dkiml_policy_lookup = NULL; @@ -4582,13 +4626,24 @@ return DKIM_STAT_INVALID; if (op == DKIM_OP_GETOPT) - { memcpy(ptr, &lib->dkiml_fixedtime, len); - } else - { memcpy(&lib->dkiml_fixedtime, ptr, len); - } + + return DKIM_STAT_OK; + + case DKIM_OPTS_MINKEYBITS: + if (ptr == NULL) + return DKIM_STAT_INVALID; + + if (len != sizeof lib->dkiml_minkeybits) + return DKIM_STAT_INVALID; + + if (op == DKIM_OP_GETOPT) + memcpy(ptr, &lib->dkiml_minkeybits, len); + else + memcpy(&lib->dkiml_minkeybits, ptr, len); + return DKIM_STAT_OK; case DKIM_OPTS_SIGNATURETTL: @@ -4599,13 +4654,10 @@ return DKIM_STAT_INVALID; if (op == DKIM_OP_GETOPT) - { memcpy(ptr, &lib->dkiml_sigttl, len); - } else - { memcpy(&lib->dkiml_sigttl, ptr, len); - } + return DKIM_STAT_OK; case DKIM_OPTS_CLOCKDRIFT: @@ -4616,13 +4668,10 @@ return DKIM_STAT_INVALID; if (op == DKIM_OP_GETOPT) - { memcpy(ptr, &lib->dkiml_clockdrift, len); - } else - { memcpy(&lib->dkiml_clockdrift, ptr, len); - } + return DKIM_STAT_OK; case DKIM_OPTS_FLAGS: @@ -4633,13 +4682,10 @@ return DKIM_STAT_INVALID; if (op == DKIM_OP_GETOPT) - { memcpy(ptr, &lib->dkiml_flags, len); - } else - { memcpy(&lib->dkiml_flags, ptr, len); - } + return DKIM_STAT_OK; case DKIM_OPTS_TIMEOUT: @@ -4650,13 +4696,10 @@ return DKIM_STAT_INVALID; if (op == DKIM_OP_GETOPT) - { memcpy(ptr, &lib->dkiml_timeout, len); - } else - { memcpy(&lib->dkiml_timeout, ptr, len); - } + return DKIM_STAT_OK; case DKIM_OPTS_SENDERHDRS: @@ -4881,13 +4924,10 @@ return DKIM_STAT_INVALID; if (op == DKIM_OP_GETOPT) - { memcpy(ptr, &lib->dkiml_querymethod, len); - } else - { memcpy(&lib->dkiml_querymethod, ptr, len); - } + return DKIM_STAT_OK; case DKIM_OPTS_QUERYINFO: diff -Nru opendkim-2.6.2/libopendkim/dkim.h opendkim-2.6.8/libopendkim/dkim.h --- opendkim-2.6.2/libopendkim/dkim.h 2012-07-02 18:12:01.000000000 +0000 +++ opendkim-2.6.8/libopendkim/dkim.h 2012-10-24 22:02:45.000000000 +0000 @@ -34,7 +34,7 @@ ** pp == patch number */ -#define OPENDKIM_LIB_VERSION 0x02060200 +#define OPENDKIM_LIB_VERSION 0x02060800 #ifdef __STDC__ # ifndef __P @@ -154,6 +154,7 @@ #define DKIM_SIGERROR_KEYDECODE 43 /* key couldn't be decoded */ #define DKIM_SIGERROR_MISSING_V 44 /* v= tag missing */ #define DKIM_SIGERROR_EMPTY_V 45 /* v= tag empty */ +#define DKIM_SIGERROR_KEYTOOSMALL 46 /* too few key bits */ /* generic DNS error codes */ #define DKIM_DNS_ERROR (-1) /* error in transit */ @@ -273,6 +274,7 @@ #define DKIM_OPTS_SIGNATURETTL 11 #define DKIM_OPTS_CLOCKDRIFT 12 #define DKIM_OPTS_MUSTBESIGNED 13 +#define DKIM_OPTS_MINKEYBITS 14 #define DKIM_LIBFLAGS_NONE 0x0000 #define DKIM_LIBFLAGS_TMPFILES 0x0001 diff -Nru opendkim-2.6.2/libopendkim/docs/Makefile.in opendkim-2.6.8/libopendkim/docs/Makefile.in --- opendkim-2.6.2/libopendkim/docs/Makefile.in 2012-07-02 17:59:44.000000000 +0000 +++ opendkim-2.6.8/libopendkim/docs/Makefile.in 2012-10-24 21:54:43.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -20,6 +19,23 @@ #AUTOMAKE_OPTIONS = foreign VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -54,6 +70,11 @@ CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -75,6 +96,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(docdir)" DATA = $(dist_doc_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -456,8 +483,11 @@ -rm -rf .libs _libs install-dist_docDATA: $(dist_doc_DATA) @$(NORMAL_INSTALL) - test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)" @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -471,15 +501,15 @@ @$(NORMAL_UNINSTALL) @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(docdir)" && rm -f $$files + dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: ctags: CTAGS CTAGS: +cscope cscopelist: + distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -528,10 +558,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru opendkim-2.6.2/libopendkim/docs/dkim_eom.html opendkim-2.6.8/libopendkim/docs/dkim_eom.html --- opendkim-2.6.2/libopendkim/docs/dkim_eom.html 2010-11-10 18:15:42.000000000 +0000 +++ opendkim-2.6.8/libopendkim/docs/dkim_eom.html 2012-10-24 21:52:25.000000000 +0000 @@ -61,6 +61,9 @@ passed to dkim_chunk() for message chunk processing but the end of message was never signaled via that interface. +
  • DKIM_STAT_INVALID returned when signing may indicate that hte + key provided for signing did not meet the minimum key size requirement + (see dkim_options()).
  • Other possible return values include all the DKIM_STAT values. diff -Nru opendkim-2.6.2/libopendkim/docs/dkim_flush_cache.html opendkim-2.6.8/libopendkim/docs/dkim_flush_cache.html --- opendkim-2.6.2/libopendkim/docs/dkim_flush_cache.html 2010-11-10 18:15:42.000000000 +0000 +++ opendkim-2.6.8/libopendkim/docs/dkim_flush_cache.html 2012-10-24 21:37:13.000000000 +0000 @@ -59,7 +59,7 @@ NOTES
      -
    • Caching is selected by setting the DKIM_LIBFLAG_CACHE flag +
    • Caching is selected by setting the DKIM_LIBFLAGS_CACHE flag using the dkim_options() function.
    • Caching requires a special compile-time option since it also adds @@ -74,7 +74,7 @@ Copyright (c) 2007 Sendmail, Inc. and its suppliers. All rights reserved.
      -Copyright (c) 2009, 2010, The OpenDKIM Project. All rights reserved. +Copyright (c) 2009, 2010, 2012, The OpenDKIM Project. All rights reserved.
      By using this file, you agree to the terms and conditions set diff -Nru opendkim-2.6.2/libopendkim/docs/dkim_options.html opendkim-2.6.8/libopendkim/docs/dkim_options.html --- opendkim-2.6.2/libopendkim/docs/dkim_options.html 2012-06-18 14:20:09.000000000 +0000 +++ opendkim-2.6.8/libopendkim/docs/dkim_options.html 2012-10-24 21:45:01.000000000 +0000 @@ -78,6 +78,11 @@ which contains a bitwise-OR of desired flags. See below for the list of known flags. + DKIM_OPTS_MINKEYBITS + data refers to a u_int + that contains the minimum number of bits + that are to be conisdered + acceptable. The default is 1024. DKIM_OPTS_MUSTBESIGNED data refers to an ordered, NULL-terminated array of header names which, diff -Nru opendkim-2.6.2/libopendkim/docs/dkim_sigerror.html opendkim-2.6.8/libopendkim/docs/dkim_sigerror.html --- opendkim-2.6.2/libopendkim/docs/dkim_sigerror.html 2012-06-18 14:20:09.000000000 +0000 +++ opendkim-2.6.8/libopendkim/docs/dkim_sigerror.html 2012-10-24 21:41:51.000000000 +0000 @@ -73,6 +73,8 @@
    • DKIM_SIGERROR_KEYDECODE -- unable to decode public key
    • DKIM_SIGERROR_MISSING_V -- missing version
    • DKIM_SIGERROR_EMPTY_V -- empty version +
    • DKIM_SIGERROR_KEYTOOSMALL -- signing key did not meet minimum + size requirements
    @@ -85,8 +87,7 @@ Copyright (c) 2007-2009 Sendmail, Inc. and its suppliers. All rights reserved.
    -Copyright (c) 2009-2011, The OpenDKIM Project. All rights reserved. - +Copyright (c) 2009-2012, The Trusted Domain Project. All rights reserved.
    By using this file, you agree to the terms and conditions set forth in the respective licenses. diff -Nru opendkim-2.6.2/libopendkim/tests/Makefile.am opendkim-2.6.8/libopendkim/tests/Makefile.am --- opendkim-2.6.2/libopendkim/tests/Makefile.am 2012-06-18 14:20:09.000000000 +0000 +++ opendkim-2.6.8/libopendkim/tests/Makefile.am 2012-10-24 21:52:25.000000000 +0000 @@ -45,7 +45,7 @@ t-test127 t-test128 t-test129 t-test130 t-test131 t-test132 \ t-test133 t-test134 t-test135 t-test136 t-test137 t-test138 \ t-test139 t-test140 t-test141 t-test142 t-test143 t-test144 \ - t-test145 t-test146 t-test147 t-test148 \ + t-test145 t-test146 t-test147 t-test148 t-test149 t-test150 \ t-signperf t-verifyperf check_SCRIPTS = t-signperf-sha1 t-signperf-relaxed-relaxed \ t-signperf-simple-simple @@ -212,6 +212,8 @@ t_test146_SOURCES = t-test146.c t-testdata.h t_test147_SOURCES = t-test147.c t-testdata.h t_test148_SOURCES = t-test148.c t-testdata.h +t_test149_SOURCES = t-test149.c t-testdata.h +t_test150_SOURCES = t-test150.c t-testdata.h MOSTLYCLEANFILES= diff -Nru opendkim-2.6.2/libopendkim/tests/Makefile.in opendkim-2.6.8/libopendkim/tests/Makefile.in --- opendkim-2.6.2/libopendkim/tests/Makefile.in 2012-07-02 17:59:45.000000000 +0000 +++ opendkim-2.6.8/libopendkim/tests/Makefile.in 2012-10-24 21:54:44.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,6 +17,23 @@ # $Id: Makefile.am,v 1.16.2.1 2010/10/09 04:55:27 cm-msk Exp $ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -90,15 +106,15 @@ t-test140$(EXEEXT) t-test141$(EXEEXT) t-test142$(EXEEXT) \ t-test143$(EXEEXT) t-test144$(EXEEXT) t-test145$(EXEEXT) \ t-test146$(EXEEXT) t-test147$(EXEEXT) t-test148$(EXEEXT) \ - t-signperf$(EXEEXT) t-verifyperf$(EXEEXT) $(am__EXEEXT_1) \ - t-cleanup$(EXEEXT) + t-test149$(EXEEXT) t-test150$(EXEEXT) t-signperf$(EXEEXT) \ + t-verifyperf$(EXEEXT) $(am__EXEEXT_1) t-cleanup$(EXEEXT) @ALL_SYMBOLS_TRUE@am__append_7 = t-test49 t-test113 t-test118 @GCOV_ONLY_TRUE@am__append_8 = *.gcov *.gcno *.gcda *.bb *.bbg *.da .gcov-files @LCOV_TRUE@am__append_9 = *.info .prepare-lcov .info-files *.gcno *.gcda @GPROF_TRUE@am__append_10 = *.prof gmon.out *.gmon subdir = libopendkim/tests DIST_COMMON = $(am__dist_doc_DATA_DIST) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in + $(srcdir)/Makefile.in $(top_srcdir)/build-aux/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_pthread.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -445,11 +461,21 @@ t_test148_LDADD = $(LDADD) t_test148_DEPENDENCIES = ../libopendkim.la $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) +am_t_test149_OBJECTS = t-test149.$(OBJEXT) +t_test149_OBJECTS = $(am_t_test149_OBJECTS) +t_test149_LDADD = $(LDADD) +t_test149_DEPENDENCIES = ../libopendkim.la $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) am_t_test15_OBJECTS = t-test15.$(OBJEXT) t_test15_OBJECTS = $(am_t_test15_OBJECTS) t_test15_LDADD = $(LDADD) t_test15_DEPENDENCIES = ../libopendkim.la $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) +am_t_test150_OBJECTS = t-test150.$(OBJEXT) +t_test150_OBJECTS = $(am_t_test150_OBJECTS) +t_test150_LDADD = $(LDADD) +t_test150_DEPENDENCIES = ../libopendkim.la $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) am_t_test16_OBJECTS = t-test16.$(OBJEXT) t_test16_OBJECTS = $(am_t_test16_OBJECTS) t_test16_LDADD = $(LDADD) @@ -900,34 +926,35 @@ $(t_test14_SOURCES) $(t_test140_SOURCES) $(t_test141_SOURCES) \ $(t_test142_SOURCES) $(t_test143_SOURCES) $(t_test144_SOURCES) \ $(t_test145_SOURCES) $(t_test146_SOURCES) $(t_test147_SOURCES) \ - $(t_test148_SOURCES) $(t_test15_SOURCES) $(t_test16_SOURCES) \ - $(t_test17_SOURCES) $(t_test18_SOURCES) $(t_test19_SOURCES) \ - $(t_test20_SOURCES) $(t_test21_SOURCES) $(t_test22_SOURCES) \ - $(t_test23_SOURCES) $(t_test24_SOURCES) $(t_test25_SOURCES) \ - $(t_test26_SOURCES) $(t_test27_SOURCES) $(t_test28_SOURCES) \ - $(t_test29_SOURCES) $(t_test30_SOURCES) $(t_test31_SOURCES) \ - $(t_test32_SOURCES) $(t_test33_SOURCES) $(t_test34_SOURCES) \ - $(t_test35_SOURCES) $(t_test36_SOURCES) $(t_test37_SOURCES) \ - $(t_test38_SOURCES) $(t_test39_SOURCES) $(t_test40_SOURCES) \ - $(t_test41_SOURCES) $(t_test42_SOURCES) $(t_test43_SOURCES) \ - $(t_test44_SOURCES) $(t_test45_SOURCES) $(t_test46_SOURCES) \ - $(t_test47_SOURCES) $(t_test48_SOURCES) $(t_test49_SOURCES) \ - $(t_test50_SOURCES) $(t_test51_SOURCES) $(t_test52_SOURCES) \ - $(t_test53_SOURCES) $(t_test54_SOURCES) $(t_test55_SOURCES) \ - $(t_test56_SOURCES) $(t_test57_SOURCES) $(t_test58_SOURCES) \ - $(t_test59_SOURCES) $(t_test60_SOURCES) $(t_test61_SOURCES) \ - $(t_test62_SOURCES) $(t_test63_SOURCES) $(t_test64_SOURCES) \ - $(t_test65_SOURCES) $(t_test66_SOURCES) $(t_test67_SOURCES) \ - $(t_test68_SOURCES) $(t_test69_SOURCES) $(t_test70_SOURCES) \ - $(t_test71_SOURCES) $(t_test72_SOURCES) $(t_test73_SOURCES) \ - $(t_test74_SOURCES) $(t_test76_SOURCES) $(t_test77_SOURCES) \ - $(t_test78_SOURCES) $(t_test79_SOURCES) $(t_test80_SOURCES) \ - $(t_test81_SOURCES) $(t_test82_SOURCES) $(t_test83_SOURCES) \ - $(t_test84_SOURCES) $(t_test85_SOURCES) $(t_test86_SOURCES) \ - $(t_test87_SOURCES) $(t_test88_SOURCES) $(t_test89_SOURCES) \ - $(t_test90_SOURCES) $(t_test91_SOURCES) $(t_test92_SOURCES) \ - $(t_test93_SOURCES) $(t_test94_SOURCES) $(t_test96_SOURCES) \ - $(t_test97_SOURCES) $(t_test98_SOURCES) $(t_test99_SOURCES) \ + $(t_test148_SOURCES) $(t_test149_SOURCES) $(t_test15_SOURCES) \ + $(t_test150_SOURCES) $(t_test16_SOURCES) $(t_test17_SOURCES) \ + $(t_test18_SOURCES) $(t_test19_SOURCES) $(t_test20_SOURCES) \ + $(t_test21_SOURCES) $(t_test22_SOURCES) $(t_test23_SOURCES) \ + $(t_test24_SOURCES) $(t_test25_SOURCES) $(t_test26_SOURCES) \ + $(t_test27_SOURCES) $(t_test28_SOURCES) $(t_test29_SOURCES) \ + $(t_test30_SOURCES) $(t_test31_SOURCES) $(t_test32_SOURCES) \ + $(t_test33_SOURCES) $(t_test34_SOURCES) $(t_test35_SOURCES) \ + $(t_test36_SOURCES) $(t_test37_SOURCES) $(t_test38_SOURCES) \ + $(t_test39_SOURCES) $(t_test40_SOURCES) $(t_test41_SOURCES) \ + $(t_test42_SOURCES) $(t_test43_SOURCES) $(t_test44_SOURCES) \ + $(t_test45_SOURCES) $(t_test46_SOURCES) $(t_test47_SOURCES) \ + $(t_test48_SOURCES) $(t_test49_SOURCES) $(t_test50_SOURCES) \ + $(t_test51_SOURCES) $(t_test52_SOURCES) $(t_test53_SOURCES) \ + $(t_test54_SOURCES) $(t_test55_SOURCES) $(t_test56_SOURCES) \ + $(t_test57_SOURCES) $(t_test58_SOURCES) $(t_test59_SOURCES) \ + $(t_test60_SOURCES) $(t_test61_SOURCES) $(t_test62_SOURCES) \ + $(t_test63_SOURCES) $(t_test64_SOURCES) $(t_test65_SOURCES) \ + $(t_test66_SOURCES) $(t_test67_SOURCES) $(t_test68_SOURCES) \ + $(t_test69_SOURCES) $(t_test70_SOURCES) $(t_test71_SOURCES) \ + $(t_test72_SOURCES) $(t_test73_SOURCES) $(t_test74_SOURCES) \ + $(t_test76_SOURCES) $(t_test77_SOURCES) $(t_test78_SOURCES) \ + $(t_test79_SOURCES) $(t_test80_SOURCES) $(t_test81_SOURCES) \ + $(t_test82_SOURCES) $(t_test83_SOURCES) $(t_test84_SOURCES) \ + $(t_test85_SOURCES) $(t_test86_SOURCES) $(t_test87_SOURCES) \ + $(t_test88_SOURCES) $(t_test89_SOURCES) $(t_test90_SOURCES) \ + $(t_test91_SOURCES) $(t_test92_SOURCES) $(t_test93_SOURCES) \ + $(t_test94_SOURCES) $(t_test96_SOURCES) $(t_test97_SOURCES) \ + $(t_test98_SOURCES) $(t_test99_SOURCES) \ $(t_verifyperf_SOURCES) DIST_SOURCES = $(t_cleanup_SOURCES) $(t_setup_SOURCES) \ $(t_signperf_SOURCES) $(t_test00_SOURCES) $(t_test01_SOURCES) \ @@ -952,35 +979,41 @@ $(t_test14_SOURCES) $(t_test140_SOURCES) $(t_test141_SOURCES) \ $(t_test142_SOURCES) $(t_test143_SOURCES) $(t_test144_SOURCES) \ $(t_test145_SOURCES) $(t_test146_SOURCES) $(t_test147_SOURCES) \ - $(t_test148_SOURCES) $(t_test15_SOURCES) $(t_test16_SOURCES) \ - $(t_test17_SOURCES) $(t_test18_SOURCES) $(t_test19_SOURCES) \ - $(t_test20_SOURCES) $(t_test21_SOURCES) $(t_test22_SOURCES) \ - $(t_test23_SOURCES) $(t_test24_SOURCES) $(t_test25_SOURCES) \ - $(t_test26_SOURCES) $(t_test27_SOURCES) $(t_test28_SOURCES) \ - $(t_test29_SOURCES) $(t_test30_SOURCES) $(t_test31_SOURCES) \ - $(t_test32_SOURCES) $(t_test33_SOURCES) $(t_test34_SOURCES) \ - $(t_test35_SOURCES) $(t_test36_SOURCES) $(t_test37_SOURCES) \ - $(t_test38_SOURCES) $(t_test39_SOURCES) $(t_test40_SOURCES) \ - $(t_test41_SOURCES) $(t_test42_SOURCES) $(t_test43_SOURCES) \ - $(t_test44_SOURCES) $(t_test45_SOURCES) $(t_test46_SOURCES) \ - $(t_test47_SOURCES) $(t_test48_SOURCES) $(t_test49_SOURCES) \ - $(t_test50_SOURCES) $(t_test51_SOURCES) $(t_test52_SOURCES) \ - $(t_test53_SOURCES) $(t_test54_SOURCES) $(t_test55_SOURCES) \ - $(t_test56_SOURCES) $(t_test57_SOURCES) $(t_test58_SOURCES) \ - $(t_test59_SOURCES) $(t_test60_SOURCES) $(t_test61_SOURCES) \ - $(t_test62_SOURCES) $(t_test63_SOURCES) $(t_test64_SOURCES) \ - $(t_test65_SOURCES) $(t_test66_SOURCES) $(t_test67_SOURCES) \ - $(t_test68_SOURCES) $(t_test69_SOURCES) $(t_test70_SOURCES) \ - $(t_test71_SOURCES) $(t_test72_SOURCES) $(t_test73_SOURCES) \ - $(t_test74_SOURCES) $(t_test76_SOURCES) $(t_test77_SOURCES) \ - $(t_test78_SOURCES) $(t_test79_SOURCES) $(t_test80_SOURCES) \ - $(t_test81_SOURCES) $(t_test82_SOURCES) $(t_test83_SOURCES) \ - $(t_test84_SOURCES) $(t_test85_SOURCES) $(t_test86_SOURCES) \ - $(t_test87_SOURCES) $(t_test88_SOURCES) $(t_test89_SOURCES) \ - $(t_test90_SOURCES) $(t_test91_SOURCES) $(t_test92_SOURCES) \ - $(t_test93_SOURCES) $(t_test94_SOURCES) $(t_test96_SOURCES) \ - $(t_test97_SOURCES) $(t_test98_SOURCES) $(t_test99_SOURCES) \ + $(t_test148_SOURCES) $(t_test149_SOURCES) $(t_test15_SOURCES) \ + $(t_test150_SOURCES) $(t_test16_SOURCES) $(t_test17_SOURCES) \ + $(t_test18_SOURCES) $(t_test19_SOURCES) $(t_test20_SOURCES) \ + $(t_test21_SOURCES) $(t_test22_SOURCES) $(t_test23_SOURCES) \ + $(t_test24_SOURCES) $(t_test25_SOURCES) $(t_test26_SOURCES) \ + $(t_test27_SOURCES) $(t_test28_SOURCES) $(t_test29_SOURCES) \ + $(t_test30_SOURCES) $(t_test31_SOURCES) $(t_test32_SOURCES) \ + $(t_test33_SOURCES) $(t_test34_SOURCES) $(t_test35_SOURCES) \ + $(t_test36_SOURCES) $(t_test37_SOURCES) $(t_test38_SOURCES) \ + $(t_test39_SOURCES) $(t_test40_SOURCES) $(t_test41_SOURCES) \ + $(t_test42_SOURCES) $(t_test43_SOURCES) $(t_test44_SOURCES) \ + $(t_test45_SOURCES) $(t_test46_SOURCES) $(t_test47_SOURCES) \ + $(t_test48_SOURCES) $(t_test49_SOURCES) $(t_test50_SOURCES) \ + $(t_test51_SOURCES) $(t_test52_SOURCES) $(t_test53_SOURCES) \ + $(t_test54_SOURCES) $(t_test55_SOURCES) $(t_test56_SOURCES) \ + $(t_test57_SOURCES) $(t_test58_SOURCES) $(t_test59_SOURCES) \ + $(t_test60_SOURCES) $(t_test61_SOURCES) $(t_test62_SOURCES) \ + $(t_test63_SOURCES) $(t_test64_SOURCES) $(t_test65_SOURCES) \ + $(t_test66_SOURCES) $(t_test67_SOURCES) $(t_test68_SOURCES) \ + $(t_test69_SOURCES) $(t_test70_SOURCES) $(t_test71_SOURCES) \ + $(t_test72_SOURCES) $(t_test73_SOURCES) $(t_test74_SOURCES) \ + $(t_test76_SOURCES) $(t_test77_SOURCES) $(t_test78_SOURCES) \ + $(t_test79_SOURCES) $(t_test80_SOURCES) $(t_test81_SOURCES) \ + $(t_test82_SOURCES) $(t_test83_SOURCES) $(t_test84_SOURCES) \ + $(t_test85_SOURCES) $(t_test86_SOURCES) $(t_test87_SOURCES) \ + $(t_test88_SOURCES) $(t_test89_SOURCES) $(t_test90_SOURCES) \ + $(t_test91_SOURCES) $(t_test92_SOURCES) $(t_test93_SOURCES) \ + $(t_test94_SOURCES) $(t_test96_SOURCES) $(t_test97_SOURCES) \ + $(t_test98_SOURCES) $(t_test99_SOURCES) \ $(t_verifyperf_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__dist_doc_DATA_DIST = lcov am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -1003,12 +1036,20 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(docdir)" DATA = $(dist_doc_DATA) ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = $(am__tty_colors_dummy) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADSP_LISTS_MANNOTICE = @ADSP_LISTS_MANNOTICE@ @@ -1398,6 +1439,8 @@ t_test146_SOURCES = t-test146.c t-testdata.h t_test147_SOURCES = t-test147.c t-testdata.h t_test148_SOURCES = t-test148.c t-testdata.h +t_test149_SOURCES = t-test149.c t-testdata.h +t_test150_SOURCES = t-test150.c t-testdata.h MOSTLYCLEANFILES = $(am__append_8) $(am__append_9) $(am__append_10) #TESTS_ENVIRONMENT=./gcov-helper.sh @@ -1481,454 +1524,460 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -t-cleanup$(EXEEXT): $(t_cleanup_OBJECTS) $(t_cleanup_DEPENDENCIES) +t-cleanup$(EXEEXT): $(t_cleanup_OBJECTS) $(t_cleanup_DEPENDENCIES) $(EXTRA_t_cleanup_DEPENDENCIES) @rm -f t-cleanup$(EXEEXT) $(LINK) $(t_cleanup_OBJECTS) $(t_cleanup_LDADD) $(LIBS) -t-setup$(EXEEXT): $(t_setup_OBJECTS) $(t_setup_DEPENDENCIES) +t-setup$(EXEEXT): $(t_setup_OBJECTS) $(t_setup_DEPENDENCIES) $(EXTRA_t_setup_DEPENDENCIES) @rm -f t-setup$(EXEEXT) $(LINK) $(t_setup_OBJECTS) $(t_setup_LDADD) $(LIBS) -t-signperf$(EXEEXT): $(t_signperf_OBJECTS) $(t_signperf_DEPENDENCIES) +t-signperf$(EXEEXT): $(t_signperf_OBJECTS) $(t_signperf_DEPENDENCIES) $(EXTRA_t_signperf_DEPENDENCIES) @rm -f t-signperf$(EXEEXT) $(LINK) $(t_signperf_OBJECTS) $(t_signperf_LDADD) $(LIBS) -t-test00$(EXEEXT): $(t_test00_OBJECTS) $(t_test00_DEPENDENCIES) +t-test00$(EXEEXT): $(t_test00_OBJECTS) $(t_test00_DEPENDENCIES) $(EXTRA_t_test00_DEPENDENCIES) @rm -f t-test00$(EXEEXT) $(LINK) $(t_test00_OBJECTS) $(t_test00_LDADD) $(LIBS) -t-test01$(EXEEXT): $(t_test01_OBJECTS) $(t_test01_DEPENDENCIES) +t-test01$(EXEEXT): $(t_test01_OBJECTS) $(t_test01_DEPENDENCIES) $(EXTRA_t_test01_DEPENDENCIES) @rm -f t-test01$(EXEEXT) $(LINK) $(t_test01_OBJECTS) $(t_test01_LDADD) $(LIBS) -t-test02$(EXEEXT): $(t_test02_OBJECTS) $(t_test02_DEPENDENCIES) +t-test02$(EXEEXT): $(t_test02_OBJECTS) $(t_test02_DEPENDENCIES) $(EXTRA_t_test02_DEPENDENCIES) @rm -f t-test02$(EXEEXT) $(LINK) $(t_test02_OBJECTS) $(t_test02_LDADD) $(LIBS) -t-test03$(EXEEXT): $(t_test03_OBJECTS) $(t_test03_DEPENDENCIES) +t-test03$(EXEEXT): $(t_test03_OBJECTS) $(t_test03_DEPENDENCIES) $(EXTRA_t_test03_DEPENDENCIES) @rm -f t-test03$(EXEEXT) $(LINK) $(t_test03_OBJECTS) $(t_test03_LDADD) $(LIBS) -t-test04$(EXEEXT): $(t_test04_OBJECTS) $(t_test04_DEPENDENCIES) +t-test04$(EXEEXT): $(t_test04_OBJECTS) $(t_test04_DEPENDENCIES) $(EXTRA_t_test04_DEPENDENCIES) @rm -f t-test04$(EXEEXT) $(LINK) $(t_test04_OBJECTS) $(t_test04_LDADD) $(LIBS) -t-test05$(EXEEXT): $(t_test05_OBJECTS) $(t_test05_DEPENDENCIES) +t-test05$(EXEEXT): $(t_test05_OBJECTS) $(t_test05_DEPENDENCIES) $(EXTRA_t_test05_DEPENDENCIES) @rm -f t-test05$(EXEEXT) $(LINK) $(t_test05_OBJECTS) $(t_test05_LDADD) $(LIBS) -t-test06$(EXEEXT): $(t_test06_OBJECTS) $(t_test06_DEPENDENCIES) +t-test06$(EXEEXT): $(t_test06_OBJECTS) $(t_test06_DEPENDENCIES) $(EXTRA_t_test06_DEPENDENCIES) @rm -f t-test06$(EXEEXT) $(LINK) $(t_test06_OBJECTS) $(t_test06_LDADD) $(LIBS) -t-test07$(EXEEXT): $(t_test07_OBJECTS) $(t_test07_DEPENDENCIES) +t-test07$(EXEEXT): $(t_test07_OBJECTS) $(t_test07_DEPENDENCIES) $(EXTRA_t_test07_DEPENDENCIES) @rm -f t-test07$(EXEEXT) $(LINK) $(t_test07_OBJECTS) $(t_test07_LDADD) $(LIBS) -t-test08$(EXEEXT): $(t_test08_OBJECTS) $(t_test08_DEPENDENCIES) +t-test08$(EXEEXT): $(t_test08_OBJECTS) $(t_test08_DEPENDENCIES) $(EXTRA_t_test08_DEPENDENCIES) @rm -f t-test08$(EXEEXT) $(LINK) $(t_test08_OBJECTS) $(t_test08_LDADD) $(LIBS) -t-test09$(EXEEXT): $(t_test09_OBJECTS) $(t_test09_DEPENDENCIES) +t-test09$(EXEEXT): $(t_test09_OBJECTS) $(t_test09_DEPENDENCIES) $(EXTRA_t_test09_DEPENDENCIES) @rm -f t-test09$(EXEEXT) $(LINK) $(t_test09_OBJECTS) $(t_test09_LDADD) $(LIBS) -t-test10$(EXEEXT): $(t_test10_OBJECTS) $(t_test10_DEPENDENCIES) +t-test10$(EXEEXT): $(t_test10_OBJECTS) $(t_test10_DEPENDENCIES) $(EXTRA_t_test10_DEPENDENCIES) @rm -f t-test10$(EXEEXT) $(LINK) $(t_test10_OBJECTS) $(t_test10_LDADD) $(LIBS) -t-test100$(EXEEXT): $(t_test100_OBJECTS) $(t_test100_DEPENDENCIES) +t-test100$(EXEEXT): $(t_test100_OBJECTS) $(t_test100_DEPENDENCIES) $(EXTRA_t_test100_DEPENDENCIES) @rm -f t-test100$(EXEEXT) $(LINK) $(t_test100_OBJECTS) $(t_test100_LDADD) $(LIBS) -t-test101$(EXEEXT): $(t_test101_OBJECTS) $(t_test101_DEPENDENCIES) +t-test101$(EXEEXT): $(t_test101_OBJECTS) $(t_test101_DEPENDENCIES) $(EXTRA_t_test101_DEPENDENCIES) @rm -f t-test101$(EXEEXT) $(LINK) $(t_test101_OBJECTS) $(t_test101_LDADD) $(LIBS) -t-test102$(EXEEXT): $(t_test102_OBJECTS) $(t_test102_DEPENDENCIES) +t-test102$(EXEEXT): $(t_test102_OBJECTS) $(t_test102_DEPENDENCIES) $(EXTRA_t_test102_DEPENDENCIES) @rm -f t-test102$(EXEEXT) $(LINK) $(t_test102_OBJECTS) $(t_test102_LDADD) $(LIBS) -t-test103$(EXEEXT): $(t_test103_OBJECTS) $(t_test103_DEPENDENCIES) +t-test103$(EXEEXT): $(t_test103_OBJECTS) $(t_test103_DEPENDENCIES) $(EXTRA_t_test103_DEPENDENCIES) @rm -f t-test103$(EXEEXT) $(LINK) $(t_test103_OBJECTS) $(t_test103_LDADD) $(LIBS) -t-test104$(EXEEXT): $(t_test104_OBJECTS) $(t_test104_DEPENDENCIES) +t-test104$(EXEEXT): $(t_test104_OBJECTS) $(t_test104_DEPENDENCIES) $(EXTRA_t_test104_DEPENDENCIES) @rm -f t-test104$(EXEEXT) $(LINK) $(t_test104_OBJECTS) $(t_test104_LDADD) $(LIBS) -t-test105$(EXEEXT): $(t_test105_OBJECTS) $(t_test105_DEPENDENCIES) +t-test105$(EXEEXT): $(t_test105_OBJECTS) $(t_test105_DEPENDENCIES) $(EXTRA_t_test105_DEPENDENCIES) @rm -f t-test105$(EXEEXT) $(LINK) $(t_test105_OBJECTS) $(t_test105_LDADD) $(LIBS) -t-test106$(EXEEXT): $(t_test106_OBJECTS) $(t_test106_DEPENDENCIES) +t-test106$(EXEEXT): $(t_test106_OBJECTS) $(t_test106_DEPENDENCIES) $(EXTRA_t_test106_DEPENDENCIES) @rm -f t-test106$(EXEEXT) $(LINK) $(t_test106_OBJECTS) $(t_test106_LDADD) $(LIBS) -t-test107$(EXEEXT): $(t_test107_OBJECTS) $(t_test107_DEPENDENCIES) +t-test107$(EXEEXT): $(t_test107_OBJECTS) $(t_test107_DEPENDENCIES) $(EXTRA_t_test107_DEPENDENCIES) @rm -f t-test107$(EXEEXT) $(LINK) $(t_test107_OBJECTS) $(t_test107_LDADD) $(LIBS) -t-test108$(EXEEXT): $(t_test108_OBJECTS) $(t_test108_DEPENDENCIES) +t-test108$(EXEEXT): $(t_test108_OBJECTS) $(t_test108_DEPENDENCIES) $(EXTRA_t_test108_DEPENDENCIES) @rm -f t-test108$(EXEEXT) $(LINK) $(t_test108_OBJECTS) $(t_test108_LDADD) $(LIBS) -t-test109$(EXEEXT): $(t_test109_OBJECTS) $(t_test109_DEPENDENCIES) +t-test109$(EXEEXT): $(t_test109_OBJECTS) $(t_test109_DEPENDENCIES) $(EXTRA_t_test109_DEPENDENCIES) @rm -f t-test109$(EXEEXT) $(LINK) $(t_test109_OBJECTS) $(t_test109_LDADD) $(LIBS) -t-test11$(EXEEXT): $(t_test11_OBJECTS) $(t_test11_DEPENDENCIES) +t-test11$(EXEEXT): $(t_test11_OBJECTS) $(t_test11_DEPENDENCIES) $(EXTRA_t_test11_DEPENDENCIES) @rm -f t-test11$(EXEEXT) $(LINK) $(t_test11_OBJECTS) $(t_test11_LDADD) $(LIBS) -t-test110$(EXEEXT): $(t_test110_OBJECTS) $(t_test110_DEPENDENCIES) +t-test110$(EXEEXT): $(t_test110_OBJECTS) $(t_test110_DEPENDENCIES) $(EXTRA_t_test110_DEPENDENCIES) @rm -f t-test110$(EXEEXT) $(LINK) $(t_test110_OBJECTS) $(t_test110_LDADD) $(LIBS) -t-test111$(EXEEXT): $(t_test111_OBJECTS) $(t_test111_DEPENDENCIES) +t-test111$(EXEEXT): $(t_test111_OBJECTS) $(t_test111_DEPENDENCIES) $(EXTRA_t_test111_DEPENDENCIES) @rm -f t-test111$(EXEEXT) $(LINK) $(t_test111_OBJECTS) $(t_test111_LDADD) $(LIBS) -t-test112$(EXEEXT): $(t_test112_OBJECTS) $(t_test112_DEPENDENCIES) +t-test112$(EXEEXT): $(t_test112_OBJECTS) $(t_test112_DEPENDENCIES) $(EXTRA_t_test112_DEPENDENCIES) @rm -f t-test112$(EXEEXT) $(LINK) $(t_test112_OBJECTS) $(t_test112_LDADD) $(LIBS) -t-test113$(EXEEXT): $(t_test113_OBJECTS) $(t_test113_DEPENDENCIES) +t-test113$(EXEEXT): $(t_test113_OBJECTS) $(t_test113_DEPENDENCIES) $(EXTRA_t_test113_DEPENDENCIES) @rm -f t-test113$(EXEEXT) $(LINK) $(t_test113_OBJECTS) $(t_test113_LDADD) $(LIBS) -t-test114$(EXEEXT): $(t_test114_OBJECTS) $(t_test114_DEPENDENCIES) +t-test114$(EXEEXT): $(t_test114_OBJECTS) $(t_test114_DEPENDENCIES) $(EXTRA_t_test114_DEPENDENCIES) @rm -f t-test114$(EXEEXT) $(LINK) $(t_test114_OBJECTS) $(t_test114_LDADD) $(LIBS) -t-test115$(EXEEXT): $(t_test115_OBJECTS) $(t_test115_DEPENDENCIES) +t-test115$(EXEEXT): $(t_test115_OBJECTS) $(t_test115_DEPENDENCIES) $(EXTRA_t_test115_DEPENDENCIES) @rm -f t-test115$(EXEEXT) $(LINK) $(t_test115_OBJECTS) $(t_test115_LDADD) $(LIBS) -t-test116$(EXEEXT): $(t_test116_OBJECTS) $(t_test116_DEPENDENCIES) +t-test116$(EXEEXT): $(t_test116_OBJECTS) $(t_test116_DEPENDENCIES) $(EXTRA_t_test116_DEPENDENCIES) @rm -f t-test116$(EXEEXT) $(LINK) $(t_test116_OBJECTS) $(t_test116_LDADD) $(LIBS) -t-test117$(EXEEXT): $(t_test117_OBJECTS) $(t_test117_DEPENDENCIES) +t-test117$(EXEEXT): $(t_test117_OBJECTS) $(t_test117_DEPENDENCIES) $(EXTRA_t_test117_DEPENDENCIES) @rm -f t-test117$(EXEEXT) $(LINK) $(t_test117_OBJECTS) $(t_test117_LDADD) $(LIBS) -t-test118$(EXEEXT): $(t_test118_OBJECTS) $(t_test118_DEPENDENCIES) +t-test118$(EXEEXT): $(t_test118_OBJECTS) $(t_test118_DEPENDENCIES) $(EXTRA_t_test118_DEPENDENCIES) @rm -f t-test118$(EXEEXT) $(LINK) $(t_test118_OBJECTS) $(t_test118_LDADD) $(LIBS) -t-test119$(EXEEXT): $(t_test119_OBJECTS) $(t_test119_DEPENDENCIES) +t-test119$(EXEEXT): $(t_test119_OBJECTS) $(t_test119_DEPENDENCIES) $(EXTRA_t_test119_DEPENDENCIES) @rm -f t-test119$(EXEEXT) $(LINK) $(t_test119_OBJECTS) $(t_test119_LDADD) $(LIBS) -t-test12$(EXEEXT): $(t_test12_OBJECTS) $(t_test12_DEPENDENCIES) +t-test12$(EXEEXT): $(t_test12_OBJECTS) $(t_test12_DEPENDENCIES) $(EXTRA_t_test12_DEPENDENCIES) @rm -f t-test12$(EXEEXT) $(LINK) $(t_test12_OBJECTS) $(t_test12_LDADD) $(LIBS) -t-test120$(EXEEXT): $(t_test120_OBJECTS) $(t_test120_DEPENDENCIES) +t-test120$(EXEEXT): $(t_test120_OBJECTS) $(t_test120_DEPENDENCIES) $(EXTRA_t_test120_DEPENDENCIES) @rm -f t-test120$(EXEEXT) $(LINK) $(t_test120_OBJECTS) $(t_test120_LDADD) $(LIBS) -t-test121$(EXEEXT): $(t_test121_OBJECTS) $(t_test121_DEPENDENCIES) +t-test121$(EXEEXT): $(t_test121_OBJECTS) $(t_test121_DEPENDENCIES) $(EXTRA_t_test121_DEPENDENCIES) @rm -f t-test121$(EXEEXT) $(LINK) $(t_test121_OBJECTS) $(t_test121_LDADD) $(LIBS) -t-test122$(EXEEXT): $(t_test122_OBJECTS) $(t_test122_DEPENDENCIES) +t-test122$(EXEEXT): $(t_test122_OBJECTS) $(t_test122_DEPENDENCIES) $(EXTRA_t_test122_DEPENDENCIES) @rm -f t-test122$(EXEEXT) $(LINK) $(t_test122_OBJECTS) $(t_test122_LDADD) $(LIBS) -t-test123$(EXEEXT): $(t_test123_OBJECTS) $(t_test123_DEPENDENCIES) +t-test123$(EXEEXT): $(t_test123_OBJECTS) $(t_test123_DEPENDENCIES) $(EXTRA_t_test123_DEPENDENCIES) @rm -f t-test123$(EXEEXT) $(LINK) $(t_test123_OBJECTS) $(t_test123_LDADD) $(LIBS) -t-test125$(EXEEXT): $(t_test125_OBJECTS) $(t_test125_DEPENDENCIES) +t-test125$(EXEEXT): $(t_test125_OBJECTS) $(t_test125_DEPENDENCIES) $(EXTRA_t_test125_DEPENDENCIES) @rm -f t-test125$(EXEEXT) $(LINK) $(t_test125_OBJECTS) $(t_test125_LDADD) $(LIBS) -t-test126$(EXEEXT): $(t_test126_OBJECTS) $(t_test126_DEPENDENCIES) +t-test126$(EXEEXT): $(t_test126_OBJECTS) $(t_test126_DEPENDENCIES) $(EXTRA_t_test126_DEPENDENCIES) @rm -f t-test126$(EXEEXT) $(LINK) $(t_test126_OBJECTS) $(t_test126_LDADD) $(LIBS) -t-test127$(EXEEXT): $(t_test127_OBJECTS) $(t_test127_DEPENDENCIES) +t-test127$(EXEEXT): $(t_test127_OBJECTS) $(t_test127_DEPENDENCIES) $(EXTRA_t_test127_DEPENDENCIES) @rm -f t-test127$(EXEEXT) $(LINK) $(t_test127_OBJECTS) $(t_test127_LDADD) $(LIBS) -t-test128$(EXEEXT): $(t_test128_OBJECTS) $(t_test128_DEPENDENCIES) +t-test128$(EXEEXT): $(t_test128_OBJECTS) $(t_test128_DEPENDENCIES) $(EXTRA_t_test128_DEPENDENCIES) @rm -f t-test128$(EXEEXT) $(LINK) $(t_test128_OBJECTS) $(t_test128_LDADD) $(LIBS) -t-test129$(EXEEXT): $(t_test129_OBJECTS) $(t_test129_DEPENDENCIES) +t-test129$(EXEEXT): $(t_test129_OBJECTS) $(t_test129_DEPENDENCIES) $(EXTRA_t_test129_DEPENDENCIES) @rm -f t-test129$(EXEEXT) $(LINK) $(t_test129_OBJECTS) $(t_test129_LDADD) $(LIBS) -t-test13$(EXEEXT): $(t_test13_OBJECTS) $(t_test13_DEPENDENCIES) +t-test13$(EXEEXT): $(t_test13_OBJECTS) $(t_test13_DEPENDENCIES) $(EXTRA_t_test13_DEPENDENCIES) @rm -f t-test13$(EXEEXT) $(LINK) $(t_test13_OBJECTS) $(t_test13_LDADD) $(LIBS) -t-test130$(EXEEXT): $(t_test130_OBJECTS) $(t_test130_DEPENDENCIES) +t-test130$(EXEEXT): $(t_test130_OBJECTS) $(t_test130_DEPENDENCIES) $(EXTRA_t_test130_DEPENDENCIES) @rm -f t-test130$(EXEEXT) $(LINK) $(t_test130_OBJECTS) $(t_test130_LDADD) $(LIBS) -t-test131$(EXEEXT): $(t_test131_OBJECTS) $(t_test131_DEPENDENCIES) +t-test131$(EXEEXT): $(t_test131_OBJECTS) $(t_test131_DEPENDENCIES) $(EXTRA_t_test131_DEPENDENCIES) @rm -f t-test131$(EXEEXT) $(LINK) $(t_test131_OBJECTS) $(t_test131_LDADD) $(LIBS) -t-test132$(EXEEXT): $(t_test132_OBJECTS) $(t_test132_DEPENDENCIES) +t-test132$(EXEEXT): $(t_test132_OBJECTS) $(t_test132_DEPENDENCIES) $(EXTRA_t_test132_DEPENDENCIES) @rm -f t-test132$(EXEEXT) $(LINK) $(t_test132_OBJECTS) $(t_test132_LDADD) $(LIBS) -t-test133$(EXEEXT): $(t_test133_OBJECTS) $(t_test133_DEPENDENCIES) +t-test133$(EXEEXT): $(t_test133_OBJECTS) $(t_test133_DEPENDENCIES) $(EXTRA_t_test133_DEPENDENCIES) @rm -f t-test133$(EXEEXT) $(LINK) $(t_test133_OBJECTS) $(t_test133_LDADD) $(LIBS) -t-test134$(EXEEXT): $(t_test134_OBJECTS) $(t_test134_DEPENDENCIES) +t-test134$(EXEEXT): $(t_test134_OBJECTS) $(t_test134_DEPENDENCIES) $(EXTRA_t_test134_DEPENDENCIES) @rm -f t-test134$(EXEEXT) $(LINK) $(t_test134_OBJECTS) $(t_test134_LDADD) $(LIBS) -t-test135$(EXEEXT): $(t_test135_OBJECTS) $(t_test135_DEPENDENCIES) +t-test135$(EXEEXT): $(t_test135_OBJECTS) $(t_test135_DEPENDENCIES) $(EXTRA_t_test135_DEPENDENCIES) @rm -f t-test135$(EXEEXT) $(LINK) $(t_test135_OBJECTS) $(t_test135_LDADD) $(LIBS) -t-test136$(EXEEXT): $(t_test136_OBJECTS) $(t_test136_DEPENDENCIES) +t-test136$(EXEEXT): $(t_test136_OBJECTS) $(t_test136_DEPENDENCIES) $(EXTRA_t_test136_DEPENDENCIES) @rm -f t-test136$(EXEEXT) $(LINK) $(t_test136_OBJECTS) $(t_test136_LDADD) $(LIBS) -t-test137$(EXEEXT): $(t_test137_OBJECTS) $(t_test137_DEPENDENCIES) +t-test137$(EXEEXT): $(t_test137_OBJECTS) $(t_test137_DEPENDENCIES) $(EXTRA_t_test137_DEPENDENCIES) @rm -f t-test137$(EXEEXT) $(LINK) $(t_test137_OBJECTS) $(t_test137_LDADD) $(LIBS) -t-test138$(EXEEXT): $(t_test138_OBJECTS) $(t_test138_DEPENDENCIES) +t-test138$(EXEEXT): $(t_test138_OBJECTS) $(t_test138_DEPENDENCIES) $(EXTRA_t_test138_DEPENDENCIES) @rm -f t-test138$(EXEEXT) $(LINK) $(t_test138_OBJECTS) $(t_test138_LDADD) $(LIBS) -t-test139$(EXEEXT): $(t_test139_OBJECTS) $(t_test139_DEPENDENCIES) +t-test139$(EXEEXT): $(t_test139_OBJECTS) $(t_test139_DEPENDENCIES) $(EXTRA_t_test139_DEPENDENCIES) @rm -f t-test139$(EXEEXT) $(LINK) $(t_test139_OBJECTS) $(t_test139_LDADD) $(LIBS) -t-test14$(EXEEXT): $(t_test14_OBJECTS) $(t_test14_DEPENDENCIES) +t-test14$(EXEEXT): $(t_test14_OBJECTS) $(t_test14_DEPENDENCIES) $(EXTRA_t_test14_DEPENDENCIES) @rm -f t-test14$(EXEEXT) $(LINK) $(t_test14_OBJECTS) $(t_test14_LDADD) $(LIBS) -t-test140$(EXEEXT): $(t_test140_OBJECTS) $(t_test140_DEPENDENCIES) +t-test140$(EXEEXT): $(t_test140_OBJECTS) $(t_test140_DEPENDENCIES) $(EXTRA_t_test140_DEPENDENCIES) @rm -f t-test140$(EXEEXT) $(LINK) $(t_test140_OBJECTS) $(t_test140_LDADD) $(LIBS) -t-test141$(EXEEXT): $(t_test141_OBJECTS) $(t_test141_DEPENDENCIES) +t-test141$(EXEEXT): $(t_test141_OBJECTS) $(t_test141_DEPENDENCIES) $(EXTRA_t_test141_DEPENDENCIES) @rm -f t-test141$(EXEEXT) $(LINK) $(t_test141_OBJECTS) $(t_test141_LDADD) $(LIBS) -t-test142$(EXEEXT): $(t_test142_OBJECTS) $(t_test142_DEPENDENCIES) +t-test142$(EXEEXT): $(t_test142_OBJECTS) $(t_test142_DEPENDENCIES) $(EXTRA_t_test142_DEPENDENCIES) @rm -f t-test142$(EXEEXT) $(LINK) $(t_test142_OBJECTS) $(t_test142_LDADD) $(LIBS) -t-test143$(EXEEXT): $(t_test143_OBJECTS) $(t_test143_DEPENDENCIES) +t-test143$(EXEEXT): $(t_test143_OBJECTS) $(t_test143_DEPENDENCIES) $(EXTRA_t_test143_DEPENDENCIES) @rm -f t-test143$(EXEEXT) $(LINK) $(t_test143_OBJECTS) $(t_test143_LDADD) $(LIBS) -t-test144$(EXEEXT): $(t_test144_OBJECTS) $(t_test144_DEPENDENCIES) +t-test144$(EXEEXT): $(t_test144_OBJECTS) $(t_test144_DEPENDENCIES) $(EXTRA_t_test144_DEPENDENCIES) @rm -f t-test144$(EXEEXT) $(LINK) $(t_test144_OBJECTS) $(t_test144_LDADD) $(LIBS) -t-test145$(EXEEXT): $(t_test145_OBJECTS) $(t_test145_DEPENDENCIES) +t-test145$(EXEEXT): $(t_test145_OBJECTS) $(t_test145_DEPENDENCIES) $(EXTRA_t_test145_DEPENDENCIES) @rm -f t-test145$(EXEEXT) $(LINK) $(t_test145_OBJECTS) $(t_test145_LDADD) $(LIBS) -t-test146$(EXEEXT): $(t_test146_OBJECTS) $(t_test146_DEPENDENCIES) +t-test146$(EXEEXT): $(t_test146_OBJECTS) $(t_test146_DEPENDENCIES) $(EXTRA_t_test146_DEPENDENCIES) @rm -f t-test146$(EXEEXT) $(LINK) $(t_test146_OBJECTS) $(t_test146_LDADD) $(LIBS) -t-test147$(EXEEXT): $(t_test147_OBJECTS) $(t_test147_DEPENDENCIES) +t-test147$(EXEEXT): $(t_test147_OBJECTS) $(t_test147_DEPENDENCIES) $(EXTRA_t_test147_DEPENDENCIES) @rm -f t-test147$(EXEEXT) $(LINK) $(t_test147_OBJECTS) $(t_test147_LDADD) $(LIBS) -t-test148$(EXEEXT): $(t_test148_OBJECTS) $(t_test148_DEPENDENCIES) +t-test148$(EXEEXT): $(t_test148_OBJECTS) $(t_test148_DEPENDENCIES) $(EXTRA_t_test148_DEPENDENCIES) @rm -f t-test148$(EXEEXT) $(LINK) $(t_test148_OBJECTS) $(t_test148_LDADD) $(LIBS) -t-test15$(EXEEXT): $(t_test15_OBJECTS) $(t_test15_DEPENDENCIES) +t-test149$(EXEEXT): $(t_test149_OBJECTS) $(t_test149_DEPENDENCIES) $(EXTRA_t_test149_DEPENDENCIES) + @rm -f t-test149$(EXEEXT) + $(LINK) $(t_test149_OBJECTS) $(t_test149_LDADD) $(LIBS) +t-test15$(EXEEXT): $(t_test15_OBJECTS) $(t_test15_DEPENDENCIES) $(EXTRA_t_test15_DEPENDENCIES) @rm -f t-test15$(EXEEXT) $(LINK) $(t_test15_OBJECTS) $(t_test15_LDADD) $(LIBS) -t-test16$(EXEEXT): $(t_test16_OBJECTS) $(t_test16_DEPENDENCIES) +t-test150$(EXEEXT): $(t_test150_OBJECTS) $(t_test150_DEPENDENCIES) $(EXTRA_t_test150_DEPENDENCIES) + @rm -f t-test150$(EXEEXT) + $(LINK) $(t_test150_OBJECTS) $(t_test150_LDADD) $(LIBS) +t-test16$(EXEEXT): $(t_test16_OBJECTS) $(t_test16_DEPENDENCIES) $(EXTRA_t_test16_DEPENDENCIES) @rm -f t-test16$(EXEEXT) $(LINK) $(t_test16_OBJECTS) $(t_test16_LDADD) $(LIBS) -t-test17$(EXEEXT): $(t_test17_OBJECTS) $(t_test17_DEPENDENCIES) +t-test17$(EXEEXT): $(t_test17_OBJECTS) $(t_test17_DEPENDENCIES) $(EXTRA_t_test17_DEPENDENCIES) @rm -f t-test17$(EXEEXT) $(LINK) $(t_test17_OBJECTS) $(t_test17_LDADD) $(LIBS) -t-test18$(EXEEXT): $(t_test18_OBJECTS) $(t_test18_DEPENDENCIES) +t-test18$(EXEEXT): $(t_test18_OBJECTS) $(t_test18_DEPENDENCIES) $(EXTRA_t_test18_DEPENDENCIES) @rm -f t-test18$(EXEEXT) $(LINK) $(t_test18_OBJECTS) $(t_test18_LDADD) $(LIBS) -t-test19$(EXEEXT): $(t_test19_OBJECTS) $(t_test19_DEPENDENCIES) +t-test19$(EXEEXT): $(t_test19_OBJECTS) $(t_test19_DEPENDENCIES) $(EXTRA_t_test19_DEPENDENCIES) @rm -f t-test19$(EXEEXT) $(LINK) $(t_test19_OBJECTS) $(t_test19_LDADD) $(LIBS) -t-test20$(EXEEXT): $(t_test20_OBJECTS) $(t_test20_DEPENDENCIES) +t-test20$(EXEEXT): $(t_test20_OBJECTS) $(t_test20_DEPENDENCIES) $(EXTRA_t_test20_DEPENDENCIES) @rm -f t-test20$(EXEEXT) $(LINK) $(t_test20_OBJECTS) $(t_test20_LDADD) $(LIBS) -t-test21$(EXEEXT): $(t_test21_OBJECTS) $(t_test21_DEPENDENCIES) +t-test21$(EXEEXT): $(t_test21_OBJECTS) $(t_test21_DEPENDENCIES) $(EXTRA_t_test21_DEPENDENCIES) @rm -f t-test21$(EXEEXT) $(LINK) $(t_test21_OBJECTS) $(t_test21_LDADD) $(LIBS) -t-test22$(EXEEXT): $(t_test22_OBJECTS) $(t_test22_DEPENDENCIES) +t-test22$(EXEEXT): $(t_test22_OBJECTS) $(t_test22_DEPENDENCIES) $(EXTRA_t_test22_DEPENDENCIES) @rm -f t-test22$(EXEEXT) $(LINK) $(t_test22_OBJECTS) $(t_test22_LDADD) $(LIBS) -t-test23$(EXEEXT): $(t_test23_OBJECTS) $(t_test23_DEPENDENCIES) +t-test23$(EXEEXT): $(t_test23_OBJECTS) $(t_test23_DEPENDENCIES) $(EXTRA_t_test23_DEPENDENCIES) @rm -f t-test23$(EXEEXT) $(LINK) $(t_test23_OBJECTS) $(t_test23_LDADD) $(LIBS) -t-test24$(EXEEXT): $(t_test24_OBJECTS) $(t_test24_DEPENDENCIES) +t-test24$(EXEEXT): $(t_test24_OBJECTS) $(t_test24_DEPENDENCIES) $(EXTRA_t_test24_DEPENDENCIES) @rm -f t-test24$(EXEEXT) $(LINK) $(t_test24_OBJECTS) $(t_test24_LDADD) $(LIBS) -t-test25$(EXEEXT): $(t_test25_OBJECTS) $(t_test25_DEPENDENCIES) +t-test25$(EXEEXT): $(t_test25_OBJECTS) $(t_test25_DEPENDENCIES) $(EXTRA_t_test25_DEPENDENCIES) @rm -f t-test25$(EXEEXT) $(LINK) $(t_test25_OBJECTS) $(t_test25_LDADD) $(LIBS) -t-test26$(EXEEXT): $(t_test26_OBJECTS) $(t_test26_DEPENDENCIES) +t-test26$(EXEEXT): $(t_test26_OBJECTS) $(t_test26_DEPENDENCIES) $(EXTRA_t_test26_DEPENDENCIES) @rm -f t-test26$(EXEEXT) $(LINK) $(t_test26_OBJECTS) $(t_test26_LDADD) $(LIBS) -t-test27$(EXEEXT): $(t_test27_OBJECTS) $(t_test27_DEPENDENCIES) +t-test27$(EXEEXT): $(t_test27_OBJECTS) $(t_test27_DEPENDENCIES) $(EXTRA_t_test27_DEPENDENCIES) @rm -f t-test27$(EXEEXT) $(LINK) $(t_test27_OBJECTS) $(t_test27_LDADD) $(LIBS) -t-test28$(EXEEXT): $(t_test28_OBJECTS) $(t_test28_DEPENDENCIES) +t-test28$(EXEEXT): $(t_test28_OBJECTS) $(t_test28_DEPENDENCIES) $(EXTRA_t_test28_DEPENDENCIES) @rm -f t-test28$(EXEEXT) $(LINK) $(t_test28_OBJECTS) $(t_test28_LDADD) $(LIBS) -t-test29$(EXEEXT): $(t_test29_OBJECTS) $(t_test29_DEPENDENCIES) +t-test29$(EXEEXT): $(t_test29_OBJECTS) $(t_test29_DEPENDENCIES) $(EXTRA_t_test29_DEPENDENCIES) @rm -f t-test29$(EXEEXT) $(LINK) $(t_test29_OBJECTS) $(t_test29_LDADD) $(LIBS) -t-test30$(EXEEXT): $(t_test30_OBJECTS) $(t_test30_DEPENDENCIES) +t-test30$(EXEEXT): $(t_test30_OBJECTS) $(t_test30_DEPENDENCIES) $(EXTRA_t_test30_DEPENDENCIES) @rm -f t-test30$(EXEEXT) $(LINK) $(t_test30_OBJECTS) $(t_test30_LDADD) $(LIBS) -t-test31$(EXEEXT): $(t_test31_OBJECTS) $(t_test31_DEPENDENCIES) +t-test31$(EXEEXT): $(t_test31_OBJECTS) $(t_test31_DEPENDENCIES) $(EXTRA_t_test31_DEPENDENCIES) @rm -f t-test31$(EXEEXT) $(LINK) $(t_test31_OBJECTS) $(t_test31_LDADD) $(LIBS) -t-test32$(EXEEXT): $(t_test32_OBJECTS) $(t_test32_DEPENDENCIES) +t-test32$(EXEEXT): $(t_test32_OBJECTS) $(t_test32_DEPENDENCIES) $(EXTRA_t_test32_DEPENDENCIES) @rm -f t-test32$(EXEEXT) $(LINK) $(t_test32_OBJECTS) $(t_test32_LDADD) $(LIBS) -t-test33$(EXEEXT): $(t_test33_OBJECTS) $(t_test33_DEPENDENCIES) +t-test33$(EXEEXT): $(t_test33_OBJECTS) $(t_test33_DEPENDENCIES) $(EXTRA_t_test33_DEPENDENCIES) @rm -f t-test33$(EXEEXT) $(LINK) $(t_test33_OBJECTS) $(t_test33_LDADD) $(LIBS) -t-test34$(EXEEXT): $(t_test34_OBJECTS) $(t_test34_DEPENDENCIES) +t-test34$(EXEEXT): $(t_test34_OBJECTS) $(t_test34_DEPENDENCIES) $(EXTRA_t_test34_DEPENDENCIES) @rm -f t-test34$(EXEEXT) $(LINK) $(t_test34_OBJECTS) $(t_test34_LDADD) $(LIBS) -t-test35$(EXEEXT): $(t_test35_OBJECTS) $(t_test35_DEPENDENCIES) +t-test35$(EXEEXT): $(t_test35_OBJECTS) $(t_test35_DEPENDENCIES) $(EXTRA_t_test35_DEPENDENCIES) @rm -f t-test35$(EXEEXT) $(LINK) $(t_test35_OBJECTS) $(t_test35_LDADD) $(LIBS) -t-test36$(EXEEXT): $(t_test36_OBJECTS) $(t_test36_DEPENDENCIES) +t-test36$(EXEEXT): $(t_test36_OBJECTS) $(t_test36_DEPENDENCIES) $(EXTRA_t_test36_DEPENDENCIES) @rm -f t-test36$(EXEEXT) $(LINK) $(t_test36_OBJECTS) $(t_test36_LDADD) $(LIBS) -t-test37$(EXEEXT): $(t_test37_OBJECTS) $(t_test37_DEPENDENCIES) +t-test37$(EXEEXT): $(t_test37_OBJECTS) $(t_test37_DEPENDENCIES) $(EXTRA_t_test37_DEPENDENCIES) @rm -f t-test37$(EXEEXT) $(LINK) $(t_test37_OBJECTS) $(t_test37_LDADD) $(LIBS) -t-test38$(EXEEXT): $(t_test38_OBJECTS) $(t_test38_DEPENDENCIES) +t-test38$(EXEEXT): $(t_test38_OBJECTS) $(t_test38_DEPENDENCIES) $(EXTRA_t_test38_DEPENDENCIES) @rm -f t-test38$(EXEEXT) $(LINK) $(t_test38_OBJECTS) $(t_test38_LDADD) $(LIBS) -t-test39$(EXEEXT): $(t_test39_OBJECTS) $(t_test39_DEPENDENCIES) +t-test39$(EXEEXT): $(t_test39_OBJECTS) $(t_test39_DEPENDENCIES) $(EXTRA_t_test39_DEPENDENCIES) @rm -f t-test39$(EXEEXT) $(LINK) $(t_test39_OBJECTS) $(t_test39_LDADD) $(LIBS) -t-test40$(EXEEXT): $(t_test40_OBJECTS) $(t_test40_DEPENDENCIES) +t-test40$(EXEEXT): $(t_test40_OBJECTS) $(t_test40_DEPENDENCIES) $(EXTRA_t_test40_DEPENDENCIES) @rm -f t-test40$(EXEEXT) $(LINK) $(t_test40_OBJECTS) $(t_test40_LDADD) $(LIBS) -t-test41$(EXEEXT): $(t_test41_OBJECTS) $(t_test41_DEPENDENCIES) +t-test41$(EXEEXT): $(t_test41_OBJECTS) $(t_test41_DEPENDENCIES) $(EXTRA_t_test41_DEPENDENCIES) @rm -f t-test41$(EXEEXT) $(LINK) $(t_test41_OBJECTS) $(t_test41_LDADD) $(LIBS) -t-test42$(EXEEXT): $(t_test42_OBJECTS) $(t_test42_DEPENDENCIES) +t-test42$(EXEEXT): $(t_test42_OBJECTS) $(t_test42_DEPENDENCIES) $(EXTRA_t_test42_DEPENDENCIES) @rm -f t-test42$(EXEEXT) $(LINK) $(t_test42_OBJECTS) $(t_test42_LDADD) $(LIBS) -t-test43$(EXEEXT): $(t_test43_OBJECTS) $(t_test43_DEPENDENCIES) +t-test43$(EXEEXT): $(t_test43_OBJECTS) $(t_test43_DEPENDENCIES) $(EXTRA_t_test43_DEPENDENCIES) @rm -f t-test43$(EXEEXT) $(LINK) $(t_test43_OBJECTS) $(t_test43_LDADD) $(LIBS) -t-test44$(EXEEXT): $(t_test44_OBJECTS) $(t_test44_DEPENDENCIES) +t-test44$(EXEEXT): $(t_test44_OBJECTS) $(t_test44_DEPENDENCIES) $(EXTRA_t_test44_DEPENDENCIES) @rm -f t-test44$(EXEEXT) $(LINK) $(t_test44_OBJECTS) $(t_test44_LDADD) $(LIBS) -t-test45$(EXEEXT): $(t_test45_OBJECTS) $(t_test45_DEPENDENCIES) +t-test45$(EXEEXT): $(t_test45_OBJECTS) $(t_test45_DEPENDENCIES) $(EXTRA_t_test45_DEPENDENCIES) @rm -f t-test45$(EXEEXT) $(LINK) $(t_test45_OBJECTS) $(t_test45_LDADD) $(LIBS) -t-test46$(EXEEXT): $(t_test46_OBJECTS) $(t_test46_DEPENDENCIES) +t-test46$(EXEEXT): $(t_test46_OBJECTS) $(t_test46_DEPENDENCIES) $(EXTRA_t_test46_DEPENDENCIES) @rm -f t-test46$(EXEEXT) $(LINK) $(t_test46_OBJECTS) $(t_test46_LDADD) $(LIBS) -t-test47$(EXEEXT): $(t_test47_OBJECTS) $(t_test47_DEPENDENCIES) +t-test47$(EXEEXT): $(t_test47_OBJECTS) $(t_test47_DEPENDENCIES) $(EXTRA_t_test47_DEPENDENCIES) @rm -f t-test47$(EXEEXT) $(LINK) $(t_test47_OBJECTS) $(t_test47_LDADD) $(LIBS) -t-test48$(EXEEXT): $(t_test48_OBJECTS) $(t_test48_DEPENDENCIES) +t-test48$(EXEEXT): $(t_test48_OBJECTS) $(t_test48_DEPENDENCIES) $(EXTRA_t_test48_DEPENDENCIES) @rm -f t-test48$(EXEEXT) $(LINK) $(t_test48_OBJECTS) $(t_test48_LDADD) $(LIBS) -t-test49$(EXEEXT): $(t_test49_OBJECTS) $(t_test49_DEPENDENCIES) +t-test49$(EXEEXT): $(t_test49_OBJECTS) $(t_test49_DEPENDENCIES) $(EXTRA_t_test49_DEPENDENCIES) @rm -f t-test49$(EXEEXT) $(LINK) $(t_test49_OBJECTS) $(t_test49_LDADD) $(LIBS) -t-test50$(EXEEXT): $(t_test50_OBJECTS) $(t_test50_DEPENDENCIES) +t-test50$(EXEEXT): $(t_test50_OBJECTS) $(t_test50_DEPENDENCIES) $(EXTRA_t_test50_DEPENDENCIES) @rm -f t-test50$(EXEEXT) $(LINK) $(t_test50_OBJECTS) $(t_test50_LDADD) $(LIBS) -t-test51$(EXEEXT): $(t_test51_OBJECTS) $(t_test51_DEPENDENCIES) +t-test51$(EXEEXT): $(t_test51_OBJECTS) $(t_test51_DEPENDENCIES) $(EXTRA_t_test51_DEPENDENCIES) @rm -f t-test51$(EXEEXT) $(LINK) $(t_test51_OBJECTS) $(t_test51_LDADD) $(LIBS) -t-test52$(EXEEXT): $(t_test52_OBJECTS) $(t_test52_DEPENDENCIES) +t-test52$(EXEEXT): $(t_test52_OBJECTS) $(t_test52_DEPENDENCIES) $(EXTRA_t_test52_DEPENDENCIES) @rm -f t-test52$(EXEEXT) $(LINK) $(t_test52_OBJECTS) $(t_test52_LDADD) $(LIBS) -t-test53$(EXEEXT): $(t_test53_OBJECTS) $(t_test53_DEPENDENCIES) +t-test53$(EXEEXT): $(t_test53_OBJECTS) $(t_test53_DEPENDENCIES) $(EXTRA_t_test53_DEPENDENCIES) @rm -f t-test53$(EXEEXT) $(LINK) $(t_test53_OBJECTS) $(t_test53_LDADD) $(LIBS) -t-test54$(EXEEXT): $(t_test54_OBJECTS) $(t_test54_DEPENDENCIES) +t-test54$(EXEEXT): $(t_test54_OBJECTS) $(t_test54_DEPENDENCIES) $(EXTRA_t_test54_DEPENDENCIES) @rm -f t-test54$(EXEEXT) $(LINK) $(t_test54_OBJECTS) $(t_test54_LDADD) $(LIBS) -t-test55$(EXEEXT): $(t_test55_OBJECTS) $(t_test55_DEPENDENCIES) +t-test55$(EXEEXT): $(t_test55_OBJECTS) $(t_test55_DEPENDENCIES) $(EXTRA_t_test55_DEPENDENCIES) @rm -f t-test55$(EXEEXT) $(LINK) $(t_test55_OBJECTS) $(t_test55_LDADD) $(LIBS) -t-test56$(EXEEXT): $(t_test56_OBJECTS) $(t_test56_DEPENDENCIES) +t-test56$(EXEEXT): $(t_test56_OBJECTS) $(t_test56_DEPENDENCIES) $(EXTRA_t_test56_DEPENDENCIES) @rm -f t-test56$(EXEEXT) $(LINK) $(t_test56_OBJECTS) $(t_test56_LDADD) $(LIBS) -t-test57$(EXEEXT): $(t_test57_OBJECTS) $(t_test57_DEPENDENCIES) +t-test57$(EXEEXT): $(t_test57_OBJECTS) $(t_test57_DEPENDENCIES) $(EXTRA_t_test57_DEPENDENCIES) @rm -f t-test57$(EXEEXT) $(LINK) $(t_test57_OBJECTS) $(t_test57_LDADD) $(LIBS) -t-test58$(EXEEXT): $(t_test58_OBJECTS) $(t_test58_DEPENDENCIES) +t-test58$(EXEEXT): $(t_test58_OBJECTS) $(t_test58_DEPENDENCIES) $(EXTRA_t_test58_DEPENDENCIES) @rm -f t-test58$(EXEEXT) $(LINK) $(t_test58_OBJECTS) $(t_test58_LDADD) $(LIBS) -t-test59$(EXEEXT): $(t_test59_OBJECTS) $(t_test59_DEPENDENCIES) +t-test59$(EXEEXT): $(t_test59_OBJECTS) $(t_test59_DEPENDENCIES) $(EXTRA_t_test59_DEPENDENCIES) @rm -f t-test59$(EXEEXT) $(LINK) $(t_test59_OBJECTS) $(t_test59_LDADD) $(LIBS) -t-test60$(EXEEXT): $(t_test60_OBJECTS) $(t_test60_DEPENDENCIES) +t-test60$(EXEEXT): $(t_test60_OBJECTS) $(t_test60_DEPENDENCIES) $(EXTRA_t_test60_DEPENDENCIES) @rm -f t-test60$(EXEEXT) $(LINK) $(t_test60_OBJECTS) $(t_test60_LDADD) $(LIBS) -t-test61$(EXEEXT): $(t_test61_OBJECTS) $(t_test61_DEPENDENCIES) +t-test61$(EXEEXT): $(t_test61_OBJECTS) $(t_test61_DEPENDENCIES) $(EXTRA_t_test61_DEPENDENCIES) @rm -f t-test61$(EXEEXT) $(LINK) $(t_test61_OBJECTS) $(t_test61_LDADD) $(LIBS) -t-test62$(EXEEXT): $(t_test62_OBJECTS) $(t_test62_DEPENDENCIES) +t-test62$(EXEEXT): $(t_test62_OBJECTS) $(t_test62_DEPENDENCIES) $(EXTRA_t_test62_DEPENDENCIES) @rm -f t-test62$(EXEEXT) $(LINK) $(t_test62_OBJECTS) $(t_test62_LDADD) $(LIBS) -t-test63$(EXEEXT): $(t_test63_OBJECTS) $(t_test63_DEPENDENCIES) +t-test63$(EXEEXT): $(t_test63_OBJECTS) $(t_test63_DEPENDENCIES) $(EXTRA_t_test63_DEPENDENCIES) @rm -f t-test63$(EXEEXT) $(LINK) $(t_test63_OBJECTS) $(t_test63_LDADD) $(LIBS) -t-test64$(EXEEXT): $(t_test64_OBJECTS) $(t_test64_DEPENDENCIES) +t-test64$(EXEEXT): $(t_test64_OBJECTS) $(t_test64_DEPENDENCIES) $(EXTRA_t_test64_DEPENDENCIES) @rm -f t-test64$(EXEEXT) $(LINK) $(t_test64_OBJECTS) $(t_test64_LDADD) $(LIBS) -t-test65$(EXEEXT): $(t_test65_OBJECTS) $(t_test65_DEPENDENCIES) +t-test65$(EXEEXT): $(t_test65_OBJECTS) $(t_test65_DEPENDENCIES) $(EXTRA_t_test65_DEPENDENCIES) @rm -f t-test65$(EXEEXT) $(LINK) $(t_test65_OBJECTS) $(t_test65_LDADD) $(LIBS) -t-test66$(EXEEXT): $(t_test66_OBJECTS) $(t_test66_DEPENDENCIES) +t-test66$(EXEEXT): $(t_test66_OBJECTS) $(t_test66_DEPENDENCIES) $(EXTRA_t_test66_DEPENDENCIES) @rm -f t-test66$(EXEEXT) $(LINK) $(t_test66_OBJECTS) $(t_test66_LDADD) $(LIBS) -t-test67$(EXEEXT): $(t_test67_OBJECTS) $(t_test67_DEPENDENCIES) +t-test67$(EXEEXT): $(t_test67_OBJECTS) $(t_test67_DEPENDENCIES) $(EXTRA_t_test67_DEPENDENCIES) @rm -f t-test67$(EXEEXT) $(LINK) $(t_test67_OBJECTS) $(t_test67_LDADD) $(LIBS) -t-test68$(EXEEXT): $(t_test68_OBJECTS) $(t_test68_DEPENDENCIES) +t-test68$(EXEEXT): $(t_test68_OBJECTS) $(t_test68_DEPENDENCIES) $(EXTRA_t_test68_DEPENDENCIES) @rm -f t-test68$(EXEEXT) $(LINK) $(t_test68_OBJECTS) $(t_test68_LDADD) $(LIBS) -t-test69$(EXEEXT): $(t_test69_OBJECTS) $(t_test69_DEPENDENCIES) +t-test69$(EXEEXT): $(t_test69_OBJECTS) $(t_test69_DEPENDENCIES) $(EXTRA_t_test69_DEPENDENCIES) @rm -f t-test69$(EXEEXT) $(LINK) $(t_test69_OBJECTS) $(t_test69_LDADD) $(LIBS) -t-test70$(EXEEXT): $(t_test70_OBJECTS) $(t_test70_DEPENDENCIES) +t-test70$(EXEEXT): $(t_test70_OBJECTS) $(t_test70_DEPENDENCIES) $(EXTRA_t_test70_DEPENDENCIES) @rm -f t-test70$(EXEEXT) $(LINK) $(t_test70_OBJECTS) $(t_test70_LDADD) $(LIBS) -t-test71$(EXEEXT): $(t_test71_OBJECTS) $(t_test71_DEPENDENCIES) +t-test71$(EXEEXT): $(t_test71_OBJECTS) $(t_test71_DEPENDENCIES) $(EXTRA_t_test71_DEPENDENCIES) @rm -f t-test71$(EXEEXT) $(LINK) $(t_test71_OBJECTS) $(t_test71_LDADD) $(LIBS) -t-test72$(EXEEXT): $(t_test72_OBJECTS) $(t_test72_DEPENDENCIES) +t-test72$(EXEEXT): $(t_test72_OBJECTS) $(t_test72_DEPENDENCIES) $(EXTRA_t_test72_DEPENDENCIES) @rm -f t-test72$(EXEEXT) $(LINK) $(t_test72_OBJECTS) $(t_test72_LDADD) $(LIBS) -t-test73$(EXEEXT): $(t_test73_OBJECTS) $(t_test73_DEPENDENCIES) +t-test73$(EXEEXT): $(t_test73_OBJECTS) $(t_test73_DEPENDENCIES) $(EXTRA_t_test73_DEPENDENCIES) @rm -f t-test73$(EXEEXT) $(LINK) $(t_test73_OBJECTS) $(t_test73_LDADD) $(LIBS) -t-test74$(EXEEXT): $(t_test74_OBJECTS) $(t_test74_DEPENDENCIES) +t-test74$(EXEEXT): $(t_test74_OBJECTS) $(t_test74_DEPENDENCIES) $(EXTRA_t_test74_DEPENDENCIES) @rm -f t-test74$(EXEEXT) $(LINK) $(t_test74_OBJECTS) $(t_test74_LDADD) $(LIBS) -t-test76$(EXEEXT): $(t_test76_OBJECTS) $(t_test76_DEPENDENCIES) +t-test76$(EXEEXT): $(t_test76_OBJECTS) $(t_test76_DEPENDENCIES) $(EXTRA_t_test76_DEPENDENCIES) @rm -f t-test76$(EXEEXT) $(LINK) $(t_test76_OBJECTS) $(t_test76_LDADD) $(LIBS) -t-test77$(EXEEXT): $(t_test77_OBJECTS) $(t_test77_DEPENDENCIES) +t-test77$(EXEEXT): $(t_test77_OBJECTS) $(t_test77_DEPENDENCIES) $(EXTRA_t_test77_DEPENDENCIES) @rm -f t-test77$(EXEEXT) $(LINK) $(t_test77_OBJECTS) $(t_test77_LDADD) $(LIBS) -t-test78$(EXEEXT): $(t_test78_OBJECTS) $(t_test78_DEPENDENCIES) +t-test78$(EXEEXT): $(t_test78_OBJECTS) $(t_test78_DEPENDENCIES) $(EXTRA_t_test78_DEPENDENCIES) @rm -f t-test78$(EXEEXT) $(LINK) $(t_test78_OBJECTS) $(t_test78_LDADD) $(LIBS) -t-test79$(EXEEXT): $(t_test79_OBJECTS) $(t_test79_DEPENDENCIES) +t-test79$(EXEEXT): $(t_test79_OBJECTS) $(t_test79_DEPENDENCIES) $(EXTRA_t_test79_DEPENDENCIES) @rm -f t-test79$(EXEEXT) $(LINK) $(t_test79_OBJECTS) $(t_test79_LDADD) $(LIBS) -t-test80$(EXEEXT): $(t_test80_OBJECTS) $(t_test80_DEPENDENCIES) +t-test80$(EXEEXT): $(t_test80_OBJECTS) $(t_test80_DEPENDENCIES) $(EXTRA_t_test80_DEPENDENCIES) @rm -f t-test80$(EXEEXT) $(LINK) $(t_test80_OBJECTS) $(t_test80_LDADD) $(LIBS) -t-test81$(EXEEXT): $(t_test81_OBJECTS) $(t_test81_DEPENDENCIES) +t-test81$(EXEEXT): $(t_test81_OBJECTS) $(t_test81_DEPENDENCIES) $(EXTRA_t_test81_DEPENDENCIES) @rm -f t-test81$(EXEEXT) $(LINK) $(t_test81_OBJECTS) $(t_test81_LDADD) $(LIBS) -t-test82$(EXEEXT): $(t_test82_OBJECTS) $(t_test82_DEPENDENCIES) +t-test82$(EXEEXT): $(t_test82_OBJECTS) $(t_test82_DEPENDENCIES) $(EXTRA_t_test82_DEPENDENCIES) @rm -f t-test82$(EXEEXT) $(LINK) $(t_test82_OBJECTS) $(t_test82_LDADD) $(LIBS) -t-test83$(EXEEXT): $(t_test83_OBJECTS) $(t_test83_DEPENDENCIES) +t-test83$(EXEEXT): $(t_test83_OBJECTS) $(t_test83_DEPENDENCIES) $(EXTRA_t_test83_DEPENDENCIES) @rm -f t-test83$(EXEEXT) $(LINK) $(t_test83_OBJECTS) $(t_test83_LDADD) $(LIBS) -t-test84$(EXEEXT): $(t_test84_OBJECTS) $(t_test84_DEPENDENCIES) +t-test84$(EXEEXT): $(t_test84_OBJECTS) $(t_test84_DEPENDENCIES) $(EXTRA_t_test84_DEPENDENCIES) @rm -f t-test84$(EXEEXT) $(LINK) $(t_test84_OBJECTS) $(t_test84_LDADD) $(LIBS) -t-test85$(EXEEXT): $(t_test85_OBJECTS) $(t_test85_DEPENDENCIES) +t-test85$(EXEEXT): $(t_test85_OBJECTS) $(t_test85_DEPENDENCIES) $(EXTRA_t_test85_DEPENDENCIES) @rm -f t-test85$(EXEEXT) $(LINK) $(t_test85_OBJECTS) $(t_test85_LDADD) $(LIBS) -t-test86$(EXEEXT): $(t_test86_OBJECTS) $(t_test86_DEPENDENCIES) +t-test86$(EXEEXT): $(t_test86_OBJECTS) $(t_test86_DEPENDENCIES) $(EXTRA_t_test86_DEPENDENCIES) @rm -f t-test86$(EXEEXT) $(LINK) $(t_test86_OBJECTS) $(t_test86_LDADD) $(LIBS) -t-test87$(EXEEXT): $(t_test87_OBJECTS) $(t_test87_DEPENDENCIES) +t-test87$(EXEEXT): $(t_test87_OBJECTS) $(t_test87_DEPENDENCIES) $(EXTRA_t_test87_DEPENDENCIES) @rm -f t-test87$(EXEEXT) $(LINK) $(t_test87_OBJECTS) $(t_test87_LDADD) $(LIBS) -t-test88$(EXEEXT): $(t_test88_OBJECTS) $(t_test88_DEPENDENCIES) +t-test88$(EXEEXT): $(t_test88_OBJECTS) $(t_test88_DEPENDENCIES) $(EXTRA_t_test88_DEPENDENCIES) @rm -f t-test88$(EXEEXT) $(LINK) $(t_test88_OBJECTS) $(t_test88_LDADD) $(LIBS) -t-test89$(EXEEXT): $(t_test89_OBJECTS) $(t_test89_DEPENDENCIES) +t-test89$(EXEEXT): $(t_test89_OBJECTS) $(t_test89_DEPENDENCIES) $(EXTRA_t_test89_DEPENDENCIES) @rm -f t-test89$(EXEEXT) $(LINK) $(t_test89_OBJECTS) $(t_test89_LDADD) $(LIBS) -t-test90$(EXEEXT): $(t_test90_OBJECTS) $(t_test90_DEPENDENCIES) +t-test90$(EXEEXT): $(t_test90_OBJECTS) $(t_test90_DEPENDENCIES) $(EXTRA_t_test90_DEPENDENCIES) @rm -f t-test90$(EXEEXT) $(LINK) $(t_test90_OBJECTS) $(t_test90_LDADD) $(LIBS) -t-test91$(EXEEXT): $(t_test91_OBJECTS) $(t_test91_DEPENDENCIES) +t-test91$(EXEEXT): $(t_test91_OBJECTS) $(t_test91_DEPENDENCIES) $(EXTRA_t_test91_DEPENDENCIES) @rm -f t-test91$(EXEEXT) $(LINK) $(t_test91_OBJECTS) $(t_test91_LDADD) $(LIBS) -t-test92$(EXEEXT): $(t_test92_OBJECTS) $(t_test92_DEPENDENCIES) +t-test92$(EXEEXT): $(t_test92_OBJECTS) $(t_test92_DEPENDENCIES) $(EXTRA_t_test92_DEPENDENCIES) @rm -f t-test92$(EXEEXT) $(LINK) $(t_test92_OBJECTS) $(t_test92_LDADD) $(LIBS) -t-test93$(EXEEXT): $(t_test93_OBJECTS) $(t_test93_DEPENDENCIES) +t-test93$(EXEEXT): $(t_test93_OBJECTS) $(t_test93_DEPENDENCIES) $(EXTRA_t_test93_DEPENDENCIES) @rm -f t-test93$(EXEEXT) $(LINK) $(t_test93_OBJECTS) $(t_test93_LDADD) $(LIBS) -t-test94$(EXEEXT): $(t_test94_OBJECTS) $(t_test94_DEPENDENCIES) +t-test94$(EXEEXT): $(t_test94_OBJECTS) $(t_test94_DEPENDENCIES) $(EXTRA_t_test94_DEPENDENCIES) @rm -f t-test94$(EXEEXT) $(LINK) $(t_test94_OBJECTS) $(t_test94_LDADD) $(LIBS) -t-test96$(EXEEXT): $(t_test96_OBJECTS) $(t_test96_DEPENDENCIES) +t-test96$(EXEEXT): $(t_test96_OBJECTS) $(t_test96_DEPENDENCIES) $(EXTRA_t_test96_DEPENDENCIES) @rm -f t-test96$(EXEEXT) $(LINK) $(t_test96_OBJECTS) $(t_test96_LDADD) $(LIBS) -t-test97$(EXEEXT): $(t_test97_OBJECTS) $(t_test97_DEPENDENCIES) +t-test97$(EXEEXT): $(t_test97_OBJECTS) $(t_test97_DEPENDENCIES) $(EXTRA_t_test97_DEPENDENCIES) @rm -f t-test97$(EXEEXT) $(LINK) $(t_test97_OBJECTS) $(t_test97_LDADD) $(LIBS) -t-test98$(EXEEXT): $(t_test98_OBJECTS) $(t_test98_DEPENDENCIES) +t-test98$(EXEEXT): $(t_test98_OBJECTS) $(t_test98_DEPENDENCIES) $(EXTRA_t_test98_DEPENDENCIES) @rm -f t-test98$(EXEEXT) $(LINK) $(t_test98_OBJECTS) $(t_test98_LDADD) $(LIBS) -t-test99$(EXEEXT): $(t_test99_OBJECTS) $(t_test99_DEPENDENCIES) +t-test99$(EXEEXT): $(t_test99_OBJECTS) $(t_test99_DEPENDENCIES) $(EXTRA_t_test99_DEPENDENCIES) @rm -f t-test99$(EXEEXT) $(LINK) $(t_test99_OBJECTS) $(t_test99_LDADD) $(LIBS) -t-verifyperf$(EXEEXT): $(t_verifyperf_OBJECTS) $(t_verifyperf_DEPENDENCIES) +t-verifyperf$(EXEEXT): $(t_verifyperf_OBJECTS) $(t_verifyperf_DEPENDENCIES) $(EXTRA_t_verifyperf_DEPENDENCIES) @rm -f t-verifyperf$(EXEEXT) $(LINK) $(t_verifyperf_OBJECTS) $(t_verifyperf_LDADD) $(LIBS) @@ -2004,7 +2053,9 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-test146.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-test147.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-test148.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-test149.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-test15.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-test150.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-test16.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-test17.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-test18.Po@am__quote@ @@ -2117,8 +2168,11 @@ -rm -rf .libs _libs install-dist_docDATA: $(dist_doc_DATA) @$(NORMAL_INSTALL) - test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)" @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -2132,9 +2186,7 @@ @$(NORMAL_UNINSTALL) @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(docdir)" && rm -f $$files + dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -2185,6 +2237,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -2198,7 +2264,7 @@ if test -f ./$$tst; then dir=./; \ elif test -f $$tst; then dir=; \ else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + if $(TESTS_ENVIRONMENT) $${dir}$$tst $(AM_TESTS_FD_REDIRECT); then \ all=`expr $$all + 1`; \ case " $(XFAIL_TESTS) " in \ *[\ \ ]$$tst[\ \ ]*) \ @@ -2269,14 +2335,15 @@ fi; \ dashes=`echo "$$dashes" | sed s/./=/g`; \ if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ + col="$$grn"; \ else \ - echo "$$red$$dashes"; \ + col="$$red"; \ fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ + echo "$${col}$$dashes$${std}"; \ + echo "$${col}$$banner$${std}"; \ + test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ + test -z "$$report" || echo "$${col}$$report$${std}"; \ + echo "$${col}$$dashes$${std}"; \ test "$$failed" -eq 0; \ else :; fi @@ -2330,10 +2397,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) @@ -2423,8 +2495,8 @@ .MAKE: check-am install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am check-local \ - clean clean-checkPROGRAMS clean-generic clean-libtool ctags \ - distclean distclean-compile distclean-generic \ + clean clean-checkPROGRAMS clean-generic clean-libtool \ + cscopelist 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-dist_docDATA install-dvi \ diff -Nru opendkim-2.6.2/libopendkim/tests/t-test149.c opendkim-2.6.8/libopendkim/tests/t-test149.c --- opendkim-2.6.2/libopendkim/tests/t-test149.c 1970-01-01 00:00:00.000000000 +0000 +++ opendkim-2.6.8/libopendkim/tests/t-test149.c 2012-10-24 21:37:13.000000000 +0000 @@ -0,0 +1,268 @@ +/* +** Copyright (c) 2005-2008 Sendmail, Inc. and its suppliers. +** All rights reserved. +** +** Copyright (c) 2009, 2011, 2012, The OpenDKIM Project. All rights reserved. +*/ + +#ifndef lint +static char t_test149_c_id[] = "@(#)$Id: t-test149.c,v 1.2 2009/12/08 19:14:27 cm-msk Exp $"; +#endif /* !lint */ + +#include "build-config.h" + +/* system includes */ +#include +#include +#include +#include + +#ifdef USE_GNUTLS +# include +#endif /* USE_GNUTLS */ + +/* libopendkim includes */ +#include "../dkim.h" +#include "t-testdata.h" + +#define MAXHEADER 4096 + +#define SIG2 "v=1; a=rsa-sha1; c=relaxed/relaxed; d=example.com; s=test;\r\n\tt=1172620939; bh=Z9ONHHsBrKN0pbfrOu025VfbdR4=; l=340; h=Received:\r\n\t Received:Received:From:To:Date:Subject:Message-ID; b=NiN+5WZz+O0jY\r\n\t+OH1mCVhv3zM+SrJ6i0wTrhoaDOawOTwW10dF/ZTaMdFmrjJkQfxQenKQN0hmxRNm0Q\r\n\tabHoiaaO1N5owKY0/cUV78U5Z05bNjGl9P9goSgNsLGukRgjb+ellUI8U97Xi9mFjOG\r\n\tWm1iJ2FIq31Bh1mybmvlveKA=" + +/* +** MAIN -- program mainline +** +** Parameters: +** The usual. +** +** Return value: +** Exit status. +*/ + +int +main(int argc, char **argv) +{ + u_int flags; + DKIM_STAT status; + DKIM *dkim; + DKIM_LIB *lib; + dkim_query_t qtype = DKIM_QUERY_FILE; + unsigned char hdr[MAXHEADER + 1]; + + printf("*** relaxed/relaxed rsa-sha1 verifying with missing end CRLF\n"); + +#ifdef USE_GNUTLS + (void) gnutls_global_init(); +#endif /* USE_GNUTLS */ + + /* instantiate the library */ + lib = dkim_init(NULL, NULL); + assert(lib != NULL); + +#ifdef TEST_KEEP_FILES + /* set flags */ + flags = (DKIM_LIBFLAGS_TMPFILES|DKIM_LIBFLAGS_KEEPFILES); + (void) dkim_options(lib, DKIM_OP_SETOPT, DKIM_OPTS_FLAGS, &flags, + sizeof flags); +#endif /* TEST_KEEP_FILES */ + + (void) dkim_options(lib, DKIM_OP_GETOPT, DKIM_OPTS_FLAGS, &flags, + sizeof flags); + flags |= DKIM_LIBFLAGS_SIGNLEN; + (void) dkim_options(lib, DKIM_OP_SETOPT, DKIM_OPTS_FLAGS, &flags, + sizeof flags); + + (void) dkim_options(lib, DKIM_OP_SETOPT, DKIM_OPTS_QUERYMETHOD, + &qtype, sizeof qtype); + (void) dkim_options(lib, DKIM_OP_SETOPT, DKIM_OPTS_QUERYINFO, + KEYFILE, strlen(KEYFILE)); + + dkim = dkim_verify(lib, JOBID, NULL, &status); + assert(dkim != NULL); + + snprintf(hdr, sizeof hdr, "%s: %s", DKIM_SIGNHEADER, SIG2); + status = dkim_header(dkim, hdr, strlen(hdr)); + assert(status == DKIM_STAT_OK); + + status = dkim_header(dkim, HEADER01, strlen(HEADER01)); + assert(status == DKIM_STAT_OK); + + status = dkim_header(dkim, HEADER02, strlen(HEADER02)); + assert(status == DKIM_STAT_OK); + + status = dkim_header(dkim, HEADER03, strlen(HEADER03)); + assert(status == DKIM_STAT_OK); + + status = dkim_header(dkim, HEADER04, strlen(HEADER04)); + assert(status == DKIM_STAT_OK); + + status = dkim_header(dkim, HEADER05, strlen(HEADER05)); + assert(status == DKIM_STAT_OK); + + status = dkim_header(dkim, HEADER06, strlen(HEADER06)); + assert(status == DKIM_STAT_OK); + + status = dkim_header(dkim, HEADER07, strlen(HEADER07)); + assert(status == DKIM_STAT_OK); + + status = dkim_header(dkim, HEADER08, strlen(HEADER08)); + assert(status == DKIM_STAT_OK); + + status = dkim_header(dkim, HEADER09, strlen(HEADER09)); + assert(status == DKIM_STAT_OK); + + status = dkim_eoh(dkim); + assert(status == DKIM_STAT_OK); + + status = dkim_body(dkim, BODY00, strlen(BODY00)); + assert(status == DKIM_STAT_OK); + + status = dkim_body(dkim, BODY01, strlen(BODY01)); + assert(status == DKIM_STAT_OK); + + status = dkim_body(dkim, BODY01A, strlen(BODY01A)); + assert(status == DKIM_STAT_OK); + status = dkim_body(dkim, BODY01B, strlen(BODY01B)); + assert(status == DKIM_STAT_OK); + status = dkim_body(dkim, BODY01C, strlen(BODY01C)); + assert(status == DKIM_STAT_OK); + status = dkim_body(dkim, BODY01D, strlen(BODY01D)); + assert(status == DKIM_STAT_OK); + status = dkim_body(dkim, BODY01E, strlen(BODY01E)); + assert(status == DKIM_STAT_OK); + + status = dkim_body(dkim, BODY02, strlen(BODY02)); + assert(status == DKIM_STAT_OK); + + status = dkim_body(dkim, BODY03, strlen(BODY03)); + assert(status == DKIM_STAT_OK); + + status = dkim_body(dkim, BODY04, strlen(BODY04)); + assert(status == DKIM_STAT_OK); + + status = dkim_body(dkim, BODY03, strlen(BODY03)); + assert(status == DKIM_STAT_OK); + + status = dkim_body(dkim, BODY03, strlen(BODY03)); + assert(status == DKIM_STAT_OK); + + status = dkim_body(dkim, BODY05, strlen(BODY05)); + assert(status == DKIM_STAT_OK); + + status = dkim_body(dkim, BODY03, strlen(BODY03)); + assert(status == DKIM_STAT_OK); + + status = dkim_body(dkim, BODY03, strlen(BODY03)); + assert(status == DKIM_STAT_OK); + + status = dkim_body(dkim, BODY06, strlen(BODY06) - 2); + assert(status == DKIM_STAT_OK); + + status = dkim_eom(dkim, NULL); + assert(status == DKIM_STAT_SYNTAX); + + status = dkim_free(dkim); + assert(status == DKIM_STAT_OK); + + (void) dkim_options(lib, DKIM_OP_GETOPT, DKIM_OPTS_FLAGS, &flags, + sizeof flags); + flags |= DKIM_LIBFLAGS_FIXCRLF; + (void) dkim_options(lib, DKIM_OP_SETOPT, DKIM_OPTS_FLAGS, &flags, + sizeof flags); + + (void) dkim_options(lib, DKIM_OP_SETOPT, DKIM_OPTS_QUERYMETHOD, + &qtype, sizeof qtype); + (void) dkim_options(lib, DKIM_OP_SETOPT, DKIM_OPTS_QUERYINFO, + KEYFILE, strlen(KEYFILE)); + + dkim = dkim_verify(lib, JOBID, NULL, &status); + assert(dkim != NULL); + + snprintf(hdr, sizeof hdr, "%s: %s", DKIM_SIGNHEADER, SIG2); + status = dkim_header(dkim, hdr, strlen(hdr)); + assert(status == DKIM_STAT_OK); + + status = dkim_header(dkim, HEADER01, strlen(HEADER01)); + assert(status == DKIM_STAT_OK); + + status = dkim_header(dkim, HEADER02, strlen(HEADER02)); + assert(status == DKIM_STAT_OK); + + status = dkim_header(dkim, HEADER03, strlen(HEADER03)); + assert(status == DKIM_STAT_OK); + + status = dkim_header(dkim, HEADER04, strlen(HEADER04)); + assert(status == DKIM_STAT_OK); + + status = dkim_header(dkim, HEADER05, strlen(HEADER05)); + assert(status == DKIM_STAT_OK); + + status = dkim_header(dkim, HEADER06, strlen(HEADER06)); + assert(status == DKIM_STAT_OK); + + status = dkim_header(dkim, HEADER07, strlen(HEADER07)); + assert(status == DKIM_STAT_OK); + + status = dkim_header(dkim, HEADER08, strlen(HEADER08)); + assert(status == DKIM_STAT_OK); + + status = dkim_header(dkim, HEADER09, strlen(HEADER09)); + assert(status == DKIM_STAT_OK); + + status = dkim_eoh(dkim); + assert(status == DKIM_STAT_OK); + + status = dkim_body(dkim, BODY00, strlen(BODY00)); + assert(status == DKIM_STAT_OK); + + status = dkim_body(dkim, BODY01, strlen(BODY01)); + assert(status == DKIM_STAT_OK); + + status = dkim_body(dkim, BODY01A, strlen(BODY01A)); + assert(status == DKIM_STAT_OK); + status = dkim_body(dkim, BODY01B, strlen(BODY01B)); + assert(status == DKIM_STAT_OK); + status = dkim_body(dkim, BODY01C, strlen(BODY01C)); + assert(status == DKIM_STAT_OK); + status = dkim_body(dkim, BODY01D, strlen(BODY01D)); + assert(status == DKIM_STAT_OK); + status = dkim_body(dkim, BODY01E, strlen(BODY01E)); + assert(status == DKIM_STAT_OK); + + status = dkim_body(dkim, BODY02, strlen(BODY02)); + assert(status == DKIM_STAT_OK); + + status = dkim_body(dkim, BODY03, strlen(BODY03)); + assert(status == DKIM_STAT_OK); + + status = dkim_body(dkim, BODY04, strlen(BODY04)); + assert(status == DKIM_STAT_OK); + + status = dkim_body(dkim, BODY03, strlen(BODY03)); + assert(status == DKIM_STAT_OK); + + status = dkim_body(dkim, BODY03, strlen(BODY03)); + assert(status == DKIM_STAT_OK); + + status = dkim_body(dkim, BODY05, strlen(BODY05)); + assert(status == DKIM_STAT_OK); + + status = dkim_body(dkim, BODY03, strlen(BODY03)); + assert(status == DKIM_STAT_OK); + + status = dkim_body(dkim, BODY03, strlen(BODY03)); + assert(status == DKIM_STAT_OK); + + status = dkim_body(dkim, BODY06, strlen(BODY06) - 2); + assert(status == DKIM_STAT_OK); + + status = dkim_eom(dkim, NULL); + assert(status == DKIM_STAT_OK); + + status = dkim_free(dkim); + assert(status == DKIM_STAT_OK); + + dkim_close(lib); + + return 0; +} diff -Nru opendkim-2.6.2/libopendkim/tests/t-test150.c opendkim-2.6.8/libopendkim/tests/t-test150.c --- opendkim-2.6.2/libopendkim/tests/t-test150.c 1970-01-01 00:00:00.000000000 +0000 +++ opendkim-2.6.8/libopendkim/tests/t-test150.c 2012-10-24 21:52:25.000000000 +0000 @@ -0,0 +1,156 @@ +/* +** Copyright (c) 2005-2008 Sendmail, Inc. and its suppliers. +** All rights reserved. +** +** Copyright (c) 2009, 2011, 2012, The Trusted Domain Project. +** All rights reserved. +*/ + +#include "build-config.h" + +/* system includes */ +#include +#include +#include +#include + +#ifdef USE_GNUTLS +# include +#endif /* USE_GNUTLS */ + +/* libopendkim includes */ +#include "../dkim.h" +#include "t-testdata.h" + +#define MAXHEADER 4096 + +/* +** MAIN -- program mainline +** +** Parameters: +** The usual. +** +** Return value: +** Exit status. +*/ + +int +main(int argc, char **argv) +{ +#ifdef TEST_KEEP_FILES + u_int flags; +#endif /* TEST_KEEP_FILES */ + DKIM_STAT status; + uint64_t fixed_time; + DKIM *dkim; + DKIM_LIB *lib; + dkim_sigkey_t key; + unsigned char hdr[MAXHEADER + 1]; + + printf("*** relaxed/relaxed rsa-sha1 signing with small key (failure)\n"); + +#ifdef USE_GNUTLS + (void) gnutls_global_init(); +#endif /* USE_GNUTLS */ + + /* instantiate the library */ + lib = dkim_init(NULL, NULL); + assert(lib != NULL); + +#ifdef TEST_KEEP_FILES + /* set flags */ + flags = (DKIM_LIBFLAGS_TMPFILES|DKIM_LIBFLAGS_KEEPFILES); + (void) dkim_options(lib, DKIM_OP_SETOPT, DKIM_OPTS_FLAGS, &flags, + sizeof flags); +#endif /* TEST_KEEP_FILES */ + + key = SMALLKEY; + + dkim = dkim_sign(lib, JOBID, NULL, key, SELECTOR, DOMAIN, + DKIM_CANON_RELAXED, DKIM_CANON_RELAXED, + DKIM_SIGN_RSASHA1, -1L, &status); + assert(dkim != NULL); + + /* fix signing time */ + fixed_time = 1172620939; + (void) dkim_options(lib, DKIM_OP_SETOPT, DKIM_OPTS_FIXEDTIME, + &fixed_time, sizeof fixed_time); + + status = dkim_header(dkim, HEADER02, strlen(HEADER02)); + assert(status == DKIM_STAT_OK); + + status = dkim_header(dkim, HEADER03, strlen(HEADER03)); + assert(status == DKIM_STAT_OK); + + status = dkim_header(dkim, HEADER04, strlen(HEADER04)); + assert(status == DKIM_STAT_OK); + + status = dkim_header(dkim, HEADER05, strlen(HEADER05)); + assert(status == DKIM_STAT_OK); + + status = dkim_header(dkim, HEADER06, strlen(HEADER06)); + assert(status == DKIM_STAT_OK); + + status = dkim_header(dkim, HEADER07, strlen(HEADER07)); + assert(status == DKIM_STAT_OK); + + status = dkim_header(dkim, HEADER08, strlen(HEADER08)); + assert(status == DKIM_STAT_OK); + + status = dkim_header(dkim, HEADER09, strlen(HEADER09)); + assert(status == DKIM_STAT_OK); + + status = dkim_eoh(dkim); + assert(status == DKIM_STAT_OK); + + status = dkim_body(dkim, BODY00, strlen(BODY00)); + assert(status == DKIM_STAT_OK); + + status = dkim_body(dkim, BODY01, strlen(BODY01)); + assert(status == DKIM_STAT_OK); + + status = dkim_body(dkim, BODY01A, strlen(BODY01A)); + assert(status == DKIM_STAT_OK); + status = dkim_body(dkim, BODY01B, strlen(BODY01B)); + assert(status == DKIM_STAT_OK); + status = dkim_body(dkim, BODY01C, strlen(BODY01C)); + assert(status == DKIM_STAT_OK); + status = dkim_body(dkim, BODY01D, strlen(BODY01D)); + assert(status == DKIM_STAT_OK); + status = dkim_body(dkim, BODY01E, strlen(BODY01E)); + assert(status == DKIM_STAT_OK); + + status = dkim_body(dkim, BODY02, strlen(BODY02)); + assert(status == DKIM_STAT_OK); + + status = dkim_body(dkim, BODY03, strlen(BODY03)); + assert(status == DKIM_STAT_OK); + + status = dkim_body(dkim, BODY04, strlen(BODY04)); + assert(status == DKIM_STAT_OK); + + status = dkim_body(dkim, BODY03, strlen(BODY03)); + assert(status == DKIM_STAT_OK); + + status = dkim_body(dkim, BODY03, strlen(BODY03)); + assert(status == DKIM_STAT_OK); + + status = dkim_body(dkim, BODY05, strlen(BODY05)); + assert(status == DKIM_STAT_OK); + + status = dkim_body(dkim, BODY03, strlen(BODY03)); + assert(status == DKIM_STAT_OK); + + status = dkim_body(dkim, BODY03, strlen(BODY03)); + assert(status == DKIM_STAT_OK); + + status = dkim_eom(dkim, NULL); + assert(status == DKIM_STAT_INVALID); + + status = dkim_free(dkim); + assert(status == DKIM_STAT_OK); + + dkim_close(lib); + + return 0; +} diff -Nru opendkim-2.6.2/libopendkim/tests/t-testdata.h opendkim-2.6.8/libopendkim/tests/t-testdata.h --- opendkim-2.6.2/libopendkim/tests/t-testdata.h 2012-06-18 14:20:09.000000000 +0000 +++ opendkim-2.6.8/libopendkim/tests/t-testdata.h 2012-10-24 21:52:25.000000000 +0000 @@ -104,6 +104,15 @@ "A3WL/wbaHsfOYf9Y+g1NAkAGLhx67Ah+uBNK4Xvfz0YPGINX20m+CMsxAw7FOaNv\n" \ "IW2oWFfZCB4APkIis79Ql45AHpavwx5XodBMzZwJUvlL\n" \ "-----END RSA PRIVATE KEY-----\n" +#define SMALLKEY "-----BEGIN RSA PRIVATE KEY-----\n" \ + "MIIBOwIBAAJBAKmXwtw3FU/88TPoOpYR3FKkD4ViDLQZOSitce6cJzdoksJ2Vs9T\n" \ + "l6d1V9OIOsvktC1nmaZ8Xs5I7oMkJF8PbXUCAwEAAQJBAJxAG6NDCNrKY/x8AMZV\n" \ + "LFXjm/07KhMgjh4hNzAtJKCRs3NscczUlR/iA//ZmkccSJONmV6WWLo54H5lJPWi\n" \ + "jmECIQDS3m6eOt4WY4W4WWC2eMuYeOOIzSK71aWuX4qJVgYZLQIhAM3jzTlssVyh\n" \ + "y34LCV4Wap5e2eH/wlpLnHWsVD3sR8JpAiBbxJNtZv8JzUv/e14caxtngoy7F1Mb\n" \ + "XZIZ/dhDhl1nDQIhAK3rADDB4BCfm4WdTQxtYyLkfKiro0EjHcdJCuBD91oBAiB3\n" \ + "dJk2Cl+yMP+oIqR6bDZQY5lzuaE5v3GMRSSWC94B6A==\n" \ + "-----END RSA PRIVATE KEY-----\n" #define PUBLICKEY "v=DKIM1; k=rsa; t=y:s; h=sha1:sha256; p=" \ "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC4GUGr+d/6SFNzVLYpphnRd0QP" \ "GKz2uWnV65RAxa1Pw352BqizqiKOBjgYGzj8pJQSs8tOvv/2k6jpI809RnESqOFg" \ diff -Nru opendkim-2.6.2/librbl/Makefile.in opendkim-2.6.8/librbl/Makefile.in --- opendkim-2.6.2/librbl/Makefile.in 2012-07-02 17:59:45.000000000 +0000 +++ opendkim-2.6.8/librbl/Makefile.in 2012-10-24 21:54:44.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -22,6 +21,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -44,7 +60,7 @@ subdir = librbl DIST_COMMON = $(dist_man_MANS) $(librblinclude_HEADERS) \ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/rbl.pc.in + $(srcdir)/rbl.pc.in $(top_srcdir)/build-aux/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_pthread.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -77,6 +93,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man3dir)" \ "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(librblincludedir)" LTLIBRARIES = $(lib_LTLIBRARIES) @@ -101,6 +123,11 @@ $(LDFLAGS) -o $@ SOURCES = $(librbl_la_SOURCES) DIST_SOURCES = $(librbl_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac man3dir = $(mandir)/man3 NROFF = nroff MANS = $(dist_man_MANS) @@ -381,7 +408,6 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -389,6 +415,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ } @@ -404,13 +432,15 @@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -librbl.la: $(librbl_la_OBJECTS) $(librbl_la_DEPENDENCIES) + @list='$(lib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } +librbl.la: $(librbl_la_OBJECTS) $(librbl_la_DEPENDENCIES) $(EXTRA_librbl_la_DEPENDENCIES) $(librbl_la_LINK) -rpath $(libdir) $(librbl_la_OBJECTS) $(librbl_la_LIBADD) $(LIBS) mostlyclean-compile: @@ -449,11 +479,18 @@ -rm -rf .libs _libs install-man3: $(dist_man_MANS) @$(NORMAL_INSTALL) - test -z "$(man3dir)" || $(MKDIR_P) "$(DESTDIR)$(man3dir)" - @list=''; test -n "$(man3dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.3[a-z]*$$/p'; \ + @list1=''; \ + list2='$(dist_man_MANS)'; \ + test -n "$(man3dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man3dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man3dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.3[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -482,13 +519,14 @@ sed -n '/\.3[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^3][0-9a-z]*$$,3,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man3dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man3dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man3dir)'; $(am__uninstall_files_from_dir) install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) - test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -502,13 +540,14 @@ @$(NORMAL_UNINSTALL) @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files + dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) install-librblincludeHEADERS: $(librblinclude_HEADERS) @$(NORMAL_INSTALL) - test -z "$(librblincludedir)" || $(MKDIR_P) "$(DESTDIR)$(librblincludedir)" @list='$(librblinclude_HEADERS)'; test -n "$(librblincludedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(librblincludedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(librblincludedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -522,9 +561,7 @@ @$(NORMAL_UNINSTALL) @list='$(librblinclude_HEADERS)'; test -n "$(librblincludedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(librblincludedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(librblincludedir)" && rm -f $$files + dir='$(DESTDIR)$(librblincludedir)'; $(am__uninstall_files_from_dir) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -575,6 +612,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -585,10 +636,10 @@ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ if test -n "$$list" && \ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ + echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ + echo " typically 'make maintainer-clean' will remove them" >&2; \ exit 1; \ else :; fi; \ else :; fi @@ -638,10 +689,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -731,7 +787,7 @@ .MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool ctags distclean \ + clean-libLTLIBRARIES clean-libtool cscopelist 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 \ diff -Nru opendkim-2.6.2/libut/Makefile.in opendkim-2.6.8/libut/Makefile.in --- opendkim-2.6.2/libut/Makefile.in 2012-07-02 17:59:45.000000000 +0000 +++ opendkim-2.6.8/libut/Makefile.in 2012-10-24 21:54:44.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -22,6 +21,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -43,7 +59,8 @@ @RPATH_TRUE@am__append_1 = -rpath $(libdir) subdir = libut DIST_COMMON = $(dist_man_MANS) $(libutinclude_HEADERS) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in $(srcdir)/ut.pc.in + $(srcdir)/Makefile.am $(srcdir)/Makefile.in $(srcdir)/ut.pc.in \ + $(top_srcdir)/build-aux/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_pthread.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -76,6 +93,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man3dir)" \ "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(libutincludedir)" LTLIBRARIES = $(lib_LTLIBRARIES) @@ -100,6 +123,11 @@ $(LDFLAGS) -o $@ SOURCES = $(libut_la_SOURCES) DIST_SOURCES = $(libut_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac man3dir = $(mandir)/man3 NROFF = nroff MANS = $(dist_man_MANS) @@ -380,7 +408,6 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -388,6 +415,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ } @@ -403,13 +432,15 @@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libut.la: $(libut_la_OBJECTS) $(libut_la_DEPENDENCIES) + @list='$(lib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } +libut.la: $(libut_la_OBJECTS) $(libut_la_DEPENDENCIES) $(EXTRA_libut_la_DEPENDENCIES) $(libut_la_LINK) -rpath $(libdir) $(libut_la_OBJECTS) $(libut_la_LIBADD) $(LIBS) mostlyclean-compile: @@ -448,11 +479,18 @@ -rm -rf .libs _libs install-man3: $(dist_man_MANS) @$(NORMAL_INSTALL) - test -z "$(man3dir)" || $(MKDIR_P) "$(DESTDIR)$(man3dir)" - @list=''; test -n "$(man3dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.3[a-z]*$$/p'; \ + @list1=''; \ + list2='$(dist_man_MANS)'; \ + test -n "$(man3dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man3dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man3dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.3[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -481,13 +519,14 @@ sed -n '/\.3[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^3][0-9a-z]*$$,3,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man3dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man3dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man3dir)'; $(am__uninstall_files_from_dir) install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) - test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -501,13 +540,14 @@ @$(NORMAL_UNINSTALL) @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files + dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) install-libutincludeHEADERS: $(libutinclude_HEADERS) @$(NORMAL_INSTALL) - test -z "$(libutincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libutincludedir)" @list='$(libutinclude_HEADERS)'; test -n "$(libutincludedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libutincludedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libutincludedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -521,9 +561,7 @@ @$(NORMAL_UNINSTALL) @list='$(libutinclude_HEADERS)'; test -n "$(libutincludedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(libutincludedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(libutincludedir)" && rm -f $$files + dir='$(DESTDIR)$(libutincludedir)'; $(am__uninstall_files_from_dir) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -574,6 +612,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -584,10 +636,10 @@ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ if test -n "$$list" && \ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ + echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ + echo " typically 'make maintainer-clean' will remove them" >&2; \ exit 1; \ else :; fi; \ else :; fi @@ -637,10 +689,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -730,7 +787,7 @@ .MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool ctags distclean \ + clean-libLTLIBRARIES clean-libtool cscopelist 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 \ diff -Nru opendkim-2.6.2/libvbr/Makefile.in opendkim-2.6.8/libvbr/Makefile.in --- opendkim-2.6.2/libvbr/Makefile.in 2012-07-02 17:59:46.000000000 +0000 +++ opendkim-2.6.8/libvbr/Makefile.in 2012-10-24 21:54:44.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -22,6 +21,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -44,7 +60,7 @@ subdir = libvbr DIST_COMMON = $(dist_man_MANS) $(libvbrinclude_HEADERS) \ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/vbr.pc.in + $(srcdir)/vbr.pc.in $(top_srcdir)/build-aux/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_pthread.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -77,6 +93,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man3dir)" \ "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(libvbrincludedir)" LTLIBRARIES = $(lib_LTLIBRARIES) @@ -101,6 +123,11 @@ $(LDFLAGS) -o $@ SOURCES = $(libvbr_la_SOURCES) DIST_SOURCES = $(libvbr_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac man3dir = $(mandir)/man3 NROFF = nroff MANS = $(dist_man_MANS) @@ -381,7 +408,6 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -389,6 +415,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ } @@ -404,13 +432,15 @@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libvbr.la: $(libvbr_la_OBJECTS) $(libvbr_la_DEPENDENCIES) + @list='$(lib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } +libvbr.la: $(libvbr_la_OBJECTS) $(libvbr_la_DEPENDENCIES) $(EXTRA_libvbr_la_DEPENDENCIES) $(libvbr_la_LINK) -rpath $(libdir) $(libvbr_la_OBJECTS) $(libvbr_la_LIBADD) $(LIBS) mostlyclean-compile: @@ -449,11 +479,18 @@ -rm -rf .libs _libs install-man3: $(dist_man_MANS) @$(NORMAL_INSTALL) - test -z "$(man3dir)" || $(MKDIR_P) "$(DESTDIR)$(man3dir)" - @list=''; test -n "$(man3dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.3[a-z]*$$/p'; \ + @list1=''; \ + list2='$(dist_man_MANS)'; \ + test -n "$(man3dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man3dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man3dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.3[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -482,13 +519,14 @@ sed -n '/\.3[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^3][0-9a-z]*$$,3,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man3dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man3dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man3dir)'; $(am__uninstall_files_from_dir) install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) - test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -502,13 +540,14 @@ @$(NORMAL_UNINSTALL) @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files + dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) install-libvbrincludeHEADERS: $(libvbrinclude_HEADERS) @$(NORMAL_INSTALL) - test -z "$(libvbrincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libvbrincludedir)" @list='$(libvbrinclude_HEADERS)'; test -n "$(libvbrincludedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libvbrincludedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libvbrincludedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -522,9 +561,7 @@ @$(NORMAL_UNINSTALL) @list='$(libvbrinclude_HEADERS)'; test -n "$(libvbrincludedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(libvbrincludedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(libvbrincludedir)" && rm -f $$files + dir='$(DESTDIR)$(libvbrincludedir)'; $(am__uninstall_files_from_dir) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -575,6 +612,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -585,10 +636,10 @@ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ if test -n "$$list" && \ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ + echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ + echo " typically 'make maintainer-clean' will remove them" >&2; \ exit 1; \ else :; fi; \ else :; fi @@ -638,10 +689,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -731,7 +787,7 @@ .MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool ctags distclean \ + clean-libLTLIBRARIES clean-libtool cscopelist 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 \ diff -Nru opendkim-2.6.2/miltertest/Makefile.in opendkim-2.6.8/miltertest/Makefile.in --- opendkim-2.6.2/miltertest/Makefile.in 2012-07-02 17:59:46.000000000 +0000 +++ opendkim-2.6.8/miltertest/Makefile.in 2012-10-24 21:54:44.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -23,6 +22,23 @@ #AM_CFLAGS = --pedantic -Wall -O2 VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -43,7 +59,8 @@ host_triplet = @host@ @LUA_TRUE@bin_PROGRAMS = miltertest$(EXEEXT) subdir = miltertest -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/build-aux/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_pthread.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -80,6 +97,11 @@ $(LDFLAGS) -o $@ SOURCES = $(miltertest_SOURCES) DIST_SOURCES = $(am__miltertest_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -101,6 +123,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man8dir = $(mandir)/man8 NROFF = nroff MANS = $(man_MANS) @@ -375,8 +403,11 @@ $(am__aclocal_m4_deps): install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p || test -f $$p1; \ @@ -416,7 +447,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -miltertest$(EXEEXT): $(miltertest_OBJECTS) $(miltertest_DEPENDENCIES) +miltertest$(EXEEXT): $(miltertest_OBJECTS) $(miltertest_DEPENDENCIES) $(EXTRA_miltertest_DEPENDENCIES) @rm -f miltertest$(EXEEXT) $(miltertest_LINK) $(miltertest_OBJECTS) $(miltertest_LDADD) $(LIBS) @@ -470,11 +501,18 @@ -rm -rf .libs _libs install-man8: $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)" - @list=''; test -n "$(man8dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.8[a-z]*$$/p'; \ + @list1=''; \ + list2='$(man_MANS)'; \ + test -n "$(man8dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.8[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -503,9 +541,7 @@ sed -n '/\.8[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man8dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -556,6 +592,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -566,10 +616,10 @@ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ if test -n "$$list" && \ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ + echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ + echo " typically 'make maintainer-clean' will remove them" >&2; \ exit 1; \ else :; fi; \ else :; fi @@ -619,10 +669,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -709,19 +764,19 @@ .MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-man8 install-pdf install-pdf-am install-ps \ - install-ps-am 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-binPROGRAMS uninstall-man \ - uninstall-man8 + clean-generic clean-libtool cscopelist ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-binPROGRAMS install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-man8 install-pdf \ + install-pdf-am install-ps install-ps-am 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-binPROGRAMS \ + uninstall-man uninstall-man8 # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru opendkim-2.6.2/opendkim/Makefile.in opendkim-2.6.8/opendkim/Makefile.in --- opendkim-2.6.2/opendkim/Makefile.in 2012-07-02 17:59:46.000000000 +0000 +++ opendkim-2.6.8/opendkim/Makefile.in 2012-10-24 21:54:45.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -22,6 +21,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -184,7 +200,8 @@ $(srcdir)/opendkim-testmsg.8.in $(srcdir)/opendkim.8.in \ $(srcdir)/opendkim.conf.5.in \ $(srcdir)/opendkim.conf.simple-verify.in \ - $(srcdir)/opendkim.conf.simple.in + $(srcdir)/opendkim.conf.simple.in \ + $(top_srcdir)/build-aux/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_pthread.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -394,6 +411,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } SCRIPTS = $(dist_bin_SCRIPTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp @@ -425,6 +448,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac man1dir = $(mandir)/man1 man3dir = $(mandir)/man3 man5dir = $(mandir)/man5 @@ -878,8 +906,11 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p || test -f $$p1; \ @@ -921,8 +952,11 @@ rm -f $$list install-sbinPROGRAMS: $(sbin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)" @list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(sbindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(sbindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p || test -f $$p1; \ @@ -962,34 +996,37 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -opendkim$(EXEEXT): $(opendkim_OBJECTS) $(opendkim_DEPENDENCIES) +opendkim$(EXEEXT): $(opendkim_OBJECTS) $(opendkim_DEPENDENCIES) $(EXTRA_opendkim_DEPENDENCIES) @rm -f opendkim$(EXEEXT) $(opendkim_LINK) $(opendkim_OBJECTS) $(opendkim_LDADD) $(LIBS) -opendkim-atpszone$(EXEEXT): $(opendkim_atpszone_OBJECTS) $(opendkim_atpszone_DEPENDENCIES) +opendkim-atpszone$(EXEEXT): $(opendkim_atpszone_OBJECTS) $(opendkim_atpszone_DEPENDENCIES) $(EXTRA_opendkim_atpszone_DEPENDENCIES) @rm -f opendkim-atpszone$(EXEEXT) $(opendkim_atpszone_LINK) $(opendkim_atpszone_OBJECTS) $(opendkim_atpszone_LDADD) $(LIBS) -opendkim-genzone$(EXEEXT): $(opendkim_genzone_OBJECTS) $(opendkim_genzone_DEPENDENCIES) +opendkim-genzone$(EXEEXT): $(opendkim_genzone_OBJECTS) $(opendkim_genzone_DEPENDENCIES) $(EXTRA_opendkim_genzone_DEPENDENCIES) @rm -f opendkim-genzone$(EXEEXT) $(opendkim_genzone_LINK) $(opendkim_genzone_OBJECTS) $(opendkim_genzone_LDADD) $(LIBS) -opendkim-spam$(EXEEXT): $(opendkim_spam_OBJECTS) $(opendkim_spam_DEPENDENCIES) +opendkim-spam$(EXEEXT): $(opendkim_spam_OBJECTS) $(opendkim_spam_DEPENDENCIES) $(EXTRA_opendkim_spam_DEPENDENCIES) @rm -f opendkim-spam$(EXEEXT) $(opendkim_spam_LINK) $(opendkim_spam_OBJECTS) $(opendkim_spam_LDADD) $(LIBS) -opendkim-stats$(EXEEXT): $(opendkim_stats_OBJECTS) $(opendkim_stats_DEPENDENCIES) +opendkim-stats$(EXEEXT): $(opendkim_stats_OBJECTS) $(opendkim_stats_DEPENDENCIES) $(EXTRA_opendkim_stats_DEPENDENCIES) @rm -f opendkim-stats$(EXEEXT) $(opendkim_stats_LINK) $(opendkim_stats_OBJECTS) $(opendkim_stats_LDADD) $(LIBS) -opendkim-testadsp$(EXEEXT): $(opendkim_testadsp_OBJECTS) $(opendkim_testadsp_DEPENDENCIES) +opendkim-testadsp$(EXEEXT): $(opendkim_testadsp_OBJECTS) $(opendkim_testadsp_DEPENDENCIES) $(EXTRA_opendkim_testadsp_DEPENDENCIES) @rm -f opendkim-testadsp$(EXEEXT) $(opendkim_testadsp_LINK) $(opendkim_testadsp_OBJECTS) $(opendkim_testadsp_LDADD) $(LIBS) -opendkim-testkey$(EXEEXT): $(opendkim_testkey_OBJECTS) $(opendkim_testkey_DEPENDENCIES) +opendkim-testkey$(EXEEXT): $(opendkim_testkey_OBJECTS) $(opendkim_testkey_DEPENDENCIES) $(EXTRA_opendkim_testkey_DEPENDENCIES) @rm -f opendkim-testkey$(EXEEXT) $(opendkim_testkey_LINK) $(opendkim_testkey_OBJECTS) $(opendkim_testkey_LDADD) $(LIBS) -opendkim-testmsg$(EXEEXT): $(opendkim_testmsg_OBJECTS) $(opendkim_testmsg_DEPENDENCIES) +opendkim-testmsg$(EXEEXT): $(opendkim_testmsg_OBJECTS) $(opendkim_testmsg_DEPENDENCIES) $(EXTRA_opendkim_testmsg_DEPENDENCIES) @rm -f opendkim-testmsg$(EXEEXT) $(opendkim_testmsg_LINK) $(opendkim_testmsg_OBJECTS) $(opendkim_testmsg_LDADD) $(LIBS) install-dist_binSCRIPTS: $(dist_bin_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(dist_bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ @@ -1017,9 +1054,7 @@ @list='$(dist_bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 's,.*/,,;$(transform)'`; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(bindir)" && rm -f $$files + dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -1581,11 +1616,18 @@ -rm -rf .libs _libs install-man1: $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" - @list=''; test -n "$(man1dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.1[a-z]*$$/p'; \ + @list1=''; \ + list2='$(man_MANS)'; \ + test -n "$(man1dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.1[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -1614,16 +1656,21 @@ sed -n '/\.1[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) install-man3: $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man3dir)" || $(MKDIR_P) "$(DESTDIR)$(man3dir)" - @list=''; test -n "$(man3dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.3[a-z]*$$/p'; \ + @list1=''; \ + list2='$(man_MANS)'; \ + test -n "$(man3dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man3dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man3dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.3[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -1652,16 +1699,21 @@ sed -n '/\.3[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^3][0-9a-z]*$$,3,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man3dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man3dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man3dir)'; $(am__uninstall_files_from_dir) install-man5: $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man5dir)" || $(MKDIR_P) "$(DESTDIR)$(man5dir)" - @list=''; test -n "$(man5dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.5[a-z]*$$/p'; \ + @list1=''; \ + list2='$(man_MANS)'; \ + test -n "$(man5dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man5dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man5dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.5[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -1690,16 +1742,21 @@ sed -n '/\.5[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man5dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man5dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man5dir)'; $(am__uninstall_files_from_dir) install-man8: $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)" - @list=''; test -n "$(man8dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.8[a-z]*$$/p'; \ + @list1=''; \ + list2='$(man_MANS)'; \ + test -n "$(man8dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.8[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -1728,13 +1785,14 @@ sed -n '/\.8[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man8dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir) install-dist_docDATA: $(dist_doc_DATA) @$(NORMAL_INSTALL) - test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)" @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -1748,17 +1806,15 @@ @$(NORMAL_UNINSTALL) @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(docdir)" && rm -f $$files + dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -1768,7 +1824,11 @@ done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -1782,37 +1842,6 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ @@ -1821,6 +1850,10 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done +cscopelist-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -1884,6 +1917,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -1894,10 +1941,10 @@ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ if test -n "$$list" && \ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ + echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ + echo " typically 'make maintainer-clean' will remove them" >&2; \ exit 1; \ else :; fi; \ else :; fi @@ -1932,13 +1979,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -1976,10 +2020,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -2067,25 +2116,27 @@ uninstall-man: uninstall-man1 uninstall-man3 uninstall-man5 \ uninstall-man8 -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ + cscopelist-recursive ctags-recursive install-am install-strip \ + tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am check check-am clean clean-binPROGRAMS \ - clean-generic clean-libtool clean-sbinPROGRAMS ctags \ - ctags-recursive distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-binPROGRAMS \ - install-data install-data-am install-dist_binSCRIPTS \ - install-dist_docDATA install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-man1 install-man3 \ - install-man5 install-man8 install-pdf install-pdf-am \ - install-ps install-ps-am install-sbinPROGRAMS install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ + clean-generic clean-libtool clean-sbinPROGRAMS cscopelist \ + cscopelist-recursive ctags ctags-recursive distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-binPROGRAMS install-data \ + install-data-am install-dist_binSCRIPTS install-dist_docDATA \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-man1 install-man3 install-man5 \ + install-man8 install-pdf install-pdf-am install-ps \ + install-ps-am install-sbinPROGRAMS install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am \ uninstall-binPROGRAMS uninstall-dist_binSCRIPTS \ uninstall-dist_docDATA uninstall-man uninstall-man1 \ uninstall-man3 uninstall-man5 uninstall-man8 \ diff -Nru opendkim-2.6.2/opendkim/README opendkim-2.6.8/opendkim/README --- opendkim-2.6.2/opendkim/README 2012-06-18 14:20:09.000000000 +0000 +++ opendkim-2.6.8/opendkim/README 2012-10-24 21:37:13.000000000 +0000 @@ -19,7 +19,7 @@ COMPILING AND INSTALLING ======================== -The INSTALL document in the root of the build director covers the compilation +The INSTALL document in the root of the build directory covers the compilation and software installation of opendkim and its prerequisites. You should complete that process before continuing with the next section. diff -Nru opendkim-2.6.2/opendkim/opendkim-config.h opendkim-2.6.8/opendkim/opendkim-config.h --- opendkim-2.6.2/opendkim/opendkim-config.h 2012-06-25 03:33:43.000000000 +0000 +++ opendkim-2.6.8/opendkim/opendkim-config.h 2012-10-24 21:45:34.000000000 +0000 @@ -124,6 +124,7 @@ { "MacroList", CONFIG_TYPE_STRING, FALSE }, { "MilterDebug", CONFIG_TYPE_INTEGER, FALSE }, { "Minimum", CONFIG_TYPE_STRING, FALSE }, + { "MinimumKeyBits", CONFIG_TYPE_INTEGER, FALSE }, { "MultipleSignatures", CONFIG_TYPE_BOOLEAN, FALSE }, { "Mode", CONFIG_TYPE_STRING, FALSE }, { "MTA", CONFIG_TYPE_STRING, FALSE }, @@ -191,6 +192,9 @@ { "ResignAll", CONFIG_TYPE_BOOLEAN, FALSE }, { "ResignMailTo", CONFIG_TYPE_STRING, FALSE }, #endif /* _FFR_RESIGN */ +#ifdef USE_UNBOUND + { "ResolvConf", CONFIG_TYPE_STRING, FALSE }, +#endif /* USE_UNBOUND */ { "ResolverTracing", CONFIG_TYPE_BOOLEAN, FALSE }, #ifdef USE_LUA { "ScreenPolicyScript", CONFIG_TYPE_STRING, FALSE }, diff -Nru opendkim-2.6.2/opendkim/opendkim-db.c opendkim-2.6.8/opendkim/opendkim-db.c --- opendkim-2.6.2/opendkim/opendkim-db.c 2012-07-02 17:58:53.000000000 +0000 +++ opendkim-2.6.8/opendkim/opendkim-db.c 2012-10-24 21:37:13.000000000 +0000 @@ -2140,7 +2140,7 @@ return -1; } - newl->db_list_key = strdup(p); + newl->db_list_key = strdup(key); if (newl->db_list_key == NULL) { if (err != NULL) diff -Nru opendkim-2.6.2/opendkim/opendkim-dns.c opendkim-2.6.8/opendkim/opendkim-dns.c --- opendkim-2.6.2/opendkim/opendkim-dns.c 2012-06-18 14:20:09.000000000 +0000 +++ opendkim-2.6.8/opendkim/opendkim-dns.c 2012-10-24 21:37:13.000000000 +0000 @@ -657,6 +657,31 @@ return (status == 0 ? 0 : -1); } + +/* +** DKIMF_UNBOUND_ADD_RESOLVCONF -- tell libunbound to read a resolv.conf file +** +** Parameters: +** ub -- libunbound context +** file -- path to read +** +** Return value: +** 0 -- success +** -1 -- error +*/ + +int +dkimf_unbound_add_resolvconf(struct dkimf_unbound *ub, char *file) +{ + int status; + + assert(ub != NULL); + assert(file != NULL); + + status = ub_ctx_resolvconf(ub->ub_ub, file); + + return (status == 0 ? 0 : -1); +} #endif /* USE_UNBOUND */ #ifdef USE_ARLIB diff -Nru opendkim-2.6.2/opendkim/opendkim-dns.h opendkim-2.6.8/opendkim/opendkim-dns.h --- opendkim-2.6.2/opendkim/opendkim-dns.h 2012-06-18 14:20:09.000000000 +0000 +++ opendkim-2.6.8/opendkim/opendkim-dns.h 2012-10-24 21:37:13.000000000 +0000 @@ -42,6 +42,7 @@ /* prototypes */ extern int dkimf_unbound_add_conffile __P((struct dkimf_unbound *, char *)); +extern int dkimf_unbound_add_resolvconf __P((struct dkimf_unbound *, char *)); extern int dkimf_unbound_add_trustanchor __P((struct dkimf_unbound *, char *)); extern int dkimf_unbound_close __P((struct dkimf_unbound *)); extern int dkimf_unbound_init __P((struct dkimf_unbound **)); diff -Nru opendkim-2.6.2/opendkim/opendkim.c opendkim-2.6.8/opendkim/opendkim.c --- opendkim-2.6.2/opendkim/opendkim.c 2012-07-02 17:58:53.000000000 +0000 +++ opendkim-2.6.8/opendkim/opendkim.c 2012-10-24 21:45:34.000000000 +0000 @@ -259,6 +259,7 @@ unsigned int conf_dnstimeout; /* DNS timeout */ unsigned int conf_maxhdrsz; /* max header bytes */ unsigned int conf_maxverify; /* max sigs to verify */ + unsigned int conf_minkeybits; /* min key size (bits) */ #ifdef _FFR_REPUTATION unsigned int conf_repfactor; /* reputation factor */ unsigned int conf_repminimum; /* reputation minimum */ @@ -381,6 +382,7 @@ #ifdef USE_UNBOUND char * conf_trustanchorpath; /* unbound trust anchor file */ char * conf_unboundconfig; /* unbound config file */ + char * conf_resolvconf; /* resolv.conf file */ struct dkimf_unbound * conf_unbound; /* libunbound handle */ #endif /* USE_UNBOUND */ #ifdef USE_ARLIB @@ -774,7 +776,7 @@ sfsistat dkimf_delrcpt __P((SMFICTX *, char *)); static Header dkimf_findheader __P((msgctx, char *, int)); void *dkimf_getpriv __P((SMFICTX *)); -char * dkimf_getsymval __P((SMFICTX *, char *)); +char *dkimf_getsymval __P((SMFICTX *, char *)); sfsistat dkimf_insheader __P((SMFICTX *, int, char *, char *)); static void dkimf_policyreport __P((connctx, struct dkimf_config *, char *)); sfsistat dkimf_quarantine __P((SMFICTX *, char *)); @@ -6037,6 +6039,10 @@ &conf->conf_enablecores, sizeof conf->conf_enablecores); + (void) config_get(data, "MinimumKeyBits", + &conf->conf_minkeybits, + sizeof conf->conf_minkeybits); + (void) config_get(data, "RequestReports", &conf->conf_reqreports, sizeof conf->conf_reqreports); @@ -6415,6 +6421,18 @@ return -1; } + (void) config_get(data, "ResolvConf", + &conf->conf_resolvconf, + sizeof conf->conf_resolvconf); + + if (conf->conf_resolvconf != NULL && + access(conf->conf_resolvconf, R_OK) != 0) + { + snprintf(err, errlen, "%s: %s", + conf->conf_resolvconf, strerror(errno)); + return -1; + } + str = NULL; (void) config_get(data, "BogusKey", &str, sizeof str); if (str != NULL) @@ -8177,6 +8195,13 @@ /* set the DNS callback */ (void) dkim_set_dns_callback(lib, dkimf_sendprogress, CBINTERVAL); + if (conf->conf_minkeybits != 0) + { + (void) dkim_options(lib, DKIM_OP_SETOPT, DKIM_OPTS_MINKEYBITS, + &conf->conf_minkeybits, + sizeof conf->conf_minkeybits); + } + if (conf->conf_testdnsdb != NULL) { (void) dkimf_filedns_setup(lib, conf->conf_testdnsdb); @@ -8248,6 +8273,26 @@ } } + if (conf->conf_resolvconf != NULL) + { + if (access(conf->conf_resolvconf, R_OK) != 0) + { + if (err != NULL) + *err = "can't access unbound resolver configuration file"; + return FALSE; + } + + status = dkimf_unbound_add_resolvconf(conf->conf_unbound, + conf->conf_resolvconf); + if (status != DKIM_STAT_OK) + { + if (err != NULL) + *err = "failed to add unbound resolver configuration file"; + + return FALSE; + } + } + (void) dkimf_unbound_setup(lib, conf->conf_unbound); #endif /* USE_UNBOUND */ } @@ -10427,6 +10472,7 @@ size_t ssl; char *result; char *dnssec; + char *domain; char ss[BUFRSZ + 1]; char tmp[BUFRSZ + 1]; char val[MAXADDRESS + 1]; @@ -10527,14 +10573,16 @@ (void) dkim_sig_getidentity(dkim, sigs[c], val, sizeof val - 1); + domain = dkim_sig_getdomain(sigs[c]); + snprintf(tmp, sizeof tmp, - "%s%sdkim=%s%s (%u-bit key%s%s) header.i=%s%s%s", + "%s%sdkim=%s%s (%u-bit key%s%s) header.d=%s header.i=%s%s%s", c == 0 ? "" : ";", DELIMITER, result, comment, keybits, dnssec == NULL ? "" : "; ", dnssec == NULL ? "" : dnssec, - val, + domain, val, ts == DKIM_STAT_OK ? " header.b=" : "", ts == DKIM_STAT_OK ? ss : ""); @@ -11787,7 +11835,7 @@ memset(&dbd, '\0', sizeof dbd); dbd.dbdata_buffer = val; - dbd.dbdata_buflen = strlen(val); + dbd.dbdata_buflen = strlen(val) + 1; dbd.dbdata_flags = 0; status = dkimf_db_get(conf->conf_macrosdb, @@ -14141,7 +14189,6 @@ } else if (dfc->mctx_status != DKIMF_STATUS_UNKNOWN) { - _Bool test; u_int keybits; char *authresult; char *failstatus; @@ -14150,7 +14197,6 @@ memset(comment, '\0', sizeof comment); - test = FALSE; failstatus = (testkey ? "neutral" : "fail"); #ifdef USE_UNBOUND @@ -14324,7 +14370,7 @@ break; } - if (test) + if (testkey) { if (comment[0] == '\0') { @@ -14363,42 +14409,53 @@ if (dfc->mctx_status != DKIMF_STATUS_NOSIGNATURE) { - char ss[BUFRSZ + 1]; DKIM_STAT ts; + size_t ssl; + char *domain; + char ss[BUFRSZ + 1]; memset(ss, '\0', sizeof ss); - strlcat((char *) header, DELIMITER, - sizeof header); - strlcat((char *) header, - "header.i=", sizeof header); - strlcat((char *) header, (char *) val, - sizeof header); - sig = dkim_getsignature(dfc->mctx_dkimv); if (sig != NULL) { - size_t ssl; + domain = dkim_sig_getdomain(sig); - ssl = sizeof ss - 1; - ts = dkim_get_sigsubstring(dfc->mctx_dkimv, - sig, - ss, - &ssl); - } - - if (sig != NULL && - ts == DKIM_STAT_OK && - !conf->conf_noheaderb) - { strlcat((char *) header, DELIMITER, sizeof header); strlcat((char *) header, - "header.b=", + "header.d=", + sizeof header); + strlcat((char *) header, + domain, sizeof header); - strlcat((char *) header, ss, + strlcat((char *) header, + " header.i=", + sizeof header); + strlcat((char *) header, + (char *) val, sizeof header); + + ssl = sizeof ss - 1; + ts = dkim_get_sigsubstring(dfc->mctx_dkimv, + sig, + ss, + &ssl); + + if (ts == DKIM_STAT_OK && + !conf->conf_noheaderb) + { + strlcat((char *) header, + DELIMITER, + sizeof header); + strlcat((char *) header, + "header.b=", + sizeof header); + strlcat((char *) header, + ss, + sizeof header); + } } } } @@ -17150,12 +17207,12 @@ { syslog(LOG_ERR, "pthread_create(): %s", strerror(status)); + } - if (!autorestart && pidfile != NULL) - (void) unlink(pidfile); + if (!autorestart && pidfile != NULL) + (void) unlink(pidfile); - return EX_OSERR; - } + return EX_OSERR; } /* call the milter mainline */ diff -Nru opendkim-2.6.2/opendkim/opendkim.conf.5.in opendkim-2.6.8/opendkim/opendkim.conf.5.in --- opendkim-2.6.2/opendkim/opendkim.conf.5.in 2012-07-02 17:58:53.000000000 +0000 +++ opendkim-2.6.8/opendkim/opendkim.conf.5.in 2012-10-24 21:45:34.000000000 +0000 @@ -639,6 +639,12 @@ valid. .TP +.I MinimumKeyBits (integer) +Establishes a minimum key size for acceptable signatures. Signatures with +smaller key sizes, even if they otherwise pass DKIM validation, will me marked +as invalid. The default is 1024, which accepts all signatures. + +.TP .I Mode (string) Selects operating modes. The string is a concatenation of characters that indicate which mode(s) of operation are desired. Valid modes are @@ -730,6 +736,9 @@ (t) temp-fail the message. The default is .I accept. +Note that the "t" (testing) flag in a DKIM key does not alter this behaviour; +even keys marked as test keys whose signatures fail will still be subjected +to the selected action. .TP .I On-Default (string) @@ -943,6 +952,14 @@ @RESIGN_MANNOTICE@ .TP +.I ResolvConf (string) +Specifies a file from which a list of nameservers should be read when doing +DNS queries and applying the DNSSEC protocol. The file should be formatted +as described in +.I resolv.conf(5). See the documentation at http://unbound.net for details. +@UNBOUND_MANNOTICE@ + +.TP .I ResolverTracing (Boolean) Requests resolver tracing features be enabled, if available. The effect of this depends on how debugging features of the resolver might be implemented. diff -Nru opendkim-2.6.2/opendkim/opendkim.conf.sample opendkim-2.6.8/opendkim/opendkim.conf.sample --- opendkim-2.6.2/opendkim/opendkim.conf.sample 2012-06-18 14:20:09.000000000 +0000 +++ opendkim-2.6.8/opendkim/opendkim.conf.sample 2012-10-24 21:45:34.000000000 +0000 @@ -333,6 +333,15 @@ # Minimum n +## MinimumKeyBits n +## default 1024 +## +## Causes the library not to accept signatures matching keys made of fewer +## than the specified number of bits, even if they would otherwise pass +## DKIM signing. + +# MinimumKeyBits 1024 + ## Mode [sv] ## default sv ## diff -Nru opendkim-2.6.2/opendkim/tests/Makefile.am opendkim-2.6.8/opendkim/tests/Makefile.am --- opendkim-2.6.2/opendkim/tests/Makefile.am 2012-06-18 14:20:09.000000000 +0000 +++ opendkim-2.6.8/opendkim/tests/Makefile.am 2012-10-24 21:37:13.000000000 +0000 @@ -7,8 +7,8 @@ t-verify-unsigned t-verify-unsigned-silent \ t-verify-syntax t-verify-ss t-verify-ss-bad \ t-dontsign t-peer t-local-adsp t-local-adsp-subdomain \ - t-lua-verify-tests \ - t-adsp-report t-verify-report t-sign-report + t-lua-verify-tests t-sign-ss-macro t-sign-ss-macro-value \ + t-sign-ss-macro-value-file t-adsp-report t-verify-report t-sign-report if LIVE_TESTS if RBL @@ -45,6 +45,11 @@ t-sign-ss-all t-sign-ss-all.conf t-sign-ss-all.lua \ t-sign-ss-ltag t-sign-ss-ltag.conf t-sign-ss-ltag.lua \ t-sign-ss-macro t-sign-ss-macro.conf t-sign-ss-macro.lua \ + t-sign-ss-macro-value t-sign-ss-macro-value.conf \ + t-sign-ss-macro-value.lua \ + t-sign-ss-macro-value-file t-sign-ss-macro-value-file.conf \ + t-sign-ss-macro-value-file.lua \ + t-sign-ss-macro-value-file.list \ t-sign-ss-replace t-sign-ss-replace.conf t-sign-ss-replace.lua \ t-sign-ss-replace.txt \ t-sign-report t-sign-report.conf t-sign-report.lua \ diff -Nru opendkim-2.6.2/opendkim/tests/Makefile.in opendkim-2.6.8/opendkim/tests/Makefile.in --- opendkim-2.6.2/opendkim/tests/Makefile.in 2012-07-02 17:59:46.000000000 +0000 +++ opendkim-2.6.8/opendkim/tests/Makefile.in 2012-10-24 21:54:45.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,6 +17,23 @@ # $Id: Makefile.am,v 1.30 2010/09/13 05:32:21 cm-msk Exp $ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -59,6 +75,11 @@ CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__dist_doc_DATA_DIST = lcov am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -81,10 +102,18 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(docdir)" DATA = $(dist_doc_DATA) -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = $(am__tty_colors_dummy) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADSP_LISTS_MANNOTICE = @ADSP_LISTS_MANNOTICE@ @@ -318,7 +347,8 @@ t-verify-revoked t-verify-unspec t-verify-malformed \ t-verify-unsigned t-verify-unsigned-silent t-verify-syntax \ t-verify-ss t-verify-ss-bad t-dontsign t-peer t-local-adsp \ - t-local-adsp-subdomain t-lua-verify-tests t-adsp-report \ + t-local-adsp-subdomain t-lua-verify-tests t-sign-ss-macro \ + t-sign-ss-macro-value t-sign-ss-macro-value-file t-adsp-report \ t-verify-report t-sign-report $(am__append_1) $(am__append_2) \ $(am__append_3) $(am__append_4) TESTS = $(check_SCRIPTS) @@ -340,6 +370,11 @@ t-sign-ss-all t-sign-ss-all.conf t-sign-ss-all.lua \ t-sign-ss-ltag t-sign-ss-ltag.conf t-sign-ss-ltag.lua \ t-sign-ss-macro t-sign-ss-macro.conf t-sign-ss-macro.lua \ + t-sign-ss-macro-value t-sign-ss-macro-value.conf \ + t-sign-ss-macro-value.lua \ + t-sign-ss-macro-value-file t-sign-ss-macro-value-file.conf \ + t-sign-ss-macro-value-file.lua \ + t-sign-ss-macro-value-file.list \ t-sign-ss-replace t-sign-ss-replace.conf t-sign-ss-replace.lua \ t-sign-ss-replace.txt \ t-sign-report t-sign-report.conf t-sign-report.lua \ @@ -439,8 +474,11 @@ -rm -rf .libs _libs install-dist_docDATA: $(dist_doc_DATA) @$(NORMAL_INSTALL) - test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)" @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -454,15 +492,15 @@ @$(NORMAL_UNINSTALL) @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(docdir)" && rm -f $$files + dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: ctags: CTAGS CTAGS: +cscope cscopelist: + check-TESTS: $(TESTS) @failed=0; all=0; xfail=0; xpass=0; skip=0; \ @@ -474,7 +512,7 @@ if test -f ./$$tst; then dir=./; \ elif test -f $$tst; then dir=; \ else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + if $(TESTS_ENVIRONMENT) $${dir}$$tst $(AM_TESTS_FD_REDIRECT); then \ all=`expr $$all + 1`; \ case " $(XFAIL_TESTS) " in \ *[\ \ ]$$tst[\ \ ]*) \ @@ -545,14 +583,15 @@ fi; \ dashes=`echo "$$dashes" | sed s/./=/g`; \ if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ + col="$$grn"; \ else \ - echo "$$red$$dashes"; \ + col="$$red"; \ fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ + echo "$${col}$$dashes$${std}"; \ + echo "$${col}$$banner$${std}"; \ + test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ + test -z "$$report" || echo "$${col}$$report$${std}"; \ + echo "$${col}$$dashes$${std}"; \ test "$$failed" -eq 0; \ else :; fi @@ -606,10 +645,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) diff -Nru opendkim-2.6.2/opendkim/tests/t-sign-ss-macro-value opendkim-2.6.8/opendkim/tests/t-sign-ss-macro-value --- opendkim-2.6.2/opendkim/tests/t-sign-ss-macro-value 1970-01-01 00:00:00.000000000 +0000 +++ opendkim-2.6.8/opendkim/tests/t-sign-ss-macro-value 2012-10-24 21:37:13.000000000 +0000 @@ -0,0 +1,12 @@ +#!/bin/sh +# +# $Id: t-sign-ss-macro,v 1.1 2010/09/03 07:38:49 cm-msk Exp $ +# +# simple/simple signing test using macro-based origin selection with value test + +if [ x"$srcdir" = x"" ] +then + srcdir=`pwd` +fi + +../../miltertest/miltertest -s $srcdir/t-sign-ss-macro-value.lua diff -Nru opendkim-2.6.2/opendkim/tests/t-sign-ss-macro-value-file opendkim-2.6.8/opendkim/tests/t-sign-ss-macro-value-file --- opendkim-2.6.2/opendkim/tests/t-sign-ss-macro-value-file 1970-01-01 00:00:00.000000000 +0000 +++ opendkim-2.6.8/opendkim/tests/t-sign-ss-macro-value-file 2012-10-24 21:37:13.000000000 +0000 @@ -0,0 +1,13 @@ +#!/bin/sh +# +# $Id: t-sign-ss-macro,v 1.1 2010/09/03 07:38:49 cm-msk Exp $ +# +# simple/simple signing test using macro-based origin selection with value test +# configured with a file + +if [ x"$srcdir" = x"" ] +then + srcdir=`pwd` +fi + +../../miltertest/miltertest -s $srcdir/t-sign-ss-macro-value-file.lua diff -Nru opendkim-2.6.2/opendkim/tests/t-sign-ss-macro-value-file.conf opendkim-2.6.8/opendkim/tests/t-sign-ss-macro-value-file.conf --- opendkim-2.6.2/opendkim/tests/t-sign-ss-macro-value-file.conf 1970-01-01 00:00:00.000000000 +0000 +++ opendkim-2.6.8/opendkim/tests/t-sign-ss-macro-value-file.conf 2012-10-24 21:37:13.000000000 +0000 @@ -0,0 +1,12 @@ +# $Id: t-sign-ss-macro.conf,v 1.2 2010/09/05 09:11:52 grooverdan Exp $ +# +# simple/simple signing test using macros to validate origin with value test +# configured with a file + +Background No +Domain example.com +RequireSafeKeys No +KeyFile testkey.private +Selector test +InternalHosts - +MacroList file:t-sign-ss-macro-value-file.list diff -Nru opendkim-2.6.2/opendkim/tests/t-sign-ss-macro-value-file.list opendkim-2.6.8/opendkim/tests/t-sign-ss-macro-value-file.list --- opendkim-2.6.2/opendkim/tests/t-sign-ss-macro-value-file.list 1970-01-01 00:00:00.000000000 +0000 +++ opendkim-2.6.8/opendkim/tests/t-sign-ss-macro-value-file.list 2012-10-11 07:27:35.000000000 +0000 @@ -0,0 +1 @@ +testmacro testvalue diff -Nru opendkim-2.6.2/opendkim/tests/t-sign-ss-macro-value-file.lua opendkim-2.6.8/opendkim/tests/t-sign-ss-macro-value-file.lua --- opendkim-2.6.2/opendkim/tests/t-sign-ss-macro-value-file.lua 1970-01-01 00:00:00.000000000 +0000 +++ opendkim-2.6.8/opendkim/tests/t-sign-ss-macro-value-file.lua 2012-10-24 21:37:13.000000000 +0000 @@ -0,0 +1,127 @@ +-- $Id: t-sign-ss-macro-value-file.lua,v 1.7 2010/09/24 21:40:31 cm-msk Exp $ + +-- Copyright (c) 2009, 2010, 2012, The OpenDKIM Project. All rights reserved. + +-- simple/simple signing test using macros to validate origin +-- +-- Confirms that a signature is added with the correct contents when the +-- origin is validated via macro + +mt.echo("*** simple/simple signing test using macros to validate origin (file)") + +-- setup +sock = "unix:" .. mt.getcwd() .. "/t-sign-ss-macro-value-file.sock" +binpath = mt.getcwd() .. "/.." +if os.getenv("srcdir") ~= nil then + mt.chdir(os.getenv("srcdir")) +end + +-- try to start the filter +mt.startfilter(binpath .. "/opendkim", "-x", "t-sign-ss-macro-value-file.conf", + "-p", sock) + +-- try to connect to it +conn = mt.connect(sock, 40, 0.05) +if conn == nil then + error("mt.connect() failed") +end + +-- send connection information +-- mt.negotiate() is called implicitly +if mt.conninfo(conn, "localhost", "127.0.0.1") ~= nil then + error("mt.conninfo() failed") +end +if mt.getreply(conn) ~= SMFIR_CONTINUE then + error("mt.conninfo() unexpected reply") +end + +-- send HELO +-- if mt.helo(conn, "localhost") ~= nil then + -- error("mt.helo() failed") +-- end +-- if mt.getreply(conn) ~= SMFIR_CONTINUE then + -- error("mt.helo() unexpected reply") +-- end + +-- send envelope macros and sender data +mt.macro(conn, SMFIC_MAIL, "i", "t-sign-ss-macro-value-file", "{testmacro}", "testvalue") +if mt.mailfrom(conn, "user@example.com") ~= nil then + error("mt.mailfrom() failed") +end +if mt.getreply(conn) ~= SMFIR_CONTINUE then + error("mt.mailfrom() unexpected reply") +end + +-- send headers +-- mt.rcptto() is called implicitly +if mt.header(conn, "From", "user@example.com") ~= nil then + error("mt.header(From) failed") +end +if mt.getreply(conn) ~= SMFIR_CONTINUE then + error("mt.header(From) unexpected reply") +end +if mt.header(conn, "Date", "Tue, 22 Dec 2009 13:04:12 -0800") ~= nil then + error("mt.header(Date) failed") +end +if mt.getreply(conn) ~= SMFIR_CONTINUE then + error("mt.header(Date) unexpected reply") +end +if mt.header(conn, "Subject", "Signing test") ~= nil then + error("mt.header(Subject) failed") +end +if mt.getreply(conn) ~= SMFIR_CONTINUE then + error("mt.header(Subject) unexpected reply") +end + +-- send EOH +if mt.eoh(conn) ~= nil then + error("mt.eoh() failed") +end +if mt.getreply(conn) ~= SMFIR_CONTINUE then + error("mt.eoh() unexpected reply") +end + +-- send body +if mt.bodystring(conn, "This is a test!\r\n") ~= nil then + error("mt.bodystring() failed") +end +if mt.getreply(conn) ~= SMFIR_CONTINUE then + error("mt.bodystring() unexpected reply") +end + +-- end of message; let the filter react +if mt.eom(conn) ~= nil then + error("mt.eom() failed") +end +if mt.getreply(conn) ~= SMFIR_ACCEPT then + error("mt.eom() unexpected reply") +end + +-- verify that a signature got added +if not mt.eom_check(conn, MT_HDRINSERT, "DKIM-Signature") and + not mt.eom_check(conn, MT_HDRADD, "DKIM-Signature") then + error("no signature added") +end + +-- confirm properties +sig = mt.getheader(conn, "DKIM-Signature", 0) +if string.find(sig, "c=simple/simple", 1, true) == nil then + error("signature has wrong c= value") +end +if string.find(sig, "v=1", 1, true) == nil then + error("signature has wrong v= value") +end +if string.find(sig, "d=example.com", 1, true) == nil then + error("signature has wrong d= value") +end +if string.find(sig, "s=test", 1, true) == nil then + error("signature has wrong s= value") +end +if string.find(sig, "bh=3VWGQGY+cSNYd1MGM+X6hRXU0stl8JCaQtl4mbX/j2I=", 1, true) == nil then + error("signature has wrong bh= value") +end +if string.find(sig, "h=From:Date:Subject", 1, true) == nil then + error("signature has wrong h= value") +end + +mt.disconnect(conn) diff -Nru opendkim-2.6.2/opendkim/tests/t-sign-ss-macro-value.conf opendkim-2.6.8/opendkim/tests/t-sign-ss-macro-value.conf --- opendkim-2.6.2/opendkim/tests/t-sign-ss-macro-value.conf 1970-01-01 00:00:00.000000000 +0000 +++ opendkim-2.6.8/opendkim/tests/t-sign-ss-macro-value.conf 2012-10-24 21:37:13.000000000 +0000 @@ -0,0 +1,11 @@ +# $Id: t-sign-ss-macro.conf,v 1.2 2010/09/05 09:11:52 grooverdan Exp $ +# +# simple/simple signing test using macros to validate origin with value test + +Background No +Domain example.com +RequireSafeKeys No +KeyFile testkey.private +Selector test +InternalHosts - +MacroList testmacro=testvalue diff -Nru opendkim-2.6.2/opendkim/tests/t-sign-ss-macro-value.lua opendkim-2.6.8/opendkim/tests/t-sign-ss-macro-value.lua --- opendkim-2.6.2/opendkim/tests/t-sign-ss-macro-value.lua 1970-01-01 00:00:00.000000000 +0000 +++ opendkim-2.6.8/opendkim/tests/t-sign-ss-macro-value.lua 2012-10-24 21:37:13.000000000 +0000 @@ -0,0 +1,127 @@ +-- $Id: t-sign-ss-macro-value.lua,v 1.7 2010/09/24 21:40:31 cm-msk Exp $ + +-- Copyright (c) 2009, 2010, 2012, The OpenDKIM Project. All rights reserved. + +-- simple/simple signing test using macros to validate origin +-- +-- Confirms that a signature is added with the correct contents when the +-- origin is validated via macro + +mt.echo("*** simple/simple signing test using macros to validate origin (value)") + +-- setup +sock = "unix:" .. mt.getcwd() .. "/t-sign-ss-macro-value.sock" +binpath = mt.getcwd() .. "/.." +if os.getenv("srcdir") ~= nil then + mt.chdir(os.getenv("srcdir")) +end + +-- try to start the filter +mt.startfilter(binpath .. "/opendkim", "-x", "t-sign-ss-macro-value.conf", + "-p", sock) + +-- try to connect to it +conn = mt.connect(sock, 40, 0.05) +if conn == nil then + error("mt.connect() failed") +end + +-- send connection information +-- mt.negotiate() is called implicitly +if mt.conninfo(conn, "localhost", "127.0.0.1") ~= nil then + error("mt.conninfo() failed") +end +if mt.getreply(conn) ~= SMFIR_CONTINUE then + error("mt.conninfo() unexpected reply") +end + +-- send HELO +-- if mt.helo(conn, "localhost") ~= nil then + -- error("mt.helo() failed") +-- end +-- if mt.getreply(conn) ~= SMFIR_CONTINUE then + -- error("mt.helo() unexpected reply") +-- end + +-- send envelope macros and sender data +mt.macro(conn, SMFIC_MAIL, "i", "t-sign-ss-macro-value", "{testmacro}", "testvalue") +if mt.mailfrom(conn, "user@example.com") ~= nil then + error("mt.mailfrom() failed") +end +if mt.getreply(conn) ~= SMFIR_CONTINUE then + error("mt.mailfrom() unexpected reply") +end + +-- send headers +-- mt.rcptto() is called implicitly +if mt.header(conn, "From", "user@example.com") ~= nil then + error("mt.header(From) failed") +end +if mt.getreply(conn) ~= SMFIR_CONTINUE then + error("mt.header(From) unexpected reply") +end +if mt.header(conn, "Date", "Tue, 22 Dec 2009 13:04:12 -0800") ~= nil then + error("mt.header(Date) failed") +end +if mt.getreply(conn) ~= SMFIR_CONTINUE then + error("mt.header(Date) unexpected reply") +end +if mt.header(conn, "Subject", "Signing test") ~= nil then + error("mt.header(Subject) failed") +end +if mt.getreply(conn) ~= SMFIR_CONTINUE then + error("mt.header(Subject) unexpected reply") +end + +-- send EOH +if mt.eoh(conn) ~= nil then + error("mt.eoh() failed") +end +if mt.getreply(conn) ~= SMFIR_CONTINUE then + error("mt.eoh() unexpected reply") +end + +-- send body +if mt.bodystring(conn, "This is a test!\r\n") ~= nil then + error("mt.bodystring() failed") +end +if mt.getreply(conn) ~= SMFIR_CONTINUE then + error("mt.bodystring() unexpected reply") +end + +-- end of message; let the filter react +if mt.eom(conn) ~= nil then + error("mt.eom() failed") +end +if mt.getreply(conn) ~= SMFIR_ACCEPT then + error("mt.eom() unexpected reply") +end + +-- verify that a signature got added +if not mt.eom_check(conn, MT_HDRINSERT, "DKIM-Signature") and + not mt.eom_check(conn, MT_HDRADD, "DKIM-Signature") then + error("no signature added") +end + +-- confirm properties +sig = mt.getheader(conn, "DKIM-Signature", 0) +if string.find(sig, "c=simple/simple", 1, true) == nil then + error("signature has wrong c= value") +end +if string.find(sig, "v=1", 1, true) == nil then + error("signature has wrong v= value") +end +if string.find(sig, "d=example.com", 1, true) == nil then + error("signature has wrong d= value") +end +if string.find(sig, "s=test", 1, true) == nil then + error("signature has wrong s= value") +end +if string.find(sig, "bh=3VWGQGY+cSNYd1MGM+X6hRXU0stl8JCaQtl4mbX/j2I=", 1, true) == nil then + error("signature has wrong bh= value") +end +if string.find(sig, "h=From:Date:Subject", 1, true) == nil then + error("signature has wrong h= value") +end + +mt.disconnect(conn) diff -Nru opendkim-2.6.2/opendkim/tests/t-sign-ss-macro.lua opendkim-2.6.8/opendkim/tests/t-sign-ss-macro.lua --- opendkim-2.6.2/opendkim/tests/t-sign-ss-macro.lua 2010-11-10 18:15:42.000000000 +0000 +++ opendkim-2.6.8/opendkim/tests/t-sign-ss-macro.lua 2012-10-24 21:37:13.000000000 +0000 @@ -35,14 +35,6 @@ error("mt.conninfo() unexpected reply") end --- send HELO -if mt.helo(conn, "localhost") ~= nil then - error("mt.helo() failed") -end -if mt.getreply(conn) ~= SMFIR_CONTINUE then - error("mt.helo() unexpected reply") -end - -- send envelope macros and sender data mt.macro(conn, SMFIC_MAIL, "i", "t-sign-ss-macro", "{testmacro}", "foobar") if mt.mailfrom(conn, "user@example.com") ~= nil then diff -Nru opendkim-2.6.2/reputation/Makefile.in opendkim-2.6.8/reputation/Makefile.in --- opendkim-2.6.2/reputation/Makefile.in 2012-07-02 17:59:46.000000000 +0000 +++ opendkim-2.6.8/reputation/Makefile.in 2012-10-24 21:54:45.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -21,6 +20,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -47,7 +63,8 @@ $(srcdir)/opendkim-genrates.8.in \ $(srcdir)/opendkim-genrates.in \ $(srcdir)/opendkim-modtotals.8.in \ - $(srcdir)/opendkim-modtotals.in $(srcdir)/repute.pc.in + $(srcdir)/opendkim-modtotals.in $(srcdir)/repute.pc.in \ + $(top_srcdir)/build-aux/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_pthread.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -81,6 +98,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(docdir)" \ "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(libreputeincludedir)" @@ -110,6 +133,11 @@ $(LDFLAGS) -o $@ SOURCES = $(librepute_la_SOURCES) DIST_SOURCES = $(librepute_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac man8dir = $(mandir)/man8 NROFF = nroff MANS = $(dist_man_MANS) @@ -406,7 +434,6 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -414,6 +441,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ } @@ -429,18 +458,23 @@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -librepute.la: $(librepute_la_OBJECTS) $(librepute_la_DEPENDENCIES) + @list='$(lib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } +librepute.la: $(librepute_la_OBJECTS) $(librepute_la_DEPENDENCIES) $(EXTRA_librepute_la_DEPENDENCIES) $(librepute_la_LINK) -rpath $(libdir) $(librepute_la_OBJECTS) $(librepute_la_LIBADD) $(LIBS) install-dist_binSCRIPTS: $(dist_bin_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(dist_bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ @@ -468,9 +502,7 @@ @list='$(dist_bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 's,.*/,,;$(transform)'`; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(bindir)" && rm -f $$files + dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -515,11 +547,18 @@ -rm -rf .libs _libs install-man8: $(dist_man_MANS) @$(NORMAL_INSTALL) - test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)" - @list=''; test -n "$(man8dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.8[a-z]*$$/p'; \ + @list1=''; \ + list2='$(dist_man_MANS)'; \ + test -n "$(man8dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.8[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -548,13 +587,14 @@ sed -n '/\.8[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man8dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir) install-dist_docDATA: $(dist_doc_DATA) @$(NORMAL_INSTALL) - test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)" @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -568,13 +608,14 @@ @$(NORMAL_UNINSTALL) @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(docdir)" && rm -f $$files + dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir) install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) - test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -588,13 +629,14 @@ @$(NORMAL_UNINSTALL) @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files + dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) install-libreputeincludeHEADERS: $(libreputeinclude_HEADERS) @$(NORMAL_INSTALL) - test -z "$(libreputeincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libreputeincludedir)" @list='$(libreputeinclude_HEADERS)'; test -n "$(libreputeincludedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libreputeincludedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libreputeincludedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -608,9 +650,7 @@ @$(NORMAL_UNINSTALL) @list='$(libreputeinclude_HEADERS)'; test -n "$(libreputeincludedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(libreputeincludedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(libreputeincludedir)" && rm -f $$files + dir='$(DESTDIR)$(libreputeincludedir)'; $(am__uninstall_files_from_dir) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -661,6 +701,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -671,10 +725,10 @@ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ if test -n "$$list" && \ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ + echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ + echo " typically 'make maintainer-clean' will remove them" >&2; \ exit 1; \ else :; fi; \ else :; fi @@ -724,10 +778,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -818,7 +877,7 @@ .MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool ctags distclean \ + clean-libLTLIBRARIES clean-libtool cscopelist 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 \ diff -Nru opendkim-2.6.2/reputation/opendkim-genrates opendkim-2.6.8/reputation/opendkim-genrates --- opendkim-2.6.2/reputation/opendkim-genrates 2012-07-02 18:00:32.000000000 +0000 +++ opendkim-2.6.8/reputation/opendkim-genrates 2012-10-24 21:55:35.000000000 +0000 @@ -24,7 +24,7 @@ # general my $progname = basename($0); -my $version = "2.6.2"; +my $version = "2.6.8"; my $verbose = 0; my $helponly = 0; my $showversion = 0; diff -Nru opendkim-2.6.2/reputation/opendkim-genrates.8 opendkim-2.6.8/reputation/opendkim-genrates.8 --- opendkim-2.6.2/reputation/opendkim-genrates.8 2012-07-02 18:00:32.000000000 +0000 +++ opendkim-2.6.8/reputation/opendkim-genrates.8 2012-10-24 21:55:36.000000000 +0000 @@ -73,7 +73,7 @@ .SH VERSION This man page covers the version of .I opendkim-genrates -that shipped with version 2.6.2 of +that shipped with version 2.6.8 of .I OpenDKIM. .SH COPYRIGHT Copyright (c) 2011, 2012, The OpenDKIM Project. All rights reserved. diff -Nru opendkim-2.6.2/reputation/opendkim-modtotals opendkim-2.6.8/reputation/opendkim-modtotals --- opendkim-2.6.2/reputation/opendkim-modtotals 2012-07-02 18:00:32.000000000 +0000 +++ opendkim-2.6.8/reputation/opendkim-modtotals 2012-10-24 21:55:36.000000000 +0000 @@ -24,7 +24,7 @@ # general my $progname = basename($0); -my $version = "\2.6.2"; +my $version = "\2.6.8"; my $verbose = 0; my $helponly = 0; my $showversion = 0; diff -Nru opendkim-2.6.2/reputation/opendkim-modtotals.8 opendkim-2.6.8/reputation/opendkim-modtotals.8 --- opendkim-2.6.2/reputation/opendkim-modtotals.8 2012-07-02 18:00:32.000000000 +0000 +++ opendkim-2.6.8/reputation/opendkim-modtotals.8 2012-10-24 21:55:36.000000000 +0000 @@ -57,7 +57,7 @@ .SH VERSION This man page covers the version of .I opendkim-modtotals -that shipped with version 2.6.2 of +that shipped with version 2.6.8 of .I OpenDKIM. .SH COPYRIGHT Copyright (c) 2011, 2012, The OpenDKIM Project. All rights reserved. diff -Nru opendkim-2.6.2/stats/Makefile.in opendkim-2.6.8/stats/Makefile.in --- opendkim-2.6.2/stats/Makefile.in 2012-07-02 17:59:47.000000000 +0000 +++ opendkim-2.6.8/stats/Makefile.in 2012-10-24 21:54:45.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -22,6 +21,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,7 +67,8 @@ $(srcdir)/opendkim-genstats.8.in \ $(srcdir)/opendkim-genstats.in \ $(srcdir)/opendkim-importstats.8.in \ - $(srcdir)/opendkim-reportstats.in + $(srcdir)/opendkim-reportstats.in \ + $(top_srcdir)/build-aux/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_pthread.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -104,6 +121,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } SCRIPTS = $(dist_bin_SCRIPTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp @@ -120,6 +143,11 @@ $(LDFLAGS) -o $@ SOURCES = $(opendkim_importstats_SOURCES) DIST_SOURCES = $(am__opendkim_importstats_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac man8dir = $(mandir)/man8 NROFF = nroff MANS = $(man_MANS) @@ -421,8 +449,11 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p || test -f $$p1; \ @@ -462,13 +493,16 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -opendkim-importstats$(EXEEXT): $(opendkim_importstats_OBJECTS) $(opendkim_importstats_DEPENDENCIES) +opendkim-importstats$(EXEEXT): $(opendkim_importstats_OBJECTS) $(opendkim_importstats_DEPENDENCIES) $(EXTRA_opendkim_importstats_DEPENDENCIES) @rm -f opendkim-importstats$(EXEEXT) $(opendkim_importstats_LINK) $(opendkim_importstats_OBJECTS) $(opendkim_importstats_LDADD) $(LIBS) install-dist_binSCRIPTS: $(dist_bin_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(dist_bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ @@ -496,9 +530,7 @@ @list='$(dist_bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 's,.*/,,;$(transform)'`; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(bindir)" && rm -f $$files + dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -550,11 +582,18 @@ -rm -rf .libs _libs install-man8: $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)" - @list=''; test -n "$(man8dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.8[a-z]*$$/p'; \ + @list1=''; \ + list2='$(man_MANS)'; \ + test -n "$(man8dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.8[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -583,13 +622,14 @@ sed -n '/\.8[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man8dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir) install-dist_docDATA: $(dist_doc_DATA) @$(NORMAL_INSTALL) - test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)" @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -603,13 +643,14 @@ @$(NORMAL_UNINSTALL) @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(docdir)" && rm -f $$files + dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir) install-dist_exampleDATA: $(dist_example_DATA) @$(NORMAL_INSTALL) - test -z "$(exampledir)" || $(MKDIR_P) "$(DESTDIR)$(exampledir)" @list='$(dist_example_DATA)'; test -n "$(exampledir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(exampledir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(exampledir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -623,9 +664,7 @@ @$(NORMAL_UNINSTALL) @list='$(dist_example_DATA)'; test -n "$(exampledir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(exampledir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(exampledir)" && rm -f $$files + dir='$(DESTDIR)$(exampledir)'; $(am__uninstall_files_from_dir) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -676,6 +715,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -686,10 +739,10 @@ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ if test -n "$$list" && \ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ + echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ + echo " typically 'make maintainer-clean' will remove them" >&2; \ exit 1; \ else :; fi; \ else :; fi @@ -739,10 +792,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -832,11 +890,11 @@ .MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-data install-data-am \ - install-dist_binSCRIPTS install-dist_docDATA \ + clean-generic clean-libtool cscopelist ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-binPROGRAMS install-data \ + install-data-am install-dist_binSCRIPTS install-dist_docDATA \ install-dist_exampleDATA install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ install-info install-info-am install-man install-man8 \ diff -Nru opendkim-2.6.2/stats/opendkim-expire opendkim-2.6.8/stats/opendkim-expire --- opendkim-2.6.2/stats/opendkim-expire 2012-07-02 18:00:31.000000000 +0000 +++ opendkim-2.6.8/stats/opendkim-expire 2012-10-24 21:55:35.000000000 +0000 @@ -23,7 +23,7 @@ # general my $progname = basename($0); -my $version = "2.6.2"; +my $version = "2.6.8"; my $verbose = 0; my $helponly = 0; my $showversion = 0; diff -Nru opendkim-2.6.2/stats/opendkim-gengraphs opendkim-2.6.8/stats/opendkim-gengraphs --- opendkim-2.6.2/stats/opendkim-gengraphs 2012-07-02 18:00:32.000000000 +0000 +++ opendkim-2.6.8/stats/opendkim-gengraphs 2012-10-24 21:55:35.000000000 +0000 @@ -23,7 +23,7 @@ # general my $progname = basename($0); -my $version = "\2.6.2"; +my $version = "\2.6.8"; my $verbose = 0; my $helponly = 0; my $showversion = 0; diff -Nru opendkim-2.6.2/stats/opendkim-genstats opendkim-2.6.8/stats/opendkim-genstats --- opendkim-2.6.2/stats/opendkim-genstats 2012-07-02 18:00:32.000000000 +0000 +++ opendkim-2.6.8/stats/opendkim-genstats 2012-10-24 21:55:35.000000000 +0000 @@ -23,7 +23,7 @@ # general my $progname = basename($0); -my $version = "2.6.2"; +my $version = "2.6.8"; my $verbose = 0; my $helponly = 0; my $showversion = 0; @@ -473,7 +473,7 @@ print $out " Year \n"; print $out " Month \n"; print $out " \n"; -$dbi_s = $dbi_h->prepare("SELECT COUNT(DISTINCT signatures_domain), YEAR(messages_date), MONTHNAME(messages_date) FROM t1 WHERE (signatures_dnssec = 0 OR signatures_dnssec = 2) GROUP BY 2, 3"); +$dbi_s = $dbi_h->prepare("SELECT COUNT(DISTINCT signatures_domain), YEAR(messages_date), MONTHNAME(messages_date) FROM t1 WHERE (signatures_dnssec = 0 OR signatures_dnssec = 2) GROUP BY 2, 3 ORDER BY 2, MONTH(messages_date)"); if (!$dbi_s->execute) { print STDERR "$progname: SELECT failed: " . $dbi_h->errstr; @@ -676,7 +676,7 @@ print $out " Signatures \n"; print $out " % Passed \n"; print $out " \n"; -$dbi_s = $dbi_h->prepare("SELECT domains.name, COUNT(t1.id), 100*SUM(t1.signatures_pass)/COUNT(t1.id) FROM t1 JOIN domains ON t1.signatures_domain = domains.id GROUP BY t1.signatures_domain ORDER BY 3 DESC, 2 LIMIT 10"); +$dbi_s = $dbi_h->prepare("SELECT domains.name, COUNT(t1.id), 100*SUM(t1.signatures_pass)/COUNT(t1.id) FROM t1 JOIN domains ON t1.signatures_domain = domains.id GROUP BY t1.signatures_domain ORDER BY 3 DESC, 2 DESC LIMIT 10"); if (!$dbi_s->execute) { print STDERR "$progname: SELECT failed: " . $dbi_h->errstr; @@ -708,7 +708,7 @@ print $out " Signatures \n"; print $out " % Failed \n"; print $out " \n"; -$dbi_s = $dbi_h->prepare("SELECT domains.name, COUNT(t1.id), 100-100*SUM(signatures_pass)/COUNT(t1.id) FROM t1 JOIN domains ON t1.signatures_domain = domains.id GROUP BY t1.signatures_domain ORDER BY 3 DESC, 2 LIMIT 10"); +$dbi_s = $dbi_h->prepare("SELECT domains.name, COUNT(t1.id), 100-100*SUM(signatures_pass)/COUNT(t1.id) FROM t1 JOIN domains ON t1.signatures_domain = domains.id GROUP BY t1.signatures_domain ORDER BY 3 DESC, 2 DESC LIMIT 10"); if (!$dbi_s->execute) { print STDERR "$progname: SELECT failed: " . $dbi_h->errstr; diff -Nru opendkim-2.6.2/stats/opendkim-genstats.in opendkim-2.6.8/stats/opendkim-genstats.in --- opendkim-2.6.2/stats/opendkim-genstats.in 2012-06-18 14:20:09.000000000 +0000 +++ opendkim-2.6.8/stats/opendkim-genstats.in 2012-10-24 21:37:13.000000000 +0000 @@ -473,7 +473,7 @@ print $out " Year \n"; print $out " Month \n"; print $out " \n"; -$dbi_s = $dbi_h->prepare("SELECT COUNT(DISTINCT signatures_domain), YEAR(messages_date), MONTHNAME(messages_date) FROM t1 WHERE (signatures_dnssec = 0 OR signatures_dnssec = 2) GROUP BY 2, 3"); +$dbi_s = $dbi_h->prepare("SELECT COUNT(DISTINCT signatures_domain), YEAR(messages_date), MONTHNAME(messages_date) FROM t1 WHERE (signatures_dnssec = 0 OR signatures_dnssec = 2) GROUP BY 2, 3 ORDER BY 2, MONTH(messages_date)"); if (!$dbi_s->execute) { print STDERR "$progname: SELECT failed: " . $dbi_h->errstr; @@ -676,7 +676,7 @@ print $out " Signatures \n"; print $out " % Passed \n"; print $out " \n"; -$dbi_s = $dbi_h->prepare("SELECT domains.name, COUNT(t1.id), 100*SUM(t1.signatures_pass)/COUNT(t1.id) FROM t1 JOIN domains ON t1.signatures_domain = domains.id GROUP BY t1.signatures_domain ORDER BY 3 DESC, 2 LIMIT 10"); +$dbi_s = $dbi_h->prepare("SELECT domains.name, COUNT(t1.id), 100*SUM(t1.signatures_pass)/COUNT(t1.id) FROM t1 JOIN domains ON t1.signatures_domain = domains.id GROUP BY t1.signatures_domain ORDER BY 3 DESC, 2 DESC LIMIT 10"); if (!$dbi_s->execute) { print STDERR "$progname: SELECT failed: " . $dbi_h->errstr; @@ -708,7 +708,7 @@ print $out " Signatures \n"; print $out " % Failed \n"; print $out " \n"; -$dbi_s = $dbi_h->prepare("SELECT domains.name, COUNT(t1.id), 100-100*SUM(signatures_pass)/COUNT(t1.id) FROM t1 JOIN domains ON t1.signatures_domain = domains.id GROUP BY t1.signatures_domain ORDER BY 3 DESC, 2 LIMIT 10"); +$dbi_s = $dbi_h->prepare("SELECT domains.name, COUNT(t1.id), 100-100*SUM(signatures_pass)/COUNT(t1.id) FROM t1 JOIN domains ON t1.signatures_domain = domains.id GROUP BY t1.signatures_domain ORDER BY 3 DESC, 2 DESC LIMIT 10"); if (!$dbi_s->execute) { print STDERR "$progname: SELECT failed: " . $dbi_h->errstr; diff -Nru opendkim-2.6.2/stats/opendkim-reportstats opendkim-2.6.8/stats/opendkim-reportstats --- opendkim-2.6.2/stats/opendkim-reportstats 2012-07-02 18:00:32.000000000 +0000 +++ opendkim-2.6.8/stats/opendkim-reportstats 2012-10-24 21:55:35.000000000 +0000 @@ -27,7 +27,7 @@ PROGNAME=`basename $0` -OPENDKIMSTATS=`awk '$1 == "Statistics" { print $2 }'` +OPENDKIMSTATS=`awk '$1 == "Statistics" { print $2 }' $OPENDKIMCONFIG` if [ x"$OPENDKIMSTATS" = x"" ] then echo "${PROGNAME}: can't determine statistics file location from ${OPENDKIMCONFIG}" @@ -59,7 +59,7 @@ ODKGNUPGCERT="${GNUPGDIR}/opendkim_org.pem" ODKGNUPGMD5="${GNUPGDIR}/stats_opendkim_org.pub.md5" -OPENDKIMSTATS="2.6.2" +OPENDKIMSTATS="2.6.8" # # VERSION -- output version string diff -Nru opendkim-2.6.2/stats/opendkim-reportstats.in opendkim-2.6.8/stats/opendkim-reportstats.in --- opendkim-2.6.2/stats/opendkim-reportstats.in 2012-06-18 14:20:09.000000000 +0000 +++ opendkim-2.6.8/stats/opendkim-reportstats.in 2012-10-24 21:37:13.000000000 +0000 @@ -27,7 +27,7 @@ PROGNAME=`basename $0` -OPENDKIMSTATS=`awk '$1 == "Statistics" { print $2 }'` +OPENDKIMSTATS=`awk '$1 == "Statistics" { print $2 }' $OPENDKIMCONFIG` if [ x"$OPENDKIMSTATS" = x"" ] then echo "${PROGNAME}: can't determine statistics file location from ${OPENDKIMCONFIG}"