[tor-commits] [tor/master] Mark openbsd-malloc as deprecated

[nickm at torproject.org]

commit 5597ddc36047a4f306a6f668235d02c069db991a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Aug 3 07:38:47 2018 -0400

    Mark openbsd-malloc as deprecated
---
 changes/ticket20424 | 4 ++--
 configure.ac        | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/changes/ticket20424 b/changes/ticket20424
index 123807ae2..b3b6f1afa 100644
--- a/changes/ticket20424
+++ b/changes/ticket20424
@@ -1,5 +1,5 @@
   o Minor features (compilation):
     - Tor's configure script now supports a --with-malloc= option to select
       your malloc implementation. Supported options are "tcmalloc",
-      "jemalloc", "openbsd", and "system" (the default). Addresses part of
-      ticket 20424. Based on a patch from Alex Xu.
+      "jemalloc", "openbsd" (deprecated), and "system" (the default).
+      Addresses part of ticket 20424. Based on a patch from Alex Xu.
diff --git a/configure.ac b/configure.ac
index ea19e3fef..fbe0fa5ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ AC_CANONICAL_HOST
 PKG_PROG_PKG_CONFIG
 
 AC_ARG_ENABLE(openbsd-malloc,
-   AS_HELP_STRING(--enable-openbsd-malloc, [use malloc code from OpenBSD.  Linux only]))
+   AS_HELP_STRING(--enable-openbsd-malloc, [use malloc code from OpenBSD.  Linux only. Deprecated: see --with-malloc]))
 AC_ARG_ENABLE(static-openssl,
    AS_HELP_STRING(--enable-static-openssl, [link against a static openssl library. Requires --with-openssl-dir]))
 AC_ARG_ENABLE(static-libevent,
@@ -1788,7 +1788,7 @@ if test "$tor_cv_uint8_uchar" = "no"; then
 fi
 
 AC_ARG_WITH(tcmalloc,
-AS_HELP_STRING(--with-tcmalloc, [use tcmalloc memory allocation library]),
+AS_HELP_STRING(--with-tcmalloc, [use tcmalloc memory allocation library. Deprecated; see --with-malloc]),
 [ tcmalloc=yes ], [ tcmalloc=no ])
 
 default_malloc=system
@@ -1839,6 +1839,7 @@ AS_CASE([$malloc],
   ],
 
   [openbsd], [
+    AC_WARN([The openbsd malloc port is deprecated in Tor 0.3.5 and will be removed in a future version.])
     enable_openbsd_malloc=yes
   ],