* Fix wrapper generator and untaint code's handling of strings contining

  newlines.

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 015df1f74a644c49374279c9a22f701f3ba30d63..fdb62f7da028f88c139b76949427fb7867767b67 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -206,7 +206,7 @@ sub log_message ($$) { #{{{
 
 sub possibly_foolish_untaint ($) { #{{{
        my $tainted=shift;
 
 sub possibly_foolish_untaint ($) { #{{{
        my $tainted=shift;

-       my ($untainted)=$tainted=~/(.*)/;
+       my ($untainted)=$tainted=~/(.*)/s;

        return $untainted;
 } #}}}
 
        return $untainted;
 } #}}}
 

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index 8c363cc11219111db798fa8b8704a3571519b352..9415d4a17646a47ef41228bf8bada9a3795d8b28 100644 (file)
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -57,7 +57,7 @@ EOF
        my $configstring=Data::Dumper->Dump([\%config], ['*config']);
        $configstring=~s/\\/\\\\/g;
        $configstring=~s/"/\\"/g;
        my $configstring=Data::Dumper->Dump([\%config], ['*config']);
        $configstring=~s/\\/\\\\/g;
        $configstring=~s/"/\\"/g;

-       $configstring=~s/\n/\\\n/g;
+       $configstring=~s/\n/\\n/g;

        
        #translators: The first parameter is a filename, and the second is
        #translators: a (probably not translated) error message.
        
        #translators: The first parameter is a filename, and the second is
        #translators: a (probably not translated) error message.

diff --git a/debian/changelog b/debian/changelog
index 6b2794eaf7a1d936b49e27de6f571f1068e6777e..dd7f509b387fb07f038a452f430978df8c80a08a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,8 +32,10 @@ ikiwiki (2.2) UNRELEASED; urgency=low
     in a PageSpec.
   * Explode some of the more insane regexps.
   * Add test suite for preprocessor directive parsing.
     in a PageSpec.
   * Explode some of the more insane regexps.
   * Add test suite for preprocessor directive parsing.

+  * Fix wrapper generator and untaint code's handling of strings contining
+    newlines.

 
 

- -- Joey Hess <joeyh@debian.org>  Sat, 02 Jun 2007 01:03:37 -0400
+ -- Joey Hess <joeyh@debian.org>  Sun, 03 Jun 2007 12:20:26 -0400

 
 ikiwiki (2.1) unstable; urgency=low
 
 
 ikiwiki (2.1) unstable; urgency=low
 

diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 67c5356cf62248defd0d8cb4cd62f1935d6bfd9b..15d20ce2955cafbde4c468406ebe772855e36494 100644 (file)
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2007-06-01 19:35-0400\n"
+"POT-Creation-Date: 2007-06-03 12:21-0400\n"

 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"