[or-cvs] r16275: Torbutton 1.2.0 Also fixed a few minor Torbutton related iss (in incognito/trunk: portage.overlay/x11-plugins/torbutton-bin root_overlay/var/lib/firefox-config/firefox/o2e6y2eh.default)
anonym at seul.org
anonym at seul.org
Thu Jul 31 00:09:09 UTC 2008
Author: anonym
Date: 2008-07-30 20:09:08 -0400 (Wed, 30 Jul 2008)
New Revision: 16275
Added:
incognito/trunk/portage.overlay/x11-plugins/torbutton-bin/torbutton-bin-1.2.0.ebuild
Removed:
incognito/trunk/portage.overlay/x11-plugins/torbutton-bin/torbutton-bin-1.2.0_rc6.ebuild
Modified:
incognito/trunk/portage.overlay/x11-plugins/torbutton-bin/Manifest
incognito/trunk/root_overlay/var/lib/firefox-config/firefox/o2e6y2eh.default/prefs.js
Log:
Torbutton 1.2.0
Also fixed a few minor Torbutton related issues in the Firefox configuration, which was also reorganized and tidied up a little.
Modified: incognito/trunk/portage.overlay/x11-plugins/torbutton-bin/Manifest
===================================================================
--- incognito/trunk/portage.overlay/x11-plugins/torbutton-bin/Manifest 2008-07-31 00:07:58 UTC (rev 16274)
+++ incognito/trunk/portage.overlay/x11-plugins/torbutton-bin/Manifest 2008-07-31 00:09:08 UTC (rev 16275)
@@ -1,2 +1,2 @@
-DIST torbutton-1.2.0rc6.xpi 196648 RMD160 56ffa054d930675762fa1c72146dce8a8ac72260 SHA1 7f01c577641b6222781cd880c9825d6f50ff1cc4 SHA256 22f3fa67498a6603603d9fa23e9bd8ba1c2e09a5a08be4bfe42c359b8a4c0919
-EBUILD torbutton-bin-1.2.0_rc6.ebuild 748 RMD160 f7623eabfdad8a6848056bfab1fb55e70e14b122 SHA1 10af61ee6421989fc2c369ef6ed9b61db175f1e9 SHA256 bd832eee5085f42bf5f8140f1dbc68d1ad891304e610a6e1fd8136e2cb70c6e1
+DIST torbutton-1.2.0-fx.xpi 197571 RMD160 25fa2d5ed2bb871eb3082f45674c8073b18c6f4f SHA1 086e2a05b8e5393f2f28533cdb715e69465c3169 SHA256 b49993f9e9394ab2d0ef1cafa82f22730cd7f995ec197b2f53770705aa6e9522
+EBUILD torbutton-bin-1.2.0.ebuild 670 RMD160 18f9f83f793c0d9e1a79b1065f75a14fc06c9639 SHA1 757356cc3429ed2c1e85f1fb8df3f93564d5637c SHA256 b81641a6630f2449546c02c2b1bb24d1e49a2a597df8092ba1d7c5e55f66d7fb
Copied: incognito/trunk/portage.overlay/x11-plugins/torbutton-bin/torbutton-bin-1.2.0.ebuild (from rev 16082, incognito/trunk/portage.overlay/x11-plugins/torbutton-bin/torbutton-bin-1.2.0_rc6.ebuild)
===================================================================
--- incognito/trunk/portage.overlay/x11-plugins/torbutton-bin/torbutton-bin-1.2.0.ebuild (rev 0)
+++ incognito/trunk/portage.overlay/x11-plugins/torbutton-bin/torbutton-bin-1.2.0.ebuild 2008-07-31 00:09:08 UTC (rev 16275)
@@ -0,0 +1,31 @@
+# Distributed under the terms of the GNU General Public License v2
+
+inherit mozextension multilib
+
+DESCRIPTION="Firefox plugin to control Tor"
+HOMEPAGE="https://www.torproject.org/torbutton/"
+MY_P="${P/-bin/}-fx"
+SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/addons/2275/${MY_P}.xpi"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="|| (
+ >=www-client/mozilla-firefox-bin-2.0
+ >=www-client/mozilla-firefox-2.0
+)"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}
+
+src_unpack() {
+ xpi_unpack "${MY_P}.xpi"
+}
+
+src_install() {
+ declare MOZILLA_FIVE_HOME
+ MOZILLA_FIVE_HOME="/opt/firefox"
+ xpi_install "${S}"/"${MY_P}"
+}
Deleted: incognito/trunk/portage.overlay/x11-plugins/torbutton-bin/torbutton-bin-1.2.0_rc6.ebuild
===================================================================
--- incognito/trunk/portage.overlay/x11-plugins/torbutton-bin/torbutton-bin-1.2.0_rc6.ebuild 2008-07-31 00:07:58 UTC (rev 16274)
+++ incognito/trunk/portage.overlay/x11-plugins/torbutton-bin/torbutton-bin-1.2.0_rc6.ebuild 2008-07-31 00:09:08 UTC (rev 16275)
@@ -1,33 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit mozextension multilib
-
-DESCRIPTION="Firefox plugin to control Tor"
-HOMEPAGE="https://www.torproject.org/torbutton/"
-MY_P="torbutton"
-MY_PV="${PV/_rc/rc}"
-SRC_URI="http://www.torproject.org/torbutton/releases/${MY_P}-${MY_PV}.xpi"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="|| (
- >=www-client/mozilla-firefox-bin-2.0
- >=www-client/mozilla-firefox-2.0
-)"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}
-
-src_unpack() {
- xpi_unpack "${MY_P}-${MY_PV}".xpi
-}
-
-src_install() {
- declare MOZILLA_FIVE_HOME
- MOZILLA_FIVE_HOME="/opt/firefox"
- xpi_install "${S}"/"${MY_P}-${MY_PV}"
-}
Modified: incognito/trunk/root_overlay/var/lib/firefox-config/firefox/o2e6y2eh.default/prefs.js
===================================================================
--- incognito/trunk/root_overlay/var/lib/firefox-config/firefox/o2e6y2eh.default/prefs.js 2008-07-31 00:07:58 UTC (rev 16274)
+++ incognito/trunk/root_overlay/var/lib/firefox-config/firefox/o2e6y2eh.default/prefs.js 2008-07-31 00:09:08 UTC (rev 16275)
@@ -1,61 +1,80 @@
# 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
+/*
+ * Note that many of the settings below are part of Torbutton's toggled state
+ * (initially enabled). Settings that Torbutton plays with need to be set in
+ * extensions.torbutton.saved.<something> in order for them to be set once
+ * Torbutton is untoggled.
*/
-user_pref("app.update.enabled", false);
-user_pref("app.update.autoInstallEnabled", false);
-user_pref("app.update.auto", false);
-user_pref("browser.cache.disk.capacity", 0);
-user_pref("browser.history_expire_days", 0);
-user_pref("browser.history_expire_days.mirror", 0);
+/* Miscellaneous */
+user_pref("browser.shell.checkDefaultBrowser", false);
+user_pref("browser.startup.homepage", "http://incognito.anonymityanywhere.com");
+user_pref("browser.startup.page", 0);
+user_pref("network.cookie.prefsMigrated", true);
+
+/* Make sure the password manager and form-filling is disabled. */
+user_pref("browser.formfill.enable", false);
+user_pref("signon.prefillForms", false);
user_pref("signon.rememberSignons", false);
+
+/* Remove all traces on shutdown. */
+user_pref("privacy.item.cache", true);
user_pref("privacy.item.cookies", true);
+user_pref("privacy.item.downloads", true);
+user_pref("privacy.item.formdata", true);
+user_pref("privacy.item.history", true);
+user_pref("privacy.item.sessions", true);
user_pref("privacy.sanitize.promptOnSanitize", false);
user_pref("privacy.sanitize.sanitizeOnShutdown", true);
-user_pref("browser.preferences.advanced.selectedTabIndex", 0);
-user_pref("browser.shell.checkDefaultBrowser", false);
-user_pref("browser.startup.homepage", "http://incognito.anonymityanywhere.com");
-user_pref("browser.startup.page", 0);
+/* For completeness, don't keep history or cookies. */
+user_pref("browser.history_expire_days", 0);
+user_pref("browser.history_expire_days_min", 0);
+user_pref("browser.history_expire_days.mirror", 0);
+user_pref("network.cookie.lifetimePolicy", 2);
+
+/* Don't cache to disk. */
+user_pref("browser.cache.disk.enable", false);
+user_pref("browser.cache.disk.capacity", 0);
+
+/* Don't use google's safe browsing. */
+user_pref("browser.safebrowsing.enabled", false);
+
+/* Fonts */
+user_pref("font.name.monospace.x-western", "Bitstream Vera Sans Mono");
+user_pref("font.name.sans-serif.x-western", "Bitstream Vera Sans");
+user_pref("font.name.serif.x-western", "Bitstream Vera Serif");
+
+/* Search engines */
+user_pref("browser.search.selectedEngine", "Scroogle SSL");
+user_pref("browser.search.suggest.enabled", false);
+user_pref("browser.search.update", false);
+user_pref("browser.search.useDBForOrder", true);
+
/* Update the following two versions when upgrading Firefox */
user_pref("extensions.lastAppVersion", "2.0.0.16");
user_pref("browser.startup.homepage_override.mstone", "rv:1.8.1.16");
-/* Firefox: disable extension updates. */
+/* Suppress Firefox update checking. */
+user_pref("app.update.enabled", false);
+user_pref("app.update.autoInstallEnabled", false);
+user_pref("app.update.auto", false);
+
+/* Disable extension updates. */
user_pref("extensions.update.enabled", false);
user_pref("extensions.update.notifyUser", false);
-user_pref("network.cookie.prefsMigrated", true);
-/* Firefox: network performance improvements. */
+/* Network performance improvements in general and for Tor. */
user_pref("network.http.keep-alive.timeout", 600);
user_pref("network.http.max-persistent-connections-per-proxy", 16);
user_pref("network.http.pipelining", true);
user_pref("network.http.pipelining.maxrequests", 8);
user_pref("network.http.proxy.pipelining", true);
-/* Firefox: HTTP/SOCKS proxies. */
-user_pref("network.proxy.http", "127.0.0.1");
-user_pref("network.proxy.http_port", 3128);
-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.ssl", "127.0.0.1");
-user_pref("network.proxy.ssl_port", 3128);
-user_pref("network.proxy.type", 1);
+/* No should be used for local addresses (not even the transparent proxy) */
user_pref("network.proxy.no_proxies_on", "localhost, 10.0.0.0/8, 172.16.0.0/12, 192.168.0.0/16, 127.0.0.0/9, 127.128.0.0/10");
-/* Firefox: fonts */
-user_pref("font.name.monospace.x-western", "Bitstream Vera Sans Mono");
-user_pref("font.name.sans-serif.x-western", "Bitstream Vera Sans");
-user_pref("font.name.serif.x-western", "Bitstream Vera Serif");
-
/* Torbutton settings */
user_pref("extensions.torbutton.custom.http_port", 3128);
user_pref("extensions.torbutton.custom.http_proxy", "127.0.0.1");
@@ -71,35 +90,42 @@
user_pref("extensions.torbutton.nontor_memory_jar", true);
user_pref("extensions.torbutton.proxies_applied", true);
user_pref("extensions.torbutton.restore_tor", true);
+user_pref("extensions.torbutton.settings_applied", true);
+user_pref("extensions.torbutton.settings_method", "custom");
+user_pref("extensions.torbutton.socks_host", "127.0.0.1");
+user_pref("extensions.torbutton.socks_port", 9050);
+user_pref("extensions.torbutton.startup_state", 1);
+user_pref("extensions.torbutton.tor_enabled", true);
+user_pref("extensions.torbutton.tor_memory_jar", true);
+user_pref("extensions.torbutton.use_privoxy", false);
+
+/* Torbutton's saved Firefox settings -- "these" are set when disabled */
user_pref("extensions.torbutton.saved.app_update", false);
user_pref("extensions.torbutton.saved.auto_update", false);
+user_pref("extensions.torbutton.saved.disk_cache", false);
user_pref("extensions.torbutton.saved.extension_update", false);
-user_pref("extensions.torbutton.saved.http_port", 3128);
-user_pref("extensions.torbutton.saved.http_proxy", "127.0.0.1");
-user_pref("extensions.torbutton.saved.https_port", 3128);
-user_pref("extensions.torbutton.saved.https_proxy", "127.0.0.1");
+user_pref("extensions.torbutton.saved.formfill", false);
user_pref("extensions.torbutton.saved.remember_signons", false);
+user_pref("extensions.torbutton.saved.safebrowsing", false);
user_pref("extensions.torbutton.saved.search_suggest", false);
user_pref("extensions.torbutton.saved.search_update", false);
user_pref("extensions.torbutton.saved.share_proxy_settings", false);
-user_pref("extensions.torbutton.saved.socks_host", "127.0.0.1");
-user_pref("extensions.torbutton.saved.socks_port", 9050);
user_pref("extensions.torbutton.saved.socks_remote_dns", true);
user_pref("extensions.torbutton.saved.socks_version", 5);
-user_pref("extensions.torbutton.settings_applied", true);
-user_pref("extensions.torbutton.settings_method", "custom");
-user_pref("extensions.torbutton.socks_host", "127.0.0.1");
-user_pref("extensions.torbutton.socks_port", 9050);
-user_pref("extensions.torbutton.startup_state", 1);
-user_pref("extensions.torbutton.tor_enabled", true);
-user_pref("extensions.torbutton.tor_memory_jar", true);
-user_pref("extensions.torbutton.use_privoxy", false);
+user_pref("extensions.torbutton.saved.type", 0);
-/* Additional Firefox state due to Torbutton being toggled */
-user_pref("browser.cache.disk.enable", false);
+/* Proxy settings, part of Torbutton's initial enabled state. */
+user_pref("network.proxy.http", "127.0.0.1");
+user_pref("network.proxy.http_port", 3128);
+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.ssl", "127.0.0.1");
+user_pref("network.proxy.ssl_port", 3128);
+user_pref("network.proxy.type", 1);
+
+/* Additional Firefox state so Torbutton _really_ starts enabled. */
user_pref("browser.download.manager.retention", 0);
-user_pref("browser.formfill.enable", false);
-user_pref("browser.safebrowsing.enabled", false);
user_pref("browser.send_pings", false);
user_pref("dom.storage.enabled", false);
user_pref("general.appname.override", "Netscape");
@@ -107,12 +133,12 @@
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.override", "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.14) Gecko/20080404 Firefox/2.0.0.14");
+user_pref("general.productSub.override", "20080702");
+user_pref("general.useragent.override", "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.16) Gecko/20080702 Firefox/2.0.0.16");
user_pref("general.useragent.vendor", "");
user_pref("general.useragent.vendorSub", "");
user_pref("intl.accept_languages", "en-us, en");
-user_pref("network.cookie.lifetimePolicy", 2);
+user_pref("intl.charsetmenu.browser.cache", "ISO-8859-1, UTF-8");
user_pref("network.protocol-handler.warn-external.file", true);
user_pref("network.protocol-handler.warn-external.mailto", true);
user_pref("network.protocol-handler.warn-external.news", true);
@@ -133,17 +159,11 @@
/* FireGPG: disable updates and welcome window */
user_pref("extensions.firegpg.gpg_path", "gpg");
-user_pref("extensions.firegpg.gpg_version", "0.5");
+user_pref("extensions.firegpg.gpg_version", "0.5.1");
user_pref("extensions.firegpg.no_updates", true);
user_pref("extensions.firegpg.xpcom_state", 1);
user_pref("extensions.firegpg.show_website", false);
-/* Search engine plugins */
-user_pref("browser.search.selectedEngine", "Scroogle SSL");
-user_pref("browser.search.suggest.enabled", false);
-user_pref("browser.search.update", false);
-user_pref("browser.search.useDBForOrder", true);
-
/* Quick Locale Switcher */
user_pref("extensions.qls.autoswitchfortld", false);
user_pref("extensions.qls.backup_acceptlanguages", "en-us, en");
More information about the tor-commits
mailing list