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

[torbrowser/master] remove betterprivacy from osx bundles
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit a0e3aa031694051815911f74d71c37e5f779e48d Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Aug 20 21:36:03 2011 +0200 remove betterprivacy from osx bundles --- build-scripts/osx.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 1ab3a77..e1f005d 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -351,7 +351,7 @@ bundle_%: compressed-bundle_%: LANGCODE=$* make -f osx.mk compressed-bundle-localized bundle-localized_%.stamp: - make -f osx.mk copy-files_$* install-extensions install-betterprivacy install-httpseverywhere install-noscript install-lang-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language update-extension-pref final + make -f osx.mk copy-files_$* install-extensions install-httpseverywhere install-noscript install-lang-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language update-extension-pref final touch bundle-localized_$*.stamp cp extensions/torbutton.xpi .

1 0

[torbrowser/master] use the right mozconfig for linux
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 830a8850ee2a288005c318a4449916c72536cc32 Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Aug 20 21:42:22 2011 +0200 use the right mozconfig for linux --- build-scripts/linux.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 1a70edb..7d3bab0 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -112,7 +112,7 @@ FIREFOX_DIR=$(FETCH_DIR)/mozilla-release build-firefox: cp ../src/current-patches/*Firefox* $(FIREFOX_DIR) cp patch-firefox-src.sh $(FIREFOX_DIR) - cp $(CONFIG_SRC)/mozconfig-osx-$(ARCH_TYPE) $(FIREFOX_DIR)/mozconfig + cp $(CONFIG_SRC)/dot_mozconfig $(FIREFOX_DIR)/mozconfig cd $(FIREFOX_DIR) && ./patch-firefox-src.sh cd $(FIREFOX_DIR) && make -f client.mk build

1 0

[torbrowser/master] new bundles are version 1, not 2
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 50ef43974ea4bfe95835dfedc6719710d9e52d90 Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Aug 20 21:36:21 2011 +0200 new bundles are version 1, not 2 --- build-scripts/osx.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index e1f005d..ebd265d 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -153,7 +153,7 @@ NAME=TorBrowser DISTDIR=tbbosx-alpha-dist ## Version and name of the compressed bundle (also used for source) -VERSION=$(RELEASE_VER)-2-alpha +VERSION=$(RELEASE_VER)-1-alpha DEFAULT_COMPRESSED_BASENAME=TorBrowser-$(VERSION)-osx-$(ARCH_TYPE)- IM_COMPRESSED_BASENAME=TorBrowser-IM-$(VERSION)- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)

1 0

[torbrowser/master] add some missing makefile bits for linux
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 3df7a8edcb81b222f3fff6303a10865f3d46fd97 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Aug 21 02:57:16 2011 +0200 add some missing makefile bits for linux --- build-scripts/linux.mk | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 7d3bab0..8859cd0 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -119,9 +119,9 @@ build-firefox: copy-firefox: -rm -rf $(FETCH_DIR)/Firefox ## This is so ugly. Update it to use cool tar --transform soon. - cd $(FIREFOX_DIR) && make -C obj-$(ARCH_TYPE)-pc-linux-gnu/ package - cp $(FIREFOX_DIR)/obj-$(ARCH_TYPE)-pc-linux-gnu/*bz2 $(FETCH_DIR) - cd $(FETCH_DIR) && tar -xvjf firefox-$(FIREFOX_VER).en-US.bz2 && mv firefox Firefox + cd $(FIREFOX_DIR) && make -C obj-$(ARCH_TYPE)-*/ package + cp $(FIREFOX_DIR)/obj-$(ARCH_TYPE)-*/dist/*bz2 $(FETCH_DIR) + cd $(FETCH_DIR) && tar -xvjf firefox-$(FIREFOX_VER).en-US.linux-$(ARCH_TYPE).tar.bz2 && mv firefox Firefox # source-dance unpack-source build-all-binaries: source-dance build-zlib build-openssl build-libpng build-qt build-vidalia build-libevent build-tor build-polipo @@ -233,7 +233,6 @@ all-compressed-bundles: compressed-bundle_ar \ ## clean: - rm -fr $(DISTDIR) rm -fr *.tar.gz rm -fr $(DEST) *.stamp rm -f *~ @@ -280,9 +279,9 @@ install-binaries: # zlib cp -d $(ZLIB)/libz.so $(ZLIB)/libz.so.1 $(ZLIB)/libz.so.1.2.5 $(LIBSDIR)/libz # Libevent - cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.0.1 $(LIBEVENT)/libevent_core.so \ - $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.0.1 \ - $(LIBEVENT)/libevent_extra-2.0.so.5 $(LIBEVENT)/libevent_extra-2.0.so.5.0.1 \ + cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.1.2 $(LIBEVENT)/libevent_core.so \ + $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.1.2 \ + $(LIBEVENT)/libevent_extra-2.0.so.5 $(LIBEVENT)/libevent_extra-2.0.so.5.1.2 \ $(LIBEVENT)/libevent_extra.so $(LIBEVENT)/libevent.so $(LIBSDIR) # libpng cp -d $(LIBPNG)/libpng14.so* $(LIBSDIR) @@ -360,8 +359,8 @@ strip-it-stripper: ## ## Torbutton development version -#torbutton.xpi: -# $(WGET) -O $@ $(TORBUTTON) +torbutton.xpi: + $(WGET) -O $@ $(TORBUTTON) ## NoScript development version noscript.xpi: @@ -403,7 +402,6 @@ compressed-bundle-localized: bundle-localized_$(LANGCODE).stamp -mkdir $(DISTDIR) tar -cvzf $(DISTDIR)/$(DEFAULT_COMPRESSED_BASENAME)$(LANGCODE).tar.gz $(NAME)_$(LANGCODE); rm *.zip *.xpi - cp torbutton/torbutton.xpi . copy-files_%: generic-bundle.stamp rm -fr $(NAME)_$*

1 0

[torbrowser/master] put the right OS in the changelogs...
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit b4e560edf5af143643e525b3ffbe659b4ac2d6b4 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Aug 21 03:31:47 2011 +0200 put the right OS in the changelogs... --- changelog.linux-2.2 | 2 +- changelog.win-2.2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index 20d8bc5..dfd7fb8 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,4 +1,4 @@ -Tor Browser Bundle (2.2.30-1) alpha; suite=osx +Tor Browser Bundle (2.2.30-1) alpha; suite=linux * Update Tor to 0.2.2.31-rc * Update Firefox to 6.0 diff --git a/changelog.win-2.2 b/changelog.win-2.2 index bde8ad4..bc070ec 100644 --- a/changelog.win-2.2 +++ b/changelog.win-2.2 @@ -1,4 +1,4 @@ -Tor Browser Bundle (2.2.30-1) alpha; suite=osx +Tor Browser Bundle (2.2.30-1) alpha; suite=windows * Update Tor to 0.2.2.31-rc * Update Firefox to 6.0

1 0

[torbrowser/master] update build targets for better automatic building
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 6b2c454261728e45a8787e7062b7ad19f2338d48 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Aug 21 03:10:20 2011 +0200 update build targets for better automatic building --- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 8859cd0..0bcefb3 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -124,7 +124,7 @@ copy-firefox: cd $(FETCH_DIR) && tar -xvjf firefox-$(FIREFOX_VER).en-US.linux-$(ARCH_TYPE).tar.bz2 && mv firefox Firefox # source-dance unpack-source -build-all-binaries: source-dance build-zlib build-openssl build-libpng build-qt build-vidalia build-libevent build-tor build-polipo +build-all-binaries: source-dance build-zlib build-openssl build-libpng build-qt build-vidalia build-libevent build-tor build-firefox echo "If we're here, we've done something right." ## Location of compiled libraries diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index ebd265d..0b07e67 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -113,7 +113,7 @@ copy-firefox: -rm -rf $(FETCH_DIR)/Firefox.app cp -r $(FIREFOX_DIR)/obj*/dist/*.app $(FETCH_DIR)/Firefox.app -build-all-binaries: build-zlib build-openssl build-vidalia build-libevent build-tor +build-all-binaries: build-zlib build-openssl build-vidalia build-libevent build-tor build-firefox echo "If we're here, we've done something right." ## Location of compiled libraries diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index e8991a2..28b7d82 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -46,6 +46,9 @@ fetch-source: fetch-zlib fetch-openssl fetch-vidalia fetch-libevent fetch-tor fe fetch-zlib: $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(ZLIB_URL) +fetch-qt: + $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(QT_URL) + fetch-openssl: $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(OPENSSL_URL)

1 0

[torbrowser/master] add missing commit for removal of betterprivacy from linux bundles
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit eb7dec6deef77535bcd8c12fffe509c3101b972b Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Aug 21 03:34:21 2011 +0200 add missing commit for removal of betterprivacy from linux bundles --- build-scripts/linux.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 0bcefb3..14c691b 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -392,7 +392,7 @@ compressed-bundle_%: LANGCODE=$* make -f linux.mk compressed-bundle-localized bundle-localized_%.stamp: - make -f linux.mk copy-files_$* install-extensions install-betterprivacy install-lang-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language update-extension-pref + make -f linux.mk copy-files_$* install-extensions install-lang-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language update-extension-pref touch bundle-localized_$*.stamp bundle-localized: bundle-localized_$(LANGCODE).stamp

1 0

[torbrowser/master] tell windows to use gcc for CC
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 00e711011b62fc3d74968d3b44d44cd80b210f5f Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Aug 25 11:54:41 2011 +0200 tell windows to use gcc for CC --- build-scripts/windows.mk | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index da5dda1..1a52f6a 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -51,6 +51,7 @@ SEVENZIP="/c/Program Files/7-Zip/7z.exe" WGET=$(PYTHON) $(PWD)/pyget.py VIRUSSCAN=$(PYTHON) $(PWD)/virus-scan.py WINRAR="/c/Program Files/WinRAR/WinRAR.exe" +CC=gcc ## Location of directory for source unpacking

1 0

[torbrowser/master] [2824 Linux] Set UID:GID of files in TBB-Linux tarball to 0:0 (root:wheel)
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 312b16cf1b9a60d39e1bed2c442e43fabb77ea2c Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Tue Aug 23 01:36:33 2011 -0400 [2824 Linux] Set UID:GID of files in TBB-Linux tarball to 0:0 (root:wheel) As a result of this change, the build process for TBB for Linux now requires 'Tardy' (http://tardy.sourceforge.net/ ; Debian package 'tardy'). (I tested this Tardy command line with version 1.12 from Debian Squeeze, but not as part of the TBB build process.) (cherry picked from commit 037f07b7008643793704af280a847a82296591f7) --- build-scripts/linux.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 14c691b..659e3b0 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -400,7 +400,7 @@ bundle-localized: bundle-localized_$(LANGCODE).stamp compressed-bundle-localized: bundle-localized_$(LANGCODE).stamp -rm -f $(DISTDIR)/$(COMPRESSED_NAME)_$(LANGCODE).tar.gz -mkdir $(DISTDIR) - tar -cvzf $(DISTDIR)/$(DEFAULT_COMPRESSED_BASENAME)$(LANGCODE).tar.gz $(NAME)_$(LANGCODE); + tar -cvf - $(NAME)_$(LANGCODE) |tardy -unu 0 -una root -gnu 0 -gna wheel |gzip -c9 >$(DISTDIR)/$(DEFAULT_COMPRESSED_BASENAME)$(LANGCODE).tar.gz rm *.zip *.xpi copy-files_%: generic-bundle.stamp

1 0

[torbrowser/master] [Linux] Quote $XAUTHORITY properly
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 08893694389291bac39a71292fef70b113075ed7 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Tue Aug 23 01:46:42 2011 -0400 [Linux] Quote $XAUTHORITY properly I would be moderately surprised if any program put a shell metacharacter in that variable, but it could happen. (cherry picked from commit 60e114c5598a6c3b2615745b8c49e1a45fab8052) --- src/RelativeLink/RelativeLink.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index 99e5255..33961c9 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -14,7 +14,7 @@ if [ $1 ]; then printf "\nDebug enabled.\n\n" fi -if [ -z $XAUTHORITY ]; then +if [ -z "$XAUTHORITY" ]; then XAUTHORITY=~/.Xauthority export XAUTHORITY fi

1 0