[or-cvs] r19182: {torvm} Use updated po2wxl in Vidalia so translations work again, kl (in torvm/trunk/build/win32: . files patches)

[coderman at seul.org]

Author: coderman
Date: 2009-03-29 15:19:39 -0400 (Sun, 29 Mar 2009)
New Revision: 19182

Added:
   torvm/trunk/build/win32/files/build-geoip-cache.sh
Modified:
   torvm/trunk/build/win32/Makefile
   torvm/trunk/build/win32/patches/vidalia-torvm.patch
Log:
Use updated po2wxl in Vidalia so translations work again, kludge the geoip cache script for now and unwind it from the other Vidalia patches.

Modified: torvm/trunk/build/win32/Makefile
===================================================================
--- torvm/trunk/build/win32/Makefile	2009-03-29 13:53:36 UTC (rev 19181)
+++ torvm/trunk/build/win32/Makefile	2009-03-29 19:19:39 UTC (rev 19182)
@@ -217,7 +217,7 @@
 VIDALIA_TGZ=$(VIDALIA_NAME).tar.gz
 VIDALIA_SVN=https://svn.vidalia-project.net/svn/vidalia/
 VIDALIA_BR=trunk
-VIDALIA_VER=3645
+VIDALIA_VER=3646
 
 # for package resources
 TORSVN_NAME=tor-latest
@@ -389,7 +389,7 @@
 	$(UNZIP) $(WDLDIR)/$(WIXSRC_F) -d wixsrc; tar zcf $(ISODIR)/dl/$(WIXSRC_TGZ) wixsrc; rm -rf wixsrc $(ISODIR)/dl/$(WIXSRC_F); \
 	echo "--- Exporting Vidalia version $(VIDALIA_VER) from local mirror ..."; \
 	rm -rf $(VIDALIA_NAME); $(SVNCMD) export --revision $(VIDALIA_VER) $(SDLDIR)/$(VIDALIA_NAME) $(VIDALIA_NAME); \
-	( echo "Updating geoip cache in Vidalia source tree ..."; cd $(VIDALIA_NAME)/pkg; ./build-geoip-cache.sh ; ls -l geoip-cache ); \
+	( echo "Updating geoip cache in Vidalia source tree ..."; cp -f files/build-geoip-cache.sh $(VIDALIA_NAME)/pkg/; cd $(VIDALIA_NAME)/pkg; ./build-geoip-cache.sh ; ls -l geoip-cache ); \
 	tar zcf $(ISODIR)/dl/src/$(VIDALIA_TGZ) $(VIDALIA_NAME); rm -rf $(VIDALIA_NAME); \
 	echo "--- Exporting Marble revision $(MARBLE_VER) from local mirror ..."; \
 	rm -rf $(MARBLE_NAME); $(SVNCMD) export --revision $(MARBLE_VER) $(SDLDIR)/$(MARBLE_NAME) $(MARBLE_NAME) ; \

Added: torvm/trunk/build/win32/files/build-geoip-cache.sh
===================================================================
--- torvm/trunk/build/win32/files/build-geoip-cache.sh	                        (rev 0)
+++ torvm/trunk/build/win32/files/build-geoip-cache.sh	2009-03-29 19:19:39 UTC (rev 19182)
@@ -0,0 +1,31 @@
+#!/bin/bash
+##
+##  $Id: build-geoip-cache.sh 2362 2008-02-29 04:30:11Z edmanm $
+## 
+##  This file is part of Vidalia, and is subject to the license terms in the
+##  LICENSE file, found in the top level directory of this distribution. If 
+##  you did not receive the LICENSE file with this file, you may obtain it
+##  from the Vidalia source package distributed by the Vidalia Project at
+##  http://www.vidalia-project.net/. No part of Vidalia, including this file,
+##  may be copied, modified, propagated, or distributed except according to
+##  the terms described in the LICENSE file.
+##
+
+
+DIRURL="http://tor.noreply.org/tor/status/all"
+GEOIPURL="http://peertech.org/geoip"
+CACHEFILE="geoip-cache"
+
+# Fetch a list of server IP addresses
+ipaddrs=$(wget -q -O - "$DIRURL" | awk '$1 == "r" { print $7 }' | sort | uniq | tr "\n" ",")
+
+# Get GeoIP information for each IP address
+geoips=$(wget -q -O - --post-data="ip=$ipaddrs" "$GEOIPURL")
+
+# Cache the GeoIP information with timestamps
+IFS=$'\n'
+rm -f $CACHEFILE
+for geoip in $geoips; do
+  echo "$geoip" >> "$CACHEFILE"
+done
+

Modified: torvm/trunk/build/win32/patches/vidalia-torvm.patch
===================================================================
--- torvm/trunk/build/win32/patches/vidalia-torvm.patch	2009-03-29 13:53:36 UTC (rev 19181)
+++ torvm/trunk/build/win32/patches/vidalia-torvm.patch	2009-03-29 19:19:39 UTC (rev 19182)
@@ -17,40 +17,6 @@
  
  ## Check for the sizes of various data types
  check_type_size(int SIZEOF_INT)
-diff -Naur a/pkg/build-geoip-cache.sh b/pkg/build-geoip-cache.sh
---- a/pkg/build-geoip-cache.sh	2008-02-29 04:30:11.928307000 +0000
-+++ b/pkg/build-geoip-cache.sh	2009-03-16 05:33:25.000000000 +0000
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- ##
- ##  $Id: build-geoip-cache.sh 2362 2008-02-29 04:30:11Z edmanm $
- ## 
-@@ -13,15 +13,9 @@
- 
- 
- DIRURL="http://tor.noreply.org/tor/status/all"
--GEOIPURL="http://geoip.vidalia-project.net/cgi-bin/geoip"
-+GEOIPURL="http://peertech.org/geoip"
- CACHEFILE="geoip-cache"
- 
--if [ "$1" == "-notimestamp" -o "$1" == "--notimestamp" ]; then
--  timestamp=""
--else
--  timestamp=":$(date +%s)"
--fi
--
- # Fetch a list of server IP addresses
- ipaddrs=$(wget -q -O - "$DIRURL" | awk '$1 == "r" { print $7 }' | sort | uniq | tr "\n" ",")
- 
-@@ -32,6 +26,6 @@
- IFS=$'\n'
- rm -f $CACHEFILE
- for geoip in $geoips; do
--  echo "$geoip""$timestamp" >> "$CACHEFILE"
-+  echo "$geoip" >> "$CACHEFILE"
- done
- 
 diff -Naur a/pkg/win32/polipo.conf b/pkg/win32/polipo.conf
 --- a/pkg/win32/polipo.conf	2008-04-06 00:00:07.066809000 +0000
 +++ b/pkg/win32/polipo.conf	2009-03-07 12:47:21.000000000 +0000