Skip to content

Commit 51cd2aa

Browse files
cooperqcooperq
committed
Merge pull request EFForg#2588 from EFForg/rename
Change id of extension for AMO signing.
2 parents 977756a + 4721d67 commit 51cd2aa

File tree

5 files changed

+19
-20
lines changed

5 files changed

+19
-20
lines changed

‎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: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ if [ -n "$1" ] && [ "$2" != "--no-recurse" ] ; then
3434
# Ensure a clean build.
3535
git clean -fdx
3636

37-
git submodule init
38-
git submodule update
37+
git submodule update --recursive -f
3938
# Use the version of the build script that was current when that
4039
# tag/release/branch was made.
4140
./makexpi.sh $1 --no-recurse || exit 1
@@ -47,7 +46,7 @@ if [ -n "$1" ] && [ "$2" != "--no-recurse" ] ; then
4746
# Now escape from the horrible mess we've made
4847
cd ..
4948
XPI_NAME="$APP_NAME-$1"
50-
cp $SUBDIR/pkg/$XPI_NAME.xpi pkg/
49+
cp $SUBDIR/pkg/$XPI_NAME-eff.xpi pkg/
5150
if ! cp $SUBDIR/pkg/$XPI_NAME-amo.xpi pkg/ 2> /dev/null ; then
5251
echo Old version does not support AMO
5352
fi
@@ -107,8 +106,14 @@ cp -a translations/* pkg/xpi-eff/chrome/locale/
107106
rm -r pkg/xpi-eff/chrome/content/rules
108107
[ -e pkg/xpi-amo ] && rm -rf pkg/xpi-amo
109108
cp -a pkg/xpi-eff/ pkg/xpi-amo/
110-
# The AMO version of the package cannot contain the updateKey or updateURL tags
111-
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
112117
rm pkg/xpi-amo/install.rdf.bak
113118

114119
# Used for figuring out which branch to pull from when viewing source for rules
@@ -121,16 +126,16 @@ fi
121126
# Build the XPI!
122127
rm -f "${XPI_NAME}.xpi"
123128
rm -f "${XPI_NAME}-amo.xpi"
124-
python2.7 utils/create_xpi.py -n "${XPI_NAME}.xpi" -x ".build_exclusions" "pkg/xpi-eff"
129+
python2.7 utils/create_xpi.py -n "${XPI_NAME}-eff.xpi" -x ".build_exclusions" "pkg/xpi-eff"
125130
python2.7 utils/create_xpi.py -n "${XPI_NAME}-amo.xpi" -x ".build_exclusions" "pkg/xpi-amo"
126131

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

131-
bash utils/android-push.sh "$XPI_NAME.xpi"
136+
bash utils/android-push.sh "$XPI_NAME-eff.xpi"
132137

133138
if [ -n "$BRANCH" ]; then
134-
cp $SUBDIR/$XPI_NAME.xpi pkg
139+
cp $SUBDIR/${XPI_NAME}-eff.xpi $SUBDIR/${XPI_NAME}-amo pkg
135140
rm -rf $SUBDIR
136141
fi

‎src/install.rdf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<em:name>HTTPS-Everywhere</em:name>
77
<em:creator>Mike Perry, Peter Eckersley, &amp; Yan Zhu</em:creator>
88
<em:aboutURL>chrome://https-everywhere/content/about.xul</em:aboutURL>
9-
<em:id>https-everywhere@eff.org</em:id>
9+
<em:id>https-everywhere-eff@eff.org</em:id>
1010
<em:type>2</em:type> <!-- type: Extension -->
1111
<em:description>Encrypt the Web! Automatically use HTTPS security on many sites.</em:description>
1212
<em:version>5.0.9</em:version>
@@ -15,7 +15,7 @@
1515
<em:optionsURL>chrome://https-everywhere/content/observatory-preferences.xul</em:optionsURL>
1616
<em:iconURL>chrome://https-everywhere/skin/https-everywhere.png</em:iconURL>
1717
<em:unpack>true</em:unpack> <!-- Required for Firefox 4 -->
18-
<em:updateURL>https://www.eff.org/files/https-everywhere-update-2048.rdf</em:updateURL>
18+
<em:updateURL>https://www.eff.org/files/https-everywhere-eff-update-2048.rdf</em:updateURL> <!-- 2015-08-14: New update URL to go with new id (https-everywhere-eff@ef.org) -->
1919
<em:updateKey>MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6MR8W/galdxnpGqBsYbqOzQb2eyW15YFjDDEMI0ZOzt8f504obNs920lDnpPD2/KqgsfjOgw2K7xWDJIj/18xUvWPk3LDkrnokNiRkA3KOx3W6fHycKL+zID7zy+xZYBuh2fLyQtWV1VGQ45iNRp9+Zo7rH86cdfgkdnWTlNSHyTLW9NbXvyv/E12bppPcEvgCTAQXgnDVJ0/sqmeiijn9tTFh03aM+R2V/21h8aTraAS24qiPCz6gkmYGC8yr6mglcnNoYbsLNYZ69zF1XHcXPduCPdPdfLlzVlKK1/U7hkA28eG3BIAMh6uJYBRJTpiGgaGdPd7YekUB8S6cy+CQIDAQAB</em:updateKey>
2020
<!-- Firefox -->
2121
<em:targetApplication>

‎test.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ TEST_ADDON_PATH=./https-everywhere-tests/
1515
# We'll create a Firefox profile here and install HTTPS Everywhere into it.
1616
PROFILE_DIRECTORY="$(mktemp -d)"
1717
trap 'rm -r "$PROFILE_DIRECTORY"' EXIT
18-
HTTPSE_INSTALL_DIRECTORY=$PROFILE_DIRECTORY/extensions/https-everywhere@eff.org
18+
HTTPSE_INSTALL_DIRECTORY=$PROFILE_DIRECTORY/extensions/https-everywhere-eff@eff.org
1919

2020
# Build the XPI to run all the validations in makexpi.sh, and to ensure that
2121
# we test what is actually getting built.
2222
./makexpi.sh
23-
XPI_NAME="pkg/`ls -tr pkg/ | tail -1`"
23+
XPI_NAME="`ls -tr pkg/*-eff.xpi | tail -1`"
2424

2525
# Set up a skeleton profile and then install into it.
2626
# The skeleton contains a few files required to trick Firefox into thinking

‎utils/make-sqlite.py‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,6 @@
3333
c.execute('''CREATE TABLE targets
3434
(host TEXT,
3535
ruleset_id INTEGER)''')
36-
c.execute('''DROP TABLE IF EXISTS git_commit''')
37-
c.execute('''CREATE TABLE git_commit
38-
(git_commit TEXT)''')
39-
40-
git_commit = subprocess.check_output("git rev-parse HEAD", shell=True).rstrip("\n")
41-
c.execute('''INSERT INTO git_commit (git_commit) VALUES(?)''', (git_commit,))
4236

4337
parser = etree.XMLParser(remove_blank_text=True)
4438

0 commit comments

Comments
 (0)