From 9edcd4ac295c8799664016276ff9e39da55c6906 Mon Sep 17 00:00:00 2001
From: Nick White <git@njw.me.uk>
Date: Sun, 22 May 2011 00:56:31 +0100
Subject: Detail chromium bug, ensure makecrx uses standard unix dd

---
 BUGS                | 8 ++++++++
 TODO                | 4 ----
 chromium/makecrx.sh | 7 +++----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/BUGS b/BUGS
index e69de29..b85f83d 100644
--- a/BUGS
+++ b/BUGS
@@ -0,0 +1,8 @@
+# Chromium
+
+* page action doesn't work from icon on file:// (though from keybind it works fine
+)
+  'Error during tabs.executeScript: Cannot access contents of url "file:///hom
+e/nick/marlbo2.htm". Extension manifest must request permission to access this host.
+'
+  which is unfair, as it does (with <all_urls>). likely therefore a bug in chromium.
diff --git a/TODO b/TODO
index 5e07320..5e1f1fb 100644
--- a/TODO
+++ b/TODO
@@ -3,10 +3,6 @@ finish update support. this means use tool http://www.softlights.net/projects/mx
 core:
 	it would be nice to do hyphenation. http://code.google.com/p/hyphenator/ is nice, but heavyish (around 2000 LOC). most of that is just unneeded config options etc, though, the core looks reasonable; see hyphenate and hyphenateWord functions. note that it's lgpl.
 
-chromium:
-	page action doesn't work from icon on file:// (though from keybind it works fine)
-	fix makecrx.sh to work with 9base utils
-
 gecko:
 	test with firefox 4.0, and update version info
 
diff --git a/chromium/makecrx.sh b/chromium/makecrx.sh
index b0b8f2e..d290a44 100755
--- a/chromium/makecrx.sh
+++ b/chromium/makecrx.sh
@@ -5,8 +5,6 @@
 # Based on bash script at:
 # http://code.google.com/chrome/extensions/crx.html
 # Licensed under the BSD license
-#
-# NOTE: does not yet work perfectly with 9base tools
 
 test $# -ne 2 && echo "Usage: $0 dir pem" && exit 1
 
@@ -24,8 +22,9 @@ openssl rsa -pubout -outform DER < "$key" > "$pub" 2>/dev/null
 
 crmagic_hex="4372 3234" # Cr24
 version_hex="0200 0000" # 2
-pub_len_hex=`stat -c %s "$pub" | xargs printf '%08x\n' | rev | dd conv=swab 2>/dev/null`
-sig_len_hex=`stat -c %s "$sig" | xargs printf '%08x\n' | rev | dd conv=swab 2>/dev/null`
+# use /bin/dd as 9base dd has different syntax expectations
+pub_len_hex=`stat -c %s "$pub" | xargs printf '%08x\n' | rev | /bin/dd conv=swab 2>/dev/null`
+sig_len_hex=`stat -c %s "$sig" | xargs printf '%08x\n' | rev | /bin/dd conv=swab 2>/dev/null`
 
 echo "$crmagic_hex $version_hex $pub_len_hex $sig_len_hex" | xxd -r -p
 cat "$pub" "$sig" "$zip"
-- 
cgit v1.2.3