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

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 11 Oct '14

11 Oct '14

commit 355fd5f49be169a2813ebc2e1aae46bbec29fc28 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Oct 11 04:45:57 2014 +0000 Update translations for tails-misc --- de.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/de.po b/de.po index 7c12012..ec26260 100644 --- a/de.po +++ b/de.po @@ -18,7 +18,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-10-08 22:16+0200\n" -"PO-Revision-Date: 2014-10-11 04:15+0000\n" +"PO-Revision-Date: 2014-10-11 04:30+0000\n" "Last-Translator: Sandra R <drahtseilakt(a)live.com>\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n" @@ -457,26 +457,26 @@ msgstr "" #: config/chroot_local-includes/usr/local/sbin/tails-i2p:43 msgid "You can now access I2P's router console on http://127.0.0.1:7657." -msgstr "" +msgstr "Sie können nun hier auf die I2P Routerkonsole zugreifen: http://127.0.0.1:7657." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:48 msgid "I2P is not ready" -msgstr "I2P ist noch nicht bereit." +msgstr "I2P ist noch nicht bereit" #: config/chroot_local-includes/usr/local/sbin/tails-i2p:49 msgid "" "Eepsite tunnel not built within six minutes. Check the router console at " "http://127.0.0.1:7657/logs or the logs in /var/log/i2p for more information." " Reconnect to the network to try again." -msgstr "" +msgstr "Der Eepsite Tunnel wurde nicht innerhalb sechs Minuten gebaut. Check die Routerkonsole auf http://127.0.0.1:7657/logs oder die Logs in /var/log/i2p für mehr Informationen. Schliessen Sie sich wieder ans Netzwerk an um es erneut zu versuchen." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:59 msgid "I2P is ready" -msgstr "" +msgstr "I2P ist bereit" #: config/chroot_local-includes/usr/local/sbin/tails-i2p:60 msgid "You can now access services on I2P." -msgstr "" +msgstr "Sie können nun auf I2P-Dienste zugreifen." #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1 msgid "Report an error" @@ -497,7 +497,7 @@ msgstr "" #: ../config/chroot_local-includes/usr/share/applications/i2p-browser.desktop.in.h:2 msgid "I2P Browser" -msgstr "" +msgstr "I2P-Webbrowser" #: ../config/chroot_local-includes/usr/share/applications/tails-about.desktop.in.h:2 msgid "Learn more about Tails"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 11 Oct '14

11 Oct '14

commit d477cb6280f447f9d043579731ab8f500010cc14 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Oct 11 04:15:49 2014 +0000 Update translations for tails-misc --- de.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/de.po b/de.po index 27e23bc..7c12012 100644 --- a/de.po +++ b/de.po @@ -9,6 +9,7 @@ # Larson März <lmaerz(a)emailn.de>, 2013 # Mario Baier <mario.baier26(a)gmx.de>, 2013 # malexmave <inactive+malexmave(a)transifex.com>, 2014 +# Sandra R <drahtseilakt(a)live.com>, 2014 # sycamoreone <sycamoreone(a)riseup.net>, 2014 # Tobias Bannert, 2014 # rike, 2014 @@ -17,8 +18,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-10-08 22:16+0200\n" -"PO-Revision-Date: 2014-10-10 08:51+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-10-11 04:15+0000\n" +"Last-Translator: Sandra R <drahtseilakt(a)live.com>\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -429,7 +430,7 @@ msgstr "Konnte keinen DNS-Server über DHCP oder aus den manuellen Einstellungen #: config/chroot_local-includes/usr/share/tails/truecrypt-wrapper.disabled:11 msgid "TrueCrypt will be removed in Tails 1.2.1" -msgstr "" +msgstr "TrueCrypt wird in Tails 1.2.1 entfernt werden." #: config/chroot_local-includes/usr/share/tails/truecrypt-wrapper.disabled:12 msgid "" @@ -460,7 +461,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/sbin/tails-i2p:48 msgid "I2P is not ready" -msgstr "" +msgstr "I2P ist noch nicht bereit." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:49 msgid ""

1 0

[tor-browser-bundle/master] Bump nightly to new 31.2.0 branch.
by mikeperry＠torproject.org 10 Oct '14

10 Oct '14

commit aee7425946ccc4744c4b4780bf5c28ad26ca5de1 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Oct 10 20:44:05 2014 -0700 Bump nightly to new 31.2.0 branch. --- gitian/versions.nightly | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 87136d9..e3a1d65 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -4,7 +4,7 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=0 -FIREFOX_VERSION=31.1.1esr +FIREFOX_VERSION=31.2.0esr TORBROWSER_UPDATE_CHANNEL=default

1 0

[tor-browser-bundle/master] Bug 13357: Add in a sha256sum for GCC, and update our keyring for its janky keys.
by mikeperry＠torproject.org 10 Oct '14

10 Oct '14

commit 4353c70891bcc25b0e8fa01bc33cd01c19ec9294 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Oct 10 18:29:19 2014 -0700 Bug 13357: Add in a sha256sum for GCC, and update our keyring for its janky keys. --- gitian/fetch-inputs.sh | 2 +- gitian/gpg/GCC.gpg | Bin 2635 -> 23385 bytes gitian/verify-tags.sh | 2 +- gitian/versions | 1 + 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 3a4dc87..ef4dbf7 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -208,7 +208,7 @@ wget -U "" -N ${HTTPSE_URL} # 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 TOOLCHAIN4_OLD NOSCRIPT HTTPSE MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO +for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT HTTPSE MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" diff --git a/gitian/gpg/GCC.gpg b/gitian/gpg/GCC.gpg index e62de27..a0a084c 100644 Binary files a/gitian/gpg/GCC.gpg and b/gitian/gpg/GCC.gpg differ diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index a4f6ca1..5cd8649 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -135,7 +135,7 @@ done # 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 TOOLCHAIN4_OLD NOSCRIPT HTTPSE MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO +for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT HTTPSE MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" diff --git a/gitian/versions b/gitian/versions index 4a35534..945180a 100755 --- a/gitian/versions +++ b/gitian/versions @@ -93,6 +93,7 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO_HASH=1bb6fde89cfe8b9756a875af55d994cce0994861227b5dc0f268c143d91cd5ff +GCC_HASH=6a8e4f11b185f4fe2ed9d7fc053e80f8c7e73f800c045f51f9d8bea33f080f1e ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE}

1 0

[tor-browser-bundle/master] Add in the faketime tag to stable and alpha.
by mikeperry＠torproject.org 10 Oct '14

10 Oct '14

commit ce70fe6c22ef087a4c2875a70f3e533d234e62d0 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Oct 10 18:38:29 2014 -0700 Add in the faketime tag to stable and alpha. --- gitian/versions | 1 + gitian/versions.alpha | 1 + 2 files changed, 2 insertions(+) diff --git a/gitian/versions b/gitian/versions index 945180a..1ed612e 100755 --- a/gitian/versions +++ b/gitian/versions @@ -26,6 +26,7 @@ LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 MEEK_TAG=0.11 +FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 GITIAN_TAG=tor-browser-builder-3.x-7 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 14ce2d9..e17b071 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -26,6 +26,7 @@ LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 MEEK_TAG=0.11 +FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 GITIAN_TAG=tor-browser-builder-3.x-7

1 0

[tor-browser-bundle/master] Revert "Also switch gitian to commit hash."
by mikeperry＠torproject.org 10 Oct '14

10 Oct '14

commit d5084d8a23fc30233a3522b697deead0fedf73b9 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Oct 10 18:10:15 2014 -0700 Revert "Also switch gitian to commit hash." This reverts commit 4d5787fb137e5275c5c23588caa1956770f3c67e. --- gitian/mkbundle-linux.sh | 2 +- gitian/mkbundle-mac.sh | 2 +- gitian/mkbundle-windows.sh | 2 +- gitian/record-inputs.sh | 2 +- gitian/verify-tags.sh | 2 +- gitian/versions.alpha | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 68d53a1..8321ffe 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -83,7 +83,7 @@ then # If we're verifying tags, be explicit to gitian that we # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG - #GITIAN_TAG=refs/tags/$GITIAN_TAG + GITIAN_TAG=refs/tags/$GITIAN_TAG TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 2239d75..9c5d99b 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -88,7 +88,7 @@ then # If we're verifying tags, be explicit to gitian that we # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG - #GITIAN_TAG=refs/tags/$GITIAN_TAG + GITIAN_TAG=refs/tags/$GITIAN_TAG TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index b140202..7600e07 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -81,7 +81,7 @@ then # If we're verifying tags, be explicit to gitian that we # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG - #GITIAN_TAG=refs/tags/$GITIAN_TAG + GITIAN_TAG=refs/tags/$GITIAN_TAG TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG diff --git a/gitian/record-inputs.sh b/gitian/record-inputs.sh index eb368a9..afcd70d 100755 --- a/gitian/record-inputs.sh +++ b/gitian/record-inputs.sh @@ -35,7 +35,7 @@ then # If we're verifying tags, be explicit to gitian that we # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG - #GITIAN_TAG=refs/tags/$GITIAN_TAG + GITIAN_TAG=refs/tags/$GITIAN_TAG TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index b359496..a4f6ca1 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -147,6 +147,6 @@ done cd "$INPUTS_DIR" -#verify_git "." "$WRAPPER_DIR/gpg/torbutton.gpg" "$GITIAN_TAG" +verify_git "." "$WRAPPER_DIR/gpg/torbutton.gpg" "$GITIAN_TAG" git checkout "$GITIAN_TAG" diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 5d7b8a2..a9df723 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -27,7 +27,7 @@ TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0 GOPTLIB_TAG=0.2 MEEK_TAG=0.11 -GITIAN_TAG=ae72871ea2e1c731ee34bba27a47fcce1b79786e #tor-browser-builder-3.x-6 +GITIAN_TAG=tor-browser-builder-3.x-6 OPENSSL_VER=1.0.1i GMP_VER=5.1.3

1 0

[tor-browser-bundle/master] Update versions for 4.0-stable.
by mikeperry＠torproject.org 10 Oct '14

10 Oct '14

commit ab635e4b5abc1b8f543622dd3660bfd0f37302f9 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Oct 10 18:05:12 2014 -0700 Update versions for 4.0-stable. --- gitian/versions | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/gitian/versions b/gitian/versions index 838d77c..4a35534 100755 --- a/gitian/versions +++ b/gitian/versions @@ -1,18 +1,18 @@ -TORBROWSER_VERSION=3.7pre +TORBROWSER_VERSION=4.0 BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" BUILD_PT_BUNDLES=1 -VERIFY_TAGS=0 +VERIFY_TAGS=1 -FIREFOX_VERSION=24.6.0esr +FIREFOX_VERSION=31.2.0esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.x-1 -TOR_TAG=tor-0.2.4.22 -TORLAUNCHER_TAG=0.2.6.0 -TORBUTTON_TAG=1.6.9.0 -HTTPSE_TAG=3.4.5 # XXX: HTTPSE_VER is used instead, pending #11630 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.x-1-build1 +TOR_TAG=tor-0.2.5.8-rc +TORLAUNCHER_TAG=0.2.7.0.1 +TORBUTTON_TAG=1.7.0.1 +HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=v0.2 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable @@ -27,9 +27,9 @@ TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0 GOPTLIB_TAG=0.2 MEEK_TAG=0.11 -GITIAN_TAG=tor-browser-builder-3.x-6 +GITIAN_TAG=tor-browser-builder-3.x-7 -OPENSSL_VER=1.0.1g +OPENSSL_VER=1.0.1i GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build1 @@ -40,19 +40,19 @@ PYCRYPTO_VER=2.6.1 ARGPARSE_VER=1.2.1 PYYAML_VER=3.11 ZOPEINTERFACE_VER=4.0.5 -TWISTED_VER=13.1.0 +TWISTED_VER=13.2.0 M2CRYPTO_VER=0.21.1 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 -HTTPSE_VER=3.5.1 +HTTPSE_VER=5.0development.0 GO_VER=1.3.3 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.33-fn+sm+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.42-fx+fn+sm.xpi HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz @@ -75,19 +75,19 @@ PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028 +OPENSSL_HASH=3c179f46ca77069a6a0bac70212a9b3b838b2f66129cb52d568837fc79d8fcc7 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=b2ea02e9ecf05d174a6d5b4cf1ee13d63cdad1c016160f3836aeeaa96790b189 -HTTPSE_HASH=62ac6560bb224a8f5557722153a72fb245b30b345940c537423bfbb7d8144e29 +NOSCRIPT_HASH=b474156fd6b9957b38054a34c8acb581204f08733cce898ed581c67d425dda33 +HTTPSE_HASH=6feb4982d13f89656b61435b6b49e1996c61bc79e52d046d02312879376028e3 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 PYYAML_HASH=c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b0846e8 ZOPEINTERFACE_HASH=1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc -TWISTED_HASH=110e957dd8fc4c6eaba8abe4f0477e60b2873e3cf1c260325863fd2ef69341c6 +TWISTED_HASH=095175638c019ac7c0604f4c291724a16ff1acd062e181b01293bf4dcbc62cf3 M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 @@ -102,7 +102,7 @@ TOOLCHAIN4_OLD_URL=https://people.torproject.org/~mikeperry/mirrors/sources… OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} -NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/${NOSCRIPT_PACKAGE} +NOSCRIPT_URL=https://addons.cdn.mozilla.net/user-media/addons/722/${NOSCRIPT_PACKAGE} HTTPSE_URL=https://www.eff.org/files/${HTTPSE_PACKAGE} PYTHON_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI…

1 0

[tor-browser-bundle/master] Update tag for gitian-builder on the alpha branch.
by mikeperry＠torproject.org 10 Oct '14

10 Oct '14

commit 2ccbf33ce984cd0ab3af346e5b364cafb4103ac3 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Oct 10 18:10:24 2014 -0700 Update tag for gitian-builder on the alpha branch. --- gitian/versions.alpha | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index a9df723..14ce2d9 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -27,7 +27,7 @@ TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0 GOPTLIB_TAG=0.2 MEEK_TAG=0.11 -GITIAN_TAG=tor-browser-builder-3.x-6 +GITIAN_TAG=tor-browser-builder-3.x-7 OPENSSL_VER=1.0.1i GMP_VER=5.1.3

1 0

[tor-browser-bundle/master] Revert "Use the commit for Tor Launcher as well."
by mikeperry＠torproject.org 10 Oct '14

10 Oct '14

commit f19acb8eabf8d0341861eef9a0d689254eb84516 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Oct 10 18:09:41 2014 -0700 Revert "Use the commit for Tor Launcher as well." This reverts commit 72ec0faa93ceb840a897e2e6953334ced2a8ff7b. --- gitian/mkbundle-linux.sh | 2 +- gitian/mkbundle-mac.sh | 2 +- gitian/mkbundle-windows.sh | 2 +- gitian/record-inputs.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 4106e74..68d53a1 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -84,7 +84,7 @@ then # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG #GITIAN_TAG=refs/tags/$GITIAN_TAG - #TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG + TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG TOR_TAG=refs/tags/$TOR_TAG diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 9a43685..2239d75 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -89,7 +89,7 @@ then # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG #GITIAN_TAG=refs/tags/$GITIAN_TAG - #TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG + TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG TOR_TAG=refs/tags/$TOR_TAG diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 56830a0..b140202 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -82,7 +82,7 @@ then # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG #GITIAN_TAG=refs/tags/$GITIAN_TAG - #TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG + TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG TOR_TAG=refs/tags/$TOR_TAG diff --git a/gitian/record-inputs.sh b/gitian/record-inputs.sh index 2c60e6e..eb368a9 100755 --- a/gitian/record-inputs.sh +++ b/gitian/record-inputs.sh @@ -36,7 +36,7 @@ then # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG #GITIAN_TAG=refs/tags/$GITIAN_TAG - #TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG + TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG TOR_TAG=refs/tags/$TOR_TAG

1 0

[tor-browser-bundle/master] Revert "Also update the tag verification for Tor Launcher.."
by mikeperry＠torproject.org 10 Oct '14

10 Oct '14

commit dec6491f3d7c5cdbde15934fab1639d96c2ee088 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Oct 10 18:09:00 2014 -0700 Revert "Also update the tag verification for Tor Launcher.." Go back to using tags for Tor Launcher. This reverts commit 6312ab050bfbcc9d70576c5cb993f923054b96a3. --- gitian/verify-tags.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 97bc56e..b359496 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -90,6 +90,7 @@ while read dir keyring tag; do verify_git "$dir" "$WRAPPER_DIR/gpg/$keyring" "$tag" done << EOF tbb-windows-installer tbb-windows-installer.gpg $NSIS_TAG +tor-launcher torbutton.gpg $TORLAUNCHER_TAG tor-browser torbutton.gpg $TORBROWSER_TAG torbutton torbutton.gpg $TORBUTTON_TAG zlib zlib.gpg $ZLIB_TAG @@ -111,7 +112,6 @@ libdmg-hfsplus $LIBDMG_TAG libfte $LIBFTE_TAG fteproxy $FTEPROXY_TAG txsocksx $TXSOCKSX_TAG -tor-launcher $TORLAUNCHER_TAG EOF # Verify signatures on signed packages

1 0