diff options
Diffstat (limited to 'net/tor/Makefile')
| -rw-r--r-- | net/tor/Makefile | 71 |
1 files changed, 47 insertions, 24 deletions
diff --git a/net/tor/Makefile b/net/tor/Makefile index ce2135ec8..ed5551f9c 100644 --- a/net/tor/Makefile +++ b/net/tor/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2008-2014 OpenWrt.org +# Copyright (C) 2008-2016 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,17 +8,17 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tor -PKG_VERSION:=0.2.7.6 +PKG_VERSION:=0.2.9.11 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://www.torproject.org/dist \ +PKG_SOURCE_URL:=https://dist.torproject.org/ \ https://archive.torproject.org/tor-package-archive -PKG_MD5SUM:=cc19107b57136a68e8c563bf2d35b072 +PKG_MD5SUM:=763ae964e916c2a7a4c5015d351fcf8b +PKG_HASH:=c1959bebff9a546a54cbedb58c8289a42441991af417d2d16f7b336be8903221 PKG_MAINTAINER:=Hauke Mehrtens <hauke@hauke-m.de> PKG_LICENSE_FILES:=LICENSE -PKG_BUILD_DEPENDS:=libminiupnpc libnatpmp PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk @@ -41,7 +41,7 @@ endef define Package/tor $(call Package/tor/Default) TITLE:=An anonymous Internet communication system - DEPENDS:=+libevent2 +libopenssl +libpthread +librt + DEPENDS:=+libevent2 +libopenssl +libpthread +librt +zlib +libcap endef define Package/tor/description @@ -49,15 +49,26 @@ $(call Package/tor/Default/description) This package contains the tor daemon. endef -define Package/tor-fw-helper +define Package/tor-gencert $(call Package/tor/Default) - TITLE:=Firewall helper for tor - DEPENDS:=+tor +libminiupnpc +libnatpmp + TITLE:=Tor certificate generation + DEPENDS:=+tor endef -define Package/tor-fw-helper/description +define Package/tor-gencert/description $(call Package/tor/Default/description) - This package contains a helper for automatically configuring port forwarding. + Generate certs and keys for Tor directory authorities +endef + +define Package/tor-resolve +$(call Package/tor/Default) + TITLE:=tor hostname resolve + DEPENDS:=+tor +endef + +define Package/tor-resolve/description +$(call Package/tor/Default/description) + Resolve a hostname to an IP address via tor endef define Package/tor-geoip @@ -73,26 +84,30 @@ endef define Package/tor/conffiles /etc/tor/torrc +/var/lib/tor/fingerprint +/var/lib/tor/keys/* 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" \ + --with-openssl-dir="$(STAGING_DIR)/usr" \ + --with-zlib-dir="$(STAGING_DIR)/usr" \ --disable-asciidoc \ - --disable-seccomp + --disable-seccomp \ + --disable-libscrypt \ + --disable-unittests \ + --disable-largefile \ + --with-tor-user=tor \ + --with-tor-group=tor + +EXTRA_CFLAGS += -std=gnu99 ifneq ($(CONFIG_SSP_SUPPORT),y) CONFIGURE_ARGS += \ --disable-gcc-hardening - MAKE_FLAGS += \ - CFLAGS="$(TARGET_CFLAGS) -std=gnu99" else - MAKE_FLAGS += \ - CFLAGS="$(TARGET_CFLAGS) -fPIC -std=gnu99" + EXTRA_CFLAGS += -fPIC endif CONFIGURE_VARS += \ @@ -101,22 +116,30 @@ CONFIGURE_VARS += \ define Package/tor/install $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/tor $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/torify $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/tor.init $(1)/etc/init.d/tor $(INSTALL_DIR) $(1)/etc/tor $(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/ +define Package/tor-gencert/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/tor-gencert $(1)/usr/sbin/ +endef + +define Package/tor-resolve/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/tor-resolve $(1)/usr/sbin/ endef define Package/tor-geoip/install $(INSTALL_DIR) $(1)/usr/share/tor $(CP) $(PKG_INSTALL_DIR)/usr/share/tor/geoip $(1)/usr/share/tor/ + $(CP) $(PKG_INSTALL_DIR)/usr/share/tor/geoip6 $(1)/usr/share/tor/ endef $(eval $(call BuildPackage,tor)) -$(eval $(call BuildPackage,tor-fw-helper)) +$(eval $(call BuildPackage,tor-gencert)) +$(eval $(call BuildPackage,tor-resolve)) $(eval $(call BuildPackage,tor-geoip)) |