January 2014 - tor-commits - lists.torproject.org

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 15 Jan '14

15 Jan '14

commit 85501818a3cab629b108b87847aa2ac4b5f32e3f Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 15 05:15:17 2014 +0000 Update translations for vidalia_alpha --- ta/vidalia_ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ta/vidalia_ta.po b/ta/vidalia_ta.po index 6b9940d..36763e7 100644 --- a/ta/vidalia_ta.po +++ b/ta/vidalia_ta.po @@ -3782,7 +3782,7 @@ msgstr "" msgctxt "UpdatesAvailableDialog" msgid "Version" -msgstr "" +msgstr "பதிப்பு" msgctxt "VMessageBox" msgid "OK"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 15 Jan '14

15 Jan '14

commit bc0aae85111910f65e8f78ccca8984546485a105 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 15 05:15:13 2014 +0000 Update translations for vidalia --- ta/vidalia_ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ta/vidalia_ta.po b/ta/vidalia_ta.po index 68e42cb..9c046f4 100644 --- a/ta/vidalia_ta.po +++ b/ta/vidalia_ta.po @@ -3188,7 +3188,7 @@ msgstr "" msgctxt "ServicePage" msgid "Enabled" -msgstr "" +msgstr "இயக்கப்பட்டது" msgctxt "ServicePage" msgid "Add new service to list" @@ -3695,7 +3695,7 @@ msgstr "" msgctxt "UpdatesAvailableDialog" msgid "Version" -msgstr "" +msgstr "பதிப்பு" msgctxt "VMessageBox" msgid "OK"

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 15 Jan '14

15 Jan '14

commit 295466c856a146a250d6357b4f06dcd177ded70a Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 15 04:46:11 2014 +0000 Update translations for tails-greeter --- ta/ta.po | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/ta/ta.po b/ta/ta.po index ffd1e3c..8cf816e 100644 --- a/ta/ta.po +++ b/ta/ta.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# jskcse4 <jskcse4(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-01-10 12:01+0100\n" -"PO-Revision-Date: 2012-10-03 17:36+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2014-01-15 04:46+0000\n" +"Last-Translator: jskcse4 <jskcse4(a)gmail.com>\n" "Language-Team: Tamil (http://www.transifex.com/projects/p/torproject/language/ta/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,19 +20,19 @@ msgstr "" #: ../glade/persistencewindow.glade.h:1 msgid "Forward" -msgstr "" +msgstr "ஃபார்வர்டு" #: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1 msgid "Login" -msgstr "" +msgstr "புகுபதிகை" #: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2 msgid "Welcome to Tails" -msgstr "" +msgstr "Tails க்கு வரவேற்கிறோம்" #: ../glade/persistencewindow.glade.h:4 msgid "Use persistence?" -msgstr "" +msgstr "நிலைபேறு பயன்படுத்த விருப்பமா?" #: ../glade/persistencewindow.glade.h:5 msgid "Yes" @@ -43,29 +44,29 @@ msgstr "இல்லை" #: ../glade/persistencewindow.glade.h:7 msgid "Passphrase:" -msgstr "" +msgstr "கடவுச்சொற்றொடர்:" #: ../glade/persistencewindow.glade.h:8 msgid "Read-Only?" -msgstr "" +msgstr "படிக்க மட்டும்?" #: ../glade/persistencewindow.glade.h:9 msgid "Wrong passphrase. Please try again." -msgstr "" +msgstr "தவறான கடவுச்சொற்றொடர். மீண்டும் முயற்சிக்கவும்." #: ../glade/persistencewindow.glade.h:10 msgid "More options?" -msgstr "" +msgstr "மேலும் விருப்பங்கள்?" #: ../glade/optionswindow.glade.h:3 msgid "Administration password" -msgstr "" +msgstr "நிர்வாகத்தின் கடவுச்சொல்" #: ../glade/optionswindow.glade.h:4 msgid "" "Enter an administration password in case you need to perform administration tasks.\n" "Otherwise it will be disabled for better security." -msgstr "" +msgstr "நிர்வாக பணிகளை செய்ய வழக்கில் உள்ள ஒரு நிர்வாகத்தின் கடவுச்சொல்லை உள்ளிடவும்.\nஇல்லையெனில் சிறந்த பாதுகாப்பு முடக்கப்படும்." #: ../glade/optionswindow.glade.h:6 msgid "Password:" @@ -73,41 +74,41 @@ msgstr "கடவுச்சொல்:" #: ../glade/optionswindow.glade.h:7 msgid "Verify Password:" -msgstr "" +msgstr "கடவுச்சொல்லை சரிபார்க்கவும்:" #: ../glade/optionswindow.glade.h:8 msgid "Passwords do not match" -msgstr "" +msgstr "கடவுச்சொற்கள் பொருந்தவில்லை" #: ../glade/optionswindow.glade.h:9 msgid "Windows Camouflage" -msgstr "" +msgstr "விண்டோஸ் உருமறைப்பு" #: ../glade/optionswindow.glade.h:10 msgid "" "This option makes Tails look more like Microsoft Windows XP. This may be " "useful in public places in order to avoid attracting suspicion." -msgstr "" +msgstr "இந்த விருப்பத்தின் மூலம் Tails இன்னும் மைக்ரோசாப்ட் விண்டோஸ் எக்ஸ்பி போன்ற தோற்றத்தை ஏற்படுத்தும். இந்த சந்தேகம் தவிர்க்கும் பொருட்டு பொது இடங்களில் பயனுள்ளதாக இருக்கும்." #: ../glade/optionswindow.glade.h:11 msgid "Activate Microsoft Windows XP Camouflage" -msgstr "" +msgstr "மைக்ரோசாப்ட் விண்டோஸ் எக்ஸ்பி உருமறைப்பு செயல்படுத்த" #: ../glade/langpanel.glade.h:1 msgid " " -msgstr "" +msgstr " " #: ../glade/langpanel.glade.h:2 ../GdmGreeter/langpanel.py:42 msgid "Language" -msgstr "" +msgstr "மொழி" #: ../glade/langpanel.glade.h:3 msgid "Locale" -msgstr "" +msgstr "காட்சிக்குரிய இடம்" #: ../glade/langpanel.glade.h:4 msgid "Layout" -msgstr "" +msgstr "மாதிரி" #: ../GdmGreeter/persistence.py:59 #, python-format @@ -135,4 +136,4 @@ msgstr "" #: ../GdmGreeter/langpanel.py:124 ../GdmGreeter/langpanel.py:148 #: ../GdmGreeter/langpanel.py:181 msgid "Other..." -msgstr "" +msgstr "மற்றவை..."

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 15 Jan '14

15 Jan '14

commit 25ee41c659d2cea6ad5a5491ceaa1755de0fc772 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 15 04:46:07 2014 +0000 Update translations for tails-persistence-setup --- ta/ta.po | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/ta/ta.po b/ta/ta.po index caff0dd..715c28c 100644 --- a/ta/ta.po +++ b/ta/ta.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2013-11-07 16:37+0100\n" -"PO-Revision-Date: 2013-11-15 09:19+0000\n" +"POT-Creation-Date: 2013-12-19 12:20+0100\n" +"PO-Revision-Date: 2014-01-15 04:30+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Tamil (http://www.transifex.com/projects/p/torproject/language/ta/)\n" "MIME-Version: 1.0\n" @@ -118,67 +118,67 @@ msgstr "" msgid "Setup Tails persistent volume" msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:331 +#: ../lib/Tails/Persistence/Setup.pm:337 #, perl-format msgid "Device %s already has a persistent volume." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:339 +#: ../lib/Tails/Persistence/Setup.pm:345 #, perl-format msgid "Device %s has not enough unallocated space." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:347 ../lib/Tails/Persistence/Setup.pm:361 +#: ../lib/Tails/Persistence/Setup.pm:353 ../lib/Tails/Persistence/Setup.pm:367 #, perl-format msgid "Device %s has no persistent volume." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:353 +#: ../lib/Tails/Persistence/Setup.pm:359 msgid "" "Cannot delete the persistent volume while in use. You should restart Tails " "without persistence." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:372 +#: ../lib/Tails/Persistence/Setup.pm:378 msgid "Persistence volume is not unlocked." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:377 +#: ../lib/Tails/Persistence/Setup.pm:383 msgid "Persistence volume is not mounted." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:382 +#: ../lib/Tails/Persistence/Setup.pm:388 msgid "Persistence volume is not readable. Permissions or ownership problems?" msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:387 +#: ../lib/Tails/Persistence/Setup.pm:393 msgid "Persistence volume is not writable. Maybe it was mounted read-only?" msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:396 +#: ../lib/Tails/Persistence/Setup.pm:402 #, perl-format msgid "Tails is running from non-USB / non-SDIO device %s." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:402 +#: ../lib/Tails/Persistence/Setup.pm:408 #, perl-format msgid "Device %s is optical." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:409 +#: ../lib/Tails/Persistence/Setup.pm:415 #, perl-format msgid "Device %s was not created using Tails USB installer." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:444 +#: ../lib/Tails/Persistence/Setup.pm:450 msgid "Error" msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:680 +#: ../lib/Tails/Persistence/Setup.pm:665 msgid "Persistence wizard - Finished" msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:683 +#: ../lib/Tails/Persistence/Setup.pm:668 msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n" @@ -215,7 +215,7 @@ msgstr "" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:144 msgid "Passphrase:" -msgstr "" +msgstr "கடவுச்சொற்றொடர்:" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:154 msgid "Verify Passphrase:" @@ -287,28 +287,28 @@ msgstr "" msgid "Saving persistence configuration..." msgstr "" -#: ../lib/Tails/Persistence/Step/Delete.pm:40 +#: ../lib/Tails/Persistence/Step/Delete.pm:41 msgid "Persistence wizard - Persistent volume deletion" msgstr "" -#: ../lib/Tails/Persistence/Step/Delete.pm:43 +#: ../lib/Tails/Persistence/Step/Delete.pm:44 msgid "Your persistent data will be deleted." msgstr "" -#: ../lib/Tails/Persistence/Step/Delete.pm:47 +#: ../lib/Tails/Persistence/Step/Delete.pm:48 #, perl-format msgid "" "The persistent volume %s (%s), on the %s %s device, will be deleted." msgstr "" -#: ../lib/Tails/Persistence/Step/Delete.pm:53 +#: ../lib/Tails/Persistence/Step/Delete.pm:54 msgid "Delete" msgstr "" -#: ../lib/Tails/Persistence/Step/Delete.pm:91 +#: ../lib/Tails/Persistence/Step/Delete.pm:101 msgid "Deleting..." msgstr "" -#: ../lib/Tails/Persistence/Step/Delete.pm:94 +#: ../lib/Tails/Persistence/Step/Delete.pm:104 msgid "Deleting the persistent volume..." msgstr ""

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 15 Jan '14

15 Jan '14

commit 494f56d334b45b40307363dae9441c06a249234e Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 15 04:45:19 2014 +0000 Update translations for vidalia_alpha --- ta/vidalia_ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ta/vidalia_ta.po b/ta/vidalia_ta.po index d2ba102..6b9940d 100644 --- a/ta/vidalia_ta.po +++ b/ta/vidalia_ta.po @@ -239,7 +239,7 @@ msgstr "" msgctxt "AppearancePage" msgid "Language" -msgstr "" +msgstr "மொழி" msgctxt "AppearancePage" msgid "Choose the language used in Vidalia" @@ -1480,7 +1480,7 @@ msgstr "" msgctxt "HelpBrowser" msgid "Forward" -msgstr "" +msgstr "ஃபார்வர்டு" msgctxt "HelpBrowser" msgid "Move to next page (Shift+Backspace)"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 15 Jan '14

15 Jan '14

commit 0833f98890695517a3acaf93cc34fb5dec8d3e5b Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 15 04:45:13 2014 +0000 Update translations for vidalia --- ta/qt_ta.po | 4 ++-- ta/vidalia_ta.po | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ta/qt_ta.po b/ta/qt_ta.po index 14e8839..4a240a0 100644 --- a/ta/qt_ta.po +++ b/ta/qt_ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2008-08-20 03:25+0000\n" -"PO-Revision-Date: 2014-01-10 09:12+0000\n" +"PO-Revision-Date: 2014-01-15 04:30+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Tamil (http://www.transifex.com/projects/p/torproject/language/ta/)\n" "MIME-Version: 1.0\n" @@ -325,7 +325,7 @@ msgstr "" #: ui_qfiledialog.h:269 msgctxt "QFileDialog" msgid "Forward" -msgstr "" +msgstr "ஃபார்வர்டு" #: qfiledialog.cpp:2137 msgctxt "QFileDialog" diff --git a/ta/vidalia_ta.po b/ta/vidalia_ta.po index 83c4e6f..68e42cb 100644 --- a/ta/vidalia_ta.po +++ b/ta/vidalia_ta.po @@ -212,7 +212,7 @@ msgstr "" msgctxt "AppearancePage" msgid "Language" -msgstr "" +msgstr "மொழி" msgctxt "AppearancePage" msgid "Choose the language used in Vidalia" @@ -1448,7 +1448,7 @@ msgstr "" msgctxt "HelpBrowser" msgid "Forward" -msgstr "" +msgstr "ஃபார்வர்டு" msgctxt "HelpBrowser" msgid "Move to next page (Shift+Backspace)"

1 0

[tor-browser-bundle/master] Update changelog for latest 3.5.1 changes.
by mikeperry＠torproject.org 14 Jan '14

14 Jan '14

commit dfbc8c4d4ee17b144ce7012f7579ff3239526fc2 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jan 14 15:26:55 2014 -0800 Update changelog for latest 3.5.1 changes. --- Bundle-Data/Docs/ChangeLog.txt | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index c25b8c0..9b2396d 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,12 +1,18 @@ -Tor Browser Bundle 3.5.1 -- Dec 27 2013 +Tor Browser Bundle 3.5.1 -- Jan 14 2014 * All Platforms * Bug 10447: Remove SocksListenAddress to allow multiple socks ports. * Bug 10464: Remove addons.mozilla.org from NoScript whitelist - * Update Torbutton to 1.6.5.3 + * Update Torbutton to 1.6.5.4 * Bug 9486: Clear NoScript Temporary Permissions on New Identity + * Bug 10403: Include Arabic translations + * Update Tor Launcher to 0.2.4.2 + * Bug 10403: Include Arabic translations * Update Tor to 0.2.4.20 + * Update OpenSSL to 1.0.1f * Windows - * Bug 9259: Enable Accessibility support in Firefox build + * Bug 9259: Enable Accessibility (screen reader) support + * Mac + * misc: Update bundle version field in Info.plist (for MacUpdates service) Tor Browser Bundle 3.5 -- Dec 17 2013 * All Platforms

1 0

[tor-browser-bundle/master] Bug 10403: Add Arabic bundle support.
by mikeperry＠torproject.org 14 Jan '14

14 Jan '14

commit b8ef95ed55ed4be1de8148066797eb66ba8fa7d8 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jan 14 13:36:14 2014 -0800 Bug 10403: Add Arabic bundle support. --- gitian/versions | 6 +++--- gitian/versions.alpha | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gitian/versions b/gitian/versions index eebfe7d..d109b50 100755 --- a/gitian/versions +++ b/gitian/versions @@ -1,13 +1,13 @@ TORBROWSER_VERSION=3.5.1 -BUNDLE_LOCALES="de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN" +BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN" VERIFY_TAGS=1 TORBROWSER_TAG=tor-browser-24.2.0esr-3.5.1-build1 TOR_TAG=tor-0.2.4.20 OPENSSL_TAG=openssl-101e-no-gmt-time-v1 -TORLAUNCHER_TAG=0.2.4.2 -TORBUTTON_TAG=1.6.5.3 +TORLAUNCHER_TAG=0.2.4.3 +TORBUTTON_TAG=1.6.5.4 HTTPSE_TAG=3.4.4tbb NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 7465b39..fc5fa21 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -1,5 +1,5 @@ TORBROWSER_VERSION=3.5-rc-1 -BUNDLE_LOCALES="de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN" +BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN" VERIFY_TAGS=1

1 0

[tor-browser-bundle/master] Update version field for MacUpdates.
by mikeperry＠torproject.org 14 Jan '14

14 Jan '14

commit 26fe339c84153fecdb45be5c313ad0bde1caa0ae Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jan 14 13:32:54 2014 -0800 Update version field for MacUpdates. --- Bundle-Data/mac/Contents/Info.plist | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Bundle-Data/mac/Contents/Info.plist b/Bundle-Data/mac/Contents/Info.plist index 7b0c2ca..58fea7d 100644 --- a/Bundle-Data/mac/Contents/Info.plist +++ b/Bundle-Data/mac/Contents/Info.plist @@ -9,7 +9,7 @@ <key>CFBundleExecutable</key> <string>TorBrowserBundle</string> <key>CFBundleGetInfoString</key> - <string>Tor Browser Bundle 1.0 Copyright 2010 The Tor Project</string> + <string>Tor Browser Bundle 3.5.1 Copyright 2014 The Tor Project</string> <key>CFBundleIconFile</key> <string>firefox.icns</string> <key>CFBundleIdentifier</key> @@ -21,7 +21,7 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>1.0</string> + <string>3.5.1</string> <key>CFBundleSignature</key> <string>????</string> <key>LSEnvironment</key> @@ -35,7 +35,7 @@ <key>NSAppleScriptEnabled</key> <false/> <key>NSHumanReadableCopyright</key> - <string>Tor Browser Bundle 1.0 Copyright 2010 The Tor Project</string> + <string>Tor Browser Bundle 3.5.1 Copyright 2014 The Tor Project</string> <key>NSMainNibFile</key> <string>MainMenu</string> <key>NSPrincipalClass</key>

1 0

[tor-browser-bundle/master] Upgrade OpenSSL to 1.0.1f.
by mikeperry＠torproject.org 14 Jan '14

14 Jan '14

commit 151bf2706122c61a10f305593137d9bd9352e421 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jan 14 15:24:55 2014 -0800 Upgrade OpenSSL to 1.0.1f. Also switch back to using the official dist tarballs, since Nick's timestamp patch was merged. --- gitian/descriptors/linux/gitian-tor.yml | 6 ++--- gitian/descriptors/mac/gitian-tor.yml | 6 ++--- gitian/descriptors/windows/gitian-tor.yml | 6 ++--- gitian/fetch-inputs.sh | 34 ++++++++++++++--------------- gitian/mkbundle-linux.sh | 3 +-- gitian/mkbundle-mac.sh | 3 +-- gitian/mkbundle-windows.sh | 3 +-- gitian/record-inputs.sh | 3 +-- gitian/verify-tags.sh | 1 - gitian/versions | 9 ++++---- gitian/versions.alpha | 17 +++++++-------- 11 files changed, 42 insertions(+), 49 deletions(-) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index df92f37..736e84c 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -22,10 +22,9 @@ remotes: "dir": "tor" - "url": "https://github.com/libevent/libevent.git" "dir": "libevent" -- "url": "https://github.com/nmathewson/openssl.git" - "dir": "openssl" files: - "dzip.sh" +- "openssl.tar.gz" script: | INSTDIR="$HOME/install" export LIBRARY_PATH="$INSTDIR/lib" @@ -55,7 +54,8 @@ script: | cp $INSTDIR/libevent/lib/libevent-2.0.so.5 $INSTDIR/Tor/ cd .. # - cd openssl + tar xzf openssl.tar.gz + cd openssl-* find -type f | xargs touch --date="$REFERENCE_DATETIME" #./Configure -shared --prefix=$INSTDIR/openssl linux-elf ./config -shared --prefix=$INSTDIR/openssl diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index c0b483b..7707555 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -22,9 +22,8 @@ remotes: "dir": "libevent" - "url": "https://github.com/madler/zlib.git" "dir": "zlib" -- "url": "https://github.com/nmathewson/openssl.git" - "dir": "openssl" files: +- "openssl.tar.gz" - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" - "dzip.sh" @@ -65,7 +64,8 @@ script: | #cp $INSTDIR/zlib/lib/*.dylib $INSTDIR/Tor/ #cd .. # - cd openssl + tar xzf openssl.tar.gz + cd openssl-* find -type f | xargs touch --date="$REFERENCE_DATETIME" ./Configure --cross-compile-prefix=i686-apple-darwin11- $CFLAGS darwin-i386-cc --prefix=$INSTDIR/openssl make # SHARED_LDFLAGS="-shared -dynamiclib -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/" diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index 836e695..901383e 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -22,11 +22,10 @@ remotes: "dir": "libevent" - "url": "https://github.com/madler/zlib.git" "dir": "zlib" -- "url": "https://github.com/nmathewson/openssl.git" - "dir": "openssl" files: - "binutils.tar.bz2" - "dzip.sh" +- "openssl.tar.gz" script: | INSTDIR="$HOME/install" export LIBRARY_PATH="$INSTDIR/lib" @@ -71,7 +70,8 @@ script: | cp $INSTDIR/libevent/bin/*.dll $INSTDIR/Tor/ cd .. # - cd openssl + tar xzf openssl.tar.gz + cd openssl-* find -type f | xargs touch --date="$REFERENCE_DATETIME" ./Configure -shared --cross-compile-prefix=i686-w64-mingw32- mingw --prefix=$INSTDIR/openssl make diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 9f54f61..862f8af 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -116,20 +116,20 @@ checkout_mingw() { # Get package files from mirror # Get+verify sigs that exist -#for i in OPENSSL # OBFSPROXY -#do -# PACKAGE="${i}_PACKAGE" -# URL="${MIRROR_URL}${!PACKAGE}" -# SUFFIX="asc" -# get "${!PACKAGE}" "$URL" -# get "${!PACKAGE}.$SUFFIX" "$URL.$SUFFIX" -# -# if ! verify "${!PACKAGE}" "$WRAPPER_DIR/gpg/$i.gpg" $SUFFIX; then -# echo "$i: GPG signature is broken for ${URL}" -# mv "${!PACKAGE}" "${!PACKAGE}.badgpg" -# exit 1 -# fi -#done +for i in OPENSSL # OBFSPROXY +do + PACKAGE="${i}_PACKAGE" + URL="${MIRROR_URL}${!PACKAGE}" + SUFFIX="asc" + get "${!PACKAGE}" "$URL" + get "${!PACKAGE}.$SUFFIX" "$URL.$SUFFIX" + + if ! verify "${!PACKAGE}" "$WRAPPER_DIR/gpg/$i.gpg" $SUFFIX; then + echo "$i: GPG signature is broken for ${URL}" + mv "${!PACKAGE}" "${!PACKAGE}.badgpg" + exit 1 + fi +done for i in BINUTILS GCC PYTHON do @@ -164,7 +164,7 @@ done # TOOLCHAIN4 each time. Rely only on SHA256 for now.. mkdir -p verify cd verify -for i in OSXSDK #OPENSSL +for i in OPENSSL OSXSDK do URL="${i}_URL" PACKAGE="${i}_PACKAGE" @@ -200,7 +200,7 @@ fi # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK is not signed at all) -for i in OSXSDK TOOLCHAIN4 NOSCRIPT MINGW MSVCR100 # OPENSSL +for i in OSXSDK TOOLCHAIN4 NOSCRIPT MINGW MSVCR100 OPENSSL do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" @@ -236,6 +236,7 @@ done cd .. ln -sf "$NOSCRIPT_PACKAGE" noscript(a)noscript.net.xpi +ln -sf "$OPENSSL_PACKAGE" openssl.tar.gz ln -sf "$BINUTILS_PACKAGE" binutils.tar.bz2 ln -sf "$GCC_PACKAGE" gcc.tar.bz2 ln -sf "$PYTHON_PACKAGE" python.tar.bz2 @@ -254,7 +255,6 @@ while read dir url tag; do update_git "$dir" "$url" "$tag" done << EOF tbb-windows-installer https://github.com/moba/tbb-windows-installer.git $NSIS_TAG -openssl https://github.com/nmathewson/openssl.git $OPENSSL_TAG zlib https://github.com/madler/zlib.git $ZLIB_TAG libevent https://github.com/libevent/libevent.git $LIBEVENT_TAG tor https://git.torproject.org/tor.git $TOR_TAG diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 182b1b6..7c6bd60 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -66,7 +66,6 @@ then GITIAN_TAG=refs/tags/$GITIAN_TAG TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG - OPENSSL_TAG=refs/tags/$OPENSSL_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG TOR_TAG=refs/tags/$TOR_TAG HTTPSE_TAG=refs/tags/$HTTPSE_TAG @@ -82,7 +81,7 @@ then echo "****** Starting Tor Component of Linux Bundle (1/3 for Linux) ******" echo - ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_TAG,zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG,tor=$TOR_TAG $DESCRIPTOR_DIR/linux/gitian-tor.yml + ./bin/gbuild -j $NUM_PROCS --commit zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG,tor=$TOR_TAG $DESCRIPTOR_DIR/linux/gitian-tor.yml if [ $? -ne 0 ]; then #mv var/build.log ./tor-fail-linux.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index edd3846..531db8f 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -66,7 +66,6 @@ then GITIAN_TAG=refs/tags/$GITIAN_TAG TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG - OPENSSL_TAG=refs/tags/$OPENSSL_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG TOR_TAG=refs/tags/$TOR_TAG HTTPSE_TAG=refs/tags/$HTTPSE_TAG @@ -82,7 +81,7 @@ then echo "****** Starting Tor Component of Mac Bundle (1/3 for Mac) ******" echo - ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_TAG,zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG,tor=$TOR_TAG $DESCRIPTOR_DIR/mac/gitian-tor.yml + ./bin/gbuild -j $NUM_PROCS --commit zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG,tor=$TOR_TAG $DESCRIPTOR_DIR/mac/gitian-tor.yml if [ $? -ne 0 ]; then #mv var/build.log ./tor-fail-mac.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index fd0cf42..183c737 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -67,7 +67,6 @@ then GITIAN_TAG=refs/tags/$GITIAN_TAG TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG - OPENSSL_TAG=refs/tags/$OPENSSL_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG TOR_TAG=refs/tags/$TOR_TAG HTTPSE_TAG=refs/tags/$HTTPSE_TAG @@ -83,7 +82,7 @@ then echo "****** Starting Tor Component of Windows Bundle (1/3 for Windows) ******" echo - ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_TAG,zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG,tor=$TOR_TAG $DESCRIPTOR_DIR/windows/gitian-tor.yml + ./bin/gbuild -j $NUM_PROCS --commit zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG,tor=$TOR_TAG $DESCRIPTOR_DIR/windows/gitian-tor.yml if [ $? -ne 0 ]; then #mv var/build.log ./tor-fail-win32.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/record-inputs.sh b/gitian/record-inputs.sh index 0d44b1a..bbae06f 100755 --- a/gitian/record-inputs.sh +++ b/gitian/record-inputs.sh @@ -24,6 +24,7 @@ cd $INPUTS_DIR rm -f bundle.inputs sha256sum $OSXSDK_PACKAGE >> bundle.inputs +sha256sum $OPENSSL_PACKAGE >> bundle.inputs sha256sum $TOOLCHAIN4_PACKAGE >> bundle.inputs sha256sum mingw-w64-svn-snapshot.zip >> bundle.inputs echo >> bundle.inputs @@ -43,7 +44,6 @@ then HTTPSE_TAG=refs/tags/$HTTPSE_TAG ZLIB_TAG=refs/tags/$ZLIB_TAG LIBEVENT_TAG=refs/tags/$LIBEVENT_TAG - OPENSSL_TAG=refs/tags/$OPENSSL_TAG fi echo "`cd zlib && git log --format=%H -1 $ZLIB_TAG` zlib.git" >> bundle.inputs @@ -53,7 +53,6 @@ echo "`cd torbutton && git log --format=%H -1 $TORBUTTON_TAG` torbutton.git" >> echo "`cd tor-launcher && git log --format=%H -1 $TORLAUNCHER_TAG` tor-launcher.git" >> bundle.inputs echo "`cd https-everywhere && git log --format=%H -1 $HTTPSE_TAG` https-everywhere.git" >> bundle.inputs echo "`cd tbb-windows-installer && git log --format=%H -1 $NSIS_TAG` tbb-windows-installer.git" >> bundle.inputs -echo "`cd openssl && git log --format=%H -1 $OPENSSL_TAG` openssl.git" >> bundle.inputs echo "`cd $INPUTS_DIR && git log --format=%H -1` gitian-builder.git" >> bundle.inputs echo "`cd $WRAPPER_DIR && git log --format=%H -1` tor-browser-bundle.git" >> bundle.inputs diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 73016a8..055cac5 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -60,7 +60,6 @@ zlib zlib.gpg $ZLIB_TAG libevent libevent.gpg $LIBEVENT_TAG tor tor.gpg $TOR_TAG https-everywhere https-everywhere.gpg $HTTPSE_TAG -openssl tor.gpg $OPENSSL_TAG EOF cd "$INPUTS_DIR" diff --git a/gitian/versions b/gitian/versions index d109b50..e6fba05 100755 --- a/gitian/versions +++ b/gitian/versions @@ -5,7 +5,6 @@ VERIFY_TAGS=1 TORBROWSER_TAG=tor-browser-24.2.0esr-3.5.1-build1 TOR_TAG=tor-0.2.4.20 -OPENSSL_TAG=openssl-101e-no-gmt-time-v1 TORLAUNCHER_TAG=0.2.4.3 TORBUTTON_TAG=1.6.5.4 HTTPSE_TAG=3.4.4tbb @@ -16,14 +15,14 @@ MINGW_REV=6184 GITIAN_TAG=tor-browser-builder-3.0-4 -# OPENSSL_VER=1.0.1e +OPENSSL_VER=1.0.1f FIREFOX_LANG_VER=24.2.0esr BINUTILS_VER=2.22 GCC_VER=4.6.3 PYTHON_VER=2.7.5 ## File names for the source packages -# OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz +OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.7-sm+fx+fn.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -34,7 +33,7 @@ GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2 # Hashes for packages with weak sigs or no sigs -# OPENSSL_HASH=f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3 +OPENSSL_HASH=6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 NOSCRIPT_HASH=5ac1a5c727a5101fd7673ba48179a52ca1804149ed1b67e6172724606355440e @@ -42,7 +41,7 @@ MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 ## Non-git package URLs -# OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} +OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} TOOLCHAIN4_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${T… OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} diff --git a/gitian/versions.alpha b/gitian/versions.alpha index fc5fa21..ac5894d 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -1,13 +1,12 @@ -TORBROWSER_VERSION=3.5-rc-1 +TORBROWSER_VERSION=4.0-alpha-1 BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN" VERIFY_TAGS=1 TORBROWSER_TAG=tor-browser-24.2.0esr-3.5rc1-build3 -TOR_TAG=tor-0.2.4.18-rc -OPENSSL_TAG=openssl-101e-no-gmt-time-v1 -TORLAUNCHER_TAG=0.2.4.1 -TORBUTTON_TAG=1.6.5.1 +TOR_TAG=tor-0.2.5.1-alpha +TORLAUNCHER_TAG=0.2.4.3 +TORBUTTON_TAG=1.6.5.4 HTTPSE_TAG=3.4.4tbb NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 @@ -16,14 +15,14 @@ MINGW_REV=6184 GITIAN_TAG=tor-browser-builder-3.0-4 -# OPENSSL_VER=1.0.1e +OPENSSL_VER=1.0.1f FIREFOX_LANG_VER=24.2.0esr BINUTILS_VER=2.22 GCC_VER=4.6.3 PYTHON_VER=2.7.5 ## File names for the source packages -# OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz +OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.7-sm+fx+fn.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -34,7 +33,7 @@ GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2 # Hashes for packages with weak sigs or no sigs -# OPENSSL_HASH=f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3 +OPENSSL_HASH=6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 NOSCRIPT_HASH=5ac1a5c727a5101fd7673ba48179a52ca1804149ed1b67e6172724606355440e @@ -42,7 +41,7 @@ MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 ## Non-git package URLs -# OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} +OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} TOOLCHAIN4_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${T… OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE}

1 0