[xml/sgml-commit] r1749 - in /packages/w3c-markup-validator/trunk/debian: README.Debian authentication.txt changelog patches/remove_test_warning.patch patches/restrict_support_to_http.patch patches/series rules
periapt-guest at users.alioth.debian.org
periapt-guest at users.alioth.debian.org
Thu Aug 19 12:08:00 UTC 2010
Author: periapt-guest
Date: Thu Aug 19 12:07:01 2010
New Revision: 1749
URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1749
Log:
* Basing apache config fragment on upstream supplied fragment. As a
consequence of this the home page is http://localhost/w3c-validator/.
(Closes: #456904).
* Restricting support to http. This is a holding operation for #445265.
* Reviewing README.Debian (Closes: #549025).
Added:
packages/w3c-markup-validator/trunk/debian/authentication.txt
packages/w3c-markup-validator/trunk/debian/patches/remove_test_warning.patch
packages/w3c-markup-validator/trunk/debian/patches/restrict_support_to_http.patch
Modified:
packages/w3c-markup-validator/trunk/debian/README.Debian
packages/w3c-markup-validator/trunk/debian/changelog
packages/w3c-markup-validator/trunk/debian/patches/series
packages/w3c-markup-validator/trunk/debian/rules
Modified: packages/w3c-markup-validator/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/w3c-markup-validator/trunk/debian/README.Debian?rev=1749&op=diff
==============================================================================
--- packages/w3c-markup-validator/trunk/debian/README.Debian (original)
+++ packages/w3c-markup-validator/trunk/debian/README.Debian Thu Aug 19 12:07:01 2010
@@ -9,9 +9,9 @@
Suggested post-installation tests
=================================
-1.) Run /usr/lib/cgi-bin/w3c-markup-validator/check
+1.) Run /usr/lib/cgi-bin/w3c-validator/check
This should return an HTML page complaining that that type of document is not
supported. It should not complain of syntax or configuration errors.
-2.) If online run /usr/lib/cgi-bin/w3c-markup-validator/check 'uri=http://www.periapt.co.uk'.
+2.) If online run /usr/lib/cgi-bin/w3c-validator/check 'uri=http://www.periapt.co.uk'.
This should return an HTML page confirming valid HTML.
-3.) lynx http://localhost/w3c-markup-validator and run any tests you can think of.
+3.) Point your browser at http://localhost/w3c-validator/ and run any tests you can think of.
Added: packages/w3c-markup-validator/trunk/debian/authentication.txt
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/w3c-markup-validator/trunk/debian/authentication.txt?rev=1749&op=file
==============================================================================
--- packages/w3c-markup-validator/trunk/debian/authentication.txt (added)
+++ packages/w3c-markup-validator/trunk/debian/authentication.txt Thu Aug 19 12:07:01 2010
@@ -1,0 +1,39 @@
+Note from Adam Sjøgren <asjo at koldfront.dk> in Bug#298772:
+
+[ Note from Nicholas Bamber <nicholas at periapt.co.uk>.
+I have not had time to check this stuff out.
+Howver the patch is now out of date. "w3c-markup-validator" is now
+"w3c-validator/". ]
+
+The Apache-configuration supplied by this package is insufficient for
+validating pages that require http-authorization.
+
+The "check" script attempts to proxy the auth-request (the browser
+pops up a login/password dialogue), but fails (the dialogue keeps
+appearing over and over despite correctly entered login/password).
+
+The problem is that the script expects the environment variable
+HTTP_AUTHORIZATION to contain the contents of the Authorization-header
+(see line 1408 in /usr/lib/cgi-bin/check). It does not by default.
+
+By searching a little I've found an easy way to set this using
+mod_rewrite, as shown in this tiny patch:
+
+
+--- apache.conf.orig 2005-03-09 22:34:20.875157298 +0100
++++ apache.conf 2005-03-09 22:34:47.086559812 +0100
+@@ -2,6 +2,10 @@
+ ScriptAlias /w3c-markup-validator/checklink /usr/lib/cgi-bin/checklink
+ Alias /w3c-markup-validator /usr/share/w3c-markup-validator/html
+
++RewriteEngine On
++RewriteCond %{HTTP:Authorization} ^(.*)$ [NC]
++RewriteRule /.* - [E=HTTP_AUTHORIZATION:%1]
++
+ <Location /w3c-markup-validator>
+ Options +Includes +MultiViews
+ AddHandler server-parsed .html
+
+
+
+ -- Frederic Schutz <schutz at mathgen.ch> Thu, 18 May 2006 19:18:55 +0200
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=1749&op=diff
==============================================================================
--- packages/w3c-markup-validator/trunk/debian/changelog (original)
+++ packages/w3c-markup-validator/trunk/debian/changelog Thu Aug 19 12:07:01 2010
@@ -8,11 +8,15 @@
* New maintainer rebuilt package from first principles (Closes: #573497)
* Upgraded to upstream version 1.1 (Closes: #461021 and Closes: #437795)
* Restricting dependency to apache2 until someone volunteers to do
- integration for other web servers.
+ integration for other web servers.
* Changed dependency from w3c-dtd-xhtml and sgml-data to w3c-sgml-lib.
- * Basing apache config fragment on upstream supplied fragment.
+ * Basing apache config fragment on upstream supplied fragment. As a
+ consequence of this the home page is http://localhost/w3c-validator/.
+ (Closes: #456904).
* Setting version dependency on libwww-perl after investigating taint issues
* Replacing W3C placeholder logo with customized Debian logo.
+ * Restricting support to http. This is a holding operation for #445265.
+ * Reviewing README.Debian (Closes: #549025).
-- Nicholas Bamber <nicholas at periapt.co.uk> Fri, 30 Jul 2010 22:41:09 +0100
Added: packages/w3c-markup-validator/trunk/debian/patches/remove_test_warning.patch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/w3c-markup-validator/trunk/debian/patches/remove_test_warning.patch?rev=1749&op=file
==============================================================================
--- packages/w3c-markup-validator/trunk/debian/patches/remove_test_warning.patch (added)
+++ packages/w3c-markup-validator/trunk/debian/patches/remove_test_warning.patch Thu Aug 19 12:07:01 2010
@@ -1,0 +1,53 @@
+Subject: Remove warning about test instance
+ The warning is quite alarming and looks like an error.
+ We have already customized the logo to be based upon Debian
+ so noone should think this is the original.
+Author: Nicholas Bamber <nicholas at peript.co.uk>
+Forwarded: not-needed
+Last-Update: 2010-08-19
+--- a/htdocs/intro.html
++++ b/htdocs/intro.html
+@@ -15,7 +15,3 @@
+ <div class="intro" id="don_program"></div>
+ <script type="text/javascript" src="http://www.w3.org/QA/Tools/don_prog.js"></script>
+
+-<p id="test_warning"><img src="images/info_icons/warning.png" alt="Important" />
+- This instance of the validator is either a development version used for testing purposes, or a local copy of the <a href="http://validator.w3.org/source/">W3C Markup Validator software</a> used for development and testing purposes.<br />
+- The official validation service supported by the W3C is at <a href="http://validator.w3.org/">validator.w3.org</a>.
+-</p>
+--- a/htdocs/style/base.css
++++ b/htdocs/style/base.css
+@@ -714,26 +714,6 @@
+ }
+
+
+-/* warning on the home page for test instances */
+-#test_warning {
+- border-left: 1px solid #ccc;
+- border-right: 1px solid #ccc;
+- line-height: 160%;
+- text-align: center;
+- margin-top: 2em;
+- margin-left: 12%;
+- margin-right: 12%;
+- padding-left: 1.5em;
+- padding-right: 1.5em;
+- color: black;
+- background-color: white;
+-}
+-
+-#test_warning img {
+- width: 1.3em;
+- vertical-align: middle;
+-}
+-
+ /* donation and sponsorship program */
+
+ div#don_program { border: 1px solid #55b05a; padding: .5em; line-height: 150%; text-align: center; margin-top: .5em; }
+@@ -741,4 +721,4 @@
+ div#don_program span#don_program_img img {vertical-align: middle;}
+ div#don_program span#don_program_text { }
+ div#don_program span#don_program_text a {font-weight: bold;}
+-/* @end */
+\ No newline at end of file
++/* @end */
Added: packages/w3c-markup-validator/trunk/debian/patches/restrict_support_to_http.patch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/w3c-markup-validator/trunk/debian/patches/restrict_support_to_http.patch?rev=1749&op=file
==============================================================================
--- packages/w3c-markup-validator/trunk/debian/patches/restrict_support_to_http.patch (added)
+++ packages/w3c-markup-validator/trunk/debian/patches/restrict_support_to_http.patch Thu Aug 19 12:07:01 2010
@@ -1,0 +1,19 @@
+Subject: Restrict support to http
+ Issues with https have been reported in the past.
+ I would like to support all the protocols but I do not
+ have the time to investigate for now.
+Author: Nicholas Bamber <nicholas at periapt.co.uk>
+Last-Update: 2010-08-19
+Forwarded: not-needed
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=445265
+--- a/htdocs/config/validator.conf
++++ b/htdocs/config/validator.conf
+@@ -72,7 +72,7 @@
+ # Protocols the validator is allowed to use for retrieving documents.
+ # The default is to allow http and https.
+ <Protocols>
+- Allow = data,ftp,http,https
++ Allow = http
+ </Protocols>
+
+ #
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=1749&op=diff
==============================================================================
--- packages/w3c-markup-validator/trunk/debian/patches/series (original)
+++ packages/w3c-markup-validator/trunk/debian/patches/series Thu Aug 19 12:07:01 2010
@@ -1,3 +1,5 @@
validator_conf_debianize.patch
httpd_conf_debianize.patch
debian_logo.patch
+remove_test_warning.patch
+restrict_support_to_http.patch
Modified: packages/w3c-markup-validator/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/w3c-markup-validator/trunk/debian/rules?rev=1749&op=diff
==============================================================================
--- packages/w3c-markup-validator/trunk/debian/rules (original)
+++ packages/w3c-markup-validator/trunk/debian/rules Thu Aug 19 12:07:01 2010
@@ -30,7 +30,7 @@
dh_install htdocs/dev/tests/* ${SHARED_DIR}/html/dev/tests
dh_install htdocs/docs/* ${SHARED_DIR}/html/docs
dh_install htdocs/source/* ${SHARED_DIR}/html/source
- dh_install debian/logo.png ${SHARED_DIR}/html
+ dh_install debian/logo.png ${IMAGES_DIR}
dh_install htdocs/images/info_icons/*.* ${IMAGES_DIR}/info_icons
dh_install htdocs/images/valid_icons/*.* ${IMAGES_DIR}/valid_icons
dh_install htdocs/images/*.* ${IMAGES_DIR}/
More information about the debian-xml-sgml-commit
mailing list