Merge from debian.

diff --cc Makefile.in
index a572d17,73026e5..5033cfe
--- 1/Makefile.in
--- 2/Makefile.in
+++ b/Makefile.in
@@@ -367,8 -349,8 +349,7 @@@ PGSQL_LIBS = @PGSQL_LIBS
  PG_CONFIG = @PG_CONFIG@
  RANLIB = @RANLIB@
  REPOSITORY = @REPOSITORY@
 -SED = @SED@
  SET_MAKE = @SET_MAKE@
- SHA1LIB = @SHA1LIB@
  SHADOWLIBS = @SHADOWLIBS@
  SHELL = @SHELL@
  STRIP = @STRIP@

diff --cc courier_auth_config.h
Simple merge

diff --cc debian/changelog
index c07b132,88916bc..f9e039c
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,55 -1,38 +1,90 @@@
+ courier-authlib (0.61.0-1+lenny1) testing-security; urgency=high
+ 
+   * Non-maintainer upload by the security team
+   * Fix several sql-injection vulnerabilities in authpgsqllib.c by using
+     PQsetClientEncoding() and PQescapeStringConn()
+     Fixes: CVE-2008-2380
+ 
+  -- Steffen Joeris <white@debian.org>  Mon, 08 Dec 2008 13:48:12 +0000
+ 
+ courier-authlib (0.61.0-1) unstable; urgency=low
+ 
+   * new upstream release
+   * lintian:
+     - debian/compat file
+     - don't ignore make clean errors
+   
+  -- Stefan Hornburg (Racke) <racke@linuxia.de>  Thu, 17 Jul 2008 12:59:36 +0200
+ 
+ courier-authlib (0.60.1-2.1) unstable; urgency=high
+ 
+   * Non-maintainer upload by the security team
+   * Fix sql injection vulnerability by changing to use
+     mysql_set_character_set instead of SET NAMES
+     (Change was introduced by upstream in 0.60.6)
+     (Closes: #485424)
+ 
+  -- Steffen Joeris <white@debian.org>  Mon, 09 Jun 2008 15:29:23 +0000
+ 
 +courier-authlib (0.60.2-0hcoop7) unstable; urgency=low
 +
 +  * Revert last change.  Now the AFS token code is before the callback.
 +
 + -- Michael Olson (HCoop) <mwolson@hcoop.net>  Thu, 07 Feb 2008 22:37:30 -0500
 +
 +courier-authlib (0.60.2-0hcoop6) unstable; urgency=low
 +
 +  * Move acquiting of AFS vmail tokens to just after callback.
 +
 + -- Michael Olson (HCoop) <mwolson@hcoop.net>  Sat, 02 Feb 2008 20:29:01 -0500
 +
 +courier-authlib (0.60.2-0hcoop5) unstable; urgency=low
 +
 +  * Move acquiring of AFS vmail tokens to preauthuserdbcommon.c.
 +
 + -- Michael Olson (HCoop) <mwolson@hcoop.net>  Fri, 01 Feb 2008 21:55:37 -0500
 +
 +courier-authlib (0.60.2-0hcoop4) unstable; urgency=low
 +
 +  * authuserdb: Try using a separate get-token script.
 +
 + -- Michael Olson (HCoop) <mwolson@hcoop.net>  Wed, 30 Jan 2008 13:17:14 -0500
 +
 +courier-authlib (0.60.2-0hcoop3) unstable; urgency=low
 +
 +  * Fix bug in previous patch.
 +
 + -- Michael Olson (HCoop) <mwolson@hcoop.net>  Sun, 27 Jan 2008 16:19:18 -0500
 +
 +courier-authlib (0.60.2-0hcoop2) unstable; urgency=low
 +
 +  * Get token after authenticating a vmail user.
 +
 + -- Michael Olson (HCoop) <mwolson@hcoop.net>  Sat, 26 Jan 2008 15:28:19 -0500
 +
 +courier-authlib (0.60.2-0hcoop1) unstable; urgency=low
 +
 +  * New upstream release.  Remaining changes:
 +    - Revert the disabling of pam_setcred so that IMAP works as expected.
 +    - Set the userdb path to be /etc/courier/userdb.
 +
 + -- Michael Olson (HCoop) <mwolson@hcoop.net>  Fri, 25 Jan 2008 19:24:41 -0500
 +
+ courier-authlib (0.60.1-2) unstable; urgency=low
+ 
+   * added LSB dependency info to init scripts (Closes: #460221, thanks to
+     Petter Reinholdtsen <pere@hungry.com> for the patch)
+ 
+  -- Stefan Hornburg (Racke) <racke@linuxia.de>  Mon,  7 Apr 2008 13:21:37 +0200
+ 
 +courier-authlib (0.60.1-1hcoop1) unstable; urgency=low
 +
 +  * Sync from Debian.  Remaining changes:
 +    - Revert the disabling of pam_setcred so that IMAP works as expected.
 +    - Set the userdb path to be /etc/courier/userdb.
 +
 + -- Michael Olson (HCoop) <mwolson@hcoop.net>  Fri, 25 Jan 2008 18:28:11 -0500
 +
  courier-authlib (0.60.1-1) unstable; urgency=low
  
    * new upstream release

diff --cc liblock/Makefile.in
Simple merge