Accepting request 252281 from Apache:Modules

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/252281
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache2-mod_perl?expand=0&rev=35

apache2-mod_perl.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Wed Sep 17 10:35:26 UTC 2014 - jsegitz@suse.com
+
+- Changed access control statements in config file to use 
+  mod_authz_host (bnc#897005)
+
+-------------------------------------------------------------------
+Tue Sep  9 12:48:46 UTC 2014 - vcizek@suse.com
+
+- adapt test configuration for apache24 to fix build
+  * use the new access control mechanisms from apache24
+  * added apache24-mod_authz_host.patch
+
 -------------------------------------------------------------------
 Mon Jul 21 12:07:26 UTC 2014 - vcizek@suse.com
 

apache2-mod_perl.spec

@@ -60,6 +60,7 @@ Patch:          %{name}-2.0.4-tests.diff
 # PATCH-NEEDS-REBASE
 Patch1:         lfs-perl-5.14.patch 
 Patch2:         avoid-broken-provides.diff
+Patch3:         apache24-mod_authz_host.patch
 Icon:         mod_perl.xpm
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -116,6 +117,7 @@ software depending on apache2-mod_perl.
 #%setup -q -n modperl-2.0 -a 1
 %setup -q -n httpd24
 %patch2 -p1
+%patch3 -p1
 #%patch1 -p1
 find -name ".svn" -type d | xargs rm -rfv
 
@@ -237,8 +239,13 @@ cat > $RPM_BUILD_ROOT/%{apache_sysconfdir}/conf.d/mod_perl.conf <<EOF
 <Directory "%{apache_serverroot}/perl-lib">
     AllowOverride None
     Options None
-    Order allow,deny
-    Deny from all
+    <IfModule !mod_authz_host.c>
+      Order allow,deny
+      Deny from all
+    </IfModule>
+    <IfModule mod_authz_host.c>
+      Require all granted
+    </IfModule>
 </Directory>
 <IfModule mod_perl.c>
     PerlRequire "/etc/apache2/mod_perl-startup.pl"

apache24-mod_authz_host.patch

@@ -0,0 +1,80 @@
+diff --git a/t/filter/TestFilter/both_str_req_proxy.pm b/t/filter/TestFilter/both_str_req_proxy.pm
+index 9e2ba81..4d0b72b 100644
+--- a/t/filter/TestFilter/both_str_req_proxy.pm
++++ b/t/filter/TestFilter/both_str_req_proxy.pm
+@@ -62,9 +62,7 @@ __DATA__
+     <IfModule mod_proxy.c>
+         <Proxy http://@servername@:@port@/*>
+             <IfModule @ACCESS_MODULE@>
+-                Order Deny,Allow
+-                Deny from all
+-                Allow from @servername@
++                Require host @servername@
+             </IfModule>
+         </Proxy>
+ 
+diff --git a/t/protocol/TestProtocol/pseudo_http.pm b/t/protocol/TestProtocol/pseudo_http.pm
+index bb49ec8..1b8e93b 100644
+--- a/t/protocol/TestProtocol/pseudo_http.pm
++++ b/t/protocol/TestProtocol/pseudo_http.pm
+@@ -154,9 +154,9 @@ __END__
+ 
+   <Location TestProtocol::pseudo_http>
+ 
++      <RequireAny>
+       <IfModule @ACCESS_MODULE@>
+-          Order Deny,Allow
+-          Allow from @servername@
++          Require host @servername@
+       </IfModule>
+ 
+       <IfModule @AUTH_MODULE@>
+@@ -168,7 +168,7 @@ __END__
+       AuthName TestProtocol::pseudo_http
+       AuthType Basic
+       Require user stas
+-      Satisfy any
++      </RequireAny>
+ 
+   </Location>
+ 
+diff --git a/t/response/TestAPI/access2.pm b/t/response/TestAPI/access2.pm
+index 718800e..836d54a 100644
+--- a/t/response/TestAPI/access2.pm
++++ b/t/response/TestAPI/access2.pm
+@@ -101,9 +101,10 @@ PerlAddAuthzProvider my-group TestAPI::access2->authz_handler
+     PerlResponseHandler Apache::TestHandler::ok1
+     SetHandler modperl
+ 
++	<RequireAll>
+     <IfModule @ACCESS_MODULE@>
+         # needed to test $r->satisfies
+-        Allow from All
++        Require all granted
+     </IfModule>
+     AuthType Basic
+     AuthName "Access"
+@@ -112,7 +113,7 @@ PerlAddAuthzProvider my-group TestAPI::access2->authz_handler
+     <Limit POST>
+        Require valid-user
+     </Limit>
+-    Satisfy All
++	</RequireAll>
+     <IfModule @AUTH_MODULE@>
+         # htpasswd -mbc auth-users goo foo
+         # htpasswd -mb auth-users bar mar
+diff --git a/t/response/TestModules/proxy.pm b/t/response/TestModules/proxy.pm
+index ab59026..91e251e 100644
+--- a/t/response/TestModules/proxy.pm
++++ b/t/response/TestModules/proxy.pm
+@@ -47,9 +47,7 @@ __END__
+     <IfModule mod_proxy.c>
+         <Proxy http://@servername@:@port@/*>
+             <IfModule @ACCESS_MODULE@>
+-                Order Deny,Allow
+-                Deny from all
+-                Allow from @servername@
++                Require host @servername@
+             </IfModule>
+         </Proxy>
+