tor-commits January 2016

tor-commits@lists.torproject.org

19 participants
1449 discussions

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 16 Jan '16

16 Jan '16

commit 86ae790268109f9329171b188303c2a3164427b2 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jan 16 21:15:55 2016 +0000 Update translations for tails-misc_completed --- pl.po | 128 ++++++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 71 insertions(+), 57 deletions(-) diff --git a/pl.po b/pl.po index 81cee84..7eb17ba 100644 --- a/pl.po +++ b/pl.po @@ -3,19 +3,22 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Adam Stachowicz <saibamenppl(a)gmail.com>, 2015 # Aron <aron.plotnikowski(a)cryptolab.net>, 2014 # Dawid <hoek(a)hoek.pl>, 2014 # Dawid <hoek(a)hoek.pl>, 2014 +# Jakub Goldberg <zenji.yamada.nihon(a)gmail.com>, 2015-2016 # oirpos <kuba2707(a)gmail.com>, 2015 # phla47 <phla47(a)gmail.com>, 2013 -# seb, 2013-2015 +# sebx, 2013-2015 +# sebx, 2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-03 01:06+0100\n" -"PO-Revision-Date: 2015-11-28 20:30+0000\n" -"Last-Translator: seb\n" +"POT-Creation-Date: 2016-01-11 21:00+0100\n" +"PO-Revision-Date: 2016-01-16 21:04+0000\n" +"Last-Translator: Jakub Goldberg <zenji.yamada.nihon(a)gmail.com>\n" "Language-Team: Polish (http://www.transifex.com/otf/torproject/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,15 +26,15 @@ msgstr "" "Language: pl\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:43 +#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:39 msgid "Tor is ready" msgstr "Tor jest gotowy" -#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:44 +#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:40 msgid "You can now access the Internet." msgstr "Teraz możesz uzyskać dostęp do Internetu." -#: config/chroot_local-includes/etc/whisperback/config.py:64 +#: config/chroot_local-includes/etc/whisperback/config.py:65 #, python-format msgid "" "<h1>Help us fix your bug!</h1>\n" @@ -46,29 +49,31 @@ msgid "" "an opportunity for eavesdroppers, like your email or Internet provider, to\n" "confirm that you are using Tails.\n" "\n" -msgstr "<h1>Pomóż nam naprawić błąd!</h1>\nPrzeczytaj <a href=\"%s\">instrukcje zgłaszania błędów</a>.\nNie dołączaj więcej prywatnych informacji o sobie niż to \nkonieczne!\n<h2>Podanie swojego adresu email</h2>\n\nPoprzez podanie swojego adresu email dajesz nam szanse na skontaktowania się z Tobą i klaryfikacją problemu który napotkałeś. \nTo jest potrzebne w większości przypadków zgłaszania błędów które otrzymujemy. \nBez jakichkolwiek danych kontaktowych zgłaszane błędy są bezużyteczne. \nZ drugiej strony to też daje możliwość na podsłuch, jakoby Twój dostawca email lub dostawca internetu będzie wiedział, że używasz Tails.\n\n\n" +msgstr "<h1>Pomóż nam naprawić błąd!</h1>\nPrzeczytaj <a href=\"%s\">instrukcje zgłaszania błędów</a>.\nNie podawaj więcej prywatnych informacji o sobie niż to konieczne!\n<h2>Podanie swojego adresu email</h2>\n\nPoprzez podanie swojego adresu email dajesz nam szanse na skontaktowania się z Tobą i klaryfikację problemu który napotkałeś. \nTo jest potrzebne w większości przypadków zgłaszania błędów które otrzymujemy. \nBez jakichkolwiek danych kontaktowych zgłaszane błędy są bezużyteczne. \nAczkolwiek, podanie swojego adresu email daje możliwość na podsłuch, np. Twój dostawca email, lub dostawca internetu będzie wiedział, że używasz Tails.\n\n\n" #: config/chroot_local-includes/usr/local/bin/electrum:14 msgid "Persistence is disabled for Electrum" -msgstr "Persistence/trwałość jest wyłączona dla Electrum" +msgstr "Zapis plików jest wyłączony dla Electrum" #: config/chroot_local-includes/usr/local/bin/electrum:16 msgid "" "When you reboot Tails, all of Electrum's data will be lost, including your " "Bitcoin wallet. It is strongly recommended to only run Electrum when its " "persistence feature is activated." -msgstr "Kiedy zrestartujesz Tails, to wszystkie dane Electrum będą stracone, włączając w to Twój portfel Bitcoin. Zaleca się, aby uruchomić Electrum tylko wtedy gdy funkcja persistence/trwałości jest aktywna." +msgstr "Kiedy zrestartujesz Tails, to wszystkie dane Electrum zostaną utracone, łącznie z Twoim portfelem Bitcoin. Zaleca się, aby uruchomić Electrum tylko wtedy gdy funkcja persistence/zapisu plików jest aktywna." #: config/chroot_local-includes/usr/local/bin/electrum:18 msgid "Do you want to start Electrum anyway?" msgstr "Mimo tego, czy chcesz uruchomić Electrum?" #: config/chroot_local-includes/usr/local/bin/electrum:20 +#: config/chroot_local-includes/usr/local/bin/icedove:22 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:36 msgid "_Launch" msgstr "_Uruchom" #: config/chroot_local-includes/usr/local/bin/electrum:21 +#: config/chroot_local-includes/usr/local/bin/icedove:23 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37 msgid "_Exit" msgstr "_Wyjście" @@ -233,13 +238,25 @@ msgstr "Wyniki GnuPG" msgid "Other messages provided by GnuPG:" msgstr "Inne wiadomości dostarczone przez GnuPG:" -#: config/chroot_local-includes/usr/local/lib/shutdown-helper-applet:39 -msgid "Shutdown Immediately" -msgstr "Wyłącz natychmiast" +#: config/chroot_local-includes/usr/local/bin/icedove:18 +msgid "The Claws Mail persistence feature is activated." +msgstr "Zapis plików jest włączony dla Claws mail" -#: config/chroot_local-includes/usr/local/lib/shutdown-helper-applet:40 -msgid "Reboot Immediately" -msgstr "Zresetuj natychmiast" +#: config/chroot_local-includes/usr/local/bin/icedove:20 +msgid "" +"If you have emails saved in Claws Mail, you should <a " +"href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate" +" your data</a> before starting Icedove." +msgstr "Jeśli trzymasz swoją pocztę w Claws Mail, przeprowadź <a href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrację Twoich danych do Icedove</a>, zanim go uruchomisz." + +#: config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-helper@tails.boum.org/extension.js:71 +msgid "Restart" +msgstr "Restart" + +#: config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-helper@tails.boum.org/extension.js:74 +#: ../config/chroot_local-includes/usr/share/applications/tails-shutdown.desktop.in.h:1 +msgid "Power Off" +msgstr "Wyłącz" #: config/chroot_local-includes/usr/local/bin/tails-about:16 msgid "not available" @@ -284,70 +301,62 @@ msgstr "Aktualizacja nie powiodła się. Może być to spowodowane problemem z T msgid "The upgrade was successful." msgstr "Aktualizacja zakończona sukcesem." -#: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:52 +#: config/chroot_local-includes/usr/local/lib/tails-htp-notify-user:52 msgid "Synchronizing the system's clock" msgstr "Synchronizacja zegara systemowego" -#: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:53 +#: config/chroot_local-includes/usr/local/lib/tails-htp-notify-user:53 msgid "" "Tor needs an accurate clock to work properly, especially for Hidden " "Services. Please wait..." msgstr "Tor wymaga dokładnego czasu do poprawnego działania, szczególnie w przypadku Ukrytych Serwisów. Proszę czekać..." -#: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:87 +#: config/chroot_local-includes/usr/local/lib/tails-htp-notify-user:87 msgid "Failed to synchronize the clock!" msgstr "Nie udało się zsynchronizować zegara!" -#: config/chroot_local-includes/usr/local/sbin/tails-restricted-network-detector:38 -msgid "Network connection blocked?" -msgstr "Czy połączenie sieciowe jest zablokowane?" - -#: config/chroot_local-includes/usr/local/sbin/tails-restricted-network-detector:40 -msgid "" -"It looks like you are blocked from the network. This may be related to the " -"MAC spoofing feature. For more information, see the <a " -"href=\\\"file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html#blocked\\\">MAC" -" spoofing documentation</a>." -msgstr "Wygląda na to, że masz zablokowany dostęp do sieci. Może być to związane z funkcją zmiany adresu MAC. Aby uzyskać więcej informacji, zobacz <a href=\\\"file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html#blocked\\\">dokumentację zmiany adresu MAC</a>." - -#: config/chroot_local-includes/usr/local/bin/tails-security-check:151 +#: config/chroot_local-includes/usr/local/bin/tails-security-check:146 msgid "This version of Tails has known security issues:" msgstr "Ta wersja Tails ma błędy bezpieczeństwa:" -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:50 +#: config/chroot_local-includes/usr/local/bin/tails-security-check:156 +msgid "Known security issues" +msgstr "Znane problemy bezpieczeństwa" + +#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:51 #, sh-format msgid "Network card ${nic} disabled" msgstr "Karta sieciowa ${nic} wyłączona" -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:51 +#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:52 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}) so it is temporarily disabled.\n" -"You might prefer to restart Tails and disable MAC spoofing. See the <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>." -msgstr "Zmiana adresu MAC dla karty ${nic_name} (${nic}) nie powiodła się, a zatem jest ona tymczasowo wyłączona.\nMoże będziesz wolał zrestartować Tails i wyłączyć zmianę adresu MAC. Zobacz <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>dokumentację</a>." +"You might prefer to restart Tails and disable MAC spoofing." +msgstr "Spoofing MAC dla karty sieciowej ${nic_name} (${nic}) nie udał się, a zatem jest ona tymczasowo nieaktywna. Spróbuj uruchomić system Tails ponownie i wyłączyć spoofing MAC." -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:60 +#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:61 msgid "All networking disabled" msgstr "Wszystkie połączenia wyłączone" -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:61 +#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:62 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}). The error recovery also failed so all networking is disabled.\n" -"You might prefer to restart Tails and disable MAC spoofing. See the <a href='file:///usr/share/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>." -msgstr "Zmiana adresu MAC dla karty sieciowej ${nic_name} (${nic}) nie powiodła się. Błąd jest permanentny, a zatem wszystkie połączenia są wyłączone.\nSpróbuj zrestartować Tails i wyłączyć zmianę adresu MAC. Zobacz <a href='file:///usr/share/doc/first_steps/startup_options/mac_spoofing.en.html'>dokumentację</a>." +"You might prefer to restart Tails and disable MAC spoofing." +msgstr "Spoofing MAC dla karty sieciowej ${nic_name} (${nic}) nie udał się. Próba usunięcia błędu także się nie powiodła, a zatem wszystkie połączenia sieciowe pozostają nieaktywne. Spróbuj uruchomić system Tails ponownie i wyłączyć spoofing MAC." -#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:19 +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:18 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:22 msgid "error:" msgstr "błąd:" -#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:20 +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:19 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:23 msgid "Error" msgstr "Błąd" -#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:40 +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:39 msgid "" "Not enough memory available to check for upgrades.\n" "\n" @@ -360,22 +369,31 @@ msgid "" "See https://tails.boum.org/doc/first_steps/upgrade#manual" msgstr "Nie ma wystarczającej ilości pamięci aby sprawdzić dostępność aktualizacji.\n\nUpewnij się, że system spełnia minimalne wymagania do uruchomienia Tails.\nZobacz file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nSpróbuj zrestartować Tails aby ponownie sprawdzić dostępność aktualizacji.\n\nMożesz także spróbować ręcznej aktualizacji.\nZobacz https://tails.boum.org/doc/first_steps/upgrade#manual" -#: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:53 +#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:67 msgid "Warning: virtual machine detected!" msgstr "Ostrzeżenie: wykryto maszynę wirtualną!" -#: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:55 +#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:69 msgid "" "Both the host operating system and the virtualization software are able to " "monitor what you are doing in Tails." msgstr "Zarówno system operacyjny gospodarza oraz oprogramowanie do wirtualizacji są w stanie monitorować co robisz w systemie Tails." -#: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:57 +#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:72 +msgid "Warning: non-free virtual machine detected!" +msgstr "Ostrzeżenie: wykryto niewolne oprogramowanie maszyny wirtualnej!" + +#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:74 msgid "" -"<a " -"href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html#security'>Learn" -" more...</a>" -msgstr "<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html#security'>Dowiedz się więcej...</a>" +"Both the host operating system and the virtualization software are able to " +"monitor what you are doing in Tails. Only free software can be considered " +"trustworthy, for both the host operating system and the virtualization " +"software." +msgstr "Zarówno system operacyjny hosta, jak i oprogramowanie wirtualizacji software'u są w stanie monitorować Twoją aktywność w systemie Tails. W odniesieniu do nich, wiarygodne jest wyłącznie oprogramowanie wolne." + +#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:79 +msgid "Learn more" +msgstr "Dowiedz się więcej" #: config/chroot_local-includes/usr/local/bin/tor-browser:29 msgid "Tor is not ready" @@ -399,10 +417,10 @@ msgstr "Czy jesteś pewien, że chcesz uruchomić Niebezpieczną Przeglądarkę? #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35 msgid "" -"Network activity within the Unsafe Browser is not anonymous. Only use" -" the Unsafe Browser if necessary, for example if you have to login or " +"Network activity within the Unsafe Browser is not anonymous.\\nOnly " +"use the Unsafe Browser if necessary, for example\\nif you have to login or " "register to activate your Internet connection." -msgstr "Aktywność w sieci w Niebezpiecznej Przeglądarce nie jest anonimowa. Należy używać Niebezpiecznej Przeglądarki tylko jeśli jest to konieczne, na przykład, jeśli musisz zalogować się lub zarejestrować, aby uaktywnić połączenie z Internetem." +msgstr "Aktywność sieciowa poprzez Niebezpieczną Przeglądarkę nie jest anonimowa\\nWykorzystuj Niebezpieczną Przeglądarkę tylko wtedy, gdy jest to potrzebne, na przykład podczas logowania się lub rejestrowania celem aktywacji połączenia z internetem." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:47 msgid "Starting the Unsafe Browser..." @@ -531,10 +549,6 @@ msgstr "Zrestartuj" msgid "Immediately reboot computer" msgstr "Natychmiast zrestartuj komputer" -#: ../config/chroot_local-includes/usr/share/applications/tails-shutdown.desktop.in.h:1 -msgid "Power Off" -msgstr "Wyłącz" - #: ../config/chroot_local-includes/usr/share/applications/tails-shutdown.desktop.in.h:2 msgid "Immediately shut down computer" msgstr "Natychmiast wyłącz komputer"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 16 Jan '16

16 Jan '16

commit d7f76c0b6a55477821eb4e9e53b3de3649be1412 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jan 16 21:15:51 2016 +0000 Update translations for tails-misc --- pl.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pl.po b/pl.po index ca4889b..7eb17ba 100644 --- a/pl.po +++ b/pl.po @@ -7,7 +7,7 @@ # Aron <aron.plotnikowski(a)cryptolab.net>, 2014 # Dawid <hoek(a)hoek.pl>, 2014 # Dawid <hoek(a)hoek.pl>, 2014 -# Jakub Goldberg <zenji.yamada.nihon(a)gmail.com>, 2015 +# Jakub Goldberg <zenji.yamada.nihon(a)gmail.com>, 2015-2016 # oirpos <kuba2707(a)gmail.com>, 2015 # phla47 <phla47(a)gmail.com>, 2013 # sebx, 2013-2015 @@ -16,9 +16,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-04 11:56+0100\n" -"PO-Revision-Date: 2016-01-06 09:25+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"POT-Creation-Date: 2016-01-11 21:00+0100\n" +"PO-Revision-Date: 2016-01-16 21:04+0000\n" +"Last-Translator: Jakub Goldberg <zenji.yamada.nihon(a)gmail.com>\n" "Language-Team: Polish (http://www.transifex.com/otf/torproject/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -240,14 +240,14 @@ msgstr "Inne wiadomości dostarczone przez GnuPG:" #: config/chroot_local-includes/usr/local/bin/icedove:18 msgid "The Claws Mail persistence feature is activated." -msgstr "" +msgstr "Zapis plików jest włączony dla Claws mail" #: config/chroot_local-includes/usr/local/bin/icedove:20 msgid "" "If you have emails saved in Claws Mail, you should <a " "href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate" " your data</a> before starting Icedove." -msgstr "" +msgstr "Jeśli trzymasz swoją pocztę w Claws Mail, przeprowadź <a href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrację Twoich danych do Icedove</a>, zanim go uruchomisz." #: config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-helper@tails.boum.org/extension.js:71 msgid "Restart"

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 16 Jan '16

16 Jan '16

commit 85e035a0447cc07d4a9a369c84df6d5575489a4a Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jan 16 21:15:30 2016 +0000 Update translations for tails-persistence-setup_completed --- pl/pl.po | 55 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/pl/pl.po b/pl/pl.po index db3e26e..80578ef 100644 --- a/pl/pl.po +++ b/pl/pl.po @@ -5,13 +5,13 @@ # Translators: # Aron <aron.plotnikowski(a)cryptolab.net>, 2014 # bogdrozd <bog.d(a)gazeta.pl>, 2013 -# seb, 2013-2015 +# sebx, 2013-2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2015-12-14 21:35+0100\n" -"PO-Revision-Date: 2015-12-15 09:27+0000\n" +"POT-Creation-Date: 2015-12-16 17:55+0100\n" +"PO-Revision-Date: 2016-01-16 21:04+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: Polish (http://www.transifex.com/otf/torproject/language/pl/)\n" "MIME-Version: 1.0\n" @@ -125,71 +125,71 @@ msgid "" "Symlink into $HOME every file or directory found in the `dotfiles' directory" msgstr "Zrób dowiązania w $HOME do każdego pliku lub katalogu znajdującego się w katalogu `dotfiles'" -#: ../lib/Tails/Persistence/Setup.pm:227 +#: ../lib/Tails/Persistence/Setup.pm:230 msgid "Setup Tails persistent volume" msgstr "Ustaw wolumen przechowywania danych Tails" -#: ../lib/Tails/Persistence/Setup.pm:307 ../lib/Tails/Persistence/Setup.pm:451 +#: ../lib/Tails/Persistence/Setup.pm:311 ../lib/Tails/Persistence/Setup.pm:458 msgid "Error" msgstr "Błąd" -#: ../lib/Tails/Persistence/Setup.pm:338 +#: ../lib/Tails/Persistence/Setup.pm:343 #, perl-format msgid "Device %s already has a persistent volume." msgstr "Urządzenie %s ma już wolumen przechowywania danych." -#: ../lib/Tails/Persistence/Setup.pm:346 +#: ../lib/Tails/Persistence/Setup.pm:351 #, perl-format msgid "Device %s has not enough unallocated space." msgstr "Urządzenie %s nie ma wystarczająco wolnego miejsca." -#: ../lib/Tails/Persistence/Setup.pm:354 ../lib/Tails/Persistence/Setup.pm:368 +#: ../lib/Tails/Persistence/Setup.pm:359 ../lib/Tails/Persistence/Setup.pm:373 #, perl-format msgid "Device %s has no persistent volume." msgstr "Urządzenie %s nie ma wolumenu przechowywania danych." -#: ../lib/Tails/Persistence/Setup.pm:360 +#: ../lib/Tails/Persistence/Setup.pm:365 msgid "" "Cannot delete the persistent volume while in use. You should restart Tails " "without persistence." msgstr "Nie można usunąć wolumenu przechowywania danych, gdy jest używany. Powinno się ponownie uruchomić Tails bez przechowywania danych." -#: ../lib/Tails/Persistence/Setup.pm:379 +#: ../lib/Tails/Persistence/Setup.pm:384 msgid "Persistence volume is not unlocked." msgstr "Wolumen przechowywania danych nie jest odblokowany." -#: ../lib/Tails/Persistence/Setup.pm:384 +#: ../lib/Tails/Persistence/Setup.pm:389 msgid "Persistence volume is not mounted." msgstr "Wolumen przechowywania danych nie jest zamontowany." -#: ../lib/Tails/Persistence/Setup.pm:389 +#: ../lib/Tails/Persistence/Setup.pm:394 msgid "Persistence volume is not readable. Permissions or ownership problems?" msgstr "Nie można odczytać wolumenu przechowywania danych. Problemy z uprawnieniami lub własnością?" -#: ../lib/Tails/Persistence/Setup.pm:394 +#: ../lib/Tails/Persistence/Setup.pm:399 msgid "Persistence volume is not writable. Maybe it was mounted read-only?" msgstr "Nie można zapisać wolumenu przechowywania danych. Może został zamontowany tylko do odczytu?" -#: ../lib/Tails/Persistence/Setup.pm:403 +#: ../lib/Tails/Persistence/Setup.pm:408 #, perl-format msgid "Tails is running from non-USB / non-SDIO device %s." msgstr "Tails nie jest uruchomiony z USB / karty SD %s." -#: ../lib/Tails/Persistence/Setup.pm:409 +#: ../lib/Tails/Persistence/Setup.pm:414 #, perl-format msgid "Device %s is optical." msgstr "Urządzenie %s jest napędem optycznym." -#: ../lib/Tails/Persistence/Setup.pm:416 +#: ../lib/Tails/Persistence/Setup.pm:421 #, perl-format msgid "Device %s was not created using Tails Installer." msgstr "Urządzenie %s nie zostało utworzone przy użyciu Tails Installer." -#: ../lib/Tails/Persistence/Setup.pm:676 +#: ../lib/Tails/Persistence/Setup.pm:667 msgid "Persistence wizard - Finished" msgstr "Kreator przechowywania danych - Koniec" -#: ../lib/Tails/Persistence/Setup.pm:679 +#: ../lib/Tails/Persistence/Setup.pm:670 msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n" @@ -241,32 +241,33 @@ msgstr "Hasło nie może być puste" msgid "Passphrases do not match" msgstr "Hasła nie pasują" -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:262 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:274 #: ../lib/Tails/Persistence/Step/Configure.pm:129 +#: ../lib/Tails/Persistence/Step/Delete.pm:95 msgid "Failed" msgstr "Nieudane" -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:271 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:283 msgid "Mounting Tails persistence partition." msgstr "Montowanie partycji przechowywania danych Tails." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:274 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:286 msgid "The Tails persistence partition will be mounted." msgstr "Partycja przechowywania danych Tails zostanie zamontowana." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:283 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:295 msgid "Correcting permissions of the persistent volume." msgstr "Korygowanie uprawnienia stałej objętości." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:286 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:298 msgid "The permissions of the persistent volume will be corrected." msgstr "Uprawnienia stałej objętości zostaną skorygowane." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:308 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:320 msgid "Creating..." msgstr "Tworzenie..." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:311 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:323 msgid "Creating the persistent volume..." msgstr "Tworzenie wolumenu przechowywania danych..." @@ -316,10 +317,10 @@ msgstr "Wolumen przechowywania danych %s (%s), na urządzeniu %s %s, zost msgid "Delete" msgstr "Usuń" -#: ../lib/Tails/Persistence/Step/Delete.pm:101 +#: ../lib/Tails/Persistence/Step/Delete.pm:111 msgid "Deleting..." msgstr "Usuwanie..." -#: ../lib/Tails/Persistence/Step/Delete.pm:104 +#: ../lib/Tails/Persistence/Step/Delete.pm:114 msgid "Deleting the persistent volume..." msgstr "Usuwanie wolumenu przechowywania danych..."

1 0

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

16 Jan '16

commit 75fbd2f9ca90e4d92842aa488d96572d53ed6630 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jan 16 21:15:24 2016 +0000 Update translations for tails-persistence-setup --- pl/pl.po | 55 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/pl/pl.po b/pl/pl.po index db3e26e..80578ef 100644 --- a/pl/pl.po +++ b/pl/pl.po @@ -5,13 +5,13 @@ # Translators: # Aron <aron.plotnikowski(a)cryptolab.net>, 2014 # bogdrozd <bog.d(a)gazeta.pl>, 2013 -# seb, 2013-2015 +# sebx, 2013-2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2015-12-14 21:35+0100\n" -"PO-Revision-Date: 2015-12-15 09:27+0000\n" +"POT-Creation-Date: 2015-12-16 17:55+0100\n" +"PO-Revision-Date: 2016-01-16 21:04+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: Polish (http://www.transifex.com/otf/torproject/language/pl/)\n" "MIME-Version: 1.0\n" @@ -125,71 +125,71 @@ msgid "" "Symlink into $HOME every file or directory found in the `dotfiles' directory" msgstr "Zrób dowiązania w $HOME do każdego pliku lub katalogu znajdującego się w katalogu `dotfiles'" -#: ../lib/Tails/Persistence/Setup.pm:227 +#: ../lib/Tails/Persistence/Setup.pm:230 msgid "Setup Tails persistent volume" msgstr "Ustaw wolumen przechowywania danych Tails" -#: ../lib/Tails/Persistence/Setup.pm:307 ../lib/Tails/Persistence/Setup.pm:451 +#: ../lib/Tails/Persistence/Setup.pm:311 ../lib/Tails/Persistence/Setup.pm:458 msgid "Error" msgstr "Błąd" -#: ../lib/Tails/Persistence/Setup.pm:338 +#: ../lib/Tails/Persistence/Setup.pm:343 #, perl-format msgid "Device %s already has a persistent volume." msgstr "Urządzenie %s ma już wolumen przechowywania danych." -#: ../lib/Tails/Persistence/Setup.pm:346 +#: ../lib/Tails/Persistence/Setup.pm:351 #, perl-format msgid "Device %s has not enough unallocated space." msgstr "Urządzenie %s nie ma wystarczająco wolnego miejsca." -#: ../lib/Tails/Persistence/Setup.pm:354 ../lib/Tails/Persistence/Setup.pm:368 +#: ../lib/Tails/Persistence/Setup.pm:359 ../lib/Tails/Persistence/Setup.pm:373 #, perl-format msgid "Device %s has no persistent volume." msgstr "Urządzenie %s nie ma wolumenu przechowywania danych." -#: ../lib/Tails/Persistence/Setup.pm:360 +#: ../lib/Tails/Persistence/Setup.pm:365 msgid "" "Cannot delete the persistent volume while in use. You should restart Tails " "without persistence." msgstr "Nie można usunąć wolumenu przechowywania danych, gdy jest używany. Powinno się ponownie uruchomić Tails bez przechowywania danych." -#: ../lib/Tails/Persistence/Setup.pm:379 +#: ../lib/Tails/Persistence/Setup.pm:384 msgid "Persistence volume is not unlocked." msgstr "Wolumen przechowywania danych nie jest odblokowany." -#: ../lib/Tails/Persistence/Setup.pm:384 +#: ../lib/Tails/Persistence/Setup.pm:389 msgid "Persistence volume is not mounted." msgstr "Wolumen przechowywania danych nie jest zamontowany." -#: ../lib/Tails/Persistence/Setup.pm:389 +#: ../lib/Tails/Persistence/Setup.pm:394 msgid "Persistence volume is not readable. Permissions or ownership problems?" msgstr "Nie można odczytać wolumenu przechowywania danych. Problemy z uprawnieniami lub własnością?" -#: ../lib/Tails/Persistence/Setup.pm:394 +#: ../lib/Tails/Persistence/Setup.pm:399 msgid "Persistence volume is not writable. Maybe it was mounted read-only?" msgstr "Nie można zapisać wolumenu przechowywania danych. Może został zamontowany tylko do odczytu?" -#: ../lib/Tails/Persistence/Setup.pm:403 +#: ../lib/Tails/Persistence/Setup.pm:408 #, perl-format msgid "Tails is running from non-USB / non-SDIO device %s." msgstr "Tails nie jest uruchomiony z USB / karty SD %s." -#: ../lib/Tails/Persistence/Setup.pm:409 +#: ../lib/Tails/Persistence/Setup.pm:414 #, perl-format msgid "Device %s is optical." msgstr "Urządzenie %s jest napędem optycznym." -#: ../lib/Tails/Persistence/Setup.pm:416 +#: ../lib/Tails/Persistence/Setup.pm:421 #, perl-format msgid "Device %s was not created using Tails Installer." msgstr "Urządzenie %s nie zostało utworzone przy użyciu Tails Installer." -#: ../lib/Tails/Persistence/Setup.pm:676 +#: ../lib/Tails/Persistence/Setup.pm:667 msgid "Persistence wizard - Finished" msgstr "Kreator przechowywania danych - Koniec" -#: ../lib/Tails/Persistence/Setup.pm:679 +#: ../lib/Tails/Persistence/Setup.pm:670 msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n" @@ -241,32 +241,33 @@ msgstr "Hasło nie może być puste" msgid "Passphrases do not match" msgstr "Hasła nie pasują" -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:262 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:274 #: ../lib/Tails/Persistence/Step/Configure.pm:129 +#: ../lib/Tails/Persistence/Step/Delete.pm:95 msgid "Failed" msgstr "Nieudane" -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:271 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:283 msgid "Mounting Tails persistence partition." msgstr "Montowanie partycji przechowywania danych Tails." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:274 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:286 msgid "The Tails persistence partition will be mounted." msgstr "Partycja przechowywania danych Tails zostanie zamontowana." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:283 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:295 msgid "Correcting permissions of the persistent volume." msgstr "Korygowanie uprawnienia stałej objętości." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:286 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:298 msgid "The permissions of the persistent volume will be corrected." msgstr "Uprawnienia stałej objętości zostaną skorygowane." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:308 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:320 msgid "Creating..." msgstr "Tworzenie..." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:311 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:323 msgid "Creating the persistent volume..." msgstr "Tworzenie wolumenu przechowywania danych..." @@ -316,10 +317,10 @@ msgstr "Wolumen przechowywania danych %s (%s), na urządzeniu %s %s, zost msgid "Delete" msgstr "Usuń" -#: ../lib/Tails/Persistence/Step/Delete.pm:101 +#: ../lib/Tails/Persistence/Step/Delete.pm:111 msgid "Deleting..." msgstr "Usuwanie..." -#: ../lib/Tails/Persistence/Step/Delete.pm:104 +#: ../lib/Tails/Persistence/Step/Delete.pm:114 msgid "Deleting the persistent volume..." msgstr "Usuwanie wolumenu przechowywania danych..."

1 0

[snowflake/master] Make logging in server match client (no payloads).
by dcf＠torproject.org 16 Jan '16

16 Jan '16

commit 726ad2bfb953b48bd8e0829d93a9b63f3e237bd1 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jan 16 09:37:27 2016 -0800 Make logging in server match client (no payloads). --- server/snowflake.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/server/snowflake.go b/server/snowflake.go index 30036e0..de6cc76 100644 --- a/server/snowflake.go +++ b/server/snowflake.go @@ -50,7 +50,8 @@ func (c *webRTCConn) Read(b []byte) (int, error) { } func (c *webRTCConn) Write(b []byte) (int, error) { - log.Printf("webrtc Write %d %+q", len(b), string(b)) + // log.Printf("webrtc Write %d %+q", len(b), string(b)) + log.Printf("Write %d bytes --> WebRTC", len(b)) c.dc.Send(b) return len(b), nil } @@ -104,7 +105,8 @@ func datachannelHandler(conn *webRTCConn) { pw.Close() } dc.OnMessage = func(msg []byte) { - log.Printf("OnMessage channel %d %+q", len(msg), msg) + // log.Printf("OnMessage channel %d %+q", len(msg), msg) + log.Printf("OnMessage <--- %d bytes", len(msg)) n, err := pw.Write(msg) if err != nil { pw.CloseWithError(err)

1 0

[webwml/master] add a signature on the 2014 financials
by arma＠torproject.org 16 Jan '16

16 Jan '16

commit 84c411d69d41f63325ad7429fc8c144f8650066a Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Jan 16 05:36:28 2016 -0500 add a signature on the 2014 financials (the previous files have signatures. i'm not quite sure why, but who am i to break the trend.) --- ...rProject-combined-Form990_PC_Audit_Results.pdf.asc | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/about/findoc/2014-TorProject-combined-Form990_PC_Audit_Results.pdf.asc b/about/findoc/2014-TorProject-combined-Form990_PC_Audit_Results.pdf.asc new file mode 100644 index 0000000..7804026 --- /dev/null +++ b/about/findoc/2014-TorProject-combined-Form990_PC_Audit_Results.pdf.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAABCAAGBQJWmh0eAAoJEMIYUlgZ94RRlBwP/09Wg8MBwVzDgkdhsr9q1HTO +Nw3XVoY18J7nhypjR22U+T6CEnx6CYUlDtFYkNwgWYPVrJmtg1gWVzi0ty3QuRTG +IKgpoerd5+d4fG+wUxC5SJDZ6a28fmnEivwTuN0Rs4tcVoekPmpfgxGnLVw6nHAO +vtuReyIl2yLfyG0sWpEVlMzjYS4jFTFVP/PU1HZ5XhitRqtJoPExhoc4LfGnUG4g +zPJfN/ldaWqiWAr2DC32z8ygiXeOkFlrEMa5rwDt8KLfVKtAzC7HwySIBlVcW90s +oMMnYsmRGJrN0w1tqtDIB5tcr6kNO+L7nKyvraREDpgsFdrAUJJDaOHurY/PN/7Y +Ewga5hcYH/Z1ChzvjATyLrCjK017Ea0ZISLP94+3hkmt20q3nsVEpOzcjAvy4m1S +C1hSSTR8sK3OeKvukEQryRIOTlmQ5gZZeRLp1x0QH7jXm7SqenBm/uod7Z8eNSQm +/dbTHUChthJrtUHy4hTrtw2SKFX+LH4/LRJTPUsXfhNwW+sBxt5nSCUgh4J11Mvq +exnFYVl9no1Xcn+NpLoIZheohdy0W1/5uIQTfJWEVwtbGlkrfp+6VBtqILdGuKGN +Miw8S7xU/t9gXF9mHpK7fC717TByONoCXh6gkBw0geRg4P/EaD6Fe3Jv/lb2rex7 +I9LuG/MLoj1OiTzhmivY +=Bd6v +-----END PGP SIGNATURE-----

1 0

[tor-browser/tor-browser-38.5.0esr-5.5-2] fixup! Bug 16940: After update, load local change notes.
by gk＠torproject.org 16 Jan '16

16 Jan '16

commit a46acd14e1bacdc0e3c68a29ee203ce37bd6c9a7 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Jan 15 09:16:15 2016 -0500 fixup! Bug 16940: After update, load local change notes. Fix path separator problem on Windows. This fixes bug 18064. --- browser/base/content/content.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/browser/base/content/content.js b/browser/base/content/content.js index fd87352..d1afdb9 100644 --- a/browser/base/content/content.js +++ b/browser/base/content/content.js @@ -606,7 +606,8 @@ let AboutTBUpdateListener = { let f = Cc["@mozilla.org/file/directory_service;1"] .getService(Ci.nsIProperties).get("DefProfRt", Ci.nsIFile); f = f.parent.parent; // Remove "Data/Browser" - f.appendRelativePath("Docs/ChangeLog.txt"); + f.append("Docs"); + f.append("ChangeLog.txt"); let fs = Cc["@mozilla.org/network/file-input-stream;1"] .createInstance(Ci.nsIFileInputStream);

1 0

[tor-browser-bundle/hardened-builds] Bug 17428: Removing Flashproxy from Tor Browser
by gk＠torproject.org 16 Jan '16

16 Jan '16

commit 4ebec5b9feaae342ed53c70005c6946c96fa0fe1 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 14 15:16:01 2016 +0000 Bug 17428: Removing Flashproxy from Tor Browser Remove M2crypto as well as this was only used by Flashproxy. --- .../PTConfigs/linux/torrc-defaults-appendix | 7 ----- Bundle-Data/PTConfigs/mac/torrc-defaults-appendix | 7 ----- .../PTConfigs/windows/torrc-defaults-appendix | 7 ----- .../linux/gitian-pluggable-transports.yml | 21 --------------- .../mac/gitian-pluggable-transports.yml | 27 -------------------- .../windows/gitian-pluggable-transports.yml | 26 ------------------- gitian/fetch-inputs.sh | 10 +++----- gitian/mkbundle-linux.sh | 3 +-- gitian/mkbundle-mac.sh | 3 +-- gitian/mkbundle-windows.sh | 3 +-- gitian/verify-tags.sh | 9 +++---- gitian/versions.alpha | 5 ---- gitian/versions.nightly | 5 ---- 13 files changed, 11 insertions(+), 122 deletions(-) diff --git a/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix b/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix index d0885ff..c79efde 100644 --- a/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix +++ b/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix @@ -4,12 +4,5 @@ ClientTransportPlugin fte exec ./TorBrowser/Tor/PluggableTransports/fteproxy.bin ## obfs4proxy configuration ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec ./TorBrowser/Tor/PluggableTransports/obfs4proxy -## flash proxy configuration -# -# Change the second number here (9000) to the number of a port that can -# receive connections from the Internet (the port for which you -# configured port forwarding). -ClientTransportPlugin flashproxy exec ./TorBrowser/Tor/PluggableTransports/flashproxy-client --register :0 :9000 - ## meek configuration ClientTransportPlugin meek exec ./TorBrowser/Tor/PluggableTransports/meek-client-torbrowser -- ./TorBrowser/Tor/PluggableTransports/meek-client diff --git a/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix b/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix index 0dee29b..f5eb5e4 100644 --- a/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix +++ b/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix @@ -4,12 +4,5 @@ ClientTransportPlugin fte exec PluggableTransports/fteproxy.bin --managed ## obfs4proxy configuration ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec PluggableTransports/obfs4proxy -## flash proxy configuration -# -# Change the second number here (9000) to the number of a port that can -# receive connections from the Internet (the port for which you -# configured port forwarding). -ClientTransportPlugin flashproxy exec PluggableTransports/flashproxy-client --register :0 :9000 - ## meek configuration ClientTransportPlugin meek exec PluggableTransports/meek-client-torbrowser -- PluggableTransports/meek-client diff --git a/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix b/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix index ad1eb07..2c1b636 100644 --- a/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix +++ b/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix @@ -4,12 +4,5 @@ ClientTransportPlugin fte exec TorBrowser\Tor\PluggableTransports\fteproxy --man ## obfs4proxy configuration ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec TorBrowser\Tor\PluggableTransports\obfs4proxy -## flash proxy configuration -# -# Change the second number here (9000) to the number of a port that can -# receive connections from the Internet (the port for which you -# configured port forwarding). -ClientTransportPlugin flashproxy exec TorBrowser\Tor\PluggableTransports\flashproxy-client --register :0 :9000 - ## meek configuration ClientTransportPlugin meek exec TorBrowser\Tor\PluggableTransports\terminateprocess-buffer TorBrowser\Tor\PluggableTransports\meek-client-torbrowser -- TorBrowser\Tor\PluggableTransports\meek-client diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index d9b8338..25b5a1b 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -19,8 +19,6 @@ remotes: "dir": "pyptlib" - "url": "https://git.torproject.org/pluggable-transports/obfsproxy.git" "dir": "obfsproxy" -- "url": "https://git.torproject.org/flashproxy.git" - "dir": "flashproxy" - "url": "https://github.com/kpdyer/libfte.git" "dir": "libfte" - "url": "https://github.com/kpdyer/fteproxy.git" @@ -47,7 +45,6 @@ files: - "pyyaml.tar.gz" - "zope.interface.zip" - "twisted.tar.bz2" -- "m2crypto.tar.gz" - "parsley.tar.gz" - "go.tar.gz" - "dzip.sh" @@ -164,24 +161,6 @@ script: | cp -a {LICENSE,README} $INSTDIR/Docs/Obfsproxy cd .. - # Building M2Crypto - tar xzf m2crypto.tar.gz - cd M2Crypto-* - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - $PYTHON setup.py build_ext --build-lib build --openssl $INSTDIR/openssl - $PYTHON setup.py build --build-lib build - cp -a build/M2Crypto $PTDIR/ - cd .. - - # Building flashproxy - cd flashproxy - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - make dist DISTNAME=flashproxy-client - cp -a dist/flashproxy-client/{flashproxy,flashproxy-client,flashproxy-reg-appspot,flashproxy-reg-email,flashproxy-reg-http,flashproxy-reg-url} $PTDIR/ - mkdir -p $INSTDIR/Docs/FlashProxy - cp -a {doc/*,README,LICENSE,ChangeLog} $INSTDIR/Docs/FlashProxy - cd .. - # Building libfte cd libfte ln -s $INSTDIR/gmp thirdparty/gmp diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index d483462..fd62919 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -18,8 +18,6 @@ remotes: "dir": "pyptlib" - "url": "https://git.torproject.org/pluggable-transports/obfsproxy.git" "dir": "obfsproxy" -- "url": "https://git.torproject.org/flashproxy.git" - "dir": "flashproxy" - "url": "https://github.com/kpdyer/libfte.git" "dir": "libfte" - "url": "https://github.com/kpdyer/fteproxy.git" @@ -46,7 +44,6 @@ files: - "pyyaml.tar.gz" - "zope.interface.zip" - "twisted.tar.bz2" -- "m2crypto.tar.gz" - "parsley.tar.gz" - "go.tar.gz" - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" @@ -188,30 +185,6 @@ script: | sed 's/python2/python/' -i $PTDIR/obfsproxy.bin cd .. - # Building M2Crypto - tar xzf m2crypto.tar.gz - cd M2Crypto-* - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - # We have to put $INSTDIR/openssl at the beginning of the header and library - # search paths (build_ext otherwise puts it at the end, after CFLAGS and - # LDFLAGS). The reason for this is that /usr/lib/apple/SDKs/MacOSX10.6.sdk/usr - # (part of CFLAGS and LDFLAGS) has its own openssl headers and library files. - # It also has necessary headers like stdio.h, so we can't remove it - # completely, but our locally built openssl must take precedence. - CFLAGS="-I$INSTDIR/openssl/include $CFLAGS" LDFLAGS="-L$INSTDIR/openssl/lib $LDFLAGS" LDSHARED="$LDSHARED -framework Python" python setup.py build_ext --build-lib build --openssl $INSTDIR/openssl -I/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/Python.framework/Headers $SDK_INCLUDES - python setup.py build --build-lib build - cp -a build/M2Crypto $PTDIR/ - cd .. - - # Building flashproxy - cd flashproxy - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - make dist DISTNAME=flashproxy-client - cp -a dist/flashproxy-client/{flashproxy,flashproxy-client,flashproxy-reg-appspot,flashproxy-reg-email,flashproxy-reg-http,flashproxy-reg-url} $PTDIR/ - mkdir -p $TBDIR/Docs/FlashProxy - cp -a {doc/*,README,LICENSE,ChangeLog} $TBDIR/Docs/FlashProxy - cd .. - # Building libfte cd libfte find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index 1d8caba..9c1642d 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -8,8 +8,6 @@ packages: - "faketime" - "unzip" - "p7zip-full" -# Needed by M2Crypto -- "swig" - "zip" reference_datetime: "2000-01-01 00:00:00" remotes: @@ -17,8 +15,6 @@ remotes: "dir": "pyptlib" - "url": "https://git.torproject.org/pluggable-transports/obfsproxy.git" "dir": "obfsproxy" -- "url": "https://git.torproject.org/flashproxy.git" - "dir": "flashproxy" - "url": "https://github.com/kpdyer/libfte.git" "dir": "libfte" - "url": "https://github.com/kpdyer/fteproxy.git" @@ -46,7 +42,6 @@ files: - "pyyaml.tar.gz" - "zope.interface.zip" - "twisted.tar.bz2" -- "m2crypto.tar.gz" - "parsley.tar.gz" - "ubuntu-wine.gpg" - "wine-wrappers" @@ -260,27 +255,6 @@ script: | cp {LICENSE,README} $INSTDIR/Docs/Obfsproxy cd .. - # Building M2Crypto - tar xzf m2crypto.tar.gz - cd M2Crypto-* - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - LD_PRELOAD= $INSTPYTHON setup.py build_ext -c mingw32 --openssl $INSTDIR/openssl/ -lssl.dll,crypto.dll - LD_PRELOAD= $INSTPYTHON setup.py install --single-version-externally-managed --record /dev/null - cd .. - # py2exe byte-compiles to .pyc files, which embed the mtime of the parent .py - # file. - find $INSTDIR/python -type f | xargs touch --date="$REFERENCE_DATETIME" - - # Building flashproxy - cd flashproxy - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - make dist-exe DISTNAME=flashproxy-client PYTHON="LD_PRELOAD= $INSTPYTHON" - py2exe_zip_timestomp dist/flashproxy-client-win32/py2exe-flashproxy.zip - cp -an dist/flashproxy-client-win32/{*.pyd,*.exe,*.zip} $PTDIR/ - mkdir -p $INSTDIR/Docs/FlashProxy - cp dist/flashproxy-client-win32/{doc/*,README,LICENSE,ChangeLog} $INSTDIR/Docs/FlashProxy - cd .. - # Building libfte cd libfte ln -s $INSTDIR/gmp thirdparty/gmp diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 9252aea..206023b 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -112,12 +112,12 @@ update_git() { ############################################################################## # Get+verify sigs that exist -for i in OPENSSL BINUTILS GCC PYTHON PYCRYPTO M2CRYPTO PYTHON_MSI GMP LXML +for i in OPENSSL BINUTILS GCC PYTHON PYCRYPTO PYTHON_MSI GMP LXML do PACKAGE="${i}_PACKAGE" URL="${i}_URL" - if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" -o "${i}" == "M2CRYPTO" -o \ - "${i}" == "PYTHON_MSI" -o "${i}" == "LXML" -o "${i}" == "OPENSSL" ]; then + if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" -o "${i}" == "PYTHON_MSI" -o \ + "${i}" == "LXML" -o "${i}" == "OPENSSL" ]; then SUFFIX="asc" else SUFFIX="sig" @@ -167,7 +167,7 @@ wget -U "" -N ${NOSCRIPT_URL} # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK + OSXSDK_OLD are not signed at all) -for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC NOTOCJKFONT STIXMATHFONT +for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC NOTOCJKFONT STIXMATHFONT do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" @@ -233,7 +233,6 @@ ln -sf "$ARGPARSE_PACKAGE" argparse.tar.gz ln -sf "$PYYAML_PACKAGE" pyyaml.tar.gz ln -sf "$ZOPEINTERFACE_PACKAGE" zope.interface.zip ln -sf "$TWISTED_PACKAGE" twisted.tar.bz2 -ln -sf "$M2CRYPTO_PACKAGE" m2crypto.tar.gz ln -sf "$PY2EXE_PACKAGE" py2exe.exe ln -sf "$SETUPTOOLS_PACKAGE" setuptools.tar.gz ln -sf "$GMP_PACKAGE" gmp.tar.bz2 @@ -265,7 +264,6 @@ tor-browser https://git.torproject.org/tor-browser.git $TORBR mingw-w64-git http://git.code.sf.net/p/mingw-w64/mingw-w64 $MINGW_TAG pyptlib https://git.torproject.org/pluggable-transports/pyptlib.git $PYPTLIB_TAG obfsproxy https://git.torproject.org/pluggable-transports/obfsproxy.git $OBFSPROXY_TAG -flashproxy https://git.torproject.org/flashproxy.git $FLASHPROXY_TAG libfte https://github.com/kpdyer/libfte.git $LIBFTE_TAG fteproxy https://github.com/kpdyer/fteproxy.git $FTEPROXY_TAG libdmg-hfsplus https://github.com/vasi/libdmg-hfsplus.git $LIBDMG_TAG diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 64a0fd4..5fa3966 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -95,7 +95,6 @@ then LIBEVENT_TAG=refs/tags/$LIBEVENT_TAG PYPTLIB_TAG=refs/tags/$PYPTLIB_TAG OBFSPROXY_TAG=refs/tags/$OBFSPROXY_TAG - FLASHPROXY_TAG=refs/tags/$FLASHPROXY_TAG OBFS4_TAG=refs/tags/$OBFS4_TAG fi @@ -199,7 +198,7 @@ then echo "****** Starting Pluggable Transports Component of Linux Bundle (4/5 for Linux) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,goxnet=$GO_X_NET_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,goxnet=$GO_X_NET_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./pluggable-transports-fail-linux.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 670d152..39dac5f 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -100,7 +100,6 @@ then LIBEVENT_TAG=refs/tags/$LIBEVENT_TAG PYPTLIB_TAG=refs/tags/$PYPTLIB_TAG OBFSPROXY_TAG=refs/tags/$OBFSPROXY_TAG - FLASHPROXY_TAG=refs/tags/$FLASHPROXY_TAG OBFS4_TAG=refs/tags/$OBFS4_TAG fi @@ -193,7 +192,7 @@ then echo "****** Starting Pluggable Transports Component of Mac Bundle (4/5 for Mac) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,goxnet=$GO_X_NET_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,goxnet=$GO_X_NET_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./firefox-fail-mac.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 6aeec8a..2de0f1e 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -94,7 +94,6 @@ then LIBEVENT_TAG=refs/tags/$LIBEVENT_TAG PYPTLIB_TAG=refs/tags/$PYPTLIB_TAG OBFSPROXY_TAG=refs/tags/$OBFSPROXY_TAG - FLASHPROXY_TAG=refs/tags/$FLASHPROXY_TAG OBFS4_TAG=refs/tags/$OBFS4_TAG fi @@ -198,7 +197,7 @@ then echo "****** Starting Pluggable Transports Component of Windows Bundle (4/5 for Windows) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,goxnet=$GO_X_NET_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,goxnet=$GO_X_NET_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./pluggable-transports-fail-win32.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index a1ce6a1..82a810a 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -98,7 +98,6 @@ libevent libevent.gpg $LIBEVENT_TAG tor tor.gpg $TOR_TAG pyptlib pyptlib.gpg $PYPTLIB_TAG obfsproxy obfsproxy.gpg $OBFSPROXY_TAG -flashproxy flashproxy.gpg $FLASHPROXY_TAG goptlib goptlib.gpg $GOPTLIB_TAG meek meek.gpg $MEEK_TAG obfs4 obfs4proxy.gpg $OBFS4_TAG @@ -122,12 +121,12 @@ noto-fonts $NOTOFONTS_TAG EOF # Verify signatures on signed packages -for i in OPENSSL BINUTILS GCC PYTHON PYCRYPTO M2CRYPTO PYTHON_MSI GMP LXML +for i in OPENSSL BINUTILS GCC PYTHON PYCRYPTO PYTHON_MSI GMP LXML do PACKAGE="${i}_PACKAGE" URL="${i}_URL" - if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" -o "${i}" == "M2CRYPTO" -o \ - "${i}" == "PYTHON_MSI" -o "${i}" == "LXML" -o "${i}" == "OPENSSL" ]; then + if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" -o "${i}" == "PYTHON_MSI" -o \ + "${i}" == "LXML" -o "${i}" == "OPENSSL" ]; then SUFFIX="asc" else SUFFIX="sig" @@ -142,7 +141,7 @@ done # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK + OSXSDK_OLD are not signed at all) -for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC NOTOCJKFONT STIXMATHFONT +for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC NOTOCJKFONT STIXMATHFONT do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 22eb8df..fd03b8b 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -26,7 +26,6 @@ LIBEVENT_TAG=release-2.0.22-stable MINGW_TAG=a883b47a45ff74ced41dfbd9f748d5c2c61f3c01 # due to bug 1156131 PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.12 -FLASHPROXY_TAG=1.6 LIBFTE_TAG=85ef8ae58dbf0d02ea26b627e343784b5574c428 # sketch master with fix FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 @@ -55,7 +54,6 @@ ARGPARSE_VER=1.2.1 PYYAML_VER=3.11 ZOPEINTERFACE_VER=4.0.5 TWISTED_VER=13.2.0 -M2CRYPTO_VER=0.21.1 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 @@ -81,7 +79,6 @@ ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz PYYAML_PACKAGE=PyYAML-${PYYAML_VER}.tar.gz ZOPEINTERFACE_PACKAGE=zope.interface-${ZOPEINTERFACE_VER}.zip TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 -M2CRYPTO_PACKAGE=M2Crypto-${M2CRYPTO_VER}.tar.gz PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz LXML_PACKAGE=lxml-${LXML_VER}.tar.gz @@ -104,7 +101,6 @@ ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 PYYAML_HASH=c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b0846e8 ZOPEINTERFACE_HASH=1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc TWISTED_HASH=095175638c019ac7c0604f4c291724a16ff1acd062e181b01293bf4dcbc62cf3 -M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 @@ -130,7 +126,6 @@ PYYAML_URL=https://pypi.python.org/packages/source/P/PyYAML/${PYYAML_PACKAG… ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/… TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE} -M2CRYPTO_URL=https://pypi.python.org/packages/source/M/M2Crypto/${M2CRYPTO_PACKAGE} PY2EXE_URL=http://liquidtelecom.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} diff --git a/gitian/versions.nightly b/gitian/versions.nightly index a5407a6..d209c6a 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -29,7 +29,6 @@ LIBEVENT_TAG=release-2.0.22-stable MINGW_TAG=a883b47a45ff74ced41dfbd9f748d5c2c61f3c01 # due to bug 1156131 PYPTLIB_TAG=master OBFSPROXY_TAG=master -FLASHPROXY_TAG=master LIBFTE_TAG=master FTEPROXY_TAG=master LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 @@ -58,7 +57,6 @@ ARGPARSE_VER=1.2.1 PYYAML_VER=3.11 ZOPEINTERFACE_VER=4.0.5 TWISTED_VER=13.2.0 -M2CRYPTO_VER=0.21.1 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 @@ -84,7 +82,6 @@ ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz PYYAML_PACKAGE=PyYAML-${PYYAML_VER}.tar.gz ZOPEINTERFACE_PACKAGE=zope.interface-${ZOPEINTERFACE_VER}.zip TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 -M2CRYPTO_PACKAGE=M2Crypto-${M2CRYPTO_VER}.tar.gz PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz LXML_PACKAGE=lxml-${LXML_VER}.tar.gz @@ -107,7 +104,6 @@ ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 PYYAML_HASH=c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b0846e8 ZOPEINTERFACE_HASH=1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc TWISTED_HASH=095175638c019ac7c0604f4c291724a16ff1acd062e181b01293bf4dcbc62cf3 -M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 @@ -133,7 +129,6 @@ PYYAML_URL=https://pypi.python.org/packages/source/P/PyYAML/${PYYAML_PACKAG… ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/… TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE} -M2CRYPTO_URL=https://pypi.python.org/packages/source/M/M2Crypto/${M2CRYPTO_PACKAGE} PY2EXE_URL=http://liquidtelecom.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE}

1 0

[tor-browser-bundle/master] Bug 17428: Removing Flashproxy from Tor Browser
by gk＠torproject.org 16 Jan '16

16 Jan '16

commit 969136e13861c1cc6d983a66a82736a1fae971c3 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 14 15:16:01 2016 +0000 Bug 17428: Removing Flashproxy from Tor Browser Remove M2crypto as well as this was only used by Flashproxy. --- .../PTConfigs/linux/torrc-defaults-appendix | 7 ----- Bundle-Data/PTConfigs/mac/torrc-defaults-appendix | 7 ----- .../PTConfigs/windows/torrc-defaults-appendix | 7 ----- .../linux/gitian-pluggable-transports.yml | 21 --------------- .../mac/gitian-pluggable-transports.yml | 27 -------------------- .../windows/gitian-pluggable-transports.yml | 26 ------------------- gitian/fetch-inputs.sh | 10 +++----- gitian/mkbundle-linux.sh | 3 +-- gitian/mkbundle-mac.sh | 3 +-- gitian/mkbundle-windows.sh | 3 +-- gitian/verify-tags.sh | 9 +++---- gitian/versions.alpha | 5 ---- gitian/versions.nightly | 5 ---- 13 files changed, 11 insertions(+), 122 deletions(-) diff --git a/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix b/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix index d0885ff..c79efde 100644 --- a/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix +++ b/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix @@ -4,12 +4,5 @@ ClientTransportPlugin fte exec ./TorBrowser/Tor/PluggableTransports/fteproxy.bin ## obfs4proxy configuration ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec ./TorBrowser/Tor/PluggableTransports/obfs4proxy -## flash proxy configuration -# -# Change the second number here (9000) to the number of a port that can -# receive connections from the Internet (the port for which you -# configured port forwarding). -ClientTransportPlugin flashproxy exec ./TorBrowser/Tor/PluggableTransports/flashproxy-client --register :0 :9000 - ## meek configuration ClientTransportPlugin meek exec ./TorBrowser/Tor/PluggableTransports/meek-client-torbrowser -- ./TorBrowser/Tor/PluggableTransports/meek-client diff --git a/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix b/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix index 0dee29b..f5eb5e4 100644 --- a/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix +++ b/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix @@ -4,12 +4,5 @@ ClientTransportPlugin fte exec PluggableTransports/fteproxy.bin --managed ## obfs4proxy configuration ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec PluggableTransports/obfs4proxy -## flash proxy configuration -# -# Change the second number here (9000) to the number of a port that can -# receive connections from the Internet (the port for which you -# configured port forwarding). -ClientTransportPlugin flashproxy exec PluggableTransports/flashproxy-client --register :0 :9000 - ## meek configuration ClientTransportPlugin meek exec PluggableTransports/meek-client-torbrowser -- PluggableTransports/meek-client diff --git a/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix b/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix index ad1eb07..2c1b636 100644 --- a/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix +++ b/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix @@ -4,12 +4,5 @@ ClientTransportPlugin fte exec TorBrowser\Tor\PluggableTransports\fteproxy --man ## obfs4proxy configuration ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec TorBrowser\Tor\PluggableTransports\obfs4proxy -## flash proxy configuration -# -# Change the second number here (9000) to the number of a port that can -# receive connections from the Internet (the port for which you -# configured port forwarding). -ClientTransportPlugin flashproxy exec TorBrowser\Tor\PluggableTransports\flashproxy-client --register :0 :9000 - ## meek configuration ClientTransportPlugin meek exec TorBrowser\Tor\PluggableTransports\terminateprocess-buffer TorBrowser\Tor\PluggableTransports\meek-client-torbrowser -- TorBrowser\Tor\PluggableTransports\meek-client diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index 0f123ff..31deebb 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -20,8 +20,6 @@ remotes: "dir": "pyptlib" - "url": "https://git.torproject.org/pluggable-transports/obfsproxy.git" "dir": "obfsproxy" -- "url": "https://git.torproject.org/flashproxy.git" - "dir": "flashproxy" - "url": "https://github.com/kpdyer/libfte.git" "dir": "libfte" - "url": "https://github.com/kpdyer/fteproxy.git" @@ -48,7 +46,6 @@ files: - "pyyaml.tar.gz" - "zope.interface.zip" - "twisted.tar.bz2" -- "m2crypto.tar.gz" - "parsley.tar.gz" - "go.tar.gz" - "dzip.sh" @@ -167,24 +164,6 @@ script: | cp -a {LICENSE,README} $INSTDIR/Docs/Obfsproxy cd .. - # Building M2Crypto - tar xzf m2crypto.tar.gz - cd M2Crypto-* - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - $PYTHON setup.py build_ext --build-lib build --openssl $INSTDIR/openssl - $PYTHON setup.py build --build-lib build - cp -a build/M2Crypto $PTDIR/ - cd .. - - # Building flashproxy - cd flashproxy - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - make dist DISTNAME=flashproxy-client - cp -a dist/flashproxy-client/{flashproxy,flashproxy-client,flashproxy-reg-appspot,flashproxy-reg-email,flashproxy-reg-http,flashproxy-reg-url} $PTDIR/ - mkdir -p $INSTDIR/Docs/FlashProxy - cp -a {doc/*,README,LICENSE,ChangeLog} $INSTDIR/Docs/FlashProxy - cd .. - # Building libfte cd libfte ln -s $INSTDIR/gmp thirdparty/gmp diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index d483462..fd62919 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -18,8 +18,6 @@ remotes: "dir": "pyptlib" - "url": "https://git.torproject.org/pluggable-transports/obfsproxy.git" "dir": "obfsproxy" -- "url": "https://git.torproject.org/flashproxy.git" - "dir": "flashproxy" - "url": "https://github.com/kpdyer/libfte.git" "dir": "libfte" - "url": "https://github.com/kpdyer/fteproxy.git" @@ -46,7 +44,6 @@ files: - "pyyaml.tar.gz" - "zope.interface.zip" - "twisted.tar.bz2" -- "m2crypto.tar.gz" - "parsley.tar.gz" - "go.tar.gz" - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" @@ -188,30 +185,6 @@ script: | sed 's/python2/python/' -i $PTDIR/obfsproxy.bin cd .. - # Building M2Crypto - tar xzf m2crypto.tar.gz - cd M2Crypto-* - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - # We have to put $INSTDIR/openssl at the beginning of the header and library - # search paths (build_ext otherwise puts it at the end, after CFLAGS and - # LDFLAGS). The reason for this is that /usr/lib/apple/SDKs/MacOSX10.6.sdk/usr - # (part of CFLAGS and LDFLAGS) has its own openssl headers and library files. - # It also has necessary headers like stdio.h, so we can't remove it - # completely, but our locally built openssl must take precedence. - CFLAGS="-I$INSTDIR/openssl/include $CFLAGS" LDFLAGS="-L$INSTDIR/openssl/lib $LDFLAGS" LDSHARED="$LDSHARED -framework Python" python setup.py build_ext --build-lib build --openssl $INSTDIR/openssl -I/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/Python.framework/Headers $SDK_INCLUDES - python setup.py build --build-lib build - cp -a build/M2Crypto $PTDIR/ - cd .. - - # Building flashproxy - cd flashproxy - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - make dist DISTNAME=flashproxy-client - cp -a dist/flashproxy-client/{flashproxy,flashproxy-client,flashproxy-reg-appspot,flashproxy-reg-email,flashproxy-reg-http,flashproxy-reg-url} $PTDIR/ - mkdir -p $TBDIR/Docs/FlashProxy - cp -a {doc/*,README,LICENSE,ChangeLog} $TBDIR/Docs/FlashProxy - cd .. - # Building libfte cd libfte find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index 1d8caba..9c1642d 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -8,8 +8,6 @@ packages: - "faketime" - "unzip" - "p7zip-full" -# Needed by M2Crypto -- "swig" - "zip" reference_datetime: "2000-01-01 00:00:00" remotes: @@ -17,8 +15,6 @@ remotes: "dir": "pyptlib" - "url": "https://git.torproject.org/pluggable-transports/obfsproxy.git" "dir": "obfsproxy" -- "url": "https://git.torproject.org/flashproxy.git" - "dir": "flashproxy" - "url": "https://github.com/kpdyer/libfte.git" "dir": "libfte" - "url": "https://github.com/kpdyer/fteproxy.git" @@ -46,7 +42,6 @@ files: - "pyyaml.tar.gz" - "zope.interface.zip" - "twisted.tar.bz2" -- "m2crypto.tar.gz" - "parsley.tar.gz" - "ubuntu-wine.gpg" - "wine-wrappers" @@ -260,27 +255,6 @@ script: | cp {LICENSE,README} $INSTDIR/Docs/Obfsproxy cd .. - # Building M2Crypto - tar xzf m2crypto.tar.gz - cd M2Crypto-* - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - LD_PRELOAD= $INSTPYTHON setup.py build_ext -c mingw32 --openssl $INSTDIR/openssl/ -lssl.dll,crypto.dll - LD_PRELOAD= $INSTPYTHON setup.py install --single-version-externally-managed --record /dev/null - cd .. - # py2exe byte-compiles to .pyc files, which embed the mtime of the parent .py - # file. - find $INSTDIR/python -type f | xargs touch --date="$REFERENCE_DATETIME" - - # Building flashproxy - cd flashproxy - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - make dist-exe DISTNAME=flashproxy-client PYTHON="LD_PRELOAD= $INSTPYTHON" - py2exe_zip_timestomp dist/flashproxy-client-win32/py2exe-flashproxy.zip - cp -an dist/flashproxy-client-win32/{*.pyd,*.exe,*.zip} $PTDIR/ - mkdir -p $INSTDIR/Docs/FlashProxy - cp dist/flashproxy-client-win32/{doc/*,README,LICENSE,ChangeLog} $INSTDIR/Docs/FlashProxy - cd .. - # Building libfte cd libfte ln -s $INSTDIR/gmp thirdparty/gmp diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 9252aea..206023b 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -112,12 +112,12 @@ update_git() { ############################################################################## # Get+verify sigs that exist -for i in OPENSSL BINUTILS GCC PYTHON PYCRYPTO M2CRYPTO PYTHON_MSI GMP LXML +for i in OPENSSL BINUTILS GCC PYTHON PYCRYPTO PYTHON_MSI GMP LXML do PACKAGE="${i}_PACKAGE" URL="${i}_URL" - if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" -o "${i}" == "M2CRYPTO" -o \ - "${i}" == "PYTHON_MSI" -o "${i}" == "LXML" -o "${i}" == "OPENSSL" ]; then + if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" -o "${i}" == "PYTHON_MSI" -o \ + "${i}" == "LXML" -o "${i}" == "OPENSSL" ]; then SUFFIX="asc" else SUFFIX="sig" @@ -167,7 +167,7 @@ wget -U "" -N ${NOSCRIPT_URL} # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK + OSXSDK_OLD are not signed at all) -for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC NOTOCJKFONT STIXMATHFONT +for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC NOTOCJKFONT STIXMATHFONT do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" @@ -233,7 +233,6 @@ ln -sf "$ARGPARSE_PACKAGE" argparse.tar.gz ln -sf "$PYYAML_PACKAGE" pyyaml.tar.gz ln -sf "$ZOPEINTERFACE_PACKAGE" zope.interface.zip ln -sf "$TWISTED_PACKAGE" twisted.tar.bz2 -ln -sf "$M2CRYPTO_PACKAGE" m2crypto.tar.gz ln -sf "$PY2EXE_PACKAGE" py2exe.exe ln -sf "$SETUPTOOLS_PACKAGE" setuptools.tar.gz ln -sf "$GMP_PACKAGE" gmp.tar.bz2 @@ -265,7 +264,6 @@ tor-browser https://git.torproject.org/tor-browser.git $TORBR mingw-w64-git http://git.code.sf.net/p/mingw-w64/mingw-w64 $MINGW_TAG pyptlib https://git.torproject.org/pluggable-transports/pyptlib.git $PYPTLIB_TAG obfsproxy https://git.torproject.org/pluggable-transports/obfsproxy.git $OBFSPROXY_TAG -flashproxy https://git.torproject.org/flashproxy.git $FLASHPROXY_TAG libfte https://github.com/kpdyer/libfte.git $LIBFTE_TAG fteproxy https://github.com/kpdyer/fteproxy.git $FTEPROXY_TAG libdmg-hfsplus https://github.com/vasi/libdmg-hfsplus.git $LIBDMG_TAG diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 7e84cb9..0c70732 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -95,7 +95,6 @@ then LIBEVENT_TAG=refs/tags/$LIBEVENT_TAG PYPTLIB_TAG=refs/tags/$PYPTLIB_TAG OBFSPROXY_TAG=refs/tags/$OBFSPROXY_TAG - FLASHPROXY_TAG=refs/tags/$FLASHPROXY_TAG OBFS4_TAG=refs/tags/$OBFS4_TAG fi @@ -224,7 +223,7 @@ then echo "****** Starting Pluggable Transports Component of Linux Bundle (4/5 for Linux) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,goxnet=$GO_X_NET_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,goxnet=$GO_X_NET_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./pluggable-transports-fail-linux.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 670d152..39dac5f 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -100,7 +100,6 @@ then LIBEVENT_TAG=refs/tags/$LIBEVENT_TAG PYPTLIB_TAG=refs/tags/$PYPTLIB_TAG OBFSPROXY_TAG=refs/tags/$OBFSPROXY_TAG - FLASHPROXY_TAG=refs/tags/$FLASHPROXY_TAG OBFS4_TAG=refs/tags/$OBFS4_TAG fi @@ -193,7 +192,7 @@ then echo "****** Starting Pluggable Transports Component of Mac Bundle (4/5 for Mac) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,goxnet=$GO_X_NET_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,goxnet=$GO_X_NET_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./firefox-fail-mac.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 6aeec8a..2de0f1e 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -94,7 +94,6 @@ then LIBEVENT_TAG=refs/tags/$LIBEVENT_TAG PYPTLIB_TAG=refs/tags/$PYPTLIB_TAG OBFSPROXY_TAG=refs/tags/$OBFSPROXY_TAG - FLASHPROXY_TAG=refs/tags/$FLASHPROXY_TAG OBFS4_TAG=refs/tags/$OBFS4_TAG fi @@ -198,7 +197,7 @@ then echo "****** Starting Pluggable Transports Component of Windows Bundle (4/5 for Windows) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,goxnet=$GO_X_NET_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,goxnet=$GO_X_NET_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./pluggable-transports-fail-win32.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index a1ce6a1..82a810a 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -98,7 +98,6 @@ libevent libevent.gpg $LIBEVENT_TAG tor tor.gpg $TOR_TAG pyptlib pyptlib.gpg $PYPTLIB_TAG obfsproxy obfsproxy.gpg $OBFSPROXY_TAG -flashproxy flashproxy.gpg $FLASHPROXY_TAG goptlib goptlib.gpg $GOPTLIB_TAG meek meek.gpg $MEEK_TAG obfs4 obfs4proxy.gpg $OBFS4_TAG @@ -122,12 +121,12 @@ noto-fonts $NOTOFONTS_TAG EOF # Verify signatures on signed packages -for i in OPENSSL BINUTILS GCC PYTHON PYCRYPTO M2CRYPTO PYTHON_MSI GMP LXML +for i in OPENSSL BINUTILS GCC PYTHON PYCRYPTO PYTHON_MSI GMP LXML do PACKAGE="${i}_PACKAGE" URL="${i}_URL" - if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" -o "${i}" == "M2CRYPTO" -o \ - "${i}" == "PYTHON_MSI" -o "${i}" == "LXML" -o "${i}" == "OPENSSL" ]; then + if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" -o "${i}" == "PYTHON_MSI" -o \ + "${i}" == "LXML" -o "${i}" == "OPENSSL" ]; then SUFFIX="asc" else SUFFIX="sig" @@ -142,7 +141,7 @@ done # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK + OSXSDK_OLD are not signed at all) -for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC NOTOCJKFONT STIXMATHFONT +for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC NOTOCJKFONT STIXMATHFONT do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 149b765..95ca078 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -22,7 +22,6 @@ LIBEVENT_TAG=release-2.0.22-stable MINGW_TAG=a883b47a45ff74ced41dfbd9f748d5c2c61f3c01 # due to bug 1156131 PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.12 -FLASHPROXY_TAG=1.6 LIBFTE_TAG=85ef8ae58dbf0d02ea26b627e343784b5574c428 # sketch master with fix FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 @@ -51,7 +50,6 @@ ARGPARSE_VER=1.2.1 PYYAML_VER=3.11 ZOPEINTERFACE_VER=4.0.5 TWISTED_VER=13.2.0 -M2CRYPTO_VER=0.21.1 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 @@ -77,7 +75,6 @@ ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz PYYAML_PACKAGE=PyYAML-${PYYAML_VER}.tar.gz ZOPEINTERFACE_PACKAGE=zope.interface-${ZOPEINTERFACE_VER}.zip TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 -M2CRYPTO_PACKAGE=M2Crypto-${M2CRYPTO_VER}.tar.gz PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz LXML_PACKAGE=lxml-${LXML_VER}.tar.gz @@ -100,7 +97,6 @@ ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 PYYAML_HASH=c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b0846e8 ZOPEINTERFACE_HASH=1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc TWISTED_HASH=095175638c019ac7c0604f4c291724a16ff1acd062e181b01293bf4dcbc62cf3 -M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 @@ -126,7 +122,6 @@ PYYAML_URL=https://pypi.python.org/packages/source/P/PyYAML/${PYYAML_PACKAG… ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/… TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE} -M2CRYPTO_URL=https://pypi.python.org/packages/source/M/M2Crypto/${M2CRYPTO_PACKAGE} PY2EXE_URL=http://liquidtelecom.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 92967a1..b1c7387 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -29,7 +29,6 @@ LIBEVENT_TAG=release-2.0.22-stable MINGW_TAG=a883b47a45ff74ced41dfbd9f748d5c2c61f3c01 # due to bug 1156131 PYPTLIB_TAG=master OBFSPROXY_TAG=master -FLASHPROXY_TAG=master LIBFTE_TAG=master FTEPROXY_TAG=master LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 @@ -58,7 +57,6 @@ ARGPARSE_VER=1.2.1 PYYAML_VER=3.11 ZOPEINTERFACE_VER=4.0.5 TWISTED_VER=13.2.0 -M2CRYPTO_VER=0.21.1 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 @@ -84,7 +82,6 @@ ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz PYYAML_PACKAGE=PyYAML-${PYYAML_VER}.tar.gz ZOPEINTERFACE_PACKAGE=zope.interface-${ZOPEINTERFACE_VER}.zip TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 -M2CRYPTO_PACKAGE=M2Crypto-${M2CRYPTO_VER}.tar.gz PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz LXML_PACKAGE=lxml-${LXML_VER}.tar.gz @@ -107,7 +104,6 @@ ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 PYYAML_HASH=c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b0846e8 ZOPEINTERFACE_HASH=1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc TWISTED_HASH=095175638c019ac7c0604f4c291724a16ff1acd062e181b01293bf4dcbc62cf3 -M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 @@ -133,7 +129,6 @@ PYYAML_URL=https://pypi.python.org/packages/source/P/PyYAML/${PYYAML_PACKAG… ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/… TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE} -M2CRYPTO_URL=https://pypi.python.org/packages/source/M/M2Crypto/${M2CRYPTO_PACKAGE} PY2EXE_URL=http://liquidtelecom.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE}

1 0

[orbot/master] update changelog
by n8fr8＠torproject.org 16 Jan '16

16 Jan '16

commit 3c4864b84395579c51b6088c0b73dca051291584 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Jan 16 00:10:57 2016 -0500 update changelog --- CHANGELOG | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 2188805..124707b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,10 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ +/** 15.1.0-RC-2 / 16-January-2016 / 9ed17b551c29b9edf94d64f5f013ad607c21bbc5 **/ + +Quick fix for Samsung Galaxy devices which have a port conflict on the default SOCKS 9050 part +* 6ffea9e add ability to check if configured SOCKS port is available Samsung devices like to use 9050 (Since their hardware model is i9 + /** 15.1.0-RC-1 / 15-January-2016 / f541e9ffe14a2719863327bf262b48de135ee0fd **/ We updated the essentials

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits January 2016