mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-22 04:17:44 +00:00
update tor to 0.2.2.34, and tor-devel to 0.2.3.6-alpha
Security: CVE-2011-2768
This commit is contained in:
parent
2afc66e56b
commit
f211ad2bf5
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=284500
@ -6,7 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= tor
|
||||
DISTVERSION= 0.2.3.5-alpha
|
||||
DISTVERSION= 0.2.3.6-alpha
|
||||
CATEGORIES= security net ipv6
|
||||
MASTER_SITES= https://www.torproject.org/dist/ \
|
||||
ftp://ftp.bit.nl/mirror/tor/ \
|
||||
|
@ -1,2 +1,2 @@
|
||||
SHA256 (tor-0.2.3.5-alpha.tar.gz) = 9b5467f4c1229b81e3c4d7e1ffdd17c01b1f5c3b9c5ce030108690d3ef5488d0
|
||||
SIZE (tor-0.2.3.5-alpha.tar.gz) = 2835138
|
||||
SHA256 (tor-0.2.3.6-alpha.tar.gz) = f4562ddfdd673f25811cf3b0c29a7c5d7e81b99e352d9585bc80e1ab010c9c67
|
||||
SIZE (tor-0.2.3.6-alpha.tar.gz) = 2901597
|
||||
|
@ -1,24 +1,24 @@
|
||||
--- configure.orig 2011-07-18 13:22:21.000000000 -0400
|
||||
+++ configure 2011-07-23 16:09:51.000000000 -0400
|
||||
@@ -2579,7 +2579,7 @@
|
||||
--- configure.orig 2011-10-26 20:42:18.000000000 -0400
|
||||
+++ configure 2011-10-27 23:01:20.000000000 -0400
|
||||
@@ -3334,7 +3334,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
|
||||
|
||||
@@ -6816,7 +6816,7 @@
|
||||
@@ -6276,7 +6276,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
|
||||
@@ -6825,6 +6825,7 @@
|
||||
@@ -6285,6 +6285,7 @@
|
||||
fi
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
trylibeventdir=""
|
||||
|
||||
# Check whether --with-libevent-dir was given.
|
||||
@@ -7235,6 +7236,7 @@
|
||||
@@ -6611,6 +6612,7 @@
|
||||
LIBS="$tor_saved_LIBS"
|
||||
LDFLAGS="$tor_saved_LDFLAGS"
|
||||
CPPFLAGS="$tor_saved_CPPFLAGS"
|
||||
@ -34,15 +34,15 @@
|
||||
|
||||
|
||||
|
||||
@@ -7607,6 +7609,7 @@
|
||||
@@ -6673,6 +6675,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
|
||||
@@ -7618,6 +7621,7 @@
|
||||
as_fn_error $? "\"You must specify an explicit --with-libevent-dir=x option when using --enable-static-libevent\"" "$LINENO" 5
|
||||
@@ -6682,6 +6685,7 @@
|
||||
else
|
||||
TOR_LIBEVENT_LIBS="-levent"
|
||||
fi
|
||||
@ -50,9 +50,9 @@
|
||||
|
||||
if test "$enable_bufferevents" = "yes" ; then
|
||||
if test "$ac_cv_header_event2_bufferevent_ssl_h" != "yes" ; then
|
||||
@@ -7750,12 +7754,14 @@
|
||||
#define USE_BUFFEREVENTS 1
|
||||
_ACEOF
|
||||
@@ -6760,12 +6764,14 @@
|
||||
|
||||
$as_echo "#define USE_BUFFEREVENTS 1" >>confdefs.h
|
||||
|
||||
+if false ; then
|
||||
if test "$enable_static_libevent" = "yes"; then
|
||||
|
@ -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/ \
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user