bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[packages] tor: update to 0.2.3.25, add fw-helper package & package descriptions, add libssp dependency if enabled

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@34435 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
swalker 2012-12-01 22:10:13 +00:00
parent 5fcea13f6f
commit 35b181a422
2 changed files with 44 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
net/tor/Makefile
View File

@ -8,14 +8,15 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=tor
PKG_VERSION:=0.2.2.39
PKG_VERSION:=0.2.3.25
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:=9157a1f02fcda9d7d2c5744176373abd
PKG_MD5SUM:=a1c364189a9a66ed9daa8e6436489daf
PKG_BUILD_DEPENDS:=libminiupnpc libnatpmp
PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
@ -37,7 +38,23 @@ endef
define Package/tor
$(call Package/tor/Default)
TITLE:=An anonymous Internet communication system
DEPENDS:=+libevent2 +libopenssl +libpthread +librt
DEPENDS:=+libevent2 +libopenssl +libpthread +librt +SSP_SUPPORT:libssp
endef
define Package/tor/description
$(call Package/tor/Default/description)
This package contains the tor daemon.
endef
define Package/tor-fw-helper
$(call Package/tor/Default)
TITLE:=Firewall helper for tor
DEPENDS:=+tor +libminiupnpc +libnatpmp
endef
define Package/tor-fw-helper/description
$(call Package/tor/Default/description)
This package contains a helper for automatically configuring port forwarding.
endef
define Package/tor-geoip
@ -46,6 +63,11 @@ $(call Package/tor/Default)
DEPENDS:=+tor
endef
define Package/tor-geoip/description
$(call Package/tor/Default/description)
This package contains a GeoIP database mapping IP addresses to countries.
endef
define Package/tor/conffiles
/etc/tor/torrc
endef
@ -53,8 +75,17 @@ endef
CONFIGURE_ARGS += \
--with-libevent-dir="$(STAGING_DIR)/usr" \
--with-ssl-dir="$(STAGING_DIR)/usr" \
--enable-upnp \
--with-libminiupnpc-dir="$(STAGING_DIR)/usr" \
--enable-nat-pmp \
--with-libnatpmp-dir="$(STAGING_DIR)/usr" \
--disable-asciidoc
ifneq ($(CONFIG_SSP_SUPPORT),y)
CONFIGURE_ARGS += \
--disable-gcc-hardening
endif
CONFIGURE_VARS += \
CROSS_COMPILE="yes"
@ -71,10 +102,16 @@ define Package/tor/install
$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/tor/torrc.sample $(1)/etc/tor/torrc
endef
define Package/tor-fw-helper/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/tor-fw-helper $(1)/usr/bin/
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-fw-helper))
$(eval $(call BuildPackage,tor-geoip))

8
net/tor/patches/001-torrc.patch
View File

@ -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
@@ -45,11 +45,11 @@
## 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 *:*
@@ -187,3 +187,4 @@
## address manually to your friends, uncomment this line:
#PublishServerDescriptor 0
+User tor