Subject: Collected Debian patches for WebAuth
Author: Russ Allbery <rra@debian.org>

Since I am also upstream for this package, there will normally not be any
patches to apply to the upstream source.  However, occasionally I'll pull
up specific upstream commits prior to making an upstream release.  When
this happens, this patch will collect all of those modifications.

I use Git to maintain both the upstream source and the Debian packages,
and generating individual patches rather than using git cherry-pick takes
extra work for no gain.  Since I'm also upstream, there's no need to
separate the patches for later upstream submission.  Hence, I take this
approach with a unified patch when it's necessary.

For full commit history and separated commits, see the upstream Git
repsitory.
--- webauth-4.5.0.orig/tests/mod_webauth/htdocs/tests/test.tt2
+++ webauth-4.5.0/tests/mod_webauth/htdocs/tests/test.tt2
@@ -14,12 +14,12 @@
 [% END -%]
 
 [% IF unauth_location -%]
-        <p>Click <a href="/tests-new/index.html">here</a> to return to
+        <p>Click <a href="/tests/index.html">here</a> to return to
             tests</p>
 [% ELSE -%]
-        <p>Click <a href="/tests-new/index.html">here</a> to return without
+        <p>Click <a href="/tests/index.html">here</a> to return without
             logging out<br />
-           Click <a href="/tests-new/auth/logout">here</a> to logout and
+           Click <a href="/tests/auth/logout">here</a> to logout and
             return
         </p>
 [% END -%]
--- webauth-4.5.0.orig/tests/mod_webauth/htdocs/tests/auth/test10
+++ webauth-4.5.0/tests/mod_webauth/htdocs/tests/auth/test10
@@ -28,7 +28,7 @@ if ($prev) {
 }
 
 push (@extended,
-      'Click <a href="/tests/auth/test10?prev=$wtl">here</a> to re-run the '
+      "Click <a href=\"/tests/auth/test10?prev=$wtl\">here</a> to re-run the "
       .'test. If you wait for less then 20 seconds, you\'ll get taken back '
       .'to this page. If you wait for more then 20 seconds, you should end '
       .'up back at the webkdc login page.');
@@ -36,7 +36,7 @@ push (@extended,
 # Set information for the tests.
 my %settings = (
     test_number   => 10,
-    test_desc     => 'testing WebAuthVarPrefix',
+    test_desc     => 'testing inactive-expire',
     extended_desc => \@extended,
     extra_title   => 'Performing Last Used tests',
     extra_tests   => last_used_test(),
--- webauth-4.5.0.orig/tests/mod_webauth/htdocs/tests/auth/test9
+++ webauth-4.5.0/tests/mod_webauth/htdocs/tests/auth/test9
@@ -30,7 +30,7 @@ if ($prev) {
 }
 push (@extended, $value);
 push (@extended,
-      "Click <a href=\"/tests-new/auth/test9?prev=$wtl\">here</a> to re-run "
+      "Click <a href=\"/tests/auth/test9?prev=$wtl\">here</a> to re-run "
       ."the test when you have waited 10 seconds.");
 
 # Set information for the tests.
--- webauth-4.5.0.orig/tests/mod_webauth/htdocs/tests/auth/test13
+++ webauth-4.5.0/tests/mod_webauth/htdocs/tests/auth/test13
@@ -26,7 +26,7 @@ if ($remote_user) {
           'You are accessing a page with optional authentication and are not '
           .'authenticated.  This part of the test succeeded.  To see if your '
           .'identity is displayed properly after logging in, follow the '
-          .'<a href="/tests-new/auth/test13login">login</a> link.  You should '
+          .'<a href="/tests/auth/test13login">login</a> link.  You should '
           .'then authenticate and be returned to this page, but with an '
           .'identity set.');
 }
