From: RISCi_ATOM <bob@bobcall.me>
Date: Mon, 3 Aug 2020 17:12:34 +0000 (-0400)
Subject: tor: update to version 0.4.3.6 (security fix)
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c9a16ca9de57151ca78a420642b1f73aae19db9c;p=librecmc%2Flibrecmc.git

tor: update to version 0.4.3.6 (security fix)

Applicable CVEs:
* CVE-2020-15572

Notes:
* Removes libssp hack : Upstream pkg. feed: 0df6c58f82f0b84ca08696d9d0760d425ce11917
---

diff --git a/package/network/services/tor/Makefile b/package/network/services/tor/Makefile
index cad225e01b..c7081f5c1f 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.2.7
+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:=06a1d835ddf382f6bca40a62e8fb40b71b2f73d56f0d53523c8bd5caf9b3026d
+PKG_HASH:=6a2d0637d4e514be2ec574723a05065245cce51da78a21cec1dc831be5ccac62
 PKG_MAINTAINER:=Hauke Mehrtens <hauke@hauke-m.de> \
 		Peter Wagner <tripolar@gmx.at>
 PKG_LICENSE_FILES:=LICENSE
@@ -103,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"