[or-cvs] [torbrowser/master 2/2] remove or comment out polipo-related things, bump tbb version
erinn at torproject.org
erinn at torproject.org
Tue Dec 14 05:11:27 UTC 2010
Author: Erinn Clark <erinn at torproject.org>
Date: Tue, 14 Dec 2010 05:10:35 +0000
Subject: remove or comment out polipo-related things, bump tbb version
Commit: d70ebff6d6b5e383b7f0b2ce4631dd6177a364c5
---
README.Linux | 1 +
build-scripts/Makefile.linux | 35 +++---
build-scripts/config/no-polipo.js | 155 ++++++++++++++++++++++++++++
build-scripts/config/torrc-linux | 1 +
build-scripts/config/vidalia.conf.ff-linux | 3 -
5 files changed, 175 insertions(+), 20 deletions(-)
create mode 100644 build-scripts/config/no-polipo.js
diff --git a/README.Linux b/README.Linux
index e634787..547d1ad 100644
--- a/README.Linux
+++ b/README.Linux
@@ -42,6 +42,7 @@ Changelog
Torbutton has been reconfigured to just use a SOCKS proxy. Polipo has been removed
entirely from this release of the Tor Browser Bundle. If this causes you problems,
please file a bug: https://trac.torproject.org/projects/tor
+ Rebuild all binaries against glibc 2.7 so they work for older distros again
1.0.17: Released 2010-11-24
Update Tor to 0.2.2.19-alpha
diff --git a/build-scripts/Makefile.linux b/build-scripts/Makefile.linux
index 10f324e..e02939d 100644
--- a/build-scripts/Makefile.linux
+++ b/build-scripts/Makefile.linux
@@ -41,7 +41,7 @@ BUILT_DIR=$(FETCH_DIR)/built
TBB_FINAL=$(BUILT_DIR)/TBBL
## Versions for our source packages
-HTTPSEVERY_VER=0.2.2
+HTTPSEVERY_VER=0.9.9.development.1
FIREFOX_VER=3.6.13
LIBEVENT_VER=1.4.13-stable
LIBPNG_VER=1.4.3
@@ -60,7 +60,7 @@ ZLIB_VER=1.2.3
FF_VENDOR_ID:=\{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
## File names for the source packages
-FIREFOX_PACKAGE=firefox-$(FIREFOX_VER).tar.bz2
+FIREFOX_PACKAGE=firefox-$(FIREFOX_VER).source.tar.bz2
LIBEVENT_PACKAGE=libevent-$(LIBEVENT_VER).tar.gz
LIBPNG_PACKAGE=libpng-$(LIBPNG_VER).tar.gz
OPENSSL_PACKAGE=openssl-$(OPENSSL_VER).tar.gz
@@ -72,7 +72,7 @@ VIDALIA_PACKAGE=vidalia-$(VIDALIA_VER).tar.gz
ZLIB_PACKAGE=zlib-$(ZLIB_VER).tar.gz
## Location of files for download
-FIREFOX_URL=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(FIREFOX_VER)/linux-i686/en-US/$(FIREFOX_PACKAGE)
+FIREFOX_URL=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(FIREFOX_VER)/source/$(FIREFOX_PACKAGE)
LIBEVENT_URL=http://www.monkey.org/~provos/$(LIBEVENT_PACKAGE)
LIBPNG_URL=http://download.sourceforge.net/libpng/$(LIBPNG_PACKAGE).tar.gz
OPENSSL_URL=https://www.openssl.org/source/$(OPENSSL_PACKAGE)
@@ -171,7 +171,8 @@ build-pidgin:
echo "We're not building pidgin yet!"
build-firefox:
- echo "We're using a prebuilt firefox. Fix this someday!"
+ # XXX: add directions ASAP
+
# source-dance unpack-source
build-all-binaries: build-zlib build-openssl build-libpng build-qt build-vidalia build-libevent build-tor build-polipo
echo "If we're here, we've done something right."
@@ -314,7 +315,7 @@ directory-structure:
mkdir -p $(LIBSDIR)/libz
mkdir -p $(DATADIR)/Tor
mkdir -p $(DATADIR)/Vidalia
- mkdir -p $(DATADIR)/Polipo
+ #mkdir -p $(DATADIR)/Polipo
mkdir -p $(DATADIR)/profile
mkdir -p $(DOCSDIR)
mkdir -p $(TB_TMPDIR)
@@ -342,7 +343,7 @@ install-binaries:
# Vidalia
cp $(VIDALIA) $(APPDIR)
# Polipo
- cp $(POLIPO) $(APPDIR)
+ #cp $(POLIPO) $(APPDIR)
# Tor (perhaps we want tor-resolve too?)
cp $(TOR) $(APPDIR)
@@ -352,11 +353,11 @@ install-docs:
mkdir -p $(DOCSDIR)/Vidalia
mkdir -p $(DOCSDIR)/Tor
mkdir -p $(DOCSDIR)/Qt
- mkdir -p $(DOCSDIR)/Polipo
+ #mkdir -p $(DOCSDIR)/Polipo
cp $(VIDALIA_DIR)/LICENSE* $(VIDALIA_DIR)/CREDITS $(DOCSDIR)/Vidalia
cp $(TOR_DIR)/LICENSE $(TOR_DIR)/README $(DOCSDIR)/Tor
cp $(QT_DIR)/LICENSE.GPL* $(QT_DIR)/LICENSE.LGPL $(DOCSDIR)/Qt
- cp $(POLIPO_DIR)/COPYING $(POLIPO_DIR)/README $(DOCSDIR)/Polipo
+ #cp $(POLIPO_DIR)/COPYING $(POLIPO_DIR)/README $(DOCSDIR)/Polipo
# This should be updated to be more generic (version-wise) and more Linux specific
cp ../README.Linux $(DOCSDIR)/README-TorBrowserBundle
@@ -379,7 +380,7 @@ configure-apps:
#mkdir -p $(DEST)/.mozilla/Firefox/firefox.default
cp -R $(CONFIG_SRC)/firefox-profiles.ini $(DEST)/Data/profiles.ini
cp $(CONFIG_SRC)/bookmarks.html $(DEST)/Data/profile
- cp $(CONFIG_SRC)/prefs.js $(DEST)/Data/profile/prefs.js
+ cp $(CONFIG_SRC)/no-polipo.js $(DEST)/Data/profile/prefs.js
## Configure Pidgin
ifeq ($(USE_PIDGIN),1)
mkdir -p $(DEST)/PidginPortable/Data/settings/.purple
@@ -392,7 +393,7 @@ else
cp $(CONFIG_SRC)/vidalia.conf.ff-linux $(DEST)/Data/Vidalia/vidalia.conf
endif
## Configure Polipo
- cp $(CONFIG_SRC)/polipo.conf $(DEST)/Data/Polipo/polipo.conf
+ #cp $(CONFIG_SRC)/polipo.conf $(DEST)/Data/Polipo/polipo.conf
## Configure Tor
cp $(CONFIG_SRC)/torrc-linux $(DEST)/Data/Tor/torrc
cp $(TOR_DIR)/src/config/geoip $(DEST)/Data/Tor/geoip
@@ -405,7 +406,7 @@ launcher:
strip-it-stripper:
strip $(APPDIR)/tor
- strip $(APPDIR)/polipo
+ #strip $(APPDIR)/polipo
strip $(APPDIR)/vidalia
strip $(LIBSDIR)/*.so*
strip $(LIBSDIR)/libz/*.so*
@@ -415,8 +416,8 @@ strip-it-stripper:
##
## Torbutton development version
-torbutton.xpi:
- $(WGET) -O $@ $(TORBUTTON)
+#torbutton.xpi:
+# $(WGET) -O $@ $(TORBUTTON)
## NoScript development version
noscript.xpi:
@@ -427,8 +428,8 @@ betterprivacy.xpi:
$(WGET) -O $@ $(BETTERPRIVACY)
## HTTPS Everywhere
-httpseverywhere.xpi:
- $(WGET) -O $@ --no-check-certificate $(HTTPSEVERYWHERE)
+#httpseverywhere.xpi:
+# $(WGET) -O $@ --no-check-certificate $(HTTPSEVERYWHERE)
## Generic language pack rule
langpack_%.xpi:
@@ -510,9 +511,9 @@ patch-firefox-language:
## Patch the default Firefox prefs.js
## Don't use {} because they aren't always interpreted correctly. Thanks, sh.
cp $(CONFIG_SRC)/bookmarks.html $(BUNDLE)/App/Firefox/defaults/profile/
- cp $(CONFIG_SRC)/prefs.js $(BUNDLE)/App/Firefox/defaults/profile/prefs.js
+ cp $(CONFIG_SRC)/no-polipo.js $(BUNDLE)/App/Firefox/defaults/profile/prefs.js
cp $(CONFIG_SRC)/bookmarks.html $(BUNDLE)/Data/profile
- cp $(CONFIG_SRC)/prefs.js $(BUNDLE)/Data/profile/prefs.js
+ cp $(CONFIG_SRC)/no-polipo.js $(BUNDLE)/Data/profile/prefs.js
./patch-firefox-language.sh $(BUNDLE)/App/Firefox/defaults/profile/prefs.js $(LANGCODE) -e
./patch-firefox-language.sh $(BUNDLE)/Data/profile/prefs.js $(LANGCODE) -e
diff --git a/build-scripts/config/no-polipo.js b/build-scripts/config/no-polipo.js
new file mode 100644
index 0000000..6f7d730
--- /dev/null
+++ b/build-scripts/config/no-polipo.js
@@ -0,0 +1,155 @@
+# Mozilla User Preferences
+
+/* Do not edit this file.
+ *
+ * If you make changes to this file while the application is running,
+ * the changes will be overwritten when the application exits.
+ *
+ * To make a manual change to preferences, you can visit the URL about:config
+ * For more information, see http://www.mozilla.org/unix/customizing.html#prefs
+ */
+
+user_pref("app.update.auto", false);
+user_pref("app.update.enabled", false);
+user_pref("app.update.lastUpdateTime.addon-background-update-timer", 1216566538);
+user_pref("app.update.lastUpdateTime.background-update-timer", 1216566535);
+user_pref("app.update.lastUpdateTime.blocklist-background-update-timer", 1216566538);
+user_pref("app.update.lastUpdateTime.microsummary-generator-update-timer", 1232574822);
+user_pref("app.update.lastUpdateTime.search-engine-update-timer", 1216566539);
+user_pref("browser.bookmarks.livemark_refresh_seconds", 31536000);
+user_pref("browser.cache.disk.capacity", 0);
+user_pref("browser.cache.disk.enable", false);
+user_pref("browser.download.manager.retention", 0);
+user_pref("browser.download.useDownloadDir", false);
+user_pref("browser.formfill.enable", false);
+user_pref("browser.migration.version", 1);
+user_pref("browser.places.importBookmarksHTML", false);
+user_pref("browser.places.importDefaults", false);
+user_pref("browser.places.leftPaneFolderId", -1);
+user_pref("browser.places.migratePostDataAnnotations", false);
+user_pref("browser.places.smartBookmarksVersion", 1);
+user_pref("browser.places.updateRecentTagsUri", false);
+user_pref("browser.preferences.advanced.selectedTabIndex", 0);
+user_pref("browser.privatebrowsing.autostart", true);
+user_pref("browser.rights.3.shown", true);
+user_pref("browser.safebrowsing.enabled", false);
+user_pref("browser.safebrowsing.malware.enabled", false);
+user_pref("browser.search.suggest.enabled", false);
+user_pref("browser.search.update", false);
+user_pref("browser.shell.checkDefaultBrowser", false);
+user_pref("browser.startup.homepage", "https://check.torproject.org/?lang=BUNDLELOCALE&small=1");
+user_pref("browser.startup.homepage_override.mstone", "rv:1.9.1.11");
+user_pref("dom.storage.enabled", false);
+user_pref("extensions.enabledItems", "SHPONKA,{73a6fe31-595d-460b-a920-fcc0f8843232}:1.9.9.57,{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}:1.2.4,{972ce4c6-7e08-4474-a285-3208198ce6fd}:3.5.8");
+user_pref("extensions.bprivacy.donotaskforfolder", true);
+user_pref("extensions.bprivacy.donotaskonexit", true);
+user_pref("extensions.bprivacy.initiated", true);
+user_pref("extensions.checkCompatibility", false);
+user_pref("extensions.checkUpdateSecurity", false);
+user_pref("extensions.lastAppVersion", "3.5.11");
+user_pref("extensions.torbutton.fresh_install", false);
+user_pref("extensions.torbutton.http_port", 8118);
+user_pref("extensions.torbutton.http_proxy", "127.0.0.1");
+user_pref("extensions.torbutton.https_port", 8118);
+user_pref("extensions.torbutton.https_proxy", "127.0.0.1");
+user_pref("extensions.torbutton.locked_mode", true);
+user_pref("extensions.torbutton.proxies_applied", true);
+user_pref("extensions.torbutton.restore_tor", true);
+user_pref("extensions.torbutton.saved.auto_update", false);
+user_pref("extensions.torbutton.saved.share_proxy_settings", false);
+user_pref("extensions.torbutton.saved.socks_version", 5);
+user_pref("extensions.torbutton.settings_applied", true);
+user_pref("extensions.torbutton.socks_host", "127.0.0.1");
+user_pref("extensions.torbutton.socks_port", 9050);
+user_pref("extensions.torbutton.tor_enabled", true);
+user_pref("extensions.torbutton.tor_memory_jar", true);
+user_pref("extensions.update.enabled", false);
+user_pref("extensions.update.notifyUser", false);
+user_pref("general.appname.override", "Netscape");
+user_pref("general.appversion.override", "5.0 (Windows; en-US)");
+user_pref("general.buildID.override", "0");
+user_pref("general.oscpu.override", "Windows NT 5.1");
+user_pref("general.platform.override", "Win32");
+user_pref("general.productSub.override", "20080404");
+user_pref("general.useragent.locale", "BUNDLELOCALE");
+user_pref("general.useragent.override", "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.1.9) Gecko/20080404 Firefox/3.5.11");
+user_pref("general.useragent.vendor", "");
+user_pref("general.useragent.vendorSub", "");
+user_pref("intl.accept_languages", "en-us, en");
+user_pref("intl.charsetmenu.browser.cache", "UTF-8");
+user_pref("network.cookie.cookieBehavior", 1);
+user_pref("network.cookie.lifetimePolicy", 2);
+user_pref("network.cookie.prefsMigrated", true);
+user_pref("network.protocol-handler.warn-external.mailto", true);
+user_pref("network.protocol-handler.warn-external.news", true);
+user_pref("network.protocol-handler.warn-external.nntp", true);
+user_pref("network.protocol-handler.warn-external.snews", true);
+user_pref("network.proxy.http", "");
+user_pref("network.proxy.http_port", 0);
+user_pref("network.proxy.ssl", "");
+user_pref("network.proxy.ssl_port", 0);
+user_pref("network.proxy.socks", "127.0.0.1");
+user_pref("network.proxy.socks_port", 9050);
+user_pref("network.proxy.socks_remote_dns", true);
+user_pref("network.proxy.type", 1);
+user_pref("network.security.ports.banned", "8118,8123,9050,9051");
+user_pref("plugin.disable_full_page_plugin_for_types", "application/asx,video/x-ms-asf-plugin,application/x-mplayer2,video/x-ms-asf,video/x-ms-wm,audio/x-ms-wma,audio/x-ms-wax,video/x-ms-wmv,video/x-ms-wvx,application/x-drm-v2,application/x-drm");
+user_pref("plugin.scan.Acrobat", false);
+user_pref("plugin.scan.Quicktime", false);
+user_pref("plugin.scan.SunJRE", false);
+user_pref("plugin.scan.WindowsMediaPlayer", false);
+user_pref("plugin.scan.plid.all", false);
+user_pref("plugin.scan.4xPluginFolder", false);
+user_pref("security.enable_java", false);
+user_pref("signon.rememberSignons", false);
+user_pref("urlclassifier.keyupdatetime.https://sb-ssl.google.com/safebrowsing/newkey", 1235166825);
+user_pref("urlclassifier.tableversion.goog-black-enchash", "1.55536");
+user_pref("urlclassifier.tableversion.goog-black-url", "1.23256");
+user_pref("urlclassifier.tableversion.goog-white-domain", "1.481");
+user_pref("urlclassifier.tableversion.goog-white-url", "1.371");
+user_pref("browser.microsummary.updateGenerators", false);
+user_pref("network.hosts.pop_server", "");
+user_pref("browser.sessionstore.privacy_level", 2);
+user_pref("browser.chrome.site_icons", false);
+user_pref("browser.chrome.favicons", false);
+user_pref("browser.chrome.image_icons.max_size", 0);
+user_pref("browser.download.manager.retention", 1);
+user_pref("browser.send_pings", false);
+user_pref("dom.event.contextmenu.enabled", false);
+user_pref("browser.urlbar.autocomplete.enabled", false);
+user_pref("plugin.expose_full_path", true);
+user_pref("network.protocol-handler.external-default", false);
+user_pref("network.protocol-handler.external.mailto", false);
+user_pref("network.protocol-handler.external.news", false);
+user_pref("network.protocol-handler.external.nntp", false);
+user_pref("network.protocol-handler.external.snews", false);
+user_pref("browser.history_expire_days", 0);
+user_pref("browser.history_expire_days.mirror", 0);
+user_pref("capability.policy.maonoscript.javascript.enabled", "allAccess");
+user_pref("capability.policy.maonoscript.sites", "addons.mozilla.org about: about:blank about:blocked about:certerror about:config about:credits about:neterror about:plugins about:privatebrowsing about:sessionrestore chrome: resource:");
+user_pref("noscript.ABE.enabled", false);
+user_pref("noscript.ABE.notify", false);
+user_pref("noscript.autoReload", false);
+user_pref("noscript.contentBlocker", true);
+user_pref("noscript.default", "about:blank about:credits addons.mozilla.org flashgot.net google.com gstatic.com googlesyndication.com informaction.com yahoo.com yimg.com maone.net noscript.net hotmail.com msn.com passport.com passport.net passportimages.com live.com");
+user_pref("noscript.firstRunRedirection", false);
+user_pref("noscript.global", true);
+user_pref("noscript.gtemp", "");
+user_pref("noscript.opacizeObject", 3);
+user_pref("noscript.options.tabSelectedIndexes", "5,0,0");
+user_pref("noscript.policynames", "");
+user_pref("noscript.secureCookies", true);
+user_pref("noscript.showAllowPage", false);
+user_pref("noscript.showBaseDomain", false);
+user_pref("noscript.showDistrust", false);
+user_pref("noscript.showRecentlyBlocked", false);
+user_pref("noscript.showRevokeTemp", false);
+user_pref("noscript.showTemp", false);
+user_pref("noscript.showTempAllowPage", false);
+user_pref("noscript.showTempToPerm", false);
+user_pref("noscript.showUntrusted", false);
+user_pref("noscript.subscription.lastCheck", -1723345640);
+user_pref("noscript.temp", "");
+user_pref("noscript.untrusted", "");
+user_pref("noscript.ABE.wanIpAsLocal", false);
+user_pref("noscript.version", "2.0.3.2");
diff --git a/build-scripts/config/torrc-linux b/build-scripts/config/torrc-linux
index 70731eb..9c6cecd 100644
--- a/build-scripts/config/torrc-linux
+++ b/build-scripts/config/torrc-linux
@@ -8,4 +8,5 @@ GeoIPFile ./Data/Tor/geoip
Log notice stdout
# Bind to this address to listen to connections from SOCKS-speaking
# applications.
+SocksPort 9050
SocksListenAddress 127.0.0.1
diff --git a/build-scripts/config/vidalia.conf.ff-linux b/build-scripts/config/vidalia.conf.ff-linux
index 8cd916e..998be98 100644
--- a/build-scripts/config/vidalia.conf.ff-linux
+++ b/build-scripts/config/vidalia.conf.ff-linux
@@ -2,9 +2,6 @@
BrowserDirectory=.
BrowserExecutable=firefox
LanguageCode=en
-ProxyExecutable=./App/polipo
-ProxyExecutableArguments=-c ./Data/Polipo/polipo.conf
-RunProxyAtStart=true
[Tor]
ControlPort=9051
--
1.7.1
More information about the tor-commits
mailing list