#
-# Copyright (C) 2008-2010 OpenWrt.org
+# Copyright (C) 2008-2011 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
include $(TOPDIR)/rules.mk
PKG_NAME:=tor
-PKG_VERSION:=0.2.1.28
+PKG_VERSION:=0.2.1.30
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.torproject.org/dist
-PKG_MD5SUM:=11e8384414623b50fe50ba7da85893db
+PKG_SOURCE_URL:=https://www.torproject.org/dist \
+ https://archive.torproject.org/tor-package-archive
+PKG_MD5SUM:=6c6d61e053af5969a245d025c4cfce9d
PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
-define Package/tor
+define Package/tor/Default
SECTION:=net
CATEGORY:=Network
- DEPENDS:=+libevent +libopenssl +libpthread
- TITLE:=An anonymous Internet communication system
- URL:=http://www.torproject.org/
+ URL:=https://www.torproject.org/
endef
-define Package/tor/description
+define Package/tor/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
new applications with built-in anonymity, safety, and privacy features.
endef
+define Package/tor
+$(call Package/tor/Default)
+ TITLE:=An anonymous Internet communication system
+ DEPENDS:=+libevent +libopenssl +libpthread +librt
+endef
+
+define Package/tor-geoip
+$(call Package/tor/Default)
+ TITLE:=GeoIP db for tor
+ DEPENDS:=+tor
+endef
+
define Package/tor/conffiles
/etc/tor/torrc
endef
$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/tor/torrc.sample $(1)/etc/tor/torrc
endef
+define Package/tor-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))
+$(eval $(call BuildPackage,tor-geoip))