Merge remote-tracking branch 'origin/debian'

diff --combined courier_auth_config.h
index 21906a6,c033328..8c11c50
--- 1/courier_auth_config.h
--- 2/courier_auth_config.h
+++ b/courier_auth_config.h
@@@ -201,7 -201,7 +201,7 @@@
  /* #undef LTDL_DLOPEN_DEPLIBS */
  
  /* Define to the system default library search path. */
- #define LT_DLSEARCH_PATH "/lib64:/usr/lib64:/lib:/usr/lib:/usr/lib64/atlas:/usr/lib64/dyninst:/usr/lib64/llvm:/usr/lib64/mysql:/usr/lib64/tracker-0.16:/usr/lib64/xulrunner"
+ #define LT_DLSEARCH_PATH "/lib64:/usr/lib64:/lib:/usr/lib:/usr/lib64/atlas:/usr/lib64/bind99:/usr/lib64/dyninst:/usr/lib64/llvm:/usr/lib64/mysql"
  
  /* The archive extension */
  #define LT_LIBEXT "a"
@@@ -216,13 -216,15 +216,15 @@@
     module search path. */
  #define LT_MODULE_PATH_VAR "LD_LIBRARY_PATH"
  
- /* Define to the sub-directory in which libtool stores uninstalled libraries.
-    */
+ /* Define to the sub-directory where libtool stores uninstalled libraries. */
  #define LT_OBJDIR ".libs/"
  
  /* Define to the shared library suffix, say, ".dylib". */
  /* #undef LT_SHARED_EXT */
  
+ /* Define to the shared archive member specification, say "(shr.o)". */
+ /* #undef LT_SHARED_LIB_MEMBER */
+ 
  /* Whether we must a prototype for crypt() */
  #define NEED_CRYPT_PROTOTYPE 0
  
@@@ -254,7 -256,7 +256,7 @@@
  #define STDC_HEADERS 1
  
  /* Location of the userdb database */
 -#define USERDB "/usr/local/etc/authlib/userdb"
 +#define USERDB "/etc/courier/userdb"
  
  /* Version number of package */
  /* #undef VERSION */
@@@ -265,7 -267,7 +267,7 @@@
  /* Define to empty if `const' does not conform to ANSI C. */
  /* #undef const */
  
- /* Define to a type to use for `error_t' if it is not otherwise available. */
+ /* Define to a type to use for 'error_t' if it is not otherwise available. */
  /* #undef error_t */
  
  /* Define to `int' if <sys/types.h> doesn't define. */

diff --combined debian/changelog
index e8d333b,f7bb5e1..83b2ba5
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,24 -1,105 +1,126 @@@
+ courier-authlib (0.66.4-9) unstable; urgency=medium
+ 
+   * Orphan the package.
+ 
+  -- Ondřej Surý <ondrej@debian.org>  Wed, 21 Dec 2016 15:02:10 +0100
+ 
+ courier-authlib (0.66.4-8) unstable; urgency=medium
+ 
+   * Use default-libmysqlclient-dev instead of libmysqlclient-dev
+   * Run wrap-and-sort -a
+   * Rebuild with default-libmysqlclient-dev as libmysqlclient-dev (>= 5.7)
+     is broken (Closes: #844952)
+ 
+  -- Ondřej Surý <ondrej@debian.org>  Fri, 25 Nov 2016 15:21:19 +0100
+ 
+ courier-authlib (0.66.4-7) unstable; urgency=medium
+ 
+   * /usr/sbin/authdaemon is just a shell wrapper we need to call with
+     'start' and 'stop' arguments (Closes: #818747)
+   * Look at /usr/lib/courier/courier-authlib/authdaemond for
+     courier-authdaemon init.d script status call
+ 
+  -- Ondřej Surý <ondrej@debian.org>  Wed, 23 Mar 2016 14:38:43 +0100
+ 
+ courier-authlib (0.66.4-6) unstable; urgency=medium
+ 
+   * Fix the TMPFILES loop in init script (Closes: #818744)
+   * Add "start" as default DAEMON_ARGS to launch courier-authdaemon
+     (Closes: #818747)
+   * Fix courier-authlib-sqlite description (Closes: #810601)
+ 
+  -- Ondřej Surý <ondrej@debian.org>  Tue, 22 Mar 2016 12:11:51 +0100
+ 
+ courier-authlib (0.66.4-5) unstable; urgency=medium
+ 
+   * sysvinit-utils | init-d-script is Dependency and not Build-Dependency
+   * Looks like trigger name cannot end with /
+   * Let's restart courier-authdaemon and not authdaemon in triggered action
+     (Closes: #810345)
+   * libcourierauth* libraries are normal shared libraries, treat them as such
+     (Closes: #378241)
+   * Fix misc lintian warnings
+   * Add versioned Breaks: for courier-base and maildrop to not break them
+   * Rewritten init.d script using init-d-script
+     (Closes: #776529, #144505, #580187, #750582)
+   * Remove authdaemon restart from prerm scripts, we don't need this
+     anymore since we restart authdaemon via dpkg-trigger (Closes: #540374)
+   * Rewritten d/rules to use debhelper 9, autoreconf, and autotools-dev
+     (Closes: #558542, #540698, #599628, #607123, #744560)
+   * Update symbols file to match current symbols and set
+     DPKG_GENSYMBOLS_CHECK_LEVEL to 4
+   * Add adduser to courier-authlib Depends
+ 
+  -- Ondřej Surý <ondrej@debian.org>  Wed, 16 Mar 2016 11:41:54 +0100
+ 
+ courier-authlib (0.66.4-4) unstable; urgency=medium
+ 
+   * Update packaging to modern dh9 format and use dh-autoreconf and
+     autotools-dev
+   * Don't mangle file permissions on install time as it's take care of in
+     Debian package
+   * Rip AC_PROG_SYSCONFTOOL macro to m4/ directory
+   * Fix authdaemondprog linking; missing libcourierauth.la
+   * Reorder libs on pkglib_LTLIBRARIES to help libtool find the libs
+   * Lintian overrides are installed by dh_lintian
+ 
+  -- Ondřej Surý <ondrej@debian.org>  Mon, 08 Feb 2016 15:00:41 +0100
+ 
+ courier-authlib (0.66.4-3) unstable; urgency=medium
+ 
+   * Check and create courier user in authdaemon package in case
+     courier-base is not installed first (LP#1542174)
+ 
+  -- Ondřej Surý <ondrej@debian.org>  Fri, 05 Feb 2016 09:58:26 +0100
+ 
+ courier-authlib (0.66.4-2) unstable; urgency=medium
+ 
+   * Convert the d/copyright into machine-readable file and add license for
+     authldaplib.c
+   * Use invoke-rc.d to restart authdaemon on mysql and postgresql fresh
+     installation
+   * Add courier-authdaemon systemd files (service and tmpfile)
+ 
+  -- Ondřej Surý <ondrej@debian.org>  Sat, 02 Jan 2016 17:29:17 +0100
+ 
+ courier-authlib (0.66.4-1) unstable; urgency=medium
+ 
+   * Imported Upstream version 0.66.4
+   * Add dependency on libcourier-unicode-dev and wrap-and-sort -a
+   * Add myself to Uploaders
+   * Add Vcs-* links and Homepage
+   * Add d/watch with support for signed packages
+ 
+  -- Ondřej Surý <ondrej@debian.org>  Thu, 31 Dec 2015 11:33:25 +0100
+ 
+ courier-authlib (0.66.3-1) unstable; urgency=medium
+ 
+   * Add support for authsqlite
+   * New upstream version 0.66.3
+ 
+  -- Ondřej Surý <ondrej@debian.org>  Mon, 29 Jun 2015 12:23:12 +0200
+ 
 +courier-authlib (0.66.1-1+hcoop3) unstable; urgency=medium
 +
 +  * Replace system() with fork()+setuid()+exec() when calling afs
 +    get-token script. Fixes issues with modern libafs-pam-session / PAG
 +    behavior (courier must still run nopag)
 +
 + -- Clinton Ebadi <clinton@unknownlamer.org>  Mon, 18 May 2015 23:36:51 -0400
 +
 +courier-authlib (0.66.1-1+hcoop2) unstable; urgency=medium
 +
 +  * Rebuild for Jessie
 +
 + -- Clinton Ebadi <clinton@unknownlamer.org>  Wed, 13 May 2015 11:08:11 -0400
 +
 +courier-authlib (0.66.1-1~bpo70+hcoop1) wheezy-backports; urgency=medium
 +
 +  * Merge hcoop changes
 +  * Backport to wheezy
 +
 + -- Clinton Ebadi <clinton@neurasthenic.home.unknownlamer.org>  Tue, 29 Apr 2014 23:08:29 -0400
 +
  courier-authlib (0.66.1-1) unstable; urgency=low
  
    * New upstream release.
@@@ -29,12 -110,6 +131,12 @@@
  
   -- Stefan Hornburg (Racke) <racke@linuxia.de>  Mon, 28 Oct 2013 11:38:37 +0100
  
 +courier-authlib (0.63.0-6+hcoop1) unstable; urgency=medium
 +
 +  * Merged HCoop changes
 +
 + -- Clinton Ebadi <clinton@neurasthenic.home.unknownlamer.org>  Tue, 29 Apr 2014 20:17:45 -0400
 +
  courier-authlib (0.63.0-6) unstable; urgency=low
  
    [Martin Orr <martin@martinorr.name>]
@@@ -127,18 -202,6 +229,18 @@@ courier-authlib (0.62.2-1) unstable; ur
    
   -- Stefan Hornburg (Racke) <racke@linuxia.de>  Mon, 02 Mar 2009 16:09:05 +0100
  
 +courier-authlib (0.61.0-1+lenny1hcoop1) lenny; urgency=low
 +
 +  * Merge from Debian.  Remaining changes:
 +    + authpam.c:
 +      - Revert the disabling of pam_setcred so that IMAP works on AFS.
 +    + courier_auth_config.h:
 +      - Set the userdb path to be /etc/courier/userdb.
 +    + preauthuserdbcommon.c:
 +      - Get AFS tokens.
 +
 + -- Michael Olson (HCoop) <mwolson@hcoop.net>  Thu, 09 Apr 2009 23:43:21 -0400
 + 
  courier-authlib (0.61.0-1+lenny1) testing-security; urgency=high
  
    * Non-maintainer upload by the security team
@@@ -167,50 -230,6 +269,50 @@@ courier-authlib (0.60.1-2.1) unstable; 
  
   -- 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
@@@ -218,14 -237,6 +320,14 @@@
  
   -- 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
@@@ -245,15 -256,6 +347,15 @@@ courier-authlib (0.59.3-2) unstable; ur
  
   -- Stefan Hornburg (Racke) <racke@linuxia.de>  Thu, 21 Jun 2007 20:26:38 +0200
  
 +courier-authlib (0.59.3-1hcoop1) unstable; urgency=low
 +
 +  [Adam Megacz]
 +  * Revert the disabling of pam_setcred so that IMAP works as expected.
 +  * Set the userdb path to be /etc/courier/userdb.
 +  * userdb: Allow "+", ":", and "_" in usernames.
 +
 + -- Michael Olson (HCoop) <mwolson@hcoop.net>  Fri, 25 Jan 2008 17:46:10 -0500
 +
  courier-authlib (0.59.3-1) unstable; urgency=low
  
    * new upstream release