diff options
| author | bf <bf@FreeBSD.org> | 2011-10-28 13:21:44 +0800 |
|---|---|---|
| committer | bf <bf@FreeBSD.org> | 2011-10-28 13:21:44 +0800 |
| commit | b93a4ea3c50533fb84a37f531dca4be0bd58fde9 (patch) | |
| tree | eba4598f37494007fdba47c7cf44c8299a907eee /security/tor-devel | |
| parent | a8e60aa97e8bd6cfc83fde79445879013e9319e4 (diff) | |
| download | freebsd-ports-gnome-b93a4ea3c50533fb84a37f531dca4be0bd58fde9.tar.gz freebsd-ports-gnome-b93a4ea3c50533fb84a37f531dca4be0bd58fde9.tar.zst freebsd-ports-gnome-b93a4ea3c50533fb84a37f531dca4be0bd58fde9.zip | |
update tor to 0.2.2.34, and tor-devel to 0.2.3.6-alpha
Security: CVE-2011-2768
Diffstat (limited to 'security/tor-devel')
| -rw-r--r-- | security/tor-devel/Makefile | 2 | ||||
| -rw-r--r-- | security/tor-devel/distinfo | 4 | ||||
| -rw-r--r-- | security/tor-devel/files/patch-configure | 28 |
3 files changed, 17 insertions, 17 deletions
diff --git a/security/tor-devel/Makefile b/security/tor-devel/Makefile index 67815afd0c57..604a3dda072b 100644 --- a/security/tor-devel/Makefile +++ b/security/tor-devel/Makefile @@ -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/ \ diff --git a/security/tor-devel/distinfo b/security/tor-devel/distinfo index 6b78cd8cf201..9b2dd497b79f 100644 --- a/security/tor-devel/distinfo +++ b/security/tor-devel/distinfo @@ -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 diff --git a/security/tor-devel/files/patch-configure b/security/tor-devel/files/patch-configure index 0c1bdb4972c9..51fb9ee0b383 100644 --- a/security/tor-devel/files/patch-configure +++ b/security/tor-devel/files/patch-configure @@ -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 |