update to latest upstream

7 files changed, 8 insertions, 107 deletions

diff --git a/package/tor/Makefile b/package/tor/Makefile
index 197b8d815..85c8de729 100644
--- a/package/tor/Makefile
+++ b/package/tor/Makefile
@@ -4,20 +4,22 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		tor
-PKG_VERSION:=		0.2.3.25
-PKG_RELEASE:=		3
-PKG_MD5SUM:=		a1c364189a9a66ed9daa8e6436489daf
-PKG_DESCR:=		An anonymous Internet communication system
+PKG_VERSION:=		0.2.4.21
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		bde981d10e8faf1e171ef1ebbb7b398a
+PKG_DESCR:=		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_URL:=		https://www.torproject.org/
+PKG_SITES:=		https://www.torproject.org/dist/
 
 include ${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" \
diff --git a/package/tor/patches/patch-contrib_suse_tor_sh b/package/tor/patches/patch-contrib_suse_tor_sh
deleted file mode 100644
index 2bc55db33..000000000
--- a/package/tor/patches/patch-contrib_suse_tor_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- tor-0.2.1.20.orig/contrib/suse/tor.sh	2009-10-15 18:16:23.000000000 +0200
-+++ tor-0.2.1.20/contrib/suse/tor.sh	2009-12-03 23:45:45.000000000 +0100
-@@ -43,7 +43,7 @@ rc_reset
- # Increase open file descriptors a reasonable amount
- ulimit -n 8192
- 
--TORCTL=/usr/local/bin/torctl
-+TORCTL=/usr/bin/torctl
- 
- # torctl will use these environment variables
- TORUSER=_tor
diff --git a/package/tor/patches/patch-contrib_tor_sh b/package/tor/patches/patch-contrib_tor_sh
deleted file mode 100644
index 4f953b0fd..000000000
--- a/package/tor/patches/patch-contrib_tor_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- tor-0.2.1.20.orig/contrib/tor.sh	2009-10-15 18:16:22.000000000 +0200
-+++ tor-0.2.1.20/contrib/tor.sh	2009-12-03 23:45:44.000000000 +0100
-@@ -26,7 +26,7 @@ fi
- # Increase open file descriptors a reasonable amount
- ulimit -n 8192
- 
--TORCTL=/usr/local/bin/torctl
-+TORCTL=/usr/bin/torctl
- 
- # torctl will use these environment variables
- TORUSER=_tor
diff --git a/package/tor/patches/patch-contrib_torctl b/package/tor/patches/patch-contrib_torctl
deleted file mode 100644
index b531711db..000000000
--- a/package/tor/patches/patch-contrib_torctl
+++ /dev/null
@@ -1,27 +0,0 @@
---- tor-0.2.1.20.orig/contrib/torctl	2009-10-15 18:16:22.000000000 +0200
-+++ tor-0.2.1.20/contrib/torctl	2009-12-03 23:45:44.000000000 +0100
-@@ -24,19 +24,19 @@
- EXEC=tor
- #
- # the path to your binary, including options if necessary
--TORBIN="/usr/local/bin/$EXEC"
-+TORBIN="/usr/bin/$EXEC"
- #
- # the path to the configuration file
--TORCONF="/usr/local/etc/tor/torrc"
-+TORCONF="/etc/tor/torrc"
- #
- # the path to your PID file
--PIDFILE="/usr/local/var/run/tor/tor.pid"
-+PIDFILE="/var/run/tor/tor.pid"
- #
- # The path to the log file
--LOGFILE="/usr/local/var/log/tor/tor.log"
-+LOGFILE="/var/log/tor/tor.log"
- #
- # The path to the datadirectory
--TORDATA="/usr/local/var/lib/tor"
-+TORDATA="/var/lib/tor"
- #
- TORARGS="--pidfile $PIDFILE --log \"notice file $LOGFILE\" --runasdaemon 1"
- TORARGS="$TORARGS --datadirectory $TORDATA"
diff --git a/package/tor/patches/patch-src_common_util_h b/package/tor/patches/patch-src_common_util_h
deleted file mode 100644
index f6607ffc1..000000000
--- a/package/tor/patches/patch-src_common_util_h
+++ /dev/null
@@ -1,23 +0,0 @@
---- tor-0.2.1.20.orig/src/common/util.h	2009-06-19 08:13:53.000000000 +0200
-+++ tor-0.2.1.20/src/common/util.h	2009-12-03 23:47:21.000000000 +0100
-@@ -24,20 +24,6 @@
- #define O_TEXT 0
- #endif
- 
--/* Replace assert() with a variant that sends failures to the log before
-- * calling assert() normally.
-- */
--#ifdef NDEBUG
--/* Nobody should ever want to build with NDEBUG set.  99% of our asserts will
-- * be outside the critical path anyway, so it's silly to disable bug-checking
-- * throughout the entire program just because a few asserts are slowing you
-- * down.  Profile, optimize the critical path, and keep debugging on.
-- *
-- * And I'm not just saying that because some of our asserts check
-- * security-critical properties.
-- */
--#error "Sorry; we don't support building with NDEBUG."
--#endif
- 
- /** Like assert(3), but send assertion failures to the log as well as to
-  * stderr. */
diff --git a/package/tor/patches/patch-src_or_eventdns_c b/package/tor/patches/patch-src_or_eventdns_c
deleted file mode 100644
index 138469f09..000000000
--- a/package/tor/patches/patch-src_or_eventdns_c
+++ /dev/null
@@ -1,18 +0,0 @@
---- tor-0.2.1.20.orig/src/or/eventdns.c	2009-09-17 08:02:18.000000000 +0200
-+++ tor-0.2.1.20/src/or/eventdns.c	2009-12-03 23:49:27.000000000 +0100
-@@ -375,7 +375,6 @@ error_is_eagain(int err)
- #define TOLOWER(c) TOR_TOLOWER(c)
- #define TOUPPER(c) TOR_TOUPPER(c)
- 
--#ifndef NDEBUG
- static const char *
- debug_ntoa(u32 address)
- {
-@@ -404,7 +403,6 @@ debug_ntop(const struct sockaddr *sa)
- 	}
- 	return "<unknown>";
- }
--#endif
- 
- static evdns_debug_log_fn_type evdns_log_fn = NULL;
- 
diff --git a/package/tor/patches/patch-tor_spec b/package/tor/patches/patch-tor_spec
deleted file mode 100644
index a4bc4adaa..000000000
--- a/package/tor/patches/patch-tor_spec
+++ /dev/null
@@ -1,11 +0,0 @@
---- tor-0.2.1.20.orig/tor.spec	2009-10-15 18:16:22.000000000 +0200
-+++ tor-0.2.1.20/tor.spec	2009-12-03 23:45:44.000000000 +0100
-@@ -101,7 +101,7 @@
- %endif
- 
- %if %{!?_localstatedir:1}%{?_localstatedir:0}
--%define _localstatedir /usr/local/var
-+%define _localstatedir /var
- %endif
- 
- ## Package information