tor: update to version 0.4.3.6 (security fix)

[librecmc/librecmc.git] / package / network / services / tor / Makefile

diff --git a/package/network/services/tor/Makefile b/package/network/services/tor/Makefile
index 0110e8c482edc511ef44961566943274499c65db..c7081f5c1f4ba514d660d3a8b6a3b7c9d26ee5b6 100644 (file)
--- 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.2.5
-PKG_RELEASE:=2
+PKG_VERSION:=0.4.3.6
+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:=4d5975862e7808faebe9960def6235669fafeeac844cb76965501fa7af79d8c2
+PKG_HASH:=6a2d0637d4e514be2ec574723a05065245cce51da78a21cec1dc831be5ccac62
 PKG_MAINTAINER:=Hauke Mehrtens <hauke@hauke-m.de> \
                Peter Wagner <tripolar@gmx.at>
 PKG_LICENSE_FILES:=LICENSE
@@ -89,6 +89,7 @@ define Package/tor/conffiles
 /etc/tor/torrc
 /var/lib/tor/fingerprint
 /var/lib/tor/keys/*
+/etc/config/tor
 endef
 
 CONFIGURE_ARGS += \
@@ -102,18 +103,12 @@ CONFIGURE_ARGS += \
        --disable-lzma \
        --disable-zstd \
        --with-tor-user=tor \
-       --with-tor-group=tor
+       --with-tor-group=tor \
+       --with-pic
 
 TARGET_CFLAGS += -ffunction-sections -fdata-sections -flto
 TARGET_LDFLAGS += -Wl,--gc-sections -flto
 
-ifneq ($(CONFIG_SSP_SUPPORT),y)
-       CONFIGURE_ARGS += \
-               --disable-gcc-hardening
-else
-       EXTRA_CFLAGS += $(FPIC)
-endif
-
 CONFIGURE_VARS += \
        CROSS_COMPILE="yes"
 
@@ -124,6 +119,8 @@ define Package/tor/install
        $(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
+       $(INSTALL_DIR) $(1)/etc/config
+       $(INSTALL_CONF) ./files/tor.conf $(1)/etc/config/tor
 endef
 
 define Package/tor-gencert/install