Merging debian version 2.4.59-1~deb12u1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

7 files changed, 85 insertions, 45 deletions

diff --git a/debian/perl-framework/Apache-Test/Changes b/debian/perl-framework/Apache-Test/Changes
index 052e335..ec0c6ef 100644
--- a/debian/perl-framework/Apache-Test/Changes
+++ b/debian/perl-framework/Apache-Test/Changes
@@ -6,7 +6,25 @@ Changes - Apache::Test change logfile
 
 =over 3
 
-=item 1.42-dev
+=item 1.44-dev
+
+=item 1.43 Nov 7 2021
+
+Our implementation of "which" should not search
+for a program in the elements of PATH when program
+already contains a path. [rjung]
+
+Fix hash generation when the openssl command
+was overwritten with the environment variable
+"APACHE_TEST_OPENSSL_CMD". [rjung]
+
+Add new config option limitrequestline needed
+when the local directory paths are long. [rjung]
+
+=item 1.42 Aug 28 2019
+
+Fix loading apache_test_config.pm for recent perls in which '.' is
+no longer in @INC by default. [Steve Hay]
 
 =item 1.41 Jul 11 2019
 
diff --git a/debian/perl-framework/Apache-Test/RELEASE b/debian/perl-framework/Apache-Test/RELEASE
index 4f8e5e8..0ec2b46 100644
--- a/debian/perl-framework/Apache-Test/RELEASE
+++ b/debian/perl-framework/Apache-Test/RELEASE
@@ -15,7 +15,7 @@ Instructions for Apache-Test Release Manager
        tags, so keep that in mind.
 
   b. commit Changes
-     % svn ci -m "1.42 rc1" Changes
+     % svn ci -m "1.44 rc1" Changes
 
   c. nuke any preinstalled Apache-Test libs and run 'make test'
 
@@ -37,7 +37,7 @@ Instructions for Apache-Test Release Manager
    (or maybe longer to give most people a chance to catch up). no need
    to tag this package
 
-   Subject: [RELEASE CANDIDATE] Apache-Test-1.42 RC\d+
+   Subject: [RELEASE CANDIDATE] Apache-Test-1.44 RC\d+
 
   a. if problems are detected during stage 2, repeat stages 1 and 2.
 
@@ -54,7 +54,7 @@ Instructions for Apache-Test Release Manager
      % make -n tag
 
   c. commit Changes
-     % svn ci -m "1.42 release" Changes
+     % svn ci -m "1.44 release" Changes
 
   d. tag
      % make tag
@@ -74,7 +74,7 @@ Instructions for Apache-Test Release Manager
      o dev/perl.apache.org
      o modperl/perl.apache.org
 
-   Subject: [ANNOUNCE] Apache-Test-1.42
+   Subject: [ANNOUNCE] Apache-Test-1.44
 
      include:
      - MD5 sig (as it comes from CPAN upload announce).
@@ -87,11 +87,11 @@ Instructions for Apache-Test Release Manager
   b. edit ./Changes:
      - start a new item with incremented version + '-dev'
 
-     =item 1.43-dev
+     =item 1.45-dev
 
   c. bump up version numbers in this file to make it easier to do the
      next release.
      % perl -pi.bak -e 's/(\d+)\.(\d+)/join(".", $1, $2+1)/eg' RELEASE
 
   d. commit Changes
-     % svn ci -m "start 1.42-dev cycle" Changes RELEASE lib/Apache/Test.pm
+     % svn ci -m "start 1.44-dev cycle" Changes RELEASE lib/Apache/Test.pm
diff --git a/debian/perl-framework/Apache-Test/lib/Apache/Test.pm b/debian/perl-framework/Apache-Test/lib/Apache/Test.pm
index b3263c6..b18de11 100644
--- a/debian/perl-framework/Apache-Test/lib/Apache/Test.pm
+++ b/debian/perl-framework/Apache-Test/lib/Apache/Test.pm
@@ -37,7 +37,7 @@ BEGIN {
 
 use vars qw(@ISA @EXPORT %EXPORT_TAGS $VERSION %SubTests @SkipReasons);
 
-$VERSION = '1.42';
+$VERSION = '1.44';
 
 my @need = qw(need_lwp need_http11 need_cgi need_access need_auth
               need_module need_apache need_min_apache_version need_min_apache_fix
diff --git a/debian/perl-framework/Apache-Test/lib/Apache/TestCommon.pm b/debian/perl-framework/Apache-Test/lib/Apache/TestCommon.pm
index e65d1d3..9722bc2 100644
--- a/debian/perl-framework/Apache-Test/lib/Apache/TestCommon.pm
+++ b/debian/perl-framework/Apache-Test/lib/Apache/TestCommon.pm
@@ -53,7 +53,7 @@ sub run_write_test {
                                 $received += length $chunk;
                             });
 
-            ok t_cmp($length, $received, 'bytes in body');
+            ok t_cmp($received, $length, 'bytes in body');
         }
     }
 }
diff --git a/debian/perl-framework/Apache-Test/lib/Apache/TestConfig.pm b/debian/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
index 85689b0..274f1a0 100644
--- a/debian/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
+++ b/debian/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
@@ -59,38 +59,39 @@ use Apache::TestRun ();
 use vars qw(%Usage);
 
 %Usage = (
-   top_dir         => 'top-level directory (default is $PWD)',
-   t_dir           => 'the t/ test directory (default is $top_dir/t)',
-   t_conf          => 'the conf/ test directory (default is $t_dir/conf)',
-   t_logs          => 'the logs/ test directory (default is $t_dir/logs)',
-   t_state         => 'the state/ test directory (default is $t_dir/state)',
-   t_pid_file      => 'location of the pid file (default is $t_logs/httpd.pid)',
-   t_conf_file     => 'test httpd.conf file (default is $t_conf/httpd.conf)',
-   src_dir         => 'source directory to look for mod_foos.so',
-   serverroot      => 'ServerRoot (default is $t_dir)',
-   documentroot    => 'DocumentRoot (default is $ServerRoot/htdocs',
-   port            => 'Port [port_number|select] (default ' . DEFAULT_PORT . ')',
-   servername      => 'ServerName (default is localhost)',
-   user            => 'User to run test server as (default is $USER)',
-   group           => 'Group to run test server as (default is $GROUP)',
-   bindir          => 'Apache bin/ dir (default is apxs -q BINDIR)',
-   sbindir         => 'Apache sbin/ dir (default is apxs -q SBINDIR)',
-   httpd           => 'server to use for testing (default is $bindir/httpd)',
-   target          => 'name of server binary (default is apxs -q TARGET)',
-   apxs            => 'location of apxs (default is from Apache2::BuildConfig)',
-   startup_timeout => 'seconds to wait for the server to start (default is 60)',
-   httpd_conf      => 'inherit config from this file (default is apxs derived)',
-   httpd_conf_extra=> 'inherit additional config from this file',
-   minclients      => 'minimum number of concurrent clients (default is 1)',
-   maxclients      => 'maximum number of concurrent clients (default is minclients+1)',
-   threadsperchild => 'number of threads per child when using threaded MPMs (default is 10)',
-   perlpod         => 'location of perl pod documents (for testing downloads)',
-   proxyssl_url    => 'url for testing ProxyPass / https (default is localhost)',
-   sslca           => 'location of SSL CA (default is $t_conf/ssl/ca)',
-   sslcaorg        => 'SSL CA organization to use for tests (default is asf)',
-   sslproto        => 'SSL/TLS protocol version(s) to test',
-   libmodperl      => 'path to mod_perl\'s .so (full or relative to LIBEXECDIR)',
-   defines         => 'values to add as -D defines (for example, "VAR1 VAR2")',
+   top_dir          => 'top-level directory (default is $PWD)',
+   t_dir            => 'the t/ test directory (default is $top_dir/t)',
+   t_conf           => 'the conf/ test directory (default is $t_dir/conf)',
+   t_logs           => 'the logs/ test directory (default is $t_dir/logs)',
+   t_state          => 'the state/ test directory (default is $t_dir/state)',
+   t_pid_file       => 'location of the pid file (default is $t_logs/httpd.pid)',
+   t_conf_file      => 'test httpd.conf file (default is $t_conf/httpd.conf)',
+   src_dir          => 'source directory to look for mod_foos.so',
+   serverroot       => 'ServerRoot (default is $t_dir)',
+   documentroot     => 'DocumentRoot (default is $ServerRoot/htdocs',
+   port             => 'Port [port_number|select] (default ' . DEFAULT_PORT . ')',
+   servername       => 'ServerName (default is localhost)',
+   user             => 'User to run test server as (default is $USER)',
+   group            => 'Group to run test server as (default is $GROUP)',
+   bindir           => 'Apache bin/ dir (default is apxs -q BINDIR)',
+   sbindir          => 'Apache sbin/ dir (default is apxs -q SBINDIR)',
+   httpd            => 'server to use for testing (default is $bindir/httpd)',
+   target           => 'name of server binary (default is apxs -q TARGET)',
+   apxs             => 'location of apxs (default is from Apache2::BuildConfig)',
+   startup_timeout  => 'seconds to wait for the server to start (default is 60)',
+   httpd_conf       => 'inherit config from this file (default is apxs derived)',
+   httpd_conf_extra => 'inherit additional config from this file',
+   minclients       => 'minimum number of concurrent clients (default is 1)',
+   maxclients       => 'maximum number of concurrent clients (default is minclients+1)',
+   threadsperchild  => 'number of threads per child when using threaded MPMs (default is 10)',
+   limitrequestline => 'global LimitRequestLine setting (default is 128)',
+   perlpod          => 'location of perl pod documents (for testing downloads)',
+   proxyssl_url     => 'url for testing ProxyPass / https (default is localhost)',
+   sslca            => 'location of SSL CA (default is $t_conf/ssl/ca)',
+   sslcaorg         => 'SSL CA organization to use for tests (default is asf)',
+   sslproto         => 'SSL/TLS protocol version(s) to test',
+   libmodperl       => 'path to mod_perl\'s .so (full or relative to LIBEXECDIR)',
+   defines          => 'values to add as -D defines (for example, "VAR1 VAR2")',
    (map { $_ . '_module_name', "$_ module name"} qw(cgi ssl thread access auth php)),
 );
 
@@ -368,6 +369,9 @@ sub new {
         $vars->{maxclientsthreadedmpm} = $vars->{maxsparethreadedmpm} + $vars->{threadsperchild};
     }
 
+    $vars->{limitrequestline} ||= 128;
+    $vars->{limitrequestlinex2} = 2 * $vars->{limitrequestline};
+
     $vars->{proxy}        ||= 'off';
     $vars->{proxyssl_url} ||= '';
     $vars->{defines}      ||= '';
@@ -1778,6 +1782,11 @@ sub which {
 
     return undef unless $program;
 
+    # No need to search PATH components
+    # if $program already contains a path
+    return $program if !OSX and !WINFU and
+        $program =~ /\// and -f $program and -x $program;
+
     my @dirs = File::Spec->path();
 
     require Config;
diff --git a/debian/perl-framework/Apache-Test/lib/Apache/TestRun.pm b/debian/perl-framework/Apache-Test/lib/Apache/TestRun.pm
index f398eb5..515f69a 100644
--- a/debian/perl-framework/Apache-Test/lib/Apache/TestRun.pm
+++ b/debian/perl-framework/Apache-Test/lib/Apache/TestRun.pm
@@ -776,7 +776,7 @@ sub detect_relocation {
     return unless -e $config_file;
 
     my %inc = %INC;
-    eval { require "$config_file" };
+    eval { require "./$config_file" };
     %INC = %inc; # be stealth
     warn($@), return if $@;
 
diff --git a/debian/perl-framework/Apache-Test/lib/Apache/TestSSLCA.pm b/debian/perl-framework/Apache-Test/lib/Apache/TestSSLCA.pm
index fc4c685..ca37f16 100644
--- a/debian/perl-framework/Apache-Test/lib/Apache/TestSSLCA.pm
+++ b/debian/perl-framework/Apache-Test/lib/Apache/TestSSLCA.pm
@@ -294,8 +294,20 @@ nsComment = This Is A Comment
 1.3.6.1.4.1.18060.12.0 = DER:0c064c656d6f6e73
 subjectAltName = email:\$mail$san_msupn
 
+[ client_ext ]
+extendedKeyUsage = clientAuth
+
 [ server_ext ]
 subjectAltName = DNS:\$CN$san_dnssrv
+extendedKeyUsage = serverAuth
+subjectKeyIdentifier=hash
+authorityKeyIdentifier=keyid,issuer
+
+[ ca_ext ]
+subjectKeyIdentifier=hash
+authorityKeyIdentifier=keyid:always,issuer
+basicConstraints = critical,CA:true
+
 EOF
 
     return $file;
@@ -326,7 +338,7 @@ sub new_ca {
               join ':', dn_oneline('client_snakeoil'),
               $basic_auth_password);
 
-    openssl req => "-new -x509 -keyout $cakey -out $cacert $days",
+    openssl req => "-new -x509 -extensions ca_ext -keyout $cakey -out $cacert $days",
                    config('ca');
 
     export_cert('ca'); #useful for importing into IE
@@ -367,7 +379,8 @@ sub sign_cert {
     my $name = shift;
     my $exts = '';
 
-    $exts = ' -extensions client_ok_ext' if $name =~ /client_ok/;
+    $exts = ' -extensions client_ext' if $name =~ /client/;
+    $exts .= ' -extensions client_ok_ext' if $name =~ /client_ok/;
 
     $exts = ' -extensions server_ext' if $name =~ /server/;
 
@@ -423,7 +436,7 @@ sub hash_certs {
 
     for my $file ($dh->read) {
         next unless $file =~ /\.cr[tl]$/;
-        chomp(my $hash = `openssl $type -noout -hash < $file`);
+        chomp(my $hash = `$openssl $type -noout -hash < $file`);
         next unless $hash;
         my $symlink = "$hash.r$n";
         $n++;