[xml/sgml-commit] r1851 - in /packages/w3c-markup-validator/trunk/debian: changelog patches/mod_perl_disable.patch patches/series

[periapt-guest at users.alioth.debian.org]

Author: periapt-guest
Date: Wed Mar 16 13:38:50 2011
New Revision: 1851

URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1851
Log:
TODO: 
* Disabled mod_perl support (cf. #618416)

Added:
    packages/w3c-markup-validator/trunk/debian/patches/mod_perl_disable.patch
Modified:
    packages/w3c-markup-validator/trunk/debian/changelog
    packages/w3c-markup-validator/trunk/debian/patches/series

Modified: packages/w3c-markup-validator/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/w3c-markup-validator/trunk/debian/changelog?rev=1851&op=diff
==============================================================================
--- packages/w3c-markup-validator/trunk/debian/changelog (original)
+++ packages/w3c-markup-validator/trunk/debian/changelog Wed Mar 16 13:38:50 2011
@@ -1,7 +1,6 @@
 w3c-markup-validator (1.2-1) UNRELEASED; urgency=low
 
-  TODO: mod_perl incompatibility: confirm, forward upstream and try
-  turning off block in config
+  TODO: 
   - consider permissions block #608225
   - copyright
 
@@ -11,6 +10,7 @@
     to support content negotiation (Closes: #618469)
   * Moved test files to the examples directory
   * Reviewed dependencies
+  * Disabled mod_perl support (cf. #618416)
 
  -- Nicholas Bamber <nicholas at periapt.co.uk>  Mon, 14 Mar 2011 10:30:01 +0000
 

Added: packages/w3c-markup-validator/trunk/debian/patches/mod_perl_disable.patch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/w3c-markup-validator/trunk/debian/patches/mod_perl_disable.patch?rev=1851&op=file
==============================================================================
--- packages/w3c-markup-validator/trunk/debian/patches/mod_perl_disable.patch (added)
+++ packages/w3c-markup-validator/trunk/debian/patches/mod_perl_disable.patch Wed Mar 16 13:38:50 2011
@@ -1,0 +1,36 @@
+Author: Nicholas Bamber <nicholas at periapt.co.uk>
+Subject: problems with mod_perl
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=618469
+Last-Update: 2011-03-16
+--- a/httpd/conf/httpd.conf
++++ b/httpd/conf/httpd.conf
+@@ -6,27 +6,17 @@
+ # The w3c-markup-validator postinst script will link
+ # /etc/apache2/conf.d/w3c-markup-validator.conf -> /etc/w3c/httpd.conf
+ #
+-# To run the validator without mod_perl 2.x even if it is loaded, comment
+-# out the "IfDefine MODPERL2" sections below.
++# Note: mod_perl has been disabled. See #618469.
++#
+ 
+ # First, tell httpd that check and sendfeedback.pl are CGI scripts.
+ 
+ AliasMatch ^/+w3c-validator/+check(/+referer)?$   /usr/lib/cgi-bin/w3c-markup-validator/check
+ AliasMatch ^/+w3c-validator/+feedback(\.html)?$ /usr/lib/cgi-bin/w3c-markup-validator/sendfeedback.pl
+ 
+-<IfDefine MODPERL2>
+-# Note: this affects the whole server, not just the validator.
+-PerlSwitches -T
+-</IfDefine>
+-
+ <LocationMatch "^/+w3c-validator/+(check(/+referer)?|feedback(\.html)?)$">
+   Options               +ExecCGI
+   SetHandler            cgi-script
+-<IfDefine MODPERL2>
+-  SetHandler            perl-script
+-  PerlResponseHandler   ModPerl::Registry
+-  PerlOptions           +ParseHeaders
+-</IfDefine>
+   # Environment settings affecting validator's outside connectivity, see
+   # LWP::UserAgent and Net::FTP documentation for details.
+   #SetEnv                http_proxy      http://proxy:3128

Modified: packages/w3c-markup-validator/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/w3c-markup-validator/trunk/debian/patches/series?rev=1851&op=diff
==============================================================================
--- packages/w3c-markup-validator/trunk/debian/patches/series (original)
+++ packages/w3c-markup-validator/trunk/debian/patches/series Wed Mar 16 13:38:50 2011
@@ -3,3 +3,4 @@
 debian_logo.patch
 remove_test_warning.patch
 restrict_support_to_http.patch
+mod_perl_disable.patch