Skip to content

Commit cd0b803

Browse files
author
MB
committed
Merge branch 'master' of github.com:EFForg/HTTPS-Everywhere
Conflicts: src/chrome/content/rules/OptOutPrescreen.com.xml src/chrome/content/rules/WellsFargo.xml
2 parents dba772c + 71ae699 commit cd0b803

Some content is hidden

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

64 files changed

+364
-1177
lines changed

‎https-everywhere-tests/test/test-httpse-installed.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ exports["test httpse potentiallyApplicableRulesets"] = function(assert) {
2323

2424
exports["test sample ruleset"] = function(assert, done) {
2525
tabs.open({
26-
url: "http://www.reddit.com/robots.txt",
26+
url: "http://libssh.org/robots.txt",
2727
onOpen: function(tab) {
2828
tab.on('load', function(tab) {
29-
assert.equal(tab.url, "https://www.reddit.com/robots.txt",
30-
"Test that Reddit URLs are rewritten to HTTPS.");
29+
assert.equal(tab.url, "https://libssh.org/robots.txt",
30+
"Test that LibSSH URLs are rewritten to HTTPS.");
3131
tab.close();
3232
done();
3333
});

‎https-everywhere-tests/test_profile_skeleton/extensions.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"hasBinaryComponents": false,
1717
"icon64URL": null,
1818
"iconURL": "chrome://https-everywhere/skin/https-everywhere.png",
19-
"id": "https-everywhere@eff.org",
19+
"id": "https-everywhere-eff@eff.org",
2020
"installDate": 1407525887000,
2121
"internalName": null,
2222
"locales": [],

‎makexpi.sh‎

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -34,32 +34,19 @@ if [ -n "$1" ] && [ "$2" != "--no-recurse" ] ; then
3434
# Ensure a clean build.
3535
git clean -fdx
3636

37+
git submodule update --recursive -f
3738
# Use the version of the build script that was current when that
3839
# tag/release/branch was made.
3940
./makexpi.sh $1 --no-recurse || exit 1
4041

41-
# Check that all the string present in the English entities file are present in
42-
# each other locale we use. A missing entity causes a nasty error at startup.
43-
# Note that we only make this check when doing tagged builds, since otherwise
44-
# the check would fail anytime someone adds a new string in the entities file,
45-
# before it is included in Transifex. Once the new string is in the master
46-
# branch, Transifex will automatically fill it in with the default English
47-
# value in all the other locales.
48-
if bash utils/compare-locales.sh pkg/$XPI_NAME.xpi >&2
49-
then
50-
echo Validation of included locales completed. >&2
51-
else
52-
die "Validation of locales failed."
53-
fi
54-
5542
# The fact that the above works even when the thing you are building predates
5643
# support for --no-recurse in this script is (1) non-intuitive; (2) crazy; and (3)
5744
# involves two pristine checkouts of $1 within each other
5845

5946
# Now escape from the horrible mess we've made
6047
cd ..
6148
XPI_NAME="$APP_NAME-$1"
62-
cp $SUBDIR/pkg/$XPI_NAME.xpi pkg/
49+
cp $SUBDIR/pkg/$XPI_NAME-eff.xpi pkg/
6350
if ! cp $SUBDIR/pkg/$XPI_NAME-amo.xpi pkg/ 2> /dev/null ; then
6451
echo Old version does not support AMO
6552
fi
@@ -119,8 +106,14 @@ cp -a translations/* pkg/xpi-eff/chrome/locale/
119106
rm -r pkg/xpi-eff/chrome/content/rules
120107
[ -e pkg/xpi-amo ] && rm -rf pkg/xpi-amo
121108
cp -a pkg/xpi-eff/ pkg/xpi-amo/
122-
# The AMO version of the package cannot contain the updateKey or updateURL tags
123-
sed -i.bak -e '/updateKey/d' -e '/updateURL/d' pkg/xpi-amo/install.rdf
109+
# The AMO version of the package cannot contain the updateKey or updateURL tags.
110+
# Also, it has a different id than the eff-hosted version, because Firefox now
111+
# requires us to upload the eff-hosted version to an unlisted extension on AMO
112+
# in order to receive a signature indicating that it is not malware.
113+
# https://github.com/efforg/https-everywhere/issues/2051
114+
sed -i.bak -e '/updateKey/d' -e '/updateURL/d' \
115+
-e 's,<em:id>https-everywhere-eff@eff.org</em:id>,<em:id>https-everywhere@eff.org</em:id>,' \
116+
pkg/xpi-amo/install.rdf
124117
rm pkg/xpi-amo/install.rdf.bak
125118

126119
# Used for figuring out which branch to pull from when viewing source for rules
@@ -132,17 +125,18 @@ fi
132125

133126
# Build the XPI!
134127
rm -f "${XPI_NAME}.xpi"
128+
rm -f "${XPI_NAME}-eff.xpi"
135129
rm -f "${XPI_NAME}-amo.xpi"
136-
python2.7 utils/create_xpi.py -n "${XPI_NAME}.xpi" -x ".build_exclusions" "pkg/xpi-eff"
130+
python2.7 utils/create_xpi.py -n "${XPI_NAME}-eff.xpi" -x ".build_exclusions" "pkg/xpi-eff"
137131
python2.7 utils/create_xpi.py -n "${XPI_NAME}-amo.xpi" -x ".build_exclusions" "pkg/xpi-amo"
138132

139133
echo >&2 "Total included rules: `sqlite3 $RULESETS_SQLITE 'select count(*) from rulesets'`"
140134
echo >&2 "Rules disabled by default: `find src/chrome/content/rules -name "*.xml" | xargs grep -F default_off | wc -l`"
141-
echo >&2 "Created ${XPI_NAME}.xpi and ${XPI_NAME}-amo.xpi"
135+
echo >&2 "Created ${XPI_NAME}-eff.xpi and ${XPI_NAME}-amo.xpi"
142136

143-
bash utils/android-push.sh "$XPI_NAME.xpi"
137+
bash utils/android-push.sh "$XPI_NAME-eff.xpi"
144138

145139
if [ -n "$BRANCH" ]; then
146-
cp $SUBDIR/$XPI_NAME.xpi pkg
140+
cp $SUBDIR/${XPI_NAME}-eff.xpi $SUBDIR/${XPI_NAME}-amo.xpi pkg
147141
rm -rf $SUBDIR
148142
fi

‎src/Changelog‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
Firefox 5.1.0
2+
* Signed by AMO so it won't get a warning in Firefox
3+
4+
Firefox 5.0.9
5+
* Fixed missing translations from 5.0.8
6+
17
Firefox 5.0.8 / Chrome-2015.8.13
28
* Ruleset fixes
39
* Restore checkbox icons on Firefox

‎src/chrome/content/about.xul‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
<groupbox>
4040
<caption label="&https-everywhere.about.version;" />
41-
<label>5.0.8</label>
41+
<label>5.0.9</label>
4242
</groupbox>
4343

4444
<groupbox>

0 commit comments

Comments
 (0)