[tor-commits] [tor-browser-bundle/maint-3.6] Bug 11630: Backport the fix from HTTPS-E trunk.

[gk at torproject.org]

commit 3e9088694cb0bed1780914b775570151ebf7f2bf
Author: Georg Koppen <gk at torproject.org>
Date:   Sat Jun 7 10:27:57 2014 +0000

    Bug 11630: Backport the fix from HTTPS-E trunk.
---
 gitian/descriptors/linux/gitian-bundle.yml   |    2 ++
 gitian/descriptors/mac/gitian-bundle.yml     |    2 ++
 gitian/descriptors/windows/gitian-bundle.yml |    2 ++
 3 files changed, 6 insertions(+)

diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml
index c16589a..214b9a2 100644
--- a/gitian/descriptors/linux/gitian-bundle.yml
+++ b/gitian/descriptors/linux/gitian-bundle.yml
@@ -92,6 +92,8 @@ script: |
   # XXX: Bloody hack to workaround a bug in HTTPS_E's git hash extraction in
   # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066
   rm -f .git/refs/heads/master
+  # Backport the fix for #11630 from HTTPS-Everywhere trunk.
+  sed 's/conn.commit()/&\nconn.execute("VACUUM")/' -i utils/make-sqlite.py
   ./makexpi.sh
   cp pkg/*.xpi ../tor-browser/Data/Browser/profile.default/extensions/https-everywhere at eff.org.xpi
   cd ..
diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml
index 263ca57..d5da018 100644
--- a/gitian/descriptors/mac/gitian-bundle.yml
+++ b/gitian/descriptors/mac/gitian-bundle.yml
@@ -99,6 +99,8 @@ script: |
   # XXX: Bloody hack to workaround a bug in HTTPS_E's git hash extraction in
   # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066
   rm -f .git/refs/heads/master
+  # Backport the fix for #11630 from HTTPS-Everywhere trunk.
+  sed 's/conn.commit()/&\nconn.execute("VACUUM")/' -i utils/make-sqlite.py
   ./makexpi.sh
   cp pkg/*.xpi ../$TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/https-everywhere at eff.org.xpi
   cd ..
diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml
index 457fa7b..ec128be 100644
--- a/gitian/descriptors/windows/gitian-bundle.yml
+++ b/gitian/descriptors/windows/gitian-bundle.yml
@@ -82,6 +82,8 @@ script: |
   # XXX: Bloody hack to workaround a bug in HTTPS_E's git hash extraction in
   # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066
   rm -f .git/refs/heads/master
+  # Backport the fix for #11630 from HTTPS-Everywhere trunk.
+  sed 's/conn.commit()/&\nconn.execute("VACUUM")/' -i utils/make-sqlite.py
   ./makexpi.sh
   cp ./pkg/*.xpi ../tbb-windows-installer/"Tor Browser"/Data/Browser/profile.default/extensions/https-everywhere at eff.org.xpi
   cd ..