September 2019 - tor-commits - lists.torproject.org

[tor/maint-0.4.1] Merge branch 'maint-0.4.0' into maint-0.4.1
by nickm＠torproject.org 18 Sep '19

18 Sep '19

commit 50f981719f1bc7066496bcc4ef78fcdbb1ff1806 Merge: cec42be57 ef3543558 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 17 18:58:44 2019 -0400 Merge branch 'maint-0.4.0' into maint-0.4.1 changes/ticket31673 | 3 +++ src/lib/meminfo/meminfo.c | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.3.5' into maint-0.4.0
by nickm＠torproject.org 18 Sep '19

18 Sep '19

commit ef35435584c529906d385b0ce532aa6e43205608 Merge: 34bab120d dc41e6a80 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 17 18:58:43 2019 -0400 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/ticket31673 | 3 +++ src/lib/meminfo/meminfo.c | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-)

1 0

[tor/release-0.3.5] Merge remote-tracking branch 'tor-github/pr/1307' into maint-0.3.5
by nickm＠torproject.org 18 Sep '19

18 Sep '19

commit dc41e6a80cc7df8d8f2b3ff91be2da38242c541d Merge: 2ebe1fcd5 409df19b5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 17 18:58:06 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1307' into maint-0.3.5 changes/ticket31673 | 3 +++ src/lib/meminfo/meminfo.c | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-)

1 0

[tor/release-0.4.0] Merge branch 'maint-0.2.9' into maint-0.3.5
by nickm＠torproject.org 18 Sep '19

18 Sep '19

commit 2ebe1fcd52778ea2d305331f4283366eb35c9d93 Merge: 97f7efa9e 484710f25 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 17 18:57:49 2019 -0400 Merge branch 'maint-0.2.9' into maint-0.3.5 "ours" merge to avoid picking up 0.2.9 version of ticket 31673.

1 0

[tor/release-0.4.0] Merge branch 'maint-0.4.0' into release-0.4.0
by nickm＠torproject.org 18 Sep '19

18 Sep '19

commit 1f19b5528f90eed57fdb4a7385eea14a6e5e84de Merge: 7b348e2ef ef3543558 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 17 18:58:43 2019 -0400 Merge branch 'maint-0.4.0' into release-0.4.0 changes/ticket31673 | 3 +++ src/lib/meminfo/meminfo.c | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-)

1 0

[tor/release-0.4.0] Merge branch 'maint-0.3.5' into maint-0.4.0
by nickm＠torproject.org 18 Sep '19

18 Sep '19

commit ef35435584c529906d385b0ce532aa6e43205608 Merge: 34bab120d dc41e6a80 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 17 18:58:43 2019 -0400 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/ticket31673 | 3 +++ src/lib/meminfo/meminfo.c | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-)

1 0

[tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/1307' into maint-0.3.5
by nickm＠torproject.org 18 Sep '19

18 Sep '19

commit dc41e6a80cc7df8d8f2b3ff91be2da38242c541d Merge: 2ebe1fcd5 409df19b5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 17 18:58:06 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1307' into maint-0.3.5 changes/ticket31673 | 3 +++ src/lib/meminfo/meminfo.c | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-)

1 0

[tor/release-0.3.5] build: The <sys/sysctl.h> is now deprecated on Linux
by nickm＠torproject.org 18 Sep '19

18 Sep '19

commit 409df19b5a0053175f05851086e6ef35c5bce2c0 Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Sep 9 11:55:33 2019 -0400 build: The <sys/sysctl.h> is now deprecated on Linux Closes #31673 --- changes/ticket31673 | 3 +++ src/lib/meminfo/meminfo.c | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/changes/ticket31673 b/changes/ticket31673 new file mode 100644 index 000000000..3b2bb4a46 --- /dev/null +++ b/changes/ticket31673 @@ -0,0 +1,3 @@ + o New system requirements (build system): + - Do not include the deprecated <sys/sysctl.h> on Linux or Windows system. + Closes 31673; diff --git a/src/lib/meminfo/meminfo.c b/src/lib/meminfo/meminfo.c index f23318889..f4fa45167 100644 --- a/src/lib/meminfo/meminfo.c +++ b/src/lib/meminfo/meminfo.c @@ -18,9 +18,6 @@ #include "lib/log/log.h" #include "lib/malloc/malloc.h" -#ifdef HAVE_SYS_SYSCTL_H -#include <sys/sysctl.h> -#endif #ifdef HAVE_FCNTL_H #include <fcntl.h> #endif @@ -36,6 +33,10 @@ #endif #include <string.h> +#if defined(HAVE_SYS_SYSCTL_H) && !defined(_WIN32) && !defined(__linux__) +#include <sys/sysctl.h> +#endif + DISABLE_GCC_WARNING(aggregate-return) /** Call the platform malloc info function, and dump the results to the log at * level <b>severity</b>. If no such function exists, do nothing. */

1 0

[tor/release-0.4.0] build: The <sys/sysctl.h> is now deprecated on Linux
by nickm＠torproject.org 18 Sep '19

18 Sep '19

commit 409df19b5a0053175f05851086e6ef35c5bce2c0 Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Sep 9 11:55:33 2019 -0400 build: The <sys/sysctl.h> is now deprecated on Linux Closes #31673 --- changes/ticket31673 | 3 +++ src/lib/meminfo/meminfo.c | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/changes/ticket31673 b/changes/ticket31673 new file mode 100644 index 000000000..3b2bb4a46 --- /dev/null +++ b/changes/ticket31673 @@ -0,0 +1,3 @@ + o New system requirements (build system): + - Do not include the deprecated <sys/sysctl.h> on Linux or Windows system. + Closes 31673; diff --git a/src/lib/meminfo/meminfo.c b/src/lib/meminfo/meminfo.c index f23318889..f4fa45167 100644 --- a/src/lib/meminfo/meminfo.c +++ b/src/lib/meminfo/meminfo.c @@ -18,9 +18,6 @@ #include "lib/log/log.h" #include "lib/malloc/malloc.h" -#ifdef HAVE_SYS_SYSCTL_H -#include <sys/sysctl.h> -#endif #ifdef HAVE_FCNTL_H #include <fcntl.h> #endif @@ -36,6 +33,10 @@ #endif #include <string.h> +#if defined(HAVE_SYS_SYSCTL_H) && !defined(_WIN32) && !defined(__linux__) +#include <sys/sysctl.h> +#endif + DISABLE_GCC_WARNING(aggregate-return) /** Call the platform malloc info function, and dump the results to the log at * level <b>severity</b>. If no such function exists, do nothing. */

1 0

[tor/release-0.4.0] build: The <sys/sysctl.h> is now deprecated on Linux
by nickm＠torproject.org 18 Sep '19

18 Sep '19

commit 484710f25be73d18fefa1e03339c9247e8ec7337 Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Sep 9 11:47:37 2019 -0400 build: The <sys/sysctl.h> is now deprecated on Linux Closes #31673 --- changes/ticket31673 | 3 +++ src/common/compat.c | 8 +++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/changes/ticket31673 b/changes/ticket31673 new file mode 100644 index 000000000..3b2bb4a46 --- /dev/null +++ b/changes/ticket31673 @@ -0,0 +1,3 @@ + o New system requirements (build system): + - Do not include the deprecated <sys/sysctl.h> on Linux or Windows system. + Closes 31673; diff --git a/src/common/compat.c b/src/common/compat.c index ee3bf0fd5..e99abcb16 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -27,9 +27,6 @@ #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif -#ifdef HAVE_SYS_SYSCTL_H -#include <sys/sysctl.h> -#endif #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> #endif @@ -70,6 +67,11 @@ #include <sys/capability.h> #endif +/* Now deprecated in Linux GLIBC */ +#if defined(HAVE_SYS_SYSCTL_H) && !defined(_WIN32) && !defined(__linux__) +#include <sys/sysctl.h> +#endif + #ifdef _WIN32 #include <conio.h> #include <wchar.h>

1 0