gsasl-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[SCM] GNU gsasl branch, master, updated. gsasl-1-6-0-44-geb580aa


From: Simon Josefsson
Subject: [SCM] GNU gsasl branch, master, updated. gsasl-1-6-0-44-geb580aa
Date: Tue, 07 Feb 2012 13:51:15 +0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gsasl".

http://git.savannah.gnu.org/cgit/gsasl.git/commit/?id=eb580aae981e116b9ddba4dffb330ada3d3633e3

The branch, master has been updated
       via  eb580aae981e116b9ddba4dffb330ada3d3633e3 (commit)
       via  3494f52f2e0d2fe84a81ca15a551dac03e4b7622 (commit)
       via  4aedbf0e6001f0d620942e87198e2f2e449ac14d (commit)
       via  f1d919130000f8a279cf16906cad27045838d9b8 (commit)
       via  43c3168a83b286f9f667a0bb4fa696c2eadd9028 (commit)
       via  37e56cb746de61188d5f893a9866935a2538d1c7 (commit)
       via  877ccaa5c7a5d70662a115d676e76499dc750f49 (commit)
       via  fd73e650654aa3fb8f11276f5f2237e448e9d0f9 (commit)
       via  72c118bba6700c282f6d3a3ce5c2ae5fa50e90a1 (commit)
      from  e953dccdc88d32a4efce935f2cf033df38d2ab3f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit eb580aae981e116b9ddba4dffb330ada3d3633e3
Author: Simon Josefsson <address@hidden>
Date:   Tue Feb 7 14:50:28 2012 +0100

    Fix links.

commit 3494f52f2e0d2fe84a81ca15a551dac03e4b7622
Author: Simon Josefsson <address@hidden>
Date:   Tue Feb 7 14:48:44 2012 +0100

    Mention OPENID/SAML.

commit 4aedbf0e6001f0d620942e87198e2f2e449ac14d
Author: Simon Josefsson <address@hidden>
Date:   Tue Feb 7 14:47:23 2012 +0100

    Fix ignore rule.

commit f1d919130000f8a279cf16906cad27045838d9b8
Author: Simon Josefsson <address@hidden>
Date:   Tue Feb 7 14:36:30 2012 +0100

    Update gtk-doc files.

commit 43c3168a83b286f9f667a0bb4fa696c2eadd9028
Author: Simon Josefsson <address@hidden>
Date:   Tue Feb 7 14:35:32 2012 +0100

    Fix syntax-check nit.

commit 37e56cb746de61188d5f893a9866935a2538d1c7
Author: Simon Josefsson <address@hidden>
Date:   Tue Feb 7 14:33:05 2012 +0100

    Drop old files.

commit 877ccaa5c7a5d70662a115d676e76499dc750f49
Author: Simon Josefsson <address@hidden>
Date:   Tue Feb 7 14:32:14 2012 +0100

    Drop licenses from manual.

commit fd73e650654aa3fb8f11276f5f2237e448e9d0f9
Author: Simon Josefsson <address@hidden>
Date:   Tue Feb 7 14:29:33 2012 +0100

    Update copyright headers.

commit 72c118bba6700c282f6d3a3ce5c2ae5fa50e90a1
Author: Simon Josefsson <address@hidden>
Date:   Tue Feb 7 14:22:13 2012 +0100

    Use update-copyright gnulib module.

-----------------------------------------------------------------------

Summary of changes:
 .clcopying                     |    2 +-
 .cvsusers                      |    1 -
 .prev-version                  |    1 -
 AUTHORS                        |    2 +-
 ChangeLog                      |    2 +-
 Makefile.am                    |    2 +-
 README                         |   10 +-
 README-alpha                   |    2 +-
 THANKS                         |    3 +-
 cfg.mk                         |    6 +-
 configure.ac                   |    3 +-
 doc/Makefile.am                |    4 +-
 doc/announce.txt               |   20 +-
 doc/cyclo/Makefile.am          |    2 +-
 doc/doxygen/gdoc2doxygen       |    2 +-
 doc/gdoc                       |    3 +-
 doc/gpl-3.0.texi               |  717 ----------------------------------------
 doc/gsasl.texi                 |   18 +-
 doc/lgpl-2.1.texi              |  549 ------------------------------
 doc/print-errors.c             |    2 +-
 doc/reference/Makefile.am      |   21 +-
 doc/reference/gsasl-docs.sgml  |   22 +-
 doc/reference/version.xml.in   |    1 +
 examples/Makefile.am           |    2 +-
 examples/README                |    2 +-
 examples/client-callback.c     |    2 +-
 examples/client-mech.c         |    2 +-
 examples/client-serverfirst.c  |    2 +-
 examples/client.c              |    2 +-
 gl/Makefile.am                 |    9 +-
 gl/m4/gnulib-cache.m4          |    7 +-
 gl/m4/gnulib-comp.m4           |    6 +-
 gtk-doc.make                   |  182 +++++++----
 lib/.prev-version              |    1 -
 lib/AUTHORS                    |    2 +-
 lib/ChangeLog                  |    2 +-
 lib/Makefile.am                |    2 +-
 lib/NEWS                       |    2 +-
 lib/README                     |    2 +-
 lib/THANKS                     |    2 +-
 lib/anonymous/Makefile.am      |    2 +-
 lib/anonymous/anonymous.h      |    2 +-
 lib/anonymous/client.c         |    2 +-
 lib/anonymous/mechinfo.c       |    2 +-
 lib/anonymous/server.c         |    2 +-
 lib/build-aux/update-copyright |  274 +++++++++++++++
 lib/cfg.mk                     |    2 +-
 lib/cram-md5/Makefile.am       |    2 +-
 lib/cram-md5/challenge.c       |    2 +-
 lib/cram-md5/challenge.h       |    2 +-
 lib/cram-md5/client.c          |    2 +-
 lib/cram-md5/cram-md5.h        |    2 +-
 lib/cram-md5/digest.c          |    2 +-
 lib/cram-md5/digest.h          |    2 +-
 lib/cram-md5/mechinfo.c        |    2 +-
 lib/cram-md5/server.c          |    2 +-
 lib/digest-md5/Makefile.am     |    2 +-
 lib/digest-md5/README          |    2 +-
 lib/digest-md5/client.c        |    2 +-
 lib/digest-md5/digest-md5.h    |    2 +-
 lib/digest-md5/digesthmac.c    |    2 +-
 lib/digest-md5/digesthmac.h    |    2 +-
 lib/digest-md5/free.c          |    2 +-
 lib/digest-md5/free.h          |    2 +-
 lib/digest-md5/getsubopt.c     |    2 +-
 lib/digest-md5/mechinfo.c      |    2 +-
 lib/digest-md5/nonascii.c      |    2 +-
 lib/digest-md5/nonascii.h      |    2 +-
 lib/digest-md5/parser.c        |    2 +-
 lib/digest-md5/parser.h        |    2 +-
 lib/digest-md5/printer.c       |    2 +-
 lib/digest-md5/printer.h       |    2 +-
 lib/digest-md5/qop.c           |    2 +-
 lib/digest-md5/qop.h           |    2 +-
 lib/digest-md5/server.c        |    2 +-
 lib/digest-md5/session.c       |    2 +-
 lib/digest-md5/session.h       |    2 +-
 lib/digest-md5/test-parser.c   |    2 +-
 lib/digest-md5/tokens.h        |    2 +-
 lib/digest-md5/validate.c      |    2 +-
 lib/digest-md5/validate.h      |    2 +-
 lib/external/Makefile.am       |    2 +-
 lib/external/client.c          |    2 +-
 lib/external/external.h        |    2 +-
 lib/external/mechinfo.c        |    2 +-
 lib/external/server.c          |    2 +-
 lib/gs2/Makefile.am            |    2 +-
 lib/gs2/client.c               |    2 +-
 lib/gs2/gs2.h                  |    2 +-
 lib/gs2/gs2helper.c            |    2 +-
 lib/gs2/gs2helper.h            |    2 +-
 lib/gs2/mechinfo.c             |    2 +-
 lib/gs2/server.c               |    2 +-
 lib/gssapi/Makefile.am         |    2 +-
 lib/gssapi/client.c            |    2 +-
 lib/gssapi/mechinfo.c          |    2 +-
 lib/gssapi/server.c            |    2 +-
 lib/gssapi/x-gssapi.h          |    2 +-
 lib/kerberos_v5/Makefile.am    |    2 +-
 lib/kerberos_v5/client.c       |    2 +-
 lib/kerberos_v5/kerberos_v5.c  |    2 +-
 lib/kerberos_v5/kerberos_v5.h  |    2 +-
 lib/kerberos_v5/server.c       |    2 +-
 lib/kerberos_v5/shared.h       |    2 +-
 lib/libgsasl.pc.in             |    2 +-
 lib/login/Makefile.am          |    2 +-
 lib/login/client.c             |    2 +-
 lib/login/login.h              |    2 +-
 lib/login/mechinfo.c           |    2 +-
 lib/login/server.c             |    2 +-
 lib/ntlm/Makefile.am           |    2 +-
 lib/ntlm/mechinfo.c            |    2 +-
 lib/ntlm/ntlm.c                |    2 +-
 lib/ntlm/x-ntlm.h              |    2 +-
 lib/openid20/Makefile.am       |    2 +-
 lib/openid20/client.c          |    2 +-
 lib/openid20/mechinfo.c        |    2 +-
 lib/openid20/openid20.h        |    2 +-
 lib/openid20/server.c          |    2 +-
 lib/plain/Makefile.am          |    2 +-
 lib/plain/client.c             |    2 +-
 lib/plain/mechinfo.c           |    2 +-
 lib/plain/plain.h              |    2 +-
 lib/plain/server.c             |    2 +-
 lib/saml20/Makefile.am         |    2 +-
 lib/saml20/mechinfo.c          |    2 +-
 lib/saml20/saml20.h            |    2 +-
 lib/saml20/server.c            |    2 +-
 lib/scram/Makefile.am          |    2 +-
 lib/scram/client.c             |    2 +-
 lib/scram/mechinfo.c           |    2 +-
 lib/scram/parser.c             |    2 +-
 lib/scram/parser.h             |    2 +-
 lib/scram/printer.c            |    2 +-
 lib/scram/printer.h            |    2 +-
 lib/scram/scram.h              |    2 +-
 lib/scram/server.c             |    2 +-
 lib/scram/tokens.c             |    2 +-
 lib/scram/tokens.h             |    2 +-
 lib/scram/validate.c           |    2 +-
 lib/scram/validate.h           |    2 +-
 lib/securid/Makefile.am        |    2 +-
 lib/securid/client.c           |    2 +-
 lib/securid/mechinfo.c         |    2 +-
 lib/securid/securid.h          |    2 +-
 lib/securid/server.c           |    2 +-
 lib/src/Makefile.am            |    2 +-
 lib/src/base64.c               |    2 +-
 lib/src/callback.c             |    2 +-
 lib/src/crypto.c               |    2 +-
 lib/src/done.c                 |    2 +-
 lib/src/error.c                |    2 +-
 lib/src/free.c                 |    2 +-
 lib/src/gsasl-compat.h         |    2 +-
 lib/src/gsasl-mech.h           |    2 +-
 lib/src/gsasl.h                |    2 +-
 lib/src/init.c                 |    2 +-
 lib/src/internal.h             |    2 +-
 lib/src/libgsasl.map           |    2 +-
 lib/src/listmech.c             |    2 +-
 lib/src/md5pwd.c               |    2 +-
 lib/src/mechname.c             |    2 +-
 lib/src/obsolete.c             |    2 +-
 lib/src/property.c             |    2 +-
 lib/src/register.c             |    2 +-
 lib/src/saslprep.c             |    2 +-
 lib/src/suggest.c              |    2 +-
 lib/src/supportp.c             |    2 +-
 lib/src/version.c              |    2 +-
 lib/src/xcode.c                |    2 +-
 lib/src/xfinish.c              |    2 +-
 lib/src/xstart.c               |    2 +-
 lib/src/xstep.c                |    2 +-
 lib/tests/Makefile.am          |    2 +-
 lib/tests/test-error.c         |    2 +-
 m4/gtk-doc.m4                  |    1 +
 src/Makefile.am                |    2 +-
 src/callbacks.c                |    2 +-
 src/callbacks.h                |    2 +-
 src/gsasl.ggo                  |    2 +-
 src/imap.c                     |    2 +-
 src/imap.h                     |    2 +-
 src/internal.h                 |    2 +-
 src/smtp.c                     |    2 +-
 src/smtp.h                     |    2 +-
 tests/Makefile.am              |    2 +-
 tests/cram-md5.c               |    2 +-
 tests/crypto.c                 |    2 +-
 tests/digest-md5.c             |    2 +-
 tests/errors.c                 |    2 +-
 tests/external.c               |    2 +-
 tests/gs2-krb5.c               |    2 +-
 tests/gssapi.c                 |    2 +-
 tests/libgsasl.supp            |    2 +-
 tests/md5file.c                |    2 +-
 tests/name.c                   |    2 +-
 tests/old-base64.c             |    2 +-
 tests/old-cram-md5.c           |    2 +-
 tests/old-digest-md5.c         |    2 +-
 tests/old-gssapi.c             |    2 +-
 tests/old-md5file.c            |    2 +-
 tests/old-simple.c             |    2 +-
 tests/readnz.c                 |    2 +-
 tests/saml20.c                 |    2 +-
 tests/scram.c                  |    2 +-
 tests/scramplus.c              |    2 +-
 tests/simple.c                 |    2 +-
 tests/suggest.c                |    2 +-
 tests/symbols.c                |    2 +-
 tests/threadsafety             |    2 +-
 tests/unicode.c                |    2 +-
 tests/utils.c                  |    2 +-
 tests/utils.h                  |    2 +-
 windows/gsasl4win.mk           |    2 +-
 214 files changed, 653 insertions(+), 1590 deletions(-)
 delete mode 100644 .cvsusers
 delete mode 100644 .prev-version
 delete mode 100644 doc/gpl-3.0.texi
 delete mode 100644 doc/lgpl-2.1.texi
 create mode 100644 doc/reference/version.xml.in
 delete mode 100644 lib/.prev-version
 create mode 100755 lib/build-aux/update-copyright

diff --git a/.clcopying b/.clcopying
index f3d085e..6ea102c 100644
--- a/.clcopying
+++ b/.clcopying
@@ -1,6 +1,6 @@
        -----
 
-       Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Simon Josefsson
+       Copyright (C) 2002-2012 Simon Josefsson
 
        Copying and distribution of this file, with or without
        modification, are permitted provided the copyright notice
diff --git a/.cvsusers b/.cvsusers
deleted file mode 100644
index d275b8e..0000000
--- a/.cvsusers
+++ /dev/null
@@ -1 +0,0 @@
-jas:Simon Josefsson <address@hidden>
diff --git a/.prev-version b/.prev-version
deleted file mode 100644
index 9459d4b..0000000
--- a/.prev-version
+++ /dev/null
@@ -1 +0,0 @@
-1.1
diff --git a/AUTHORS b/AUTHORS
index be11251..f1b1e2c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,5 +1,5 @@
 GNU SASL AUTHORS -- Information about the authors.
-Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Simon Josefsson
+Copyright (C) 2002-2012 Simon Josefsson
 See the end for copying conditions.
 
 Simon Josefsson <address@hidden>
diff --git a/ChangeLog b/ChangeLog
index 67757d3..727d2d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16970,7 +16970,7 @@
 
        -----
 
-       Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Simon Josefsson
+       Copyright (C) 2002-2012 Simon Josefsson
 
        Copying and distribution of this file, with or without
        modification, are permitted provided the copyright notice
diff --git a/Makefile.am b/Makefile.am
index fe93f92..f494fae 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Simon Josefsson
+# Copyright (C) 2002-2012 Simon Josefsson
 #
 # This file is part of GNU SASL.
 #
diff --git a/README b/README
index c399035..a5b4620 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 GNU SASL README -- Important introductory notes.
-Copyright (C) 2002-2011 Simon Josefsson
+Copyright (C) 2002-2012 Simon Josefsson
 See the end for copying conditions.
 
 GNU SASL an implementation of the Simple Authentication and Security
@@ -13,7 +13,7 @@ lib/COPYING.LIB.  The GNU project typically uses the GNU 
General
 Public License (GPL) for libraries, and not the LGPL, but for this
 project we decided that we would get more help from the community if
 we used the LGPLv2.1+, as other free SASL implementations exists.  See
-also <http://www.gnu.org/licenses/why-not-lgpl.html>.
+also <https://www.gnu.org/licenses/why-not-lgpl.html>.
 
 The command-line application and test suite (src/, and tests/) are
 licensed under the GNU General Public License license version 3.0 (or
@@ -24,7 +24,7 @@ License version 1.3 (or later).
 
 If you need help to use GNU SASL, or wish to help others, you are
 invited to join our mailing list address@hidden, see
-<http://lists.gnu.org/mailman/listinfo/help-gsasl>.
+<https://lists.gnu.org/mailman/listinfo/help-gsasl>.
 
 Currently there is some support for the following mechanisms:
 
@@ -40,6 +40,8 @@ Currently there is some support for the following mechanisms:
   - LOGIN (non-standard)
   - NTLM (non-standard, client only, requires Libntlm)
   - KERBEROS_V5 (experimental, requires Shishi)
+  - OPENID20 (experimental)
+  - SAML20 (experimental)
 
 The library should be portable to all C89 platforms.  The command-line
 application currently requires POSIX for network communication.
@@ -67,7 +69,7 @@ please let me know so work duplication can be avoided.
   - Improve documentation
   - Port to Cyclone? CCured?
 
-For updates to the project, see <http://www.gnu.org/software/gsasl/>.
+For updates to the project, see <https://www.gnu.org/software/gsasl/>.
 
 For any copyright year range specified as YYYY-ZZZZ in this package
 note that the range specifies every single year in that closed interval.
diff --git a/README-alpha b/README-alpha
index ab2f717..7a34734 100644
--- a/README-alpha
+++ b/README-alpha
@@ -1,5 +1,5 @@
 GNU SASL README-alpha -- Information for developers.            -*- outline -*-
-Copyright (C) 2009, 2010 Simon Josefsson
+Copyright (C) 2009-2012 Simon Josefsson
 See the end for copying conditions.
 
 This file contains instructions for developers and advanced users that
diff --git a/THANKS b/THANKS
index c1945d5..fc3fb67 100644
--- a/THANKS
+++ b/THANKS
@@ -1,6 +1,5 @@
 GNU SASL THANKS -- Acknowledgements.
-Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-              2009, 2010 Simon Josefsson
+Copyright (C) 2002-2012 Simon Josefsson
 See the end for copying conditions.
 
 GNU SASL uses libntlm by Grant Edwards maintained by Simon Josefsson;
diff --git a/cfg.mk b/cfg.mk
index c995885..2d3271c 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -31,18 +31,20 @@ local-checks-to-skip = sc_prohibit_strcmp 
sc_error_message_uppercase        \
        sc_prohibit_have_config_h sc_require_config_h                   \
        sc_require_config_h_first sc_immutable_NEWS sc_po_check
 VC_LIST_ALWAYS_EXCLUDE_REGEX = \
-       
^(gtk-doc.make|m4/pkg.m4|doc/fdl-1.3.texi|doc/specification|doc/doxygen/Doxyfile|(lib/)?maint.mk|((lib/)?(gl|gltests|build-aux))/.*)
+       
^((lib/)?GNUmakefile|gtk-doc.make|m4/pkg.m4|doc/gendocs_template|doc/fdl-1.3.texi|doc/specification|doc/doxygen/Doxyfile|(lib/)?po/.*.po.in|(lib/)?maint.mk|((lib/)?(gl|gltests|build-aux))/.*)
 
 # Explicit syntax-check exceptions.
 exclude_file_name_regexp--sc_prohibit_empty_lines_at_EOF = 
^doc/.*\.(dia|png)|tests/gssapi.tkt$$
-exclude_file_name_regexp--sc_copyright_check = ^doc/gsasl.texi$$
 exclude_file_name_regexp--sc_GPL_version = ^doc/lgpl-2.1.texi|lib/.*$$
+exclude_file_name_regexp--sc_copyright_check = ^doc/gsasl.texi$$
 exclude_file_name_regexp--sc_unmarked_diagnostics = ^examples/.*|src/gsasl.c$$
 exclude_file_name_regexp--sc_bindtextdomain = 
^doc/print-errors.c|examples/.*|lib/digest-md5/test-parser.c|lib/tests/test-error.c|tests/.*$$
 exclude_file_name_regexp--sc_program_name = 
$(exclude_file_name_regexp--sc_bindtextdomain)
 exclude_file_name_regexp--sc_prohibit_magic_number_exit = 
^doc/gsasl.texi|tests.*$$
 exclude_file_name_regexp--sc_trailing_blank = ^doc/.*\.(eps|png)|(lib/)?po/.*$$
 
+update-copyright-env = UPDATE_COPYRIGHT_HOLDER="Simon Josefsson" 
UPDATE_COPYRIGHT_USE_INTERVALS=2
+
 autoreconf:
        for f in po/*.po.in lib/po/*.po.in; do \
                cp $$f `echo $$f | sed 's/.in//'`; \
diff --git a/configure.ac b/configure.ac
index 36fa567..60176b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 
Simon Josefsson
+# Copyright (C) 2002-2012 Simon Josefsson
 #
 # This file is part of GNU SASL.
 #
@@ -139,6 +139,7 @@ AC_CONFIG_FILES([
   doc/cyclo/Makefile
   doc/doxygen/Doxyfile
   doc/reference/Makefile
+  doc/reference/version.xml
   examples/Makefile
   gl/Makefile
   gltests/Makefile
diff --git a/doc/Makefile.am b/doc/Makefile.am
index f6bfcab..c27d4ea 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Simon 
Josefsson
+# Copyright (C) 2002-2012 Simon Josefsson
 #
 # This file is part of GNU SASL.
 #
@@ -35,7 +35,7 @@ EXTRA_DIST = gdoc \
        $(EPSTOPDF) $<
 
 info_TEXINFOS = gsasl.texi
-gsasl_TEXINFOS = fdl-1.3.texi gpl-3.0.texi lgpl-2.1.texi $(gdoc_TEXINFOS) \
+gsasl_TEXINFOS = fdl-1.3.texi $(gdoc_TEXINFOS) \
        controlflow.eps controlflow.png controlflow.pdf \
        controlflow2.eps controlflow2.png controlflow2.pdf \
        abstraction.eps abstraction.png abstraction.pdf \
diff --git a/doc/announce.txt b/doc/announce.txt
index c17da90..553ad5e 100644
--- a/doc/announce.txt
+++ b/doc/announce.txt
@@ -37,23 +37,23 @@ maintenance.  We are always looking for interesting 
development
 projects.  See http://josefsson.org/ for more details.
 
 The project's web page is available at:
-  http://www.gnu.org/software/gsasl/
+  https://www.gnu.org/software/gsasl/
 
 All manuals are available from:
-  http://www.gnu.org/software/gsasl/manual/
+  https://www.gnu.org/software/gsasl/manual/
 
 Specifically, the following formats are available.
 
 The main manual:
-  http://www.gnu.org/software/gsasl/manual/gsasl.html - HTML format
-  http://www.gnu.org/software/gsasl/manual/gsasl.pdf - PDF format
+  https://www.gnu.org/software/gsasl/manual/gsasl.html - HTML format
+  https://www.gnu.org/software/gsasl/manual/gsasl.pdf - PDF format
 
 API Reference manual:
-  http://www.gnu.org/software/gsasl/reference/ - GTK-DOC HTML
+  https://www.gnu.org/software/gsasl/reference/ - GTK-DOC HTML
 
 Doxygen documentation:
-  http://www.gnu.org/software/gsasl/doxygen/ - HTML format
-  http://www.gnu.org/software/gsasl/doxygen/gsasl.pdf - PDF format
+  https://www.gnu.org/software/gsasl/doxygen/ - HTML format
+  https://www.gnu.org/software/gsasl/doxygen/gsasl.pdf - PDF format
 
 Instructions for how to build GNU SASL under uClinux are available from
 <http://josefsson.org/uclinux/>.  If your uClinux toolchain is broken,
@@ -62,7 +62,7 @@ mechanism, see <http://josefsson.org/uclinux/old/>.
 
 If you need help to use GNU SASL, or want to help others, you are
 invited to join our help-gsasl mailing list, see:
-<http://lists.gnu.org/mailman/listinfo/help-gsasl>.
+<https://lists.gnu.org/mailman/listinfo/help-gsasl>.
 
 Here are the compressed sources of the entire package:
   ftp://ftp.gnu.org/gnu/gsasl/gsasl-1.4.4.tar.gz (3.9MB)
@@ -83,8 +83,8 @@ Daily builds of the package are available from:
   http://daily.josefsson.org/gsasl/
 
 For code coverage and cyclomatic code complexity charts:
-  http://www.gnu.org/software/gsasl/coverage/
-  http://www.gnu.org/software/gsasl/cyclo/cyclo-gsasl.html
+  https://www.gnu.org/software/gsasl/coverage/
+  https://www.gnu.org/software/gsasl/cyclo/cyclo-gsasl.html
 
 The software is cryptographically signed by the author using an
 OpenPGP key identified by the following information:
diff --git a/doc/cyclo/Makefile.am b/doc/cyclo/Makefile.am
index 1b67a51..eca42d1 100644
--- a/doc/cyclo/Makefile.am
+++ b/doc/cyclo/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2008, 2009, 2010  Simon Josefsson
+# Copyright (C) 2008-2012 Simon Josefsson
 #
 # This file is part of GNU SASL.
 #
diff --git a/doc/doxygen/gdoc2doxygen b/doc/doxygen/gdoc2doxygen
index ca1df3a..e34498a 100755
--- a/doc/doxygen/gdoc2doxygen
+++ b/doc/doxygen/gdoc2doxygen
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# Copyright (C) 2003, 2005, 2007, 2008, 2009  Simon Josefsson
+# Copyright (C) 2003-2012 Simon Josefsson
 #
 # 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
diff --git a/doc/gdoc b/doc/gdoc
index e29584d..7449c61 100755
--- a/doc/gdoc
+++ b/doc/gdoc
@@ -1,7 +1,6 @@
 #!/usr/bin/perl
 
-## Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007,
-##               2008, 2009, 2010 Simon Josefsson
+## Copyright (c) 2002-2012 Simon Josefsson
 ##                    added -texinfo, -listfunc, -pkg-name
 ##                    man page revamp
 ##                    various improvements
diff --git a/doc/gpl-3.0.texi b/doc/gpl-3.0.texi
deleted file mode 100644
index 97a17e1..0000000
--- a/doc/gpl-3.0.texi
+++ /dev/null
@@ -1,717 +0,0 @@
address@hidden The GNU General Public License.
address@hidden Version 3, 29 June 2007
-
address@hidden This file is intended to be included within another document,
address@hidden hence no sectioning command or @node.
-
address@hidden
-Copyright @copyright{} 2007 Free Software Foundation, Inc. 
@url{http://fsf.org/}
-
-Everyone is permitted to copy and distribute verbatim copies of this
-license document, but changing it is not allowed.
address@hidden display
-
address@hidden Preamble
-
-The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom
-to share and change all versions of a program---to make sure it remains
-free software for all its users.  We, the Free Software Foundation,
-use the GNU General Public License for most of our software; it
-applies also to any other work released this way by its authors.  You
-can apply it to your programs, too.
-
-When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you
-have certain responsibilities if you distribute copies of the
-software, or if you modify it: responsibilities to respect the freedom
-of others.
-
-For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too,
-receive or can get the source code.  And you must show them these
-terms so they know their rights.
-
-Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the
-manufacturer can do so.  This is fundamentally incompatible with the
-aim of protecting users' freedom to change the software.  The
-systematic pattern of such abuse occurs in the area of products for
-individuals to use, which is precisely where it is most unacceptable.
-Therefore, we have designed this version of the GPL to prohibit the
-practice for those products.  If such problems arise substantially in
-other domains, we stand ready to extend this provision to those
-domains in future versions of the GPL, as needed to protect the
-freedom of users.
-
-Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish
-to avoid the special danger that patents applied to a free program
-could make it effectively proprietary.  To prevent this, the GPL
-assures that patents cannot be used to render the program non-free.
-
-The precise terms and conditions for copying, distribution and
-modification follow.
-
address@hidden TERMS AND CONDITIONS
-
address@hidden 0
address@hidden Definitions.
-
-``This License'' refers to version 3 of the GNU General Public License.
-
-``Copyright'' also means copyright-like laws that apply to other kinds
-of works, such as semiconductor masks.
-
-``The Program'' refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as ``you''.  ``Licensees'' and
-``recipients'' may be individuals or organizations.
-
-To ``modify'' a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of
-an exact copy.  The resulting work is called a ``modified version'' of
-the earlier work or a work ``based on'' the earlier work.
-
-A ``covered work'' means either the unmodified Program or a work based
-on the Program.
-
-To ``propagate'' a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-To ``convey'' a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user
-through a computer network, with no transfer of a copy, is not
-conveying.
-
-An interactive user interface displays ``Appropriate Legal Notices'' to
-the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
address@hidden Source Code.
-
-The ``source code'' for a work means the preferred form of the work for
-making modifications to it.  ``Object code'' means any non-source form
-of a work.
-
-A ``Standard Interface'' means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-The ``System Libraries'' of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-``Major Component'', in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-The ``Corresponding Source'' for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-The Corresponding Source need not include anything that users can
-regenerate automatically from other parts of the Corresponding Source.
-
-The Corresponding Source for a work in source code form is that same
-work.
-
address@hidden Basic Permissions.
-
-All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-You may make, run and propagate covered works that you do not convey,
-without conditions so long as your license otherwise remains in force.
-You may convey covered works to others for the sole purpose of having
-them make modifications exclusively for you, or provide you with
-facilities for running those works, provided that you comply with the
-terms of this License in conveying all material for which you do not
-control copyright.  Those thus making or running the covered works for
-you must do so exclusively on your behalf, under your direction and
-control, on terms that prohibit them from making any copies of your
-copyrighted material outside their relationship with you.
-
-Conveying under any other circumstances is permitted solely under the
-conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
address@hidden Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such
-circumvention is effected by exercising rights under this License with
-respect to the covered work, and you disclaim any intention to limit
-operation or modification of the work as a means of enforcing, against
-the work's users, your or third parties' legal rights to forbid
-circumvention of technological measures.
-
address@hidden Conveying Verbatim Copies.
-
-You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
address@hidden Conveying Modified Source Versions.
-
-You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these
-conditions:
-
address@hidden a
address@hidden
-The work must carry prominent notices stating that you modified it,
-and giving a relevant date.
-
address@hidden
-The work must carry prominent notices stating that it is released
-under this License and any conditions added under section 7.  This
-requirement modifies the requirement in section 4 to ``keep intact all
-notices''.
-
address@hidden
-You must license the entire work, as a whole, under this License to
-anyone who comes into possession of a copy.  This License will
-therefore apply, along with any applicable section 7 additional terms,
-to the whole of the work, and all its parts, regardless of how they
-are packaged.  This License gives no permission to license the work in
-any other way, but it does not invalidate such permission if you have
-separately received it.
-
address@hidden
-If the work has interactive user interfaces, each must display
-Appropriate Legal Notices; however, if the Program has interactive
-interfaces that do not display Appropriate Legal Notices, your work
-need not make them do so.
address@hidden enumerate
-
-A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-``aggregate'' if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
address@hidden  Conveying Non-Source Forms.
-
-You may convey a covered work in object code form under the terms of
-sections 4 and 5, provided that you also convey the machine-readable
-Corresponding Source under the terms of this License, in one of these
-ways:
-
address@hidden a
address@hidden
-Convey the object code in, or embodied in, a physical product
-(including a physical distribution medium), accompanied by the
-Corresponding Source fixed on a durable physical medium customarily
-used for software interchange.
-
address@hidden
-Convey the object code in, or embodied in, a physical product
-(including a physical distribution medium), accompanied by a written
-offer, valid for at least three years and valid for as long as you
-offer spare parts or customer support for that product model, to give
-anyone who possesses the object code either (1) a copy of the
-Corresponding Source for all the software in the product that is
-covered by this License, on a durable physical medium customarily used
-for software interchange, for a price no more than your reasonable
-cost of physically performing this conveying of source, or (2) access
-to copy the Corresponding Source from a network server at no charge.
-
address@hidden
-Convey individual copies of the object code with a copy of the written
-offer to provide the Corresponding Source.  This alternative is
-allowed only occasionally and noncommercially, and only if you
-received the object code with such an offer, in accord with subsection
-6b.
-
address@hidden
-Convey the object code by offering access from a designated place
-(gratis or for a charge), and offer equivalent access to the
-Corresponding Source in the same way through the same place at no
-further charge.  You need not require recipients to copy the
-Corresponding Source along with the object code.  If the place to copy
-the object code is a network server, the Corresponding Source may be
-on a different server (operated by you or a third party) that supports
-equivalent copying facilities, provided you maintain clear directions
-next to the object code saying where to find the Corresponding Source.
-Regardless of what server hosts the Corresponding Source, you remain
-obligated to ensure that it is available for as long as needed to
-satisfy these requirements.
-
address@hidden
-Convey the object code using peer-to-peer transmission, provided you
-inform other peers where the object code and Corresponding Source of
-the work are being offered to the general public at no charge under
-subsection 6d.
-
address@hidden enumerate
-
-A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-A ``User Product'' is either (1) a ``consumer product'', which means any
-tangible personal property which is normally used for personal,
-family, or household purposes, or (2) anything designed or sold for
-incorporation into a dwelling.  In determining whether a product is a
-consumer product, doubtful cases shall be resolved in favor of
-coverage.  For a particular product received by a particular user,
-``normally used'' refers to a typical or common use of that class of
-product, regardless of the status of the particular user or of the way
-in which the particular user actually uses, or expects or is expected
-to use, the product.  A product is a consumer product regardless of
-whether the product has substantial commercial, industrial or
-non-consumer uses, unless such uses represent the only significant
-mode of use of the product.
-
-``Installation Information'' for a User Product means any methods,
-procedures, authorization keys, or other information required to
-install and execute modified versions of a covered work in that User
-Product from a modified version of its Corresponding Source.  The
-information must suffice to ensure that the continued functioning of
-the modified object code is in no case prevented or interfered with
-solely because modification has been made.
-
-If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or
-updates for a work that has been modified or installed by the
-recipient, or for the User Product in which it has been modified or
-installed.  Access to a network may be denied when the modification
-itself materially and adversely affects the operation of the network
-or violates the rules and protocols for communication across the
-network.
-
-Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
address@hidden Additional Terms.
-
-``Additional permissions'' are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders
-of that material) supplement the terms of this License with terms:
-
address@hidden a
address@hidden
-Disclaiming warranty or limiting liability differently from the terms
-of sections 15 and 16 of this License; or
-
address@hidden
-Requiring preservation of specified reasonable legal notices or author
-attributions in that material or in the Appropriate Legal Notices
-displayed by works containing it; or
-
address@hidden
-Prohibiting misrepresentation of the origin of that material, or
-requiring that modified versions of such material be marked in
-reasonable ways as different from the original version; or
-
address@hidden
-Limiting the use for publicity purposes of names of licensors or
-authors of the material; or
-
address@hidden
-Declining to grant rights under trademark law for use of some trade
-names, trademarks, or service marks; or
-
address@hidden
-Requiring indemnification of licensors and authors of that material by
-anyone who conveys the material (or modified versions of it) with
-contractual assumptions of liability to the recipient, for any
-liability that these contractual assumptions directly impose on those
-licensors and authors.
address@hidden enumerate
-
-All other non-permissive additional terms are considered ``further
-restrictions'' within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions; the
-above requirements apply either way.
-
address@hidden Termination.
-
-You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-However, if you cease all violation of this License, then your license
-from a particular copyright holder is reinstated (a) provisionally,
-unless and until the copyright holder explicitly and finally
-terminates your license, and (b) permanently, if the copyright holder
-fails to notify you of the violation by some reasonable means prior to
-60 days after the cessation.
-
-Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
address@hidden Acceptance Not Required for Having Copies.
-
-You are not required to accept this License in order to receive or run
-a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
address@hidden Automatic Licensing of Downstream Recipients.
-
-Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-An ``entity transaction'' is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
address@hidden Patents.
-
-A ``contributor'' is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's ``contributor version''.
-
-A contributor's ``essential patent claims'' are all patent claims owned
-or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, ``control'' includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-In the following three paragraphs, a ``patent license'' is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To ``grant'' such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  ``Knowingly relying'' means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-A patent license is ``discriminatory'' if it does not include within the
-scope of its coverage, prohibits the exercise of, or is conditioned on
-the non-exercise of one or more of the rights that are specifically
-granted under this License.  You may not convey a covered work if you
-are a party to an arrangement with a third party that is in the
-business of distributing software, under which you make payment to the
-third party based on the extent of your activity of conveying the
-work, and under which the third party grants, to any of the parties
-who would receive the covered work from you, a discriminatory patent
-license (a) in connection with copies of the covered work conveyed by
-you (or copies made from those copies), or (b) primarily for and in
-connection with specific products or compilations that contain the
-covered work, unless you entered into that arrangement, or that patent
-license was granted, prior to 28 March 2007.
-
-Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
address@hidden No Surrender of Others' Freedom.
-
-If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey
-a covered work so as to satisfy simultaneously your obligations under
-this License and any other pertinent obligations, then as a
-consequence you may not convey it at all.  For example, if you agree
-to terms that obligate you to collect a royalty for further conveying
-from those to whom you convey the Program, the only way you could
-satisfy both those terms and this License would be to refrain entirely
-from conveying the Program.
-
address@hidden Use with the GNU Affero General Public License.
-
-Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
address@hidden Revised Versions of this License.
-
-The Free Software Foundation may publish revised and/or new versions
-of the GNU General Public License from time to time.  Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies that a certain numbered version of the GNU General Public
-License ``or any later version'' applies to it, you have the option of
-following the terms and conditions either of that numbered version or
-of any later version published by the Free Software Foundation.  If
-the Program does not specify a version number of the GNU General
-Public License, you may choose any version ever published by the Free
-Software Foundation.
-
-If the Program specifies that a proxy can decide which future versions
-of the GNU General Public License can be used, that proxy's public
-statement of acceptance of a version permanently authorizes you to
-choose that version for the Program.
-
-Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
address@hidden Disclaimer of Warranty.
-
-THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM ``AS IS'' WITHOUT
-WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND
-PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE
-DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR
-CORRECTION.
-
address@hidden Limitation of Liability.
-
-IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR
-CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT
-NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR
-LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM
-TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER
-PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
address@hidden Interpretation of Sections 15 and 16.
-
-If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
address@hidden enumerate
-
address@hidden END OF TERMS AND CONDITIONS
-
address@hidden How to Apply These Terms to Your New Programs
-
-If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these
-terms.
-
-To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the ``copyright'' line and a pointer to where the full notice is found.
-
address@hidden
address@hidden line to give the program's name and a brief idea of what it 
does.}
-Copyright (C) @var{year} @var{name of author}
-
-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 3 of the License, 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, see @url{http://www.gnu.org/licenses/}.
address@hidden smallexample
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
address@hidden
address@hidden Copyright (C) @var{year} @var{name of author}
-This program comes with ABSOLUTELY NO WARRANTY; for details type @samp{show w}.
-This is free software, and you are welcome to redistribute it
-under certain conditions; type @samp{show c} for details.
address@hidden smallexample
-
-The hypothetical commands @samp{show w} and @samp{show c} should show
-the appropriate parts of the General Public License.  Of course, your
-program's commands might be different; for a GUI interface, you would
-use an ``about box''.
-
-You should also get your employer (if you work as a programmer) or school,
-if any, to sign a ``copyright disclaimer'' for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
address@hidden://www.gnu.org/licenses/}.
-
-The GNU General Public License does not permit incorporating your
-program into proprietary programs.  If your program is a subroutine
-library, you may consider it more useful to permit linking proprietary
-applications with the library.  If this is what you want to do, use
-the GNU Lesser General Public License instead of this License.  But
-first, please read @url{http://www.gnu.org/philosophy/why-not-lgpl.html}.
diff --git a/doc/gsasl.texi b/doc/gsasl.texi
index 7c82488..d24fbd2 100644
--- a/doc/gsasl.texi
+++ b/doc/gsasl.texi
@@ -12,7 +12,7 @@
 This manual was last updated @value{UPDATED} for version
 @value{VERSION} of GNU SASL.
 
-Copyright @copyright{} 2002-2011 Simon Josefsson.
+Copyright @copyright{} 2002-2012 Simon Josefsson.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -2529,8 +2529,6 @@ otherwise @code{GSASL_AUTHENTICATION_ERROR}.
 
 @menu
 * GNU Free Documentation License::   License for copying this manual.
-* GNU LGPL::                         License for copying the library.
-* GNU GPL::                          License for copying the programs.
 @end menu
 
 @node GNU Free Documentation License
@@ -2540,20 +2538,6 @@ otherwise @code{GSASL_AUTHENTICATION_ERROR}.
 
 @include fdl-1.3.texi
 
address@hidden GNU LGPL
address@hidden GNU Lesser General Public License
address@hidden LGPL, GNU Lesser General Public License
address@hidden License, GNU LGPL
-
address@hidden lgpl-2.1.texi
-
address@hidden GNU GPL
address@hidden GNU General Public License
address@hidden GPL, GNU General Public License
address@hidden License, GNU GPL
-
address@hidden gpl-3.0.texi
-
 @node Function and Data Index
 @unnumbered Function and Data Index
 
diff --git a/doc/lgpl-2.1.texi b/doc/lgpl-2.1.texi
deleted file mode 100644
index ab03d6c..0000000
--- a/doc/lgpl-2.1.texi
+++ /dev/null
@@ -1,549 +0,0 @@
address@hidden The GNU Lesser General Public License.
address@hidden Version 2.1, February 1999
-
address@hidden This file is intended to be included within another document,
address@hidden hence no sectioning command or @node.
-
address@hidden
-Copyright @copyright{} 1991, 1999 Free Software Foundation, Inc.
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
-
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
-as the successor of the GNU Library Public License, version 2, hence the
-version number 2.1.]
address@hidden display
-
address@hidden Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software---to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software---typically libraries---of the Free
-Software Foundation and other authors who decide to use it.  You can use
-it too, but we suggest you first think carefully about whether this
-license or the ordinary General Public License is the better strategy to
-use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of it
-in new free programs; and that you are informed that you can do these
-things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the @dfn{Lesser} General Public License because it
-does @emph{Less} to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-``work based on the library'' and a ``work that uses the library''.  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
address@hidden TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
address@hidden 0
address@hidden
-This License Agreement applies to any software library or other program
-which contains a notice placed by the copyright holder or other
-authorized party saying it may be distributed under the terms of this
-Lesser General Public License (also called ``this License'').  Each
-licensee is addressed as ``you''.
-
-  A ``library'' means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The ``Library'', below, refers to any such software library or work
-which has been distributed under these terms.  A ``work based on the
-Library'' means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term ``modification''.)
-
-  ``Source code'' for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
address@hidden
-You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
address@hidden
-You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
address@hidden a
address@hidden
-The modified work must itself be a software library.
-
address@hidden
-You must cause the files modified to carry prominent notices
-stating that you changed the files and the date of any change.
-
address@hidden
-You must cause the whole of the work to be licensed at no
-charge to all third parties under the terms of this License.
-
address@hidden
-If a facility in the modified Library refers to a function or a
-table of data to be supplied by an application program that uses
-the facility, other than as an argument passed when the facility
-is invoked, then you must make a good faith effort to ensure that,
-in the event an application does not supply such function or
-table, the facility still operates, and performs whatever part of
-its purpose remains meaningful.
-
-(For example, a function in a library to compute square roots has
-a purpose that is entirely well-defined independent of the
-application.  Therefore, Subsection 2d requires that any
-application-supplied function or table used by this function must
-be optional: if the application does not supply it, the square
-root function must still compute square roots.)
address@hidden enumerate
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
address@hidden
-You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
address@hidden
-You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
address@hidden
-A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a ``work that uses the Library''.  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a ``work that uses the Library'' with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a ``work that uses the
-library''.  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a ``work that uses the Library'' uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
address@hidden
-As an exception to the Sections above, you may also combine or
-link a ``work that uses the Library'' with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
address@hidden a
address@hidden
-Accompany the work with the complete corresponding
-machine-readable source code for the Library including whatever
-changes were used in the work (which must be distributed under
-Sections 1 and 2 above); and, if the work is an executable linked
-with the Library, with the complete machine-readable ``work that
-uses the Library'', as object code and/or source code, so that the
-user can modify the Library and then relink to produce a modified
-executable containing the modified Library.  (It is understood
-that the user who changes the contents of definitions files in the
-Library will not necessarily be able to recompile the application
-to use the modified definitions.)
-
address@hidden
-Use a suitable shared library mechanism for linking with the Library.  A
-suitable mechanism is one that (1) uses at run time a copy of the
-library already present on the user's computer system, rather than
-copying library functions into the executable, and (2) will operate
-properly with a modified version of the library, if the user installs
-one, as long as the modified version is interface-compatible with the
-version that the work was made with.
-
address@hidden
-Accompany the work with a written offer, valid for at
-least three years, to give the same user the materials
-specified in Subsection 6a, above, for a charge no more
-than the cost of performing this distribution.
-
address@hidden
-If distribution of the work is made by offering access to copy
-from a designated place, offer equivalent access to copy the above
-specified materials from the same place.
-
address@hidden
-Verify that the user has already received a copy of these
-materials or that you have already sent this user a copy.
address@hidden enumerate
-
-  For an executable, the required form of the ``work that uses the
-Library'' must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies the
-executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
address@hidden
-You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
address@hidden a
address@hidden
-Accompany the combined library with a copy of the same work
-based on the Library, uncombined with any other library
-facilities.  This must be distributed under the terms of the
-Sections above.
-
address@hidden
-Give prominent notice with the combined library of the fact
-that part of it is a work based on the Library, and explaining
-where to find the accompanying uncombined form of the same work.
address@hidden enumerate
-
address@hidden
-You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
address@hidden
-You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
address@hidden
-Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
address@hidden
-If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
address@hidden
-If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
address@hidden
-The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-``any later version'', you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
address@hidden
-If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
address@hidden @b{NO WARRANTY}
-
address@hidden
-BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY ``AS IS'' WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
address@hidden
-IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
address@hidden enumerate
-
address@hidden END OF TERMS AND CONDITIONS
-
address@hidden
address@hidden How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-``copyright'' line and a pointer to where the full notice is found.
-
address@hidden
address@hidden line to give the library's name and an idea of what it does.}
-Copyright (C) @var{year}  @var{name of author}
-
-This library is free software; you can redistribute it and/or modify it
-under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or (at
-your option) any later version.
-
-This library 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
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-USA.
address@hidden smallexample
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a ``copyright disclaimer'' for the library, if
-necessary.  Here is a sample; alter the names:
-
address@hidden
-Yoyodyne, Inc., hereby disclaims all copyright interest in the library
-`Frob' (a library for tweaking knobs) written by James Random Hacker.
-
address@hidden of Ty Coon}, 1 April 1990
-Ty Coon, President of Vice
address@hidden smallexample
-
-That's all there is to it!
diff --git a/doc/print-errors.c b/doc/print-errors.c
index 14cee1f..6397950 100644
--- a/doc/print-errors.c
+++ b/doc/print-errors.c
@@ -1,5 +1,5 @@
 /* print-errors.c --- Print error codes.
- * Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008, 2009  Simon Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL.
  *
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index b10b912..8e1e68c 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -18,10 +18,10 @@ DOC_MODULE=$(PACKAGE)
 # The top-level SGML file. You can change this if you want to.
 DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
 
-# Directories containing the source code, relative to $(srcdir).
+# Directories containing the source code.
 # gtk-doc will search all .c and .h files beneath these paths
 # for inline comments documenting functions and macros.
-# e.g. DOC_SOURCE_DIR=../../../gtk ../../../gdk
+# e.g. DOC_SOURCE_DIR=$(top_srcdir)/gtk $(top_srcdir)/gdk
 DOC_SOURCE_DIR=../../lib/src
 
 # Extra options to pass to gtkdoc-scangobj. Not normally needed.
@@ -32,8 +32,8 @@ SCANGOBJ_OPTIONS=
 SCAN_OPTIONS=--deprecated-guards=GSASL_COMPAT_H --ignore-decorators=GSASL_API
 
 # Extra options to supply to gtkdoc-mkdb.
-# e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml
-MKDB_OPTIONS=--sgml-mode --output-format=xml
+# e.g. MKDB_OPTIONS=--xml-mode --output-format=xml
+MKDB_OPTIONS=--xml-mode --output-format=xml
 
 # Extra options to supply to gtkdoc-mktmpl
 # e.g. MKTMPL_OPTIONS=--only-section-tmpl
@@ -56,8 +56,8 @@ CFILE_GLOB=$(top_srcdir)/lib/src/*.c
 # e.g. EXTRA_HFILES=$(top_srcdir}/contrib/extra.h
 EXTRA_HFILES=
 
-# Header files to ignore when scanning. Use base file name, no paths
-# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
+# Header files or dirs to ignore when scanning. Use base file/dir names
+# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h private_code
 IGNORE_HFILES=internal.h
 
 # Images to copy into HTML directory.
@@ -93,8 +93,13 @@ EXTRA_DIST +=
 # for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt
 #DISTCLEANFILES +=
 
-# Comment this out if you want your docs-status tested during 'make check'
+# Comment this out if you want 'make check' to test you doc status
+# and run some sanity checks
 if ENABLE_GTK_DOC
-#TESTS_ENVIRONMENT = cd $(srcsrc) &&
+TESTS_ENVIRONMENT = cd $(srcdir) && \
+  DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \
+  SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir)
 #TESTS = $(GTKDOC_CHECK)
 endif
+
+-include $(top_srcdir)/git.mk
diff --git a/doc/reference/gsasl-docs.sgml b/doc/reference/gsasl-docs.sgml
index 930f628..d07bf3a 100644
--- a/doc/reference/gsasl-docs.sgml
+++ b/doc/reference/gsasl-docs.sgml
@@ -1,12 +1,21 @@
 <?xml version="1.0"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-          "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd";>
-<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude";>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd";
+[
+  <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 
'http://www.w3.org/2003/XInclude'">
+  <!ENTITY version SYSTEM "version.xml">
+]>
+<book id="index">
   <bookinfo>
     <title>GNU SASL API Reference Manual</title>
+    <releaseinfo>
+      for GNU SASL &version;.
+      The latest version of this documentation can be found on-line at
+      <ulink role="online-location" 
url="https://www.gnu.org/software/gsasl/reference/";>https://www.gnu.org/software/gsasl/reference/</ulink>.
+    </releaseinfo>
   </bookinfo>
 
-  <chapter>
+  <chapter id="intro">
     <title>GNU SASL API Reference Manual</title>
 
     <para>
@@ -92,8 +101,9 @@ mechanism interact is shown in <xref linkend="abstraction"/>.
     <xi:include href="xml/gsasl-compat.xml"/>
   </chapter>
 
-  <index>
-    <title>Index</title>
+  <index id="api-index-full">
+    <title>API Index</title>
+    <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
   </index>
   <index role="deprecated">
     <title>Index of deprecated symbols</title>
diff --git a/doc/reference/version.xml.in b/doc/reference/version.xml.in
new file mode 100644
index 0000000..d78bda9
--- /dev/null
+++ b/doc/reference/version.xml.in
@@ -0,0 +1 @@
address@hidden@
diff --git a/examples/Makefile.am b/examples/Makefile.am
index ce3b7f1..d4454ca 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010 Simon Josefsson
+# Copyright (C) 2002-2012 Simon Josefsson
 #
 # This file is part of GNU SASL.
 #
diff --git a/examples/README b/examples/README
index f20528a..ff9c303 100644
--- a/examples/README
+++ b/examples/README
@@ -1,5 +1,5 @@
 GNU SASL examples/README -- Information about files in examples/ directory.
-Copyright (C) 2003, 2004 Simon Josefsson
+Copyright (C) 2003-2012 Simon Josefsson
 See the end for copying conditions.
 
 This directory contains examples on how to use GNU SASL.
diff --git a/examples/client-callback.c b/examples/client-callback.c
index ee014f7..54ab8b9 100644
--- a/examples/client-callback.c
+++ b/examples/client-callback.c
@@ -1,5 +1,5 @@
 /* client-callback.c --- Example SASL client, with callback for user info.
- * Copyright (C) 2004, 2005, 2007, 2009  Simon Josefsson
+ * Copyright (C) 2004-2012 Simon Josefsson
  *
  * This file is part of GNU SASL.
  *
diff --git a/examples/client-mech.c b/examples/client-mech.c
index aac3a96..c95ed82 100644
--- a/examples/client-mech.c
+++ b/examples/client-mech.c
@@ -1,5 +1,5 @@
 /* client-mech.c --- Example SASL client, with a choice of mechanism to use.
- * Copyright (C) 2004, 2005, 2007, 2009  Simon Josefsson
+ * Copyright (C) 2004-2012 Simon Josefsson
  *
  * This file is part of GNU SASL.
  *
diff --git a/examples/client-serverfirst.c b/examples/client-serverfirst.c
index 987d255..f322175 100644
--- a/examples/client-serverfirst.c
+++ b/examples/client-serverfirst.c
@@ -1,5 +1,5 @@
 /* client-serverfirst.c --- Example SASL client, where server send data first.
- * Copyright (C) 2004, 2005, 2007, 2009  Simon Josefsson
+ * Copyright (C) 2004-2012 Simon Josefsson
  *
  * This file is part of GNU SASL.
  *
diff --git a/examples/client.c b/examples/client.c
index a45013c..f050ce6 100644
--- a/examples/client.c
+++ b/examples/client.c
@@ -1,5 +1,5 @@
 /* client.c --- Example SASL client.
- * Copyright (C) 2004, 2005, 2007, 2009  Simon Josefsson
+ * Copyright (C) 2004-2012 Simon Josefsson
  *
  * This file is part of GNU SASL.
  *
diff --git a/gl/Makefile.am b/gl/Makefile.am
index 9511690..392262b 100644
--- a/gl/Makefile.am
+++ b/gl/Makefile.am
@@ -21,7 +21,7 @@
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --local-dir=gl/override 
--lib=libgl --source-base=gl --m4-base=gl/m4 --doc-base=doc 
--tests-base=gltests --aux-dir=lib/build-aux --with-tests 
--no-conditional-dependencies --libtool --macro-prefix=gl --no-vc-files 
autobuild close connect error fdl-1.3 gendocs getaddrinfo getopt-gnu getpass 
gpl-3.0 lgpl-2.1 maintainer-makefile manywarnings netdb netinet_in pmccabe2html 
poll progname quote readline recv shutdown socket striconv strtok_r sys_time 
unistd valgrind-tests vasprintf version-etc warnings xalloc
+# Reproduce by: gnulib-tool --import --dir=. --local-dir=gl/override 
--lib=libgl --source-base=gl --m4-base=gl/m4 --doc-base=doc 
--tests-base=gltests --aux-dir=lib/build-aux --with-tests 
--avoid=update-copyright-tests --no-conditional-dependencies --libtool 
--macro-prefix=gl --no-vc-files autobuild close connect error fdl-1.3 gendocs 
getaddrinfo getopt-gnu getpass maintainer-makefile manywarnings netdb 
netinet_in pmccabe2html poll progname quote readline recv shutdown socket 
striconv strtok_r sys_time unistd update-copyright valgrind-tests vasprintf 
version-etc warnings xalloc
 
 AUTOMAKE_OPTIONS = 1.5 gnits subdir-objects
 
@@ -2011,6 +2011,13 @@ EXTRA_DIST += unitypes.in.h
 
 ## end   gnulib module unitypes
 
+## begin gnulib module update-copyright
+
+
+EXTRA_DIST += $(top_srcdir)/lib/build-aux/update-copyright
+
+## end   gnulib module update-copyright
+
 ## begin gnulib module useless-if-before-free
 
 
diff --git a/gl/m4/gnulib-cache.m4 b/gl/m4/gnulib-cache.m4
index 3f92cf3..281fcab 100644
--- a/gl/m4/gnulib-cache.m4
+++ b/gl/m4/gnulib-cache.m4
@@ -27,7 +27,7 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --local-dir=gl/override --lib=libgl 
--source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=gltests 
--aux-dir=lib/build-aux --with-tests --no-conditional-dependencies --libtool 
--macro-prefix=gl --no-vc-files autobuild close connect error fdl-1.3 gendocs 
getaddrinfo getopt-gnu getpass gpl-3.0 lgpl-2.1 maintainer-makefile 
manywarnings netdb netinet_in pmccabe2html poll progname quote readline recv 
shutdown socket striconv strtok_r sys_time unistd valgrind-tests vasprintf 
version-etc warnings xalloc
+#   gnulib-tool --import --dir=. --local-dir=gl/override --lib=libgl 
--source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=gltests 
--aux-dir=lib/build-aux --with-tests --avoid=update-copyright-tests 
--no-conditional-dependencies --libtool --macro-prefix=gl --no-vc-files 
autobuild close connect error fdl-1.3 gendocs getaddrinfo getopt-gnu getpass 
maintainer-makefile manywarnings netdb netinet_in pmccabe2html poll progname 
quote readline recv shutdown socket striconv strtok_r sys_time unistd 
update-copyright valgrind-tests vasprintf version-etc warnings xalloc
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([gl/override])
@@ -41,8 +41,6 @@ gl_MODULES([
   getaddrinfo
   getopt-gnu
   getpass
-  gpl-3.0
-  lgpl-2.1
   maintainer-makefile
   manywarnings
   netdb
@@ -59,13 +57,14 @@ gl_MODULES([
   strtok_r
   sys_time
   unistd
+  update-copyright
   valgrind-tests
   vasprintf
   version-etc
   warnings
   xalloc
 ])
-gl_AVOID([])
+gl_AVOID([update-copyright-tests])
 gl_SOURCE_BASE([gl])
 gl_M4_BASE([gl/m4])
 gl_PO_BASE([])
diff --git a/gl/m4/gnulib-comp.m4 b/gl/m4/gnulib-comp.m4
index eaec029..453a966 100644
--- a/gl/m4/gnulib-comp.m4
+++ b/gl/m4/gnulib-comp.m4
@@ -118,7 +118,6 @@ AC_DEFUN([gl_EARLY],
   # Code from module gettimeofday-tests:
   # Code from module gnumakefile:
   # Code from module gperf:
-  # Code from module gpl-3.0:
   # Code from module havelib:
   # Code from module hostent:
   # Code from module iconv:
@@ -143,7 +142,6 @@ AC_DEFUN([gl_EARLY],
   # Code from module ioctl-tests:
   # Code from module largefile:
   AC_REQUIRE([AC_SYS_LARGEFILE])
-  # Code from module lgpl-2.1:
   # Code from module listen:
   # Code from module listen-tests:
   # Code from module localcharset:
@@ -294,6 +292,7 @@ AC_DEFUN([gl_EARLY],
   # Code from module unitypes:
   # Code from module unsetenv:
   # Code from module unsetenv-tests:
+  # Code from module update-copyright:
   # Code from module useless-if-before-free:
   # Code from module valgrind-tests:
   # Code from module vasnprintf:
@@ -993,12 +992,11 @@ AC_DEFUN([gl_FILE_LIST], [
   build-aux/snippet/c++defs.h
   build-aux/snippet/unused-parameter.h
   build-aux/snippet/warn-on-use.h
+  build-aux/update-copyright
   build-aux/useless-if-before-free
   build-aux/vc-list-files
   doc/fdl-1.3.texi
   doc/gendocs_template
-  doc/gpl-3.0.texi
-  doc/lgpl-2.1.texi
   lib/alloca.c
   lib/alloca.in.h
   lib/arpa_inet.in.h
diff --git a/gtk-doc.make b/gtk-doc.make
index 57fab98..1f75dfd 100644
--- a/gtk-doc.make
+++ b/gtk-doc.make
@@ -5,12 +5,12 @@
 ####################################
 
 if GTK_DOC_USE_LIBTOOL
-GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) 
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) 
$(AM_LDFLAGS) $(LDFLAGS)
+GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) 
$(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(GTKDOC_DEPS_LIBS) 
$(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
 GTKDOC_RUN = $(LIBTOOL) --mode=execute
 else
-GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) 
$(AM_CFLAGS) $(CFLAGS)
+GTKDOC_LD = $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) 
$(LDFLAGS)
 GTKDOC_RUN =
 endif
 
@@ -23,17 +23,19 @@ GPATH = $(srcdir)
 
 TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
 
-EXTRA_DIST =                           \
+SETUP_FILES = \
        $(content_files)                \
-       $(HTML_IMAGES)                  \
        $(DOC_MAIN_SGML_FILE)           \
        $(DOC_MODULE)-sections.txt      \
        $(DOC_MODULE)-overrides.txt
 
-DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp 
\
-       pdf-build.stamp \
-       $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \
-       $(srcdir)/pdf.stamp
+EXTRA_DIST =                           \
+       $(HTML_IMAGES)                  \
+       $(SETUP_FILES)
+
+DOC_STAMPS=setup-build.stamp scan-build.stamp tmpl-build.stamp 
sgml-build.stamp \
+       html-build.stamp pdf-build.stamp \
+       tmpl.stamp sgml.stamp html.stamp pdf.stamp
 
 SCANOBJ_FILES =                 \
        $(DOC_MODULE).args       \
@@ -70,22 +72,47 @@ docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
 
 $(REPORT_FILES): sgml-build.stamp
 
+#### setup ####
+
+setup-build.stamp:
+       address@hidden test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+           echo '  DOC   Preparing build'; \
+           files=`echo $(SETUP_FILES) $(expand_content_files) 
$(DOC_MODULE).types`; \
+           if test "x$$files" != "x" ; then \
+               for file in $$files ; do \
+                   test -f $(abs_srcdir)/$$file && \
+                       cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \
+               done; \
+           fi; \
+           test -d $(abs_srcdir)/tmpl && \
+               { cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \
+               chmod -R u+w $(abs_builddir)/tmpl; } \
+       fi
+       @touch setup-build.stamp
+
 #### scan ####
 
 scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
-       @echo 'gtk-doc: Scanning header files'
-       @-chmod -R u+w $(srcdir)
-       @_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \
+       @echo '  DOC   Scanning header files'
+       @_source_dir='' ; \
+       for i in $(DOC_SOURCE_DIR) ; do \
            _source_dir="$${_source_dir} --source-dir=$$i" ; \
-         done ; \
-         cd $(srcdir) && \
-         gtkdoc-scan --module=$(DOC_MODULE) 
--ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) 
$(EXTRA_HFILES)
-       @if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; 
then \
-           CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" 
CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" 
gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) 
--output-dir=$(srcdir) ; \
+       done ; \
+       gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" 
$${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
+       @if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
+           echo "  DOC   Introspecting gobjects"; \
+           scanobj_options=""; \
+           gtkdoc-scangobj 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
+           if test "$(?)" = "0"; then \
+               if test "x$(V)" = "x1"; then \
+                   scanobj_options="--verbose"; \
+               fi; \
+           fi; \
+           CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" 
CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \
+           gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options 
--module=$(DOC_MODULE); \
        else \
-           cd $(srcdir) ; \
            for i in $(SCANOBJ_FILES) ; do \
-               test -f $$i || touch $$i ; \
+               test -f $$i || touch $$i ; \
            done \
        fi
        @touch scan-build.stamp
@@ -95,10 +122,14 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) 
$(DOC_MODULE)-sections.txt $(DOC_MODULE)
 
 #### templates ####
 
-tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) 
$(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
-       @echo 'gtk-doc: Rebuilding template files'
-       @-chmod -R u+w $(srcdir)
-       @cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
+tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) 
$(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
+       @echo '  DOC   Rebuilding template files'
+       @gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
+       @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+         if test -w $(abs_srcdir) ; then \
+           cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \
+         fi \
+       fi
        @touch tmpl-build.stamp
 
 tmpl.stamp: tmpl-build.stamp
@@ -110,13 +141,13 @@ $(srcdir)/tmpl/*.sgml:
 #### xml ####
 
 sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml 
$(expand_content_files)
-       @echo 'gtk-doc: Building XML'
+       @echo '  DOC   Building XML'
        @-chmod -R u+w $(srcdir)
-       @_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \
+       @_source_dir='' ; \
+       for i in $(DOC_SOURCE_DIR) ; do \
            _source_dir="$${_source_dir} --source-dir=$$i" ; \
-         done ; \
-         cd $(srcdir) && \
-         gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml 
--expand-content-files="$(expand_content_files)" 
--main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
+       done ; \
+       gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml 
--expand-content-files="$(expand_content_files)" 
--main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
        @touch sgml-build.stamp
 
 sgml.stamp: sgml-build.stamp
@@ -125,58 +156,79 @@ sgml.stamp: sgml-build.stamp
 #### html ####
 
 html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-       @echo 'gtk-doc: Building HTML'
-       @-chmod -R u+w $(srcdir)
-       @rm -rf $(srcdir)/html
-       @mkdir $(srcdir)/html
+       @echo '  DOC   Building HTML'
+       @rm -rf html
+       @mkdir html
        @mkhtml_options=""; \
+       gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
+       if test "$(?)" = "0"; then \
+         if test "x$(V)" = "x1"; then \
+           mkhtml_options="$$mkhtml_options --verbose"; \
+         fi; \
+       fi; \
        gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-path"; \
        if test "$(?)" = "0"; then \
-         mkhtml_options=--path="$(srcdir)"; \
+         mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \
        fi; \
-       cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) 
$(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
-       @test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) 
html )
-       @echo 'gtk-doc: Fixing cross-references'
-       @cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) 
--module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+       cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) 
$(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+       address@hidden "x$(HTML_IMAGES)" = "x" || \
+       for file in $(HTML_IMAGES) ; do \
+         if test -f $(abs_srcdir)/$$file ; then \
+           cp $(abs_srcdir)/$$file $(abs_builddir)/html; \
+         fi; \
+         if test -f $(abs_builddir)/$$file ; then \
+           cp $(abs_builddir)/$$file $(abs_builddir)/html; \
+         fi; \
+       done;
+       @echo '  DOC   Fixing cross-references'
+       @gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html 
--html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
        @touch html-build.stamp
 
 #### pdf ####
 
 pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-       @echo 'gtk-doc: Building PDF'
-       @-chmod -R u+w $(srcdir)
-       @rm -rf $(srcdir)/$(DOC_MODULE).pdf
-       @mkpdf_imgdirs=""; \
+       @echo '  DOC   Building PDF'
+       @rm -f $(DOC_MODULE).pdf
+       @mkpdf_options=""; \
+       gtkdoc-mkpdf 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
+       if test "$(?)" = "0"; then \
+         if test "x$(V)" = "x1"; then \
+           mkpdf_options="$$mkpdf_options --verbose"; \
+         fi; \
+       fi; \
        if test "x$(HTML_IMAGES)" != "x"; then \
          for img in $(HTML_IMAGES); do \
            part=`dirname $$img`; \
-           echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \
+           echo $$mkpdf_options | grep >/dev/null "\-\-imgdir=$$part "; \
            if test $$? != 0; then \
-             mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \
+             mkpdf_options="$$mkpdf_options --imgdir=$$part"; \
            fi; \
          done; \
        fi; \
-       cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs 
$(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
+       gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) 
$(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
        @touch pdf-build.stamp
 
 ##############
 
 clean-local:
-       rm -f *~ *.bak
-       rm -rf .libs
+       @rm -f *~ *.bak
+       @rm -rf .libs
 
 distclean-local:
-       cd $(srcdir) && \
-         rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \
-                $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+       @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
+           $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+       @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+           rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \
+           rm -rf tmpl; \
+       fi
 
 maintainer-clean-local: clean
-       cd $(srcdir) && rm -rf xml html
+       @rm -rf xml html
 
 install-data-local:
-       @installfiles=`echo $(srcdir)/html/*`; \
-       if test "$$installfiles" = '$(srcdir)/html/*'; \
-       then echo '-- Nothing to install' ; \
+       @installfiles=`echo $(builddir)/html/*`; \
+       if test "$$installfiles" = '$(builddir)/html/*'; \
+       then echo 1>&2 'Nothing to install' ; \
        else \
          if test -n "$(DOC_MODULE_VERSION)"; then \
            installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
@@ -185,14 +237,12 @@ install-data-local:
          fi; \
          $(mkinstalldirs) $${installdir} ; \
          for i in $$installfiles; do \
-           echo '-- Installing '$$i ; \
+           echo ' $(INSTALL_DATA) '$$i ; \
            $(INSTALL_DATA) $$i $${installdir}; \
          done; \
          if test -n "$(DOC_MODULE_VERSION)"; then \
            mv -f $${installdir}/$(DOC_MODULE).devhelp2 \
              $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \
-           mv -f $${installdir}/$(DOC_MODULE).devhelp \
-             $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
          fi; \
          $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) 
--html-dir=$${installdir}; \
        fi
@@ -217,14 +267,14 @@ dist-check-gtkdoc:
 endif
 
 dist-hook: dist-check-gtkdoc dist-hook-local
-       mkdir $(distdir)/tmpl
-       mkdir $(distdir)/html
-       -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-       cp $(srcdir)/html/* $(distdir)/html
-       -cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/
-       -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
-       -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
-       cd $(distdir) && rm -f $(DISTCLEANFILES)
-       $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
+       @mkdir $(distdir)/tmpl
+       @mkdir $(distdir)/html
+       @-cp ./tmpl/*.sgml $(distdir)/tmpl
+       @cp ./html/* $(distdir)/html
+       @-cp ./$(DOC_MODULE).pdf $(distdir)/
+       @-cp ./$(DOC_MODULE).types $(distdir)/
+       @-cp ./$(DOC_MODULE)-sections.txt $(distdir)/
+       @cd $(distdir) && rm -f $(DISTCLEANFILES)
+       @$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
 
 .PHONY : dist-hook-local docs
diff --git a/lib/.prev-version b/lib/.prev-version
deleted file mode 100644
index 9459d4b..0000000
--- a/lib/.prev-version
+++ /dev/null
@@ -1 +0,0 @@
-1.1
diff --git a/lib/AUTHORS b/lib/AUTHORS
index b35d51b..07a63a4 100644
--- a/lib/AUTHORS
+++ b/lib/AUTHORS
@@ -1,5 +1,5 @@
 GNU SASL LIBRARY AUTHORS -- Information about the authors.
-Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Simon Josefsson
+Copyright (C) 2002-2012 Simon Josefsson
 See the end for copying conditions.
 
 Simon Josefsson <address@hidden>
diff --git a/lib/ChangeLog b/lib/ChangeLog
index aea51db..eae7f0b 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -16966,7 +16966,7 @@
 
        -----
 
-       Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Simon Josefsson
+       Copyright (C) 2002-2012 Simon Josefsson
 
        Copying and distribution of this file, with or without
        modification, are permitted provided the copyright notice
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 10ab390..88298d7 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 
Simon Josefsson
+# Copyright (C) 2002-2012 Simon Josefsson
 #
 # This file is part of GNU SASL Library.
 #
diff --git a/lib/NEWS b/lib/NEWS
index c33e469..5cf007a 100644
--- a/lib/NEWS
+++ b/lib/NEWS
@@ -1,5 +1,5 @@
 GNU SASL LIBRARY NEWS -- History of user-visible changes.
-Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Simon 
Josefsson
+Copyright (C) 2002-2012 Simon Josefsson
 See the end for copying conditions.
 
 * Version 1.7.1 (unreleased) [alpha]
diff --git a/lib/README b/lib/README
index 4210fa3..f3d560f 100644
--- a/lib/README
+++ b/lib/README
@@ -1,5 +1,5 @@
 GNU SASL LIBRARY README -- Important introductory notes.
-Copyright (C) 2002-2011 Simon Josefsson
+Copyright (C) 2002-2012 Simon Josefsson
 See the end for copying conditions.
 
 The GNU SASL Library is a library that implements the Simple
diff --git a/lib/THANKS b/lib/THANKS
index 6c9e853..81579e5 100644
--- a/lib/THANKS
+++ b/lib/THANKS
@@ -1,5 +1,5 @@
 GNU SASL LIBRARY THANKS -- Acknowledgements.
-Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Simon Josefsson
+Copyright (C) 2002-2012 Simon Josefsson
 See the end for copying conditions.
 
 GNU SASL uses libntlm by Grant Edwards maintained by Simon Josefsson;
diff --git a/lib/anonymous/Makefile.am b/lib/anonymous/Makefile.am
index 515db16..f00781a 100644
--- a/lib/anonymous/Makefile.am
+++ b/lib/anonymous/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Simon Josefsson
+# Copyright (C) 2002-2012 Simon Josefsson
 #
 # This file is part of GNU SASL Library.
 #
diff --git a/lib/anonymous/anonymous.h b/lib/anonymous/anonymous.h
index 1176a2b..3c71197 100644
--- a/lib/anonymous/anonymous.h
+++ b/lib/anonymous/anonymous.h
@@ -1,5 +1,5 @@
 /* anonymous.h --- Prototypes for ANONYMOUS mechanism as defined in RFC 2245.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/anonymous/client.c b/lib/anonymous/client.c
index 5119bc1..5604f3a 100644
--- a/lib/anonymous/client.c
+++ b/lib/anonymous/client.c
@@ -1,5 +1,5 @@
 /* client.c --- ANONYMOUS mechanism as defined in RFC 2245, client side.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/anonymous/mechinfo.c b/lib/anonymous/mechinfo.c
index b34f70f..6a17e73 100644
--- a/lib/anonymous/mechinfo.c
+++ b/lib/anonymous/mechinfo.c
@@ -1,5 +1,5 @@
 /* mechinfo.c --- Definition of ANONYMOUS mechanism.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/anonymous/server.c b/lib/anonymous/server.c
index 5d30706..53d5ecf 100644
--- a/lib/anonymous/server.c
+++ b/lib/anonymous/server.c
@@ -1,5 +1,5 @@
 /* server.c --- ANONYMOUS mechanism as defined in RFC 2245, server side.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/build-aux/update-copyright b/lib/build-aux/update-copyright
new file mode 100755
index 0000000..082b749
--- /dev/null
+++ b/lib/build-aux/update-copyright
@@ -0,0 +1,274 @@
+eval '(exit $?0)' && eval 'exec perl -wS -0777 -pi "$0" ${1+"$@"}'
+  & eval 'exec perl -wS -0777 -pi "$0" $argv:q'
+    if 0;
+# Update an FSF copyright year list to include the current year.
+
+my $VERSION = '2012-02-05.21:39'; # UTC
+
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, 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, see <http://www.gnu.org/licenses/>.
+
+# Written by Jim Meyering and Joel E. Denny
+
+# The arguments to this script should be names of files that contain
+# copyright statements to be updated.  The copyright holder's name
+# defaults to "Free Software Foundation, Inc." but may be changed to
+# any other name by using the "UPDATE_COPYRIGHT_HOLDER" environment
+# variable.
+#
+# For example, you might wish to use the update-copyright target rule
+# in maint.mk from gnulib's maintainer-makefile module.
+#
+# Iff a copyright statement is recognized in a file and the final
+# year is not the current year, then the statement is updated for the
+# new year and it is reformatted to:
+#
+#   1. Fit within 72 columns.
+#   2. Convert 2-digit years to 4-digit years by prepending "19".
+#   3. Expand copyright year intervals.  (See "Environment variables"
+#      below.)
+#
+# A warning is printed for every file for which no copyright
+# statement is recognized.
+#
+# Each file's copyright statement must be formatted correctly in
+# order to be recognized.  For example, each of these is fine:
+#
+#   Copyright @copyright{} 1990-2005, 2007-2009 Free Software
+#   Foundation, Inc.
+#
+#   # Copyright (C) 1990-2005, 2007-2009 Free Software
+#   # Foundation, Inc.
+#
+#   /*
+#    * Copyright &copy; 90,2005,2007-2009
+#    * Free Software Foundation, Inc.
+#    */
+#
+# However, the following format is not recognized because the line
+# prefix changes after the first line:
+#
+#   ## Copyright (C) 1990-2005, 2007-2009 Free Software
+#   #  Foundation, Inc.
+#
+# However, any correctly formatted copyright statement following
+# a non-matching copyright statements would be recognized.
+#
+# The exact conditions that a file's copyright statement must meet
+# to be recognized are:
+#
+#   1. It is the first copyright statement that meets all of the
+#      following conditions.  Subsequent copyright statements are
+#      ignored.
+#   2. Its format is "Copyright (C)", then a list of copyright years,
+#      and then the name of the copyright holder.
+#   3. The "(C)" takes one of the following forms or is omitted
+#      entirely:
+#
+#        A. (C)
+#        B. (c)
+#        C. @copyright{}
+#        D. &copy;
+#
+#   4. The "Copyright" appears at the beginning of a line, except that it
+#      may be prefixed by any sequence (e.g., a comment) of no more than
+#      5 characters -- including white space.
+#   5. Iff such a prefix is present, the same prefix appears at the
+#      beginning of each remaining line within the FSF copyright
+#      statement.  There is one exception in order to support C-style
+#      comments: if the first line's prefix contains nothing but
+#      whitespace surrounding a "/*", then the prefix for all subsequent
+#      lines is the same as the first line's prefix except with each of
+#      "/" and possibly "*" replaced by a " ".  The replacement of "*"
+#      by " " is consistent throughout all subsequent lines.
+#   6. Blank lines, even if preceded by the prefix, do not appear
+#      within the FSF copyright statement.
+#   7. Each copyright year is 2 or 4 digits, and years are separated by
+#      commas or dashes.  Whitespace may appear after commas.
+#
+# Environment variables:
+#
+#   1. If UPDATE_COPYRIGHT_FORCE=1, a recognized FSF copyright statement
+#      is reformatted even if it does not need updating for the new
+#      year.  If unset or set to 0, only updated FSF copyright
+#      statements are reformatted.
+#   2. If UPDATE_COPYRIGHT_USE_INTERVALS=1, every series of consecutive
+#      copyright years (such as 90, 1991, 1992-2007, 2008) in a
+#      reformatted FSF copyright statement is collapsed to a single
+#      interval (such as 1990-2008).  If unset or set to 0, all existing
+#      copyright year intervals in a reformatted FSF copyright statement
+#      are expanded instead.
+#      If UPDATE_COPYRIGHT_USE_INTERVALS=2, convert a sequence with gaps
+#      to the minimal containing range.  For example, convert
+#      2000, 2004-2007, 2009 to 2000-2009.
+#   3. For testing purposes, you can set the assumed current year in
+#      UPDATE_COPYRIGHT_YEAR.
+#   4. The default maximum line length for a copyright line is 72.
+#      Set UPDATE_COPYRIGHT_MAX_LINE_LENGTH to use a different length.
+#   5. Set UPDATE_COPYRIGHT_HOLDER if the copyright holder is other
+#      than "Free Software Foundation, Inc.".
+
+use strict;
+use warnings;
+
+my $copyright_re = 'Copyright';
+my $circle_c_re = '(?:\([cC]\)|@copyright{}|&copy;)';
+my $holder = $ENV{UPDATE_COPYRIGHT_HOLDER};
+$holder ||= 'Free Software Foundation, Inc.';
+my $prefix_max = 5;
+my $margin = $ENV{UPDATE_COPYRIGHT_MAX_LINE_LENGTH};
+!$margin || $margin !~ m/^\d+$/
+  and $margin = 72;
+
+my $tab_width = 8;
+
+my $this_year = $ENV{UPDATE_COPYRIGHT_YEAR};
+if (!$this_year || $this_year !~ m/^\d{4}$/)
+  {
+    my ($sec, $min, $hour, $mday, $month, $year) = localtime (time ());
+    $this_year = $year + 1900;
+  }
+
+# Unless the file consistently uses "\r\n" as the EOL, use "\n" instead.
+my $eol = /(?:^|[^\r])\n/ ? "\n" : "\r\n";
+
+my $leading;
+my $prefix;
+my $ws_re;
+my $stmt_re;
+while (/(^|\n)(.{0,$prefix_max})$copyright_re/g)
+  {
+    $leading = "$1$2";
+    $prefix = $2;
+    if ($prefix =~ /^(\s*\/)\*(\s*)$/)
+      {
+        $prefix =~ s,/, ,;
+        my $prefix_ws = $prefix;
+        $prefix_ws =~ s/\*/ /; # Only whitespace.
+        if (/\G(?:[^*\n]|\*[^\/\n])*\*?\n$prefix_ws/)
+          {
+            $prefix = $prefix_ws;
+          }
+      }
+    $ws_re = '[ \t\r\f]'; # \s without \n
+    $ws_re =
+      "(?:$ws_re*(?:$ws_re|\\n" . quotemeta($prefix) . ")$ws_re*)";
+    my $holder_re = $holder;
+    $holder_re =~ s/\s/$ws_re/g;
+    my $stmt_remainder_re =
+      "(?:$ws_re$circle_c_re)?"
+      . "$ws_re(?:(?:\\d\\d)?\\d\\d(?:,$ws_re?|-))*"
+      . "((?:\\d\\d)?\\d\\d)$ws_re$holder_re";
+    if (/\G$stmt_remainder_re/)
+      {
+        $stmt_re =
+          quotemeta($leading) . "($copyright_re$stmt_remainder_re)";
+        last;
+      }
+  }
+if (defined $stmt_re)
+  {
+    /$stmt_re/ or die; # Should never die.
+    my $stmt = $1;
+    my $final_year_orig = $2;
+
+    # Handle two-digit year numbers like "98" and "99".
+    my $final_year = $final_year_orig;
+    $final_year <= 99
+      and $final_year += 1900;
+
+    if ($final_year != $this_year)
+      {
+        # Update the year.
+        $stmt =~ s/$final_year_orig/$final_year, $this_year/;
+      }
+    if ($final_year != $this_year || $ENV{'UPDATE_COPYRIGHT_FORCE'})
+      {
+        # Normalize all whitespace including newline-prefix sequences.
+        $stmt =~ s/$ws_re/ /g;
+
+        # Put spaces after commas.
+        $stmt =~ s/, ?/, /g;
+
+        # Convert 2-digit to 4-digit years.
+        $stmt =~ s/(\b\d\d\b)/19$1/g;
+
+        # Make the use of intervals consistent.
+        if (!$ENV{UPDATE_COPYRIGHT_USE_INTERVALS})
+          {
+            $stmt =~ s/(\d{4})-(\d{4})/join(', ', $1..$2)/eg;
+          }
+        else
+          {
+            $stmt =~
+              s/
+                (\d{4})
+                (?:
+                  (,\ |-)
+                  ((??{
+                    if    ($2 eq '-') { '\d{4}'; }
+                    elsif (!$3)       { $1 + 1;  }
+                    else              { $3 + 1;  }
+                  }))
+                )+
+              /$1-$3/gx;
+
+            # When it's 2, emit a single range encompassing all year numbers.
+            $ENV{UPDATE_COPYRIGHT_USE_INTERVALS} == 2
+              and $stmt =~ s/\b(\d{4})\b.*\b(\d{4})\b/$1-$2/;
+          }
+
+        # Format within margin.
+        my $stmt_wrapped;
+        my $text_margin = $margin - length($prefix);
+        if ($prefix =~ /^(\t+)/)
+          {
+            $text_margin -= length($1) * ($tab_width - 1);
+          }
+        while (length $stmt)
+          {
+            if (($stmt =~ s/^(.{1,$text_margin})(?: |$)//)
+                || ($stmt =~ s/^([\S]+)(?: |$)//))
+              {
+                my $line = $1;
+                $stmt_wrapped .= $stmt_wrapped ? "$eol$prefix" : $leading;
+                $stmt_wrapped .= $line;
+              }
+            else
+              {
+                # Should be unreachable, but we don't want an infinite
+                # loop if it can be reached.
+                die;
+              }
+          }
+
+        # Replace the old copyright statement.
+        s/$stmt_re/$stmt_wrapped/;
+      }
+  }
+else
+  {
+    print STDERR "$ARGV: warning: copyright statement not found\n";
+  }
+
+# Local variables:
+# mode: perl
+# indent-tabs-mode: nil
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "my $VERSION = '"
+# time-stamp-format: "%:y-%02m-%02d.%02H:%02M"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "'; # UTC"
+# End:
diff --git a/lib/cfg.mk b/lib/cfg.mk
index 068299d..d097986 100644
--- a/lib/cfg.mk
+++ b/lib/cfg.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2006, 2007, 2008, 2009, 2010 Simon Josefsson
+# Copyright (C) 2006-2012 Simon Josefsson
 #
 # This file is part of GNU SASL Library.
 #
diff --git a/lib/cram-md5/Makefile.am b/lib/cram-md5/Makefile.am
index e73726a..291c640 100644
--- a/lib/cram-md5/Makefile.am
+++ b/lib/cram-md5/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2002, 2003, 2004, 2005, 2008, 2009 Simon Josefsson
+# Copyright (C) 2002-2012 Simon Josefsson
 #
 # This file is part of GNU SASL Library.
 #
diff --git a/lib/cram-md5/challenge.c b/lib/cram-md5/challenge.c
index a42e931..baa1ace 100644
--- a/lib/cram-md5/challenge.c
+++ b/lib/cram-md5/challenge.c
@@ -1,5 +1,5 @@
 /* challenge.c --- Generate a CRAM-MD5 challenge string.
- * Copyright (C) 2002, 2003, 2004, 2008, 2009, 2011  Simon Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/cram-md5/challenge.h b/lib/cram-md5/challenge.h
index e94948a..f70d30d 100644
--- a/lib/cram-md5/challenge.h
+++ b/lib/cram-md5/challenge.h
@@ -1,5 +1,5 @@
 /* challenge.h --- Generate a CRAM-MD5 challenge string.
- * Copyright (C) 2002, 2003, 2004, 2005, 2008, 2009  Simon Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/cram-md5/client.c b/lib/cram-md5/client.c
index e8bd071..6b77a5c 100644
--- a/lib/cram-md5/client.c
+++ b/lib/cram-md5/client.c
@@ -1,5 +1,5 @@
 /* client.c --- SASL CRAM-MD5 client side functions.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/cram-md5/cram-md5.h b/lib/cram-md5/cram-md5.h
index b23078b..72246c4 100644
--- a/lib/cram-md5/cram-md5.h
+++ b/lib/cram-md5/cram-md5.h
@@ -1,5 +1,5 @@
 /* cram-md5.h --- Prototypes for CRAM-MD5 mechanism as defined in RFC 2195.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/cram-md5/digest.c b/lib/cram-md5/digest.c
index 59622fc..c154742 100644
--- a/lib/cram-md5/digest.c
+++ b/lib/cram-md5/digest.c
@@ -1,5 +1,5 @@
 /* digest.c --- Generate a CRAM-MD5 hex encoded HMAC-MD5 response string.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/cram-md5/digest.h b/lib/cram-md5/digest.h
index 9a6abd4..a8d373e 100644
--- a/lib/cram-md5/digest.h
+++ b/lib/cram-md5/digest.h
@@ -1,5 +1,5 @@
 /* digest.h --- Generate a CRAM-MD5 hex encoded HMAC-MD5 response string.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/cram-md5/mechinfo.c b/lib/cram-md5/mechinfo.c
index 1c01253..6621834 100644
--- a/lib/cram-md5/mechinfo.c
+++ b/lib/cram-md5/mechinfo.c
@@ -1,5 +1,5 @@
 /* mechinfo.c --- Definition of CRAM-MD5 mechanism.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/cram-md5/server.c b/lib/cram-md5/server.c
index 359431e..a300b89 100644
--- a/lib/cram-md5/server.c
+++ b/lib/cram-md5/server.c
@@ -1,5 +1,5 @@
 /* server.c --- SASL CRAM-MD5 server side functions.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/digest-md5/Makefile.am b/lib/digest-md5/Makefile.am
index c75ca6e..67583a2 100644
--- a/lib/digest-md5/Makefile.am
+++ b/lib/digest-md5/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Simon 
Josefsson
+# Copyright (C) 2002-2012 Simon Josefsson
 #
 # This file is part of GNU SASL Library.
 #
diff --git a/lib/digest-md5/README b/lib/digest-md5/README
index 1a6052f..d7d20c7 100644
--- a/lib/digest-md5/README
+++ b/lib/digest-md5/README
@@ -1,5 +1,5 @@
 DIGEST-MD5 README -- Notes on the implementation
-Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009  Simon Josefsson
+Copyright (C) 2004-2012 Simon Josefsson
 See the end for copying conditions.
 
 This directory hold an implementation of DIGEST-MD5.
diff --git a/lib/digest-md5/client.c b/lib/digest-md5/client.c
index f85478c..dcfb120 100644
--- a/lib/digest-md5/client.c
+++ b/lib/digest-md5/client.c
@@ -1,5 +1,5 @@
 /* client.c --- DIGEST-MD5 mechanism from RFC 2831, client side.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/digest-md5/digest-md5.h b/lib/digest-md5/digest-md5.h
index 674f1ae..f469f7f 100644
--- a/lib/digest-md5/digest-md5.h
+++ b/lib/digest-md5/digest-md5.h
@@ -1,5 +1,5 @@
 /* digest-md5.h --- Prototypes for DIGEST-MD5 mechanism as defined in RFC 2831.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/digest-md5/digesthmac.c b/lib/digest-md5/digesthmac.c
index 3cabd61..e2da6b2 100644
--- a/lib/digest-md5/digesthmac.c
+++ b/lib/digest-md5/digesthmac.c
@@ -1,5 +1,5 @@
 /* digesthmac.c --- Compute DIGEST-MD5 response value.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/digest-md5/digesthmac.h b/lib/digest-md5/digesthmac.h
index 1b7c0c6..d00a46f 100644
--- a/lib/digest-md5/digesthmac.h
+++ b/lib/digest-md5/digesthmac.h
@@ -1,5 +1,5 @@
 /* digesthmac.h --- Compute DIGEST-MD5 response value.
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009  Simon Josefsson
+ * Copyright (C) 2004-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/digest-md5/free.c b/lib/digest-md5/free.c
index 64bd3ba..f1d8928 100644
--- a/lib/digest-md5/free.c
+++ b/lib/digest-md5/free.c
@@ -1,5 +1,5 @@
 /* free.h --- Free allocated data in DIGEST-MD5 token structures.
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011  Simon Josefsson
+ * Copyright (C) 2004-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/digest-md5/free.h b/lib/digest-md5/free.h
index eb4c95b..e05b2bd 100644
--- a/lib/digest-md5/free.h
+++ b/lib/digest-md5/free.h
@@ -1,5 +1,5 @@
 /* free.h --- Free allocated data in DIGEST-MD5 token structures.
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009  Simon Josefsson
+ * Copyright (C) 2004-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/digest-md5/getsubopt.c b/lib/digest-md5/getsubopt.c
index 5edfe56..421f66d 100644
--- a/lib/digest-md5/getsubopt.c
+++ b/lib/digest-md5/getsubopt.c
@@ -1,5 +1,5 @@
 /* getsubopt.c --- Parse comma separate list into words, DIGEST-MD5 style.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  * Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc.
  * From the GNU C Library, under GNU LGPL version 2.1.
  * Contributed by Ulrich Drepper <address@hidden>, 1996.
diff --git a/lib/digest-md5/mechinfo.c b/lib/digest-md5/mechinfo.c
index 0374e42..a48b7df 100644
--- a/lib/digest-md5/mechinfo.c
+++ b/lib/digest-md5/mechinfo.c
@@ -1,5 +1,5 @@
 /* mechinfo.c --- Definition of DIGEST-MD5 mechanism.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/digest-md5/nonascii.c b/lib/digest-md5/nonascii.c
index ac6b966..669ac2b 100644
--- a/lib/digest-md5/nonascii.c
+++ b/lib/digest-md5/nonascii.c
@@ -1,5 +1,5 @@
 /* server.c --- DIGEST-MD5 mechanism from RFC 2831, server side.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/digest-md5/nonascii.h b/lib/digest-md5/nonascii.h
index ffbe89e..ac24263 100644
--- a/lib/digest-md5/nonascii.h
+++ b/lib/digest-md5/nonascii.h
@@ -1,5 +1,5 @@
 /* nonascii.h --- Prototypes for UTF-8 vs Latin-1 conversion for DIGEST-MD5
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/digest-md5/parser.c b/lib/digest-md5/parser.c
index b96a911..2c6981c 100644
--- a/lib/digest-md5/parser.c
+++ b/lib/digest-md5/parser.c
@@ -1,5 +1,5 @@
 /* parser.c --- DIGEST-MD5 parser.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/digest-md5/parser.h b/lib/digest-md5/parser.h
index 59ce2f8..6637dd9 100644
--- a/lib/digest-md5/parser.h
+++ b/lib/digest-md5/parser.h
@@ -1,5 +1,5 @@
 /* parser.h --- DIGEST-MD5 parser.
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009  Simon Josefsson
+ * Copyright (C) 2004-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/digest-md5/printer.c b/lib/digest-md5/printer.c
index 09b8e8c..0139cff 100644
--- a/lib/digest-md5/printer.c
+++ b/lib/digest-md5/printer.c
@@ -1,5 +1,5 @@
 /* printer.h --- Convert DIGEST-MD5 token structures into strings.
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009  Simon Josefsson
+ * Copyright (C) 2004-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/digest-md5/printer.h b/lib/digest-md5/printer.h
index 6005fea..ca71de1 100644
--- a/lib/digest-md5/printer.h
+++ b/lib/digest-md5/printer.h
@@ -1,5 +1,5 @@
 /* printer.h --- Convert DIGEST-MD5 token structures into strings.
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009  Simon Josefsson
+ * Copyright (C) 2004-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/digest-md5/qop.c b/lib/digest-md5/qop.c
index 4a9910f..4cb275b 100644
--- a/lib/digest-md5/qop.c
+++ b/lib/digest-md5/qop.c
@@ -1,5 +1,5 @@
 /* qop.c --- DIGEST-MD5 QOP handling.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/digest-md5/qop.h b/lib/digest-md5/qop.h
index 418f998..aaf7d4a 100644
--- a/lib/digest-md5/qop.h
+++ b/lib/digest-md5/qop.h
@@ -1,5 +1,5 @@
 /* qop.h --- Prototypes for DIGEST-MD5 qop handling.
- * Copyright (C) 2009  Simon Josefsson
+ * Copyright (C) 2009-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/digest-md5/server.c b/lib/digest-md5/server.c
index ea5ce38..ac1392d 100644
--- a/lib/digest-md5/server.c
+++ b/lib/digest-md5/server.c
@@ -1,5 +1,5 @@
 /* server.c --- DIGEST-MD5 mechanism from RFC 2831, server side.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/digest-md5/session.c b/lib/digest-md5/session.c
index 147897c..6cddd63 100644
--- a/lib/digest-md5/session.c
+++ b/lib/digest-md5/session.c
@@ -1,5 +1,5 @@
 /* session.c --- Data integrity/privacy protection of DIGEST-MD5.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/digest-md5/session.h b/lib/digest-md5/session.h
index c648b0c..840548f 100644
--- a/lib/digest-md5/session.h
+++ b/lib/digest-md5/session.h
@@ -1,5 +1,5 @@
 /* session.h --- Data integrity/privacy protection of DIGEST-MD5.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/digest-md5/test-parser.c b/lib/digest-md5/test-parser.c
index 77a3d22..0ca13d9 100644
--- a/lib/digest-md5/test-parser.c
+++ b/lib/digest-md5/test-parser.c
@@ -1,5 +1,5 @@
 /* test-parser.c --- Self tests of DIGEST-MD5 parser & printer.
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009  Simon Josefsson
+ * Copyright (C) 2004-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/digest-md5/tokens.h b/lib/digest-md5/tokens.h
index c1c2fda..5d6b0c3 100644
--- a/lib/digest-md5/tokens.h
+++ b/lib/digest-md5/tokens.h
@@ -1,5 +1,5 @@
 /* tokens.h --- Types for DIGEST-MD5 tokens.
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009  Simon Josefsson
+ * Copyright (C) 2004-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/digest-md5/validate.c b/lib/digest-md5/validate.c
index fba487e..cf56ea8 100644
--- a/lib/digest-md5/validate.c
+++ b/lib/digest-md5/validate.c
@@ -1,5 +1,5 @@
 /* validate.c --- Validate consistency of DIGEST-MD5 tokens.
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009  Simon Josefsson
+ * Copyright (C) 2004-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/digest-md5/validate.h b/lib/digest-md5/validate.h
index e23ea74..ca0fc0a 100644
--- a/lib/digest-md5/validate.h
+++ b/lib/digest-md5/validate.h
@@ -1,5 +1,5 @@
 /* validate.h --- Validate consistency of DIGEST-MD5 tokens.
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009  Simon Josefsson
+ * Copyright (C) 2004-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/external/Makefile.am b/lib/external/Makefile.am
index 03ae183..fe1a0a4 100644
--- a/lib/external/Makefile.am
+++ b/lib/external/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Simon Josefsson
+# Copyright (C) 2002-2012 Simon Josefsson
 #
 # This file is part of GNU SASL Library.
 #
diff --git a/lib/external/client.c b/lib/external/client.c
index 503a92f..4cb4538 100644
--- a/lib/external/client.c
+++ b/lib/external/client.c
@@ -1,5 +1,5 @@
 /* client.c --- EXTERNAL mechanism as defined in RFC 2222, client side.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/external/external.h b/lib/external/external.h
index c2ca127..f4664c8 100644
--- a/lib/external/external.h
+++ b/lib/external/external.h
@@ -1,5 +1,5 @@
 /* external.h --- Prototypes for EXTERNAL mechanism as defined in RFC 2222.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/external/mechinfo.c b/lib/external/mechinfo.c
index 847e982..7a18d6c 100644
--- a/lib/external/mechinfo.c
+++ b/lib/external/mechinfo.c
@@ -1,5 +1,5 @@
 /* mechinfo.c --- Definition of EXTERNAL mechanism.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/external/server.c b/lib/external/server.c
index d70d98b..545f784 100644
--- a/lib/external/server.c
+++ b/lib/external/server.c
@@ -1,5 +1,5 @@
 /* server.c --- EXTERNAL mechanism as defined in RFC 2222, server side.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/gs2/Makefile.am b/lib/gs2/Makefile.am
index d11c4f4..d86f342 100644
--- a/lib/gs2/Makefile.am
+++ b/lib/gs2/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2006, 2008, 2009, 2010 Simon Josefsson.
+# Copyright (C) 2006-2012 Simon Josefsson.
 #
 # This file is part of GNU SASL Library.
 #
diff --git a/lib/gs2/client.c b/lib/gs2/client.c
index 0a5bf25..5510543 100644
--- a/lib/gs2/client.c
+++ b/lib/gs2/client.c
@@ -1,5 +1,5 @@
 /* client.c --- SASL mechanism GS2, client side.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2010  Simon Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/gs2/gs2.h b/lib/gs2/gs2.h
index 22012c8..294819b 100644
--- a/lib/gs2/gs2.h
+++ b/lib/gs2/gs2.h
@@ -1,5 +1,5 @@
 /* gs2.h --- Prototypes for SASL mechanism GS2.
- * Copyright (C) 2006, 2010  Simon Josefsson
+ * Copyright (C) 2006-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/gs2/gs2helper.c b/lib/gs2/gs2helper.c
index 9b56cbb..40cba64 100644
--- a/lib/gs2/gs2helper.c
+++ b/lib/gs2/gs2helper.c
@@ -1,5 +1,5 @@
 /* gs2helper.c --- GS2 helper functions common to client and server.
- * Copyright (C) 2010  Simon Josefsson
+ * Copyright (C) 2010-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/gs2/gs2helper.h b/lib/gs2/gs2helper.h
index 6adc75f..76a072d 100644
--- a/lib/gs2/gs2helper.h
+++ b/lib/gs2/gs2helper.h
@@ -1,5 +1,5 @@
 /* gs2helper.h --- GS2 helper functions common to client and server.
- * Copyright (C) 2010  Simon Josefsson
+ * Copyright (C) 2010-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/gs2/mechinfo.c b/lib/gs2/mechinfo.c
index c8319e6..0058f79 100644
--- a/lib/gs2/mechinfo.c
+++ b/lib/gs2/mechinfo.c
@@ -1,5 +1,5 @@
 /* mechinfo.c --- Definition of GS2 mechanism.
- * Copyright (C) 2006, 2010 Simon Josefsson
+ * Copyright (C) 2006-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/gs2/server.c b/lib/gs2/server.c
index f866442..14a8788 100644
--- a/lib/gs2/server.c
+++ b/lib/gs2/server.c
@@ -1,5 +1,5 @@
 /* server.c --- SASL mechanism GS2, server side.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2010  Simon Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/gssapi/Makefile.am b/lib/gssapi/Makefile.am
index 4d020a0..3946d15 100644
--- a/lib/gssapi/Makefile.am
+++ b/lib/gssapi/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Simon 
Josefsson
+# Copyright (C) 2002-2012 Simon Josefsson
 #
 # This file is part of GNU SASL Library.
 #
diff --git a/lib/gssapi/client.c b/lib/gssapi/client.c
index f9a7bfa..e0229ce 100644
--- a/lib/gssapi/client.c
+++ b/lib/gssapi/client.c
@@ -1,5 +1,5 @@
 /* client.c --- SASL mechanism GSSAPI as defined in RFC 4752, client side.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/gssapi/mechinfo.c b/lib/gssapi/mechinfo.c
index 229380c..73a14c5 100644
--- a/lib/gssapi/mechinfo.c
+++ b/lib/gssapi/mechinfo.c
@@ -1,5 +1,5 @@
 /* mechinfo.c --- Definition of GSSAPI mechanism.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/gssapi/server.c b/lib/gssapi/server.c
index dc05a6f..24f20fa 100644
--- a/lib/gssapi/server.c
+++ b/lib/gssapi/server.c
@@ -1,5 +1,5 @@
 /* server.c --- SASL mechanism GSSAPI as defined in RFC 4752, server side.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/gssapi/x-gssapi.h b/lib/gssapi/x-gssapi.h
index d99362c..3ef9b83 100644
--- a/lib/gssapi/x-gssapi.h
+++ b/lib/gssapi/x-gssapi.h
@@ -1,5 +1,5 @@
 /* x-gssapi.h --- Prototypes for SASL mechanism GSSAPI as defined in RFC 2222.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/kerberos_v5/Makefile.am b/lib/kerberos_v5/Makefile.am
index 376c12c..97603b1 100644
--- a/lib/kerberos_v5/Makefile.am
+++ b/lib/kerberos_v5/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2002, 2003, 2004, 2008, 2009 Simon Josefsson.
+# Copyright (C) 2002-2012 Simon Josefsson.
 #
 # This file is part of GNU SASL Library.
 #
diff --git a/lib/kerberos_v5/client.c b/lib/kerberos_v5/client.c
index a5681fd..a0e321e 100644
--- a/lib/kerberos_v5/client.c
+++ b/lib/kerberos_v5/client.c
@@ -1,5 +1,5 @@
 /* client.c --- Experimental SASL mechanism KERBEROS_V5, client side.
- * Copyright (C) 2003, 2004  Simon Josefsson
+ * Copyright (C) 2003-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/kerberos_v5/kerberos_v5.c b/lib/kerberos_v5/kerberos_v5.c
index c28dbc4..0b42bb1 100644
--- a/lib/kerberos_v5/kerberos_v5.c
+++ b/lib/kerberos_v5/kerberos_v5.c
@@ -1,5 +1,5 @@
 /* kerberos_v5.c --- Implementation of experimental SASL mechanism KERBEROS_V5.
- * Copyright (C) 2003, 2004, 2009  Simon Josefsson
+ * Copyright (C) 2003-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/kerberos_v5/kerberos_v5.h b/lib/kerberos_v5/kerberos_v5.h
index a479c57..4fddccb 100644
--- a/lib/kerberos_v5/kerberos_v5.h
+++ b/lib/kerberos_v5/kerberos_v5.h
@@ -1,5 +1,5 @@
 /* kerberos_v5.h --- Prototypes for experimental SASL mechanism KERBEROS_V5.
- * Copyright (C) 2003, 2004  Simon Josefsson
+ * Copyright (C) 2003-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/kerberos_v5/server.c b/lib/kerberos_v5/server.c
index 54ca9f9..92db6f7 100644
--- a/lib/kerberos_v5/server.c
+++ b/lib/kerberos_v5/server.c
@@ -1,5 +1,5 @@
 /* server.c --- Experimental SASL mechanism KERBEROS_V5, server side.
- * Copyright (C) 2003, 2004, 2009  Simon Josefsson
+ * Copyright (C) 2003-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/kerberos_v5/shared.h b/lib/kerberos_v5/shared.h
index 727bc07..cb452c1 100644
--- a/lib/kerberos_v5/shared.h
+++ b/lib/kerberos_v5/shared.h
@@ -1,5 +1,5 @@
 /* shared.h --- Experimental SASL mechanism KERBEROS_V5, shared definitions.
- * Copyright (C) 2003, 2004  Simon Josefsson
+ * Copyright (C) 2003-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/libgsasl.pc.in b/lib/libgsasl.pc.in
index 92678dc..a50fdce 100644
--- a/lib/libgsasl.pc.in
+++ b/lib/libgsasl.pc.in
@@ -1,5 +1,5 @@
 # Process this file with autoconf to produce a pkg-config metadata file.
-# Copyright 2002-2011  Simon Josefsson
+# Copyright 2002-2012 Simon Josefsson
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/lib/login/Makefile.am b/lib/login/Makefile.am
index e30f344..9095068 100644
--- a/lib/login/Makefile.am
+++ b/lib/login/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon Josefsson
+# Copyright (C) 2002-2012 Simon Josefsson
 #
 # This file is part of GNU SASL Library.
 #
diff --git a/lib/login/client.c b/lib/login/client.c
index 435451d..21eca5c 100644
--- a/lib/login/client.c
+++ b/lib/login/client.c
@@ -1,5 +1,5 @@
 /* client.c --- Non-standard SASL mechanism LOGIN, client side.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/login/login.h b/lib/login/login.h
index d8b1156..2da733d 100644
--- a/lib/login/login.h
+++ b/lib/login/login.h
@@ -1,5 +1,5 @@
 /* login.h --- Prototypes for non-standard SASL mechanism LOGIN.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/login/mechinfo.c b/lib/login/mechinfo.c
index f56455c..634d932 100644
--- a/lib/login/mechinfo.c
+++ b/lib/login/mechinfo.c
@@ -1,5 +1,5 @@
 /* mechinfo.c --- Definition of LOGIN mechanism.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/login/server.c b/lib/login/server.c
index bff0455..b4cb9be 100644
--- a/lib/login/server.c
+++ b/lib/login/server.c
@@ -1,5 +1,5 @@
 /* server.c --- Non-standard SASL mechanism LOGIN, server side.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/ntlm/Makefile.am b/lib/ntlm/Makefile.am
index ef096e0..a70b93e 100644
--- a/lib/ntlm/Makefile.am
+++ b/lib/ntlm/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Simon Josefsson
+# Copyright (C) 2002-2012 Simon Josefsson
 #
 # This file is part of GNU SASL Library.
 #
diff --git a/lib/ntlm/mechinfo.c b/lib/ntlm/mechinfo.c
index 4c7cdc0..4aac5ec 100644
--- a/lib/ntlm/mechinfo.c
+++ b/lib/ntlm/mechinfo.c
@@ -1,5 +1,5 @@
 /* mechinfo.c --- Definition of NTLM mechanism.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/ntlm/ntlm.c b/lib/ntlm/ntlm.c
index 9b8abf8..ac05416 100644
--- a/lib/ntlm/ntlm.c
+++ b/lib/ntlm/ntlm.c
@@ -1,5 +1,5 @@
 /* ntlm.c --- Implementation of non-standard SASL mechanism NTLM, client side.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/ntlm/x-ntlm.h b/lib/ntlm/x-ntlm.h
index 510f61d..f2fde33 100644
--- a/lib/ntlm/x-ntlm.h
+++ b/lib/ntlm/x-ntlm.h
@@ -1,5 +1,5 @@
 /* x-ntlm.h --- Prototypes for non-standard SASL mechanism NTLM.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/openid20/Makefile.am b/lib/openid20/Makefile.am
index 964cbd7..483238f 100644
--- a/lib/openid20/Makefile.am
+++ b/lib/openid20/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2011  Simon Josefsson
+# Copyright (C) 2011-2012 Simon Josefsson
 #
 # This file is part of GNU SASL Library.
 #
diff --git a/lib/openid20/client.c b/lib/openid20/client.c
index df3afd4..52a682d 100644
--- a/lib/openid20/client.c
+++ b/lib/openid20/client.c
@@ -1,5 +1,5 @@
 /* client.c --- OPENID20 mechanism, client side.
- * Copyright (C) 2011  Simon Josefsson
+ * Copyright (C) 2011-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/openid20/mechinfo.c b/lib/openid20/mechinfo.c
index a0ade07..e2bea7b 100644
--- a/lib/openid20/mechinfo.c
+++ b/lib/openid20/mechinfo.c
@@ -1,5 +1,5 @@
 /* mechinfo.c --- Definition of OPENID20 mechanism.
- * Copyright (C) 2011  Simon Josefsson
+ * Copyright (C) 2011-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/openid20/openid20.h b/lib/openid20/openid20.h
index ada5828..21ccf52 100644
--- a/lib/openid20/openid20.h
+++ b/lib/openid20/openid20.h
@@ -1,5 +1,5 @@
 /* openid20.h --- Prototypes for OPENID20.
- * Copyright (C) 2011  Simon Josefsson
+ * Copyright (C) 2011-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/openid20/server.c b/lib/openid20/server.c
index c0d7679..2b3275a 100644
--- a/lib/openid20/server.c
+++ b/lib/openid20/server.c
@@ -1,5 +1,5 @@
 /* server.c --- OPENID20 mechanism, server side.
- * Copyright (C) 2011  Simon Josefsson
+ * Copyright (C) 2011-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/plain/Makefile.am b/lib/plain/Makefile.am
index 97e7e83..5e09a8b 100644
--- a/lib/plain/Makefile.am
+++ b/lib/plain/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Simon Josefsson
+# Copyright (C) 2002-2012 Simon Josefsson
 #
 # This file is part of GNU SASL Library.
 #
diff --git a/lib/plain/client.c b/lib/plain/client.c
index a3bc119..1da2ad3 100644
--- a/lib/plain/client.c
+++ b/lib/plain/client.c
@@ -1,5 +1,5 @@
 /* client.c --- SASL mechanism PLAIN as defined in RFC 2595, client side.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 2009  Simon Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/plain/mechinfo.c b/lib/plain/mechinfo.c
index 035dcfe..9035763 100644
--- a/lib/plain/mechinfo.c
+++ b/lib/plain/mechinfo.c
@@ -1,5 +1,5 @@
 /* mechinfo.c --- Definition of PLAIN mechanism.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/plain/plain.h b/lib/plain/plain.h
index 46352cb..abdfa55 100644
--- a/lib/plain/plain.h
+++ b/lib/plain/plain.h
@@ -1,5 +1,5 @@
 /* plain.h --- Prototypes for SASL mechanism PLAIN as defined in RFC 2595.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/plain/server.c b/lib/plain/server.c
index f6565be..1d79506 100644
--- a/lib/plain/server.c
+++ b/lib/plain/server.c
@@ -1,5 +1,5 @@
 /* server.c --- SASL mechanism PLAIN as defined in RFC 2595, server side.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/saml20/Makefile.am b/lib/saml20/Makefile.am
index ae3e27f..ac35cd2 100644
--- a/lib/saml20/Makefile.am
+++ b/lib/saml20/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2010  Simon Josefsson
+# Copyright (C) 2010-2012 Simon Josefsson
 #
 # This file is part of GNU SASL Library.
 #
diff --git a/lib/saml20/mechinfo.c b/lib/saml20/mechinfo.c
index ab6412f..0c13277 100644
--- a/lib/saml20/mechinfo.c
+++ b/lib/saml20/mechinfo.c
@@ -1,5 +1,5 @@
 /* mechinfo.c --- Definition of SAML20 mechanism.
- * Copyright (C) 2010  Simon Josefsson
+ * Copyright (C) 2010-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/saml20/saml20.h b/lib/saml20/saml20.h
index 648b1a4..c481e36 100644
--- a/lib/saml20/saml20.h
+++ b/lib/saml20/saml20.h
@@ -1,5 +1,5 @@
 /* saml20.h --- Prototypes for SAML20.
- * Copyright (C) 2010  Simon Josefsson
+ * Copyright (C) 2010-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/saml20/server.c b/lib/saml20/server.c
index cc4fd6e..e29e21a 100644
--- a/lib/saml20/server.c
+++ b/lib/saml20/server.c
@@ -1,5 +1,5 @@
 /* server.c --- SAML20 mechanism, server side.
- * Copyright (C) 2010  Simon Josefsson
+ * Copyright (C) 2010-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/scram/Makefile.am b/lib/scram/Makefile.am
index ee54640..991a16e 100644
--- a/lib/scram/Makefile.am
+++ b/lib/scram/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 Simon Josefsson
+# Copyright (C) 2009-2012 Simon Josefsson
 #
 # This file is part of GNU SASL Library.
 #
diff --git a/lib/scram/client.c b/lib/scram/client.c
index 9f8e983..fb5157f 100644
--- a/lib/scram/client.c
+++ b/lib/scram/client.c
@@ -1,5 +1,5 @@
 /* client.c --- SASL SCRAM client side functions.
- * Copyright (C) 2009, 2010  Simon Josefsson
+ * Copyright (C) 2009-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/scram/mechinfo.c b/lib/scram/mechinfo.c
index c83350a..cd407ea 100644
--- a/lib/scram/mechinfo.c
+++ b/lib/scram/mechinfo.c
@@ -1,5 +1,5 @@
 /* mechinfo.c --- Definition of SCRAM mechanism.
- * Copyright (C) 2009, 2010  Simon Josefsson
+ * Copyright (C) 2009-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/scram/parser.c b/lib/scram/parser.c
index 616438b..057f43a 100644
--- a/lib/scram/parser.c
+++ b/lib/scram/parser.c
@@ -1,5 +1,5 @@
 /* parser.c --- SCRAM parser.
- * Copyright (C) 2009, 2010  Simon Josefsson
+ * Copyright (C) 2009-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/scram/parser.h b/lib/scram/parser.h
index a43f8d7..7f398cc 100644
--- a/lib/scram/parser.h
+++ b/lib/scram/parser.h
@@ -1,5 +1,5 @@
 /* parser.h --- SCRAM parser.
- * Copyright (C) 2009  Simon Josefsson
+ * Copyright (C) 2009-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/scram/printer.c b/lib/scram/printer.c
index 95135de..adb8be8 100644
--- a/lib/scram/printer.c
+++ b/lib/scram/printer.c
@@ -1,5 +1,5 @@
 /* printer.h --- Convert SCRAM token structures into strings.
- * Copyright (C) 2009, 2010  Simon Josefsson
+ * Copyright (C) 2009-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/scram/printer.h b/lib/scram/printer.h
index d4a0cb3..ec0e43d 100644
--- a/lib/scram/printer.h
+++ b/lib/scram/printer.h
@@ -1,5 +1,5 @@
 /* printer.h --- Convert SCRAM token structures into strings.
- * Copyright (C) 2009  Simon Josefsson
+ * Copyright (C) 2009-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/scram/scram.h b/lib/scram/scram.h
index 20b157d..ef8d557 100644
--- a/lib/scram/scram.h
+++ b/lib/scram/scram.h
@@ -1,5 +1,5 @@
 /* scram.h --- Prototypes for SCRAM mechanism
- * Copyright (C) 2009, 2010  Simon Josefsson
+ * Copyright (C) 2009-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/scram/server.c b/lib/scram/server.c
index 710868a..45faade 100644
--- a/lib/scram/server.c
+++ b/lib/scram/server.c
@@ -1,5 +1,5 @@
 /* server.c --- SASL CRAM-MD5 server side functions.
- * Copyright (C) 2009, 2010  Simon Josefsson
+ * Copyright (C) 2009-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/scram/tokens.c b/lib/scram/tokens.c
index 7b4a319..131ae09 100644
--- a/lib/scram/tokens.c
+++ b/lib/scram/tokens.c
@@ -1,5 +1,5 @@
 /* tokens.c --- Free allocated data in SCRAM tokens.
- * Copyright (C) 2009  Simon Josefsson
+ * Copyright (C) 2009-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/scram/tokens.h b/lib/scram/tokens.h
index db4edb2..4b48d9a 100644
--- a/lib/scram/tokens.h
+++ b/lib/scram/tokens.h
@@ -1,5 +1,5 @@
 /* tokens.h --- Types for SCRAM tokens.
- * Copyright (C) 2009  Simon Josefsson
+ * Copyright (C) 2009-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/scram/validate.c b/lib/scram/validate.c
index a25092b..6fa5fd2 100644
--- a/lib/scram/validate.c
+++ b/lib/scram/validate.c
@@ -1,5 +1,5 @@
 /* validate.c --- Validate consistency of SCRAM tokens.
- * Copyright (C) 2009, 2010  Simon Josefsson
+ * Copyright (C) 2009-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/scram/validate.h b/lib/scram/validate.h
index ba76896..a641adb 100644
--- a/lib/scram/validate.h
+++ b/lib/scram/validate.h
@@ -1,5 +1,5 @@
 /* validate.h --- Validate consistency of SCRAM tokens.
- * Copyright (C) 2009  Simon Josefsson
+ * Copyright (C) 2009-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/securid/Makefile.am b/lib/securid/Makefile.am
index 09db8e6..8e9d455 100644
--- a/lib/securid/Makefile.am
+++ b/lib/securid/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Simon Josefsson
+# Copyright (C) 2002-2012 Simon Josefsson
 #
 # This file is part of GNU SASL Library.
 #
diff --git a/lib/securid/client.c b/lib/securid/client.c
index be41c8f..8d10da3 100644
--- a/lib/securid/client.c
+++ b/lib/securid/client.c
@@ -1,5 +1,5 @@
 /* client.c --- SASL mechanism SECURID from RFC 2808, client side.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2008, 2009  Simon Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/securid/mechinfo.c b/lib/securid/mechinfo.c
index 8fb96aa..9b8b722 100644
--- a/lib/securid/mechinfo.c
+++ b/lib/securid/mechinfo.c
@@ -1,5 +1,5 @@
 /* mechinfo.c --- Definition of SECURID mechanism.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2008, 2009  Simon Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/securid/securid.h b/lib/securid/securid.h
index dd3130f..34a5e3a 100644
--- a/lib/securid/securid.h
+++ b/lib/securid/securid.h
@@ -1,5 +1,5 @@
 /* securid.h --- Prototypes for SASL mechanism SECURID as defined in RFC 2808.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2008, 2009  Simon Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/securid/server.c b/lib/securid/server.c
index 37408a1..21d2bf3 100644
--- a/lib/securid/server.c
+++ b/lib/securid/server.c
@@ -1,5 +1,5 @@
 /* server.c --- SASL mechanism SECURID from RFC 2808, server side.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2008, 2009  Simon Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/src/Makefile.am b/lib/src/Makefile.am
index 717e838..c268f43 100644
--- a/lib/src/Makefile.am
+++ b/lib/src/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 
Simon Josefsson
+# Copyright (C) 2002-2012 Simon Josefsson
 #
 # This file is part of GNU SASL Library.
 #
diff --git a/lib/src/base64.c b/lib/src/base64.c
index e1a4784..6842f16 100644
--- a/lib/src/base64.c
+++ b/lib/src/base64.c
@@ -1,5 +1,5 @@
 /* base64.c --- Base64 encoding/decoding functions.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/src/callback.c b/lib/src/callback.c
index 43f1801..dc7c942 100644
--- a/lib/src/callback.c
+++ b/lib/src/callback.c
@@ -1,5 +1,5 @@
 /* callback.c --- Callback handling.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/src/crypto.c b/lib/src/crypto.c
index 9e1f5db..1b456a0 100644
--- a/lib/src/crypto.c
+++ b/lib/src/crypto.c
@@ -1,5 +1,5 @@
 /* crypto.c --- Simple crypto wrappers for applications.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/src/done.c b/lib/src/done.c
index 250c14c..abc9541 100644
--- a/lib/src/done.c
+++ b/lib/src/done.c
@@ -1,5 +1,5 @@
 /* done.c --- Exit point for libgsasl.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/src/error.c b/lib/src/error.c
index 8b4873e..725d91a 100644
--- a/lib/src/error.c
+++ b/lib/src/error.c
@@ -1,5 +1,5 @@
 /* error.c --- Error handling functionality.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011  
Simon Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/src/free.c b/lib/src/free.c
index 4bc159c..5389675 100644
--- a/lib/src/free.c
+++ b/lib/src/free.c
@@ -1,5 +1,5 @@
 /* free.c --- Wrapper around the `free' function, primarily for Windows
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009  Simon Josefsson
+ * Copyright (C) 2004-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/src/gsasl-compat.h b/lib/src/gsasl-compat.h
index b3d8bf7..396f588 100644
--- a/lib/src/gsasl-compat.h
+++ b/lib/src/gsasl-compat.h
@@ -1,5 +1,5 @@
 /* gsasl-compat.h --- Header file for obsoleted features in GNU SASL Library.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/src/gsasl-mech.h b/lib/src/gsasl-mech.h
index 20b7d79..6a6cedf 100644
--- a/lib/src/gsasl-mech.h
+++ b/lib/src/gsasl-mech.h
@@ -1,5 +1,5 @@
 /* gsasl-mech.h --- Header file for mechanism handling in GNU SASL Library.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/src/gsasl.h b/lib/src/gsasl.h
index 4ba3162..099c2c4 100644
--- a/lib/src/gsasl.h
+++ b/lib/src/gsasl.h
@@ -1,5 +1,5 @@
 /* gsasl.h --- Header file for GNU SASL Library.
- * Copyright (C) 2002-2011  Simon Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/src/init.c b/lib/src/init.c
index 318d18e..354bce9 100644
--- a/lib/src/init.c
+++ b/lib/src/init.c
@@ -1,5 +1,5 @@
 /* init.c --- Entry point for libgsasl.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011  
Simon Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/src/internal.h b/lib/src/internal.h
index dc9e6bd..c98a06d 100644
--- a/lib/src/internal.h
+++ b/lib/src/internal.h
@@ -1,5 +1,5 @@
 /* internal.h --- Internal header with hidden library handle structures.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011  
Simon Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/src/libgsasl.map b/lib/src/libgsasl.map
index 26fcbc9..01a7d93 100644
--- a/lib/src/libgsasl.map
+++ b/lib/src/libgsasl.map
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 Simon Josefsson
+# Copyright (C) 2009-2012 Simon Josefsson
 #
 # This file is part of GNU SASL Library.
 #
diff --git a/lib/src/listmech.c b/lib/src/listmech.c
index 5d4f8cb..72f3742 100644
--- a/lib/src/listmech.c
+++ b/lib/src/listmech.c
@@ -1,5 +1,5 @@
 /* listmech.c --- List active client and server mechanisms.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/src/md5pwd.c b/lib/src/md5pwd.c
index ba44ffd..aee0538 100644
--- a/lib/src/md5pwd.c
+++ b/lib/src/md5pwd.c
@@ -1,5 +1,5 @@
 /* md5pwd.c --- Find passwords in UoW imapd MD5 type password files.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/src/mechname.c b/lib/src/mechname.c
index f00d49b..913c30a 100644
--- a/lib/src/mechname.c
+++ b/lib/src/mechname.c
@@ -1,5 +1,5 @@
 /* mechname.c --- Get name of SASL mechanism used in a session.
- * Copyright (C) 2008, 2009  Simon Josefsson
+ * Copyright (C) 2008-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/src/obsolete.c b/lib/src/obsolete.c
index c5d0e8c..0fd4bc3 100644
--- a/lib/src/obsolete.c
+++ b/lib/src/obsolete.c
@@ -1,5 +1,5 @@
 /* obsolete.c --- Obsolete functions kept around for backwards compatibility.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/src/property.c b/lib/src/property.c
index a01cfa9..40e3053 100644
--- a/lib/src/property.c
+++ b/lib/src/property.c
@@ -1,5 +1,5 @@
 /* property.c --- Callback property handling.
- * Copyright (C) 2004-2011  Simon Josefsson
+ * Copyright (C) 2004-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/src/register.c b/lib/src/register.c
index dafb715..ffe6e1f 100644
--- a/lib/src/register.c
+++ b/lib/src/register.c
@@ -1,5 +1,5 @@
 /* register.c --- Initialize and register SASL plugin in global context.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/src/saslprep.c b/lib/src/saslprep.c
index f5e178d..8926d06 100644
--- a/lib/src/saslprep.c
+++ b/lib/src/saslprep.c
@@ -1,5 +1,5 @@
 /* saslprep.c --- Internationalized SASL string processing.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/src/suggest.c b/lib/src/suggest.c
index 46c9dc1..eadb280 100644
--- a/lib/src/suggest.c
+++ b/lib/src/suggest.c
@@ -1,5 +1,5 @@
 /* suggest.c --- Suggest client mechanism to use, from a set of mechanisms.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/src/supportp.c b/lib/src/supportp.c
index 86a8b58..2452950 100644
--- a/lib/src/supportp.c
+++ b/lib/src/supportp.c
@@ -1,5 +1,5 @@
 /* supportp.c --- Tell if a specific mechanism is supported.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/src/version.c b/lib/src/version.c
index 7c7a721..d38f30f 100644
--- a/lib/src/version.c
+++ b/lib/src/version.c
@@ -1,5 +1,5 @@
 /* version.c -- Version handling.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/src/xcode.c b/lib/src/xcode.c
index 9764307..304dbbb 100644
--- a/lib/src/xcode.c
+++ b/lib/src/xcode.c
@@ -1,5 +1,5 @@
 /* xcode.c --- Encode and decode application payload in libgsasl session.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/src/xfinish.c b/lib/src/xfinish.c
index 17a3c9a..e9901e9 100644
--- a/lib/src/xfinish.c
+++ b/lib/src/xfinish.c
@@ -1,5 +1,5 @@
 /* xfinish.c --- Finish libgsasl session.
- * Copyright (C) 2002-2011  Simon Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/src/xstart.c b/lib/src/xstart.c
index 589f29d..94a8605 100644
--- a/lib/src/xstart.c
+++ b/lib/src/xstart.c
@@ -1,5 +1,5 @@
 /* xstart.c --- Start libgsasl session.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/src/xstep.c b/lib/src/xstep.c
index 0e08a98..05721c5 100644
--- a/lib/src/xstep.c
+++ b/lib/src/xstep.c
@@ -1,5 +1,5 @@
 /* xstep.c --- Perform one SASL authentication step.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/lib/tests/Makefile.am b/lib/tests/Makefile.am
index dbf4d44..f290a09 100644
--- a/lib/tests/Makefile.am
+++ b/lib/tests/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Simon 
Josefsson
+# Copyright (C) 2002-2012 Simon Josefsson
 #
 # This file is part of GNU SASL Library.
 #
diff --git a/lib/tests/test-error.c b/lib/tests/test-error.c
index b6e66dd..ba04ee1 100644
--- a/lib/tests/test-error.c
+++ b/lib/tests/test-error.c
@@ -1,5 +1,5 @@
 /* test-error.c --- Check consistency of error.c error definitions.
- * Copyright (C) 2008-2011  Simon Josefsson
+ * Copyright (C) 2008-2012 Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
diff --git a/m4/gtk-doc.m4 b/m4/gtk-doc.m4
index 2cfa1e7..e337492 100644
--- a/m4/gtk-doc.m4
+++ b/m4/gtk-doc.m4
@@ -6,6 +6,7 @@ dnl Usage:
 dnl   GTK_DOC_CHECK([minimum-gtk-doc-version])
 AC_DEFUN([GTK_DOC_CHECK],
 [
+  AC_REQUIRE([PKG_PROG_PKG_CONFIG])
   AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
   AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
 
diff --git a/src/Makefile.am b/src/Makefile.am
index f7fbaeb..bbc5eeb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008, 2009 Simon Josefsson
+# Copyright (C) 2002-2012 Simon Josefsson
 #
 # This file is part of GNU SASL.
 #
diff --git a/src/callbacks.c b/src/callbacks.c
index 6818d77..cfdd942 100644
--- a/src/callbacks.c
+++ b/src/callbacks.c
@@ -1,5 +1,5 @@
 /* callbacks.c --- Implementation of gsasl callbacks.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011  
Simon Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL.
  *
diff --git a/src/callbacks.h b/src/callbacks.h
index d4f2099..42b8b6a 100644
--- a/src/callbacks.h
+++ b/src/callbacks.h
@@ -1,5 +1,5 @@
 /* callbacks.h --- Prototypes for SASL callbacks.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL.
  *
diff --git a/src/gsasl.ggo b/src/gsasl.ggo
index 4842b27..b5c31ad 100644
--- a/src/gsasl.ggo
+++ b/src/gsasl.ggo
@@ -1,4 +1,4 @@
-# Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010 Simon Josefsson
+# Copyright (C) 2002-2012 Simon Josefsson
 #
 # This file is part of GNU SASL.
 #
diff --git a/src/imap.c b/src/imap.c
index 7b043ab..6c1c0c4 100644
--- a/src/imap.c
+++ b/src/imap.c
@@ -1,5 +1,5 @@
 /* imap.c --- Implement IMAP profile of SASL login.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL.
  *
diff --git a/src/imap.h b/src/imap.h
index 66b0459..f8e3dde 100644
--- a/src/imap.h
+++ b/src/imap.h
@@ -1,5 +1,5 @@
 /* imap.h --- Header file for IMAP profile of SASL login.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL.
  *
diff --git a/src/internal.h b/src/internal.h
index ef6c8de..b3c1a80 100644
--- a/src/internal.h
+++ b/src/internal.h
@@ -1,5 +1,5 @@
 /* internal.h --- internal header file for gsasl
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL.
  *
diff --git a/src/smtp.c b/src/smtp.c
index b14ab33..61391e8 100644
--- a/src/smtp.c
+++ b/src/smtp.c
@@ -1,5 +1,5 @@
 /* smtp.c --- Implement SMTP profile of SASL login.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL.
  *
diff --git a/src/smtp.h b/src/smtp.h
index 9eb0869..f2718ce 100644
--- a/src/smtp.h
+++ b/src/smtp.h
@@ -1,5 +1,5 @@
 /* smtp.h --- Header file for SMTP profile of SASL login.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL.
  *
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1c5183e..4c52fdb 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2002-2011 Simon Josefsson
+# Copyright (C) 2002-2012 Simon Josefsson
 #
 # This file is part of GNU SASL.
 #
diff --git a/tests/cram-md5.c b/tests/cram-md5.c
index 0abe6a4..489a7ae 100644
--- a/tests/cram-md5.c
+++ b/tests/cram-md5.c
@@ -1,5 +1,5 @@
 /* cram-md5.c --- Test the CRAM-MD5 mechanism.
- * Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL.
  *
diff --git a/tests/crypto.c b/tests/crypto.c
index af2802e..8090d06 100644
--- a/tests/crypto.c
+++ b/tests/crypto.c
@@ -1,5 +1,5 @@
 /* crypto.c --- Test the crypto related SASL functions.
- * Copyright (C) 2009  Simon Josefsson
+ * Copyright (C) 2009-2012 Simon Josefsson
  *
  * This file is part of GNU SASL.
  *
diff --git a/tests/digest-md5.c b/tests/digest-md5.c
index b83378b..45df013 100644
--- a/tests/digest-md5.c
+++ b/tests/digest-md5.c
@@ -1,5 +1,5 @@
 /* digest-md5.c --- Test the DIGEST-MD5 mechanism.
- * Copyright (C) 2002, 2003, 2004, 2007, 2008, 2009, 2010  Simon Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL.
  *
diff --git a/tests/errors.c b/tests/errors.c
index 0224411..64de6a3 100644
--- a/tests/errors.c
+++ b/tests/errors.c
@@ -1,5 +1,5 @@
 /* errors.c --- Test the gsasl_strerror and gsasl_strerror_name functions.
- * Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL.
  *
diff --git a/tests/external.c b/tests/external.c
index 530a6ef..5591997 100644
--- a/tests/external.c
+++ b/tests/external.c
@@ -1,5 +1,5 @@
 /* external.c --- Test the EXTERNAL mechanism.
- * Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL.
  *
diff --git a/tests/gs2-krb5.c b/tests/gs2-krb5.c
index 2062ba6..10139dd 100644
--- a/tests/gs2-krb5.c
+++ b/tests/gs2-krb5.c
@@ -1,5 +1,5 @@
 /* gs2-krb5.c --- Test the GS2-KRB5 mechanism.
- * Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL.
  *
diff --git a/tests/gssapi.c b/tests/gssapi.c
index ba68894..0bc3e9f 100644
--- a/tests/gssapi.c
+++ b/tests/gssapi.c
@@ -1,5 +1,5 @@
 /* gssapi.c --- Test the GSSAPI mechanism.
- * Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL.
  *
diff --git a/tests/libgsasl.supp b/tests/libgsasl.supp
index b6af188..16117a6 100644
--- a/tests/libgsasl.supp
+++ b/tests/libgsasl.supp
@@ -1,6 +1,6 @@
 # libgsasl.supp -- Valgrind suppresion file for Libgsasl           -*- text -*-
 #
-# Copyright (C) 2010 Simon Josefsson
+# Copyright (C) 2010-2012 Simon Josefsson
 #
 # This file is part of GNU SASL.
 #
diff --git a/tests/md5file.c b/tests/md5file.c
index 9409f86..be67c7b 100644
--- a/tests/md5file.c
+++ b/tests/md5file.c
@@ -1,5 +1,5 @@
 /* md5file.c --- Test the MD5 file password function.
- * Copyright (C) 2002, 2003, 2004, 2007, 2008, 2009  Simon Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL.
  *
diff --git a/tests/name.c b/tests/name.c
index 31de2be..80dc308 100644
--- a/tests/name.c
+++ b/tests/name.c
@@ -1,5 +1,5 @@
 /* name.c --- Test the gsasl_mechanism_name function.
- * Copyright (C) 2008, 2009  Simon Josefsson
+ * Copyright (C) 2008-2012 Simon Josefsson
  *
  * This file is part of GNU SASL.
  *
diff --git a/tests/old-base64.c b/tests/old-base64.c
index 4a025a9..661e5e8 100644
--- a/tests/old-base64.c
+++ b/tests/old-base64.c
@@ -1,5 +1,5 @@
 /* old-base64.c --- Test the base64 functions, using old callback API.
- * Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008, 2009  Simon Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL.
  *
diff --git a/tests/old-cram-md5.c b/tests/old-cram-md5.c
index ff5fc10..a0ecf6e 100644
--- a/tests/old-cram-md5.c
+++ b/tests/old-cram-md5.c
@@ -1,5 +1,5 @@
 /* cram-md5.c --- Test the CRAM-MD5 mechanism, using old callback API.
- * Copyright (C) 2002, 2003, 2004, 2005, 2007, 2009, 2010  Simon Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL.
  *
diff --git a/tests/old-digest-md5.c b/tests/old-digest-md5.c
index b893dcd..fa38cff 100644
--- a/tests/old-digest-md5.c
+++ b/tests/old-digest-md5.c
@@ -1,5 +1,5 @@
 /* digest-md5.c --- Test the DIGEST-MD5 mechanism.
- * Copyright (C) 2002, 2003, 2004, 2005, 2007, 2009, 2010  Simon Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL.
  *
diff --git a/tests/old-gssapi.c b/tests/old-gssapi.c
index e433040..0fdc34a 100644
--- a/tests/old-gssapi.c
+++ b/tests/old-gssapi.c
@@ -1,5 +1,5 @@
 /* old-gssapi.c --- Test the GSSAPI mechanism, using old callback API.
- * Copyright (C) 2002, 2003, 2004, 2005, 2007, 2009, 2010  Simon Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL.
  *
diff --git a/tests/old-md5file.c b/tests/old-md5file.c
index a9c99a5..fa86d77 100644
--- a/tests/old-md5file.c
+++ b/tests/old-md5file.c
@@ -1,5 +1,5 @@
 /* md5file.c --- Test the MD5 file password function.
- * Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL.
  *
diff --git a/tests/old-simple.c b/tests/old-simple.c
index 2331ea3..70714bc 100644
--- a/tests/old-simple.c
+++ b/tests/old-simple.c
@@ -1,5 +1,5 @@
 /* simple.c --- Test the simple SASL mechanisms, using old APIs.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL.
  *
diff --git a/tests/readnz.c b/tests/readnz.c
index 0c197ac..c0705b4 100644
--- a/tests/readnz.c
+++ b/tests/readnz.c
@@ -1,5 +1,5 @@
 /* readnz.c --- Check out-of-bounds reads on non-zero terminated strings.
- * Copyright (C) 2010-2011  Simon Josefsson
+ * Copyright (C) 2010-2012 Simon Josefsson
  *
  * This file is part of GNU SASL.
  *
diff --git a/tests/saml20.c b/tests/saml20.c
index 7a875c7..2400e95 100644
--- a/tests/saml20.c
+++ b/tests/saml20.c
@@ -1,5 +1,5 @@
 /* saml20.c --- Test the SAML20 mechanism.
- * Copyright (C) 2010, 2011  Simon Josefsson
+ * Copyright (C) 2010-2012 Simon Josefsson
  *
  * This file is part of GNU SASL.
  *
diff --git a/tests/scram.c b/tests/scram.c
index 6e6cf8d..6633e52 100644
--- a/tests/scram.c
+++ b/tests/scram.c
@@ -1,5 +1,5 @@
 /* scram.c --- Test the SCRAM mechanism.
- * Copyright (C) 2009, 2010  Simon Josefsson
+ * Copyright (C) 2009-2012 Simon Josefsson
  *
  * This file is part of GNU SASL.
  *
diff --git a/tests/scramplus.c b/tests/scramplus.c
index df23fac..41d486f 100644
--- a/tests/scramplus.c
+++ b/tests/scramplus.c
@@ -1,5 +1,5 @@
 /* scramplus.c --- Test the SCRAM-SHA-1-PLUS mechanism.
- * Copyright (C) 2009, 2010  Simon Josefsson
+ * Copyright (C) 2009-2012 Simon Josefsson
  *
  * This file is part of GNU SASL.
  *
diff --git a/tests/simple.c b/tests/simple.c
index a0bddf0..e3f89a6 100644
--- a/tests/simple.c
+++ b/tests/simple.c
@@ -1,5 +1,5 @@
 /* simple.c --- Test the simple SASL mechanisms.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL.
  *
diff --git a/tests/suggest.c b/tests/suggest.c
index 8504061..a9d13e3 100644
--- a/tests/suggest.c
+++ b/tests/suggest.c
@@ -1,5 +1,5 @@
 /* suggest.c --- Test the SASL mechanism suggestion function.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL.
  *
diff --git a/tests/symbols.c b/tests/symbols.c
index 4dc66f6..66a0973 100644
--- a/tests/symbols.c
+++ b/tests/symbols.c
@@ -1,5 +1,5 @@
 /* symbols.c --- Test if all exported symbols are available.
- * Copyright (C) 2010  Simon Josefsson
+ * Copyright (C) 2010-2012 Simon Josefsson
  *
  * This file is part of GNU SASL.
  *
diff --git a/tests/threadsafety b/tests/threadsafety
index 9f5243f..3d23c5e 100755
--- a/tests/threadsafety
+++ b/tests/threadsafety
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2004, 2005, 2007, 2009 Simon Josefsson
+# Copyright (C) 2004-2012 Simon Josefsson
 #
 # 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
diff --git a/tests/unicode.c b/tests/unicode.c
index 0c4ae7c..bd66827 100644
--- a/tests/unicode.c
+++ b/tests/unicode.c
@@ -1,5 +1,5 @@
 /* unicode.c --- Self tests for unicode related functions.
- * Copyright (C) 2002, 2005, 2007, 2009  Simon Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL.
  *
diff --git a/tests/utils.c b/tests/utils.c
index ce59a22..79e366e 100644
--- a/tests/utils.c
+++ b/tests/utils.c
@@ -1,5 +1,5 @@
 /* utils.c --- Self test utilities.
- * Copyright (C) 2002, 2003, 2004, 2005, 2007, 2009, 2010  Simon Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL.
  *
diff --git a/tests/utils.h b/tests/utils.h
index fbee542..fe6c205 100644
--- a/tests/utils.h
+++ b/tests/utils.h
@@ -1,5 +1,5 @@
 /* utils.h --- Prototypes for self test utilities.
- * Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008, 2009  Simon Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU SASL.
  *
diff --git a/windows/gsasl4win.mk b/windows/gsasl4win.mk
index e8ea663..a8f6f50 100644
--- a/windows/gsasl4win.mk
+++ b/windows/gsasl4win.mk
@@ -1,5 +1,5 @@
 # gsasl4win.mk --- build GNU SASL for Windows
-# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011  Simon Josefsson
+# Copyright (C) 2006-2012 Simon Josefsson
 #
 # 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


hooks/post-receive
-- 
GNU gsasl



reply via email to

[Prev in Thread] Current Thread [Next in Thread]