From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Wed, 25 Jul 2007 02:15:52 +0000 (+0000)
Subject: * Fix graphviz plugin to not try to read images as utf-8; they might
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/a7b8e35bf90fa9e2df8be78ac636b158760ecf9c?ds=sidebyside

* Fix graphviz plugin to not try to read images as utf-8; they might
  sometimes contain invalid utf-8 byte sequences. Thanks,
  HenrikBrixAndersen.
---

diff --git a/IkiWiki/Plugin/graphviz.pm b/IkiWiki/Plugin/graphviz.pm
index 5d666e1be..ee97c71d1 100644
--- a/IkiWiki/Plugin/graphviz.pm
+++ b/IkiWiki/Plugin/graphviz.pm
@@ -41,7 +41,6 @@ sub render_graph (\%) { #{{{
 		$pid=open2(*IN, *OUT, "$params{prog} -Tpng");
 
 		# open2 doesn't respect "use open ':utf8'"
-		binmode (IN, ':utf8');
 		binmode (OUT, ':utf8');
 
 		print OUT $src;
diff --git a/debian/changelog b/debian/changelog
index b3310a4e0..743bff55a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,11 @@ ikiwiki (2.5) UNRELEASED; urgency=low
     it.
   * Add a htmlext config option, this can be used to make ikiwiki generate
     html files with a different extension.
+  * Fix graphviz plugin to not try to read images as utf-8; they might
+    sometimes contain invalid utf-8 byte sequences. Thanks,
+    HenrikBrixAndersen.
 
- -- Joey Hess <joeyh@debian.org>  Tue, 24 Jul 2007 21:11:30 -0400
+ -- Joey Hess <joeyh@debian.org>  Tue, 24 Jul 2007 22:14:41 -0400
 
 ikiwiki (2.4) unstable; urgency=low
 
diff --git a/doc/bugs/Problems_with_graphviz.pm_plug-in.mdwn b/doc/bugs/Problems_with_graphviz.pm_plug-in.mdwn
index 7abf152b9..9eca41faf 100644
--- a/doc/bugs/Problems_with_graphviz.pm_plug-in.mdwn
+++ b/doc/bugs/Problems_with_graphviz.pm_plug-in.mdwn
@@ -3,8 +3,14 @@ The graphviz.pm plug-in currently attempts to read PNG data in UTF-8 mode, which
     utf8 "\x89" does not map to Unicode at /usr/local/lib/perl5/site_perl/5.8.8/IkiWiki/Plugin/graphviz.pm line 53, <IN> chunk 1.
     Wide character in subroutine entry at /usr/local/lib/perl5/site_perl/5.8.8/IkiWiki/Plugin/graphviz.pm line 68.
 
+> Ok, will remove the binmode IN then. [[done]] --[[Joey]]
+
 It also generates image URLs relative to the page being rendered, which means the URLs wont work when previewing a graph from the CGI script.
 
+> You seem to be using an old version of ikiwiki, these preview isues have
+> been fixed for some time, and the code doesn't look like what you patch
+> in your second hunk. --[[Joey]]
+
 The patch below fixes these two issues.
 
     --- graphviz.pm.orig	Thu Jun  7 15:45:16 2007
diff --git a/doc/bugs/hard-coded_location_for_man_pages_and_w3m_cgi_wrapper.mdwn b/doc/bugs/hard-coded_location_for_man_pages_and_w3m_cgi_wrapper.mdwn
index c8b2151fb..1efa5361f 100644
--- a/doc/bugs/hard-coded_location_for_man_pages_and_w3m_cgi_wrapper.mdwn
+++ b/doc/bugs/hard-coded_location_for_man_pages_and_w3m_cgi_wrapper.mdwn
@@ -8,6 +8,10 @@ is hard-coded in Makefile.PL.
 The patch below makes it possible to install those files to alternative directories
 while the default stays as it is now.
 
+> It should be possible to use the existing MakeMaker variables such as
+> INSTALLMAN1DIR (though MakeMaker lacks one for man8). I'd prefer not
+> adding new variables where MakeMaker already has them. --[[Joey]]
+
 <pre>
 
   - Introduce two variables, IKI_MANDIR and IKI_W3MCGIDIR, to be set from
@@ -85,4 +89,4 @@ wiki-mass-rebuild.8
  
  WriteMakefile(
 
-</pre>
\ No newline at end of file
+</pre>