- tor-commits - lists.torproject.org

[obfsproxy/master] Fix bugs in logging functions.
by nickm＠torproject.org 03 Feb '12

03 Feb '12

commit 93c9626b9a70614409ee7132a7a98052c19a6fb0 Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Feb 3 17:23:21 2012 +0200 Fix bugs in logging functions. * Don't use obfs_assert() in logv(). * Don't set the logging method before opening the log file, in log_set_method(). --- src/util.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/util.c b/src/util.c index 0ac7811..000bf85 100644 --- a/src/util.c +++ b/src/util.c @@ -20,6 +20,7 @@ #include <fcntl.h> #include <stdio.h> #include <unistd.h> +#include <assert.h> #include <event2/dns.h> #ifndef _WIN32 @@ -457,13 +458,15 @@ write_logfile_prologue(int logfile) int log_set_method(int method, const char *filename) { - logging_method = method; if (method == LOG_METHOD_FILE) { if (open_and_set_obfsproxy_logfile(filename) < 0) return -1; if (write_logfile_prologue(logging_logfile) < 0) return -1; } + + logging_method = method; + return 0; } @@ -543,10 +546,10 @@ logv(int severity, const char *format, va_list ap) if (logging_method == LOG_METHOD_STDERR) fprintf(stderr, "%s", buf); else if (logging_method == LOG_METHOD_FILE) { - obfs_assert(logging_logfile); - obfs_assert(!(write(logging_logfile, buf, strlen(buf)) < 0)); + assert(logging_logfile >= 0); + assert(!(write(logging_logfile, buf, strlen(buf)) < 0)); } else - obfs_assert(0); + assert(0); } /**** Public logging API. ****/

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 03 Feb '12

03 Feb '12

commit bbe2ea4daeb0e447288faf1a994288f6f745575b Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 3 10:15:15 2012 +0000 Update translations for vidalia --- fa/vidalia_fa.po | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/fa/vidalia_fa.po b/fa/vidalia_fa.po index 85ffc07..0ef8084 100644 --- a/fa/vidalia_fa.po +++ b/fa/vidalia_fa.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-02-01 17:30+0000\n" +"PO-Revision-Date: 2012-02-03 10:08+0000\n" "Last-Translator: Ardeshir <ardeshir(a)redteam.io>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -273,11 +273,11 @@ msgstr "سبک نمایش" msgctxt "BandwidthGraph" msgid "Changes the transparency of the Bandwidth Graph" -msgstr "شفافیت نمودار پهنای‌باند را تغییر می‌دهد" +msgstr "شفافیت نمودار پهنای‌باند را تغییر میدهد" msgctxt "BandwidthGraph" msgid "100" -msgstr "۱۰۰" +msgstr "100" msgctxt "BandwidthGraph" msgid "% Opaque" @@ -293,7 +293,7 @@ msgstr "لغو" msgctxt "BridgeDownloader" msgid "Starting HTTPS bridge request..." -msgstr " شروع به درخواست پل‌های HTTPS" +msgstr " شروع به درخواست پل های HTTPS" msgctxt "BridgeDownloader" msgid "Connecting to %1:%2..." @@ -317,7 +317,7 @@ msgstr "ناتوان در بارگذاری پل ها:%1" msgctxt "BridgeDownloaderProgressDialog" msgid "Retrying bridge request..." -msgstr "تلاش دوباره برای درخواست پل" +msgstr "تلاش دوباره برای درخواست پل..." msgctxt "BridgeUsageDialog" msgid "Country" @@ -325,12 +325,12 @@ msgstr "كشور" msgctxt "BridgeUsageDialog" msgid "# Clients" -msgstr "# كلاينت" +msgstr "# کلاینت ها" msgctxt "BridgeUsageDialog" msgid "Clients from the following countries have used your relay since %1" msgstr "" -"از تاریخ ‪%1‬ کلاینت‌هایی از کشورهای زیر از بازپخش کننده شما استفاده " +"از تاریخ ‪%1‬ کلاینت هایی از کشورهای زیر از بازپخش کننده شما استفاده " "کرده‌اند" msgctxt "BridgeUsageDialog"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 03 Feb '12

03 Feb '12

commit 38d4295c56ba6fd4be43a3b13dd4bcee65ee6e76 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 3 09:15:28 2012 +0000 Update translations for vidalia --- cy/vidalia_cy.po | 31 ++++++++++++++++--------------- 1 files changed, 16 insertions(+), 15 deletions(-) diff --git a/cy/vidalia_cy.po b/cy/vidalia_cy.po index 6d78f52..f5bd5bd 100644 --- a/cy/vidalia_cy.po +++ b/cy/vidalia_cy.po @@ -1,13 +1,14 @@ # # Translators: # cymro <markives(a)hotmail.co.uk>, 2011. +# <demonuk9(a)gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2011-09-08 00:47+0000\n" -"Last-Translator: cymro <markives(a)hotmail.co.uk>\n" +"PO-Revision-Date: 2012-02-03 09:14+0000\n" +"Last-Translator: PoopZemli <demonuk9(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -38,7 +39,7 @@ msgstr "Qt 4.4.2" msgctxt "AdvancedPage" msgid "'%1' is not a valid IP address." -msgstr "" +msgstr "'%1' не є дійсною IP-адресою." msgctxt "AdvancedPage" msgid "" @@ -55,7 +56,7 @@ msgstr "Ffeil heb ei darganfod" msgctxt "AdvancedPage" msgid "%1 does not exist. Would you like to create it?" -msgstr "" +msgstr "%1 не існує. Бажаєте створити?" msgctxt "AdvancedPage" msgid "Failed to Create File" @@ -103,7 +104,7 @@ msgstr "Cyfrinair" msgctxt "AdvancedPage" msgid "Randomly Generate" -msgstr "" +msgstr "Генерувати випадково" msgctxt "AdvancedPage" msgid ":" @@ -206,7 +207,7 @@ msgstr "" msgctxt "AppearancePage" msgid "Language" -msgstr "" +msgstr "Мова" msgctxt "AppearancePage" msgid "Choose the language used in Vidalia" @@ -254,7 +255,7 @@ msgstr "" msgctxt "BandwidthGraph" msgid "Always on Top" -msgstr "" +msgstr "Завжди згори" msgctxt "BandwidthGraph" msgid "Style" @@ -266,7 +267,7 @@ msgstr "" msgctxt "BandwidthGraph" msgid "100" -msgstr "" +msgstr "100" msgctxt "BandwidthGraph" msgid "% Opaque" @@ -286,7 +287,7 @@ msgstr "" msgctxt "BridgeDownloader" msgid "Connecting to %1:%2..." -msgstr "" +msgstr "Під'єднання до %1:%2..." msgctxt "BridgeDownloader" msgid "Sending an HTTPS request for bridges..." @@ -310,7 +311,7 @@ msgstr "" msgctxt "BridgeUsageDialog" msgid "Country" -msgstr "" +msgstr "Країна" msgctxt "BridgeUsageDialog" msgid "# Clients" @@ -330,11 +331,11 @@ msgstr "" msgctxt "Circuit" msgid "New" -msgstr "" +msgstr "Новий" msgctxt "Circuit" msgid "Open" -msgstr "" +msgstr "Відкрити" msgctxt "Circuit" msgid "Building" @@ -402,11 +403,11 @@ msgstr "" msgctxt "ConfigDialog" msgid "Help" -msgstr "" +msgstr "Допомога" msgctxt "ConfigDialog" msgid "Error Saving Settings" -msgstr "" +msgstr "Помилка при збереженні налаштувань" msgctxt "ConfigDialog" msgid "Vidalia was unable to save your %1 settings." @@ -414,7 +415,7 @@ msgstr "" msgctxt "ConfigDialog" msgid "Error Applying Settings" -msgstr "" +msgstr "Помилка при застосуванні налаштувань" msgctxt "ConfigDialog" msgid "Vidalia was unable to apply your %1 settings to Tor."

1 0

[translation/vidalia_installer] Update translations for vidalia_installer
by translation＠torproject.org 03 Feb '12

03 Feb '12

commit 4c8607070adb5615b6405dcf420b67c4eb3e7e10 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 3 07:45:20 2012 +0000 Update translations for vidalia_installer --- ko/vidalia_ko.po | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ko/vidalia_ko.po b/ko/vidalia_ko.po index ab639d0..553f193 100755 --- a/ko/vidalia_ko.po +++ b/ko/vidalia_ko.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2008-07-12 05:29+0000\n" -"PO-Revision-Date: 2012-01-14 04:09+0000\n" +"PO-Revision-Date: 2012-02-03 07:31+0000\n" "Last-Translator: cwt96 <cwt967(a)naver.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -38,7 +38,7 @@ msgstr "" "\n" "Tor는 익명 웹 브라우징과 인스턴트 메시징, IRC 등을 도와줌으로써 인터넷을 익명으로 사용할 수 있게 해 주는 시스템입니다. Vidalia는 Tor를 제어하고, 모니터하고, 설정할 수 있게 해 주는 GUI입니다. \n" "\n" -"Polopo는 Tor을 통한 웹 브라우징의 성능을 향상시키기위해서 캐싱하는 웹 프록시입니다. \n" +"Polipo는 Tor을 통한 웹 브라우징의 성능을 향상시키기위해서 캐싱하는 웹 프록시입니다. \n" "\n" "Torbutton은 익명 웹 브라우징을 빨리 활성화시키고, 비활성화시키기 위한 파이어폭스 확장 기능입니다. \n" "\n" @@ -69,7 +69,7 @@ msgstr "" msgctxt "BundleRunNow" msgid "Run installed components now" -msgstr "" +msgstr "설치된 컴포넌트 지금 실행" msgctxt "VidaliaGroupDesc" msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor." @@ -77,26 +77,26 @@ msgstr "Vidalia는 Tor를 제어하고, 모니터하고, 설정할 수 있게 msgctxt "VidaliaUninstDesc" msgid "Remove ${VIDALIA_DESC}." -msgstr "" +msgstr "${VIDALIA_DESC} 제거" msgctxt "VidaliaSetupCaption" msgid "${VIDALIA_NAME} setup" -msgstr "" +msgstr "${VIDALIA_NAME} 설치" msgctxt "VidaliaWelcomeText" msgid "" "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n" "\n" "$_CLICK" -msgstr "" +msgstr "이 마법사는 Tor를 제어하고, 모니터하고, 설정할 수 있게 해 주는 GUI인 Vidalia를 설치하는 것을 도와준다. " msgctxt "VidaliaWelcomeTitle" msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard" -msgstr "" +msgstr "${VIDALIA_NAME} 설치 마법사에 오신 것을 환영합니다. " msgctxt "VidaliaLinkText" msgid "${VIDALIA_NAME} homepage" -msgstr "" +msgstr "${VIDALIA_NAME} 홈페이지" msgctxt "VidaliaAppDesc" msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor." @@ -164,7 +164,7 @@ msgctxt "PolipoGroupDesc" msgid "" "Polipo is a caching web proxy that increases performance of web browsing " "through Tor." -msgstr "" +msgstr "Polipo는 Tor을 통한 웹 브라우징의 성능을 향상시키기위해서 캐싱하는 웹 프록시입니다. " msgctxt "PolipoUninstDesc" msgid "Remove ${POLIPO_DESC}." @@ -194,7 +194,7 @@ msgctxt "TorbuttonGroupDesc" msgid "" "Torbutton is a Firefox extension that allows you to quickly enable or " "disable anonymous web browsing." -msgstr "" +msgstr "Torbutton은 익명 웹 브라우징을 빨리 활성화시키고, 비활성화시키기 위한 파이어폭스 확장 기능입니다. " msgctxt "TorbuttonUninstDesc" msgid "Remove ${TORBUTTON_DESC}." @@ -230,12 +230,12 @@ msgstr "" msgctxt "FirefoxWarningPageTitle" msgid "Firefox is not installed" -msgstr "" +msgstr "Firefox 설치 안 됨" msgctxt "FirefoxWarningPageSubtitle" msgid "" "We recommend that you install Firefox before continuing, for best safety." -msgstr "" +msgstr "최고의 안정성을 위하여, 계속하시기 전에 Firefox를 설치하는 것을 추천합니다." msgctxt "FirefoxWarningPageUpperText" msgid ""

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 03 Feb '12

03 Feb '12

commit abae3fe8e1c7f17d6ca776d43f621ce3612161e1 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 3 07:15:16 2012 +0000 Update translations for vidalia --- ko/vidalia_ko.po | 36 +++++++++++++++++++----------------- 1 files changed, 19 insertions(+), 17 deletions(-) diff --git a/ko/vidalia_ko.po b/ko/vidalia_ko.po index ca9f3eb..4444f3e 100755 --- a/ko/vidalia_ko.po +++ b/ko/vidalia_ko.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-01-08 07:18+0000\n" +"PO-Revision-Date: 2012-02-03 07:12+0000\n" "Last-Translator: cwt96 <cwt967(a)naver.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -181,7 +181,7 @@ msgstr "지정된 토르 데이터 디렉토리 위치는 시스템의 현재 8 msgctxt "AdvancedPage" msgid "Warning" -msgstr "경디" +msgstr "경고" msgctxt "AdvancedPage" msgid "You changed torrc path, would you like to restart Tor?" @@ -533,7 +533,7 @@ msgstr "볼리비아" msgctxt "CountryInfo" msgid "Bosnia & Herzegovina" -msgstr "보스니아와 헤르체 고 비나" +msgstr "보스니아 헤르체고비나" msgctxt "CountryInfo" msgid "Botswana" @@ -1237,11 +1237,11 @@ msgstr "아일랜드" msgctxt "CountryInfo" msgid "Korea, North" -msgstr "북한" +msgstr "조선민주주의인민공화국" msgctxt "CountryInfo" msgid "Korea, South" -msgstr "남한" +msgstr "대한민국" msgctxt "CountryInfo" msgid "Libya" @@ -1534,8 +1534,8 @@ msgid "" "browser is not currently configured to use Tor then the request will not be " "anonymous." msgstr "" -"Vidalia는 당신의 기본 브라우저에서 선택한 링크를 열수 있습니다. 만약 당신의 브라우저가 Tor를 사용할수 있게 설정되있다면 링크의" -" 요청은 익명화가 안 되있을수 있습니다." +"Vidalia는 당신의 기본 브라우저에서 선택한 링크를 열수 있습니다. 만약 당신의 브라우저가 Tor를 사용할 수 있게 설정되어있다 " +"않다면 링크의 요청은 익명화가 안 되있을수 있습니다." msgctxt "HelpTextBrowser" msgid "Do you want Vidalia to open the link in your Web browser?" @@ -1550,7 +1550,7 @@ msgid "" "Vidalia was unable to open the selected link in your Web browser. You can " "still copy the URL and paste it into your browser." msgstr "" -"Vidalia는 당신의 브라우저에서 선택한 링크를 여는데 실패하였습니다. 그래도 URL을 복사하여 브라우저로 붙이기는 가능합니다." +"Vidalia는 당신의 브라우저에서 선택한 링크를 여는데 실패하였습니다. 그래도 URL을 복사하여 브라우저로 여실 수 있습니다" msgctxt "HelpTextBrowser" msgid "Error opening help file:" @@ -1586,7 +1586,7 @@ msgstr "경고" msgctxt "LogEvent" msgid "Error" -msgstr "에러" +msgstr "오류" msgctxt "LogEvent" msgid "Unknown" @@ -1654,7 +1654,7 @@ msgstr "도움말" msgctxt "MainWindow" msgid "New Identity" -msgstr "새로운 계정" +msgstr "새로운 ip로..." msgctxt "MainWindow" msgid "Ctrl+T" @@ -2100,7 +2100,7 @@ msgid "" "\n" "Would you like to shutdown gracefully and give clients time to find a new relay?" msgstr "" -"중계가 현재 작동중 입니다. 중계를 중단하시면 클라이언트와의 연결으 끊어집니다. 클라이언트가 새로운 릴레이를 찾을 수 있게 시간을 " +"중계가 현재 작동중 입니다. 중계를 중단하시면 클라이언트와의 결이 끊어집니다. 클라이언트가 새로운 릴레이를 찾을 수 있게 시간을 " "주시겠습니까?" msgctxt "MainWindow" @@ -2289,7 +2289,7 @@ msgstr "메시지 기록 닫기" msgctxt "MessageLog" msgid "Esc" -msgstr "나가기" +msgstr "ESC" msgctxt "MessageLog" msgid "Find" @@ -2321,7 +2321,9 @@ msgstr "메시지 로스 설정 저장" msgctxt "MessageLog" msgid "Save Settings" -msgstr "설정 저장" +msgstr "" +"중계가 현재 작동중 입니다. 중계를 중단하시면 클라이언트와의 결이 끊어집니다. 클라이언트가 새로운 릴레이를 찾을 수 있게 시간을 " +"주시겠습니까?" msgctxt "MessageLog" msgid "Cancels changes made to settings" @@ -2867,7 +2869,7 @@ msgstr "클라이언트만 작동" msgctxt "ServerPage" msgid "Relay traffic for the Tor network" -msgstr " Tor 네트워크를 위하여 트래픽을 중계합니다." +msgstr " Tor 네트워크를 위하여 트래픽을 중계합니다.(추천)" msgctxt "ServerPage" msgid "Relay Port:" @@ -2875,7 +2877,7 @@ msgstr "중계 포트" msgctxt "ServerPage" msgid "Enable to mirror the relay directory" -msgstr "중계 디렉토리를 전달하는 것을 허용" +msgstr "중계 디렉토리를 전달하는 것을 허용(추천)" msgctxt "ServerPage" msgid "Attempt to automatically configure port forwarding" @@ -3103,7 +3105,7 @@ msgstr "검열된 유저들이 Tor 네트워키에 닿을 수 있도록 돕기" msgctxt "ServerPage" msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>" -msgstr "<a href=\"#bridgeUsage\">누가 제 다리를 썼나요?</a>" +msgstr "<a href=\"#bridgeUsage\">누가 제 브릿지를 썼나요?</a>" msgctxt "ServerPage" msgid "<a href=\"#bridgeHelp\">What's this?</a>" @@ -3122,7 +3124,7 @@ msgid "" "Email address at which you may be reached if there is a\n" "problem with your relay. You might also include your PGP or GPG fingerprint." msgstr "" -"귀하의 중계에 대한 문제가 있을 경우 연락을 받을 수 있는 이메일 주소:귀하는 또한 PGP나 GPG 지문을 포함할 수도 있습니다." +"귀하의 중계에 대한 문제가 있을 경우 연락을 받을 수 있는 이메일 주소:귀하는 또한 PGP나 GPG 인증번호를 포함할 수도 있습니다." msgctxt "ServicePage" msgid "Error while trying to unpublish all services"

1 0

[torbrowser/maint-2.2] bump recommended-versions to 2.2.35-5
by erinn＠torproject.org 03 Feb '12

03 Feb '12

commit 85b5eee824bd96c9114b31a1c6dd137367005a1d Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Feb 3 07:39:03 2012 +0100 bump recommended-versions to 2.2.35-5 --- build-scripts/recommended-versions | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index f1e681b..c713d85 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,7 +1,7 @@ [ -"2.2.35-4-Linux-i686", -"2.2.35-4-Linux-x86_64", -"2.2.35-4-MacOS-i386", -"2.2.35-4-MacOS-x86_64", -"2.2.35-4-Windows" +"2.2.35-5-Linux-i686", +"2.2.35-5-Linux-x86_64", +"2.2.35-5-MacOS-i386", +"2.2.35-5-MacOS-x86_64", +"2.2.35-5-Windows" ]

1 0

[torbrowser/maint-2.3] bump recommended-versions to 2.2.35-5
by erinn＠torproject.org 03 Feb '12

03 Feb '12

commit 85b5eee824bd96c9114b31a1c6dd137367005a1d Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Feb 3 07:39:03 2012 +0100 bump recommended-versions to 2.2.35-5 --- build-scripts/recommended-versions | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index f1e681b..c713d85 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,7 +1,7 @@ [ -"2.2.35-4-Linux-i686", -"2.2.35-4-Linux-x86_64", -"2.2.35-4-MacOS-i386", -"2.2.35-4-MacOS-x86_64", -"2.2.35-4-Windows" +"2.2.35-5-Linux-i686", +"2.2.35-5-Linux-x86_64", +"2.2.35-5-MacOS-i386", +"2.2.35-5-MacOS-x86_64", +"2.2.35-5-Windows" ]

1 0

[torbrowser/master] bump recommended-versions to 2.2.35-5
by erinn＠torproject.org 03 Feb '12

03 Feb '12

commit 85b5eee824bd96c9114b31a1c6dd137367005a1d Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Feb 3 07:39:03 2012 +0100 bump recommended-versions to 2.2.35-5 --- build-scripts/recommended-versions | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index f1e681b..c713d85 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,7 +1,7 @@ [ -"2.2.35-4-Linux-i686", -"2.2.35-4-Linux-x86_64", -"2.2.35-4-MacOS-i386", -"2.2.35-4-MacOS-x86_64", -"2.2.35-4-Windows" +"2.2.35-5-Linux-i686", +"2.2.35-5-Linux-x86_64", +"2.2.35-5-MacOS-i386", +"2.2.35-5-MacOS-x86_64", +"2.2.35-5-Windows" ]

1 0

r25372: {website} bump tbbs to 2.2.35-5 (website/trunk/include)
by Erinn Clark 03 Feb '12

03 Feb '12

Author: erinn Date: 2012-02-03 06:07:00 +0000 (Fri, 03 Feb 2012) New Revision: 25372 Modified: website/trunk/include/versions.wmi Log: bump tbbs to 2.2.35-5 Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2012-02-02 04:25:38 UTC (rev 25371) +++ website/trunk/include/versions.wmi 2012-02-03 06:07:00 UTC (rev 25372) @@ -27,28 +27,28 @@ <define-tag version-osx-ppc-stable whitespace=delete>0.2.2.35</define-tag> <define-tag version-osx-ppc-alpha whitespace=delete>0.2.3.10-alpha</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>2.2.35-4</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>2.2.35-5</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.2.35</define-tag> -<define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.16-stable, zlib-1.2.5, openssl-1.0.0f</define-tag> -<define-tag version-torbrowser-firefox whitespace=delete>9.0.1</define-tag> +<define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.16-stable, zlib-1.2.6, openssl-1.0.0g</define-tag> +<define-tag version-torbrowser-firefox whitespace=delete>10.0</define-tag> <define-tag version-torbrowser-torbutton whitespace=delete>1.4.5.1</define-tag> <define-tag version-torbrowser-pidgin whitespace=delete>2.7.5</define-tag> <define-tag version-torbrowser-otr whitespace=delete>3.2</define-tag> <define-tag version-torbrowser-vidalia whitespace=delete>0.2.15</define-tag> <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.2.35-4</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.2.35-4</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.2.35-5</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.2.35-5</define-tag> <define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.35</define-tag> -<define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.16-stable, zlib-1.2.5, openssl-1.0.0f</define-tag> -<define-tag version-gnu-torbrowser-firefox whitespace=delete>9.0.1</define-tag> +<define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.16-stable, zlib-1.2.6, openssl-1.0.0g</define-tag> +<define-tag version-gnu-torbrowser-firefox whitespace=delete>10.0</define-tag> <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.4.5.1</define-tag> <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.15</define-tag> -<define-tag version-torbrowserbundleosx32 whitespace=delete>2.2.35-4</define-tag> -<define-tag version-torbrowserbundleosx64 whitespace=delete>2.2.35-4</define-tag> +<define-tag version-torbrowserbundleosx32 whitespace=delete>2.2.35-5</define-tag> +<define-tag version-torbrowserbundleosx64 whitespace=delete>2.2.35-5</define-tag> <define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.35</define-tag> -<define-tag version-osx-torbrowser-firefox whitespace=delete>9.0.1</define-tag> +<define-tag version-osx-torbrowser-firefox whitespace=delete>10.0</define-tag> <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.4.5.1</define-tag> <define-tag version-osx-torbrowser-vidalia whitespace=delete>0.2.15</define-tag>

1 0

[torbrowser/maint-2.2] Remove the zlib patch, specify env variables instead
by erinn＠torproject.org 02 Feb '12

02 Feb '12

commit 298be30fce26ad1fa620ddd831922136f7931fc5 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Feb 3 05:27:58 2012 +0100 Remove the zlib patch, specify env variables instead --- build-scripts/windows.mk | 7 +--- .../zlib/0001-zlib-update-Makefile.patch | 38 -------------------- 2 files changed, 2 insertions(+), 43 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index a8ddb91..143d82c 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -71,12 +71,9 @@ source-dance: fetch-source unpack-source ZLIB_DIR=$(FETCH_DIR)/zlib-$(ZLIB_VER) build-zlib: - cp ../src/current-patches/zlib/* $(ZLIB_DIR) - cp patch-any-src.sh $(ZLIB_DIR) - cd $(ZLIB_DIR) && ./patch-any-src.sh cd $(ZLIB_DIR) && sed -i -e "s%prefix = /usr/local%prefix = ${BUILT_DIR}%" win32/Makefile.gcc - cd $(ZLIB_DIR) && make -f win32/Makefile.gcc - cd $(ZLIB_DIR) && make -f win32/Makefile.gcc install + cd $(ZLIB_DIR) && LDFLAGS="-Wl,--nxcompat -Wl,--dynamicbase" make -f win32/Makefile.gcc + cd $(ZLIB_DIR) && BINARY_PATH="$(BUILT_DIR)/bin" INCLUDE_PATH="$(BUILT_DIR)/include" LIBRARY_PATH="$(BUILT_DIR)/lib" make -f win32/Makefile.gcc install OPENSSL_DIR=$(FETCH_DIR)/openssl-$(OPENSSL_VER) OPENSSL_OPTS=-no-idea -no-rc5 -no-md2 shared zlib --prefix=$(BUILT_DIR) --openssldir=$(BUILT_DIR) -L$(BUILT_DIR)/lib -Wl,--nxcompat -Wl,--dynamicbase -I$(BUILT_DIR)/include diff --git a/src/current-patches/zlib/0001-zlib-update-Makefile.patch b/src/current-patches/zlib/0001-zlib-update-Makefile.patch deleted file mode 100644 index 07b9d48..0000000 --- a/src/current-patches/zlib/0001-zlib-update-Makefile.patch +++ /dev/null @@ -1,38 +0,0 @@ -From b45561038c1819c5d6264b025e872c82b7adf94f Mon Sep 17 00:00:00 2001 -From: Erinn Clark <erinn(a)torproject.org> -Date: Sat, 29 Oct 2011 01:59:59 +0100 -Subject: [PATCH] update zlib Makefile.gcc - -zlib's Makefile is inadequate for building TBB from source, so patch it to use -DEP/ASLR build options and have some actually working include and library -paths. - ---- - win32/Makefile.gcc | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -diff --git a/win32/Makefile.gcc b/win32/Makefile.gcc -index 0a33bf6..79cad54 100644 ---- a/win32/Makefile.gcc -+++ b/win32/Makefile.gcc -@@ -44,7 +44,7 @@ AS = $(CC) - ASFLAGS = $(LOC) -Wall - - LD = $(CC) --LDFLAGS = $(LOC) -+LDFLAGS = $(LOC) -Wl,--nxcompat -Wl,--dynamicbase - - AR = $(PREFIX)ar - ARFLAGS = rcs -@@ -113,6 +113,8 @@ zlibrc.o: win32/zlib1.rc - - - # BINARY_PATH, INCLUDE_PATH and LIBRARY_PATH must be set. -+INCLUDE_PATH=$(prefix)/include -+LIBRARY_PATH=$(prefix)/lib - - .PHONY: install uninstall clean - --- -1.7.5.4 -

1 0