Merge remote-tracking branch 'sf/master'

diff --git a/configure.ac b/configure.ac
index dd183c6..9900d1b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -37,7 +37,7 @@ AC_SUBST(APACHE_LIBS)
 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 --git a/debian/changelog b/debian/changelog
index 7fe9f46..ff9a748 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,66 @@ libapache-mod-waklog (1.1.0) unstable; urgency=low
 
  -- 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 --git a/mod_waklog.c b/mod_waklog.c
index 0de994d..614cf33 100644 (file)
--- a/mod_waklog.c
+++ b/mod_waklog.c
@@ -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
@@ -1403,7 +1404,7 @@ waklog_init_handler (apr_pool_t * p, apr_pool_t * plog,
         /* 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);
         }
       }