aboutsummaryrefslogtreecommitdiff
path: root/security/tor
diff options
context:
space:
mode:
authorBrendan Fabeny <bf@FreeBSD.org>2011-10-28 05:21:44 +0000
committerBrendan Fabeny <bf@FreeBSD.org>2011-10-28 05:21:44 +0000
commitf211ad2bf55ae401400134bb5f2e5ad97ba4dd9b (patch)
tree786fcdef91e1036ea63885e22c200935a4c420e3 /security/tor
parent2afc66e56b7341afd6a67c71f9e158fe74458c77 (diff)
downloadports-f211ad2bf55ae401400134bb5f2e5ad97ba4dd9b.tar.gz
ports-f211ad2bf55ae401400134bb5f2e5ad97ba4dd9b.zip
Notes
Diffstat (limited to 'security/tor')
-rw-r--r--security/tor/Makefile3
-rw-r--r--security/tor/distinfo4
-rw-r--r--security/tor/files/patch-configure22
3 files changed, 14 insertions, 15 deletions
diff --git a/security/tor/Makefile b/security/tor/Makefile
index efa7b94f96f1..43d3b06cc32a 100644
--- a/security/tor/Makefile
+++ b/security/tor/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= tor
-DISTVERSION= 0.2.2.33
-PORTREVISION= 1
+DISTVERSION= 0.2.2.34
CATEGORIES= security net ipv6
MASTER_SITES= https://www.torproject.org/dist/ \
ftp://ftp.bit.nl/mirror/tor/ \
diff --git a/security/tor/distinfo b/security/tor/distinfo
index bf9ac66e7ce8..0d312d18da7a 100644
--- a/security/tor/distinfo
+++ b/security/tor/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tor-0.2.2.33.tar.gz) = 5af42b1cc07704fcbde8bb44380e5a02ebedc75470a132c70022ecb5f8476bcf
-SIZE (tor-0.2.2.33.tar.gz) = 2719888
+SHA256 (tor-0.2.2.34.tar.gz) = a027a535b35e5f9ca7091e4c83a06b4be48f0f95d6906bdd467ccc0659e7e798
+SIZE (tor-0.2.2.34.tar.gz) = 2752710
diff --git a/security/tor/files/patch-configure b/security/tor/files/patch-configure
index fec931ffb57a..8ca0672c6970 100644
--- a/security/tor/files/patch-configure
+++ b/security/tor/files/patch-configure
@@ -1,24 +1,24 @@
---- configure.orig 2011-08-27 00:17:47.000000000 -0400
-+++ configure 2011-08-30 05:20:28.000000000 -0400
-@@ -2516,7 +2516,7 @@
+--- configure.orig 2011-10-26 20:22:26.000000000 -0400
++++ configure 2011-10-27 23:49:02.000000000 -0400
+@@ -3268,7 +3268,7 @@
# Check whether --enable-linker-hardening was given.
- if test "${enable_linker_hardening+set}" = set; then
+ if test "${enable_linker_hardening+set}" = set; then :
enableval=$enable_linker_hardening; if test x$enableval = xyes; then
- LDFLAGS="$LDFLAGS -z relro -z now"
+ LDFLAGS="$LDFLAGS -Wl,-z,relro -Wl,-z,now"
fi
fi
-@@ -6503,7 +6503,7 @@
+@@ -5984,7 +5984,7 @@
ac_res=$ac_cv_search_clock_gettime
- if test "$ac_res" != no; then
+ if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
- have_rt=yes
+# have_rt=yes
fi
if test "$have_rt" = yes; then
-@@ -6512,6 +6512,7 @@
+@@ -5993,6 +5993,7 @@
fi
@@ -26,7 +26,7 @@
trylibeventdir=""
# Check whether --with-libevent-dir was given.
-@@ -6922,6 +6923,7 @@
+@@ -6319,6 +6320,7 @@
LIBS="$tor_saved_LIBS"
LDFLAGS="$tor_saved_LDFLAGS"
CPPFLAGS="$tor_saved_CPPFLAGS"
@@ -34,15 +34,15 @@
-@@ -7293,6 +7295,7 @@
+@@ -6381,6 +6383,7 @@
fi
+if false ; then
if test "$enable_static_libevent" = "yes"; then
if test "$tor_cv_library_libevent_dir" = "(system)"; then
- { { echo "$as_me:$LINENO: error: \"You must specify an explicit --with-libevent-dir=x option when using --enable-static-libevent\"" >&5
-@@ -7304,6 +7307,7 @@
+ as_fn_error $? "\"You must specify an explicit --with-libevent-dir=x option when using --enable-static-libevent\"" "$LINENO" 5
+@@ -6390,6 +6393,7 @@
else
TOR_LIBEVENT_LIBS="-levent"
fi