From: swalker <swalker@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 15 Feb 2012 00:44:33 +0000 (+0000)
Subject: [packages] tor-alpha: update to 0.2.3.12-alpha, refresh patches
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=1dac78cbf030d38ae5bdec5f4d38107eba1316e0;p=packages.git

[packages] tor-alpha: update to 0.2.3.12-alpha, refresh patches


git-svn-id: svn://svn.openwrt.org/openwrt/packages@30544 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/net/tor-alpha/Makefile b/net/tor-alpha/Makefile
index 69646c533..2e2912cb4 100644
--- a/net/tor-alpha/Makefile
+++ b/net/tor-alpha/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tor-alpha
-PKG_VERSION:=0.2.3.11-alpha
+PKG_VERSION:=0.2.3.12-alpha
 PKG_RELEASE:=1
 
 PKG_SOURCE:=tor-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://www.torproject.org/dist \
 	https://archive.torproject.org/tor-package-archive
-PKG_MD5SUM:=917f2952f464371727641320292c9a9e
+PKG_MD5SUM:=16dc8b7567662750e33f35afbbc6f089
 
 PKG_BUILD_DEPENDS:=libnatpmp
 PKG_BUILD_DIR:=$(BUILD_DIR)/tor-$(PKG_VERSION)
diff --git a/net/tor-alpha/patches/001-torrc.patch b/net/tor-alpha/patches/001-torrc.patch
index c788dd0c7..8c9e03192 100644
--- a/net/tor-alpha/patches/001-torrc.patch
+++ b/net/tor-alpha/patches/001-torrc.patch
@@ -1,6 +1,6 @@
 --- a/src/config/torrc.sample.in
 +++ b/src/config/torrc.sample.in
-@@ -44,11 +44,11 @@ SocksListenAddress 127.0.0.1 # accept co
+@@ -46,11 +46,11 @@ SocksListenAddress 127.0.0.1 # accept co
  ## Uncomment this to start the process in the background... or use
  ## --runasdaemon 1 on the command line. This is ignored on Windows;
  ## see the FAQ entry if you want Tor to run as an NT service.
@@ -14,8 +14,8 @@
  
  ## The port on which Tor will listen for local connections from Tor
  ## controller applications, as documented in control-spec.txt.
-@@ -168,3 +168,4 @@ SocksListenAddress 127.0.0.1 # accept co
- #BridgeRelay 1
- #ExitPolicy reject *:*
+@@ -182,3 +182,4 @@ SocksListenAddress 127.0.0.1 # accept co
+ ## address manually to your friends, uncomment this line:
+ #PublishServerDescriptor 0
  
 +User tor
diff --git a/net/tor-alpha/patches/002-add-tor-socket-t-header.patch b/net/tor-alpha/patches/002-add-tor-socket-t-header.patch
index 81dda91a6..d34a6620f 100644
--- a/net/tor-alpha/patches/002-add-tor-socket-t-header.patch
+++ b/net/tor-alpha/patches/002-add-tor-socket-t-header.patch
@@ -6,5 +6,5 @@
  #include "orconfig.h"
 +#include "compat.h"
  #ifdef NAT_PMP
- #ifdef MS_WINDOWS
+ #ifdef _WIN32
  #define STATICLIB