[or-cvs] [https-everywhere/master 1/3] Activate Bit.ly, Dopbox, Enom & Evernote rules

[pde@xxxxxxxxxxxxxx]

Author: Peter Eckersley <pde@xxxxxxx>
Date: Mon, 1 Nov 2010 16:07:50 -0700
Subject: Activate Bit.ly, Dopbox, Enom & Evernote rules
Commit: 7969dcac700c5a9986613fcc95fdab546e075e79

(these are Firesheep targets)
---
 pending-rules/Bitly.xml               |    5 -----
 pending-rules/Dropbox.xml             |    4 ----
 pending-rules/Enom.xml                |    3 ---
 pending-rules/Evernote.xml            |    3 ---
 src/Changelog                         |    6 ++++++
 src/chrome/content/rules/Bitly.xml    |    5 +++++
 src/chrome/content/rules/Dropbox.xml  |    4 ++++
 src/chrome/content/rules/Enom.xml     |    3 +++
 src/chrome/content/rules/Evernote.xml |    3 +++
 9 files changed, 21 insertions(+), 15 deletions(-)
 delete mode 100644 pending-rules/Bitly.xml
 delete mode 100644 pending-rules/Dropbox.xml
 delete mode 100644 pending-rules/Enom.xml
 delete mode 100644 pending-rules/Evernote.xml
 create mode 100644 src/chrome/content/rules/Bitly.xml
 create mode 100644 src/chrome/content/rules/Dropbox.xml
 create mode 100644 src/chrome/content/rules/Enom.xml
 create mode 100644 src/chrome/content/rules/Evernote.xml

diff --git a/pending-rules/Bitly.xml b/pending-rules/Bitly.xml
deleted file mode 100644
index e3cc6ac..0000000
--- a/pending-rules/Bitly.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<ruleset name="bit.ly">
-  <rule from="^http://(?:www\.)?bit\.ly/" to="https://bit.ly/"/>
-  <rule from="^http://(?:www\.)?bit\.ly\.pro/" to="https://bit.ly/pro/"/>
-  <rule from="^http://(?:www\.)?j\.mp/" to="https://j.mp/"/>
-</ruleset>
diff --git a/pending-rules/Dropbox.xml b/pending-rules/Dropbox.xml
deleted file mode 100644
index 96d77e1..0000000
--- a/pending-rules/Dropbox.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<ruleset name="Dropbox">
-  <rule from="^http://dropbox\.com/"; to="https://www.dropbox.com/"/>
-  <rule from="^http://([^/:@]+)\.dropbox\.com/" to="https://$1.dropbox.com/"/>
-</ruleset>
diff --git a/pending-rules/Enom.xml b/pending-rules/Enom.xml
deleted file mode 100644
index c025b3b..0000000
--- a/pending-rules/Enom.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<ruleset name="Enom.com">
-  <rule from="^http://(www\.)?enom\.com/" to="https://www.enom.com/"/>
-</ruleset>
diff --git a/pending-rules/Evernote.xml b/pending-rules/Evernote.xml
deleted file mode 100644
index 283de8a..0000000
--- a/pending-rules/Evernote.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<ruleset name="Evernote">
-  <rule from="^http://(www\.)?evernote\.com/" to="https://www.evernote.com/"/>
-</ruleset>
diff --git a/src/Changelog b/src/Changelog
index 7993569..10113ad 100644
--- a/src/Changelog
+++ b/src/Changelog
@@ -1,6 +1,12 @@
 0.2.3.development.2:
   * Restore the 0.2.2 wikipedia fix that got lost in the svn -> git transition
     (https://trac.torproject.org/projects/tor/ticket/2080)
+  * Ship rules for some sites that were targetted by Firesheep:
+    - Bit.ly
+    - Dropbox
+    - Evernote
+    - Enom
+    - Cisco
 
 0.2.3.development.1:
   * Support for the Firefox 4 API
diff --git a/src/chrome/content/rules/Bitly.xml b/src/chrome/content/rules/Bitly.xml
new file mode 100644
index 0000000..e3cc6ac
--- /dev/null
+++ b/src/chrome/content/rules/Bitly.xml
@@ -0,0 +1,5 @@
+<ruleset name="bit.ly">
+  <rule from="^http://(?:www\.)?bit\.ly/" to="https://bit.ly/"/>
+  <rule from="^http://(?:www\.)?bit\.ly\.pro/" to="https://bit.ly/pro/"/>
+  <rule from="^http://(?:www\.)?j\.mp/" to="https://j.mp/"/>
+</ruleset>
diff --git a/src/chrome/content/rules/Dropbox.xml b/src/chrome/content/rules/Dropbox.xml
new file mode 100644
index 0000000..96d77e1
--- /dev/null
+++ b/src/chrome/content/rules/Dropbox.xml
@@ -0,0 +1,4 @@
+<ruleset name="Dropbox">
+  <rule from="^http://dropbox\.com/"; to="https://www.dropbox.com/"/>
+  <rule from="^http://([^/:@]+)\.dropbox\.com/" to="https://$1.dropbox.com/"/>
+</ruleset>
diff --git a/src/chrome/content/rules/Enom.xml b/src/chrome/content/rules/Enom.xml
new file mode 100644
index 0000000..c025b3b
--- /dev/null
+++ b/src/chrome/content/rules/Enom.xml
@@ -0,0 +1,3 @@
+<ruleset name="Enom.com">
+  <rule from="^http://(www\.)?enom\.com/" to="https://www.enom.com/"/>
+</ruleset>
diff --git a/src/chrome/content/rules/Evernote.xml b/src/chrome/content/rules/Evernote.xml
new file mode 100644
index 0000000..283de8a
--- /dev/null
+++ b/src/chrome/content/rules/Evernote.xml
@@ -0,0 +1,3 @@
+<ruleset name="Evernote">
+  <rule from="^http://(www\.)?evernote\.com/" to="https://www.evernote.com/"/>
+</ruleset>
-- 
1.7.1