Package: release.debian.org User: release.debian.org@packages.debian.org Usertags: unblock Severity: normal Please unblock package w3c-markup-validator That version fixes several RC issues: #738426: FTBFS when locale was not latin1 #670973: Now works with apache2.4 (jessie) unblock w3c-markup-validator/1.3+dfsg-2 -- System Information: Debian Release: jessie/sid APT prefers testing APT policy: (990, 'testing') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.16.0-4-amd64 (SMP w/2 CPU cores) Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash
diff -Nru w3c-markup-validator-1.3+dfsg/debian/changelog w3c-markup-validator-1.3+dfsg/debian/changelog --- w3c-markup-validator-1.3+dfsg/debian/changelog 2013-03-17 11:55:01.000000000 +0100 +++ w3c-markup-validator-1.3+dfsg/debian/changelog 2014-11-06 01:03:24.000000000 +0100 @@ -1,3 +1,28 @@ +w3c-markup-validator (1.3+dfsg-2) unstable; urgency=low + + * QA upload: + - Update maintainer to Debian QA. + - Drop uploader. + * Switch Vcs to alioth collab-maint. + * Update copyright file for lintian: + - Remove spaces in licence short names. + - Pack copyright information for mootools-1.2.5-core-nc.js. There can be + only one license per file. + * debian/rules: Ask lynx to directly outputs UTF-8, rather than assuming it + outputs latin1 and then converting it with iconv. (Closes: #738426) + * Transition to apache 2.4 (Closes: #670973) : + - Use apache2-maintscript-helper to enable modules and conf files. + - Also enable cgi module. + - Remove obsolete file /etc/apache2/conf.d/w3c-markup-validator.conf. + - Rewrite permission_override.patch for new authentication directives. + - Update validator_conf_debianize.patch comments for new location. + - Change Depends:apache|httpd-cgi to Recommends. + - New no_ap_expr.patch to enable SSI legacy expression parser. + * Bump policy to 3.9.6: No change required. + * Refresh lintian overrides. + + -- Jean-Michel Nirgal Vourgère <jmv_deb@nirgal.com> Thu, 06 Nov 2014 01:02:59 +0100 + w3c-markup-validator (1.3+dfsg-1) unstable; urgency=low * New upstream release diff -Nru w3c-markup-validator-1.3+dfsg/debian/control w3c-markup-validator-1.3+dfsg/debian/control --- w3c-markup-validator-1.3+dfsg/debian/control 2013-03-17 10:49:50.000000000 +0100 +++ w3c-markup-validator-1.3+dfsg/debian/control 2014-11-06 00:59:57.000000000 +0100 @@ -1,26 +1,25 @@ Source: w3c-markup-validator Section: web Priority: optional -Maintainer: Nicholas Bamber <nicholas@periapt.co.uk> -Uploaders: Jaldhar H. Vyas <jaldhar@debian.org> +Maintainer: Debian QA Group <packages@qa.debian.org> Build-Depends: debhelper (>= 8) Build-Depends-Indep: sharutils, perl, lynx, yui-compressor, w3c-sgml-lib (>= 1.3), libhtml-template-perl, libconfig-general-perl -Standards-Version: 3.9.4 +Standards-Version: 3.9.6 Homepage: http://validator.w3.org/about.html -Vcs-Git: git://github.com/periapt/w3c-markup-validator.git -Vcs-Browser: http://github.com/periapt/w3c-markup-validator/ +Vcs-Git: git://anonscm.debian.org/collab-maint/w3c-markup-validator.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/w3c-markup-validator.git Package: w3c-markup-validator Architecture: all -Depends: ${perl:Depends}, ${misc:Depends}, apache2 | httpd-cgi, +Depends: ${perl:Depends}, ${misc:Depends}, libwww-perl (>= 6), liburi-perl, libhtml-template-perl, libhtml-parser-perl (>= 3.60), libtext-iconv-perl, libset-intspan-perl, libnet-ip-perl, libconfig-general-perl, w3c-sgml-lib (>= 1.3), libencode-hanextra-perl, libhtml-encoding-perl, libjson-perl, libxml-libxml-perl (>= 1.70), libsgml-parser-opensp-perl, liblwp-protocol-https-perl -Recommends: libhtml-tidy-perl, libencode-jis2k-perl +Recommends: apache2 | httpd-cgi, libhtml-tidy-perl, libencode-jis2k-perl Suggests: libwebservice-validator-html-w3c-perl, libtest-html-w3c-perl, libxml-xpath-perl Description: W3C Markup Validator diff -Nru w3c-markup-validator-1.3+dfsg/debian/copyright w3c-markup-validator-1.3+dfsg/debian/copyright --- w3c-markup-validator-1.3+dfsg/debian/copyright 2013-03-11 21:40:28.000000000 +0100 +++ w3c-markup-validator-1.3+dfsg/debian/copyright 2014-11-05 23:55:26.000000000 +0100 @@ -28,26 +28,6 @@ Copyright: 2006-2008, Valerio Proietti <http://mad4milk.net/> License: MIT -Files: htdocs/scripts/mootools-1.2.5-core-nc.js -Comment: Class implementation inspired by [Base.js] -Copyright: 2006, Dean Edwards <http://dean.edwards.name/weblog/2006/03/base/> -License: LGPL-2+ - -Files: htdocs/scripts/mootools-1.2.5-core-nc.js -Comment: Some functionality inspired by [Prototype.js] -Copyright: 2005-2007, Sam Stephenson <http://prototypejs.org> -License: MIT - -Files: htdocs/scripts/mootools-1.2.5-core-nc.js -Comment: Element positioning based on the [qooxdoo] code and smart browser fixes -Copyright: http://qooxdoo.org/ -License: LGPL-2+ - -Files: htdocs/scripts/mootools-1.2.5-core-nc.js -Comment: Viewport dimensions based on [YUI] code -Copyright: YUI, <http://developer.yahoo.com/yui/> -License: BSD - Files: debian/validate.pl Copyright: 2003-2008, Struan Donald License: Artistic @@ -55,7 +35,7 @@ Files: debian/logo.png Copyright: 1999, Software in the Public Interest 2010, Nicholas Bamber <nicholas@periapt.co.uk> -License: Debian Open Use Logo License +License: Debian_Open_Use_Logo_License Files: debian/* Copyright: @@ -130,7 +110,7 @@ agree that you have read, understood, and will comply with the following terms and conditions. -License: Debian Open Use Logo License +License: Debian_Open_Use_Logo_License The logo without "Debian" is released under the following common free software license. . @@ -173,37 +153,3 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -License: LGPL-2+ - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2 of the License, or (at - your option) any later version. - . - On Debian systems, the complete text of version 2 of the GNU Lesser - Public License can be found in `/usr/share/common-licenses/LGPL-2'. - -License: BSD - Redistribution and use of this software in source and binary forms, with or - without modification, are permitted provided that the following conditions are - met: - . - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of Yahoo! Inc. nor the names of YUI's contributors may - be used to endorse or promote products derived from this software without - specific prior written permission of Yahoo! Inc. - . - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff -Nru w3c-markup-validator-1.3+dfsg/debian/patches/httpd_conf_debianize.patch w3c-markup-validator-1.3+dfsg/debian/patches/httpd_conf_debianize.patch --- w3c-markup-validator-1.3+dfsg/debian/patches/httpd_conf_debianize.patch 2012-10-04 21:05:05.000000000 +0200 +++ w3c-markup-validator-1.3+dfsg/debian/patches/httpd_conf_debianize.patch 2014-11-05 23:55:26.000000000 +0100 @@ -16,7 +16,7 @@ -# The values below assume that you have the validator files in -# /usr/local/validator. If not, tune them according to your setup. +# The w3c-markup-validator postinst script will link -+# /etc/apache2/conf.d/w3c-markup-validator.conf -> /etc/w3c/httpd.conf ++# /etc/apache2/conf.available/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. diff -Nru w3c-markup-validator-1.3+dfsg/debian/patches/no_ap_expr.patch w3c-markup-validator-1.3+dfsg/debian/patches/no_ap_expr.patch --- w3c-markup-validator-1.3+dfsg/debian/patches/no_ap_expr.patch 1970-01-01 01:00:00.000000000 +0100 +++ w3c-markup-validator-1.3+dfsg/debian/patches/no_ap_expr.patch 2014-11-06 00:24:09.000000000 +0100 @@ -0,0 +1,19 @@ +Subject: Activate server side includes legacy expression parser + . + w3c-markup-validator doesn't use new style "ap_expr" expressions yet. +Author: Jean-Michel Nirgal Vourgère +Forwarded: no +Last-Update: 2014-11-06 +Index: w3c-markup-validator/httpd/conf/httpd.conf +=================================================================== +--- w3c-markup-validator.orig/httpd/conf/httpd.conf ++++ w3c-markup-validator/httpd/conf/httpd.conf +@@ -95,6 +95,8 @@ Alias /w3c-validator/ /usr/share/w3c-m + # Permission may be denied higher up so override here. + Require all granted + ++ # That project doesn't use ap_expr yet: Enable legacy mode: ++ SSILegacyExprParser on + </Directory> + + # Atom news feed diff -Nru w3c-markup-validator-1.3+dfsg/debian/patches/permission_override.patch w3c-markup-validator-1.3+dfsg/debian/patches/permission_override.patch --- w3c-markup-validator-1.3+dfsg/debian/patches/permission_override.patch 2012-10-05 16:33:35.000000000 +0200 +++ w3c-markup-validator-1.3+dfsg/debian/patches/permission_override.patch 2014-11-05 23:55:26.000000000 +0100 @@ -1,19 +1,28 @@ -Author: Nicholas Bamber <nicholas@periapt.co.uk> +Author: Jean-Michel Nirgal Vourgère <jmv_deb@nirgal.com> Subject: Permission override in case access is denied generally -Last-Update: 2011-03-17 +Last-Update: 2014-11-05 Bug: http://lists.w3.org/Archives/Public/www-validator/2011Mar/0035.html Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=608225 ---- a/httpd/conf/httpd.conf -+++ b/httpd/conf/httpd.conf -@@ -89,6 +89,12 @@ +Index: w3c-markup-validator/httpd/conf/httpd.conf +=================================================================== +--- w3c-markup-validator.orig/httpd/conf/httpd.conf ++++ w3c-markup-validator/httpd/conf/httpd.conf +@@ -47,6 +47,7 @@ PerlPostConfigRequire /usr/share/w3c-mar + PerlResponseHandler ModPerl::Registry + PerlOptions +ParseHeaders + </IfDefine> ++ Require all granted + # Environment settings affecting validator's outside connectivity, see + # LWP::UserAgent and Net::FTP documentation for details. + #SetEnv http_proxy http://proxy:3128 +@@ -89,6 +90,11 @@ Alias /w3c-validator/ /usr/share/w3c-m ExpiresByType application/javascript A2592000 ExpiresByType application/ecmascript A2592000 </IfModule> + + # See bug 608225 + # Permission may be denied higher up so override here. -+ Order allow,deny -+ allow from all ++ Require all granted + </Directory> diff -Nru w3c-markup-validator-1.3+dfsg/debian/patches/series w3c-markup-validator-1.3+dfsg/debian/patches/series --- w3c-markup-validator-1.3+dfsg/debian/patches/series 2013-03-06 18:46:12.000000000 +0100 +++ w3c-markup-validator-1.3+dfsg/debian/patches/series 2014-11-06 00:27:40.000000000 +0100 @@ -3,6 +3,7 @@ mod_perl.patch remove_test_warning.patch permission_override.patch +no_ap_expr.patch dfsg.patch makefile.patch debian_logo.patch diff -Nru w3c-markup-validator-1.3+dfsg/debian/postinst w3c-markup-validator-1.3+dfsg/debian/postinst --- w3c-markup-validator-1.3+dfsg/debian/postinst 2012-10-04 00:48:48.000000000 +0200 +++ w3c-markup-validator-1.3+dfsg/debian/postinst 2014-11-05 23:55:26.000000000 +0100 @@ -26,8 +26,6 @@ case "$1" in configure|reconfigure) - server="apache2" - # Old versions stored config files here # We won't delete the old config file in case there are # customizations. However we must delete the link pointing to it @@ -37,32 +35,21 @@ rm /etc/$old/w3c-markup-validator.conf fi done + rm -f /etc/apache2/conf.d/w3c-markup-validator.conf - if [ ! -s /etc/$server/conf.d/w3c-markup-validator.conf ]; then - ln -s /etc/w3c/httpd.conf \ - /etc/$server/conf.d/w3c-markup-validator.conf - fi - - if [ $server = "apache2" ]; then - - if [ ! -s /etc/$server/mods-enabled/include.load ]; then - a2enmod include + if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then + . /usr/share/apache2/apache2-maintscript-helper + if ! a2query -qm include ; then + apache2_invoke enmod include || exit $? fi - - if [ ! -s /etc/$server/mods-enabled/rewrite.load ]; then - a2enmod rewrite + if ! a2query -qm rewrite ; then + apache2_invoke enmod rewrite || exit $? fi - - fi - - if [ -x "/etc/init.d/$server" ]; then - if [ -x /usr/sbin/invoke-rc.d ]; then - invoke-rc.d $server restart || true - else - /etc/init.d/$server restart || true - fi - fi - sleep 2 + if ! a2query -qm cgi ; then + apache2_invoke enmod cgi || exit $? + fi + apache2_invoke enconf w3c-markup-validator || exit $? + fi ;; diff -Nru w3c-markup-validator-1.3+dfsg/debian/postrm w3c-markup-validator-1.3+dfsg/debian/postrm --- w3c-markup-validator-1.3+dfsg/debian/postrm 2012-10-04 00:48:48.000000000 +0200 +++ w3c-markup-validator-1.3+dfsg/debian/postrm 2014-11-05 23:55:26.000000000 +0100 @@ -24,6 +24,10 @@ ;; purge) + if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then + . /usr/share/apache2/apache2-maintscript-helper + apache2_invoke disconf w3c-markup-validator || exit $? + fi rmdir /etc/w3c 2>/dev/null || true ;; diff -Nru w3c-markup-validator-1.3+dfsg/debian/prerm w3c-markup-validator-1.3+dfsg/debian/prerm --- w3c-markup-validator-1.3+dfsg/debian/prerm 2012-10-04 00:48:48.000000000 +0200 +++ w3c-markup-validator-1.3+dfsg/debian/prerm 2014-11-05 23:55:26.000000000 +0100 @@ -17,34 +17,10 @@ # the debian-policy package -case "$1" in - upgrade) - ;; - remove|deconfigure) - - server="apache2" - - if [ -s /etc/$server/conf.d/w3c-markup-validator.conf ]; then - rm /etc/$server/conf.d/w3c-markup-validator.conf - fi - - if [ -x "/etc/init.d/$server" ]; then - if [ -x /usr/sbin/invoke-rc.d ]; then - invoke-rc.d $server restart || true - else - /etc/init.d/$server restart || true - fi - fi - sleep 2 - - ;; - failed-upgrade) - ;; - *) - echo "prerm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac +if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then + . /usr/share/apache2/apache2-maintscript-helper + apache2_invoke disconf w3c-markup-validator || exit $? +fi # dh_installdeb will replace this with shell code automatically # generated by other debhelper scripts. diff -Nru w3c-markup-validator-1.3+dfsg/debian/rules w3c-markup-validator-1.3+dfsg/debian/rules --- w3c-markup-validator-1.3+dfsg/debian/rules 2013-03-15 09:01:28.000000000 +0100 +++ w3c-markup-validator-1.3+dfsg/debian/rules 2014-11-05 23:55:26.000000000 +0100 @@ -23,12 +23,13 @@ dh_install share/templates/en_US/* ${SHARED_DIR}/templates/en_US dh_install -Xconfig -Xtest htdocs/* ${HTML_DIR} dh_install debian/logo.png ${IMAGES_DIR} + dh_link ${CONFIG_DIR}/httpd.conf /etc/apache2/conf-available/w3c-markup-validator.conf override_dh_installdocs: mkdir -p debian/tmp - lynx -dump -nolist htdocs/todo.html | iconv -f latin1 > debian/tmp/TODO - lynx -dump -nolist htdocs/whatsnew.html | iconv -f latin1 > debian/tmp/changelog - lynx -dump -nolist htdocs/about.html | iconv -f latin1 > debian/tmp/README + lynx -dump -nolist -display_charset=utf-8 htdocs/todo.html > debian/tmp/TODO + lynx -dump -nolist -display_charset=utf-8 htdocs/whatsnew.html > debian/tmp/changelog + lynx -dump -nolist -display_charset=utf-8 htdocs/about.html > debian/tmp/README dh_installdocs diff -Nru w3c-markup-validator-1.3+dfsg/debian/w3c-markup-validator.lintian-overrides w3c-markup-validator-1.3+dfsg/debian/w3c-markup-validator.lintian-overrides --- w3c-markup-validator-1.3+dfsg/debian/w3c-markup-validator.lintian-overrides 2012-10-04 00:48:48.000000000 +0200 +++ w3c-markup-validator-1.3+dfsg/debian/w3c-markup-validator.lintian-overrides 2014-11-05 23:55:26.000000000 +0100 @@ -2,8 +2,8 @@ # Specifically the site behaves exactly as it would if javascript # were turned off. I suspect that these are somewhat modified by the W3C # from the original mootools and so this has to stay as it is. -w3c-markup-validator: embedded-javascript-library usr/share/w3c-markup-validator/html/scripts/mootools-1.2.5.1-more.js -w3c-markup-validator: embedded-javascript-library usr/share/w3c-markup-validator/html/scripts/mootools-1.2.5-core-nc.js +w3c-markup-validator: embedded-javascript-library usr/share/w3c-markup-validator/html/scripts/mootools-1.2.5-core-nc.js please use libjs-mootools +w3c-markup-validator: embedded-javascript-library usr/share/w3c-markup-validator/html/scripts/mootools-1.2.5.1-more.js please use libjs-mootools # These files are required for content negotiation. # See #618469 w3c-markup-validator: duplicated-compressed-file
Attachment:
signature.asc
Description: OpenPGP digital signature