- tor-commits - lists.torproject.org

[pytorctl/master] use Elixir model delete method
by mikeperry＠torproject.org 01 Sep '11

01 Sep '11

commit db835ef1f6a252d9923be766f1d7dc813ea9a4eb Author: aagbsn <aagbsn(a)extc.org> Date: Wed Aug 31 16:09:00 2011 -0700 use Elixir model delete method try to use the same session for deletes and queries where possible, this may be the cause of an ObjectNotFound exception that occurs right after _update_db(), despite the Router object being in the consensus and also in the db. --- SQLSupport.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SQLSupport.py b/SQLSupport.py index 718bf35..5933707 100644 --- a/SQLSupport.py +++ b/SQLSupport.py @@ -1023,7 +1023,7 @@ class StreamListener(CircuitListener): (s.strm_id not in self.parent_handler.streams or \ self.parent_handler.streams[s.strm_id].ignored): if strm: - tc_session.delete(strm) + strm.delete() tc_session.commit() return # Ignore streams that aren't ours @@ -1038,7 +1038,7 @@ class StreamListener(CircuitListener): strm.circuit = Circuit.query.filter_by(circ_id=s.circ_id).first() if not strm.circuit: plog("NOTICE", "Ignoring prior stream "+str(strm.strm_id)+" with old circuit "+str(s.circ_id)) - tc_session.delete(strm) + strm.delete() tc_session.commit() return else:

1 0

[pytorctl/master] add function to get current branch and head
by mikeperry＠torproject.org 01 Sep '11

01 Sep '11

commit a3ed3d01ff93df9d25dc64ffbacfcb6b4ef0befa Author: aagbsn <aagbsn(a)extc.org> Date: Wed Aug 31 17:07:27 2011 -0700 add function to get current branch and head --- TorUtil.py | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/TorUtil.py b/TorUtil.py index b8d6425..50258e5 100644 --- a/TorUtil.py +++ b/TorUtil.py @@ -417,3 +417,25 @@ Usage: lzprob(z) prob = ((1.0-x)*0.5) return prob +def get_git_version(path_to_repo): + """ Returns a tuple of the branch and head from a git repo (.git) + if available, or returns ('unknown', 'unknown') + """ + try: + f = open(path_to_repo+'HEAD') + ref = f.readline().strip().split(' ') + f.close() + except IOError, e: + plog('ERROR', e) + return ('unknown','unknown') + try: + f = open(path_to_repo+ref[1]) + branch = ref[1].strip().split('/')[-1] + head = f.readline().strip() + f.close() + return (branch, head) + except IOError, e: + plog('ERROR', e) + except IndexError, e: + plog('ERROR', e) + return ('unknown','unknown')

1 0

[torbrowser/maint-2.2] bump libevent library names for 2.0.14-stable
by erinn＠torproject.org 31 Aug '11

31 Aug '11

commit 7f5edf6876e20387977979a0c3b2a1fd6388c512 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Aug 31 21:35:30 2011 +0100 bump libevent library names for 2.0.14-stable --- build-scripts/linux.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 60dce48..e7eaf94 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -281,9 +281,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.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 \ + cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.1.3 $(LIBEVENT)/libevent_core.so \ + $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.1.3 \ + $(LIBEVENT)/libevent_extra-2.0.so.5 $(LIBEVENT)/libevent_extra-2.0.so.5.1.3 \ $(LIBEVENT)/libevent_extra.so $(LIBEVENT)/libevent.so $(LIBSDIR) # libpng cp -d $(LIBPNG)/libpng14.so* $(LIBSDIR)

1 0

[torbrowser/maint-2.2] rename osx bundles from -alpha to -dev
by erinn＠torproject.org 31 Aug '11

31 Aug '11

commit da9cf1e9d9f575d1f54fc9e14f845736e9a2efdf Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Aug 31 21:35:53 2011 +0100 rename osx bundles from -alpha to -dev --- 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 816dd24..bdef4dc 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -157,7 +157,7 @@ NAME=TorBrowser DISTDIR=tbbosx-alpha-dist ## Version and name of the compressed bundle (also used for source) -VERSION=$(RELEASE_VER)-$(BUILD_NUM)-alpha +VERSION=$(RELEASE_VER)-$(BUILD_NUM)-dev DEFAULT_COMPRESSED_BASENAME=TorBrowser-$(VERSION)-osx-$(ARCH_TYPE)- IM_COMPRESSED_BASENAME=TorBrowser-IM-$(VERSION)- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)

1 0

[torbrowser/maint-2.2] change linux package name to use -dev not -alpha
by erinn＠torproject.org 31 Aug '11

31 Aug '11

commit 2fd5e9a60ef4cdf0df97c7c44992cfbc4f6ff0c5 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Aug 31 20:51:25 2011 +0100 change linux package name to use -dev not -alpha --- 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 2b329b0..60dce48 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -168,7 +168,7 @@ NAME=tor-browser DISTDIR=tbbl-alpha-dist ## Version and name of the compressed bundle (also used for source) -VERSION=$(RELEASE_VER)-$(BUILD_NUM)-alpha +VERSION=$(RELEASE_VER)-$(BUILD_NUM)-dev DEFAULT_COMPRESSED_BASENAME=tor-browser-gnu-linux-$(ARCH_TYPE)-$(VERSION)- IM_COMPRESSED_BASENAME=tor-im-browser-gnu-linux-$(VERSION)- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)$(VERSION)

1 0

[torbrowser/maint-2.2] bump versions in readmes
by erinn＠torproject.org 31 Aug '11

31 Aug '11

commit 698e441c6a91c54c5276c2f33988a727066c20f5 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Aug 31 20:33:47 2011 +0100 bump versions in readmes --- README.LINUX-2.2 | 4 ++-- README.OSX-2.2 | 4 ++-- README.WIN-2.2 | 6 +++--- build-scripts/linux.mk | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index 176ee30..e4ac63e 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -5,8 +5,8 @@ Included applications --------------------- Vidalia 0.2.14 (with Qt 4.6.2) -Tor 0.2.2.32 (with libevent-2.0.13-stable, zlib-1.2.5 and openssl-1.0.0d) -Firefox (Aurora) 6.0 +Tor 0.2.2.32 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0d) +Firefox (Aurora) 6.0.1 \_ Torbutton 1.4.1 |_ NoScript 2.1.2.6 |_ HTTPS-Everywhere 1.0.0development.5 diff --git a/README.OSX-2.2 b/README.OSX-2.2 index de6e27c..185d11c 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -5,8 +5,8 @@ Included applications --------------------- Vidalia 0.2.14 (with Qt 4.6.2) -Tor 0.2.2.32 (with libevent-2.0.13-stable, zlib-1.2.5 and openssl-1.0.0d) -Firefox (Aurora) 6.0 +Tor 0.2.2.32 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0d) +Firefox (Aurora) 6.0.1 \_ Torbutton 1.4.1 |_ NoScript 2.1.2.6 |_ HTTPS-Everywhere 1.0.0development.5 diff --git a/README.WIN-2.2 b/README.WIN-2.2 index 5ab55a0..723df9a 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -5,9 +5,9 @@ Included applications --------------------- Vidalia 0.2.14 (with Qt 4.6.2) -Tor 0.2.2.32 (with libevent-2.0.13-stable, zlib-1.2.5 and openssl-1.0.0d) -FirefoxPortable 6.0 - \_ Firefox (Aurora) 6.0 +Tor 0.2.2.32 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0d) +FirefoxPortable 6.0.1 + \_ Firefox (Aurora) 6.0.1 \_ Torbutton 1.4.1 |_ NoScript 2.1.2.6 |_ HTTPS-Everywhere 1.0.0development.5 diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index b32b258..616fe6a 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -36,7 +36,7 @@ include $(PWD)/versions.mk ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=Linux ## Location of directory for source unpacking

1 0

[torbrowser/maint-2.2] update all changelogs
by erinn＠torproject.org 31 Aug '11

31 Aug '11

commit 44d5ccafed3560985332d448c905f349f813d77d Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Aug 31 20:35:29 2011 +0100 update all changelogs --- changelog.linux-2.2 | 14 ++++++++++++++ changelog.osx-2.2 | 16 ++++++++++++++++ changelog.win-2.2 | 2 +- 3 files changed, 31 insertions(+), 1 deletions(-) diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index 6d49e4a..020c116 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,17 @@ +Tor Browser Bundle (2.2.32-2) alpha; suite=linux + + * Update Firefox to 6.0.1, with an additional patch to exclude DigiNotar completely + - https://gitweb.torproject.org/torbrowser.git/commit/0be3b043afa0e54d207f603… + For the full saga, read: + - http://blog.mozilla.com/security/2011/08/29/fraudulent-google-com-certifica… + - http://googleonlinesecurity.blogspot.com/2011/08/update-on-attempted-man-in… + * Update Libevent to 2.0.14-stable + * Update torbrowser.version string in prefs.js to have more information (see #3504) + * Enable internationalized bundles by adding and changing the + general.useragent.locale pref in prefs.js + + -- Erinn Clark <erinn(a)torproject.org> Wed Aug 31 17:43:09 BST 2011 + Tor Browser Bundle (2.2.32-1) alpha; suite=linux * Update Tor to 0.2.2.32 diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index 2b9edcb..9326450 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,19 @@ +Tor Browser Bundle (2.2.32-2) alpha; suite=osx + + * Update Firefox to 6.0.1, with an additional patch to exclude DigiNotar completely + - https://gitweb.torproject.org/torbrowser.git/commit/0be3b043afa0e54d207f603… + For the full saga, read: + - http://blog.mozilla.com/security/2011/08/29/fraudulent-google-com-certifica… + - http://googleonlinesecurity.blogspot.com/2011/08/update-on-attempted-man-in… + * Update Libevent to 2.0.14-stable + * Rebuild 32-bit binaries with backwards compatibility options so TBB works + on OSX 10.5 (closes: #3671) + * Update torbrowser.version string in prefs.js to have more information (see #3504) + * Enable internationalized bundles by adding and changing the + general.useragent.locale pref in prefs.js + + -- Erinn Clark <erinn(a)torproject.org> Wed Aug 31 17:43:09 BST 2011 + Tor Browser Bundle (2.2.32-1) alpha; suite=osx * Update Tor to 0.2.2.32 diff --git a/changelog.win-2.2 b/changelog.win-2.2 index 2436006..abfbef2 100644 --- a/changelog.win-2.2 +++ b/changelog.win-2.2 @@ -1,4 +1,4 @@ -Tor Browser Bundle (2.2.32-2) alpha; suite=osx +Tor Browser Bundle (2.2.32-2) alpha; suite=windows * Update Firefox to 6.0.1, with an additional patch to exclude DigiNotar completely - https://gitweb.torproject.org/torbrowser.git/commit/0be3b043afa0e54d207f603…

1 0

[torbrowser/maint-2.2] give linux the ability to have internationalized firefox too
by erinn＠torproject.org 31 Aug '11

31 Aug '11

commit c4b20e92d7253d450ff70ec28861a786aa7bdb7f Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Aug 31 20:35:48 2011 +0100 give linux the ability to have internationalized firefox too --- build-scripts/linux.mk | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 616fe6a..2b329b0 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -112,7 +112,7 @@ build-pidgin: FIREFOX_DIR=$(FETCH_DIR)/mozilla-release build-firefox: - cp ../src/current-patches/*Firefox* $(FIREFOX_DIR) + cp ../src/current-patches/000* $(FIREFOX_DIR) cp patch-firefox-src.sh $(FIREFOX_DIR) cp $(CONFIG_SRC)/dot_mozconfig $(FIREFOX_DIR)/mozconfig cd $(FIREFOX_DIR) && ./patch-firefox-src.sh @@ -434,9 +434,8 @@ install-betterprivacy: betterprivacy.xpi ## Language extensions need to be handled differently from other extensions install-lang-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) ifneq ($(LANGCODE), en-US) - mkdir -p $(BUNDLE)/Data/profile/extensions/langpack-$(LANGCODE)(a)firefox.mozilla.org - cp langpack_$(LANGCODE).xpi $(BUNDLE)/Data/profile/extensions/langpack-$(LANGCODE)(a)firefox.mozilla.org/langpack_$(LANGCODE).zip - (cd $(BUNDLE)/Data/profile/extensions/langpack-$(LANGCODE)(a)firefox.mozilla.org && unzip *.zip && rm *.zip) + mkdir -p $(BUNDLE)/Data/profile/extensions + cp langpack_$(LANGCODE).xpi $(BUNDLE)/Data/profile/extensions/langpack-$(LANGCODE)(a)firefox.mozilla.org.xpi endif ## Set the language for Vidalia @@ -466,8 +465,10 @@ patch-firefox-language: ## Fix prefs.js since extensions.checkCompatibility, false doesn't work update-extension-pref: - ext_ver=$$(sed -n '/em:version/{s,.*="$.*$".*,\1,p;q}' $(BUNDLE)/Data/profile/extensions/langpack-$(LANGCODE)(a)firefox.mozilla.org/install.rdf) \ + #ext_ver=$$(sed -n '/em:version/{s,.*="$.*$".*,\1,p;q}' $(BUNDLE)/Data/profile/extensions/langpack-$(LANGCODE)(a)firefox.mozilla.org/install.rdf) \ sed -i -e "s/SHPONKA/langpack-$(LANGCODE)@firefox.mozilla.org:$$ext_ver/g" $(BUNDLE)/Data/profile/prefs.js + sed -i -e "s/SHPONKA/$(LANGCODE)/g" $(BUNDLE)/Data/profile/prefs.js + sed -i -e "s/SHPONKA/$(LANGCODE)/g" $(BUNDLE)/App/Firefox/defaults/profile/prefs.js write-tbb-version: printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)-$(ARCH_TYPE)" >> $(BUNDLE)/App/Firefox/defaults/profile/prefs.js

1 0

r25000: {website} update vidalia bundle version so users can have their libgnu (website/trunk/include)
by Erinn Clark 31 Aug '11

31 Aug '11

Author: erinn Date: 2011-08-31 19:06:55 +0000 (Wed, 31 Aug 2011) New Revision: 25000 Modified: website/trunk/include/versions.wmi Log: update vidalia bundle version so users can have their libgnurx dll Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2011-08-31 14:15:01 UTC (rev 24999) +++ website/trunk/include/versions.wmi 2011-08-31 19:06:55 UTC (rev 25000) @@ -62,7 +62,7 @@ <define-tag package-win32-stable whitespace=delete>/dist/win32/tor-<version-win32-stable>-win32.exe</define-tag> <define-tag package-win32-alpha whitespace=delete>/dist/win32/tor-<version-win32-alpha>-win32.exe</define-tag> -<define-tag file-win32-bundle-stable whitespace=delete>vidalia-bundle-<version-win32-bundle-stable>-0.2.14.exe</define-tag> +<define-tag file-win32-bundle-stable whitespace=delete>vidalia-bundle-<version-win32-bundle-stable>-0.2.14-1.exe</define-tag> <define-tag package-win32-bundle-stable whitespace=delete>/dist/vidalia-bundles/<file-win32-bundle-stable></define-tag> <define-tag file-win32-bundle-alpha whitespace=delete>vidalia-bundle-<version-win32-bundle-alpha>-0.2.14.exe</define-tag> <define-tag package-win32-bundle-alpha whitespace=delete>/dist/vidalia-bundles/<file-win32-bundle-alpha></define-tag>

1 0

[torbrowser/maint-2.2] add split bundles to the windows makefile
by erinn＠torproject.org 31 Aug '11

31 Aug '11

commit 0c82f6463f4a7e2d9325500840bc250597f09d6b Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Aug 31 18:42:15 2011 +0100 add split bundles to the windows makefile --- build-scripts/windows.mk | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index cdaf403..d4d4665 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -190,7 +190,7 @@ all-bundles-both: USE_PIDGIN=0 make -f windows.mk all-bundles make -f windows.mk clean -all-bundles: all-compressed-bundles +all-bundles: all-compressed-bundles all-split-bundles all-compressed-bundles: compressed-bundle_ar \ compressed-bundle_de \ @@ -205,6 +205,19 @@ all-compressed-bundles: compressed-bundle_ar \ compressed-bundle_zh-CN \ compressed-bundle_it +all-split-bundles: split-bundle_ar \ + split-bundle_de \ + split-bundle_en-US \ + split-bundle_es-ES \ + split-bundle_fa \ + split-bundle_fr \ + split-bundle_nl \ + split-bundle_pl \ + split-bundle_pt-PT \ + split-bundle_ru \ + split-bundle_zh-CN \ + split-bundle_it + ## ## Cleanup ##

1 0