[or-cvs] r20793: {torvm} Critical bug fix and update Tor before affixing 0.0.3 label (in torvm/trunk/build: kamikaze/common kamikaze/patches win32 win32/src/torvm-w32)

[coderman at seul.org]

Author: coderman
Date: 2009-10-15 03:56:42 -0400 (Thu, 15 Oct 2009)
New Revision: 20793

Modified:
   torvm/trunk/build/kamikaze/common/pkg-cache.mk
   torvm/trunk/build/kamikaze/patches/001-kamikaze-tor-package.patch
   torvm/trunk/build/win32/Makefile
   torvm/trunk/build/win32/src/torvm-w32/torvm.c
Log:
Critical bug fix and update Tor before affixing 0.0.3 label

Modified: torvm/trunk/build/kamikaze/common/pkg-cache.mk
===================================================================
--- torvm/trunk/build/kamikaze/common/pkg-cache.mk	2009-10-15 01:43:52 UTC (rev 20792)
+++ torvm/trunk/build/kamikaze/common/pkg-cache.mk	2009-10-15 07:56:42 UTC (rev 20793)
@@ -128,9 +128,9 @@
 OPENSSL_URL=http://www.openssl.org/source/$(OPENSSL_F)
 OPENSSL_SUM=7e7cd4f3974199b729e6e3a0af08bd4279fde0370a1120c1a3b351ab090c6101
 
-TOR_F=tor-0.2.2.1-alpha.tar.gz
+TOR_F=tor-0.2.2.5-alpha.tar.gz
 TOR_URL=http://www.torproject.org/dist/$(TOR_F)
-TOR_SUM=10c66a84cedc43726fecf219b6c523e54eac4efff57d6ce4d9031a86933de013
+TOR_SUM=8b89fc25d09e00a7bd3d26cbdcda88092aaabed7124c12881b2d4fc8b6434dee
 
 
 # iterative definition to retrieve all of the necessary packages.

Modified: torvm/trunk/build/kamikaze/patches/001-kamikaze-tor-package.patch
===================================================================
--- torvm/trunk/build/kamikaze/patches/001-kamikaze-tor-package.patch	2009-10-15 01:43:52 UTC (rev 20792)
+++ torvm/trunk/build/kamikaze/patches/001-kamikaze-tor-package.patch	2009-10-15 07:56:42 UTC (rev 20793)
@@ -1,6 +1,6 @@
 diff -Naur a/package/tor/Makefile b/package/tor/Makefile
 --- a/package/tor/Makefile	1970-01-01 00:00:00.000000000 +0000
-+++ b/package/tor/Makefile	2009-08-27 04:51:44.182060149 +0000
++++ b/package/tor/Makefile	2009-10-15 07:54:19.441778659 +0000
 @@ -0,0 +1,114 @@
 +#
 +# Copyright (C) 2008 OpenWrt.org
@@ -14,13 +14,13 @@
 +include $(INCLUDE_DIR)/kernel.mk
 +
 +PKG_NAME:=tor
-+PKG_VERSION:=0.2.2.1-alpha
++PKG_VERSION:=0.2.2.5-alpha
 +
 +PKG_RELEASE:=1
 +
 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 +PKG_SOURCE_URL:=http://www.torproject.org/dist/
-+PKG_MD5SUM:=bf7611974dbc546a5368e2926eea4d52
++PKG_MD5SUM:=6cec2090ceb3afdc5b329eb2b009a7d0
 +
 +include $(INCLUDE_DIR)/package.mk
 +

Modified: torvm/trunk/build/win32/Makefile
===================================================================
--- torvm/trunk/build/win32/Makefile	2009-10-15 01:43:52 UTC (rev 20792)
+++ torvm/trunk/build/win32/Makefile	2009-10-15 07:56:42 UTC (rev 20793)
@@ -264,7 +264,7 @@
 TORSRC_NAME=tor-latest
 TORSRC_TGZ=$(TORSRC_NAME).tar.gz
 TORSRC_GIT=git://git.torproject.org/git/tor
-TORSRC_VER=5308eceef3e7287f77d7b10065c9f8341c5dd75b
+TORSRC_VER=d407d81a447f7ff7d53ac838703574c89acbc732
 
 TORBUTTON_NAME=torbutton-latest
 TORBUTTON_TGZ=$(TORBUTTON_NAME).tar.gz

Modified: torvm/trunk/build/win32/src/torvm-w32/torvm.c
===================================================================
--- torvm/trunk/build/win32/src/torvm-w32/torvm.c	2009-10-15 01:43:52 UTC (rev 20792)
+++ torvm/trunk/build/win32/src/torvm-w32/torvm.c	2009-10-15 07:56:42 UTC (rev 20793)
@@ -2018,6 +2018,8 @@
         if (numintf > 0) {
           ce = connlist;
           while (ce) {
+/* For now just check if a non-tor vm device is modified */
+#if 0
             if (strcmp(ce->guid, tapconn->guid) == 0) {
               if (equivconns(ce, tapconn) == FALSE) {
                 linfo("Tap connection modified, resetting to correct values.");
@@ -2034,8 +2036,14 @@
                 flushdns();
               }
             }
-            else {
+#endif
+            if ( (strcmp(ce->guid, tapconn->guid) != 0) &&
+                 (strcmp(ce->guid, brconn->guid) != 0) ) {
+              linfo("Connection modified, downing interface and resetting to correct values.");
               downintf(ce);
+              configbridge();
+              cleararpcache();
+              flushdns();
             }
             ce = ce->next;
           }
@@ -2095,7 +2103,7 @@
   sattr.bInheritHandle = TRUE;
   sattr.lpSecurityDescriptor = NULL;
   cmd = malloc(CMDMAX);
-  if (iso) {
+  if (iso && exists(iso)) {
     isoarg = malloc(CMDMAX);
     snprintf (isoarg, CMDMAX -1,
               "-hdc \"%s\" ",
@@ -2725,12 +2733,13 @@
   }
 
   /* all invocations past this point need a virtual disk at minimum */
+  linfo("Checking virtual disk.");
   if (! checkvirtdisk()) {
     lerror ("Unable to confirm usable virtual disk is present.");
   }
 
   if (!ctx->vmnop) {
-    if (! buildcmdline(ce, ctx->bundle, ctx->indebug, ctx->noinit, &cmdline)) {
+    if (! buildcmdline(ctx->brconn, ctx->bundle, ctx->indebug, ctx->noinit, &cmdline)) {
       lerror ("Unable to generate command line for kernel.");
       goto shutdown;
     }