Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package apache2 for openSUSE:Factory checked
in at 2021-11-27 00:50:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/apache2 (Old)
and /work/SRC/openSUSE:Factory/.apache2.new.1895 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache2"
Sat Nov 27 00:50:47 2021 rev:188 rq:933435 version:2.4.51
Changes:
--------
--- /work/SRC/openSUSE:Factory/apache2/apache2.changes 2021-11-20
02:38:10.172972328 +0100
+++ /work/SRC/openSUSE:Factory/.apache2.new.1895/apache2.changes
2021-11-27 00:51:27.602773960 +0100
@@ -1,0 +2,9 @@
+Wed Nov 24 11:04:43 UTC 2021 - pgaj...@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
+
+-------------------------------------------------------------------
Old:
----
httpd-framework-svn1878849.tar.bz2
New:
----
apache-test-DirectorySlash-NotFound-logic.patch
httpd-framework-svn1894461.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ apache2.spec ++++++
--- /var/tmp/diff_new_pack.kbNP10/_old 2021-11-27 00:51:28.778769900 +0100
+++ /var/tmp/diff_new_pack.kbNP10/_new 2021-11-27 00:51:28.778769900 +0100
@@ -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 @@
# 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-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 @@
%patch4 -p1
%patch100 -p1
%patch101 -p1
+%patch102 -p1
#
# BUILD
@@ -795,7 +797,6 @@
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
++++++ apache-test-DirectorySlash-NotFound-logic.patch ++++++
--- 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 {
++++++ httpd-framework-svn1878849.tar.bz2 -> httpd-framework-svn1894461.tar.bz2
++++++
++++ 2853 lines of diff (skipped)
