diff options
Diffstat (limited to 'security/tor/files')
| -rw-r--r-- | security/tor/files/patch-configure | 45 | ||||
| -rw-r--r-- | security/tor/files/tor.in | 2 |
2 files changed, 22 insertions, 25 deletions
diff --git a/security/tor/files/patch-configure b/security/tor/files/patch-configure index 8ca0672c6970..fcc1bc234a18 100644 --- a/security/tor/files/patch-configure +++ b/security/tor/files/patch-configure @@ -1,24 +1,6 @@ ---- 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 : - 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 - -@@ -5984,7 +5984,7 @@ - ac_res=$ac_cv_search_clock_gettime - 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 -@@ -5993,6 +5993,7 @@ +--- configure.orig 2012-06-15 03:10:31.000000000 -0400 ++++ configure 2012-06-17 08:46:34.000000000 -0400 +@@ -6319,6 +6319,7 @@ fi @@ -26,7 +8,7 @@ trylibeventdir="" # Check whether --with-libevent-dir was given. -@@ -6319,6 +6320,7 @@ +@@ -6645,6 +6646,7 @@ LIBS="$tor_saved_LIBS" LDFLAGS="$tor_saved_LDFLAGS" CPPFLAGS="$tor_saved_CPPFLAGS" @@ -34,7 +16,7 @@ -@@ -6381,6 +6383,7 @@ +@@ -6707,6 +6709,7 @@ fi @@ -42,11 +24,26 @@ if test "$enable_static_libevent" = "yes"; then if test "$tor_cv_library_libevent_dir" = "(system)"; then as_fn_error $? "\"You must specify an explicit --with-libevent-dir=x option when using --enable-static-libevent\"" "$LINENO" 5 -@@ -6390,6 +6393,7 @@ +@@ -6716,6 +6719,7 @@ else TOR_LIBEVENT_LIBS="-levent" fi +fi + if test "$enable_bufferevents" = "yes" ; then + if test "$ac_cv_header_event2_bufferevent_ssl_h" != "yes" ; then +@@ -6794,12 +6798,14 @@ + + $as_echo "#define USE_BUFFEREVENTS 1" >>confdefs.h + ++if false ; then + if test "$enable_static_libevent" = "yes"; then + TOR_LIBEVENT_LIBS="$TOR_LIBDIR_libevent/libevent_openssl.a $TOR_LIBEVENT_LIBS" + else + TOR_LIBEVENT_LIBS="-levent_openssl $TOR_LIBEVENT_LIBS" + fi + fi ++fi + diff --git a/security/tor/files/tor.in b/security/tor/files/tor.in index ac24b8ba4872..bf5b9098772a 100644 --- a/security/tor/files/tor.in +++ b/security/tor/files/tor.in @@ -37,7 +37,7 @@ required_files=${tor_conf} required_dirs=${tor_datadir} pidfile=${tor_pidfile} command="%%PREFIX%%/bin/${name}" -command_args="-f ${tor_conf} --PidFile ${tor_pidfile} --RunAsDaemon 1 --DataDirectory ${tor_datadir} --Log notice\ file\ ${tor_logfile}" +command_args="-f ${tor_conf} --PidFile ${tor_pidfile} --RunAsDaemon 1 --DataDirectory ${tor_datadir} --+Log notice\ file\ ${tor_logfile}" extra_commands="log" log_cmd="${name}_log" |