From 7ee7d2c63412dde37dfca864aa24dfd24c8b394d9e0281d8513f1b5032bd280f Mon Sep 17 00:00:00 2001
From: Petr Gajdos <pgajdos@suse.com>
Date: Wed, 24 Nov 2021 11:09:35 +0000
Subject: [PATCH] - httpd-framework updated to svn1894461 - added patches   fix
 reverted logic, DirectorySlash NotFound is available in trunk only   +
 apache-test-DirectorySlash-NotFound-logic.patch - do not consider php tests,
 they do not run anyway

OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=659
---
 ...e-test-DirectorySlash-NotFound-logic.patch | 19 +++++++++++++++++++
 apache2.changes                               |  9 +++++++++
 apache2.spec                                  |  7 ++++---
 httpd-framework-svn1878849.tar.bz2            |  3 ---
 httpd-framework-svn1894461.tar.bz2            |  3 +++
 5 files changed, 35 insertions(+), 6 deletions(-)
 create mode 100644 apache-test-DirectorySlash-NotFound-logic.patch
 delete mode 100644 httpd-framework-svn1878849.tar.bz2
 create mode 100644 httpd-framework-svn1894461.tar.bz2

diff --git a/apache-test-DirectorySlash-NotFound-logic.patch b/apache-test-DirectorySlash-NotFound-logic.patch
new file mode 100644
index 0000000..9ab66aa
--- /dev/null
+++ b/apache-test-DirectorySlash-NotFound-logic.patch
@@ -0,0 +1,19 @@
+--- 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 {
+
diff --git a/apache2.changes b/apache2.changes
index 694144f..575da05 100644
--- a/apache2.changes
+++ b/apache2.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Nov 24 11:04:43 UTC 2021 - pgajdos@suse.com
+
+- httpd-framework updated to svn1894461
+- added patches
+  fix reverted logic, DirectorySlash NotFound is available in trunk only
+  + apache-test-DirectorySlash-NotFound-logic.patch
+- do not consider php tests, they do not run anyway
+
 -------------------------------------------------------------------
 Sun Nov 14 10:21:09 UTC 2021 - Arjen de Korte <suse+build@de-korte.org>
 
diff --git a/apache2.spec b/apache2.spec
index 0b515e0..e9cf034 100644
--- a/apache2.spec
+++ b/apache2.spec
@@ -18,7 +18,7 @@
 
 %global upstream_name   httpd
 %global testsuite_name  %{upstream_name}-framework
-%global tversion        svn1878849
+%global tversion        svn1894461
 %global flavor          @BUILD_FLAVOR@%{nil}
 %define mpm             %{nil}
 %if "%{flavor}" == "prefork" || "%{flavor}" == "test_prefork"
@@ -198,6 +198,8 @@ 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
 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
@@ -243,7 +245,6 @@ BuildRequires:  apache2-worker
 BuildRequires:  apache2-event
 %endif
 %if %{unittest}
-BuildRequires:  mod_php_any
 # perl-doc is assumed by t/filter/case.t (/usr/lib/perl5/*/pod/perlsub.pod)
 BuildRequires:  perl-doc
 BuildRequires:  perl(Crypt::SSLeay)
@@ -327,6 +328,7 @@ provides HTTP services in sync with the current HTTP standards.
 %patch4 -p1
 %patch100 -p1
 %patch101 -p1
+%patch102 -p1
 
 #
 # BUILD
@@ -795,7 +797,6 @@ dep "lbmethod_byrequests" "proxy"
 dep "lbmethod_bytraffic"  "proxy"
 dep "lbmethod_heartbeat"  "proxy"
 for m in $modules; do
-  echo "$m" | grep -q 'php' && [ "%{mpm}" == 'worker' -o "%{mpm}" == 'event' ] && continue
   path=$(find %{_libdir}/apache2-%{mpm}/ %{_libdir}/apache2/ -name mod_$m.so | head -n 1)
   if ! grep -q "mod_$m.c" $PWD/load-all-modules.conf; then
     echo "<IfModule !mod_$m.c>"           >> $PWD/load-all-modules.conf
diff --git a/httpd-framework-svn1878849.tar.bz2 b/httpd-framework-svn1878849.tar.bz2
deleted file mode 100644
index 095c7a1..0000000
--- a/httpd-framework-svn1878849.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b82a6b1020c286dc13616b845dcf5b60a8bb0a062613d968e271f928b997d710
-size 1591311
diff --git a/httpd-framework-svn1894461.tar.bz2 b/httpd-framework-svn1894461.tar.bz2
new file mode 100644
index 0000000..dc6b856
--- /dev/null
+++ b/httpd-framework-svn1894461.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8536f6794f8ca000c2722e227c7ad6e17b33f8aeb0a5ce7662b4be110877733d
+size 1581270