[or-cvs] r18850: {torvm} Update Tor and Vidalia versions before buildbot kicks off ag (in torvm/trunk/build: kamikaze/patches win32 win32/files)

[coderman at seul.org]

Author: coderman
Date: 2009-03-10 05:43:34 -0400 (Tue, 10 Mar 2009)
New Revision: 18850

Modified:
   torvm/trunk/build/kamikaze/patches/001-kamikaze-tor-package.patch
   torvm/trunk/build/win32/Makefile
   torvm/trunk/build/win32/files/buildall.sh
Log:
Update Tor and Vidalia versions before buildbot kicks off again.

Modified: torvm/trunk/build/kamikaze/patches/001-kamikaze-tor-package.patch
===================================================================
--- torvm/trunk/build/kamikaze/patches/001-kamikaze-tor-package.patch	2009-03-10 09:28:28 UTC (rev 18849)
+++ torvm/trunk/build/kamikaze/patches/001-kamikaze-tor-package.patch	2009-03-10 09:43:34 UTC (rev 18850)
@@ -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-02-01 09:59:07.191839112 +0000
++++ b/package/tor/Makefile	2009-03-10 07:00:07.492772805 +0000
 @@ -0,0 +1,112 @@
 +#
 +# Copyright (C) 2008 OpenWrt.org
@@ -14,13 +14,13 @@
 +include $(INCLUDE_DIR)/kernel.mk
 +
 +PKG_NAME:=tor
-+PKG_VERSION:=0.2.1.11-alpha
++PKG_VERSION:=0.2.1.13-alpha
 +
 +PKG_RELEASE:=1
 +
 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 +PKG_SOURCE_URL:=http://www.torproject.org/dist/
-+PKG_MD5SUM:=c8477aef2c874c7bfd5a1cd6a9e08ade
++PKG_MD5SUM:=eb229b45b23bdf24a7a150332b3c526e
 +# XXX MD5 must die ... maybe time for debian embedded
 +
 +include $(INCLUDE_DIR)/package.mk

Modified: torvm/trunk/build/win32/Makefile
===================================================================
--- torvm/trunk/build/win32/Makefile	2009-03-10 09:28:28 UTC (rev 18849)
+++ torvm/trunk/build/win32/Makefile	2009-03-10 09:43:34 UTC (rev 18850)
@@ -217,14 +217,14 @@
 VIDALIA_TGZ=$(VIDALIA_NAME).tar.gz
 VIDALIA_SVN=https://svn.vidalia-project.net/svn/vidalia/
 VIDALIA_BR=trunk
-VIDALIA_VER=3604
+VIDALIA_VER=3606
 
 # for package resources
 TORSVN_NAME=tor-latest
 TORSVN_TGZ=$(TORSVN_NAME).tar.gz
 TORSVN_SVN=https://tor-svn.freehaven.net/svn/tor/
 TORSVN_BR=trunk
-TORSVN_VER=18833
+TORSVN_VER=18849
 
 TORBUTTON_NAME=torbutton-latest
 TORBUTTON_TGZ=$(TORBUTTON_NAME).tar.gz

Modified: torvm/trunk/build/win32/files/buildall.sh
===================================================================
--- torvm/trunk/build/win32/files/buildall.sh	2009-03-10 09:28:28 UTC (rev 18849)
+++ torvm/trunk/build/win32/files/buildall.sh	2009-03-10 09:43:34 UTC (rev 18850)
@@ -1299,6 +1299,7 @@
   mv save-bin bin
 
   echo "Linking tor MSI installer package ..."
+  candle.exe $CANDLE_OPTS -dEXTLICENSE tor.wxs
   WIX_CAB_CACHE=_tor.cabcache
   WIX_LINKOUT=_tor.wixout
   if [ -e $WIX_CAB_CACHE ]; then