From: Stephen Walker <stephendwalker@gmail.com>
Date: Sat, 16 Apr 2011 18:43:00 +0000 (+0000)
Subject: [packages] tor-alpha: update to 0.2.2.24-alpha, add geoip package
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=e00058640c292fcd421c3e046cec3c4794332a9d;p=openwrt%2Fsvn-archive%2Farchive.git

[packages] tor-alpha: update to 0.2.2.24-alpha, add geoip package


SVN-Revision: 26694
---

diff --git a/net/tor-alpha/Makefile b/net/tor-alpha/Makefile
index e865f7aa6c..254205f201 100644
--- a/net/tor-alpha/Makefile
+++ b/net/tor-alpha/Makefile
@@ -8,28 +8,26 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tor-alpha
-PKG_VERSION:=0.2.2.23-alpha
+PKG_VERSION:=0.2.2.24-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:=1585bcb3de34dee8ee8f3ce73eea22f3
-PKG_BUILD_DIR=$(BUILD_DIR)/tor-$(PKG_VERSION)/
+PKG_MD5SUM:=4c1e2c7d778f813d09227433fffe3990
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/tor-$(PKG_VERSION)
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/tor-alpha
+define Package/tor-alpha/Default
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+libevent +libopenssl +libpthread +librt +miniupnpc
-  TITLE:=An anonymous Internet communication system
   URL:=https://www.torproject.org/
 endef
 
-define Package/tor-alpha/description
+define Package/tor-alpha/Default/description
  Tor is a toolset for a wide range of organizations and people that want to
  improve their safety and security on the Internet. Using Tor can help you
  anonymize web browsing and publishing, instant messaging, IRC, SSH, and
@@ -37,6 +35,28 @@ define Package/tor-alpha/description
  new applications with built-in anonymity, safety, and privacy features.
 endef
 
+define Package/tor-alpha
+$(call Package/tor-alpha/Default)
+  TITLE:=An anonymous Internet communication system
+  DEPENDS:=+libevent +libopenssl +libpthread +librt +miniupnpc
+endef
+
+define Package/tor-alpha/description
+$(call Package/tor-alpha/Default/description)
+ This package contains the tor daemon.
+endef
+
+define Package/tor-alpha-geoip
+$(call Package/tor-alpha/Default)
+  TITLE:=GeoIP db for tor
+  DEPENDS:=+tor-alpha
+endef
+
+define Package/tor-alpha-geoip/description
+$(call Package/tor-alpha/Default/description)
+ This package contains a GeoIP database mapping IP addresses to countries.
+endef
+
 define Package/tor-alpha/conffiles
 /etc/tor/torrc
 endef
@@ -98,4 +118,10 @@ define Package/tor-alpha/install
 	$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/tor/torrc.sample $(1)/etc/tor/torrc
 endef
 
+define Package/tor-alpha-geoip/install
+	$(INSTALL_DIR) $(1)/usr/share/tor
+	$(CP) $(PKG_INSTALL_DIR)/usr/share/tor/geoip $(1)/usr/share/tor/
+endef
+
 $(eval $(call BuildPackage,tor-alpha))
+$(eval $(call BuildPackage,tor-alpha-geoip))