Accepting request 961683 from home:pgajdos

- httpd-framework updated to svn1898917
- deleted patches
  - apache-test-DirectorySlash-NotFound-logic.patch (upstreamed)
  - apache2-perl-io-socket.patch (upstreamed)

OBS-URL: https://build.opensuse.org/request/show/961683
OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=668

apache-test-DirectorySlash-NotFound-logic.patch

@@ -1,19 +0,0 @@
---- a/httpd-framework/t/modules/dir.t.orig	2021-11-24 10:37:58.688525957 +0000
-+++ b/httpd-framework/t/modules/dir.t	2021-11-24 10:38:15.568621991 +0000
-@@ -98,12 +98,12 @@ $res = GET "/modules/dir/htaccess", redi
- ok ($res->code == 403);
- 
- if (have_min_apache_version('2.5.1')) { 
--    skip("missing DirectorySlash NotFound");
--}
--else { 
-     $res = GET "/modules/dir/htaccess/sub1", redirect_ok => 0;
-     ok ($res->code == 404);
- }
-+else { 
-+    skip("missing DirectorySlash NotFound");
-+}
- 
- 
- sub write_htaccess {
-

apache2-perl-io-socket.patch

@@ -1,37 +0,0 @@
---- httpd/test/framework/trunk/t/ssl/ocsp.t	2022/01/10 15:44:45	1896888
-+++ httpd/test/framework/trunk/t/ssl/ocsp.t	2022/01/10 18:08:12	1896889
-@@ -32,13 +32,21 @@ sok {
-     $r = GET $url, cert => undef;
-     my $message = $r->content() || '';
-     my $warning = $r->header('Client-Warning') || '';
-+    print "warning: $warning\n";
-+    print "message: $message";
-+    print "response:\n";
-     print $r->as_string;
-     $r->code == 500 && $warning =~ 'Internal response' &&
--        $message =~ /alert handshake failure|read failed/;
-+        $message =~ /alert handshake failure|read failed|closed connection without sending any data/;
- };
- 
- sok {
-     $r = GET $url, cert => 'client_ok';
-+    my $warning = $r->header('Client-Warning') || '';
-+    my $message = $r->content() || '';
-+    print "warning: $warning\n";
-+    print "message: $message";
-+    print "response:\n";
-     print $r->as_string;
-     $r->code == 200;
- };
-@@ -47,7 +55,10 @@ sok {
-     $r = GET $url, cert => 'client_revoked';
-     my $message = $r->content() || '';
-     my $warning = $r->header('Client-Warning') || '';
-+    print "warning: $warning\n";
-+    print "message: $message";
-+    print "response:\n";
-     print $r->as_string;
-     $r->code == 500 && $warning =~ 'Internal response' &&
--        $message =~ /alert certificate revoked|read failed/;
-+        $message =~ /alert handshake failure|read failed|closed connection without sending any data/;
- };

apache2.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Mar 14 12:19:36 UTC 2022 - pgajdos@suse.com
+
+- httpd-framework updated to svn1898917
+- deleted patches
+  - apache-test-DirectorySlash-NotFound-logic.patch (upstreamed)
+  - apache2-perl-io-socket.patch (upstreamed)
+
 -------------------------------------------------------------------
 Mon Mar 14 11:20:53 UTC 2022 - pgajdos@suse.com
 

apache2.spec

@@ -18,7 +18,7 @@
 
 %global upstream_name   httpd
 %global testsuite_name  %{upstream_name}-framework
-%global tversion        svn1894461
+%global tversion        svn1898917
 %global flavor          @BUILD_FLAVOR@%{nil}
 %define mpm             %{nil}
 %if "%{flavor}" == "prefork" || "%{flavor}" == "test_prefork"
@@ -198,10 +198,6 @@ Patch100:       apache-test-application-xml-type.patch
 # even if in live system I do not experience this inconsistency, let's turn off
 # these variables from the test
 Patch101:       apache-test-turn-off-variables-in-ssl-var-lookup.patch
-# PATCH:    reverted logic, DirectorySlash NotFound is available in trunk onlyyet
-Patch102:       apache-test-DirectorySlash-NotFound-logic.patch
-# https://svn.apache.org/viewvc?view=revision&revision=1896889
-Patch103:       apache2-perl-io-socket.patch
 BuildRequires:  apache-rpm-macros-control
 #Since 2.4.7 the event MPM requires apr 1.5.0 or later.
 BuildRequires:  apr-devel >= 1.5.0
@@ -330,10 +326,6 @@ provides HTTP services in sync with the current HTTP standards.
 %patch4 -p1
 %patch100 -p1
 %patch101 -p1
-%patch102 -p1
-(cd httpd-framework
-%patch103 -p4
-)
 
 #
 # BUILD

httpd-framework-svn1894461.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8536f6794f8ca000c2722e227c7ad6e17b33f8aeb0a5ce7662b4be110877733d
-size 1581270

httpd-framework-svn1898917.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e0b49ceac5780f010a6695608fc0e62d45101a8efc395ea656b47ae225a3dfb1
+size 729713