- tor-commits - lists.torproject.org

[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 03 Feb '12

03 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

[torbrowser/master] Remove the zlib patch, specify env variables instead
by erinn＠torproject.org 03 Feb '12

03 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

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

03 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

[torbrowser/maint-2.3] chmod libssl* and libcrypto* so they can get stripped
by erinn＠torproject.org 03 Feb '12

03 Feb '12

commit 71fd5b8be39485f9e7eeb4559a644a97a1c087d8 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Jan 31 02:14:38 2012 +0100 chmod libssl* and libcrypto* so they can get stripped --- build-scripts/linux.mk | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index badb523..2981381 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -292,6 +292,8 @@ install-binaries: cp -d $(LIBPNG)/libpng14.so* $(LIBSDIR) # OpenSSL cp -d $(OPENSSL)/libssl.so* $(OPENSSL)/libcrypto.so* $(LIBSDIR) + chmod 644 $(LIBSDIR)/libssl.so* + chmod 644 $(LIBSDIR)/libcrypto.so* # Vidalia cp $(VIDALIA) $(APPDIR) cp $(TOR) $(APPDIR)

1 0

[torbrowser/master] Provide an unpack-qt target
by erinn＠torproject.org 03 Feb '12

03 Feb '12

commit c10708230444eb869bfd49b858bda3f1bc790131 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Mon Jan 30 21:49:12 2012 +0100 Provide an unpack-qt target --- build-scripts/versions.mk | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 3fc350c..c8e3d98 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -93,6 +93,10 @@ unpack-libpng: -rm -rf $(FETCH_DIR)/libpng-$(LIBPNG_VER) cd $(FETCH_DIR) && tar -xvjf $(LIBPNG_PACKAGE) +unpack-qt: + -rm -rf $(FETCH_DIR/qt-$(QT_VER) + cd $(FETCH_DIR) && tar -xvzf $(QT_PACKAGE) + unpack-openssl: -rm -rf $(FETCH_DIR)/openssl-$(OPENSSL_VER) cd $(FETCH_DIR) && tar -xvzf $(OPENSSL_PACKAGE)

1 0