- tor-commits - lists.torproject.org

[vidalia/alpha] Remove call to validateBridge
by chiiph＠torproject.org 06 Jan '12

06 Jan '12

commit 9ba8c114b1575a6914cdb79830df47caf91b2a93 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Jan 6 12:47:02 2012 -0300 Remove call to validateBridge --- src/vidalia/config/NetworkPage.cpp | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/src/vidalia/config/NetworkPage.cpp b/src/vidalia/config/NetworkPage.cpp index c51d1b6..b40cbdd 100644 --- a/src/vidalia/config/NetworkPage.cpp +++ b/src/vidalia/config/NetworkPage.cpp @@ -387,9 +387,6 @@ NetworkPage::bridgeRequestFinished(const QStringList &bridges) QString normalized; foreach (QString bridge, bridges) { - if (! validateBridge(bridge, &normalized)) - continue; - QString address = normalized.split(" ").at(0); if (ui.listBridges->findItems(address, Qt::MatchContains).isEmpty()) { ui.listBridges->addItem(normalized);

1 0

[vidalia/master] Delegate bridge line validation to Tor
by chiiph＠torproject.org 06 Jan '12

06 Jan '12

commit 9508770e7465997654b1b8a64477447449a0795d Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Jan 6 10:47:07 2012 -0300 Delegate bridge line validation to Tor --- changes/newBridgeLines | 3 ++ src/vidalia/config/NetworkPage.cpp | 62 ++---------------------------------- src/vidalia/config/NetworkPage.h | 7 ---- 3 files changed, 6 insertions(+), 66 deletions(-) diff --git a/changes/newBridgeLines b/changes/newBridgeLines new file mode 100644 index 0000000..0834912 --- /dev/null +++ b/changes/newBridgeLines @@ -0,0 +1,3 @@ + o Vidalia only validates IPv4 bridge lines. IPv6 bridges are now + available, and there will be pluggable transport bridge lines. So + the validation is now delegated to Tor through SETCONF. \ No newline at end of file diff --git a/src/vidalia/config/NetworkPage.cpp b/src/vidalia/config/NetworkPage.cpp index e67686c..c51d1b6 100644 --- a/src/vidalia/config/NetworkPage.cpp +++ b/src/vidalia/config/NetworkPage.cpp @@ -122,74 +122,18 @@ NetworkPage::onLinkActivated(const QString &url) emit helpRequested(url); } -/** Verifies that bridge is a valid bridge identifier and places a - * normalized identifier in out. The normalized identifier will have - * all spaces removed from the fingerprint portion (if any) and all - * hexadecimal characters converted to uppercase. Returns true if - * bridge is a valid bridge identifier, false otherwise. */ -bool -NetworkPage::validateBridge(const QString &bridge, QString *out) -{ - QString temp = bridge; - if (temp.startsWith("bridge ", Qt::CaseInsensitive)) - temp = temp.remove(0, 7); /* remove "bridge " */ - - QStringList parts = temp.split(" ", QString::SkipEmptyParts); - if (parts.isEmpty()) - return false; - - QString s = parts.at(0); - QRegExp re("(\\d{1,3}\\.){3}\\d{1,3}(:\\d{1,5})?"); - if (re.exactMatch(s)) { - if (s.endsWith(":")) - return false; - - int index = s.indexOf(":"); - QString host = s.mid(0, index); - if (QHostAddress(host).isNull() - || QHostAddress(host).protocol() != QAbstractSocket::IPv4Protocol) { - return false; - } - if (index > 0) { - QString port = s.mid(index + 1); - if (port.toUInt() < 1 || port.toUInt() > 65535) - return false; - } - - temp = s; - if (parts.size() > 1) { - QString fp = static_cast<QStringList>(parts.mid(1)).join(""); - if (fp.length() != 40 || !string_is_hex(fp)) - return false; - temp += " " + fp.toUpper(); - } - } else { - return false; - } - *out = temp; - return true; -} - /** Adds a bridge to the bridge list box. */ void NetworkPage::addBridge() { - QString bridge; QString input = ui.lineBridge->text().trimmed(); if (input.isEmpty()) return; - if (!validateBridge(input, &bridge)) { - VMessageBox::warning(this, - tr("Invalid Bridge"), - tr("The specified bridge identifier is not valid."), - VMessageBox::Ok|VMessageBox::Default); - return; - } - if (!ui.listBridges->findItems(bridge, Qt::MatchFixedString).isEmpty()) + if (!ui.listBridges->findItems(input, Qt::MatchFixedString).isEmpty()) return; /* duplicate bridge */ - ui.listBridges->addItem(bridge); + ui.listBridges->addItem(input); ui.lineBridge->clear(); } @@ -319,7 +263,7 @@ NetworkPage::save(QString &errmsg) if (ui.chkUseBridges->isChecked()) { if (ui.listBridges->count() < 1) { - errmsg = tr("You must specify one or more briges."); + errmsg = tr("You must specify one or more bridges."); return false; } } diff --git a/src/vidalia/config/NetworkPage.h b/src/vidalia/config/NetworkPage.h index c198573..2193be7 100644 --- a/src/vidalia/config/NetworkPage.h +++ b/src/vidalia/config/NetworkPage.h @@ -81,13 +81,6 @@ private slots: void proxyTypeChanged(int selection); private: - /** Verifies that bridge is a valid bridge identifier and places a - * normalized identifier in out. The normalized identifier will have - * all spaces removed from the fingerprint portion (if any) and all - * hexadecimal characters converted to uppercase. Returns true if - * bridge is a valid bridge identifier, false otherwise. */ - bool validateBridge(const QString &bridge, QString *out); - /** Helper class used to facilitate downloading one or more bridge * addresses. */ BridgeDownloader* _bridgeDownloader;

1 0

[vidalia/alpha] Make dist-osx work on case sensitive OSX
by chiiph＠torproject.org 06 Jan '12

06 Jan '12

commit 40f2985fccfe02e201bb04adf61635e59fa1e8ea Author: Tomás Touceda <chiiph(a)torproject.org> Date: Wed Jan 4 06:55:10 2012 -0300 Make dist-osx work on case sensitive OSX --- pkg/osx/CMakeLists.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/osx/CMakeLists.txt b/pkg/osx/CMakeLists.txt index 0dbb1df..eca7049 100644 --- a/pkg/osx/CMakeLists.txt +++ b/pkg/osx/CMakeLists.txt @@ -55,7 +55,7 @@ add_custom_target(dist-osx --source ${VIDALIA_APP_BUNDLE_ROOT} --target ${Vidalia_BINARY_DIR}/vidalia-${VERSION}-${DMG_ARCH}.dmg --sourcefile --volname "Vidalia ${VERSION}" - --icon ${Vidalia_SOURCE_DIR}/src/vidalia/res/icons/Vidalia.icns + --icon ${Vidalia_SOURCE_DIR}/src/vidalia/res/icons/vidalia.icns --symlink "/Applications:/Drag to here" --mkdir /.background --copy ${CMAKE_CURRENT_SOURCE_DIR}/background.png:/.background/ @@ -91,7 +91,7 @@ if (TOR_SOURCE_DIR AND SCRIPT_DIR) --source ${VIDALIA_APP_BUNDLE_ROOT} --target ${Vidalia_BINARY_DIR}/${bundle_DMG} --sourcefile --volname "Vidalia Bundle ${VERSION}" - --icon ${Vidalia_SOURCE_DIR}/src/vidalia/res/icons/Vidalia.icns + --icon ${Vidalia_SOURCE_DIR}/src/vidalia/res/icons/vidalia.icns --symlink "/Applications:/Drag to here" --mkdir /.background --copy ${CMAKE_CURRENT_SOURCE_DIR}/bundle-background.png:/.background/

1 0

[vidalia/alpha] Delegate bridge line validation to Tor
by chiiph＠torproject.org 06 Jan '12

06 Jan '12

commit d661bfbe24af322be97f8c6bcc7797562a08f0a8 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Jan 6 10:47:07 2012 -0300 Delegate bridge line validation to Tor --- changes/newBridgeLines | 3 ++ src/vidalia/config/NetworkPage.cpp | 62 ++---------------------------------- src/vidalia/config/NetworkPage.h | 7 ---- 3 files changed, 6 insertions(+), 66 deletions(-) diff --git a/changes/newBridgeLines b/changes/newBridgeLines new file mode 100644 index 0000000..0834912 --- /dev/null +++ b/changes/newBridgeLines @@ -0,0 +1,3 @@ + o Vidalia only validates IPv4 bridge lines. IPv6 bridges are now + available, and there will be pluggable transport bridge lines. So + the validation is now delegated to Tor through SETCONF. \ No newline at end of file diff --git a/src/vidalia/config/NetworkPage.cpp b/src/vidalia/config/NetworkPage.cpp index e67686c..c51d1b6 100644 --- a/src/vidalia/config/NetworkPage.cpp +++ b/src/vidalia/config/NetworkPage.cpp @@ -122,74 +122,18 @@ NetworkPage::onLinkActivated(const QString &url) emit helpRequested(url); } -/** Verifies that bridge is a valid bridge identifier and places a - * normalized identifier in out. The normalized identifier will have - * all spaces removed from the fingerprint portion (if any) and all - * hexadecimal characters converted to uppercase. Returns true if - * bridge is a valid bridge identifier, false otherwise. */ -bool -NetworkPage::validateBridge(const QString &bridge, QString *out) -{ - QString temp = bridge; - if (temp.startsWith("bridge ", Qt::CaseInsensitive)) - temp = temp.remove(0, 7); /* remove "bridge " */ - - QStringList parts = temp.split(" ", QString::SkipEmptyParts); - if (parts.isEmpty()) - return false; - - QString s = parts.at(0); - QRegExp re("(\\d{1,3}\\.){3}\\d{1,3}(:\\d{1,5})?"); - if (re.exactMatch(s)) { - if (s.endsWith(":")) - return false; - - int index = s.indexOf(":"); - QString host = s.mid(0, index); - if (QHostAddress(host).isNull() - || QHostAddress(host).protocol() != QAbstractSocket::IPv4Protocol) { - return false; - } - if (index > 0) { - QString port = s.mid(index + 1); - if (port.toUInt() < 1 || port.toUInt() > 65535) - return false; - } - - temp = s; - if (parts.size() > 1) { - QString fp = static_cast<QStringList>(parts.mid(1)).join(""); - if (fp.length() != 40 || !string_is_hex(fp)) - return false; - temp += " " + fp.toUpper(); - } - } else { - return false; - } - *out = temp; - return true; -} - /** Adds a bridge to the bridge list box. */ void NetworkPage::addBridge() { - QString bridge; QString input = ui.lineBridge->text().trimmed(); if (input.isEmpty()) return; - if (!validateBridge(input, &bridge)) { - VMessageBox::warning(this, - tr("Invalid Bridge"), - tr("The specified bridge identifier is not valid."), - VMessageBox::Ok|VMessageBox::Default); - return; - } - if (!ui.listBridges->findItems(bridge, Qt::MatchFixedString).isEmpty()) + if (!ui.listBridges->findItems(input, Qt::MatchFixedString).isEmpty()) return; /* duplicate bridge */ - ui.listBridges->addItem(bridge); + ui.listBridges->addItem(input); ui.lineBridge->clear(); } @@ -319,7 +263,7 @@ NetworkPage::save(QString &errmsg) if (ui.chkUseBridges->isChecked()) { if (ui.listBridges->count() < 1) { - errmsg = tr("You must specify one or more briges."); + errmsg = tr("You must specify one or more bridges."); return false; } } diff --git a/src/vidalia/config/NetworkPage.h b/src/vidalia/config/NetworkPage.h index c198573..2193be7 100644 --- a/src/vidalia/config/NetworkPage.h +++ b/src/vidalia/config/NetworkPage.h @@ -81,13 +81,6 @@ private slots: void proxyTypeChanged(int selection); private: - /** Verifies that bridge is a valid bridge identifier and places a - * normalized identifier in out. The normalized identifier will have - * all spaces removed from the fingerprint portion (if any) and all - * hexadecimal characters converted to uppercase. Returns true if - * bridge is a valid bridge identifier, false otherwise. */ - bool validateBridge(const QString &bridge, QString *out); - /** Helper class used to facilitate downloading one or more bridge * addresses. */ BridgeDownloader* _bridgeDownloader;

1 0

[vidalia/alpha] Properly package qtscriptgenerator extensions
by chiiph＠torproject.org 06 Jan '12

06 Jan '12

commit 3d4cc22f3a09ce753ece81f46dc5de933d65b0a7 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Oct 31 22:01:08 2011 -0300 Properly package qtscriptgenerator extensions --- cmake/VidaliaMacros.cmake | 38 ++++++++++++++++++++++++++++++++++++++ pkg/osx/CMakeLists.txt | 23 ++++++++++++++++++----- 2 files changed, 56 insertions(+), 5 deletions(-) diff --git a/cmake/VidaliaMacros.cmake b/cmake/VidaliaMacros.cmake index 7e468b2..5d7897c 100644 --- a/cmake/VidaliaMacros.cmake +++ b/cmake/VidaliaMacros.cmake @@ -172,6 +172,44 @@ endmacro(VIDALIA_GET_TOR_VERSION) if (APPLE) include(${Vidalia_SOURCE_DIR}/cmake/ParseArgumentsMacro.cmake) + macro(VIDALIA_COPY_PLUGINS) + parse_arguments(COPY_PLUGINS "DIR;APP_BUNDLE;FRAMEWORKS;COMPONENTS;TARGET" "" ${ARGN}) + + set(outdir "${COPY_PLUGINS_APP_BUNDLE}/Contents/MacOS/script/") + foreach(component ${COPY_PLUGINS_COMPONENTS}) + add_custom_command(TARGET ${COPY_PLUGINS_TARGET} + COMMAND ${CMAKE_COMMAND} -E make_directory ${outdir} + COMMAND cp + ${COPY_PLUGINS_DIR}/libqtscript_${component}.dylib + ${outdir}/libqtscript_${component}.dylib + ) + endforeach(component) + endmacro(VIDALIA_COPY_PLUGINS) + + macro(VIDALIA_DO_PLUGINS) + parse_arguments(DO_PLUGINS "DIR;APP_BUNDLE;FRAMEWORKS;COMPONENTS;TARGET" "" ${ARGN}) + + set(outdir "${DO_PLUGINS_APP_BUNDLE}/Contents/MacOS/script/") + + foreach(component ${DO_PLUGINS_COMPONENTS}) + foreach(framework ${DO_PLUGINS_FRAMEWORKS}) + add_custom_command(TARGET ${DO_PLUGINS_TARGET} + COMMAND install_name_tool -change + ${framework}.framework/Versions/4/${framework} + @executable_path/../Frameworks/${framework}.framework/Versions/4/${framework} + ${outdir}/libqtscript_${component}.dylib + ) + endforeach(framework) + add_custom_command(TARGET ${DO_PLUGINS_TARGET} + COMMAND install_name_tool -id + @executable_path/script/libqtscript_${component}.dylib + ${outdir}/libqtscript_${component}.dylib + ) + endforeach(component) + + + endmacro(VIDALIA_DO_PLUGINS) + ## Calls the install_name_tool utility to change the dependent shared ## library or framework install name to the corresponding library or ## framework that was previously installed in the .app bundle using diff --git a/pkg/osx/CMakeLists.txt b/pkg/osx/CMakeLists.txt index 85e81d5..0dbb1df 100644 --- a/pkg/osx/CMakeLists.txt +++ b/pkg/osx/CMakeLists.txt @@ -15,6 +15,19 @@ set(VIDALIA_APP_BUNDLE_ROOT ${Vidalia_BINARY_DIR}/src/vidalia/Vidalia.app) get_target_property(VIDALIA_EXECUTABLE Vidalia LOCATION) add_custom_target(dist-osx-libraries DEPENDS Vidalia) if (QT_USE_FRAMEWORKS) + vidalia_copy_plugins( + TARGET dist-osx-libraries + DIR ${SCRIPT_DIR} + APP_BUNDLE ${VIDALIA_APP_BUNDLE_ROOT} + COMPONENTS core gui network uitools xml + ) + vidalia_do_plugins( + TARGET dist-osx-libraries + DIR ${SCRIPT_DIR} + APP_BUNDLE ${VIDALIA_APP_BUNDLE_ROOT} + FRAMEWORKS QtGui QtCore QtScript QtNetwork QtXml + COMPONENTS core gui network uitools xml + ) if (USE_MARBLE) vidalia_install_dylib(MarbleWidget TARGET dist-osx-libraries @@ -60,7 +73,7 @@ add_custom_target(dist-osx ) add_dependencies(dist-osx dist-osx-libraries) -if (TOR_SOURCE_DIR) +if (TOR_SOURCE_DIR AND SCRIPT_DIR) get_filename_component(TOR_SOURCE_DIR ${TOR_SOURCE_DIR} ABSOLUTE) ## Determine Tor's version string used to build the .dmg filename @@ -109,21 +122,21 @@ if (TOR_SOURCE_DIR) VERBATIM ) add_dependencies(dist-osx-split-bundle dist-osx-bundle) -else(TOR_SOURCE_DIR) +else(TOR_SOURCE_DIR AND SCRIPT_DIR) message("-- Skipping dist-osx-bundle build target") add_custom_target(dist-osx-bundle COMMAND ${CMAKE_COMMAND} -E echo "!! The dist-osx-bundle target is not configured." COMMAND ${CMAKE_COMMAND} -E echo - "!! You must set the -DTOR_SOURCE_DIR CMake variables." + "!! You must set the -DTOR_SOURCE_DIR and -DSCRIPT_DIR CMake variables." COMMAND ${CMAKE_COMMAND} -E echo "!! Quitting." ) add_custom_target(dist-osx-split-bundle COMMAND ${CMAKE_COMMAND} -E echo "!! The dist-osx-split-bundle target is not configured. Quitting." COMMAND ${CMAKE_COMMAND} -E echo - "!! You must set the -DTOR_SOURCE_DIR CMake variables." + "!! You must set the -DTOR_SOURCE_DIR and -DSCRIPT_DIR CMake variables." COMMAND ${CMAKE_COMMAND} -E echo "!! Quitting." ) -endif(TOR_SOURCE_DIR) +endif(TOR_SOURCE_DIR AND SCRIPT_DIR)

1 0

[vidalia/alpha] Merge branch 'dist-osx' into alpha
by chiiph＠torproject.org 06 Jan '12

06 Jan '12

commit 1fbfcbde24a6834fac1bc6ba1224f1efa69ef67c Merge: d661bfb 3a1d2fa Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Jan 6 10:55:40 2012 -0300 Merge branch 'dist-osx' into alpha changes/newDistOSX | 3 + cmake/VidaliaMacros.cmake | 38 ++++++++++++++++ pkg/osx/CMakeLists.txt | 108 ++++++++++----------------------------------- 3 files changed, 64 insertions(+), 85 deletions(-)

1 0

[vidalia/alpha] Add changes file
by chiiph＠torproject.org 06 Jan '12

06 Jan '12

commit 3a1d2fa454daa12186d35f16df404d9ad441c108 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Jan 6 10:55:01 2012 -0300 Add changes file --- changes/newDistOSX | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/changes/newDistOSX b/changes/newDistOSX new file mode 100644 index 0000000..de1c149 --- /dev/null +++ b/changes/newDistOSX @@ -0,0 +1,3 @@ + o Improve dist-osx* targets to be able to distribute qtscript + extensions properly, and also handle deploying Qt with the + macdeployqt tool instead of a macro. \ No newline at end of file

1 0

[vidalia/alpha] Several changes in the pkg/osx CMakeLists file
by chiiph＠torproject.org 06 Jan '12

06 Jan '12

commit decd763df1b0909010b07fa648fb65208030d706 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Sat Oct 29 14:43:46 2011 -0300 Several changes in the pkg/osx CMakeLists file - Remove polipo parts - Remove torbutton parts - Add QtScript qt dependency --- pkg/osx/CMakeLists.txt | 50 +++++++++++++++-------------------------------- 1 files changed, 16 insertions(+), 34 deletions(-) diff --git a/pkg/osx/CMakeLists.txt b/pkg/osx/CMakeLists.txt index e757864..66e33e4 100644 --- a/pkg/osx/CMakeLists.txt +++ b/pkg/osx/CMakeLists.txt @@ -1,12 +1,12 @@ ## ## $Id$ -## +## ## This file is part of Vidalia, and is subject to the license terms in the -## LICENSE file, found in the top level directory of this distribution. If +## LICENSE file, found in the top level directory of this distribution. If ## you did not receive the LICENSE file with this file, you may obtain it ## from the Vidalia source package distributed by the Vidalia Project at -## http://www.torproject.org/projects/vidalia.html. No part of Vidalia, -## including this file, may be copied, modified, propagated, or distributed +## http://www.torproject.org/projects/vidalia.html. No part of Vidalia, +## including this file, may be copied, modified, propagated, or distributed ## except according to the terms described in the LICENSE file. ## @@ -38,6 +38,12 @@ if (QT_USE_FRAMEWORKS) APP_BUNDLE ${VIDALIA_APP_BUNDLE_ROOT} DEPENDS_FRAMEWORKS ${QtCore} ) + vidalia_install_qt4_framework(QtScript + TARGET dist-osx-libraries NAME QtScript + LIBRARY ${QT_QTSCRIPT_LIBRARY_RELEASE}/QtScript + APP_BUNDLE ${VIDALIA_APP_BUNDLE_ROOT} + DEPENDS_FRAMEWORKS ${QtCore} + ) vidalia_install_name_tool(${VIDALIA_EXECUTABLE} TARGET dist-osx-libraries FRAMEWORKS ${QtCore} ${QtGui} ${QtNetwork} ${QtXml} @@ -49,12 +55,6 @@ if (QT_USE_FRAMEWORKS) APP_BUNDLE ${VIDALIA_APP_BUNDLE_ROOT} DEPENDS_FRAMEWORKS ${QtCore} ${QtGui} ) - vidalia_install_qt4_framework(QtScript - TARGET dist-osx-libraries NAME QtScript - LIBRARY ${QT_QTSCRIPT_LIBRARY_RELEASE}/QtScript - APP_BUNDLE ${VIDALIA_APP_BUNDLE_ROOT} - DEPENDS_FRAMEWORKS ${QtCore} - ) vidalia_install_qt4_framework(QtDBus TARGET dist-osx-libraries NAME QtDBus LIBRARY ${QT_QTDBUS_LIBRARY_RELEASE}/QtDBus @@ -118,10 +118,8 @@ add_custom_target(dist-osx ) add_dependencies(dist-osx dist-osx-libraries) -if (TOR_SOURCE_DIR AND POLIPO_SOURCE_DIR AND TORBUTTON_XPI) +if (TOR_SOURCE_DIR) get_filename_component(TOR_SOURCE_DIR ${TOR_SOURCE_DIR} ABSOLUTE) - get_filename_component(POLIPO_SOURCE_DIR ${POLIPO_SOURCE_DIR} ABSOLUTE) - get_filename_component(TORBUTTON_XPI ${TORBUTTON_XPI} ABSOLUTE) ## Determine Tor's version string used to build the .dmg filename vidalia_get_tor_version(TOR_VERSION "${TOR_SOURCE_DIR}/src/or/tor") @@ -131,21 +129,8 @@ if (TOR_SOURCE_DIR AND POLIPO_SOURCE_DIR AND TORBUTTON_XPI) message(FATAL_ERROR "Unable to determine version of ${TOR_SOURCE_DIR}/src/or/tor") endif(TOR_VERSION) - ## Configure the Torbutton installation script file - get_filename_component(TORBUTTON_XPI_FILENAME ${TORBUTTON_XPI} NAME) - configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/InstallTorbutton.scpt.in - ${CMAKE_CURRENT_BINARY_DIR}/InstallTorbutton.scpt - ) - set(bundle_DMG "vidalia-bundle-${TOR_VERSION}-${VERSION}-${DMG_ARCH}.dmg") add_custom_target(dist-osx-bundle - COMMAND osacompile - -o "${CMAKE_CURRENT_BINARY_DIR}/Install Torbutton for Firefox.app" - ${CMAKE_CURRENT_BINARY_DIR}/InstallTorbutton.scpt - COMMAND ${CMAKE_COMMAND} -E copy - ${TORBUTTON_XPI} - "${CMAKE_CURRENT_BINARY_DIR}/Install Torbutton for Firefox.app/" COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/pkg-dmg --source ${VIDALIA_APP_BUNDLE_ROOT} --target ${Vidalia_BINARY_DIR}/${bundle_DMG} @@ -169,36 +154,33 @@ if (TOR_SOURCE_DIR AND POLIPO_SOURCE_DIR AND TORBUTTON_XPI) --copy ${TOR_SOURCE_DIR}/src/tools/tor-resolve:/Vidalia.app/Contents/MacOS/ --copy ${TOR_SOURCE_DIR}/src/config/geoip:/Vidalia.app/share/tor/ --copy ${TOR_SOURCE_DIR}/src/config/torrc.sample:/Vidalia.app/Contents/Resources/ - --copy ${POLIPO_SOURCE_DIR}/polipo:/Vidalia.app/Contents/MacOS/ - --copy ${CMAKE_CURRENT_SOURCE_DIR}/polipo.conf:/Vidalia.app/Contents/Resources/ - --copy "${CMAKE_CURRENT_BINARY_DIR}/Install Torbutton for Firefox.app:/" COMMENT "Creating ${bundle_DMG}" VERBATIM ) add_dependencies(dist-osx-bundle dist-osx-libraries) add_custom_target(dist-osx-split-bundle - COMMAND hdiutil segment -segmentSize 1.5m + COMMAND hdiutil segment -segmentSize 1.5m -o "${Vidalia_BINARY_DIR}/split-${bundle_DMG}" "${Vidalia_BINARY_DIR}/${bundle_DMG}" COMMENT "Creating split-${bundle_DMG}" VERBATIM ) add_dependencies(dist-osx-split-bundle dist-osx-bundle) -else(TOR_SOURCE_DIR AND POLIPO_SOURCE_DIR AND TORBUTTON_XPI) +else(TOR_SOURCE_DIR) message("-- Skipping dist-osx-bundle build target") add_custom_target(dist-osx-bundle COMMAND ${CMAKE_COMMAND} -E echo "!! The dist-osx-bundle target is not configured." COMMAND ${CMAKE_COMMAND} -E echo - "!! You must set the -DTOR_SOURCE_DIR,-DPOLIPO_SOURCE_DIR and -DTORBUTTON_XPI CMake variables." + "!! You must set the -DTOR_SOURCE_DIR CMake variables." COMMAND ${CMAKE_COMMAND} -E echo "!! Quitting." ) add_custom_target(dist-osx-split-bundle COMMAND ${CMAKE_COMMAND} -E echo "!! The dist-osx-split-bundle target is not configured. Quitting." COMMAND ${CMAKE_COMMAND} -E echo - "!! You must set the -DTOR_SOURCE_DIR, -DPOLIPO_SOURCE_DIR and -DTORBUTTON_XPI CMake variables." + "!! You must set the -DTOR_SOURCE_DIR CMake variables." COMMAND ${CMAKE_COMMAND} -E echo "!! Quitting." ) -endif(TOR_SOURCE_DIR AND POLIPO_SOURCE_DIR AND TORBUTTON_XPI) +endif(TOR_SOURCE_DIR)

1 0

[vidalia/alpha] Use macdeployqt
by chiiph＠torproject.org 06 Jan '12

06 Jan '12

commit 7a5471a48040e9d5d4b1e63af563865092dd151f Author: Tomás Touceda <chiiph(a)torproject.org> Date: Sat Oct 29 14:54:47 2011 -0300 Use macdeployqt --- pkg/osx/CMakeLists.txt | 61 +---------------------------------------------- 1 files changed, 2 insertions(+), 59 deletions(-) diff --git a/pkg/osx/CMakeLists.txt b/pkg/osx/CMakeLists.txt index 66e33e4..85e81d5 100644 --- a/pkg/osx/CMakeLists.txt +++ b/pkg/osx/CMakeLists.txt @@ -15,65 +15,7 @@ set(VIDALIA_APP_BUNDLE_ROOT ${Vidalia_BINARY_DIR}/src/vidalia/Vidalia.app) get_target_property(VIDALIA_EXECUTABLE Vidalia LOCATION) add_custom_target(dist-osx-libraries DEPENDS Vidalia) if (QT_USE_FRAMEWORKS) - vidalia_install_qt4_framework(QtCore - TARGET dist-osx-libraries NAME QtCore - LIBRARY ${QT_QTCORE_LIBRARY_RELEASE}/QtCore - APP_BUNDLE ${VIDALIA_APP_BUNDLE_ROOT} - ) - vidalia_install_qt4_framework(QtGui - TARGET dist-osx-libraries NAME QtGui - LIBRARY ${QT_QTGUI_LIBRARY_RELEASE}/QtGui - APP_BUNDLE ${VIDALIA_APP_BUNDLE_ROOT} - DEPENDS_FRAMEWORKS ${QtCore} - ) - vidalia_install_qt4_framework(QtNetwork - TARGET dist-osx-libraries NAME QtNetwork - LIBRARY ${QT_QTNETWORK_LIBRARY_RELEASE}/QtNetwork - APP_BUNDLE ${VIDALIA_APP_BUNDLE_ROOT} - DEPENDS_FRAMEWORKS ${QtCore} - ) - vidalia_install_qt4_framework(QtXml - TARGET dist-osx-libraries NAME QtXml - LIBRARY ${QT_QTXML_LIBRARY_RELEASE}/QtXml - APP_BUNDLE ${VIDALIA_APP_BUNDLE_ROOT} - DEPENDS_FRAMEWORKS ${QtCore} - ) - vidalia_install_qt4_framework(QtScript - TARGET dist-osx-libraries NAME QtScript - LIBRARY ${QT_QTSCRIPT_LIBRARY_RELEASE}/QtScript - APP_BUNDLE ${VIDALIA_APP_BUNDLE_ROOT} - DEPENDS_FRAMEWORKS ${QtCore} - ) - vidalia_install_name_tool(${VIDALIA_EXECUTABLE} - TARGET dist-osx-libraries - FRAMEWORKS ${QtCore} ${QtGui} ${QtNetwork} ${QtXml} - ) if (USE_MARBLE) - vidalia_install_qt4_framework(QtSvg - TARGET dist-osx-libraries NAME QtSvg - LIBRARY ${QT_QTSVG_LIBRARY_RELEASE}/QtSvg - APP_BUNDLE ${VIDALIA_APP_BUNDLE_ROOT} - DEPENDS_FRAMEWORKS ${QtCore} ${QtGui} - ) - vidalia_install_qt4_framework(QtDBus - TARGET dist-osx-libraries NAME QtDBus - LIBRARY ${QT_QTDBUS_LIBRARY_RELEASE}/QtDBus - APP_BUNDLE ${VIDALIA_APP_BUNDLE_ROOT} - DEPENDS_FRAMEWORKS ${QtCore} ${QtXml} - ) - vidalia_install_qt4_framework(QtPhonon - TARGET dist-osx-libraries NAME phonon - LIBRARY ${QT_PHONON_LIBRARY_RELEASE}/phonon - APP_BUNDLE ${VIDALIA_APP_BUNDLE_ROOT} - DEPENDS_FRAMEWORKS ${QtCore} ${QtGui} ${QtXml} ${QtDBus} - ) - vidalia_install_qt4_framework(QtWebKit - TARGET dist-osx-libraries NAME QtWebKit - LIBRARY ${QT_QTWEBKIT_LIBRARY_RELEASE}/QtWebKit - APP_BUNDLE ${VIDALIA_APP_BUNDLE_ROOT} - DEPENDS_FRAMEWORKS ${QtCore} ${QtGui} ${QtNetwork} ${QtXml} ${QtDBus} - ${QtPhonon} - ) vidalia_install_dylib(MarbleWidget TARGET dist-osx-libraries LIBRARY ${MARBLEWIDGET_LIBRARY} @@ -83,7 +25,6 @@ if (QT_USE_FRAMEWORKS) ) vidalia_install_name_tool(${VIDALIA_EXECUTABLE} TARGET dist-osx-libraries - FRAMEWORKS ${QtSvg} ${QtDBus} ${QtScript} ${QtWebKit} LIBRARIES ${MARBLEWIDGET_LIBRARY} ) endif(USE_MARBLE) @@ -96,6 +37,7 @@ else(OSX_FAT_BINARY) endif(OSX_FAT_BINARY) add_custom_target(dist-osx + COMMAND ${QT_BINARY_DIR}/macdeployqt ${VIDALIA_APP_BUNDLE_ROOT} COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/pkg-dmg --source ${VIDALIA_APP_BUNDLE_ROOT} --target ${Vidalia_BINARY_DIR}/vidalia-${VERSION}-${DMG_ARCH}.dmg @@ -131,6 +73,7 @@ if (TOR_SOURCE_DIR) set(bundle_DMG "vidalia-bundle-${TOR_VERSION}-${VERSION}-${DMG_ARCH}.dmg") add_custom_target(dist-osx-bundle + COMMAND ${QT_BINARY_DIR}/macdeployqt ${VIDALIA_APP_BUNDLE_ROOT} COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/pkg-dmg --source ${VIDALIA_APP_BUNDLE_ROOT} --target ${Vidalia_BINARY_DIR}/${bundle_DMG}

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 06 Jan '12

06 Jan '12

commit 92b74a88e6a1c4b0d2c91474da2c807efaaeb423 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 6 11:45:01 2012 +0000 Update translations for bridgedb --- hr_HR/bridgedb.po | 95 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 95 insertions(+), 0 deletions(-) diff --git a/hr_HR/bridgedb.po b/hr_HR/bridgedb.po new file mode 100644 index 0000000..78b8372 --- /dev/null +++ b/hr_HR/bridgedb.po @@ -0,0 +1,95 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Armando Vega <synaan(a)gmail.com>, 2012. +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2011-01-01 07:48-0800\n" +"PO-Revision-Date: 2012-01-06 11:31+0000\n" +"Last-Translator: Armando Vega <synaan(a)gmail.com>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: hr_HR\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n" + +#: lib/bridgedb/I18n.py:21 +msgid "Here are your bridge relays: " +msgstr "Ovdje su vaši mostni releji: " + +#: lib/bridgedb/I18n.py:23 +msgid "" +"Bridge relays (or \"bridges\" for short) are Tor relays that aren't listed\n" +"in the main directory. Since there is no complete public list of them,\n" +"even if your ISP is filtering connections to all the known Tor relays,\n" +"they probably won't be able to block all the bridges." +msgstr "" +"Mostni releji (ili skraćeno \"mostovi\") su Tor releji koji nisu navedeni\n" +"u glavnom imeniku. Kako ne postoji putpuna javna lista,\n" +"čak i ako vaš ISP filtrira veze prema svim poznatim Tor relejima,\n" +"vjerojatno neće moći blokirati sve mostove." + +#: lib/bridgedb/I18n.py:28 +msgid "" +"To use the above lines, go to Vidalia's Network settings page, and click\n" +"\"My ISP blocks connections to the Tor network\". Then add each bridge\n" +"address one at a time." +msgstr "" +"Za korištenje gore navedenih redova, posjetite stranicu\n" +"Mrežnih Postavki u Vidaliji, te kliknite \"Moj ISP blokira\n" +"veze prema Tor mreži\". Onda dodajte jednu po jednu\n" +"adresu mostova." + +#: lib/bridgedb/I18n.py:32 +msgid "" +"Configuring more than one bridge address will make your Tor connection\n" +"more stable, in case some of the bridges become unreachable." +msgstr "" +"Podešavanjem više od jedne adrese mostova će učiniti vašu\n" +"Tor vezu stabilnijom, u nekim slučajevima neki od mostova\n" +"postanu nedostupni." + +#: lib/bridgedb/I18n.py:35 +msgid "" +"Another way to find public bridge addresses is to send mail to\n" +"bridges(a)torproject.org with the line \"get bridges\" by itself in the body\n" +"of the mail. However, so we can make it harder for an attacker to learn\n" +"lots of bridge addresses, you must send this request from an email address at\n" +"one of the following domains:" +msgstr "" +"Još jedan način pronalaska adresa javnih mostova je slanjem\n" +"emaila na bridges(a)torproject.org sa redom \"get bridges\" samim\n" +"u tijelu emaila. Doduše, kako bismo učinili teškim napadačima\n" +"otkrivanje mnogo adresa mostova, morate poslati ovaj zahtjev\n" +"sa email adrese na jednoj od sljedećih domena:" + +#: lib/bridgedb/I18n.py:41 +msgid "[This is an automated message; please do not reply.]" +msgstr "[Ovo je automatizirana poruka; molimo ne odgovarati.]" + +#: lib/bridgedb/I18n.py:43 +msgid "" +"Another way to find public bridge addresses is to visit\n" +"https://bridges.torproject.org/. The answers you get from that page\n" +"will change every few days, so check back periodically if you need more\n" +"bridge addresses." +msgstr "" +"Još jedan način za pronalazak adresa javnih mostova\n" +"je posjećivanje https://bridges.torproject.org/. Odgovori\n" +"koje dobijete sa te stranice se mjenjaju svakih nekoliko\n" +"dana, pa redovno provjeravajte ako trebate još adresa." + +#: lib/bridgedb/I18n.py:48 +msgid "(no bridges currently available)" +msgstr "(nema trenutno dostupnih mostova)" + +#: lib/bridgedb/I18n.py:50 +msgid "(e-mail requests not currently supported)" +msgstr "(e-mail zahtjevi trenutno nisu podržani)" + +

1 0