Merge remote-tracking branch 'sf/master'

diff --combined configure.ac
index 172ce66,dd183c6..9900d1b
--- 1/configure.in
--- 2/configure.ac
+++ b/configure.ac
@@@ -1,5 -1,6 +1,6 @@@
- AC_INIT(mod_waklog.c)
- AM_INIT_AUTOMAKE(mod_waklog_so,1.0)
+ AC_INIT([mod_waklog], [1.1.0])
+ AC_CONFIG_SRCDIR([mod_waklog.c])
+ AM_INIT_AUTOMAKE([foreign])
  AC_PROG_CC
  AC_PROG_INSTALL
  
@@@ -15,12 -16,6 +16,6 @@@ AC_ARG_WITH([afs-headers]
              [AFS_INC=/usr/include/afs])
  AC_SUBST(AFS_INC)
  
- AC_ARG_WITH([apr-headers],
-             [AC_HELP_STRING([--with-apr-headers],[path to apr headers])],
-             [APR_INC=$withval],
-             [APR_INC=/usr/include/apr-1.0])
- AC_SUBST(APR_INC)
- 
  AC_ARG_WITH([krb5-libs],
              [AC_HELP_STRING([--with-krb5-libs],[path to krb5 libraries])],
              [KRB5_LIBS=$withval],
@@@ -39,16 -34,10 +34,10 @@@ AC_ARG_WITH([apache-libs]
              [APACHE_LIBS=/usr/lib/])
  AC_SUBST(APACHE_LIBS)
  
- AC_ARG_WITH([apache-headers],
-             [AC_HELP_STRING([--with-apache-headers],[path to apache headers])],
-             [APACHE_INC=$withval],
-             [APACHE_INC=/usr/include/apache2])
- AC_SUBST(APACHE_INC)
- 
  AC_ARG_WITH([apxs],
              [AC_HELP_STRING([--with-apxs],[path to apxs])],
              [APXS=$withval],
 -            [APXS=apxs])
 +            [APXS=apxs2])
  AC_SUBST(APXS)
  
  AC_ARG_ENABLE(debug,

diff --combined debian/changelog
index 286eb45,7fe9f46..ff9a748
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,63 -1,9 +1,69 @@@
+ libapache-mod-waklog (1.1.0) unstable; urgency=low
+ 
+   * New feature and bugfix release; see NEWS for details
+ 
+  -- Jacob Welsh <jwelsh@sinenomine.net>  Fri, 17 Jul 2015 07:25:44 -0500
+ 
 +libapache-mod-waklog (1.06) unstable; urgency=medium
 +
 +  * Merge sf.net version for apache2.4 build support
 +
 + -- Clinton Ebadi <clinton@unknownlamer.org>  Thu, 14 May 2015 19:53:05 -0400
 +
 +libapache-mod-waklog (1.05) unstable; urgency=medium
 +
 +  * Sleep for 150ms instead of 2s when acquiring initial tokens
 +
 + -- Clinton Ebadi <clinton@unknownlamer.org>  Fri, 02 May 2014 00:54:22 -0400
 +
 +libapache-mod-waklog (1.04+2) unstable; urgency=medium
 +
 +  * Change versioning scheme to placate debarchiver/pbuilder
 +
 + -- Clinton Ebadi <clinton@neurasthenic.home.unknownlamer.org>  Wed, 23 Apr 2014 01:50:36 -0400
 +
 +libapache-mod-waklog (1.04.1) stable; urgency=medium
 +
 +  * Fix package build dependencies.
 +  * Update compat and standards version
 +
 + -- Clinton Ebadi <clinton@unknownlamer.org>  Tue, 08 Apr 2014 01:14:55 -0400
 +
 +libapache-mod-waklog (1.04) unstable; urgency=low
 +
 +  * Merge sourceforge repository.
 +  * Integrate rxkad-kdf patches from Russ Albery.
 +  * This release no longer supports servers that have not rekeyed, nor
 +    clients without rxkad-kdf support.
 +
 + -- Clinton Ebadi <clinton@unknownlamer.org>  Wed, 05 Mar 2014 02:08:44 -0500
 +
 +libapache-mod-waklog (1.03) stable; urgency=low
 +
 +  * Enable weak crypto using secret API for openafs. Modern Kerberos
 +    disallows DES crypto methods, but openafs for protocol reasons is
 +    stuck using des for the time being. Rather than force all afs realms
 +    to enable weak crypto, MIT added an undocumented API call to allow
 +    openafs to skirt around the weak crypto restrictions. Since we're
 +    implementing aklog for Apache, we have to be evil and use it too in
 +    order to acquire tokens on a system where weak crypto is not
 +    permitted.
 +
 + -- Clinton Ebadi <clinton@unknownlamer.org>  Sat, 08 Sep 2012 00:34:41 -0400
 +
 +libapache-mod-waklog (1.02) stable; urgency=low
 +
 +  [ megacz ]
 +  * remove mod-auth-kerb from list of required modules
 +
 +  [ Ryan Jud Hughes ]
 +  * Fix build issues on CentOS
 +
 +  [ Clinton Ebadi ]
 +  * Update mod_waklog for 2012 * Build with apache2 by default (1.3 still works in theory) * Only build Debian package `libapache2-mod-waklog' (apache 1.3 is no   longer in Debian) * Left alone otherwise (not quite conformant with the latest package standards)
 +
 + -- Clinton Ebadi <clinton@unknownlamer.org>  Sun, 02 Sep 2012 17:16:02 -0400
 +
  libapache-mod-waklog (1.01) unstable; urgency=low
  
    * Applied patch Simon Wilkinson <simon@sxw.org.uk>, fixed a bug,

diff --combined mod_waklog.c
index eca89ad,0de994d..614cf33
--- 1/mod_waklog.c
--- 2/mod_waklog.c
+++ b/mod_waklog.c
@@@ -48,7 -48,6 +48,7 @@@ module waklog_module
  #include "http_connection.h"
  #include <apr_strings.h>
  #include <apr_base64.h>
 +#include <apr_time.h>
  #define ap_pcalloc apr_pcalloc
  #define ap_pdupstr apr_pdupstr
  #define ap_pstrdup apr_pstrdup
@@@ -1271,7 -1270,6 +1271,6 @@@ waklog_init_handler (apr_pool_t * p, ap
                       apr_pool_t * ptemp, server_rec * s)
  {
    int rv;
-   extern char *version;
    apr_proc_t *proc;
    waklog_config *cfg;
    void *data;
@@@ -1308,7 -1306,7 +1307,7 @@@
    else
      {
        log_error (APLOG_MARK, APLOG_INFO, 0, s,
-                  "mod_waklog: version %s initialized for cell %s", version, cfg->afs_cell);
+                  "mod_waklog: version %s initialized for cell %s", VERSION, cfg->afs_cell);
  
        if ( sharedspace ) {
          log_error(APLOG_MARK, APLOG_ERR, 0, s, "mod_waklog: shared memory already allocated." );
@@@ -1405,7 -1403,7 +1404,7 @@@
          /* wait here until our child process has gone and done it's renewing thing. */
          while( sharedspace->renewcount == oldrenewcount  ) {
            log_error( APLOG_MARK, APLOG_ERR, 0, s, "mod_waklog: waiting for tokens..." );
 -          sleep(2);
 +          apr_sleep(150000);
          }
        }
  
@@@ -1419,7 -1417,6 +1418,6 @@@
  static void
  waklog_init (server_rec * s, MK_POOL * p)
  {
-   extern char *version;
    int pid;
    waklog_config *cfg;
    int fd = -1;
@@@ -1431,7 -1428,7 +1429,7 @@@
  #endif
  
    log_error (APLOG_MARK, APLOG_DEBUG, 0, s,
-              "mod_waklog: version %s initialized.", version);
+              "mod_waklog: version %s initialized.", VERSION);
  
    if ( sharedspace ) {
      log_error(APLOG_MARK, APLOG_ERR, 0, s, "mod_waklog: shared memory already allocated." );