[SCM] Debian packaging of libapache2-mod-perl2 branch, master, updated. debian/2.0.8+httpd24-r1449661-5-5-gc52cb16

[gregor herrmann]

The following commit has been merged in the master branch:
commit f5f161b7cf26718bdfe28750453495439889328c
Author: gregor herrmann <gregoa at debian.org>
Date:   Sat Jun 22 03:17:43 2013 +0200

    update patch for mod-auth changes
    
    thanks again to Jorge Manuel B. S. Vicetto
    
    Git-Dch: Ignore

diff --git a/debian/patches/330-mod_authz_core.patch b/debian/patches/330-mod_authz_core.patch
new file mode 100644
index 0000000..83a9630
--- /dev/null
+++ b/debian/patches/330-mod_authz_core.patch
@@ -0,0 +1,99 @@
+Description: adjust test config to mod_authz_core changes in 2.4
+Origin: Gentoo
+Forwarded: no
+Author: Jorge Manuel B. S. Vicetto
+Reviewed-by: gregor herrmann <gregoa at debian.org>
+Last-Update: 2013-06-22
+
+--- a/t/response/TestModules/proxy.pm
++++ b/t/response/TestModules/proxy.pm
+@@ -47,9 +47,7 @@
+     <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>
+ 
+--- a/t/response/TestAPI/access2.pm
++++ b/t/response/TestAPI/access2.pm
+@@ -103,16 +103,17 @@
+ 
+     <IfModule @ACCESS_MODULE@>
+         # needed to test $r->satisfies
+-        Allow from All
++        Require all granted
+     </IfModule>
+     AuthType Basic
+     AuthName "Access"
+-    Require my-user goo bar
+-    Require my-group xar tar
+-    <Limit POST>
+-       Require valid-user
+-    </Limit>
+-    Satisfy All
++    <RequireAll>
++        Require my-user goo bar
++        Require my-group xar tar
++        <Limit POST>
++            Require valid-user
++        </Limit>
++    </RequireAll>
+     <IfModule @AUTH_MODULE@>
+         # htpasswd -mbc auth-users goo foo
+         # htpasswd -mb auth-users bar mar
+--- a/t/filter/TestFilter/both_str_req_proxy.pm
++++ b/t/filter/TestFilter/both_str_req_proxy.pm
+@@ -62,9 +62,7 @@
+     <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>
+ 
+--- a/t/protocol/TestProtocol/pseudo_http.pm
++++ b/t/protocol/TestProtocol/pseudo_http.pm
+@@ -154,21 +154,21 @@
+ 
+   <Location TestProtocol::pseudo_http>
+ 
+-      <IfModule @ACCESS_MODULE@>
+-          Order Deny,Allow
+-          Allow from @servername@
+-      </IfModule>
+-
+-      <IfModule @AUTH_MODULE@>
+-          # htpasswd -mbc basic-auth stas foobar
+-          # using md5 password so it'll work on win32 too
+-          AuthUserFile @ServerRoot@/htdocs/protocols/basic-auth
+-      </IfModule>
+-
+-      AuthName TestProtocol::pseudo_http
+-      AuthType Basic
+-      Require user stas
+-      Satisfy any
++      <RequireAny>
++        <IfModule @ACCESS_MODULE@>
++            Require host @servername@
++        </IfModule>
++
++        <IfModule @AUTH_MODULE@>
++            # htpasswd -mbc basic-auth stas foobar
++            # using md5 password so it'll work on win32 too
++            AuthUserFile @ServerRoot@/htdocs/protocols/basic-auth
++        </IfModule>
++
++        AuthName TestProtocol::pseudo_http
++        AuthType Basic
++        Require user stas
++      </RequireAny>
+ 
+   </Location>
+ 
diff --git a/debian/patches/330-proxy-test-auth.patch b/debian/patches/330-proxy-test-auth.patch
deleted file mode 100644
index aae5d04..0000000
--- a/debian/patches/330-proxy-test-auth.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: adjust test config to mod_authz_core changes in 2.4
-Origin: Gentoo
-Forwarded: no
-Author: Jorge Manuel B. S. Vicetto
-Reviewed-by: gregor herrmann <gregoa at debian.org>
-Last-Update: 2013-06-21
-
---- a/t/response/TestModules/proxy.pm
-+++ b/t/response/TestModules/proxy.pm
-@@ -47,9 +47,7 @@
-     <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/debian/patches/series b/debian/patches/series
index f61a07a..1fd16de 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,5 +14,5 @@ avoid-db-linkage.patch
 300-http-headers-version.patch
 310-defaultruntimedir.patch
 320-cleanup-authn-authz-providers.patch
-#330-proxy-test-auth.patch
+#330-mod_authz_core.patch
 340-rewrite-2.4.patch

-- 
Debian packaging of libapache2-mod-perl2