* Add a prereq on Data::Dumper 2.11 or better, needed to dump q// objects.

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index 16e5bd3501541aa9fab36f82d2d3a02420f707fd..2103ea53a501b4a048192ebc289ec0eade86741a 100644 (file)
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -3,7 +3,7 @@
 use warnings;
 use strict;
 use Cwd q{abs_path};
 use warnings;
 use strict;
 use Cwd q{abs_path};

-use Data::Dumper;
+use Data::Dumper ;

 use IkiWiki;
 
 package IkiWiki;
 use IkiWiki;
 
 package IkiWiki;

diff --git a/Makefile.PL b/Makefile.PL
index bd5bb7eee607fe31c61b12cd57809399cb3e7dc9..49fac1adecbfa1e57ac85414bd7b661366568e53 100755 (executable)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -103,5 +103,6 @@ WriteMakefile(
                'Mail::Sendmail'        => 0,
                'HTML::Parser'          => 0,
                'URI'                   => 0,
                'Mail::Sendmail'        => 0,
                'HTML::Parser'          => 0,
                'URI'                   => 0,

+               'Data::Dumper'          => 2.11,

        },
 );
        },
 );

diff --git a/debian/changelog b/debian/changelog
index 9bfdb6a58e6998fe58d89b5fbf08da0c9d8ef318..84219d267ebe9aaa09cb24295eee436efed91742 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ ikiwiki (2.19) UNRELEASED; urgency=low
     forcing a user to log in.
   * opendiscussion: allow editing of the toplevel discussion page,
     and, indirectly, allow creating new discussion pages.
     forcing a user to log in.
   * opendiscussion: allow editing of the toplevel discussion page,
     and, indirectly, allow creating new discussion pages.

+  * Add a prereq on Data::Dumper 2.11 or better, needed to dump q// objects.

 
  -- Joey Hess <joeyh@debian.org>  Mon, 07 Jan 2008 15:35:16 -0500
 
 
  -- Joey Hess <joeyh@debian.org>  Mon, 07 Jan 2008 15:35:16 -0500
 

diff --git a/doc/bugs/taint_issue_with_regular_expressions.mdwn b/doc/bugs/taint_issue_with_regular_expressions.mdwn
index 5ba9e19f6ae042b4b4302bff4a99604a54015086..6544c8aaeb553bd09491b253adc69dc2e7f7b0e4 100644 (file)
--- a/doc/bugs/taint_issue_with_regular_expressions.mdwn
+++ b/doc/bugs/taint_issue_with_regular_expressions.mdwn
@@ -29,3 +29,7 @@ without any payload of the actual regexp, and that would also certainly also hav
     'wiki_file_regexp' => qr/(?-xism:(^[-[:alnum:]_.:\/+]+$))/
 
 This would call for at most an installation prerequisite of Data::Dumper >= 1.121.  A look at the module's changelog shows that no intervening versions were actually released, so 1.121 would be the minimal good one.
     'wiki_file_regexp' => qr/(?-xism:(^[-[:alnum:]_.:\/+]+$))/
 
 This would call for at most an installation prerequisite of Data::Dumper >= 1.121.  A look at the module's changelog shows that no intervening versions were actually released, so 1.121 would be the minimal good one.

+
+> You must have a very old version of perl there. This seems to be a bug in
+> data dumper before 2.11, which didn't properly dump q// objects. Prereq
+> added, [[done]] --[[Joey]]