tor: update to version 0.2.9.8

In addition update some configure options and use EXTRA_CFLAGS.
Setting RunAsDaemon to 1 will be overwritten by the init script option
"--runasdaemon 0" anyway and we want it in foreground for procd.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/net/tor/Makefile b/net/tor/Makefile
index 570140d4391a7f03a73a68c3cd0eef1cf33c3027..e4299cc98109e8729e315cb3569c7f686961ec0e 100644 (file)
--- a/net/tor/Makefile
+++ b/net/tor/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tor
-PKG_VERSION:=0.2.8.11
+PKG_VERSION:=0.2.9.8
 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_MD5SUM:=7adea0bfa17edafd4e09453f4f58a0dca737660e5358f9dafd52d55d55dc6ab3
+PKG_MD5SUM:=fbdd33d3384574297b88744622382008d1e0f9ddd300d330746c464b7a7d746a
 PKG_MAINTAINER:=Hauke Mehrtens <hauke@hauke-m.de>
 PKG_LICENSE_FILES:=LICENSE
 
@@ -66,17 +66,23 @@ endef
 CONFIGURE_ARGS += \
        --with-libevent-dir="$(STAGING_DIR)/usr" \
        --with-ssl-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 += \

diff --git a/net/tor/patches/001-torrc.patch b/net/tor/patches/001-torrc.patch
index 47e04f93f7939cdb1207b91b22f6a0b150ab403b..eb315a077b5d59247f1b2d569ed945ecbaa4cb61 100644 (file)
--- a/net/tor/patches/001-torrc.patch
+++ b/net/tor/patches/001-torrc.patch
@@ -1,11 +1,6 @@
 --- a/src/config/torrc.sample.in
 +++ b/src/config/torrc.sample.in
-@@ -46,11 +46,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.
--#RunAsDaemon 1
-+RunAsDaemon 1
+@@ -50,7 +50,7 @@
  
  ## The directory for keeping all the keys/etc. By default, we store
  ## things in $HOME/.tor on Unix, and in Application Data\tor on Windows.
@@ -14,7 +9,7 @@
  
  ## The port on which Tor will listen for local connections from Tor
  ## controller applications, as documented in control-spec.txt.
-@@ -202,3 +202,4 @@
+@@ -204,3 +204,4 @@
  ## address manually to your friends, uncomment this line:
  #PublishServerDescriptor 0