tor-commits July 2018

tor-commits@lists.torproject.org

17 participants
1737 discussions

[tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 31 Jul '18

31 Jul '18

commit bcce3e7e0b53b0d800337c53b855713bfb83c37e Merge: 21babc8d3 373b23a9e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 31 08:30:01 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug26876 | 4 ++++ configure.ac | 32 +++++++++++++++++++++++++++++--- 2 files changed, 33 insertions(+), 3 deletions(-) diff --cc configure.ac index 56c9d1b91,b71d648f1..4f5d8337e --- a/configure.ac +++ b/configure.ac @@@ -608,10 -548,8 +608,9 @@@ AC_CHECK_FUNCS llround \ localtime_r \ lround \ - mach_approximate_time \ memmem \ memset_s \ + mmap \ pipe \ pipe2 \ prctl \

1 0

[tor/maint-0.3.4] Merge remote-tracking branch 'teor/bug26876_033' into maint-0.3.3
by nickm＠torproject.org 31 Jul '18

31 Jul '18

commit 373b23a9ee80eb81a0d4db9fb6b742a602c8e82d Merge: 4f854dbdc 022b8f15d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 31 08:29:54 2018 -0400 Merge remote-tracking branch 'teor/bug26876_033' into maint-0.3.3 changes/bug26876 | 4 ++++ configure.ac | 32 +++++++++++++++++++++++++++++--- 2 files changed, 33 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.3.4] Ignore mach_approximate_time when targeting macOS 10.9 and earlier
by nickm＠torproject.org 31 Jul '18

31 Jul '18

commit 022b8f15da2b349aaffc5aab311bdd3e0a7fa199 Author: teor <teor(a)torproject.org> Date: Fri Jul 20 12:26:33 2018 +1000 Ignore mach_approximate_time when targeting macOS 10.9 and earlier Work around two different bugs in the OS X 10.10 and later SDKs that would prevent us from successfully targeting earlier versions of OS X. Fixes bug 26876; bugfix on 0.3.3.1-alpha. --- changes/bug26876 | 4 ++++ configure.ac | 32 +++++++++++++++++++++++++++++--- 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/changes/bug26876 b/changes/bug26876 new file mode 100644 index 000000000..b66110423 --- /dev/null +++ b/changes/bug26876 @@ -0,0 +1,4 @@ + o Minor bugfixes (portability): + - Work around two different bugs in the OS X 10.10 and later SDKs that + would prevent us from successfully targeting earlier versions of OS X. + Fixes bug 26876; bugfix on 0.3.3.1-alpha. diff --git a/configure.ac b/configure.ac index 2fda2ef6f..ba58f9d74 100644 --- a/configure.ac +++ b/configure.ac @@ -548,7 +548,6 @@ AC_CHECK_FUNCS( llround \ localtime_r \ lround \ - mach_approximate_time \ memmem \ memset_s \ pipe \ @@ -574,9 +573,36 @@ AC_CHECK_FUNCS( _vscprintf ) -# Apple messed up when they added two functions functions in Sierra: they +# Apple messed up when they added some functions: they # forgot to decorate them with appropriate AVAILABLE_MAC_OS_VERSION -# checks. So we should only probe for those functions if we are sure that we +# checks. + +# We should only probe for these functions if we are sure that we +# are not targeting OS X 10.9 or earlier. +AC_MSG_CHECKING([for a pre-Yosemite OS X build target]) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ +#ifdef __APPLE__ +# include <AvailabilityMacros.h> +# ifndef MAC_OS_X_VERSION_10_10 +# define MAC_OS_X_VERSION_10_10 101000 +# endif +# if defined(MAC_OS_X_VERSION_MIN_REQUIRED) +# if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_10 +# error "Running on Mac OS X 10.9 or earlier" +# endif +# endif +#endif +]], [[]])], + [on_macos_pre_10_10=no ; AC_MSG_RESULT([no])], + [on_macos_pre_10_10=yes; AC_MSG_RESULT([yes])]) + +if test "$on_macos_pre_10_10" = "no"; then + AC_CHECK_FUNCS( + mach_approximate_time \ + ) +fi + +# We should only probe for these functions if we are sure that we # are not targeting OSX 10.11 or earlier. AC_MSG_CHECKING([for a pre-Sierra OSX build target]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[

1 0

[tor/maint-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 31 Jul '18

31 Jul '18

1 0

[tor/release-0.3.3] Ignore mach_approximate_time when targeting macOS 10.9 and earlier
by nickm＠torproject.org 31 Jul '18

31 Jul '18

1 0

[tor/release-0.3.4] Merge remote-tracking branch 'teor/bug26876_033' into maint-0.3.3
by nickm＠torproject.org 31 Jul '18

31 Jul '18

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 31 Jul '18

31 Jul '18

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
by nickm＠torproject.org 31 Jul '18

31 Jul '18

commit 51bc8283a0a7d830f59ae73e0db589c933c1fecd Merge: 524f0cd36 373b23a9e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 31 08:30:01 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug26876 | 4 ++++ configure.ac | 32 +++++++++++++++++++++++++++++--- 2 files changed, 33 insertions(+), 3 deletions(-)

1 0

[tor/release-0.3.3] Merge remote-tracking branch 'teor/bug26876_033' into maint-0.3.3
by nickm＠torproject.org 31 Jul '18

31 Jul '18

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4
by nickm＠torproject.org 31 Jul '18

31 Jul '18

commit 1c85b609d5e3c85c424800da508e80769474cb57 Merge: 56fd0249f bcce3e7e0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 31 08:30:01 2018 -0400 Merge branch 'maint-0.3.4' into release-0.3.4 changes/bug26876 | 4 ++++ configure.ac | 32 +++++++++++++++++++++++++++++--- 2 files changed, 33 insertions(+), 3 deletions(-)

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
174
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits July 2018