From d2cf71687665f4237c73954892f7bc6a611afbba Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 30 Jul 2011 19:59:54 +0200
Subject: [PATCH] Avoid using named capture groups in heredoc code for oldperl
 compatability.

Also reordered heredoc part of regexp for consistency.
---
 IkiWiki.pm       | 17 ++++++++++-------
 debian/changelog |  1 +
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 8a66dcedb..637d56c73 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1394,7 +1394,8 @@ sub preprocess ($$$;$$) {
 				|
 					'''(.*?)'''     # 4: triple-single-quote
 				|
-					<<(?<start>[a-zA-Z]+)\n(?<heredoc>.*?)\n\k<start> # 5, 6: heredoc'd value.
+					<<([a-zA-Z]+)\n # 5: heredoc start
+					(.*?)\n\5	# 6: heredoc value
 				|
 					(\S+)		# 7: unquoted value
 				)
@@ -1417,8 +1418,8 @@ sub preprocess ($$$;$$) {
 				elsif (defined $7) {
 					$val=$7;
 				}
-				elsif (defined $+{heredoc}) {
-					$val=$+{heredoc};
+				elsif (defined $6) {
+					$val=$6;
 				}
 
 				if (defined $key) {
@@ -1488,9 +1489,10 @@ sub preprocess ($$$;$$) {
 						|
 						"[^"]*?"	# single-quoted value
 						|
-						<<(?<start>[a-zA-Z]+)\n(?<heredoc>.*?)\n\k<start> # heredoc'd value.
+						'''.*?'''	# triple-single-quote
 						|
-						'''.*?''' # triple-single-quoted value
+						<<([a-zA-Z]+)\n # 5: heredoc start
+						(?:.*?)\n\5	# heredoc value
 						|
 						[^"\s\]]+	# unquoted value
 					)
@@ -1515,9 +1517,10 @@ sub preprocess ($$$;$$) {
 						|
 						"[^"]*?"	# single-quoted value
 						|
-						'''.*?'''       # triple-single-quoted value
+						'''.*?'''       # triple-single-quote
 						|
-						<<(?<start>[a-zA-Z]+)\n(?<heredoc>.*?)\n\k<start> # heredoc'd value.
+						<<([a-zA-Z]+)\n # 5: heredoc start
+						(?:.*?)\n\5	# heredoc value
 						|
 						[^"\s\]]+	# unquoted value
 					)
diff --git a/debian/changelog b/debian/changelog
index 66389f3fb..193600f45 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ ikiwiki (3.20110716) UNRELEASED; urgency=low
     regexp blowup.
   * Fix escaping of html entities in permalinks.
   * Fix escaping of html entities in tag names.
+  * Avoid using named capture groups in heredoc code for oldperl compatability.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 19 Jul 2011 11:22:52 -0400
 
-- 
2.26.2