From: Stephen Walker <stephendwalker@gmail.com>
Date: Sat, 3 Sep 2011 22:53:04 +0000 (+0000)
Subject: [packages] tor: update to 0.2.2.32, disable man pages, refresh patches
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f251f92ba29e7c7a7d50573e30388edb8d477ca7;p=openwrt%2Fsvn-archive%2Farchive.git

[packages] tor: update to 0.2.2.32, disable man pages, refresh patches


SVN-Revision: 28157
---

diff --git a/net/tor/Makefile b/net/tor/Makefile
index d505035a3b..53be6fcbd8 100644
--- a/net/tor/Makefile
+++ b/net/tor/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tor
-PKG_VERSION:=0.2.1.30
+PKG_VERSION:=0.2.2.32
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://www.torproject.org/dist \
 	https://archive.torproject.org/tor-package-archive
-PKG_MD5SUM:=6c6d61e053af5969a245d025c4cfce9d
+PKG_MD5SUM:=6d70db8da9513453d520168e017a272c
 
 PKG_INSTALL:=1
 
@@ -88,13 +88,14 @@ endef
 CONFIGURE_ARGS += \
 	--with-libevent-dir="$(STAGING_DIR)/usr" \
 	--with-ssl-dir="$(STAGING_DIR)/usr" \
+	--disable-asciidoc
 
 CONFIGURE_VARS += \
-	CROSS_COMPILE="yes" \
+	CROSS_COMPILE="yes"
 
 # pass CFLAGS again to override -O2 set by configure
 MAKE_FLAGS += \
-	CFLAGS="$(TARGET_CFLAGS)" \
+	CFLAGS="$(TARGET_CFLAGS)"
 
 define Package/tor/install
 	$(INSTALL_DIR) $(1)/usr/sbin
diff --git a/net/tor/patches/001-torrc.patch b/net/tor/patches/001-torrc.patch
index 08258cf497..a390a6e2d8 100644
--- a/net/tor/patches/001-torrc.patch
+++ b/net/tor/patches/001-torrc.patch
@@ -14,7 +14,7 @@
  
  ## The port on which Tor will listen for local connections from Tor
  ## controller applications, as documented in control-spec.txt.
-@@ -154,3 +154,5 @@ SocksListenAddress 127.0.0.1 # accept co
+@@ -168,3 +168,5 @@ SocksListenAddress 127.0.0.1 # accept co
  #BridgeRelay 1
  #ExitPolicy reject *:*