summaryrefslogtreecommitdiff
path: root/package/tor/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'package/tor/Makefile')
-rw-r--r--package/tor/Makefile39
1 files changed, 26 insertions, 13 deletions
diff --git a/package/tor/Makefile b/package/tor/Makefile
index 8bbdad072..39735dcd5 100644
--- a/package/tor/Makefile
+++ b/package/tor/Makefile
@@ -1,23 +1,28 @@
# This file is part of the OpenADK project. OpenADK is copyrighted
# material, please see the LICENCE file in the top-level directory.
-include ${TOPDIR}/rules.mk
+include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= tor
-PKG_VERSION:= 0.2.1.27
+PKG_VERSION:= 0.4.8.16
PKG_RELEASE:= 1
-PKG_MD5SUM:= 1719642b3f25a23c3b3843ee99be18fb
-PKG_DESCR:= An anonymous Internet communication system
-PKG_SECTION:= proxy
-PKG_DEPENDS:= libevent libopenssl zlib libpthread
-PKG_BUILDDEP:= libevent openssl zlib
-PKG_URL:= http://tor.eff.org/
-PKG_SITES:= http://tor.eff.org/dist/
+PKG_HASH:= 6540dd377a120fb8e7d27530aa3b7ff72a0fa5b4f670fe1d64c987c1cfd390cb
+PKG_DESCR:= anonymous internet communication system
+PKG_SECTION:= net/proxy
+PKG_DEPENDS:= libevent zlib libopenssl
+PKG_BUILDDEP:= libevent zlib openssl
+PKG_NEEDS:= threads
+PKG_URL:= https://www.torproject.org/
+PKG_SITES:= https://www.torproject.org/dist/
-include ${TOPDIR}/mk/package.mk
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
-$(eval $(call PKG_template,TOR,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+include ${ADK_TOPDIR}/mk/package.mk
+$(eval $(call PKG_template,TOR,tor,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+# -DNDEBUG not supported
+TARGET_CPPFLAGS:=
CONFIGURE_ENV+= ac_cv_libevent_normal=yes \
ac_cv_libevent_linker_option="" \
ac_cv_libevent_dir="${STAGING_TARGET_DIR}/usr" \
@@ -27,9 +32,17 @@ CONFIGURE_ENV+= ac_cv_libevent_normal=yes \
tor_cv_null_is_zero=yes \
tor_cv_unaligned_ok=yes
-post-install:
+CONFIGURE_ARGS+= --disable-tool-name-check
+
+ifeq ($(ADK_TARGET_USE_SSP),y)
+CONFIGURE_ARGS+= --enable-gcc-hardening
+else
+CONFIGURE_ARGS+= --disable-gcc-hardening
+endif
+
+tor-install:
${INSTALL_DIR} ${IDIR_TOR}/usr/bin ${IDIR_TOR}/etc/tor
${INSTALL_DATA} ./files/torrc ${IDIR_TOR}/etc/tor/
${CP} ${WRKINST}/usr/bin/tor ${IDIR_TOR}/usr/bin/
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk