[Pkg-cyrus-sasl2-commits] r461 - in /cyrus-sasl-2.1/branches/upstream/current: ./ dlcompat-20010505/ doc/ include/ java/ java/CyrusSasl/ java/Test/ java/doc/ java/javax/ java/javax/security/ java/javax/security/auth/ java/javax/security/auth/callback/ lib/ mac/make_md5_include/ man/ plugins/ pwcheck/ sample/ saslauthd/ sasldb/ utils/ win32/ win32/include/ win32/libsasl/ win32/makemd5/ win32/sample_client/ win32/sample_server/ win32/saslANONYMOUS/ win32/saslCRAM/ win32/saslDIGESTMD5/ win32/saslGSSAPI/ win32/saslKERBEROSV4/ win32/saslLOGIN/ win32/saslPLAIN/ win32/saslSCRAM/ win32/testclient/ win32/testserver/ win32/utils/
fabbe at users.alioth.debian.org
fabbe at users.alioth.debian.org
Sun May 24 13:56:34 UTC 2009
Author: fabbe
Date: Sun May 24 13:56:33 2009
New Revision: 461
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/?sc=1&rev=461
Log:
[svn-upgrade] Integrating new upstream version, cyrus-sasl2 (2.1.23.dfsg1)
Removed:
cyrus-sasl-2.1/branches/upstream/current/dlcompat-20010505/
cyrus-sasl-2.1/branches/upstream/current/doc/draft-burdis-cat-srp-sasl-xx.txt
cyrus-sasl-2.1/branches/upstream/current/doc/draft-ietf-sasl-anon-xx.txt
cyrus-sasl-2.1/branches/upstream/current/doc/draft-ietf-sasl-crammd5-xx.txt
cyrus-sasl-2.1/branches/upstream/current/doc/draft-ietf-sasl-gssapi-xx.txt
cyrus-sasl-2.1/branches/upstream/current/doc/draft-ietf-sasl-plain-xx.txt
cyrus-sasl-2.1/branches/upstream/current/doc/draft-ietf-sasl-rfc2222bis-xx.txt
cyrus-sasl-2.1/branches/upstream/current/doc/draft-ietf-sasl-rfc2831bis-xx.txt
cyrus-sasl-2.1/branches/upstream/current/doc/draft-ietf-sasl-saslprep-xx.txt
cyrus-sasl-2.1/branches/upstream/current/doc/draft-murchison-sasl-login-xx.txt
cyrus-sasl-2.1/branches/upstream/current/doc/draft-newman-sasl-c-api-xx.txt
cyrus-sasl-2.1/branches/upstream/current/doc/draft-newman-sasl-passdss-xx.txt
cyrus-sasl-2.1/branches/upstream/current/doc/rfc1321.txt
cyrus-sasl-2.1/branches/upstream/current/doc/rfc1939.txt
cyrus-sasl-2.1/branches/upstream/current/doc/rfc2104.txt
cyrus-sasl-2.1/branches/upstream/current/doc/rfc2195.txt
cyrus-sasl-2.1/branches/upstream/current/doc/rfc2222.txt
cyrus-sasl-2.1/branches/upstream/current/doc/rfc2243.txt
cyrus-sasl-2.1/branches/upstream/current/doc/rfc2245.txt
cyrus-sasl-2.1/branches/upstream/current/doc/rfc2289.txt
cyrus-sasl-2.1/branches/upstream/current/doc/rfc2444.txt
cyrus-sasl-2.1/branches/upstream/current/doc/rfc2595.txt
cyrus-sasl-2.1/branches/upstream/current/doc/rfc2831.txt
cyrus-sasl-2.1/branches/upstream/current/doc/rfc2945.txt
cyrus-sasl-2.1/branches/upstream/current/doc/rfc3174.txt
cyrus-sasl-2.1/branches/upstream/current/java/doc/draft-weltman-java-sasl-02.txt
cyrus-sasl-2.1/branches/upstream/current/mac/make_md5_include/
cyrus-sasl-2.1/branches/upstream/current/win32/libsasl/
cyrus-sasl-2.1/branches/upstream/current/win32/makemd5/
cyrus-sasl-2.1/branches/upstream/current/win32/sample_client/
cyrus-sasl-2.1/branches/upstream/current/win32/sample_server/
cyrus-sasl-2.1/branches/upstream/current/win32/saslANONYMOUS/
cyrus-sasl-2.1/branches/upstream/current/win32/saslCRAM/
cyrus-sasl-2.1/branches/upstream/current/win32/saslDIGESTMD5/
cyrus-sasl-2.1/branches/upstream/current/win32/saslGSSAPI/
cyrus-sasl-2.1/branches/upstream/current/win32/saslKERBEROSV4/
cyrus-sasl-2.1/branches/upstream/current/win32/saslLOGIN/
cyrus-sasl-2.1/branches/upstream/current/win32/saslPLAIN/
cyrus-sasl-2.1/branches/upstream/current/win32/saslSCRAM/
cyrus-sasl-2.1/branches/upstream/current/win32/testclient/
cyrus-sasl-2.1/branches/upstream/current/win32/testserver/
cyrus-sasl-2.1/branches/upstream/current/win32/utils/
Modified:
cyrus-sasl-2.1/branches/upstream/current/ChangeLog
cyrus-sasl-2.1/branches/upstream/current/Makefile.in
cyrus-sasl-2.1/branches/upstream/current/NEWS
cyrus-sasl-2.1/branches/upstream/current/aclocal.m4
cyrus-sasl-2.1/branches/upstream/current/configure
cyrus-sasl-2.1/branches/upstream/current/configure.in
cyrus-sasl-2.1/branches/upstream/current/doc/Makefile.in
cyrus-sasl-2.1/branches/upstream/current/include/Makefile.in
cyrus-sasl-2.1/branches/upstream/current/include/sasl.h
cyrus-sasl-2.1/branches/upstream/current/java/CyrusSasl/Makefile.in
cyrus-sasl-2.1/branches/upstream/current/java/CyrusSasl/javasasl.h
cyrus-sasl-2.1/branches/upstream/current/java/Makefile.in
cyrus-sasl-2.1/branches/upstream/current/java/Test/Makefile.in
cyrus-sasl-2.1/branches/upstream/current/java/javax/Makefile.in
cyrus-sasl-2.1/branches/upstream/current/java/javax/security/Makefile.in
cyrus-sasl-2.1/branches/upstream/current/java/javax/security/auth/Makefile.in
cyrus-sasl-2.1/branches/upstream/current/java/javax/security/auth/callback/Makefile.in
cyrus-sasl-2.1/branches/upstream/current/lib/Makefile.am
cyrus-sasl-2.1/branches/upstream/current/lib/Makefile.in
cyrus-sasl-2.1/branches/upstream/current/lib/saslutil.c
cyrus-sasl-2.1/branches/upstream/current/man/Makefile.in
cyrus-sasl-2.1/branches/upstream/current/plugins/Makefile.am
cyrus-sasl-2.1/branches/upstream/current/plugins/Makefile.in
cyrus-sasl-2.1/branches/upstream/current/pwcheck/Makefile.in
cyrus-sasl-2.1/branches/upstream/current/sample/Makefile.in
cyrus-sasl-2.1/branches/upstream/current/saslauthd/Makefile.in
cyrus-sasl-2.1/branches/upstream/current/saslauthd/aclocal.m4
cyrus-sasl-2.1/branches/upstream/current/saslauthd/configure
cyrus-sasl-2.1/branches/upstream/current/saslauthd/configure.in
cyrus-sasl-2.1/branches/upstream/current/saslauthd/saslauthd.8
cyrus-sasl-2.1/branches/upstream/current/sasldb/Makefile.am
cyrus-sasl-2.1/branches/upstream/current/sasldb/Makefile.in
cyrus-sasl-2.1/branches/upstream/current/utils/Makefile.in
cyrus-sasl-2.1/branches/upstream/current/win32/common.mak
cyrus-sasl-2.1/branches/upstream/current/win32/include/config.h
Modified: cyrus-sasl-2.1/branches/upstream/current/ChangeLog
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/upstream/current/ChangeLog?rev=461&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/upstream/current/ChangeLog (original)
+++ cyrus-sasl-2.1/branches/upstream/current/ChangeLog Sun May 24 13:56:33 2009
@@ -1,3 +1,10 @@
+2009-04-27 Ken Murchison <murch at andrew.cmu.edu>
+ * Ready for 2.1.23
+
+2009-04-27 Ken Murchison <murch at andrew.cmu.edu>
+ * lib/saslutil.c: Fixed CERT VU#238019 (make sure sasl_encode64()
+ always NUL terminates output or returns SASL_BUFOVER).
+
2006-05-19 Ken Murchison <murch at andrew.cmu.edu>
* Makefile.am: include INSTALL.TXT in distro
*** Ready for 2.1.22
Modified: cyrus-sasl-2.1/branches/upstream/current/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/upstream/current/Makefile.in?rev=461&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/upstream/current/Makefile.in (original)
+++ cyrus-sasl-2.1/branches/upstream/current/Makefile.in Sun May 24 13:56:33 2009
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.7.2 from Makefile.am.
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -151,6 +151,7 @@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
bindir = @bindir@
build = @build@
@@ -187,6 +188,7 @@
target_os = @target_os@
target_vendor = @target_vendor@
AUTOMAKE_OPTIONS = 1.7
+ at SASLAUTHD_FALSE@SAD =
# Top-level Makefile.am for SASL
# Rob Earhart
@@ -232,13 +234,12 @@
#
################################################################
@SASLAUTHD_TRUE at SAD = saslauthd
- at SASLAUTHD_FALSE@SAD =
+ at PWCHECK_TRUE@PWC = pwcheck
@PWCHECK_FALSE at PWC =
- at PWCHECK_TRUE@PWC = pwcheck
@SAMPLE_FALSE at SAM =
@SAMPLE_TRUE at SAM = sample
+ at JAVA_FALSE@JAV =
@JAVA_TRUE at JAV = java
- at JAVA_FALSE@JAV =
@MACOSX_FALSE at INSTALLOSX =
@MACOSX_TRUE at INSTALLOSX = install-exec-local-osx
@@ -258,11 +259,12 @@
all-recursive install-data-recursive install-exec-recursive \
installdirs-recursive install-recursive uninstall-recursive \
check-recursive installcheck-recursive
-DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
- Makefile.in NEWS aclocal.m4 config.h.in config/config.guess \
- config/config.sub config/depcomp config/install-sh \
- config/ltconfig config/ltmain.sh config/missing \
- config/mkinstalldirs configure configure.in
+DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \
+ COPYING ChangeLog INSTALL Makefile.am NEWS aclocal.m4 \
+ config.h.in config/config.guess config/config.sub \
+ config/depcomp config/install-sh config/ltconfig \
+ config/ltmain.sh config/missing config/mkinstalldirs configure \
+ configure.in
DIST_SUBDIRS = include sasldb plugins lib utils doc man pwcheck sample \
java saslauthd
all: config.h
@@ -393,9 +395,15 @@
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
+ if (etags --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+ else \
+ include_option=--include; \
+ fi; \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+ test -f $$subdir/TAGS && \
+ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
@@ -510,12 +518,12 @@
$(am__remove_distdir)
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
chmod -R a-w $(distdir); chmod a+w $(distdir)
- mkdir $(distdir)/=build
- mkdir $(distdir)/=inst
+ mkdir $(distdir)/_build
+ mkdir $(distdir)/_inst
chmod a-w $(distdir)
- dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \
+ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
- && cd $(distdir)/=build \
+ && cd $(distdir)/_build \
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
$(DISTCHECK_CONFIGURE_FLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) \
@@ -542,7 +550,7 @@
@echo "$(distdir).tar.gz is ready for distribution" | \
sed 'h;s/./=/g;p;x;p;x'
distuninstallcheck:
- cd $(distuninstallcheck_dir) \
+ @cd $(distuninstallcheck_dir) \
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
|| { echo "ERROR: files left after uninstall:" ; \
if test -n "$(DESTDIR)"; then \
@@ -551,11 +559,11 @@
$(distuninstallcheck_listfiles) ; \
exit 1; } >&2
distcleancheck: distclean
- if test '$(srcdir)' = . ; then \
+ @if test '$(srcdir)' = . ; then \
echo "ERROR: distcleancheck can only run from a VPATH build" ; \
exit 1 ; \
fi
- test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+ @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
|| { echo "ERROR: files left in build directory after distclean:" ; \
$(distcleancheck_listfiles) ; \
exit 1; } >&2
@@ -576,7 +584,7 @@
installcheck: installcheck-recursive
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -584,7 +592,7 @@
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -595,6 +603,7 @@
distclean: distclean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+ -rm -f Makefile
distclean-am: clean-am distclean-generic distclean-hdr distclean-libtool \
distclean-tags
@@ -618,7 +627,8 @@
maintainer-clean: maintainer-clean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
- -rm -rf autom4te.cache
+ -rm -rf $(top_srcdir)/autom4te.cache
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-recursive
Modified: cyrus-sasl-2.1/branches/upstream/current/NEWS
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/upstream/current/NEWS?rev=461&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/upstream/current/NEWS (original)
+++ cyrus-sasl-2.1/branches/upstream/current/NEWS Sun May 24 13:56:33 2009
@@ -1,3 +1,8 @@
+New in 2.1.23
+-------------
+* Fixed CERT VU#238019 (make sure sasl_encode64() always NUL
+ terminates output or returns SASL_BUFOVER)
+
New in 2.1.22
-------------
Modified: cyrus-sasl-2.1/branches/upstream/current/aclocal.m4
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/upstream/current/aclocal.m4?rev=461&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/upstream/current/aclocal.m4 (original)
+++ cyrus-sasl-2.1/branches/upstream/current/aclocal.m4 Sun May 24 13:56:33 2009
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.7.2 -*- Autoconf -*-
+# generated automatically by aclocal 1.7.9 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
# Free Software Foundation, Inc.
@@ -16,7 +16,7 @@
# 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.
-# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
# Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
@@ -34,14 +34,7 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
-# serial 8
-
-# 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
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
+# serial 10
AC_PREREQ([2.54])
@@ -86,8 +79,8 @@
AC_SUBST([PACKAGE], [$1])dnl
AC_SUBST([VERSION], [$2])],
[_AM_SET_OPTIONS([$1])dnl
- AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl
- AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])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])
@@ -108,6 +101,7 @@
# some platforms.
AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
_AM_IF_OPTION([no-dependencies],,
[AC_PROVIDE_IFELSE([AC_PROG_CC],
@@ -130,7 +124,16 @@
# loop where config.status creates the headers, so we can generate
# our stamp files there.
AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[_am_stamp_count=`expr ${_am_stamp_count-0} + 1`
+[# Compute $1's index in $config_headers.
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+ case $_am_header in
+ $1 | $1:* )
+ break ;;
+ * )
+ _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+ esac
+done
echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
# Copyright 2002 Free Software Foundation, Inc.
@@ -160,7 +163,7 @@
# Call AM_AUTOMAKE_VERSION so it can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
- [AM_AUTOMAKE_VERSION([1.7.2])])
+ [AM_AUTOMAKE_VERSION([1.7.9])])
# Helper functions for option handling. -*- Autoconf -*-
@@ -446,9 +449,42 @@
INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# serial 4 -*- Autoconf -*-
-
-# Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
+# -*- Autoconf -*-
+# Copyright (C) 2003 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 1
+
+# Check whether the underlying file-system supports filenames
+# with a leading dot. For instance MS-DOS doesn't.
+AC_DEFUN([AM_SET_LEADING_DOT],
+[rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+ am__leading_dot=.
+else
+ am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+AC_SUBST([am__leading_dot])])
+
+# serial 5 -*- Autoconf -*-
+
+# Copyright (C) 1999, 2000, 2001, 2002, 2003 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
@@ -509,18 +545,32 @@
# using a relative directory.
cp "$am_depcomp" conftest.dir
cd conftest.dir
+ # We will build objects and dependencies in a subdirectory because
+ # it helps to detect inapplicable dependency modes. For instance
+ # both Tru64's cc and ICC support -MD to output dependencies as a
+ # side effect of compilation, but ICC will put the dependencies in
+ # the current directory while Tru64 will put them in the object
+ # directory.
+ mkdir sub
am_cv_$1_dependencies_compiler_type=none
if test "$am_compiler_list" = ""; then
am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
fi
for depmode in $am_compiler_list; do
+ # Setup a source with many dependencies, because some compilers
+ # like to wrap large dependency lists on column 80 (with \), and
+ # we should not choose a depcomp mode which is confused by this.
+ #
# We need to recreate these files for each test, as the compiler may
# overwrite some of them when testing with obscure command lines.
# This happens at least with the AIX C compiler.
- echo '#include "conftest.h"' > conftest.c
- echo 'int i;' > conftest.h
- echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
+ : > sub/conftest.c
+ for i in 1 2 3 4 5 6; do
+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
+ : > sub/conftst$i.h
+ done
+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
case $depmode in
nosideeffect)
@@ -538,13 +588,20 @@
# mode. It turns out that the SunPro C++ compiler does not properly
# handle `-M -o', and we need to detect this.
if depmode=$depmode \
- source=conftest.c object=conftest.o \
- depfile=conftest.Po tmpdepfile=conftest.TPo \
- $SHELL ./depcomp $depcc -c -o conftest.o conftest.c >/dev/null 2>&1 &&
- grep conftest.h conftest.Po > /dev/null 2>&1 &&
+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+ >/dev/null 2>conftest.err &&
+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
- am_cv_$1_dependencies_compiler_type=$depmode
- break
+ # icc doesn't choke on unknown options, it will just issue warnings
+ # (even with -Werror). So we grep stderr for any message
+ # that says an option was ignored.
+ if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
+ am_cv_$1_dependencies_compiler_type=$depmode
+ break
+ fi
fi
done
@@ -566,16 +623,8 @@
# Choose a directory name for dependency files.
# This macro is AC_REQUIREd in _AM_DEPENDENCIES
AC_DEFUN([AM_SET_DEPDIR],
-[rm -f .deps 2>/dev/null
-mkdir .deps 2>/dev/null
-if test -d .deps; then
- DEPDIR=.deps
-else
- # MS-DOS does not allow filenames that begin with a dot.
- DEPDIR=_deps
-fi
-rmdir .deps 2>/dev/null
-AC_SUBST([DEPDIR])
+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
])
@@ -679,7 +728,7 @@
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003 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
@@ -704,8 +753,9 @@
AC_DEFUN([AM_MAKE_INCLUDE],
[am_make=${MAKE-make}
cat > confinc << 'END'
-doit:
+am__doit:
@echo done
+.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
AC_MSG_CHECKING([for style of include used by $am_make])
@@ -733,9 +783,9 @@
_am_result=BSD
fi
fi
-AC_SUBST(am__include)
-AC_SUBST(am__quote)
-AC_MSG_RESULT($_am_result)
+AC_SUBST([am__include])
+AC_SUBST([am__quote])
+AC_MSG_RESULT([$_am_result])
rm -f confinc confmf
])
Modified: cyrus-sasl-2.1/branches/upstream/current/configure
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/upstream/current/configure?rev=461&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/upstream/current/configure (original)
+++ cyrus-sasl-2.1/branches/upstream/current/configure Sun May 24 13:56:33 2009
@@ -309,7 +309,7 @@
#endif"
ac_subdirs_all="$ac_subdirs_all saslauthd"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP LN_S RANLIB ac_ct_RANLIB LIBTOOL PURECOV PURIFY JAVAC JAVAH JAVADOC JAVA_TRUE JAVA_FALSE JAVA_INCLUDES JAVAROOT SAMPLE_TRUE SAMPLE_FALSE LIB_SOCKET EGREP SASL_DB_UTILS SASL_DB_MANS SASL_DB_BACKEND SASL_DB_BACKEND_STATIC SASL_DB_INC SASL_DB_LIB NO_SASL_DB_MANS_TRUE NO_SASL_DB_MANS_FALSE SASL_DL_LIB NM SASLAUTHD_TRUE SASLAUTHD_FALSE PWCHECKMETH PWCHECK_TRUE PWCHECK_FALSE IPCTYPE LIB_DOOR CMU_LIB_SUBDIR LIB_DES OTP_LIBS SRP_LIBS SASL_KRB_LIB LIB_CRYPT GSSAPI_LIBS GSSAPIBASE_LIBS PLAIN_LIBS NTLM_LIBS PASSDSS_LIBS LIB_MYSQL LIB_PGSQL LIB_SQLITE LIB_LDAP SASL_MECHS SASL_STATIC_SRCS SASL_STATIC_OBJS SASL_STATIC_LIBS plugindir configdir MACOSX_TRUE MACOSX_FALSE DMALLOC_LIBS SFIO_INC_FLAGS SFIO_LIB_FLAGS SMTPTEST_PROGRAM SASL_UTIL_LIBS_EXTRA SASL_UTIL_HEADERS_EXTRA LIBOBJS GETSUBOPT SNPRINTFOBJS LTSNPRINTFOBJS GETADDRINFOOBJS LTGETADDRINFOOBJS GETNAMEINFOOBJS LTGETNAMEINFOOBJS LTLIBOBJS DIRS subdirs'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP LN_S RANLIB ac_ct_RANLIB LIBTOOL PURECOV PURIFY JAVAC JAVAH JAVADOC JAVA_TRUE JAVA_FALSE JAVA_INCLUDES JAVAROOT SAMPLE_TRUE SAMPLE_FALSE LIB_SOCKET EGREP SASL_DB_UTILS SASL_DB_MANS SASL_DB_BACKEND SASL_DB_BACKEND_STATIC SASL_DB_INC SASL_DB_LIB NO_SASL_DB_MANS_TRUE NO_SASL_DB_MANS_FALSE SASL_DL_LIB NM SASLAUTHD_TRUE SASLAUTHD_FALSE PWCHECKMETH PWCHECK_TRUE PWCHECK_FALSE IPCTYPE LIB_DOOR CMU_LIB_SUBDIR LIB_DES OTP_LIBS SRP_LIBS SASL_KRB_LIB LIB_CRYPT GSSAPI_LIBS GSSAPIBASE_LIBS PLAIN_LIBS NTLM_LIBS PASSDSS_LIBS LIB_MYSQL LIB_PGSQL LIB_SQLITE LIB_LDAP SASL_MECHS SASL_STATIC_SRCS SASL_STATIC_OBJS SASL_STATIC_LIBS plugindir configdir MACOSX_TRUE MACOSX_FALSE DMALLOC_LIBS SFIO_INC_FLAGS SFIO_LIB_FLAGS SMTPTEST_PROGRAM SASL_UTIL_LIBS_EXTRA SASL_UTIL_HEADERS_EXTRA LIBOBJS GETSUBOPT SNPRINTFOBJS LTSNPRINTFOBJS GETADDRINFOOBJS LTGETADDRINFOOBJS GETNAMEINFOOBJS LTGETNAMEINFOOBJS LTLIBOBJS DIRS subdirs'
ac_subst_files=''
# Initialize some variables set by options.
@@ -1682,6 +1682,15 @@
SET_MAKE="MAKE=${MAKE-make}"
fi
+rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+ am__leading_dot=.
+else
+ am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+
# test to see if srcdir already configured
if test "`cd $srcdir && pwd`" != "`pwd`" &&
test -f $srcdir/config.status; then
@@ -1702,7 +1711,7 @@
# Define the identity of the package.
PACKAGE=cyrus-sasl
- VERSION=2.1.22
+ VERSION=2.1.23
cat >>confdefs.h <<_ACEOF
@@ -2719,24 +2728,16 @@
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-rm -f .deps 2>/dev/null
-mkdir .deps 2>/dev/null
-if test -d .deps; then
- DEPDIR=.deps
-else
- # MS-DOS does not allow filenames that begin with a dot.
- DEPDIR=_deps
-fi
-rmdir .deps 2>/dev/null
-
+DEPDIR="${am__leading_dot}deps"
ac_config_commands="$ac_config_commands depfiles"
am_make=${MAKE-make}
cat > confinc << 'END'
-doit:
+am__doit:
@echo done
+.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
@@ -2811,18 +2812,32 @@
# using a relative directory.
cp "$am_depcomp" conftest.dir
cd conftest.dir
+ # We will build objects and dependencies in a subdirectory because
+ # it helps to detect inapplicable dependency modes. For instance
+ # both Tru64's cc and ICC support -MD to output dependencies as a
+ # side effect of compilation, but ICC will put the dependencies in
+ # the current directory while Tru64 will put them in the object
+ # directory.
+ mkdir sub
am_cv_CC_dependencies_compiler_type=none
if test "$am_compiler_list" = ""; then
am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
fi
for depmode in $am_compiler_list; do
+ # Setup a source with many dependencies, because some compilers
+ # like to wrap large dependency lists on column 80 (with \), and
+ # we should not choose a depcomp mode which is confused by this.
+ #
# We need to recreate these files for each test, as the compiler may
# overwrite some of them when testing with obscure command lines.
# This happens at least with the AIX C compiler.
- echo '#include "conftest.h"' > conftest.c
- echo 'int i;' > conftest.h
- echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
+ : > sub/conftest.c
+ for i in 1 2 3 4 5 6; do
+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
+ : > sub/conftst$i.h
+ done
+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
case $depmode in
nosideeffect)
@@ -2840,13 +2855,20 @@
# mode. It turns out that the SunPro C++ compiler does not properly
# handle `-M -o', and we need to detect this.
if depmode=$depmode \
- source=conftest.c object=conftest.o \
- depfile=conftest.Po tmpdepfile=conftest.TPo \
- $SHELL ./depcomp $depcc -c -o conftest.o conftest.c >/dev/null 2>&1 &&
- grep conftest.h conftest.Po > /dev/null 2>&1 &&
+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+ >/dev/null 2>conftest.err &&
+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
- am_cv_CC_dependencies_compiler_type=$depmode
- break
+ # icc doesn't choke on unknown options, it will just issue warnings
+ # (even with -Werror). So we grep stderr for any message
+ # that says an option was ignored.
+ if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
+ am_cv_CC_dependencies_compiler_type=$depmode
+ break
+ fi
fi
done
@@ -3744,7 +3766,7 @@
case "$lt_target" in
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 3747 "configure"' > conftest.$ac_ext
+ echo '#line 3769 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -16128,6 +16150,7 @@
s, at INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
s, at AWK@,$AWK,;t t
s, at SET_MAKE@,$SET_MAKE,;t t
+s, at am__leading_dot@,$am__leading_dot,;t t
s, at CC@,$CC,;t t
s, at CFLAGS@,$CFLAGS,;t t
s, at LDFLAGS@,$LDFLAGS,;t t
@@ -16644,7 +16667,16 @@
cat $tmp/config.h
rm -f $tmp/config.h
fi
-_am_stamp_count=`expr ${_am_stamp_count-0} + 1`
+# Compute $ac_file's index in $config_headers.
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+ case $_am_header in
+ $ac_file | $ac_file:* )
+ break ;;
+ * )
+ _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+ esac
+done
echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X$ac_file : 'X\(//\)[^/]' \| \
Modified: cyrus-sasl-2.1/branches/upstream/current/configure.in
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/upstream/current/configure.in?rev=461&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/upstream/current/configure.in (original)
+++ cyrus-sasl-2.1/branches/upstream/current/configure.in Sun May 24 13:56:33 2009
@@ -1,7 +1,7 @@
dnl configure.in for the SASL library
dnl Rob Siemborski
dnl Rob Earhart
-dnl $Id: configure.in,v 1.213 2006/05/18 19:03:00 mel Exp $
+dnl $Id: configure.in,v 1.213.2.1 2009/04/27 17:58:25 murch Exp $
dnl
dnl Copyright (c) 2001 Carnegie Mellon University. All rights reserved.
dnl
@@ -59,7 +59,7 @@
dnl REMINDER: When changing the version number here, please also update
dnl the values in win32/include/config.h and include/sasl.h as well.
dnl
-AM_INIT_AUTOMAKE(cyrus-sasl, 2.1.22)
+AM_INIT_AUTOMAKE(cyrus-sasl, 2.1.23)
CMU_INIT_AUTOMAKE
# and include our config dir scripts
Modified: cyrus-sasl-2.1/branches/upstream/current/doc/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/upstream/current/doc/Makefile.in?rev=461&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/upstream/current/doc/Makefile.in (original)
+++ cyrus-sasl-2.1/branches/upstream/current/doc/Makefile.in Sun May 24 13:56:33 2009
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.7.2 from Makefile.am.
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -196,6 +196,7 @@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
bindir = @bindir@
build = @build@
@@ -278,11 +279,12 @@
NTMakefile
subdir = doc
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
DIST_SOURCES =
-DIST_COMMON = Makefile.am Makefile.in TODO
+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am TODO
all: all-am
.SUFFIXES:
@@ -344,7 +346,6 @@
all-am: Makefile
installdirs:
-
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -356,7 +357,7 @@
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -364,7 +365,7 @@
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -374,7 +375,7 @@
clean-am: clean-generic clean-libtool mostlyclean-am
distclean: distclean-am
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic distclean-libtool
dvi: dvi-am
@@ -396,7 +397,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
Modified: cyrus-sasl-2.1/branches/upstream/current/include/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/upstream/current/include/Makefile.in?rev=461&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/upstream/current/include/Makefile.in (original)
+++ cyrus-sasl-2.1/branches/upstream/current/include/Makefile.in Sun May 24 13:56:33 2009
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.7.2 from Makefile.am.
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -195,6 +195,7 @@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
bindir = @bindir@
build = @build@
@@ -247,6 +248,7 @@
@MACOSX_TRUE at frameheaderdir = $(framedir)/Versions/A/Headers
@MACOSX_TRUE at frameheader_DATA = $(saslinclude_HEADERS)
subdir = include
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -275,8 +277,8 @@
HEADERS = $(noinst_HEADERS) $(saslinclude_HEADERS)
-DIST_COMMON = $(noinst_HEADERS) $(saslinclude_HEADERS) Makefile.am \
- Makefile.in
+DIST_COMMON = $(noinst_HEADERS) $(saslinclude_HEADERS) \
+ $(srcdir)/Makefile.in Makefile.am
SOURCES = $(makemd5_SOURCES)
all: all-am
@@ -307,13 +309,10 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/makemd5.Po at am__quote@
-distclean-depend:
- -rm -rf ./$(DEPDIR)
-
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
- at am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@@ -324,7 +323,7 @@
.c.obj:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
- at am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@@ -335,7 +334,7 @@
.c.lo:
@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
- at am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
+ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@@ -480,7 +479,6 @@
installdirs:
$(mkinstalldirs) $(DESTDIR)$(frameheaderdir) $(DESTDIR)$(saslincludedir)
-
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -492,7 +490,7 @@
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -500,7 +498,7 @@
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -rm -f $(CONFIG_CLEAN_FILES)
-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
maintainer-clean-generic:
@@ -512,9 +510,10 @@
mostlyclean-am
distclean: distclean-am
-
-distclean-am: clean-am distclean-compile distclean-depend \
- distclean-generic distclean-libtool distclean-tags
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-libtool distclean-tags
dvi: dvi-am
@@ -535,7 +534,8 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
@@ -556,17 +556,17 @@
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-libtool clean-noinstPROGRAMS ctags distclean \
- distclean-compile distclean-depend distclean-generic \
- distclean-libtool distclean-tags distdir dvi dvi-am info \
- info-am install install-am install-data install-data-am \
- install-exec install-exec-am install-frameheaderDATA \
- install-info install-info-am install-man \
- install-saslincludeHEADERS install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-frameheaderDATA \
- uninstall-info-am uninstall-saslincludeHEADERS
+ distclean-compile distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am info info-am install \
+ install-am install-data install-data-am install-exec \
+ install-exec-am install-frameheaderDATA install-info \
+ install-info-am install-man install-saslincludeHEADERS \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \
+ pdf-am ps ps-am tags uninstall uninstall-am \
+ uninstall-frameheaderDATA uninstall-info-am \
+ uninstall-saslincludeHEADERS
md5global.h: makemd5
Modified: cyrus-sasl-2.1/branches/upstream/current/include/sasl.h
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/upstream/current/include/sasl.h?rev=461&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/upstream/current/include/sasl.h (original)
+++ cyrus-sasl-2.1/branches/upstream/current/include/sasl.h Sun May 24 13:56:33 2009
@@ -124,7 +124,7 @@
/* Keep in sync with win32/common.mak */
#define SASL_VERSION_MAJOR 2
#define SASL_VERSION_MINOR 1
-#define SASL_VERSION_STEP 22
+#define SASL_VERSION_STEP 23
/* A convenience macro: same as was defined in the OpenLDAP LDAPDB */
#define SASL_VERSION_FULL ((SASL_VERSION_MAJOR << 16) |\
Modified: cyrus-sasl-2.1/branches/upstream/current/java/CyrusSasl/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/upstream/current/java/CyrusSasl/Makefile.in?rev=461&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/upstream/current/java/CyrusSasl/Makefile.in (original)
+++ cyrus-sasl-2.1/branches/upstream/current/java/CyrusSasl/Makefile.in Sun May 24 13:56:33 2009
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.7.2 from Makefile.am.
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -176,6 +176,7 @@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
bindir = @bindir@
build = @build@
@@ -236,6 +237,7 @@
libjavasasl_la_LDFLAGS = -export_dynamic -L../../lib/.libs -lsasl2 -version-info $(javasasl_version) $(wildcard ../lib/*.lo)
BUILT_SOURCES = javasasl.h $(CLASSES)
subdir = java/CyrusSasl
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -257,7 +259,7 @@
LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
DIST_SOURCES = $(libjavasasl_la_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
SOURCES = $(libjavasasl_la_SOURCES)
all: $(BUILT_SOURCES)
@@ -309,13 +311,10 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/javasasl.Plo at am__quote@
-distclean-depend:
- -rm -rf ./$(DEPDIR)
-
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
- at am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@@ -326,7 +325,7 @@
.c.obj:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
- at am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@@ -337,7 +336,7 @@
.c.lo:
@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
- at am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
+ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@@ -474,8 +473,8 @@
installdirs:
$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(javasasldir)
-
-install: install-am
+install: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) install-am
install-exec: install-exec-am
install-data: install-data-am
uninstall: uninstall-am
@@ -486,7 +485,7 @@
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -494,7 +493,7 @@
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -506,9 +505,10 @@
clean-libtool mostlyclean-am
distclean: distclean-am
-
-distclean-am: clean-am distclean-compile distclean-depend \
- distclean-generic distclean-libtool distclean-tags
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-libtool distclean-tags
dvi: dvi-am
@@ -529,7 +529,8 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
@@ -550,10 +551,10 @@
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-javasaslJAVA clean-libLTLIBRARIES clean-libtool ctags \
- distclean distclean-compile distclean-depend distclean-generic \
- distclean-libtool distclean-tags distdir dvi dvi-am info \
- info-am install install-am install-data install-data-am \
- install-exec install-exec-am install-info install-info-am \
+ distclean distclean-compile distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am info info-am install \
+ install-am install-data install-data-am install-exec \
+ install-exec-am install-info install-info-am \
install-javasaslJAVA install-libLTLIBRARIES install-man \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
Modified: cyrus-sasl-2.1/branches/upstream/current/java/CyrusSasl/javasasl.h
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/upstream/current/java/CyrusSasl/javasasl.h?rev=461&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/upstream/current/java/CyrusSasl/javasasl.h (original)
+++ cyrus-sasl-2.1/branches/upstream/current/java/CyrusSasl/javasasl.h Sun May 24 13:56:33 2009
@@ -7,8 +7,6 @@
#ifdef __cplusplus
extern "C" {
#endif
-/* Inaccessible static: client_factory */
-/* Inaccessible static: server_factory */
#ifdef __cplusplus
}
#endif
@@ -20,14 +18,6 @@
#ifdef __cplusplus
extern "C" {
#endif
-/* Inaccessible static: SASL_SSF */
-/* Inaccessible static: SASL_MAXOUTBUF */
-/* Inaccessible static: SASL_REALM */
-/* Inaccessible static: SASL_GETOPTCTX */
-/* Inaccessible static: SASL_IP_LOCAL */
-/* Inaccessible static: SASL_IP_REMOTE */
-/* Inaccessible static: SASL_SSF_EXTERNAL */
-/* Inaccessible static: SASL_SEC_PROPS */
/*
* Class: CyrusSasl_GenericClient
* Method: jni_sasl_client_start
@@ -82,14 +72,6 @@
#ifdef __cplusplus
extern "C" {
#endif
-/* Inaccessible static: SASL_SSF */
-/* Inaccessible static: SASL_MAXOUTBUF */
-/* Inaccessible static: SASL_REALM */
-/* Inaccessible static: SASL_GETOPTCTX */
-/* Inaccessible static: SASL_IP_LOCAL */
-/* Inaccessible static: SASL_IP_REMOTE */
-/* Inaccessible static: SASL_SSF_EXTERNAL */
-/* Inaccessible static: SASL_SEC_PROPS */
/*
* Class: CyrusSasl_GenericCommon
* Method: jni_sasl_set_prop_string
@@ -220,12 +202,10 @@
#endif
#undef CyrusSasl_SaslInputStream_SKIP_BUFFER_SIZE
#define CyrusSasl_SaslInputStream_SKIP_BUFFER_SIZE 2048L
-/* Inaccessible static: skipBuffer */
#undef CyrusSasl_SaslInputStream_DoEncrypt
#define CyrusSasl_SaslInputStream_DoEncrypt 1L
#undef CyrusSasl_SaslInputStream_DoDebug
#define CyrusSasl_SaslInputStream_DoDebug 0L
-/* Inaccessible static: BUFFERSIZE */
#ifdef __cplusplus
}
#endif
@@ -241,7 +221,6 @@
#define CyrusSasl_SaslOutputStream_DoEncrypt 1L
#undef CyrusSasl_SaslOutputStream_DoDebug
#define CyrusSasl_SaslOutputStream_DoDebug 0L
-/* Inaccessible static: MAXBUFFERSIZE */
#ifdef __cplusplus
}
#endif
@@ -253,8 +232,6 @@
#ifdef __cplusplus
extern "C" {
#endif
-/* Inaccessible static: enc_table */
-/* Inaccessible static: dec_table */
#ifdef __cplusplus
}
#endif
@@ -323,14 +300,6 @@
#ifdef __cplusplus
extern "C" {
#endif
-/* Inaccessible static: SASL_SSF */
-/* Inaccessible static: SASL_MAXOUTBUF */
-/* Inaccessible static: SASL_REALM */
-/* Inaccessible static: SASL_GETOPTCTX */
-/* Inaccessible static: SASL_IP_LOCAL */
-/* Inaccessible static: SASL_IP_REMOTE */
-/* Inaccessible static: SASL_SSF_EXTERNAL */
-/* Inaccessible static: SASL_SEC_PROPS */
/*
* Class: CyrusSasl_GenericServer
* Method: jni_sasl_server_start
Modified: cyrus-sasl-2.1/branches/upstream/current/java/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/upstream/current/java/Makefile.in?rev=461&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/upstream/current/java/Makefile.in (original)
+++ cyrus-sasl-2.1/branches/upstream/current/java/Makefile.in Sun May 24 13:56:33 2009
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.7.2 from Makefile.am.
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -176,6 +176,7 @@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
bindir = @bindir@
build = @build@
@@ -215,6 +216,7 @@
SUBDIRS = CyrusSasl javax Test
EXTRA_DIST = doc
subdir = java
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -225,7 +227,7 @@
all-recursive install-data-recursive install-exec-recursive \
installdirs-recursive install-recursive uninstall-recursive \
check-recursive installcheck-recursive
-DIST_COMMON = README Makefile.am Makefile.in
+DIST_COMMON = README $(srcdir)/Makefile.in Makefile.am
DIST_SUBDIRS = $(SUBDIRS)
all: all-recursive
@@ -326,9 +328,15 @@
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
+ if (etags --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+ else \
+ include_option=--include; \
+ fi; \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+ test -f $$subdir/TAGS && \
+ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -425,7 +433,7 @@
installcheck: installcheck-recursive
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -433,7 +441,7 @@
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -443,7 +451,7 @@
clean-am: clean-generic clean-libtool mostlyclean-am
distclean: distclean-recursive
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic distclean-libtool \
distclean-tags
@@ -466,7 +474,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-recursive
Modified: cyrus-sasl-2.1/branches/upstream/current/java/Test/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/upstream/current/java/Test/Makefile.in?rev=461&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/upstream/current/java/Test/Makefile.in (original)
+++ cyrus-sasl-2.1/branches/upstream/current/java/Test/Makefile.in Sun May 24 13:56:33 2009
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.7.2 from Makefile.am.
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -176,6 +176,7 @@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
bindir = @bindir@
build = @build@
@@ -216,11 +217,12 @@
jimtest-compile.sh jimtest.sh
subdir = java/Test
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
DIST_SOURCES =
-DIST_COMMON = Makefile.am Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
all: all-am
.SUFFIXES:
@@ -282,7 +284,6 @@
all-am: Makefile
installdirs:
-
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -294,7 +295,7 @@
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -302,7 +303,7 @@
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -312,7 +313,7 @@
clean-am: clean-generic clean-libtool mostlyclean-am
distclean: distclean-am
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic distclean-libtool
dvi: dvi-am
@@ -334,7 +335,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
Modified: cyrus-sasl-2.1/branches/upstream/current/java/javax/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/upstream/current/java/javax/Makefile.in?rev=461&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/upstream/current/java/javax/Makefile.in (original)
+++ cyrus-sasl-2.1/branches/upstream/current/java/javax/Makefile.in Sun May 24 13:56:33 2009
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.7.2 from Makefile.am.
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -192,6 +192,7 @@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
bindir = @bindir@
build = @build@
@@ -230,6 +231,7 @@
SUBDIRS = security
subdir = java/javax
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -240,7 +242,7 @@
all-recursive install-data-recursive install-exec-recursive \
installdirs-recursive install-recursive uninstall-recursive \
check-recursive installcheck-recursive
-DIST_COMMON = Makefile.am Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
DIST_SUBDIRS = $(SUBDIRS)
all: all-recursive
@@ -341,9 +343,15 @@
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
+ if (etags --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+ else \
+ include_option=--include; \
+ fi; \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+ test -f $$subdir/TAGS && \
+ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -440,7 +448,7 @@
installcheck: installcheck-recursive
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -448,7 +456,7 @@
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -458,7 +466,7 @@
clean-am: clean-generic clean-libtool mostlyclean-am
distclean: distclean-recursive
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic distclean-libtool \
distclean-tags
@@ -481,7 +489,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-recursive
Modified: cyrus-sasl-2.1/branches/upstream/current/java/javax/security/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/upstream/current/java/javax/security/Makefile.in?rev=461&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/upstream/current/java/javax/security/Makefile.in (original)
+++ cyrus-sasl-2.1/branches/upstream/current/java/javax/security/Makefile.in Sun May 24 13:56:33 2009
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.7.2 from Makefile.am.
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -192,6 +192,7 @@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
bindir = @bindir@
build = @build@
@@ -230,6 +231,7 @@
SUBDIRS = auth
subdir = java/javax/security
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -240,7 +242,7 @@
all-recursive install-data-recursive install-exec-recursive \
installdirs-recursive install-recursive uninstall-recursive \
check-recursive installcheck-recursive
-DIST_COMMON = Makefile.am Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
DIST_SUBDIRS = $(SUBDIRS)
all: all-recursive
@@ -341,9 +343,15 @@
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
+ if (etags --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+ else \
+ include_option=--include; \
+ fi; \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+ test -f $$subdir/TAGS && \
+ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -440,7 +448,7 @@
installcheck: installcheck-recursive
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -448,7 +456,7 @@
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -458,7 +466,7 @@
clean-am: clean-generic clean-libtool mostlyclean-am
distclean: distclean-recursive
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic distclean-libtool \
distclean-tags
@@ -481,7 +489,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-recursive
Modified: cyrus-sasl-2.1/branches/upstream/current/java/javax/security/auth/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/upstream/current/java/javax/security/auth/Makefile.in?rev=461&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/upstream/current/java/javax/security/auth/Makefile.in (original)
+++ cyrus-sasl-2.1/branches/upstream/current/java/javax/security/auth/Makefile.in Sun May 24 13:56:33 2009
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.7.2 from Makefile.am.
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -192,6 +192,7 @@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
bindir = @bindir@
build = @build@
@@ -230,6 +231,7 @@
SUBDIRS = callback
subdir = java/javax/security/auth
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -240,7 +242,7 @@
all-recursive install-data-recursive install-exec-recursive \
installdirs-recursive install-recursive uninstall-recursive \
check-recursive installcheck-recursive
-DIST_COMMON = Makefile.am Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
DIST_SUBDIRS = $(SUBDIRS)
all: all-recursive
@@ -341,9 +343,15 @@
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
+ if (etags --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+ else \
+ include_option=--include; \
+ fi; \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+ test -f $$subdir/TAGS && \
+ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -440,7 +448,7 @@
installcheck: installcheck-recursive
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -448,7 +456,7 @@
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -458,7 +466,7 @@
clean-am: clean-generic clean-libtool mostlyclean-am
distclean: distclean-recursive
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic distclean-libtool \
distclean-tags
@@ -481,7 +489,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-recursive
Modified: cyrus-sasl-2.1/branches/upstream/current/java/javax/security/auth/callback/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/upstream/current/java/javax/security/auth/callback/Makefile.in?rev=461&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/upstream/current/java/javax/security/auth/callback/Makefile.in (original)
+++ cyrus-sasl-2.1/branches/upstream/current/java/javax/security/auth/callback/Makefile.in Sun May 24 13:56:33 2009
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.7.2 from Makefile.am.
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -192,6 +192,7 @@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
bindir = @bindir@
build = @build@
@@ -242,11 +243,12 @@
CLASSES = $(javasasl_JAVA:.java=.class)
subdir = java/javax/security/auth/callback
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
DIST_SOURCES =
-DIST_COMMON = Makefile.am Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
all: all-am
.SUFFIXES:
@@ -336,7 +338,6 @@
installdirs:
$(mkinstalldirs) $(DESTDIR)$(javasasldir)
-
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -348,7 +349,7 @@
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -356,7 +357,7 @@
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -366,7 +367,7 @@
clean-am: clean-generic clean-javasaslJAVA clean-libtool mostlyclean-am
distclean: distclean-am
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic distclean-libtool
dvi: dvi-am
@@ -388,7 +389,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
Modified: cyrus-sasl-2.1/branches/upstream/current/lib/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/upstream/current/lib/Makefile.am?rev=461&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/upstream/current/lib/Makefile.am (original)
+++ cyrus-sasl-2.1/branches/upstream/current/lib/Makefile.am Sun May 24 13:56:33 2009
@@ -1,6 +1,6 @@
# Makefile.am for the SASL library
# Rob Earhart
-# $Id: Makefile.am,v 1.85 2006/04/19 20:24:20 murch Exp $
+# $Id: Makefile.am,v 1.85.2.1 2009/04/27 17:58:26 murch Exp $
# Copyright (c) 2000 Carnegie Mellon University. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,7 @@
#
# Library version info - here at the top, for sanity
-sasl_version = 2:22:0
+sasl_version = 2:23:0
INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/plugins -I$(top_builddir)/include -I$(top_srcdir)/sasldb
Modified: cyrus-sasl-2.1/branches/upstream/current/lib/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/upstream/current/lib/Makefile.in?rev=461&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/upstream/current/lib/Makefile.in (original)
+++ cyrus-sasl-2.1/branches/upstream/current/lib/Makefile.in Sun May 24 13:56:33 2009
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.7.2 from Makefile.am.
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -16,7 +16,7 @@
# Makefile.am for the SASL library
# Rob Earhart
-# $Id: Makefile.am,v 1.85 2006/04/19 20:24:20 murch Exp $
+# $Id: Makefile.am,v 1.85.2.1 2009/04/27 17:58:26 murch Exp $
# Copyright (c) 2000 Carnegie Mellon University. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -194,6 +194,7 @@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
bindir = @bindir@
build = @build@
@@ -231,7 +232,7 @@
target_vendor = @target_vendor@
# Library version info - here at the top, for sanity
-sasl_version = 2:22:0
+sasl_version = 2:23:0
INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/plugins -I$(top_builddir)/include -I$(top_srcdir)/sasldb
@@ -252,6 +253,7 @@
@MACOSX_TRUE at framedir = /Library/Frameworks/SASL2.framework
subdir = lib
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -291,8 +293,8 @@
LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
DIST_SOURCES = $(libsasl2_a_SOURCES) $(libsasl2_la_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in getaddrinfo.c getnameinfo.c \
- getsubopt.c snprintf.c
+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am getaddrinfo.c \
+ getnameinfo.c getsubopt.c snprintf.c
SOURCES = $(libsasl2_a_SOURCES) $(libsasl2_la_SOURCES)
all: all-am
@@ -364,13 +366,10 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/server.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/seterror.Plo at am__quote@
-distclean-depend:
- -rm -rf $(DEPDIR) ./$(DEPDIR)
-
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
- at am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@@ -381,7 +380,7 @@
.c.obj:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
- at am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@@ -392,7 +391,7 @@
.c.lo:
@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
- at am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
+ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@@ -403,7 +402,7 @@
plugin_common.o: ../plugins/plugin_common.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT plugin_common.o -MD -MP -MF "$(DEPDIR)/plugin_common.Tpo" \
@am__fastdepCC_TRUE@ -c -o plugin_common.o `test -f '../plugins/plugin_common.c' || echo '$(srcdir)/'`../plugins/plugin_common.c; \
- at am__fastdepCC_TRUE@ then mv "$(DEPDIR)/plugin_common.Tpo" "$(DEPDIR)/plugin_common.Po"; \
+ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/plugin_common.Tpo" "$(DEPDIR)/plugin_common.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/plugin_common.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../plugins/plugin_common.c' object='plugin_common.o' libtool=no @AMDEPBACKSLASH@
@@ -414,7 +413,7 @@
plugin_common.obj: ../plugins/plugin_common.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT plugin_common.obj -MD -MP -MF "$(DEPDIR)/plugin_common.Tpo" \
@am__fastdepCC_TRUE@ -c -o plugin_common.obj `if test -f '../plugins/plugin_common.c'; then $(CYGPATH_W) '../plugins/plugin_common.c'; else $(CYGPATH_W) '$(srcdir)/../plugins/plugin_common.c'; fi`; \
- at am__fastdepCC_TRUE@ then mv "$(DEPDIR)/plugin_common.Tpo" "$(DEPDIR)/plugin_common.Po"; \
+ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/plugin_common.Tpo" "$(DEPDIR)/plugin_common.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/plugin_common.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../plugins/plugin_common.c' object='plugin_common.obj' libtool=no @AMDEPBACKSLASH@
@@ -425,7 +424,7 @@
plugin_common.lo: ../plugins/plugin_common.c
@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT plugin_common.lo -MD -MP -MF "$(DEPDIR)/plugin_common.Tpo" \
@am__fastdepCC_TRUE@ -c -o plugin_common.lo `test -f '../plugins/plugin_common.c' || echo '$(srcdir)/'`../plugins/plugin_common.c; \
- at am__fastdepCC_TRUE@ then mv "$(DEPDIR)/plugin_common.Tpo" "$(DEPDIR)/plugin_common.Plo"; \
+ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/plugin_common.Tpo" "$(DEPDIR)/plugin_common.Plo"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/plugin_common.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../plugins/plugin_common.c' object='plugin_common.lo' libtool=yes @AMDEPBACKSLASH@
@@ -534,7 +533,6 @@
installdirs:
$(mkinstalldirs) $(DESTDIR)$(libdir)
-
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -546,7 +544,7 @@
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -554,7 +552,7 @@
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -565,9 +563,10 @@
clean-noinstLIBRARIES mostlyclean-am
distclean: distclean-am
-
-distclean-am: clean-am distclean-compile distclean-depend \
- distclean-generic distclean-libtool distclean-tags
+ -rm -rf $(DEPDIR) ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-libtool distclean-tags
dvi: dvi-am
@@ -590,7 +589,8 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -rf $(DEPDIR) ./$(DEPDIR)
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
@@ -610,10 +610,10 @@
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-libLTLIBRARIES clean-libtool clean-noinstLIBRARIES ctags \
- distclean distclean-compile distclean-depend distclean-generic \
- distclean-libtool distclean-tags distdir dvi dvi-am info \
- info-am install install-am install-data install-data-am \
- install-exec install-exec-am install-info install-info-am \
+ distclean distclean-compile distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am info info-am install \
+ install-am install-data install-data-am install-exec \
+ install-exec-am install-info install-info-am \
install-libLTLIBRARIES install-man install-strip installcheck \
installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
Modified: cyrus-sasl-2.1/branches/upstream/current/lib/saslutil.c
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/upstream/current/lib/saslutil.c?rev=461&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/upstream/current/lib/saslutil.c (original)
+++ cyrus-sasl-2.1/branches/upstream/current/lib/saslutil.c Sun May 24 13:56:33 2009
@@ -1,7 +1,7 @@
/* saslutil.c
* Rob Siemborski
* Tim Martin
- * $Id: saslutil.c,v 1.44 2006/03/13 18:26:36 mel Exp $
+ * $Id: saslutil.c,v 1.44.2.1 2009/04/27 17:47:17 murch Exp $
*/
/*
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
@@ -125,10 +125,12 @@
/* Will it fit? */
olen = (inlen + 2) / 3 * 4;
- if (outlen)
+ if (outlen) {
*outlen = olen;
- if (outmax < olen)
+ }
+ if (outmax <= olen) {
return SASL_BUFOVER;
+ }
/* Do the work... */
blah=(char *) out;
@@ -151,8 +153,7 @@
*out++ = '=';
}
- if (olen < outmax)
- *out = '\0';
+ *out = '\0';
return SASL_OK;
}
Modified: cyrus-sasl-2.1/branches/upstream/current/man/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/upstream/current/man/Makefile.in?rev=461&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/upstream/current/man/Makefile.in (original)
+++ cyrus-sasl-2.1/branches/upstream/current/man/Makefile.in Sun May 24 13:56:33 2009
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.7.2 from Makefile.am.
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -194,6 +194,7 @@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
bindir = @bindir@
build = @build@
@@ -248,6 +249,7 @@
EXTRA_DIST = $(man_MANS)
subdir = man
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -255,7 +257,7 @@
NROFF = nroff
MANS = $(man_MANS)
-DIST_COMMON = Makefile.am Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
all: all-am
.SUFFIXES:
@@ -365,7 +367,6 @@
installdirs:
$(mkinstalldirs) $(DESTDIR)$(man3dir)
-
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -377,7 +378,7 @@
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -385,7 +386,7 @@
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -395,7 +396,7 @@
clean-am: clean-generic clean-libtool mostlyclean-am
distclean: distclean-am
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic distclean-libtool
dvi: dvi-am
@@ -417,7 +418,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
Modified: cyrus-sasl-2.1/branches/upstream/current/plugins/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/upstream/current/plugins/Makefile.am?rev=461&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/upstream/current/plugins/Makefile.am (original)
+++ cyrus-sasl-2.1/branches/upstream/current/plugins/Makefile.am Sun May 24 13:56:33 2009
@@ -1,7 +1,7 @@
# Makefile.am for the SASL plugins
# Rob Siemborski
# Rob Earhart
-# $Id: Makefile.am,v 1.78 2006/04/19 20:24:21 murch Exp $
+# $Id: Makefile.am,v 1.78.2.1 2009/04/27 17:58:26 murch Exp $
#
################################################################
# Copyright (c) 2000 Carnegie Mellon University. All rights reserved.
@@ -46,20 +46,20 @@
# Library version info - here at the top, for sanity
# CURRENT:REVISION:AGE
-anonymous_version = 2:22:0
-digestmd5_version = 2:22:0
-kerberos4_version = 2:22:0
-gssapiv2_version = 2:22:0
-crammd5_version = 2:22:0
-passdss_version = 2:22:0
-sasldb_version = 2:22:0
-login_version = 2:22:0
-plain_version = 2:22:0
-ntlm_version = 2:22:0
-otp_version = 2:22:0
-sql_version = 2:22:0
-ldapdb_version = 2:22:0
-srp_version = 2:22:0
+anonymous_version = 2:23:0
+digestmd5_version = 2:23:0
+kerberos4_version = 2:23:0
+gssapiv2_version = 2:23:0
+crammd5_version = 2:23:0
+passdss_version = 2:23:0
+sasldb_version = 2:23:0
+login_version = 2:23:0
+plain_version = 2:23:0
+ntlm_version = 2:23:0
+otp_version = 2:23:0
+sql_version = 2:23:0
+ldapdb_version = 2:23:0
+srp_version = 2:23:0
INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/sasldb -I$(top_builddir)/include
AM_LDFLAGS = -module -export-dynamic -rpath $(plugindir)
Modified: cyrus-sasl-2.1/branches/upstream/current/plugins/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/upstream/current/plugins/Makefile.in?rev=461&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/upstream/current/plugins/Makefile.in (original)
+++ cyrus-sasl-2.1/branches/upstream/current/plugins/Makefile.in Sun May 24 13:56:33 2009
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.7.2 from Makefile.am.
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -17,7 +17,7 @@
# Makefile.am for the SASL plugins
# Rob Siemborski
# Rob Earhart
-# $Id: Makefile.am,v 1.78 2006/04/19 20:24:21 murch Exp $
+# $Id: Makefile.am,v 1.78.2.1 2009/04/27 17:58:26 murch Exp $
#
################################################################
# Copyright (c) 2000 Carnegie Mellon University. All rights reserved.
@@ -198,6 +198,7 @@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
bindir = @bindir@
build = @build@
@@ -237,20 +238,20 @@
# Library version info - here at the top, for sanity
# CURRENT:REVISION:AGE
-anonymous_version = 2:22:0
-digestmd5_version = 2:22:0
-kerberos4_version = 2:22:0
-gssapiv2_version = 2:22:0
-crammd5_version = 2:22:0
-passdss_version = 2:22:0
-sasldb_version = 2:22:0
-login_version = 2:22:0
-plain_version = 2:22:0
-ntlm_version = 2:22:0
-otp_version = 2:22:0
-sql_version = 2:22:0
-ldapdb_version = 2:22:0
-srp_version = 2:22:0
+anonymous_version = 2:23:0
+digestmd5_version = 2:23:0
+kerberos4_version = 2:23:0
+gssapiv2_version = 2:23:0
+crammd5_version = 2:23:0
+passdss_version = 2:23:0
+sasldb_version = 2:23:0
+login_version = 2:23:0
+plain_version = 2:23:0
+ntlm_version = 2:23:0
+otp_version = 2:23:0
+sql_version = 2:23:0
+ldapdb_version = 2:23:0
+srp_version = 2:23:0
INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/sasldb -I$(top_builddir)/include
AM_LDFLAGS = -module -export-dynamic -rpath $(plugindir)
@@ -349,6 +350,7 @@
CLEANFILES = $(init_src)
subdir = plugins
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -426,7 +428,7 @@
$(libotp_la_SOURCES) $(libpassdss_la_SOURCES) \
$(libplain_la_SOURCES) $(libsasldb_la_SOURCES) \
$(libsql_la_SOURCES) $(libsrp_la_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
SOURCES = $(libanonymous_la_SOURCES) $(libcrammd5_la_SOURCES) $(libdigestmd5_la_SOURCES) $(libgssapiv2_la_SOURCES) $(libkerberos4_la_SOURCES) $(libldapdb_la_SOURCES) $(liblogin_la_SOURCES) $(libntlm_la_SOURCES) $(libotp_la_SOURCES) $(libpassdss_la_SOURCES) $(libplain_la_SOURCES) $(libsasldb_la_SOURCES) $(libsql_la_SOURCES) $(libsrp_la_SOURCES)
all: all-am
@@ -531,13 +533,10 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/srp.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/srp_init.Plo at am__quote@
-distclean-depend:
- -rm -rf ./$(DEPDIR)
-
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
- at am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@@ -548,7 +547,7 @@
.c.obj:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
- at am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@@ -559,7 +558,7 @@
.c.lo:
@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
- at am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
+ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@@ -668,7 +667,6 @@
installdirs:
$(mkinstalldirs) $(DESTDIR)$(sasldir)
-
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -680,7 +678,7 @@
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -689,7 +687,7 @@
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -700,9 +698,10 @@
mostlyclean-am
distclean: distclean-am
-
-distclean-am: clean-am distclean-compile distclean-depend \
- distclean-generic distclean-libtool distclean-tags
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-libtool distclean-tags
dvi: dvi-am
@@ -723,7 +722,8 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
@@ -743,11 +743,11 @@
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-libtool clean-saslLTLIBRARIES ctags distclean \
- distclean-compile distclean-depend distclean-generic \
- distclean-libtool distclean-tags distdir dvi dvi-am info \
- info-am install install-am install-data install-data-am \
- install-exec install-exec-am install-info install-info-am \
- install-man install-saslLTLIBRARIES install-strip installcheck \
+ distclean-compile distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am info info-am install \
+ install-am install-data install-data-am install-exec \
+ install-exec-am install-info install-info-am install-man \
+ install-saslLTLIBRARIES install-strip installcheck \
installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
Modified: cyrus-sasl-2.1/branches/upstream/current/pwcheck/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/upstream/current/pwcheck/Makefile.in?rev=461&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/upstream/current/pwcheck/Makefile.in (original)
+++ cyrus-sasl-2.1/branches/upstream/current/pwcheck/Makefile.in Sun May 24 13:56:33 2009
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.7.2 from Makefile.am.
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -175,6 +175,7 @@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
bindir = @bindir@
build = @build@
@@ -220,6 +221,7 @@
pwcheck_DEPENDECIES = pwcheck_ at PWCHECKMETH@.lo
pwcheck_LDADD = pwcheck_ at PWCHECKMETH@.lo @LIB_CRYPT@ @LIB_SOCKET@
subdir = pwcheck
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -245,7 +247,7 @@
LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
DIST_SOURCES = $(pwcheck_SOURCES) $(EXTRA_pwcheck_SOURCES)
-DIST_COMMON = README Makefile.am Makefile.in
+DIST_COMMON = README $(srcdir)/Makefile.in Makefile.am
SOURCES = $(pwcheck_SOURCES) $(EXTRA_pwcheck_SOURCES)
all: all-am
@@ -300,13 +302,10 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pwcheck_getpwnam.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pwcheck_getspnam.Po at am__quote@
-distclean-depend:
- -rm -rf ./$(DEPDIR)
-
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
- at am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@@ -317,7 +316,7 @@
.c.obj:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
- at am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@@ -328,7 +327,7 @@
.c.lo:
@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
- at am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
+ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@@ -437,7 +436,6 @@
installdirs:
$(mkinstalldirs) $(DESTDIR)$(sbindir)
-
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -449,7 +447,7 @@
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -457,7 +455,7 @@
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -467,9 +465,10 @@
clean-am: clean-generic clean-libtool clean-sbinPROGRAMS mostlyclean-am
distclean: distclean-am
-
-distclean-am: clean-am distclean-compile distclean-depend \
- distclean-generic distclean-libtool distclean-tags
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-libtool distclean-tags
dvi: dvi-am
@@ -490,7 +489,8 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
@@ -510,16 +510,15 @@
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-libtool clean-sbinPROGRAMS ctags distclean \
- distclean-compile distclean-depend distclean-generic \
- distclean-libtool distclean-tags distdir dvi dvi-am info \
- info-am install install-am install-data install-data-am \
- install-exec install-exec-am install-info install-info-am \
- install-man install-sbinPROGRAMS 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-info-am \
- uninstall-sbinPROGRAMS
+ distclean-compile distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am info info-am install \
+ install-am install-data install-data-am install-exec \
+ install-exec-am install-info install-info-am install-man \
+ install-sbinPROGRAMS 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-info-am uninstall-sbinPROGRAMS
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
Modified: cyrus-sasl-2.1/branches/upstream/current/sample/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/upstream/current/sample/Makefile.in?rev=461&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/upstream/current/sample/Makefile.in (original)
+++ cyrus-sasl-2.1/branches/upstream/current/sample/Makefile.in Sun May 24 13:56:33 2009
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.7.2 from Makefile.am.
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -195,6 +195,7 @@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
bindir = @bindir@
build = @build@
@@ -251,6 +252,7 @@
EXTRA_DIST = NTMakefile
subdir = sample
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -290,7 +292,7 @@
$(AM_LDFLAGS) $(LDFLAGS) -o $@
DIST_SOURCES = $(client_SOURCES) $(sample_client_SOURCES) \
$(sample_server_SOURCES) $(server_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
SOURCES = $(client_SOURCES) $(sample_client_SOURCES) $(sample_server_SOURCES) $(server_SOURCES)
all: all-am
@@ -334,13 +336,10 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/sample-server.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/server.Po at am__quote@
-distclean-depend:
- -rm -rf ./$(DEPDIR)
-
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
- at am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@@ -351,7 +350,7 @@
.c.obj:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
- at am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@@ -362,7 +361,7 @@
.c.lo:
@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
- at am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
+ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@@ -470,7 +469,6 @@
all-am: Makefile $(PROGRAMS)
installdirs:
-
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -482,7 +480,7 @@
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -491,7 +489,7 @@
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -502,9 +500,10 @@
mostlyclean-am
distclean: distclean-am
-
-distclean-am: clean-am distclean-compile distclean-depend \
- distclean-generic distclean-libtool distclean-tags
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-libtool distclean-tags
dvi: dvi-am
@@ -525,7 +524,8 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
@@ -545,15 +545,14 @@
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-libtool clean-noinstPROGRAMS ctags distclean \
- distclean-compile distclean-depend distclean-generic \
- distclean-libtool distclean-tags distdir dvi dvi-am info \
- info-am install install-am install-data install-data-am \
- install-exec install-exec-am install-info install-info-am \
- install-man 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-info-am
+ distclean-compile distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am info info-am install \
+ install-am install-data install-data-am install-exec \
+ install-exec-am install-info install-info-am install-man \
+ 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-info-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
Modified: cyrus-sasl-2.1/branches/upstream/current/saslauthd/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/upstream/current/saslauthd/Makefile.in?rev=461&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/upstream/current/saslauthd/Makefile.in (original)
+++ cyrus-sasl-2.1/branches/upstream/current/saslauthd/Makefile.in Sun May 24 13:56:33 2009
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.7.2 from Makefile.am.
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -103,6 +103,7 @@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
bindir = @bindir@
build = @build@
@@ -216,12 +217,12 @@
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
DIST_SOURCES = $(saslauthd_SOURCES) $(saslcache_SOURCES) \
$(testsaslauthd_SOURCES)
-DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
- Makefile.in NEWS aclocal.m4 config/config.guess \
- config/config.sub config/depcomp config/install-sh \
- config/ltconfig config/ltmain.sh config/missing \
- config/mkinstalldirs configure configure.in getaddrinfo.c \
- getnameinfo.c saslauthd.h.in
+DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \
+ COPYING ChangeLog INSTALL Makefile.am NEWS aclocal.m4 \
+ config/config.guess config/config.sub config/depcomp \
+ config/install-sh config/ltconfig config/ltmain.sh \
+ config/missing config/mkinstalldirs configure configure.in \
+ getaddrinfo.c getnameinfo.c saslauthd.h.in
SOURCES = $(saslauthd_SOURCES) $(saslcache_SOURCES) $(testsaslauthd_SOURCES)
all: saslauthd.h
@@ -328,13 +329,10 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/testsaslauthd.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/utils.Po at am__quote@
-distclean-depend:
- -rm -rf $(DEPDIR) ./$(DEPDIR)
-
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
- at am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@@ -345,7 +343,7 @@
.c.obj:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
- at am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@@ -474,12 +472,12 @@
$(am__remove_distdir)
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
chmod -R a-w $(distdir); chmod a+w $(distdir)
- mkdir $(distdir)/=build
- mkdir $(distdir)/=inst
+ mkdir $(distdir)/_build
+ mkdir $(distdir)/_inst
chmod a-w $(distdir)
- dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \
+ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
- && cd $(distdir)/=build \
+ && cd $(distdir)/_build \
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
$(DISTCHECK_CONFIGURE_FLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) \
@@ -506,7 +504,7 @@
@echo "$(distdir).tar.gz is ready for distribution" | \
sed 'h;s/./=/g;p;x;p;x'
distuninstallcheck:
- cd $(distuninstallcheck_dir) \
+ @cd $(distuninstallcheck_dir) \
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
|| { echo "ERROR: files left after uninstall:" ; \
if test -n "$(DESTDIR)"; then \
@@ -515,11 +513,11 @@
$(distuninstallcheck_listfiles) ; \
exit 1; } >&2
distcleancheck: distclean
- if test '$(srcdir)' = . ; then \
+ @if test '$(srcdir)' = . ; then \
echo "ERROR: distcleancheck can only run from a VPATH build" ; \
exit 1 ; \
fi
- test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+ @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
|| { echo "ERROR: files left in build directory after distclean:" ; \
$(distcleancheck_listfiles) ; \
exit 1; } >&2
@@ -529,7 +527,6 @@
installdirs:
$(mkinstalldirs) $(DESTDIR)$(sbindir)
-
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -541,7 +538,7 @@
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -549,7 +546,7 @@
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -560,8 +557,10 @@
distclean: distclean-am
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-distclean-am: clean-am distclean-compile distclean-depend \
- distclean-generic distclean-hdr distclean-tags
+ -rm -rf $(DEPDIR) ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic distclean-hdr \
+ distclean-tags
dvi: dvi-am
@@ -583,7 +582,9 @@
maintainer-clean: maintainer-clean-am
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
- -rm -rf autom4te.cache
+ -rm -rf $(top_srcdir)/autom4te.cache
+ -rm -rf $(DEPDIR) ./$(DEPDIR)
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
@@ -602,15 +603,15 @@
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-sbinPROGRAMS ctags dist dist-all dist-gzip distcheck \
- distclean distclean-compile distclean-depend distclean-generic \
- distclean-hdr distclean-tags distcleancheck distdir \
- distuninstallcheck dvi dvi-am info info-am install install-am \
- install-data install-data-am install-data-local install-exec \
- install-exec-am install-info install-info-am install-man \
- install-sbinPROGRAMS install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
- ps ps-am tags uninstall uninstall-am uninstall-info-am \
+ distclean distclean-compile distclean-generic distclean-hdr \
+ distclean-tags distcleancheck distdir distuninstallcheck dvi \
+ dvi-am info info-am install install-am install-data \
+ install-data-am install-data-local install-exec install-exec-am \
+ install-info install-info-am install-man install-sbinPROGRAMS \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
+ tags uninstall uninstall-am uninstall-info-am \
uninstall-sbinPROGRAMS
Modified: cyrus-sasl-2.1/branches/upstream/current/saslauthd/aclocal.m4
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/upstream/current/saslauthd/aclocal.m4?rev=461&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/upstream/current/saslauthd/aclocal.m4 (original)
+++ cyrus-sasl-2.1/branches/upstream/current/saslauthd/aclocal.m4 Sun May 24 13:56:33 2009
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.7.2 -*- Autoconf -*-
+# generated automatically by aclocal 1.7.9 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
# Free Software Foundation, Inc.
@@ -60,7 +60,7 @@
# 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.
-# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
# Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
@@ -78,14 +78,7 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
-# serial 8
-
-# 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
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
+# serial 10
AC_PREREQ([2.54])
@@ -130,8 +123,8 @@
AC_SUBST([PACKAGE], [$1])dnl
AC_SUBST([VERSION], [$2])],
[_AM_SET_OPTIONS([$1])dnl
- AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl
- AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])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])
@@ -152,6 +145,7 @@
# some platforms.
AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
_AM_IF_OPTION([no-dependencies],,
[AC_PROVIDE_IFELSE([AC_PROG_CC],
@@ -174,7 +168,16 @@
# loop where config.status creates the headers, so we can generate
# our stamp files there.
AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[_am_stamp_count=`expr ${_am_stamp_count-0} + 1`
+[# Compute $1's index in $config_headers.
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+ case $_am_header in
+ $1 | $1:* )
+ break ;;
+ * )
+ _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+ esac
+done
echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
# Copyright 2002 Free Software Foundation, Inc.
@@ -204,7 +207,7 @@
# Call AM_AUTOMAKE_VERSION so it can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
- [AM_AUTOMAKE_VERSION([1.7.2])])
+ [AM_AUTOMAKE_VERSION([1.7.9])])
# Helper functions for option handling. -*- Autoconf -*-
@@ -490,9 +493,42 @@
INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# serial 4 -*- Autoconf -*-
-
-# Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
+# -*- Autoconf -*-
+# Copyright (C) 2003 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 1
+
+# Check whether the underlying file-system supports filenames
+# with a leading dot. For instance MS-DOS doesn't.
+AC_DEFUN([AM_SET_LEADING_DOT],
+[rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+ am__leading_dot=.
+else
+ am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+AC_SUBST([am__leading_dot])])
+
+# serial 5 -*- Autoconf -*-
+
+# Copyright (C) 1999, 2000, 2001, 2002, 2003 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
@@ -553,18 +589,32 @@
# using a relative directory.
cp "$am_depcomp" conftest.dir
cd conftest.dir
+ # We will build objects and dependencies in a subdirectory because
+ # it helps to detect inapplicable dependency modes. For instance
+ # both Tru64's cc and ICC support -MD to output dependencies as a
+ # side effect of compilation, but ICC will put the dependencies in
+ # the current directory while Tru64 will put them in the object
+ # directory.
+ mkdir sub
am_cv_$1_dependencies_compiler_type=none
if test "$am_compiler_list" = ""; then
am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
fi
for depmode in $am_compiler_list; do
+ # Setup a source with many dependencies, because some compilers
+ # like to wrap large dependency lists on column 80 (with \), and
+ # we should not choose a depcomp mode which is confused by this.
+ #
# We need to recreate these files for each test, as the compiler may
# overwrite some of them when testing with obscure command lines.
# This happens at least with the AIX C compiler.
- echo '#include "conftest.h"' > conftest.c
- echo 'int i;' > conftest.h
- echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
+ : > sub/conftest.c
+ for i in 1 2 3 4 5 6; do
+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
+ : > sub/conftst$i.h
+ done
+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
case $depmode in
nosideeffect)
@@ -582,13 +632,20 @@
# mode. It turns out that the SunPro C++ compiler does not properly
# handle `-M -o', and we need to detect this.
if depmode=$depmode \
- source=conftest.c object=conftest.o \
- depfile=conftest.Po tmpdepfile=conftest.TPo \
- $SHELL ./depcomp $depcc -c -o conftest.o conftest.c >/dev/null 2>&1 &&
- grep conftest.h conftest.Po > /dev/null 2>&1 &&
+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+ >/dev/null 2>conftest.err &&
+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
- am_cv_$1_dependencies_compiler_type=$depmode
- break
+ # icc doesn't choke on unknown options, it will just issue warnings
+ # (even with -Werror). So we grep stderr for any message
+ # that says an option was ignored.
+ if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
+ am_cv_$1_dependencies_compiler_type=$depmode
+ break
+ fi
fi
done
@@ -610,16 +667,8 @@
# Choose a directory name for dependency files.
# This macro is AC_REQUIREd in _AM_DEPENDENCIES
AC_DEFUN([AM_SET_DEPDIR],
-[rm -f .deps 2>/dev/null
-mkdir .deps 2>/dev/null
-if test -d .deps; then
- DEPDIR=.deps
-else
- # MS-DOS does not allow filenames that begin with a dot.
- DEPDIR=_deps
-fi
-rmdir .deps 2>/dev/null
-AC_SUBST([DEPDIR])
+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
])
@@ -723,7 +772,7 @@
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003 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
@@ -748,8 +797,9 @@
AC_DEFUN([AM_MAKE_INCLUDE],
[am_make=${MAKE-make}
cat > confinc << 'END'
-doit:
+am__doit:
@echo done
+.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
AC_MSG_CHECKING([for style of include used by $am_make])
@@ -777,9 +827,9 @@
_am_result=BSD
fi
fi
-AC_SUBST(am__include)
-AC_SUBST(am__quote)
-AC_MSG_RESULT($_am_result)
+AC_SUBST([am__include])
+AC_SUBST([am__quote])
+AC_MSG_RESULT([$_am_result])
rm -f confinc confmf
])
Modified: cyrus-sasl-2.1/branches/upstream/current/saslauthd/configure
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/upstream/current/saslauthd/configure?rev=461&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/upstream/current/saslauthd/configure (original)
+++ cyrus-sasl-2.1/branches/upstream/current/saslauthd/configure Sun May 24 13:56:33 2009
@@ -308,7 +308,7 @@
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os SASLAUTHD_TRUE SASLAUTHD_FALSE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP LN_S LIB_SOCKET EGREP CMU_LIB_SUBDIR LIB_DES SASL_KRB_LIB LIB_CRYPT GSSAPI_LIBS GSSAPIBASE_LIBS LIB_SIA SASL_DB_UTILS SASL_DB_MANS SASL_DB_BACKEND SASL_DB_BACKEND_STATIC SASL_DB_INC SASL_DB_LIB MAIN_COMPAT_OBJ LIB_PAM LDAP_LIBS LTLIBOBJS LIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os SASLAUTHD_TRUE SASLAUTHD_FALSE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP LN_S LIB_SOCKET EGREP CMU_LIB_SUBDIR LIB_DES SASL_KRB_LIB LIB_CRYPT GSSAPI_LIBS GSSAPIBASE_LIBS LIB_SIA SASL_DB_UTILS SASL_DB_MANS SASL_DB_BACKEND SASL_DB_BACKEND_STATIC SASL_DB_INC SASL_DB_LIB MAIN_COMPAT_OBJ LIB_PAM LDAP_LIBS LTLIBOBJS LIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -1622,6 +1622,15 @@
SET_MAKE="MAKE=${MAKE-make}"
fi
+rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+ am__leading_dot=.
+else
+ am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+
# test to see if srcdir already configured
if test "`cd $srcdir && pwd`" != "`pwd`" &&
test -f $srcdir/config.status; then
@@ -1642,7 +1651,7 @@
# Define the identity of the package.
PACKAGE=saslauthd
- VERSION=2.1.22
+ VERSION=2.1.23
cat >>confdefs.h <<_ACEOF
@@ -2640,24 +2649,16 @@
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-rm -f .deps 2>/dev/null
-mkdir .deps 2>/dev/null
-if test -d .deps; then
- DEPDIR=.deps
-else
- # MS-DOS does not allow filenames that begin with a dot.
- DEPDIR=_deps
-fi
-rmdir .deps 2>/dev/null
-
+DEPDIR="${am__leading_dot}deps"
ac_config_commands="$ac_config_commands depfiles"
am_make=${MAKE-make}
cat > confinc << 'END'
-doit:
+am__doit:
@echo done
+.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
@@ -2732,18 +2733,32 @@
# using a relative directory.
cp "$am_depcomp" conftest.dir
cd conftest.dir
+ # We will build objects and dependencies in a subdirectory because
+ # it helps to detect inapplicable dependency modes. For instance
+ # both Tru64's cc and ICC support -MD to output dependencies as a
+ # side effect of compilation, but ICC will put the dependencies in
+ # the current directory while Tru64 will put them in the object
+ # directory.
+ mkdir sub
am_cv_CC_dependencies_compiler_type=none
if test "$am_compiler_list" = ""; then
am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
fi
for depmode in $am_compiler_list; do
+ # Setup a source with many dependencies, because some compilers
+ # like to wrap large dependency lists on column 80 (with \), and
+ # we should not choose a depcomp mode which is confused by this.
+ #
# We need to recreate these files for each test, as the compiler may
# overwrite some of them when testing with obscure command lines.
# This happens at least with the AIX C compiler.
- echo '#include "conftest.h"' > conftest.c
- echo 'int i;' > conftest.h
- echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
+ : > sub/conftest.c
+ for i in 1 2 3 4 5 6; do
+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
+ : > sub/conftst$i.h
+ done
+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
case $depmode in
nosideeffect)
@@ -2761,13 +2776,20 @@
# mode. It turns out that the SunPro C++ compiler does not properly
# handle `-M -o', and we need to detect this.
if depmode=$depmode \
- source=conftest.c object=conftest.o \
- depfile=conftest.Po tmpdepfile=conftest.TPo \
- $SHELL ./depcomp $depcc -c -o conftest.o conftest.c >/dev/null 2>&1 &&
- grep conftest.h conftest.Po > /dev/null 2>&1 &&
+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+ >/dev/null 2>conftest.err &&
+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
- am_cv_CC_dependencies_compiler_type=$depmode
- break
+ # icc doesn't choke on unknown options, it will just issue warnings
+ # (even with -Werror). So we grep stderr for any message
+ # that says an option was ignored.
+ if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
+ am_cv_CC_dependencies_compiler_type=$depmode
+ break
+ fi
fi
done
@@ -12550,6 +12572,7 @@
s, at INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
s, at AWK@,$AWK,;t t
s, at SET_MAKE@,$SET_MAKE,;t t
+s, at am__leading_dot@,$am__leading_dot,;t t
s, at CC@,$CC,;t t
s, at CFLAGS@,$CFLAGS,;t t
s, at LDFLAGS@,$LDFLAGS,;t t
@@ -13013,7 +13036,16 @@
cat $tmp/config.h
rm -f $tmp/config.h
fi
-_am_stamp_count=`expr ${_am_stamp_count-0} + 1`
+# Compute $ac_file's index in $config_headers.
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+ case $_am_header in
+ $ac_file | $ac_file:* )
+ break ;;
+ * )
+ _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+ esac
+done
echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X$ac_file : 'X\(//\)[^/]' \| \
Modified: cyrus-sasl-2.1/branches/upstream/current/saslauthd/configure.in
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/upstream/current/saslauthd/configure.in?rev=461&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/upstream/current/saslauthd/configure.in (original)
+++ cyrus-sasl-2.1/branches/upstream/current/saslauthd/configure.in Sun May 24 13:56:33 2009
@@ -15,7 +15,7 @@
AC_DEFINE_UNQUOTED(PATH_SASLAUTHD_RUNDIR, "$with_saslauthd",[Location of saslauthd socket])
AM_CONDITIONAL(SASLAUTHD, test "$with_saslauthd" != no)
-AM_INIT_AUTOMAKE(saslauthd,2.1.22)
+AM_INIT_AUTOMAKE(saslauthd,2.1.23)
CMU_INIT_AUTOMAKE
dnl Checks for programs.
Modified: cyrus-sasl-2.1/branches/upstream/current/saslauthd/saslauthd.8
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/upstream/current/saslauthd/saslauthd.8?rev=461&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/upstream/current/saslauthd/saslauthd.8 (original)
+++ cyrus-sasl-2.1/branches/upstream/current/saslauthd/saslauthd.8 Sun May 24 13:56:33 2009
@@ -1,148 +1,148 @@
-SASLAUTHD(8) BSD System Manager's Manual SASLAUTHD(8)
+SASLAUTHD(8) BSD System Manager’s Manual SASLAUTHD(8)
-[1mNAME[0m
- [1msaslauthd [22m- sasl authentication server
+NNAAMMEE
+ ssaassllaauutthhdd - sasl authentication server
-[1mSYNOPSIS[0m
- [1msaslauthd -a [4m[22mauthmech[24m [[1m-Tvdchlr[22m] [[1m-O [4m[22moption[24m] [[1m-m [4m[22mmux_path[24m] [[1m-n [4m[22mthreads[24m]
- [[1m-s [4m[22msize[24m] [[1m-t [4m[22mtimeout[24m]
+SSYYNNOOPPSSIISS
+ ssaassllaauutthhdd --aa _a_u_t_h_m_e_c_h [--TTvvddcchhllrr] [--OO _o_p_t_i_o_n] [--mm _m_u_x___p_a_t_h] [--nn _t_h_r_e_a_d_s]
+ [--ss _s_i_z_e] [--tt _t_i_m_e_o_u_t]
-[1mDESCRIPTION[0m
- [1msaslauthd [22mis a daemon process that handles plaintext authentication
+DDEESSCCRRIIPPTTIIOONN
+ ssaassllaauutthhdd is a daemon process that handles plaintext authentication
requests on behalf of the SASL library.
The server fulfills two roles: it isolates all code requiring superuser
- privileges into a single process, and it can be used to provide [4mproxy[0m
+ privileges into a single process, and it can be used to provide _p_r_o_x_y
authentication services to clients that do not understand SASL based
authentication.
- [1msaslauthd [22mshould be started from the system boot scripts when going to
+ ssaassllaauutthhdd should be started from the system boot scripts when going to
multi-user mode. When running against a protected authentication database
(e.g. the shadow mechanism), it must be run as the superuser.
- [1mOptions[0m
+ OOppttiioonnss
Options named by lower-case letters configure the server itself.
Upper-case options control the behavior of specific authentication mecha-
nisms; their applicability to a particular authentication mechanism is
- described in the [4mAUTHENTICATION[24m [4mMECHANISMS[24m section.
+ described in the _A_U_T_H_E_N_T_I_C_A_T_I_O_N _M_E_C_H_A_N_I_S_M_S section.
- [1m-a [4m[22mauthmech[0m
- Use [4mauthmech[24m as the authentication mechanism. (See the
- [4mAUTHENTICATION[24m [4mMECHANISMS[24m section below.) This parameter is
+ --aa _a_u_t_h_m_e_c_h
+ Use _a_u_t_h_m_e_c_h as the authentication mechanism. (See the
+ _A_U_T_H_E_N_T_I_C_A_T_I_O_N _M_E_C_H_A_N_I_S_M_S section below.) This parameter is
mandatory.
- [1m-O [4m[22moption[0m
+ --OO _o_p_t_i_o_n
A mechanism specific option (e.g. rimap hostname or config file
path)
- [1m-H [4m[22mhostname[0m
+ --HH _h_o_s_t_n_a_m_e
The remote host to be contacted by the rimap authentication mech-
anism. (Depricated, use -O instead)
- [1m-m [4m[22mpath[0m
- Use [4mpath[24m as the pathname to the named socket to listen on for
+ --mm _p_a_t_h
+ Use _p_a_t_h as the pathname to the named socket to listen on for
connection requests. This must be an absolute pathname, and MUST
NOT include the trailing "/mux". Note that the default for this
value is "/var/state/saslauthd" (or what was specified at compile
time) and that this directory must exist for saslauthd to func-
tion.
- [1m-n [4m[22mthreads[0m
- Use [4mthreads[24m processes for responding to authentication queries.
+ --nn _t_h_r_e_a_d_s
+ Use _t_h_r_e_a_d_s processes for responding to authentication queries.
(default: 5) A value of zero will indicate that saslauthd should
fork an individual process for each connection. This can solve
leaks that occur in some deployments..
- [1m-s [4m[22msize[0m
- Use [4msize[24m as the table size of the hash table (in kilobytes)
+ --ss _s_i_z_e
+ Use _s_i_z_e as the table size of the hash table (in kilobytes)
- [1m-t [4m[22mtimeout[0m
- Use [4mtimeout[24m as the expiration time of the authentication cache
+ --tt _t_i_m_e_o_u_t
+ Use _t_i_m_e_o_u_t as the expiration time of the authentication cache
(in seconds)
- [1m-T [22mHonour time-of-day login restrictions.
+ --TT Honour time-of-day login restrictions.
- [1m-h [22mShow usage information
+ --hh Show usage information
- [1m-c [22mEnable cacheing of authentication credentials
+ --cc Enable cacheing of authentication credentials
- [1m-l [22mDisable the use of a lock file for controlling access to
+ --ll Disable the use of a lock file for controlling access to
accept().
- [1m-r [22mCombine the realm with the login (with an '@' sign in between).
+ --rr Combine the realm with the login (with an ’@’ sign in between).
e.g. login: "foo" realm: "bar" will get passed as login:
"foo at bar". Note that the realm will still be passed, which may
lead to unexpected behavior.
- [1m-v [22mPrint the version number and available authentication mechanisms
+ --vv Print the version number and available authentication mechanisms
on standard error, then exit.
- [1m-d [22mDebugging mode.
+ --dd Debugging mode.
- [1mLogging[0m
- [1msaslauthd [22mlogs it's activities via [1msyslogd [22musing the LOG_AUTH facility.
+ LLooggggiinngg
+ ssaassllaauutthhdd logs it’s activities via ssyyssllooggdd using the LOG_AUTH facility.
-[1mAUTHENTICATION MECHANISMS[0m
- [1msaslauthd [22msupports one or more "authentication mechanisms", dependent
+AAUUTTHHEENNTTIICCAATTIIOONN MMEECCHHAANNIISSMMSS
+ ssaassllaauutthhdd supports one or more "authentication mechanisms", dependent
upon the facilities provided by the underlying operating system. The
- mechanism is selected by the [1m-aho [22mflag from the following list of
+ mechanism is selected by the --aahhoo flag from the following list of
choices:
- dce [4m(AIX)[0m
+ dce _(_A_I_X_)
Authenticate using the DCE authentication environment.
- getpwent [4m(All[24m [4mplatforms)[0m
+ getpwent _(_A_l_l _p_l_a_t_f_o_r_m_s_)
- Authenticate using the [1mgetpwent[22m() library function. Typically
+ Authenticate using the ggeettppwweenntt() library function. Typically
this authenticates against the local password file. See your
systems getpwent(3) man page for details.
- kerberos4 [4m(All[24m [4mplatforms)[0m
+ kerberos4 _(_A_l_l _p_l_a_t_f_o_r_m_s_)
Authenticate against the local Kerberos 4 realm. (See the
- [4mNOTES[24m section for caveats about this driver.)
+ _N_O_T_E_S section for caveats about this driver.)
- kerberos5 [4m(All[24m [4mplatforms)[0m
+ kerberos5 _(_A_l_l _p_l_a_t_f_o_r_m_s_)
Authenticate against the local Kerberos 5 realm.
- pam [4m(Linux,[24m [4mSolaris)[0m
+ pam _(_L_i_n_u_x_, _S_o_l_a_r_i_s_)
Authenticate using Pluggable Authentication Modules (PAM).
- rimap [4m(All[24m [4mplatforms)[0m
+ rimap _(_A_l_l _p_l_a_t_f_o_r_m_s_)
Forward authentication requests to a remote IMAP server. This
driver connects to a remote IMAP server, specified using the
- -O flag, and attempts to login (via an IMAP `LOGIN' command)
+ -O flag, and attempts to login (via an IMAP ‘LOGIN’ command)
using the credentials supplied to the local server. If the
remote authentication succeeds the local connection is also
considered to be authenticated. The remote connection is
- closed as soon as the tagged response from the `LOGIN' command
+ closed as soon as the tagged response from the ‘LOGIN’ command
is received from the remote server.
- The [4moption[24m parameter to the [1m-O [22mflag describes the remote
- server to forward authentication requests to. [4mhostname[24m can be
+ The _o_p_t_i_o_n parameter to the --OO flag describes the remote
+ server to forward authentication requests to. _h_o_s_t_n_a_m_e can be
a hostname (imap.example.com) or a dotted-quad IP address
(192.168.0.1). The latter is useful if the remote server is
multi-homed and has network interfaces that are unreachable
from the local IMAP server. The remote host is contacted on
- the `imap' service port. A non-default port can be specified
+ the ‘imap’ service port. A non-default port can be specified
by appending a slash and the port name or number to the
- [4mhostname[24m argument.
+ _h_o_s_t_n_a_m_e argument.
- The [1m-O [22mflag and argument are mandatory when using the rimap
+ The --OO flag and argument are mandatory when using the rimap
mechanism.
- shadow [4m(AIX,[24m [4mIrix,[24m [4mLinux,[24m [4mSolaris)[0m
+ shadow _(_A_I_X_, _I_r_i_x_, _L_i_n_u_x_, _S_o_l_a_r_i_s_)
Authenticate against the local "shadow password file". The
- exact mechanism is system dependent. [1msaslauthd [22mcurrently
- understands the [1mgetspnam[22m() and [1mgetuserpw[22m() library routines.
- Some systems honour the [1m-T [22mflag.
+ exact mechanism is system dependent. ssaassllaauutthhdd currently
+ understands the ggeettssppnnaamm() and ggeettuusseerrppww() library routines.
+ Some systems honour the --TT flag.
- sasldb [4m(All[24m [4mplatforms)[0m
+ sasldb _(_A_l_l _p_l_a_t_f_o_r_m_s_)
Authenticate against the SASL authentication database. Note
that this is probabally not what you want to be using, and is
@@ -151,7 +151,7 @@
pwcheck_method of "auxprop" along with the sasldb auxprop plu-
gin instead.
- ldap [4m(All[24m [4mplatforms[24m [4mthat[24m [4msupport[24m [4mOpenLDAP[24m [4m2.0[24m [4mor[24m [4mhigher)[0m
+ ldap _(_A_l_l _p_l_a_t_f_o_r_m_s _t_h_a_t _s_u_p_p_o_r_t _O_p_e_n_L_D_A_P _2_._0 _o_r _h_i_g_h_e_r_)
Authenticate against an ldap server. The ldap configuration
parameters are read from /usr/local/etc/saslauthd.conf. The
@@ -159,30 +159,30 @@
See the LDAP_SASLAUTHD file included with the distribution for
the list of available parameters.
- sia [4m(Digital[24m [4mUNIX)[0m
+ sia _(_D_i_g_i_t_a_l _U_N_I_X_)
Authenticate using the Digital UNIX Security Integration
Architecture (a.k.a. "enhanced security").
-[1mNOTES[0m
+NNOOTTEESS
The kerberos4 authentication driver consumes considerable resources. To
perform an authentication it must obtain a ticket granting ticket from
- the TGT server [1mon every authentication request. [22mThe Kerberos library rou-
+ the TGT server oonn eevveerryy aauutthheennttiiccaattiioonn rreeqquueesstt.. The Kerberos library rou-
tines that obtain the TGT also create a local ticket file, on the reason-
able assumption that you will want to save the TGT for use by other Ker-
- beros applications. These ticket files are unusable by [1msaslauthd [22m, how-
+ beros applications. These ticket files are unusable by ssaassllaauutthhdd , how-
ever there is no way not to create them. The overhead of creating and
removing these ticket files can cause serious performance degradation on
busy servers. (Kerberos was never intended to be used in this manner,
anyway.)
-[1mFILES[0m
+FFIILLEESS
/var/run/saslauthd/mux The default communications socket.
/usr/local/etc/saslauthd.conf
The default configuration file for ldap support.
-[1mSEE ALSO[0m
+SSEEEE AALLSSOO
passwd(1), getpwent(3), getspnam(3), getuserpw(3), sasl_checkpass(3)
sia_authenticate_user(3),
Modified: cyrus-sasl-2.1/branches/upstream/current/sasldb/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/upstream/current/sasldb/Makefile.am?rev=461&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/upstream/current/sasldb/Makefile.am (original)
+++ cyrus-sasl-2.1/branches/upstream/current/sasldb/Makefile.am Sun May 24 13:56:33 2009
@@ -1,6 +1,6 @@
# Makefile.am for the SASLdb library
# Rob Siemborski
-# $Id: Makefile.am,v 1.31 2006/04/19 20:24:23 murch Exp $
+# $Id: Makefile.am,v 1.31.2.1 2009/04/27 17:58:26 murch Exp $
# Copyright (c) 2000 Carnegie Mellon University. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -42,7 +42,7 @@
# Library version info - here at the top, for sanity
# Note that this doesn't necessaraly follow the libsasl2 verison info
-sasl_version = 1:22:0
+sasl_version = 1:23:0
INCLUDES=-I$(top_srcdir)/include -I$(top_builddir)/include @SASL_DB_INC@
Modified: cyrus-sasl-2.1/branches/upstream/current/sasldb/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/upstream/current/sasldb/Makefile.in?rev=461&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/upstream/current/sasldb/Makefile.in (original)
+++ cyrus-sasl-2.1/branches/upstream/current/sasldb/Makefile.in Sun May 24 13:56:33 2009
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.7.2 from Makefile.am.
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -16,7 +16,7 @@
# Makefile.am for the SASLdb library
# Rob Siemborski
-# $Id: Makefile.am,v 1.31 2006/04/19 20:24:23 murch Exp $
+# $Id: Makefile.am,v 1.31.2.1 2009/04/27 17:58:26 murch Exp $
# Copyright (c) 2000 Carnegie Mellon University. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -193,6 +193,7 @@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
bindir = @bindir@
build = @build@
@@ -231,7 +232,7 @@
# Library version info - here at the top, for sanity
# Note that this doesn't necessaraly follow the libsasl2 verison info
-sasl_version = 1:22:0
+sasl_version = 1:23:0
INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include @SASL_DB_INC@
@@ -251,6 +252,7 @@
libsasldb_a_SOURCES =
EXTRA_libsasldb_a_SOURCES =
subdir = sasldb
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -281,7 +283,7 @@
$(AM_LDFLAGS) $(LDFLAGS) -o $@
DIST_SOURCES = $(libsasldb_a_SOURCES) $(EXTRA_libsasldb_a_SOURCES) \
$(libsasldb_la_SOURCES) $(EXTRA_libsasldb_la_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
SOURCES = $(libsasldb_a_SOURCES) $(EXTRA_libsasldb_a_SOURCES) $(libsasldb_la_SOURCES) $(EXTRA_libsasldb_la_SOURCES)
all: all-am
@@ -322,13 +324,10 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/db_ndbm.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/db_none.Plo at am__quote@
-distclean-depend:
- -rm -rf ./$(DEPDIR)
-
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
- at am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@@ -339,7 +338,7 @@
.c.obj:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
- at am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@@ -350,7 +349,7 @@
.c.lo:
@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
- at am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
+ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@@ -458,7 +457,6 @@
all-am: Makefile $(LIBRARIES) $(LTLIBRARIES)
installdirs:
-
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -470,7 +468,7 @@
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -478,7 +476,7 @@
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -489,9 +487,10 @@
clean-noinstLTLIBRARIES mostlyclean-am
distclean: distclean-am
-
-distclean-am: clean-am distclean-compile distclean-depend \
- distclean-generic distclean-libtool distclean-tags
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-libtool distclean-tags
dvi: dvi-am
@@ -512,7 +511,8 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
@@ -532,15 +532,15 @@
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-libtool clean-noinstLIBRARIES clean-noinstLTLIBRARIES \
- ctags distclean distclean-compile distclean-depend \
- distclean-generic distclean-libtool distclean-tags distdir dvi \
- dvi-am info info-am install install-am install-data \
- install-data-am install-exec install-exec-am install-info \
- install-info-am install-man 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-info-am
+ ctags distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am info \
+ info-am install install-am install-data install-data-am \
+ install-exec install-exec-am install-info install-info-am \
+ install-man 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-info-am
libsasldb.a: libsasldb.la $(SASL_DB_BACKEND_STATIC)
Modified: cyrus-sasl-2.1/branches/upstream/current/utils/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/upstream/current/utils/Makefile.in?rev=461&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/upstream/current/utils/Makefile.in (original)
+++ cyrus-sasl-2.1/branches/upstream/current/utils/Makefile.in Sun May 24 13:56:33 2009
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.7.2 from Makefile.am.
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -195,6 +195,7 @@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
bindir = @bindir@
build = @build@
@@ -278,6 +279,7 @@
INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include @SASL_DB_INC@
EXTRA_DIST = saslpasswd2.8 sasldblistusers2.8 pluginviewer.8 sfsasl.h sfsasl.c smtptest.c testsuite.c pluginviewer.c NTMakefile
subdir = utils
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -344,7 +346,7 @@
MANS = $(man_MANS)
HEADERS = $(saslinclude_HEADERS)
-DIST_COMMON = $(saslinclude_HEADERS) Makefile.am Makefile.in
+DIST_COMMON = $(saslinclude_HEADERS) $(srcdir)/Makefile.in Makefile.am
SOURCES = $(libsfsasl2_la_SOURCES) dbconverter-2.c $(pluginviewer_SOURCES) $(sasldblistusers2_SOURCES) $(saslpasswd2_SOURCES) $(smtptest_SOURCES) testsuite.c $(testsuitestatic_SOURCES)
all: all-am
@@ -456,13 +458,10 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/saslpasswd.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/testsuite.Po at am__quote@
-distclean-depend:
- -rm -rf ./$(DEPDIR)
-
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
- at am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@@ -473,7 +472,7 @@
.c.obj:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
- at am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@@ -484,7 +483,7 @@
.c.lo:
@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
- at am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
+ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@@ -658,7 +657,6 @@
installdirs:
$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(sbindir) $(DESTDIR)$(man8dir) $(DESTDIR)$(saslincludedir)
-
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -670,7 +668,7 @@
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -679,7 +677,7 @@
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -690,9 +688,10 @@
clean-noinstPROGRAMS clean-sbinPROGRAMS mostlyclean-am
distclean: distclean-am
-
-distclean-am: clean-am distclean-compile distclean-depend \
- distclean-generic distclean-libtool distclean-tags
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-libtool distclean-tags
dvi: dvi-am
@@ -713,7 +712,8 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
@@ -737,11 +737,10 @@
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-libLTLIBRARIES clean-libtool clean-noinstPROGRAMS \
clean-sbinPROGRAMS ctags distclean distclean-compile \
- distclean-depend distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am \
- install-libLTLIBRARIES install-man install-man8 \
+ distclean-generic distclean-libtool distclean-tags distdir dvi \
+ dvi-am info info-am install install-am install-data \
+ install-data-am install-exec install-exec-am install-info \
+ install-info-am install-libLTLIBRARIES install-man install-man8 \
install-saslincludeHEADERS install-sbinPROGRAMS install-strip \
installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
Modified: cyrus-sasl-2.1/branches/upstream/current/win32/common.mak
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/upstream/current/win32/common.mak?rev=461&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/upstream/current/win32/common.mak (original)
+++ cyrus-sasl-2.1/branches/upstream/current/win32/common.mak Sun May 24 13:56:33 2009
@@ -2,7 +2,7 @@
#Keep in sync with include/sasl.h and win32/include/config.h
SASL_VERSION_MAJOR=2
SASL_VERSION_MINOR=1
-SASL_VERSION_STEP=22
+SASL_VERSION_STEP=23
# Uncomment the following line, if you want to use Visual Studio 6
#VCVER=6
Modified: cyrus-sasl-2.1/branches/upstream/current/win32/include/config.h
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/upstream/current/win32/include/config.h?rev=461&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/upstream/current/win32/include/config.h (original)
+++ cyrus-sasl-2.1/branches/upstream/current/win32/include/config.h Sun May 24 13:56:33 2009
@@ -55,7 +55,7 @@
#define PACKAGE "cyrus-sasl"
/* Our version */
-#define VERSION "2.1.22"
+#define VERSION "2.1.23"
/* Visual Studio supports prototypes */
#define PROTOTYPES 1
More information about the Pkg-cyrus-sasl2-commits
mailing list