June 2012 - tor-commits - lists.torproject.org

[vidalia/alpha] Allow picking entry nodes
by chiiph＠torproject.org 12 Jun '12

12 Jun '12

commit b73d1cb047a4d478550fe946d2be1360da1e7367 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Tue Jun 12 20:19:46 2012 -0300 Allow picking entry nodes --- changes/pickExitNodes | 6 ++-- src/vidalia/config/AdvancedPage.cpp | 2 + src/vidalia/config/TorSettings.cpp | 27 +++++++++++++++++++ src/vidalia/config/TorSettings.h | 5 +++ src/vidalia/config/VidaliaSettings.cpp | 12 ++++++++ src/vidalia/config/VidaliaSettings.h | 8 ++++++ src/vidalia/network/RouterListItem.cpp | 31 ++++++++++++++++++++++ src/vidalia/network/RouterListItem.h | 7 +++++ src/vidalia/network/RouterListWidget.cpp | 41 +++++++++++++++++++++++++++++- src/vidalia/network/RouterListWidget.h | 2 + 10 files changed, 137 insertions(+), 4 deletions(-) diff --git a/changes/pickExitNodes b/changes/pickExitNodes index 32ebd1a..8751db8 100644 --- a/changes/pickExitNodes +++ b/changes/pickExitNodes @@ -1,9 +1,9 @@ New features: - o Provide a way of hand picking exit nodes from the router list in - the Network Map. + o Provide a way of hand picking entry and exit nodes from the + router list in the Network Map. Internal cleanups and improvements: o Fix return value from VMessageBox::question. o Make TorControl::getRouterDescriptorText() default to regular descriptors in case the microdescriptor is not available. - o Improve handling of ControlPort and SocksPort settings. \ No newline at end of file + o Improve handling of ControlPort and SocksPort settings. diff --git a/src/vidalia/config/AdvancedPage.cpp b/src/vidalia/config/AdvancedPage.cpp index 51214a4..a97c079 100644 --- a/src/vidalia/config/AdvancedPage.cpp +++ b/src/vidalia/config/AdvancedPage.cpp @@ -272,6 +272,8 @@ AdvancedPage::load() /** We need to keep the ExitNodes settings, even if we don't use it here */ _settings->setExitNodes(_settings->exitNodes()); + /** ... and the same for entry nodes */ + _settings->setEntryNodes(_settings->entryNodes()); } /** Called when the user selects a different authentication method from the diff --git a/src/vidalia/config/TorSettings.cpp b/src/vidalia/config/TorSettings.cpp index df56b12..c1dcb1a 100644 --- a/src/vidalia/config/TorSettings.cpp +++ b/src/vidalia/config/TorSettings.cpp @@ -49,6 +49,7 @@ #define SETTING_AUTOCONTROL "AutoControl" #define SETTING_DISABLE_NETWORK "DisableNetwork" #define SETTING_EXITNODES "ExitNodes" +#define SETTING_ENTRYNODES "EntryNodes" /** Default to using hashed password authentication */ #define DEFAULT_AUTH_METHOD PasswordAuth @@ -176,6 +177,14 @@ TorSettings::apply(QString *errmsg) torrc->setValue(SETTING_EXITNODES, exitNodes); } + QString entryNodes = volatileValue(SETTING_ENTRYNODES).toString(); + + if (entryNodes.isEmpty()) { + torrc->clear(QStringList() << SETTING_ENTRYNODES); + } else { + torrc->setValue(SETTING_ENTRYNODES, entryNodes); + } + return torrc->apply(Vidalia::torControl(), errmsg); } @@ -606,3 +615,21 @@ TorSettings::setExitNodes(const QStringList &exitNodes) { setVolatileValue(SETTING_EXITNODES, exitNodes.join(",")); } + +/** Returns the selected entry nodes */ +QStringList +TorSettings::entryNodes() const +{ + QStringList entryNodes; + with_torrc_value(SETTING_ENTRYNODES) { + entryNodes = ret.at(0).split(","); + } + return entryNodes; +} + +/** Sets the entry nodes to the specified list */ +void +TorSettings::setEntryNodes(const QStringList &entryNodes) +{ + setVolatileValue(SETTING_ENTRYNODES, entryNodes.join(",")); +} diff --git a/src/vidalia/config/TorSettings.h b/src/vidalia/config/TorSettings.h index a8c6e06..e995ba7 100644 --- a/src/vidalia/config/TorSettings.h +++ b/src/vidalia/config/TorSettings.h @@ -154,6 +154,11 @@ public: /** Sets the exit nodes to the specified list */ void setExitNodes(const QStringList &exitNodes); + /** Returns the selected entry nodes */ + QStringList entryNodes() const; + /** Sets the entry nodes to the specified list */ + void setEntryNodes(const QStringList &entryNodes); + private: /** Returns the AuthenticationMethod enum value for the string * description of the authentication method given in <b>authMethod</b>. */ diff --git a/src/vidalia/config/VidaliaSettings.cpp b/src/vidalia/config/VidaliaSettings.cpp index 8386d64..03dde13 100644 --- a/src/vidalia/config/VidaliaSettings.cpp +++ b/src/vidalia/config/VidaliaSettings.cpp @@ -393,3 +393,15 @@ VidaliaSettings::setDontWarnExitNodes(bool val) { setValue(SETTING_REMEMBER_DONTWARNEXIT, val); } + +bool +VidaliaSettings::dontWarnEntryNodes() const +{ + return value(SETTING_REMEMBER_DONTWARNENTRY).toBool(); +} + +void +VidaliaSettings::setDontWarnEntryNodes(bool val) +{ + setValue(SETTING_REMEMBER_DONTWARNENTRY, val); +} diff --git a/src/vidalia/config/VidaliaSettings.h b/src/vidalia/config/VidaliaSettings.h index 68cbd3b..43a9600 100644 --- a/src/vidalia/config/VidaliaSettings.h +++ b/src/vidalia/config/VidaliaSettings.h @@ -23,6 +23,7 @@ /** Public setting keys */ #define SETTING_REMEMBER_SHUTDOWN "RememberShutdown" #define SETTING_REMEMBER_DONTWARNEXIT "DontWarnExitNodes" +#define SETTING_REMEMBER_DONTWARNENTRY "DontWarnEntryNodes" /** Handles saving and restoring Vidalia's settings, such as the * location of Tor, the control port, etc. @@ -159,6 +160,13 @@ public: /** Sets wether Vidalia should warn the user when setting Exit nodes * by hand */ void setDontWarnExitNodes(bool val); + + /** Returns true if Vidalia should warn the user when setting Entry + * nodes by hand */ + bool dontWarnEntryNodes() const; + /** Sets wether Vidalia should warn the user when setting Entry nodes + * by hand */ + void setDontWarnEntryNodes(bool val); }; #endif diff --git a/src/vidalia/network/RouterListItem.cpp b/src/vidalia/network/RouterListItem.cpp index 3a961b4..480d5a8 100644 --- a/src/vidalia/network/RouterListItem.cpp +++ b/src/vidalia/network/RouterListItem.cpp @@ -28,6 +28,7 @@ #define NONEXIT_COLOR (Qt::white) #define EXIT_COLOR (QColor::fromRgb(169, 207, 84)) #define CANBEEXIT_COLOR (QColor::fromRgb(172, 209, 233)) +#define ENTRY_COLOR (QColor::fromRgb(255, 144, 0)) #define IMG_NODE_OFFLINE ":/images/icons/node-unresponsive.png" #define IMG_NODE_SLEEPING ":/images/icons/node-hibernating.png" @@ -208,3 +209,33 @@ RouterListItem::showAsExit(bool exit) setBackground(NONEXIT_COLOR); } } + +/** Sets this item's background to selected entry color if entry is true */ +void +RouterListItem::showAsSelectedEntry(bool entry) +{ + _selectedEntry = entry; + TorSettings settings; + QStringList entryNodes = settings.entryNodes(); + bool changed = false; + + if (entry) { + setBackground(ENTRY_COLOR); + + if (entryNodes.indexOf(id()) == -1) { + entryNodes << id(); + settings.setEntryNodes(entryNodes); + changed = true; + } + } else { + setBackground(NONEXIT_COLOR); + entryNodes.removeAll(id()); + settings.setEntryNodes(entryNodes); + changed = true; + } + + QString errmsg; + if (changed && !settings.apply(&errmsg)) { + vWarn(errmsg); + } +} diff --git a/src/vidalia/network/RouterListItem.h b/src/vidalia/network/RouterListItem.h index 65904dd..db98364 100644 --- a/src/vidalia/network/RouterListItem.h +++ b/src/vidalia/network/RouterListItem.h @@ -61,6 +61,12 @@ public: /** Returns true if this item has been selected as exit */ bool selectedExit() const { return _selectedExit; } + /** Sets this item's background to selected entry color if exit is true */ + void showAsSelectedEntry(bool entry); + + /** Returns true if this item has been selected as entry */ + bool selectedEntry() const { return _selectedEntry; } + private: RouterDescriptor* _rd; /**< Descriptor for this router item. */ RouterListWidget* _list; /**< The list for this list item. */ @@ -69,6 +75,7 @@ private: QString _countryCode; bool _selectedExit; /**< True if this router has been selected for exit */ + bool _selectedEntry; /**< True if this router has been selected for exit */ /** Sets the whole line to the given brush */ void setBackground(const QBrush &brush); diff --git a/src/vidalia/network/RouterListWidget.cpp b/src/vidalia/network/RouterListWidget.cpp index 837c025..faa9a3e 100644 --- a/src/vidalia/network/RouterListWidget.cpp +++ b/src/vidalia/network/RouterListWidget.cpp @@ -59,7 +59,7 @@ RouterListWidget::retranslateUi() void RouterListWidget::contextMenuEvent(QContextMenuEvent *event) { - QAction *action, *routerInfoAction, *useAsExit; + QAction *action, *routerInfoAction, *useAsExit, *useAsEntry; QMenu *menu, *copyMenu; QList<QTreeWidgetItem *> selected; @@ -100,6 +100,18 @@ RouterListWidget::contextMenuEvent(QContextMenuEvent *event) connect(useAsExit, SIGNAL(triggered()), this, SLOT(useAsExit())); } + useAsEntry = menu->addAction(QIcon(IMG_PLUS), tr("Use as Entry node")); + if (selected.size() > 1) { + useAsEntry->setEnabled(false); + } else { + if (item->selectedEntry()) { + useAsEntry->setText(tr("Do not use as Entry node")); + useAsEntry->setIcon(QIcon(IMG_MINUS)); + } + + connect(useAsEntry, SIGNAL(triggered()), this, SLOT(useAsEntry())); + } + menu->exec(event->globalPos()); delete menu; } @@ -344,3 +356,30 @@ RouterListWidget::useAsExit() } } } + +/** Called when the Use as Entry node menu action is selected */ +void +RouterListWidget::useAsEntry() +{ + foreach (QTreeWidgetItem *item, selectedItems()) { + RouterListItem *relay = dynamic_cast<RouterListItem *>(item); + VidaliaSettings settings; + if (!settings.dontWarnEntryNodes()) { + int res = VMessageBox::question(this, tr("You are about to set a fixed Entry node"), + tr("You need to understand that by doing this you might be " + "putting your anonymity at risk and/or limiting the " + "services you have available through Tor.\n\n" + "Do you still want to set this node as Entry?"), + VMessageBox::Yes, + VMessageBox::No|VMessageBox::Default, + VMessageBox::Cancel|VMessageBox::Escape, + "I know what I'm doing, do not remind me", &settings, + SETTING_REMEMBER_DONTWARNENTRY); + + if (res == VMessageBox::Yes) + relay->showAsSelectedEntry(!relay->selectedEntry()); + } else { + relay->showAsSelectedEntry(!relay->selectedEntry()); + } + } +} diff --git a/src/vidalia/network/RouterListWidget.h b/src/vidalia/network/RouterListWidget.h index 5b5be3c..fddfaa9 100644 --- a/src/vidalia/network/RouterListWidget.h +++ b/src/vidalia/network/RouterListWidget.h @@ -91,6 +91,8 @@ private slots: void displayRouterInfo(); /** Called when the Use as Exit node menu action is selected */ void useAsExit(); + /** Called when the Use as Entry node menu action is selected */ + void useAsEntry(); protected: /** Called when the user presses a key while the list has focus. */

1 0

[vidalia/alpha] Fix build error in certain Debian flavors
by chiiph＠torproject.org 12 Jun '12

12 Jun '12

commit 13a75c5dd6d150b821c3f0b5495af63f958260e3 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Tue Jun 12 20:28:31 2012 -0300 Fix build error in certain Debian flavors --- src/vidalia/plugin/PluginEngine.cpp | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/vidalia/plugin/PluginEngine.cpp b/src/vidalia/plugin/PluginEngine.cpp index 0c9e75a..c20424c 100644 --- a/src/vidalia/plugin/PluginEngine.cpp +++ b/src/vidalia/plugin/PluginEngine.cpp @@ -20,6 +20,8 @@ #include "Vidalia.h" +#include <unistd.h> + PluginEngine::PluginEngine(QObject *parent) : QScriptEngine(parent) { @@ -228,7 +230,7 @@ PluginEngine::sleep(QScriptContext *context, QScriptEngine *engine) #if defined(Q_WS_WIN) Sleep(s*1000); #else - !::sleep(s); + (void)::sleep(s); #endif return engine->nullValue();

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 12 Jun '12

12 Jun '12

commit 2c7028b792228c0b999b63f15eba58050a0df779 Merge: a8043f0 6948e41 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Jun 12 18:15:17 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/recommended-versions | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-)

1 0

[torbrowser/master] bump recommended-versions for 2.2.37-1
by erinn＠torproject.org 12 Jun '12

12 Jun '12

commit 6948e41ac2f27944fee696b5a525c4994a123610 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Jun 12 18:15:05 2012 -0300 bump recommended-versions for 2.2.37-1 --- build-scripts/recommended-versions | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index 8c39dd8..0763323 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,14 +1,9 @@ [ -"2.2.35-12-MacOS-i386", -"2.2.35-12-MacOS-x86_64", -"2.2.35-13-Windows", -"2.2.35-12-Linux-i686", -"2.2.35-12-Linux-x86_64", -"2.2.36-1-MacOS-i386", -"2.2.36-1-MacOS-x86_64", -"2.2.36-1-Windows", -"2.2.36-1-Linux-i686", -"2.2.36-1-Linux-x86_64", +"2.2.37-1-MacOS-i386", +"2.2.37-1-MacOS-x86_64", +"2.2.37-1-Windows", +"2.2.37-1-Linux-i686", +"2.2.37-1-Linux-x86_64", "2.3.12-alpha-2-MacOS-i386", "2.3.12-alpha-2-Windows", "2.3.12-alpha-2-Linux-i386",

1 0

[torbrowser/master] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 12 Jun '12

12 Jun '12

commit 2c7028b792228c0b999b63f15eba58050a0df779 Merge: a8043f0 6948e41 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Jun 12 18:15:17 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/recommended-versions | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-)

1 0

[torbrowser/maint-2.3] bump recommended-versions for 2.2.37-1
by erinn＠torproject.org 12 Jun '12

12 Jun '12

commit 6948e41ac2f27944fee696b5a525c4994a123610 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Jun 12 18:15:05 2012 -0300 bump recommended-versions for 2.2.37-1 --- build-scripts/recommended-versions | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index 8c39dd8..0763323 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,14 +1,9 @@ [ -"2.2.35-12-MacOS-i386", -"2.2.35-12-MacOS-x86_64", -"2.2.35-13-Windows", -"2.2.35-12-Linux-i686", -"2.2.35-12-Linux-x86_64", -"2.2.36-1-MacOS-i386", -"2.2.36-1-MacOS-x86_64", -"2.2.36-1-Windows", -"2.2.36-1-Linux-i686", -"2.2.36-1-Linux-x86_64", +"2.2.37-1-MacOS-i386", +"2.2.37-1-MacOS-x86_64", +"2.2.37-1-Windows", +"2.2.37-1-Linux-i686", +"2.2.37-1-Linux-x86_64", "2.3.12-alpha-2-MacOS-i386", "2.3.12-alpha-2-Windows", "2.3.12-alpha-2-Linux-i386",

1 0

[torbrowser/maint-2.2] bump recommended-versions for 2.2.37-1
by erinn＠torproject.org 12 Jun '12

12 Jun '12

commit 6948e41ac2f27944fee696b5a525c4994a123610 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Jun 12 18:15:05 2012 -0300 bump recommended-versions for 2.2.37-1 --- build-scripts/recommended-versions | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index 8c39dd8..0763323 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,14 +1,9 @@ [ -"2.2.35-12-MacOS-i386", -"2.2.35-12-MacOS-x86_64", -"2.2.35-13-Windows", -"2.2.35-12-Linux-i686", -"2.2.35-12-Linux-x86_64", -"2.2.36-1-MacOS-i386", -"2.2.36-1-MacOS-x86_64", -"2.2.36-1-Windows", -"2.2.36-1-Linux-i686", -"2.2.36-1-Linux-x86_64", +"2.2.37-1-MacOS-i386", +"2.2.37-1-MacOS-x86_64", +"2.2.37-1-Windows", +"2.2.37-1-Linux-i686", +"2.2.37-1-Linux-x86_64", "2.3.12-alpha-2-MacOS-i386", "2.3.12-alpha-2-Windows", "2.3.12-alpha-2-Linux-i386",

1 0

r25675: {website} bump all stable packages for tor 0.2.2.37 (website/trunk/include)
by Erinn Clark 12 Jun '12

12 Jun '12

Author: erinn Date: 2012-06-12 19:27:58 +0000 (Tue, 12 Jun 2012) New Revision: 25675 Modified: website/trunk/include/versions.wmi Log: bump all stable packages for tor 0.2.2.37 Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2012-06-12 11:40:14 UTC (rev 25674) +++ website/trunk/include/versions.wmi 2012-06-12 19:27:58 UTC (rev 25675) @@ -1,58 +1,58 @@ <define-tag version-stable whitespace=delete>0.2.2.37</define-tag> <define-tag version-alpha whitespace=delete>0.2.3.16-alpha</define-tag> -<define-tag version-win32-stable whitespace=delete>0.2.2.36</define-tag> +<define-tag version-win32-stable whitespace=delete>0.2.2.37</define-tag> <define-tag version-win32-alpha whitespace=delete>0.2.3.15-alpha</define-tag> -<define-tag version-win32-bundle-stable whitespace=delete>0.2.2.36</define-tag> +<define-tag version-win32-bundle-stable whitespace=delete>0.2.2.37</define-tag> <define-tag version-win32-bundle-alpha whitespace=delete>0.2.3.15-alpha</define-tag> <define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.3.15-alpha-<version-vidalia-stable></define-tag> <define-tag version-win32-relay-bundle-alpha whitespace=delete>0.2.3.15-alpha-<version-vidalia-stable></define-tag> <define-tag version-win32-exit-bundle-alpha whitespace=delete>0.2.3.15-alpha-<version-vidalia-stable></define-tag> -<define-tag version-osx-x86-bundle-stable whitespace=delete>0.2.2.36</define-tag> +<define-tag version-osx-x86-bundle-stable whitespace=delete>0.2.2.37</define-tag> <define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.3.15-alpha</define-tag> -<define-tag version-osx-ppc-bundle-stable whitespace=delete>0.2.2.36</define-tag> +<define-tag version-osx-ppc-bundle-stable whitespace=delete>0.2.2.37</define-tag> <define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.3.15-alpha</define-tag> -<define-tag version-osx-x86-stable whitespace=delete>0.2.2.36</define-tag> +<define-tag version-osx-x86-stable whitespace=delete>0.2.2.37</define-tag> <define-tag version-osx-x86-alpha whitespace=delete>0.2.3.15-alpha</define-tag> -<define-tag version-osx-ppc-stable whitespace=delete>0.2.2.36</define-tag> +<define-tag version-osx-ppc-stable whitespace=delete>0.2.2.37</define-tag> <define-tag version-osx-ppc-alpha whitespace=delete>0.2.3.15-alpha</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>2.2.36-1</define-tag> -<define-tag version-torbrowser-tor whitespace=delete>0.2.2.36</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>2.2.37-1</define-tag> +<define-tag version-torbrowser-tor whitespace=delete>0.2.2.37</define-tag> <define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.19-stable, zlib-1.2.7, openssl-1.0.1c</define-tag> -<define-tag version-torbrowser-firefox whitespace=delete>12.0</define-tag> +<define-tag version-torbrowser-firefox whitespace=delete>10.0.5esr</define-tag> <define-tag version-torbrowser-torbutton whitespace=delete>1.4.5.1</define-tag> <define-tag version-torbrowser-pidgin whitespace=delete>2.7.5</define-tag> <define-tag version-torbrowser-otr whitespace=delete>3.2</define-tag> -<define-tag version-torbrowser-vidalia whitespace=delete>0.2.17</define-tag> +<define-tag version-torbrowser-vidalia whitespace=delete>0.2.19</define-tag> <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag> <define-tag version-torbrowserbundlealpha whitespace=delete>2.3.12-alpha-2</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.2.36-1</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.2.36-1</define-tag> -<define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.36</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.2.37-1</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.2.37-1</define-tag> +<define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.37</define-tag> <define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.19-stable, zlib-1.2.7, openssl-1.0.1c</define-tag> -<define-tag version-gnu-torbrowser-firefox whitespace=delete>12.0</define-tag> +<define-tag version-gnu-torbrowser-firefox whitespace=delete>10.0.5esr</define-tag> <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.4.5.1</define-tag> -<define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.17</define-tag> +<define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.19</define-tag> <define-tag version-torbrowserbundlelinux32alpha whitespace=delete>2.3.12-alpha-2</define-tag> <define-tag version-torbrowserbundlelinux64alpha whitespace=delete>2.3.12-alpha-2</define-tag> -<define-tag version-torbrowserbundleosx32 whitespace=delete>2.2.36-1</define-tag> -<define-tag version-torbrowserbundleosx64 whitespace=delete>2.2.36-1</define-tag> -<define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.36</define-tag> -<define-tag version-osx-torbrowser-firefox whitespace=delete>12.0</define-tag> +<define-tag version-torbrowserbundleosx32 whitespace=delete>2.2.37-1</define-tag> +<define-tag version-torbrowserbundleosx64 whitespace=delete>2.2.37-1</define-tag> +<define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.37</define-tag> +<define-tag version-osx-torbrowser-firefox whitespace=delete>10.0.5esr</define-tag> <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.4.5.1</define-tag> -<define-tag version-osx-torbrowser-vidalia whitespace=delete>0.2.17</define-tag> +<define-tag version-osx-torbrowser-vidalia whitespace=delete>0.2.19</define-tag> <define-tag version-torbrowserbundleosx32alpha whitespace=delete>2.3.12-alpha-2</define-tag> -<define-tag version-vidalia-stable whitespace=delete>0.2.17</define-tag> +<define-tag version-vidalia-stable whitespace=delete>0.2.19</define-tag> <define-tag version-vidalia-alpha whitespace=delete>0.3.1</define-tag> <define-tag version-androidbundle-tor whitespace=delete>0.2.3.10-alpha</define-tag> @@ -64,32 +64,32 @@ <define-tag package-win32-stable whitespace=delete>../dist/win32/tor-<version-win32-stable>-win32.exe</define-tag> <define-tag package-win32-alpha whitespace=delete>../dist/win32/tor-<version-win32-alpha>-win32.exe</define-tag> -<define-tag file-win32-bundle-stable whitespace=delete>vidalia-bundle-<version-win32-bundle-stable>-0.2.17.exe</define-tag> +<define-tag file-win32-bundle-stable whitespace=delete>vidalia-bundle-<version-win32-bundle-stable>-0.2.19.exe</define-tag> <define-tag package-win32-bundle-stable whitespace=delete>../dist/vidalia-bundles/<file-win32-bundle-stable></define-tag> <define-tag file-win32-bundle-alpha whitespace=delete>vidalia-bundle-<version-win32-bundle-alpha>-0.2.17.exe</define-tag> <define-tag package-win32-bundle-alpha whitespace=delete>../dist/vidalia-bundles/<file-win32-bundle-alpha></define-tag> -<define-tag file-win32-bridge-bundle-stable whitespace=delete>vidalia-bridge-bundle-<version-win32-bundle-stable>-0.2.17.exe</define-tag> +<define-tag file-win32-bridge-bundle-stable whitespace=delete>vidalia-bridge-bundle-<version-win32-bundle-stable>-0.2.19.exe</define-tag> <define-tag package-win32-bridge-bundle-stable whitespace=delete>../dist/vidalia-bundles/<file-win32-bridge-bundle-stable></define-tag> <define-tag file-win32-bridge-bundle-alpha whitespace=delete>vidalia-bridge-bundle-<version-win32-bundle-alpha>-0.2.17.exe</define-tag> <define-tag package-win32-bridge-bundle-alpha whitespace=delete>../dist/vidalia-bundles/<file-win32-bridge-bundle-alpha></define-tag> -<define-tag file-win32-relay-bundle-stable whitespace=delete>vidalia-relay-bundle-<version-win32-bundle-stable>-0.2.17.exe</define-tag> +<define-tag file-win32-relay-bundle-stable whitespace=delete>vidalia-relay-bundle-<version-win32-bundle-stable>-0.2.19.exe</define-tag> <define-tag package-win32-relay-bundle-stable whitespace=delete>../dist/vidalia-bundles/<file-win32-relay-bundle-stable></define-tag> <define-tag file-win32-relay-bundle-alpha whitespace=delete>vidalia-relay-bundle-<version-win32-bundle-alpha>-0.2.17.exe</define-tag> <define-tag package-win32-relay-bundle-alpha whitespace=delete>../dist/vidalia-bundles/<file-win32-relay-bundle-alpha></define-tag> -<define-tag file-win32-exit-bundle-stable whitespace=delete>vidalia-exit-bundle-<version-win32-bundle-stable>-0.2.17.exe</define-tag> +<define-tag file-win32-exit-bundle-stable whitespace=delete>vidalia-exit-bundle-<version-win32-bundle-stable>-0.2.19.exe</define-tag> <define-tag package-win32-exit-bundle-stable whitespace=delete>../dist/vidalia-bundles/<file-win32-exit-bundle-stable></define-tag> <define-tag file-win32-exit-bundle-alpha whitespace=delete>vidalia-exit-bundle-<version-win32-bundle-alpha>-0.2.17.exe</define-tag> <define-tag package-win32-exit-bundle-alpha whitespace=delete>../dist/vidalia-bundles/<file-win32-exit-bundle-alpha></define-tag> -<define-tag file-osx-x86-bundle-stable whitespace=delete>vidalia-bundle-<version-osx-x86-bundle-stable>-0.2.17-i386.dmg</define-tag> +<define-tag file-osx-x86-bundle-stable whitespace=delete>vidalia-bundle-<version-osx-x86-bundle-stable>-0.2.19-i386.dmg</define-tag> <define-tag package-osx-x86-bundle-stable whitespace=delete>../dist/vidalia-bundles/<file-osx-x86-bundle-stable></define-tag> <define-tag file-osx-x86-bundle-alpha whitespace=delete>vidalia-bundle-<version-osx-x86-bundle-alpha>-0.2.17-i386.dmg</define-tag> <define-tag package-osx-x86-bundle-alpha whitespace=delete>../dist/vidalia-bundles/<file-osx-x86-bundle-alpha></define-tag> -<define-tag package-osx-ppc-bundle-stable whitespace=delete>../dist/vidalia-bundles/vidalia-bundle-<version-osx-ppc-bundle-stable>-0.2.17-ppc.dmg</define-tag> +<define-tag package-osx-ppc-bundle-stable whitespace=delete>../dist/vidalia-bundles/vidalia-bundle-<version-osx-ppc-bundle-stable>-0.2.19-ppc.dmg</define-tag> <define-tag package-osx-ppc-bundle-alpha whitespace=delete>../dist/vidalia-bundles/vidalia-bundle-<version-osx-ppc-bundle-alpha>-0.2.17-ppc.dmg</define-tag> <define-tag package-osx-x86-stable whitespace=delete>../dist/osx-x86/Tor-<version-osx-stable>-i386-Bundle.dmg</define-tag>

1 0

[torbrowser/maint-2.2] change the way torbutton is installed on linux since the old method no longer works
by erinn＠torproject.org 12 Jun '12

12 Jun '12

commit b9f4cc4144ea87f0dc08d6e1e9fd5b6fe8b23ef1 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Jun 12 15:34:33 2012 -0300 change the way torbutton is installed on linux since the old method no longer works --- build-scripts/linux.mk | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index b122469..170916b 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -336,7 +336,7 @@ compressed-bundle_%: LANGCODE=$* make -f linux.mk compressed-bundle-localized bundle-localized_%.stamp: - make -f linux.mk copy-files_$* install-extensions install-lang-extensions patch-vidalia-language patch-firefox-language \ + make -f linux.mk copy-files_$* install-extensions install-torbutton install-lang-extensions patch-vidalia-language patch-firefox-language \ patch-pidgin-language update-extension-pref write-tbb-version touch $(STAMP_DIR)/bundle-localized_$*.stamp @@ -359,7 +359,7 @@ DUMMYPROFILE=$(BUNDLE)/.mozilla/ ## This is a little overcomplicated, but I'm keeping it here in case there are ## extensions we want to use in the future install-extensions: $(DEFAULT_EXTENSIONS) - for extension in *.xpi; \ + for extension in httpseverywhere.xpi noscript.xpi; \ do \ cp $$extension $$extension.zip; \ ext_id=$$(unzip -p $$extension.zip install.rdf | sed -n '/<em:id>/{s#[^<]*<em:id>$.*$</em:id>#\1#p;q}'); \ @@ -368,6 +368,10 @@ install-extensions: $(DEFAULT_EXTENSIONS) (cd $(BUNDLE)/Data/profile/extensions/$$ext_id/ && unzip *.zip && rm *.zip); \ done +install-torbutton: torbutton.xpi + mkdir -p $(BUNDLE)/Data/profile/extensions/ + cp torbutton.xpi $(BUNDLE)/Data/profile/extensions/{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.xpi + ## Language extensions need to be handled differently from other extensions install-lang-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) ifneq ($(LANGCODE), en-US)

1 0

[torbrowser/maint-2.3] change the way torbutton is installed on linux since the old method no longer works
by erinn＠torproject.org 12 Jun '12

12 Jun '12

commit b9f4cc4144ea87f0dc08d6e1e9fd5b6fe8b23ef1 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Jun 12 15:34:33 2012 -0300 change the way torbutton is installed on linux since the old method no longer works --- build-scripts/linux.mk | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index b122469..170916b 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -336,7 +336,7 @@ compressed-bundle_%: LANGCODE=$* make -f linux.mk compressed-bundle-localized bundle-localized_%.stamp: - make -f linux.mk copy-files_$* install-extensions install-lang-extensions patch-vidalia-language patch-firefox-language \ + make -f linux.mk copy-files_$* install-extensions install-torbutton install-lang-extensions patch-vidalia-language patch-firefox-language \ patch-pidgin-language update-extension-pref write-tbb-version touch $(STAMP_DIR)/bundle-localized_$*.stamp @@ -359,7 +359,7 @@ DUMMYPROFILE=$(BUNDLE)/.mozilla/ ## This is a little overcomplicated, but I'm keeping it here in case there are ## extensions we want to use in the future install-extensions: $(DEFAULT_EXTENSIONS) - for extension in *.xpi; \ + for extension in httpseverywhere.xpi noscript.xpi; \ do \ cp $$extension $$extension.zip; \ ext_id=$$(unzip -p $$extension.zip install.rdf | sed -n '/<em:id>/{s#[^<]*<em:id>$.*$</em:id>#\1#p;q}'); \ @@ -368,6 +368,10 @@ install-extensions: $(DEFAULT_EXTENSIONS) (cd $(BUNDLE)/Data/profile/extensions/$$ext_id/ && unzip *.zip && rm *.zip); \ done +install-torbutton: torbutton.xpi + mkdir -p $(BUNDLE)/Data/profile/extensions/ + cp torbutton.xpi $(BUNDLE)/Data/profile/extensions/{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.xpi + ## Language extensions need to be handled differently from other extensions install-lang-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) ifneq ($(LANGCODE), en-US)

1 0