June 2012 - tor-commits - lists.torproject.org

[githax/master] Update make-tor-next script to handle multiple repositories
by nickm＠torproject.org 29 Jun '12

29 Jun '12

commit afa55796e75a3c3b18310c46986a164b5c30e459 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 29 00:41:12 2012 -0400 Update make-tor-next script to handle multiple repositories --- scripts/make-tor-next | 66 ++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 55 insertions(+), 11 deletions(-) diff --git a/scripts/make-tor-next b/scripts/make-tor-next index 2997a75..1fb5df1 100755 --- a/scripts/make-tor-next +++ b/scripts/make-tor-next @@ -8,6 +8,10 @@ import subprocess import sys import time +if len(sys.argv) != 2 or sys.argv[1] not in ["023", "master"]: + print >>sys.stderr, "I want an argument: 023 or master." + sys.exit(1) + # Where to build the tor-next tree. this needs to be a clone of the main tor repo DIR = os.path.expanduser("~/src/tor-next") # What file in that directory do you use for your list of branches to include? @@ -26,28 +30,68 @@ GRANDFATHERED_REPOS = set(""" BASE_BRANCH = "origin/master" # To which repository do we push the pu branch and the tor-next branch? TARGET_REPO = "tor-next" +TARGET_BRANCH = "tor-next" + +TMP_BRANCH_PREFIX = "pu-" logging.basicConfig(level="INFO", format=">>>> %(levelname)s: %(message)s") +if sys.argv[1] == "023": + DIR = os.path.expanduser("~/src/tor-next-023") + BRANCHLIST = os.path.join(DIR, "TOR_NEXT_BRANCHES") + BASE_BRANCH = "origin/release-0.2.3" + TARGET_REPO = "tor-next" + TARGET_BRANCH = "tor-next-023" + TMP_BRANCH_PREFIX = "pu-023-" # 0. PARSE STUFF. +def parseRemoteConfigLine(line): + m = re.match(r'remote\s+(\S+)\s*=\s*(\S+)', line) + if not m: + return None + return m.groups() + +branchlist_contents = [] + def read_remotes_and_branches(fname): branches = [] + specialRemotes = [] + with open(fname) as f: for line in f: + line_orig = line line = re.sub(r'#.*', '', line) line = line.strip() + if line.startswith("include "): + fname2 = line.split()[1] + branchlist_contents.append("# BEGIN: %s"%line) + r,b = read_remotes_and_branches(os.path.expanduser(fname2)) + branchlist_contents.append("# END: %s"%line) + specialRemotes.extend([(k,v) for k,v in r.iteritems()]) + branches.extend(b) + continue + + branchlist_contents.append(line_orig) + if not line: continue + rmt = parseRemoteConfigLine(line) + if rmt != None: + specialRemotes.append(rmt) + continue + if "/" not in line: logging.warn("Bogus absolute branch %s", line) branches.append(line) - remotes = set() + remotes = {} for b in branches: - remotes.add(b.split("/")[0]) + remotes[b.split("/")[0]] = None + for rmt, url in specialRemotes: + if rmt in remotes: + remotes[rmt] = url return remotes, branches @@ -72,8 +116,9 @@ def fix_remotes(want_remotes): if fields[2] != "(fetch)": continue have_remotes[fields[0]] = fields[1] - for rmt in want_remotes: - repo = repoName(rmt) + for rmt, repo in want_remotes.iteritems(): + if repo == None: + repo = repoName(rmt) if rmt not in have_remotes: logging.info("Adding remote %s", rmt) subprocess.check_call(["git", "remote", "add", rmt, repo]) @@ -96,7 +141,7 @@ update_remotes(remotes) # 2. MERGE STUFF INTO A NEW TEMP BRANCH -temp_branch_name = time.strftime("pu-%Y%m%d%H%M%S", time.gmtime()) +temp_branch_name = TMP_BRANCH_PREFIX+time.strftime("%Y%m%d%H%M%S", time.gmtime()) subprocess.check_call(["git", "branch", "-f", temp_branch_name, BASE_BRANCH]) subprocess.check_call(["git", "checkout", temp_branch_name]) @@ -134,7 +179,7 @@ with open("README.tor-next", 'w') as f: # Here are the branches I used: """% temp_branch_name) - f.write( open(BRANCHLIST).read() ) + f.write( "".join(branchlist_contents) ) f.write("\n") subprocess.check_call(["git", "add", "README.tor-next"]) @@ -146,7 +191,7 @@ logging.info("Looks okay to me. Will it compile?") try: logfile = temp_branch_name+".log" with open(logfile, 'w') as f: - logging.info("(logging output to %s", logfile) + logging.info("(logging output to %s)", logfile) logging.info("configuring...") subprocess.check_call(["sh", "autogen.sh"], stdout=f,stderr=f) subprocess.check_call(["./configure", "--enable-gcc-warnings"], @@ -154,16 +199,15 @@ try: logging.info("building...") subprocess.check_call(["make", "clean"], stdout=f, stderr=f) subprocess.check_call(["make", "-j4"], stdout=f, stderr=f) -except CalledProcessError: +except subprocess.CalledProcessError: logging.warn("Build wasn't clean. Exiting") sys.exit(1) logging.info("Build seemed to work. Pushing it!") - subprocess.check_call(["git", "push", TARGET_REPO, temp_branch_name]) -subprocess.check_call(["git", "push", TARGET_REPO, "+%s:tor-next"%(temp_branch_name)]) -logging.info("Pushed tor-next. It's a great big beautiful tomorrow.") +subprocess.check_call(["git", "push", TARGET_REPO, "+%s:%s"%(temp_branch_name,TARGET_BRANCH)]) +logging.info("Pushed %s. It's a great big beautiful tomorrow.",TARGET_BRANCH) LICENSE = """

1 0

[tor/master] Fix crash bug from 4a8eaad7 (Bug 6255)
by nickm＠torproject.org 29 Jun '12

29 Jun '12

commit 6abdcdf11641b9d7e84d438ece781dcfb689a705 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 29 00:32:27 2012 -0400 Fix crash bug from 4a8eaad7 (Bug 6255) We were doing a tor_strclear() on client_keys_str when it might not even be set. Fix for bug 6255; bug not in any release of Tor. Thanks to katmagic for finding this one! --- src/or/rendservice.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 8acc226..689cfb1 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -724,7 +724,6 @@ rend_service_load_auth_keys(rend_service_t *s, const char *hfname) } else { log_info(LD_CONFIG, "Parsed %d previously stored client entries.", strmap_size(parsed_clients)); - tor_free(client_keys_str); } } @@ -870,8 +869,10 @@ rend_service_load_auth_keys(rend_service_t *s, const char *hfname) if (open_hfile) abort_writing_to_file(open_hfile); done: - tor_strclear(client_keys_str); - tor_free(client_keys_str); + if (client_keys_str) { + tor_strclear(client_keys_str); + tor_free(client_keys_str); + } strmap_free(parsed_clients, rend_authorized_client_strmap_item_free); memset(cfname, 0, sizeof(cfname));

1 0

[tor/master] Merge branch 'bug6255'
by nickm＠torproject.org 29 Jun '12

29 Jun '12

commit ed2601f2be0978c37c0ae086b2a8d2f7d94078fc Merge: 630677f 6abdcdf Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 29 00:43:59 2012 -0400 Merge branch 'bug6255' src/or/rendservice.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)

1 0

[tor/master] bump version to 0.2.3.18-rc-dev
by nickm＠torproject.org 29 Jun '12

29 Jun '12

commit 9c5a118272bfbb7d4c287f4310237bf90a404c63 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 28 16:01:55 2012 -0400 bump version to 0.2.3.18-rc-dev --- configure.in | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index e9ef4f8..1db7d08 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2012, The Tor Project, Inc. dnl See LICENSE for licensing information AC_INIT -AM_INIT_AUTOMAKE(tor, 0.2.3.18-rc) +AM_INIT_AUTOMAKE(tor, 0.2.3.18-rc-dev) AM_CONFIG_HEADER(orconfig.h) AC_CANONICAL_HOST diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index 75b2567..2133a47 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.3.18-rc" +!define VERSION "0.2.3.18-rc-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index a5bd2ee..d780d5d 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -232,7 +232,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.3.18-rc" +#define VERSION "0.2.3.18-rc-dev"

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.3'
by nickm＠torproject.org 29 Jun '12

29 Jun '12

commit 630677f339dda6fbb720380d42cfe247b85eb1a8 Merge: da3edc4 9c5a118 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 29 00:38:30 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.3'

1 0

[tor/master] Fix clang warning on d4285f03df475dc. Not in any released tor.
by nickm＠torproject.org 29 Jun '12

29 Jun '12

commit da3edc4df0783778833b6f8660f73047a280e308 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 29 00:22:57 2012 -0400 Fix clang warning on d4285f03df475dc. Not in any released tor. --- src/common/util.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 4850e04..492ea32 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -2872,7 +2872,7 @@ tor_vsscanf(const char *buf, const char *pattern, va_list ap) unsigned *out = va_arg(ap, unsigned *); if (u > UINT_MAX) return n_matched; - *out = u; + *out = (unsigned) u; } ++pattern; ++n_matched;

1 0

[orbot/master] updated manifest version
by n8fr8＠torproject.org 29 Jun '12

29 Jun '12

commit 7ab5fae52258fc8c49f429e6278cd7b9e3b1ff0d Author: n8fr8 <nathan(a)freitas.net> Date: Thu Jun 28 22:54:07 2012 -0400 updated manifest version --- AndroidManifest.xml | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index b913ef8..99dff50 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android" - android:versionName="0.2.3.17-beta-1.0.9-rc3" - android:versionCode="41" + android:versionName="0.2.3.17-beta-1.0.9-rc4" + android:versionCode="42" android:installLocation="auto" > <uses-permission android:name="android.permission.INTERNET" /> @@ -11,7 +11,8 @@ <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="15"/> <application android:name=".OrbotApp" android:icon="@drawable/icon" android:label="@string/app_name" - android:configChanges="locale|orientation"> + android:configChanges="locale" + > <activity android:name=".Orbot"> <intent-filter>

1 0

[orbot/master] fixed check for tor binary and install process
by n8fr8＠torproject.org 29 Jun '12

29 Jun '12

commit 2d4ebe27ee98501dc2924af89179cea126bf86a6 Author: n8fr8 <nathan(a)freitas.net> Date: Thu Jun 28 22:02:09 2012 -0400 fixed check for tor binary and install process --- src/org/torproject/android/service/TorService.java | 40 +++++++++++--------- 1 files changed, 22 insertions(+), 18 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 85095ee..74a91cf 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -205,25 +205,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst initTorPaths(); - //if Tor was deleted for some reason, do this again! - if (!fileTor.exists()) - { - new Thread () - { - public void run () - { - try { - checkTorBinaries (false); - } catch (Exception e) { - logNotice("unable to find tor binaries: " + e.getMessage()); - showToolbarNotification(getString(R.string.error_installing_binares), ERROR_NOTIFY_ID, R.drawable.tornotificationerr, -1); - - Log.e(TAG, "error checking tor binaries", e); - } - } - }.start(); - } } @@ -1157,6 +1139,28 @@ public class TorService extends Service implements TorServiceConstants, TorConst _torInstance = this; initTorPaths(); + //android.os.Debug.waitForDebugger(); + + //if Tor was deleted for some reason, do this again! + if (!fileTor.exists()) + { + new Thread () + { + public void run () + { + try { + checkTorBinaries (false); + } catch (Exception e) { + + logNotice("unable to find tor binaries: " + e.getMessage()); + showToolbarNotification(getString(R.string.error_installing_binares), ERROR_NOTIFY_ID, R.drawable.tornotificationerr, -1); + + Log.e(TAG, "error checking tor binaries", e); + } + } + }.start(); + } + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);

1 0

[orbot/master] transproxy app manager reset to show all apps
by n8fr8＠torproject.org 29 Jun '12

29 Jun '12

commit ecf3c79b726bad91c4ca7636c65fe47dad1c83eb Author: n8fr8 <nathan(a)freitas.net> Date: Thu Jun 28 17:00:41 2012 -0400 transproxy app manager reset to show all apps attempted to 'detect' if an app had internet permissions but that was not working --- .../torproject/android/settings/AppManager.java | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/android/settings/AppManager.java b/src/org/torproject/android/settings/AppManager.java index a88a4d7..db641ae 100644 --- a/src/org/torproject/android/settings/AppManager.java +++ b/src/org/torproject/android/settings/AppManager.java @@ -237,12 +237,15 @@ public class AppManager extends Activity implements OnCheckedChangeListener, OnC } + /* + * TODO n8fr8 June 2012: adding all apps for now b/c the Internet permission concept is not really working if (!app.usesInternet()) continue; else { apps.add(app); - } + }*/ + apps.add(app); app.setEnabled(aInfo.enabled); app.setUid(aInfo.uid);

1 0

[orbot/master] cleaned up background view, removed unused thread
by n8fr8＠torproject.org 29 Jun '12

29 Jun '12

commit eb2b7531c9c38b4e81743a86cd3bd8b9771e58da Author: n8fr8 <nathan(a)freitas.net> Date: Thu Jun 28 17:01:24 2012 -0400 cleaned up background view, removed unused thread --- src/org/torproject/android/AnimatedBlockView.java | 41 ++++----------------- 1 files changed, 8 insertions(+), 33 deletions(-) diff --git a/src/org/torproject/android/AnimatedBlockView.java b/src/org/torproject/android/AnimatedBlockView.java index 1599ccd..7ba4e63 100644 --- a/src/org/torproject/android/AnimatedBlockView.java +++ b/src/org/torproject/android/AnimatedBlockView.java @@ -13,7 +13,8 @@ import android.view.MotionEvent; import android.view.View; import android.view.View.MeasureSpec; -public class AnimatedBlockView extends View implements Runnable { +public class AnimatedBlockView extends View +{ private Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG); @@ -22,14 +23,6 @@ public class AnimatedBlockView extends View implements Runnable { Random rand = new Random(); - private Handler mHandler = new Handler() - { - public void handleMessage(Message msg) { - - invalidate(); - } - }; - public AnimatedBlockView(Context context) { super(context); @@ -54,15 +47,15 @@ public class AnimatedBlockView extends View implements Runnable { paint.setColor(Color.WHITE); paint.setAntiAlias(true); - new Thread (this).start(); - } @Override protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { - // TODO Auto-generated method stub - setMeasuredDimension(MeasureSpec.getSize(widthMeasureSpec), + super.onMeasure(widthMeasureSpec, heightMeasureSpec); + + setMeasuredDimension(MeasureSpec.getSize(widthMeasureSpec), MeasureSpec.getSize(heightMeasureSpec)); + } int a1 = 30; @@ -71,6 +64,7 @@ public class AnimatedBlockView extends View implements Runnable { @Override protected void onDraw(Canvas canvas) { + super.onDraw(canvas); for (int i = 0; i < 20; i++) { @@ -104,26 +98,6 @@ public class AnimatedBlockView extends View implements Runnable { } - - public void run () - { - - - /*while (true) - { - - - try - { - Thread.sleep(10); - } - catch (Exception e) - {} - - mHandler.sendEmptyMessage(0); - - }*/ - } @Override public boolean onTouchEvent(MotionEvent event) { @@ -155,6 +129,7 @@ public class AnimatedBlockView extends View implements Runnable { } return true; + } } \ No newline at end of file

1 0