Skip to content

Commit 49aa044

Browse files
author
MB
committed
Merge remote-tracking branch 'EFForg/master'
Conflict note: Server redirects to !www over http & https. Conflicts: src/chrome/content/rules/Marvel.com.xml
2 parents 5be3ca9 + 62d998c commit 49aa044

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+751
-523
lines changed

‎.travis.yml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,28 @@
11
# Config copied from
22
# http://www.theautomatedtester.co.uk/blog/2012/using-travis-ci-for-building-and-testing-firefox-addons.html
3-
# Use node_js because there are maybe more workers?
43
language: python
54
python:
65
- "2.7"
6+
cache: pip
77
addons:
8+
apt:
9+
packages:
10+
- libxml2-dev
11+
- python-dev
12+
- libcurl4-openssl-dev
13+
- python-lxml
814
firefox: "37.0"
915
virtualenv:
1016
system_site_packages: true
1117
install:
12-
- sudo apt-get -qq install libxml2-dev libxslt-dev python-dev libcurl4-openssl-dev python-lxml
1318
- pip install -r https-everywhere-checker/requirements.txt
1419
before_script:
1520
- sh -e /etc/init.d/xvfb start
1621
env:
1722
- DISPLAY=':99.0'
1823
script:
1924
- ./test.sh
25+
sudo: false
2026
notifications:
2127
email:
2228
recipients:

‎install-dev-dependencies.sh‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,15 @@
33
# HTTPS Everywhere
44
set -o errexit -o xtrace
55
if type apt-get >/dev/null ; then
6+
BROWSERS="firefox chromium-browser"
7+
if [[ "$(lsb_release -is)" == "Debian" ]]; then
8+
# Iceweasel is the rebranded Firefox that Debian ships, and Chromium
9+
# takes the name of 'chromium' instead of 'chromium-browser' in
10+
# Debian 7 (wheezy) and later.
11+
BROWSERS="iceweasel chromium"
12+
fi
613
sudo apt-get install libxml2-dev libxml2-utils libxslt1-dev python-dev \
7-
firefox chromium-browser zip sqlite3 python-pip libcurl4-openssl-dev
14+
$BROWSERS zip sqlite3 python-pip libcurl4-openssl-dev
815
elif type brew >/dev/null ; then
916
brew list python &>/dev/null || brew install python
1017
brew install libxml2 gnu-sed

‎makexpi.sh‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,14 @@ APP_NAME=https-everywhere
1818
cd "`dirname $0`"
1919
RULESETS_SQLITE="$PWD/src/defaults/rulesets.sqlite"
2020
ANDROID_APP_ID=org.mozilla.firefox
21+
if [ "$1" == "--fast" ]; then
22+
FAST=true
23+
fi
2124

2225
[ -d pkg ] || mkdir pkg
2326

2427
# If the command line argument is a tag name, check that out and build it
25-
if [ -n "$1" ] && [ "$2" != "--no-recurse" ] && [ "$1" != "--fast" ] ; then
28+
if [ -n "$1" ] && [ "$2" != "--no-recurse" ] && [ -z "$FAST" ] ; then
2629
BRANCH=`git branch | head -n 1 | cut -d \ -f 2-`
2730
SUBDIR=checkout
2831
[ -d $SUBDIR ] || mkdir $SUBDIR
@@ -51,7 +54,7 @@ if [ -n "$1" ] && [ "$2" != "--no-recurse" ] && [ "$1" != "--fast" ] ; then
5154
exit 0
5255
fi
5356

54-
if [ "$1" != "--fast" -o ! -f "$RULESETS_SQLITE" ] ; then
57+
if [ -z "$FAST" -o ! -f "$RULESETS_SQLITE" ] ; then
5558
# This is an optimization to get the OS reading the rulesets into RAM ASAP;
5659
# it's useful on machines with slow disk seek times; doing several of these
5760
# at once allows the IO subsystem to seek more efficiently.
@@ -72,7 +75,7 @@ die() {
7275
exit 1
7376
}
7477

75-
if [ "$1" != "--fast" -a -z "$FAST" ] ; then
78+
if [ -z "$FAST" ] ; then
7679
if python2.7 ./utils/trivial-validate.py --quiet --db $RULESETS_SQLITE >&2
7780
then
7881
echo Validation of included rulesets completed. >&2
@@ -120,7 +123,7 @@ fi
120123

121124
# The name/version of the XPI we're building comes from src/install.rdf
122125
XPI_NAME="pkg/$APP_NAME-`grep em:version src/install.rdf | sed -e 's/[<>]/ /g' | cut -f3`"
123-
if [ "$1" ] && [ "$1" != "--fast" ] ; then
126+
if [ "$1" -a -z "$FAST" ] ; then
124127
XPI_NAME="$XPI_NAME"
125128
else
126129
# During development, generate packages named with the short hash of HEAD.

‎src/chrome/content/about.xul‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,23 @@
1919
<label style="text-align:center; font-weight:bold; font-size:22px;">&https-everywhere.about.ext_name;</label>
2020
<label style="text-align:center; font-size:18px; margin-bottom:10px;">&https-everywhere.about.ext_description;</label>
2121

22+
<label style="font-weight:bold; margin-top:10px;">
23+
&https-everywhere.about.contribute;
24+
<label id="donate link"
25+
value="&https-everywhere.about.donate_tor;"
26+
style="color: blue; cursor:hand; text-decoration:underline; font-style:bold"
27+
onmouseover="event.target.style.cursor='pointer'"
28+
onmouseout="event.target.style.cursor='default'"
29+
onclick="window_opener('https://www.torproject.org/donate/donate.html.en')"/>
30+
&https-everywhere.about.or;
31+
<label id="donate link2"
32+
value="&https-everywhere.about.donate_eff;"
33+
style="color: blue; cursor:hand; text-decoration:underline; font-style:bold"
34+
onmouseover="event.target.style.cursor='pointer'"
35+
onmouseout="event.target.style.cursor='default'"
36+
onclick="window_opener('https://www.eff.org/donate')"/>
37+
</label>
38+
2239
<groupbox>
2340
<caption label="&https-everywhere.about.version;" />
2441
<label>5.0.5</label>
@@ -51,22 +68,5 @@
5168
from NoScript, by Giorgio Maone and others. We are grateful for their
5269
excellent work!</label>
5370
</groupbox>
54-
55-
<label style="font-weight:bold; margin-top:10px;">
56-
&https-everywhere.about.contribute;
57-
<label id="donate link"
58-
value="&https-everywhere.about.donate_tor;"
59-
style="color: blue; cursor:hand; text-decoration:underline; font-style:bold"
60-
onmouseover="event.target.style.cursor='pointer'"
61-
onmouseout="event.target.style.cursor='default'"
62-
onclick="window_opener('https://www.torproject.org/donate/donate.html.en')"/>
63-
&https-everywhere.about.or;
64-
<label id="donate link2"
65-
value="&https-everywhere.about.donate_eff;"
66-
style="color: blue; cursor:hand; text-decoration:underline; font-style:bold"
67-
onmouseover="event.target.style.cursor='pointer'"
68-
onmouseout="event.target.style.cursor='default'"
69-
onclick="window_opener('https://www.eff.org/donate')"/>
70-
</label>
7171
</vbox>
7272
</dialog>

‎src/chrome/content/rules/Agar.io.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<ruleset name="Agar.io">
1+
<ruleset name="Agar.io" default_off="webmaster request">
22
<target host="agar.io" />
33
<target host="www.agar.io" />
44
<target host="m.agar.io" />

‎src/chrome/content/rules/Boing-Boing.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* Refused
1818
1919
-->
20-
<ruleset name="Boing Boing Shop">
20+
<ruleset name="Boing Boing Shop" default_off="Breaks boingboing.net">
2121

2222
<target host="*.boingboing.net" />
2323
<!-- * for cross-domain cookie. -->

‎src/chrome/content/rules/BroadbandReports.xml‎

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎src/chrome/content/rules/Chrome_Experiments.com.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,16 @@
1010
<!-- Direct rewrites:
1111
-->
1212
<target host="www.chromeexperiments.com" />
13+
<target host="1000.chromeexperiments.com" />
14+
<target host="500.chromeexperiments.com" />
15+
<target host="armsglobe.chromeexperiments.com" />
16+
<target host="bookcase.chromeexperiments.com" />
17+
<target host="clouds.chromeexperiments.com" />
18+
<target host="globe.chromeexperiments.com" />
19+
<target host="m.chromeexperiments.com" />
20+
<target host="machines.chromeexperiments.com" />
21+
<target host="stars.chromeexperiments.com" />
22+
<target host="workshop.chromeexperiments.com" />
1323

1424
<!-- Complications:
1525
-->

‎src/chrome/content/rules/Collabora-mismatches.xml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,8 @@
44
-->
55
<ruleset name="Collabora (mismatches)" default_off="mismatched, self-signed">
66

7-
<target host="dhansak.collabora.co.uk" />
87
<target host="monkey.collabora.co.uk" />
98

10-
11-
<rule from="^http://(dhansak|monkey)\.collabora\.co\.uk/"
12-
to="https://$1.collabora.co.uk/" />
9+
<rule from="^http:" to="https:" />
1310

1411
</ruleset>

‎src/chrome/content/rules/Collabora.xml‎

Lines changed: 24 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,37 @@
11
<!--
22
For problematic rules, see Collabora-mismatches.xml.
33
4-
54
Nonfunctional domains:
65
7-
- collabora.co.uk subdomains:
8-
9-
- bzr *
10-
- cgit *
11-
- git *
12-
- planet *
13-
14-
- collabora.com subdomains:
15-
16-
- cgit *
17-
- git *
18-
- planet *
19-
20-
* Shows dhansak.collabora.co.uk; CN: www.collabora.co.uk
21-
22-
23-
Problematic domains:
24-
25-
- dhansak.collabora.co.uk *
26-
- monkey.collabora.co.uk *
27-
28-
* Works; mismatched, CN: www.collabora.co.uk
29-
30-
31-
Fully covered domains:
32-
33-
- (www.)collabora.co.uk
6+
- collabora.ca
7+
- packages.collabora.co.uk
8+
- monkey.collabora.co.uk
9+
- raspberrypi.collabora.com
10+
- raspberrypi.collabora.co.uk
3411
- trac.collabora.co.uk
35-
- (www.)collabora.com
36-
12+
- bzr.collabora.co.uk
3713
-->
14+
3815
<ruleset name="Collabora (partial)">
3916

40-
<target host="collabora.co.uk" />
41-
<target host="*.collabora.co.uk" />
17+
<target host="cgit.collabora.com" />
18+
<target host="cgit.collabora.co.uk" />
4219
<target host="collabora.com" />
20+
<target host="collabora.co.uk" />
21+
<target host="dhansak.collabora.co.uk" />
22+
<target host="gin.collabora.co.uk" />
23+
<target host="git.collabora.com" />
24+
<target host="git.collabora.co.uk" />
25+
<target host="libreoffice.collabora.co.uk" />
26+
<target host="people.collabora.com" />
27+
<target host="people.collabora.co.uk" />
28+
<target host="planet.collabora.com" />
29+
<target host="planet.collabora.co.uk" />
30+
<target host="unmaintained.git.collabora.com" />
31+
<target host="unmaintained.git.collabora.co.uk" />
32+
<target host="www.collabora.ca" />
4333
<target host="www.collabora.com" />
34+
<target host="www.collabora.co.uk" />
4435

45-
46-
<rule from="^http://(trac\.|www\.)?collabora\.co(\.uk|m)/"
47-
to="https://$1collabora.co$2/" />
48-
36+
<rule from="^http:" to="https:" />
4937
</ruleset>

0 commit comments

Comments
 (0)