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

[translation/orbot_completed] Update translations for orbot_completed
by translation＠torproject.org 23 Apr '12

23 Apr '12

commit 60391800282d8ca3dc3c851097594eec6b355915 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 23 19:45:06 2012 +0000 Update translations for orbot_completed --- values-de/strings.xml | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/values-de/strings.xml b/values-de/strings.xml index 3070322..cc0d990 100644 --- a/values-de/strings.xml +++ b/values-de/strings.xml @@ -31,7 +31,6 @@ <string name="button_clear_log">Log löschen</string> <string name="menu_verify">Überprüfen</string> <string name="menu_exit">Beenden</string> - <string name="powered_by">ermöglicht durch das Tor Projekt</string> <string name="press_to_start">- Zum Starten gedrückt halten -</string> <string name="pref_trans_proxy_group">Transparenter Proxy (benötigt Administratorrechte)</string> <string name="pref_trans_proxy_title">Transparenter Proxy</string> @@ -209,4 +208,6 @@ <string name="set_locale_summary">Gebietsschema und Sprache wählen</string> <string name="wizard_locale_title">Sprache wählen</string> <string name="wizard_locale_msg">Grundeinstellung beibehalten oder Sprache ändern</string> + <string name="powered_by">ermöglicht durch das Tor Projekt</string> + <string name="btn_save_settings">Einstellungen speichern</string> </resources>

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 23 Apr '12

23 Apr '12

commit 255d204cd8a7146a4863e9d950fc1caf3143778a Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 23 19:45:05 2012 +0000 Update translations for orbot --- values-de/strings.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/values-de/strings.xml b/values-de/strings.xml index 5dd2c35..cc0d990 100644 --- a/values-de/strings.xml +++ b/values-de/strings.xml @@ -209,5 +209,5 @@ <string name="wizard_locale_title">Sprache wählen</string> <string name="wizard_locale_msg">Grundeinstellung beibehalten oder Sprache ändern</string> <string name="powered_by">ermöglicht durch das Tor Projekt</string> - <string name="btn_save_settings">Save Settings</string> + <string name="btn_save_settings">Einstellungen speichern</string> </resources>

1 0

[translation/vidalia_completed] Update translations for vidalia_completed
by translation＠torproject.org 23 Apr '12

23 Apr '12

commit 0bcf4b4511c8a69025fe6ee139c70b3babe8a2cf Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 23 19:15:13 2012 +0000 Update translations for vidalia_completed --- de/vidalia_de.po | 112 ++++++++++++++++++++++++++++++++++------------------- 1 files changed, 72 insertions(+), 40 deletions(-) diff --git a/de/vidalia_de.po b/de/vidalia_de.po index 09fcd4d..904fef0 100644 --- a/de/vidalia_de.po +++ b/de/vidalia_de.po @@ -1,7 +1,8 @@ -# Translators: +# # Translators: # bastik <bastik.tor(a)googlemail.com>, 2011. # cosimacosa <leccefv(a)libero.it>, 2011. +# <f.schima(a)googlemail.com>, 2012. # Hendrik Richter <hendrikr(a)gnome.org>, 2011. # <koloman375(a)gmail.com>, 2012. # runasand <runa.sandvik(a)gmail.com>, 2011. @@ -9,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-03-01 18:56+0000\n" -"Last-Translator: K0L0M4N <koloman375(a)gmail.com>\n" +"POT-Creation-Date: 2012-03-21 17:52+0000\n" +"PO-Revision-Date: 2012-04-23 19:14+0000\n" +"Last-Translator: Sacro <Scion(a)T-Online.de>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -203,6 +204,13 @@ msgstr "Konfiguriere den Kontroll-Port automatisch." msgctxt "AdvancedPage" msgid "" +"You've checked the autoconfiguration option for the ControlPort, but " +"provided no Data Directory. Please add one, or uncheck the \"Configure " +"ControlPort automatically\" option." +msgstr "Du hast die Option für die automatische Konfiguration für ControlPort ausgewählt, allerdings kein Datenverzeichniss angegeben. Bitte füge ein Datenverzeichniss hinzu, oder schalte die \"Konfiguriere ControlPort automatisch\" Option ab." + +msgctxt "AdvancedPage" +msgid "" "Vidalia was unable to remove the Tor service.\n" "\n" "You may need to remove it manually." @@ -228,6 +236,23 @@ msgctxt "AppearancePage" msgid "Vidalia was unable to load the selected language translation." msgstr "Vidalia konnte die gewählte Sprache nicht laden." +msgctxt "AppearancePage" +msgid "" +"System Icon Preferences (changes will take effect when you restart Vidalia)" +msgstr "System Icon Einstellungen (Änderungen werden nach Vidalia Neustart wirksam)" + +msgctxt "AppearancePage" +msgid "Show the Tray Icon and Dock Icon (default)" +msgstr "Tray Icon und Dock Icon anzeigen (Standard)" + +msgctxt "AppearancePage" +msgid "Hide the Tray Icon" +msgstr "Tray Icon verstecken" + +msgctxt "AppearancePage" +msgid "Hide the Dock Icon" +msgstr "Dock Icon verstecken" + msgctxt "BandwidthGraph" msgid "Since:" msgstr "Seit:" @@ -1753,10 +1778,6 @@ msgid "Connected to the Tor network!" msgstr "Verbindung zum Tor-Netzwerk hergestellt!" msgctxt "MainWindow" -msgid "Unrecognized startup status" -msgstr "Nicht erkannter Startzustand" - -msgctxt "MainWindow" msgid "miscellaneous" msgstr "Verschiedenes" @@ -2068,6 +2089,24 @@ msgid "" msgstr "Alles, was über diese Verbindung gesendet wird, sollte beobachtet werden. Bitte überprüfen Sie die Konfiguration Ihres Programmes und verwenden Sie wenn möglich nur verschlüsselte Protokolle wie SSL. " msgctxt "MainWindow" +msgid "Bootstrapping torrc from %1 to %2" +msgstr "Bootstrapping torrc von %1 zu %2" + +msgctxt "MainWindow" +msgid "(probably Telnet)" +msgstr "(vermutlich Telnet)" + +msgctxt "MainWindow" +msgid "(probably an email client)" +msgstr "(vermutlich ein Email Client)" + +msgctxt "MainWindow" +msgid "" +"One of your applications %1 appears to be making a potentially unencrypted " +"and unsafe connection to port %2." +msgstr "Eine ihrer Anwendungen %1 versucht anscheinend eine potentiell unverschlüsselte und unsichere Verbindung zum Port %2 herzustellen." + +msgctxt "MainWindow" msgid "failed (%1)" msgstr "fehlgeschlagen (%1)" @@ -2078,8 +2117,19 @@ msgid "" msgstr "Ihr Relais wird beendet.\nKlicken Sie erneut auf \"Stop\" um das Relais sofort zu beenden." msgctxt "MainWindow" -msgid "Bootstrapping torrc from %1 to %2" -msgstr "Bootstrapping torrc von %1 zu %2" +msgid "" +"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n" +"\n" +"Here's the last error message:\n" +"%2" +msgstr "Vidalia kann nicht mit Tor kommunizieren, da es keinen zugriff auf diese datei hat: %1\n\nHier ist die letzte Fehlermeldung:\n%2" + +msgctxt "MainWindow" +msgid "" +"It seems Tor has stopped running since Vidalia started it.\n" +"\n" +"See the Advanced Message Log for more information." +msgstr "Es scheint als würde Tor nicht mehr funktionieren seit Vidalia es gestartet hat.\n\nSiehe im Erweiterten Nachrichten-Log nach, um mehr Informationen zu erhalten." msgctxt "MainWindow" msgid "" @@ -2095,20 +2145,6 @@ msgid "" "Please check the message log for recent warning or error messages." msgstr "Vidalia entdeckte dass Tor unerwartet beendet wurde.\n\nBitte überprüfen Sie das Nachrichtenprotoll auf Fehler und Warnungen." -msgctxt "MainWindow" -msgid "(probably Telnet)" -msgstr "(vermutlich Telnet)" - -msgctxt "MainWindow" -msgid "(probably an email client)" -msgstr "(vermutlich ein Email Client)" - -msgctxt "MainWindow" -msgid "" -"One of your applications %1 appears to be making a potentially unencrypted " -"and unsafe connection to port %2." -msgstr "Eine ihrer Anwendungen %1 versucht anscheinend eine potentiell unverschlüsselte und unsichere Verbindung zum Port %2 herzustellen." - msgctxt "MessageLog" msgid "Error Setting Filter" msgstr "Fehler beim Setzen des Filters" @@ -2521,14 +2557,6 @@ msgid "Ctrl+F" msgstr "Strg+F" msgctxt "NetworkPage" -msgid "Invalid Bridge" -msgstr "Ungültige Brücke" - -msgctxt "NetworkPage" -msgid "The specified bridge identifier is not valid." -msgstr "Die angegebene Brücke ist nicht gültig." - -msgctxt "NetworkPage" msgid "Copy (Ctrl+C)" msgstr "Kopieren (Strg+C)" @@ -2661,13 +2689,13 @@ msgid "SOCKS 5" msgstr "SOCKS 5" msgctxt "NetworkPage" -msgid "HTTP" -msgstr "HTTP" - -msgctxt "NetworkPage" msgid "HTTP / HTTPS" msgstr "HTTP / HTTPS" +msgctxt "NetworkPage" +msgid "You must specify one or more bridges." +msgstr "Du musst eine oder mehrere Bridges festlegen." + msgctxt "Policy" msgid "accept" msgstr "annehmen" @@ -2845,10 +2873,6 @@ msgid "Run as a client only" msgstr "Benutze Tor nur als Client" msgctxt "ServerPage" -msgid "Relay traffic for the Tor network" -msgstr "Verkehr für das Tor-Netzwerk weiterleiten" - -msgctxt "ServerPage" msgid "Relay Port:" msgstr "Verteiler-Port:" @@ -3093,6 +3117,14 @@ msgid "Automatically distribute my bridge address" msgstr "Meine Bridge-Adresse automatisch verteilen" msgctxt "ServerPage" +msgid "Relay traffic for the Tor network (exit relay)" +msgstr "Relais-Verkehr für das Tor-Netzwerk (ausgangs Relais)" + +msgctxt "ServerPage" +msgid "Relay traffic inside the Tor network (non-exit relay)" +msgstr "Relais-Verkehr im Tor-Netzwerk (kein ausgangs Relais)" + +msgctxt "ServerPage" msgid "Mirror the Relay Directory" msgstr "Spiegele das Relay Verzeichnis"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 23 Apr '12

23 Apr '12

commit 49fd7f70fcd1ad97c2d2bec89ee567be4e29844b Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 23 19:15:09 2012 +0000 Update translations for vidalia --- de/vidalia_de.po | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/de/vidalia_de.po b/de/vidalia_de.po index 33291e5..904fef0 100644 --- a/de/vidalia_de.po +++ b/de/vidalia_de.po @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2012-03-29 10:05+0000\n" -"Last-Translator: fschima <f.schima(a)googlemail.com>\n" +"PO-Revision-Date: 2012-04-23 19:14+0000\n" +"Last-Translator: Sacro <Scion(a)T-Online.de>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -207,7 +207,7 @@ msgid "" "You've checked the autoconfiguration option for the ControlPort, but " "provided no Data Directory. Please add one, or uncheck the \"Configure " "ControlPort automatically\" option." -msgstr "" +msgstr "Du hast die Option für die automatische Konfiguration für ControlPort ausgewählt, allerdings kein Datenverzeichniss angegeben. Bitte füge ein Datenverzeichniss hinzu, oder schalte die \"Konfiguriere ControlPort automatisch\" Option ab." msgctxt "AdvancedPage" msgid "" @@ -2122,14 +2122,14 @@ msgid "" "\n" "Here's the last error message:\n" "%2" -msgstr "" +msgstr "Vidalia kann nicht mit Tor kommunizieren, da es keinen zugriff auf diese datei hat: %1\n\nHier ist die letzte Fehlermeldung:\n%2" msgctxt "MainWindow" msgid "" "It seems Tor has stopped running since Vidalia started it.\n" "\n" "See the Advanced Message Log for more information." -msgstr "" +msgstr "Es scheint als würde Tor nicht mehr funktionieren seit Vidalia es gestartet hat.\n\nSiehe im Erweiterten Nachrichten-Log nach, um mehr Informationen zu erhalten." msgctxt "MainWindow" msgid "" @@ -2694,7 +2694,7 @@ msgstr "HTTP / HTTPS" msgctxt "NetworkPage" msgid "You must specify one or more bridges." -msgstr "" +msgstr "Du musst eine oder mehrere Bridges festlegen." msgctxt "Policy" msgid "accept" @@ -3118,11 +3118,11 @@ msgstr "Meine Bridge-Adresse automatisch verteilen" msgctxt "ServerPage" msgid "Relay traffic for the Tor network (exit relay)" -msgstr "" +msgstr "Relais-Verkehr für das Tor-Netzwerk (ausgangs Relais)" msgctxt "ServerPage" msgid "Relay traffic inside the Tor network (non-exit relay)" -msgstr "" +msgstr "Relais-Verkehr im Tor-Netzwerk (kein ausgangs Relais)" msgctxt "ServerPage" msgid "Mirror the Relay Directory"

1 0

[torbrowser/maint-2.3] Add targets to fetch and extract obfsproxy
by erinn＠torproject.org 23 Apr '12

23 Apr '12

commit cab58ff1b6e46305eeb75fbfce56df145b2f20ee Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Mon Apr 2 11:41:28 2012 +0200 Add targets to fetch and extract obfsproxy --- build-scripts/versions.mk | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 395be17..818d1d4 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -17,6 +17,7 @@ TORBUTTON_VER=1.4.5.1 NOSCRIPT_VER=2.3.4 HTTPSEVERYWHERE_VER=2.0.1 OTR_VER=3.2.0 +OBFSPROXY_VER=0.1.1 ## Extension IDs FF_VENDOR_ID:=\{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} @@ -36,7 +37,7 @@ PYMAKE_PACKAGE=$(PYMAKE_VER).tar.bz2 TORBUTTON_PACKAGE=torbutton-$(TORBUTTON_VER).xpi NOSCRIPT_PACKAGE=addon-722-latest.xpi HTTPSEVERYWHERE_PACKAGE=https-everywhere-$(HTTPSEVERYWHERE_VER).xpi - +OBFSPROXY_PACKAGE=obfsproxy-$(OBFSPROXY_VER).tar.gz ## Location of files for download ZLIB_URL=http://www.zlib.net/$(ZLIB_PACKAGE) @@ -53,6 +54,7 @@ PYMAKE_URL=https://hg.mozilla.org/users/bsmedberg_mozilla.com/pymake/archiv… TORBUTTON_URL=https://www.torproject.org/dist/torbutton/$(TORBUTTON_PACKAGE) NOSCRIPT_URL=https://addons.mozilla.org/firefox/downloads/latest/722/$(NOSC… HTTPSEVERYWHERE_URL=https://eff.org/files/$(HTTPSEVERYWHERE_PACKAGE) +OBFSPROXY_URL=https://www.torproject.org/dist/obfsproxy/$(OBFSPROXY_PACKAGE) # Provide some mappings between lower and upper case, which means we don't need # to rely on shell shenanigans when we need the upper case version. This is @@ -68,6 +70,7 @@ firefox=FIREFOX pidgin=PIDGIN mozbuild=MOZBUILD pymake=PYMAKE +obfsproxy=OBFSPROXY # The locations of the unpacked tarballs ZLIB_DIR=$(BUILD_DIR)/zlib-$(ZLIB_VER) @@ -80,6 +83,7 @@ TOR_DIR=$(BUILD_DIR)/tor-$(TOR_VER) FIREFOX_DIR=$(BUILD_DIR)/firefox-$(FIREFOX_VER) MOZBUILD_DIR=$(BUILD_DIR)/mozilla-build PYMAKE_DIR=$(BUILD_DIR)/pymake-$(PYMAKE_VER) +OBFSPROXY_DIR=$(BUILD_DIR)/obfsproxy-$(OBFSPROXY_VER) # Empty targets are written in arch-dependent $(BUILD_DIR). Usual # VPATH issues documented below should be avoided as the paths of @@ -93,7 +97,7 @@ vpath build-% $(STAMP_DIR) vpath patch-% $(STAMP_DIR) vpath %.stamp $(STAMP_DIR) -fetch-source: $(FETCH_DIR)/$(ZLIB_PACKAGE) $(FETCH_DIR)/$(LIBPNG_PACKAGE) $(FETCH_DIR)/$(QT_PACKAGE) $(FETCH_DIR)/$(OPENSSL_PACKAGE) $(FETCH_DIR)/$(VIDALIA_PACKAGE) $(FETCH_DIR)/$(LIBEVENT_PACKAGE) $(FETCH_DIR)/$(TOR_PACKAGE) $(FETCH_DIR)/$(FIREFOX_PACKAGE) | $(FETCH_DIR) ; +fetch-source: $(FETCH_DIR)/$(ZLIB_PACKAGE) $(FETCH_DIR)/$(LIBPNG_PACKAGE) $(FETCH_DIR)/$(QT_PACKAGE) $(FETCH_DIR)/$(OPENSSL_PACKAGE) $(FETCH_DIR)/$(VIDALIA_PACKAGE) $(FETCH_DIR)/$(LIBEVENT_PACKAGE) $(FETCH_DIR)/$(TOR_PACKAGE) $(FETCH_DIR)/$(FIREFOX_PACKAGE) $(FETCH_DIR)/$(OBFSPROXY_PACKAGE) | $(FETCH_DIR) ; source-dance: fetch-source unpack-source ; @@ -154,7 +158,10 @@ langpack_%.xpi: langpack_en-US.xpi: touch $@ -unpack-source: $(ZLIB_DIR) $(OPENSSL_DIR) $(LIBPNG_DIR $(QT_DIR) $(VIDALIA_DIR) $(LIBEVENT_DIR) $(TOR_DIR) $(FIREFOX_DIR) +$(FETCH_DIR)/$(OBFSPROXY_PACKAGE): | $(FETCH_DIR) + $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(OBFSPROXY_URL) + +unpack-source: $(ZLIB_DIR) $(OPENSSL_DIR) $(LIBPNG_DIR $(QT_DIR) $(VIDALIA_DIR) $(LIBEVENT_DIR) $(TOR_DIR) $(FIREFOX_DIR) $(OBFSPROXY_DIR) $(ZLIB_DIR): $(FETCH_DIR)/$(ZLIB_PACKAGE) | $(BUILD_DIR) @@ -213,22 +220,26 @@ $(PYMAKE_DIR): $(FETCH_DIR)/$(PYMAKE_PACKAGE) | $(BUILD_DIR) rm -rf $(PYMAKE_DIR) cd $(FETCH_DIR) && tar -xmf $(PYMAKE_PACKAGE) -C $(BUILD_DIR)/ +$(OBFSPROXY_DIR): $(FETCH_DIR)/$(OBFSPROXY_PACKAGE) | $(BUILD_DIR) + rm -rf $(OBFSPROXY_DIR) + cd $(FETCH_DIR) && tar -xmf $(OBFSPROXY_PACKAGE) -C $(BUILD_DIR)/ + clean-fetch-%: rm -rf $(FETCH_DIR)/$($($*)_PACKAGE) -clean-fetch: clean-fetch-zlib clean-fetch-libpng clean-fetch-qt clean-fetch-openssl clean-fetch-vidalia clean-fetch-libevent clean-fetch-tor clean-fetch-firefox +clean-fetch: clean-fetch-zlib clean-fetch-libpng clean-fetch-qt clean-fetch-openssl clean-fetch-vidalia clean-fetch-libevent clean-fetch-tor clean-fetch-firefox clean-fetch-obfsproxy clean-unpack-%: rm -rf $($($*)_DIR) -clean-unpack: clean-unpack-zlib clean-unpack-libpng clean-unpack-qt clean-unpack-openssl clean-unpack-vidalia clean-unpack-libevent clean-unpack-tor clean-unpack-firefox +clean-unpack: clean-unpack-zlib clean-unpack-libpng clean-unpack-qt clean-unpack-openssl clean-unpack-vidalia clean-unpack-libevent clean-unpack-tor clean-unpack-firefox clean-unpack-obfsproxy clean-build-%: rm -rf $($($*)_DIR) rm -rf build-$* -clean-build: clean-build-zlib clean-build-libpng clean-build-qt clean-build-openssl clean-build-vidalia clean-build-libevent clean-build-tor clean-build-firefox +clean-build: clean-build-zlib clean-build-libpng clean-build-qt clean-build-openssl clean-build-vidalia clean-build-libevent clean-build-tor clean-build-firefox clean-build-obfsproxy .PHONY: clean-fetch clean-unpack clean-build

1 0

[torbrowser/maint-2.3] Win/OSX: Remove -O -g from libevent, tor cflags
by erinn＠torproject.org 23 Apr '12

23 Apr '12

commit 6fdf347054540320c9e624b21cd34ca4392ac4b1 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Apr 11 17:58:51 2012 +0200 Win/OSX: Remove -O -g from libevent, tor cflags --- build-scripts/osx.mk | 4 ++-- build-scripts/windows.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 68e13fe..a39eb94 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -85,7 +85,7 @@ build-vidalia: build-openssl build-qt $(VIDALIA_DIR) cd $(VIDALIA_DIR)/build && DESTDIR=$(BUILT_DIR) make install touch $(STAMP_DIR)/build-vidalia -LIBEVENT_CFLAGS="-O -g -arch $(ARCH_TYPE) $(MIN_VERSION) $(CF_MIN_VERSION) -arch $(ARCH_TYPE)" +LIBEVENT_CFLAGS="-arch $(ARCH_TYPE) $(MIN_VERSION) $(CF_MIN_VERSION) -arch $(ARCH_TYPE)" LIBEVENT_LDFLAGS="-L$(BUILT_DIR)/lib $(LD_MIN_VERSION)" LIBEVENT_OPTS=--prefix=$(BUILT_DIR) --enable-static --disable-shared --disable-dependency-tracking $(CC) build-libevent: build-zlib build-openssl $(LIBEVENT_DIR) @@ -94,7 +94,7 @@ build-libevent: build-zlib build-openssl $(LIBEVENT_DIR) cd $(LIBEVENT_DIR) && make install touch $(STAMP_DIR)/build-libevent -TOR_CFLAGS="-O -g -arch $(ARCH_TYPE) -I$(BUILT_DIR)/include $(MIN_VERSION) $(CF_MIN_VERSION)" +TOR_CFLAGS="-arch $(ARCH_TYPE) -I$(BUILT_DIR)/include $(MIN_VERSION) $(CF_MIN_VERSION)" TOR_LDFLAGS="-L$(BUILT_DIR)/lib $(LD_MIN_VERSION)" TOR_OPTS=--enable-gcc-warnings-advisory --enable-static-openssl --enable-static-libevent --with-openssl-dir=$(BUILT_DIR)/lib --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) --disable-dependency-tracking $(CC) build-tor: build-zlib build-openssl build-libevent $(TOR_DIR) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index dc8de89..505e5b6 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -86,7 +86,7 @@ build-vidalia: build-openssl $(VIDALIA_DIR) cd $(VIDALIA_DIR)/build && make -j $(NUM_CORES) touch $(STAMP_DIR)/build-vidalia -LIBEVENT_CFLAGS="-I$(BUILT_DIR)/include -O -g" +LIBEVENT_CFLAGS="-I$(BUILT_DIR)/include" LIBEVENT_LDFLAGS="-L$(BUILT_DIR)/lib -L$(BUILT_DIR)/bin -Wl,--nxcompat -Wl,--dynamicbase" LIBEVENT_OPTS=--prefix=$(BUILT_DIR) --enable-static --disable-shared --disable-dependency-tracking build-libevent: build-zlib build-openssl $(LIBEVENT_DIR) @@ -95,7 +95,7 @@ build-libevent: build-zlib build-openssl $(LIBEVENT_DIR) cd $(LIBEVENT_DIR) && make install touch $(STAMP_DIR)/build-libevent -TOR_CFLAGS="-O -g -I$(BUILT_DIR)/include" +TOR_CFLAGS="-I$(BUILT_DIR)/include" TOR_LDFLAGS="-L$(BUILT_DIR)/lib -L$(BUILT_DIR)/bin" TOR_OPTS=--enable-gcc-warnings --enable-static-libevent --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) build-tor:PATH+=:$(BUILT_DIR)/bin

1 0

[torbrowser/maint-2.3] Update to Qt 4.8.1
by erinn＠torproject.org 23 Apr '12

23 Apr '12

commit 1a2b64a6cb5849e93ccdc3cb54621607d5f397ad Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Apr 17 14:40:00 2012 +0200 Update to Qt 4.8.1 --- build-scripts/versions.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 818d1d4..ee29c6b 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -5,7 +5,7 @@ RELEASE_VER=2.2.35 ZLIB_VER=1.2.6 OPENSSL_VER=1.0.0h LIBPNG_VER=1.5.9 -QT_VER=4.7.4 +QT_VER=4.8.1 VIDALIA_VER=0.2.17 LIBEVENT_VER=2.0.17-stable TOR_VER=0.2.2.35

1 0

[torbrowser/maint-2.3] Update settings for the macx86 builder
by erinn＠torproject.org 23 Apr '12

23 Apr '12

commit 1fce8030e46ebe02716254bf91b3e99bb0249475 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Mon Apr 2 11:32:37 2012 +0200 Update settings for the macx86 builder --- build-scripts/config/mozconfig-osx-i386 | 11 ++++++----- build-scripts/osx.mk | 8 ++++---- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/build-scripts/config/mozconfig-osx-i386 b/build-scripts/config/mozconfig-osx-i386 index e0d2187..6ec8d67 100644 --- a/build-scripts/config/mozconfig-osx-i386 +++ b/build-scripts/config/mozconfig-osx-i386 @@ -3,12 +3,13 @@ mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ mk_add_options AUTOCONF=autoconf213 mk_add_options MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 +mk_add_options MOZ_MAKE_FLAGS="-s --no-print-directory -j8" # Options for cross-compilation on Snow Leopard. -HOST_CC="gcc-4.2 -arch i386" -HOST_CXX="g++-4.2 -arch i386" -CC="gcc-4.2 -arch i386" -CXX="g++-4.2 -arch i386" +HOST_CC="gcc -arch i386" +HOST_CXX="g++ -arch i386" +CC="gcc -arch i386" +CXX="g++ -arch i386" RANLIB=ranlib AR=ar AS=$CC @@ -18,7 +19,7 @@ CROSS_COMPILE=1 ac_add_options --target=i386-apple-darwin$DARWIN_VERSION # Options for 'configure' (same as command-line options). -ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.5.sdk +ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.6.sdk ac_add_options --enable-macos-target=10.5 ac_add_options --enable-application=browser ac_add_options --enable-official-branding diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index a39eb94..7e2c080 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -14,15 +14,15 @@ ## Architecture -ARCH_TYPE=x86_64 +ARCH_TYPE=i386 BUILD_NUM=8 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options OSX_VERSION=10.5 -CC=CC=gcc-4.0 +CC= # These can probably be left alone for OSX_VERSION 10.5 and up -SDK_PATH=/Developer/SDKs/MacOSX$(OSX_VERSION).sdk +SDK_PATH=/Developer/SDKs/MacOSX10.6.sdk SDK=-sdk $(SDK_PATH) MIN_VERSION=-mmacosx-version-min=$(OSX_VERSION) CF_MIN_VERSION=-isysroot $(SDK_PATH) @@ -31,7 +31,7 @@ BACKWARDS_COMPAT=$(MIN_VERSION) $(CF_MIN_VERSION) $(LD_MIN_VERSION) ## Build machine specific settings # Number of cpu cores used to build in parallel -NUM_CORES=2 +NUM_CORES=4 ## Location of directory for source fetching FETCH_DIR=$(PWD)/build

1 0

[torbrowser/maint-2.3] Small fix to continue when no stamps exist.
by erinn＠torproject.org 23 Apr '12

23 Apr '12

commit b30d28e532e93d42b9b43f96bea0a9734f1dde40 Author: Shondoit Walker <shondoit(a)gmail.com> Date: Sun Apr 8 21:37:24 2012 +0200 Small fix to continue when no stamps exist. --- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/windows.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index fed251a..1a32df0 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -202,7 +202,7 @@ clean: rm -f *~ rm -fr *.xpi *.jar *.zip rm -fr $(NAME)_* - rm $(STAMP_DIR)/*stamp + rm -f $(STAMP_DIR)/*.stamp cd ../src/RelativeLink/ && $(MAKE) clean ## diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 7e2c080..b4dd9fd 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -217,7 +217,7 @@ clean: rm -f *~ rm -fr *.xpi *.jar *.zip rm -fr $(NAME)_* - rm $(STAMP_DIR)/*stamp + rm -f $(STAMP_DIR)/*.stamp cd ../src/RelativeLink/ && $(MAKE) clean ## diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 505e5b6..d690230 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -208,7 +208,7 @@ clean: rm -f *~ rm -fr *.xpi *.jar *.zip rm -fr $(NAME)_* - rm $(STAMP_DIR)/*stamp + rm -f $(STAMP_DIR)/*.stamp cd ../src/RelativeLink/ && $(MAKE) clean ## Also remove the output files

1 0

[torbrowser/maint-2.3] OSX: Copy qt_menu.nib from Qt source to vidalia
by erinn＠torproject.org 23 Apr '12

23 Apr '12

commit 0143a7d6db9241c24c366be27bf3ae1cedd5719a Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Apr 17 17:04:01 2012 +0200 OSX: Copy qt_menu.nib from Qt source to vidalia --- build-scripts/osx.mk | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index b4dd9fd..83e008a 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -83,6 +83,7 @@ build-vidalia: build-openssl build-qt $(VIDALIA_DIR) cd $(VIDALIA_DIR)/build && cmake $(VIDALIA_OPTS) \ && make -j $(NUM_CORES) && make dist-osx-libraries cd $(VIDALIA_DIR)/build && DESTDIR=$(BUILT_DIR) make install + cp -r $(QT_DIR)/src/gui/mac/qt_menu.nib $(VIDALIA)/Contents/Resources/ touch $(STAMP_DIR)/build-vidalia LIBEVENT_CFLAGS="-arch $(ARCH_TYPE) $(MIN_VERSION) $(CF_MIN_VERSION) -arch $(ARCH_TYPE)"

1 0