Skip to content

Commit a58637f

Browse files
jshajsha
committed
Merge branch 'master' into faster-build
Conflicts: makexpi.sh
2 parents 2ad5306 + 0603909 commit a58637f

25 files changed

+435
-339
lines changed

‎makexpi.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ ANDROID_APP_ID=org.mozilla.firefox
2323
[ -d pkg ] || mkdir pkg
2424

2525
# If the command line argument is a tag name, check that out and build it
26-
if [ -n "$1" ] && [ "$2" != "--no-recurse" ] && [ "$1" != "--fast" ] ; then
26+
if [ -n "$1" ] && [ "$2" != "--no-recurse" ] ; then
2727
BRANCH=`git branch | head -n 1 | cut -d \ -f 2-`
2828
SUBDIR=checkout
2929
[ -d $SUBDIR ] || mkdir $SUBDIR
@@ -53,7 +53,7 @@ if [ -n "$1" ] && [ "$2" != "--no-recurse" ] && [ "$1" != "--fast" ] ; then
5353
fi
5454

5555
# Only generate the sqlite database if any rulesets have changed. Tried
56-
# implementing this with make, but make is very slow with 11k+ input files.
56+
# implementing this with make, but make is very slow with 15k+ input files.
5757
needs_update() {
5858
find src/chrome/content/rules/ -newer $RULESETS_UNVALIDATED |\
5959
grep -q .
@@ -86,7 +86,7 @@ fi
8686

8787
# The name/version of the XPI we're building comes from src/install.rdf
8888
XPI_NAME="pkg/$APP_NAME-`grep em:version src/install.rdf | sed -e 's/[<>]/ /g' | cut -f3`"
89-
if [ "$1" ] && [ "$1" != "--fast" ] ; then
89+
if [ "$1" ]; then
9090
XPI_NAME="$XPI_NAME"
9191
else
9292
# 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/BroadbandReports.xml‎

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

‎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>

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

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<!--
2+
Update ruleset as per following issue, https://github.com/EFForg/https-everywhere/issues/2058
3+
-->
4+
<ruleset name="DSLReports">
5+
6+
<target host="dslreports.com" />
7+
<target host="www.dslreports.com" />
8+
<target host="i.dslr.net" />
9+
<target host="broadbandreports.com" />
10+
<target host="www.broadbandreports.com" />
11+
<target host="dslreports.ca" />
12+
<target host="www.dslreports.ca" />
13+
14+
<securecookie host="^.*\.dslreports\.com$" name=".*" />
15+
16+
<rule from="^http://(www\.)?broadbandreports\.com/"
17+
to="https://www.dslreports.com/" />
18+
19+
<rule from="^http://(www\.)?dslreports\.ca/"
20+
to="https://www.dslreports.com/" />
21+
22+
<test url="http://www.dslreports.com/" />
23+
24+
<rule from="^http:"
25+
to="https:" />
26+
27+
</ruleset>

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

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,4 @@
11
<!--
2-
Disabled by https-everywhere-checker because:
3-
Fetch error: http://db.tt/ => https://db.tt/: Redirect for 'http://db.tt/' missing Location
4-
Fetch error: http://www.db.tt/ => https://www.db.tt/: Redirect for 'http://www.db.tt/' missing Location
5-
Fetch error: http://dropboxmail.com/ => https://dropboxmail.com/: (51, "SSL: no alternative certificate subject name matches target host name 'dropboxmail.com'")
6-
Fetch error: http://www.dropboxmail.com/ => https://www.dropboxmail.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.dropboxmail.com'")
7-
Fetch error: http://getdropbox.com/ => https://getdropbox.com/: Redirect for 'https://www.getdropbox.com/' missing Location
8-
Fetch error: http://www.getdropbox.com/ => https://www.getdropbox.com/: Redirect for 'http://www.getdropbox.com/' missing Location
92
Fully covered domains:
103
114
- (www.)db.tt
@@ -29,25 +22,21 @@ Fetch error: http://www.getdropbox.com/ => https://www.getdropbox.com/: Redirect
2922
- v-misc
3023
3124
- (www.)dropboxatwork.com
32-
- (www.)dropboxmail.com
3325
- (www.)dropboxteam.com
3426
- *.dropboxusercontent.com
3527
- (www.)getdropbox.com
3628
3729
-->
38-
<ruleset name="Dropbox" default_off='failed ruleset test'>
30+
<ruleset name="Dropbox">
3931

4032
<target host="db.tt" />
4133
<target host="www.db.tt" />
4234
<target host="dropbox.com" />
4335
<target host="*.dropbox.com" />
4436
<target host="dropboxatwork.com" />
4537
<target host="www.dropboxatwork.com" />
46-
<target host="dropboxmail.com" />
47-
<target host="www.dropboxmail.com" />
4838
<target host="dropboxteam.com" />
4939
<target host="www.dropboxteam.com" />
50-
<target host="*.dropboxusercontent.com" />
5140
<target host="getdropbox.com" />
5241
<target host="www.getdropbox.com" />
5342

@@ -56,17 +45,22 @@ Fetch error: http://www.getdropbox.com/ => https://www.getdropbox.com/: Redirect
5645

5746

5847
<rule from="^http://(www\.)?db\.tt/"
59-
to="https://$1db.tt/" />
48+
to="https://db.tt/" />
6049

6150
<rule from="^http://([\w-]+\.)?dropbox\.com/"
6251
to="https://$1dropbox.com/" />
52+
<test url="http://blogs.dropbox.com/" />
53+
<test url="http://carousel.dropbox.com/" />
54+
<test url="http://composer.dropbox.com/" />
55+
<test url="http://dl.dropbox.com/" />
56+
<test url="http://dl-web.dropbox.com/" />
57+
<test url="http://forums.dropbox.com/" />
58+
<test url="http://status.dropbox.com/" />
59+
<test url="http://tech.dropbox.com/" />
6360

64-
<rule from="^http://(www\.)?dropbox(atwork|mail|team)\.com/"
61+
<rule from="^http://(www\.)?dropbox(atwork|team)\.com/"
6562
to="https://$1dropbox$2.com/" />
6663

67-
<rule from="^http://([\w-]+)\.dropboxusercontent\.com/"
68-
to="https://$1.dropboxusercontent.com/" />
69-
7064
<rule from="^http://(www\.)?getdropbox\.com/"
7165
to="https://$1getdropbox.com/" />
7266

‎src/chrome/content/rules/Dustri.org.xml‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
1-
<!--
2-
Disabled by https-everywhere-checker because:
3-
Fetch error: http://dustri.org/ => https://dustri.org/: (60, 'SSL certificate problem: unable to get local issuer certificate')
4-
-->
5-
<ruleset name="dustri.org" platform="cacert" default_off='failed ruleset test'>
6-
1+
<ruleset name="dustri.org">
72
<target host="dustri.org" />
8-
<target host="*.dustri.org" />
9-
3+
<target host="www.dustri.org" />
104

11-
<rule from="^http://(kiwie\.|www\.)?dustri\.org/"
12-
to="https://$1dustri.org/" />
135

6+
<rule from="^http://(www\.)?dustri\.org/" to="https://$1dustri.org/" />
147
</ruleset>

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

Lines changed: 41 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
Nonfunctional subdomains:
99
1010
- marvelkids (redirects to http, valid cert)
11+
- shop (redirects to http)
1112
1213
1314
Partially covered subdomains:
@@ -39,17 +40,50 @@
3940
<ruleset name="Marvel.com (partial)">
4041

4142
<target host="marvel.com" />
42-
<target host="*.marvel.com" />
43-
<exclusion pattern="^http://comicstore\.marvel\.com/(?!assets/)" />
44-
<exclusion pattern="^http://secure\.marvel\.com/(?:\?.*)?$" />
45-
<exclusion pattern="^http://subscriptions\.marvel\.com/(?!css/|i/|images/|(?:login|store/shippingr)\.asp|script/)" />
43+
<target host="www.marvel.com" />
44+
<target host="comicstore.marvel.com" />
45+
<target host="subscriptions.marvel.com" />
46+
<target host="developer.marvel.com" />
47+
48+
<!-- previous rule for reference
49+
<target host="secure.marvel.com" />
50+
<securecookie host="^\.marvel\.com$" name="^CMXSESSIONID$" />
51+
<exclusion pattern="^http://comicstore\.marvel\.com/(?!assets/)" />
52+
<exclusion pattern="^http://secure\.marvel\.com/(?:\?.*)?$" />
53+
<exclusion pattern="^http://subscriptions\.marvel\.com/(?!css/|i/|images/|(?:login|store/shippingr)\.asp|script/)" />
54+
<rule from="^http://((?:comicstore|secure|subscriptions|www)\.)?marvel\.com/"
55+
to="https://$1marvel.com/" />
56+
-->
57+
58+
<!-- https redirects to http -->
59+
<exclusion pattern="^http://subscriptions\.marvel\.com/$" />
60+
<exclusion pattern="^http://subscriptions\.marvel\.com/(.*\.asp|store|fonts)" />
61+
62+
<test url="http://subscriptions.marvel.com/" />
63+
<test url="http://subscriptions.marvel.com/Default.asp" />
64+
<test url="http://subscriptions.marvel.com/search.asp" />
65+
<test url="http://subscriptions.marvel.com/store/" />
66+
<test url="http://subscriptions.marvel.com/fonts/" />
67+
68+
<!-- MCB issue -->
69+
<exclusion pattern="^http://marvel\.com/universe/" />
4670

71+
<test url="http://marvel.com/universe/" />
72+
73+
<!-- https redirects to http and timeout -->
74+
<exclusion pattern="^http://marvel\.com/universe3zx/index\.php" />
75+
76+
<test url="http://marvel.com/universe3zx/index.php" />
4777

48-
<!--securecookie host="^\.marvel\.com$" name="^CMXSESSIONID$" /-->
4978
<securecookie host="^marvel\.com$" name=".+" />
5079

80+
<!-- follow server's behaviour -->
81+
<rule from="^http://www\.marvel\.com/"
82+
to="https://marvel.com/" />
5183

52-
<rule from="^http://((?:comicstore|secure|subscriptions|www)\.)?marvel\.com/"
53-
to="https://$1marvel.com/" />
84+
<test url="http://marvel.com/" />
85+
86+
<rule from="^http:"
87+
to="https:" />
5488

5589
</ruleset>

0 commit comments

Comments
 (0)