From 7ae3271d7b091fb1b11ee9a5616dc9f9ee9ae28e Mon Sep 17 00:00:00 2001 From: RISCi_ATOM Date: Fri, 14 Jan 2022 13:23:36 -0500 Subject: [PATCH] tor: Bump to 0.4.5.10 --- package/network/services/tor/Makefile | 70 ++++++++++++++----- .../services/tor/patches/001-torrc.patch | 6 +- 2 files changed, 56 insertions(+), 20 deletions(-) diff --git a/package/network/services/tor/Makefile b/package/network/services/tor/Makefile index e1cbff1bff..a9df0c6c3f 100644 --- a/package/network/services/tor/Makefile +++ b/package/network/services/tor/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tor -PKG_VERSION:=0.4.4.9 +PKG_VERSION:=0.4.5.10 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://dist.torproject.org/ \ https://archive.torproject.org/tor-package-archive -PKG_HASH:=e320d04b99ac27d5b7e0d1d5b85fd5b4f3dbb24528196f07520688b45e026e4c +PKG_HASH:=8fe32222f8f2b4e65c6f50ac32eb4dfca59b8af71d0d16781f7ee5bec4c00743 PKG_MAINTAINER:=Hauke Mehrtens \ Peter Wagner PKG_LICENSE_FILES:=LICENSE @@ -31,58 +31,83 @@ define Package/tor/Default CATEGORY:=Network URL:=https://www.torproject.org/ USERID:=tor=52:tor=52 + DEPENDS:=+libevent2 +libopenssl +libpthread +librt +zlib +libcap + TITLE:=Tor routing daemon endef 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 - more. Tor also provides a platform on which software developers can build - new applications with built-in anonymity, safety, and privacy features. +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 +more. Tor also provides a platform on which software developers can build +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:=+libevent2 +libopenssl +libpthread +librt +zlib +libcap + TITLE+= (full) + CONFLICTS:=tor-basic + PROVIDES:=tor-basic + VARIANT:=full endef define Package/tor/description $(call Package/tor/Default/description) - This package contains the tor daemon. + +This package contains the full tor daemon. + +endef + +define Package/tor-basic +$(call Package/tor/Default) + TITLE+= (no bridge/relay support) + VARIANT:=basic +endef + +define Package/tor-basic/description +$(call Package/tor/Default/description) + +This package contains the basic tor daemon, without bridge/relay support. + endef define Package/tor-gencert $(call Package/tor/Default) TITLE:=Tor certificate generation - DEPENDS:=+tor + DEPENDS:=tor endef define Package/tor-gencert/description $(call Package/tor/Default/description) - Generate certs and keys for Tor directory authorities + +Generate certs and keys for Tor directory authorities. + endef define Package/tor-resolve $(call Package/tor/Default) TITLE:=tor hostname resolve - DEPENDS:=+tor + DEPENDS:=tor-basic endef define Package/tor-resolve/description $(call Package/tor/Default/description) - Resolve a hostname to an IP address via tor + +Resolve a hostname to an IP address via tor. + endef define Package/tor-geoip $(call Package/tor/Default) TITLE:=GeoIP db for tor - DEPENDS:=+tor + DEPENDS:=tor-basic endef define Package/tor-geoip/description $(call Package/tor/Default/description) - This package contains a GeoIP database mapping IP addresses to countries. + +This package contains a GeoIP database mapping IP addresses to countries. + endef define Package/tor/conffiles @@ -92,11 +117,15 @@ define Package/tor/conffiles /etc/config/tor endef +Package/tor-basic/conffiles = $(Package/tor/conffiles) + CONFIGURE_ARGS += \ --with-libevent-dir="$(STAGING_DIR)/usr" \ --with-openssl-dir="$(STAGING_DIR)/usr" \ --with-zlib-dir="$(STAGING_DIR)/usr" \ --disable-asciidoc \ + --disable-html-manual \ + --disable-manpage \ --disable-seccomp \ --disable-libscrypt \ --disable-unittests \ @@ -104,7 +133,11 @@ CONFIGURE_ARGS += \ --disable-zstd \ --with-tor-user=tor \ --with-tor-group=tor \ - --with-pic + --enable-pic + +ifeq ($(BUILD_VARIANT),basic) + CONFIGURE_ARGS += --disable-module-relay +endif TARGET_CFLAGS += -ffunction-sections -fdata-sections -flto TARGET_LDFLAGS += -Wl,--gc-sections -flto @@ -124,6 +157,8 @@ define Package/tor/install $(INSTALL_CONF) ./files/tor.conf $(1)/etc/config/tor endef +Package/tor-basic/install = $(Package/tor/install) + define Package/tor-gencert/install $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/tor-gencert $(1)/usr/sbin/ @@ -143,6 +178,7 @@ define Package/tor-geoip/install endef $(eval $(call BuildPackage,tor)) +$(eval $(call BuildPackage,tor-basic)) $(eval $(call BuildPackage,tor-gencert)) $(eval $(call BuildPackage,tor-resolve)) $(eval $(call BuildPackage,tor-geoip)) diff --git a/package/network/services/tor/patches/001-torrc.patch b/package/network/services/tor/patches/001-torrc.patch index 16cae0402f..e4c26266af 100644 --- a/package/network/services/tor/patches/001-torrc.patch +++ b/package/network/services/tor/patches/001-torrc.patch @@ -18,8 +18,8 @@ ## The port on which Tor will listen for local connections from Tor ## controller applications, as documented in control-spec.txt. -@@ -238,3 +238,4 @@ - #%include /etc/torrc.d/ - #%include /etc/torrc.custom +@@ -251,3 +251,4 @@ + ## The %include option can be used recursively. + #%include /etc/torrc.d/*.conf +User tor -- 2.25.1