From ca5d5142c6d6eaba4572a086f8473e4aebdd3f9e Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Mon, 25 Apr 2022 12:03:45 +0200
Subject: [PATCH] Deprecate the --supervised options.

* agent/gpg-agent.c (main): Mark --supervised as deprecated.
* dirmngr/dirmngr.c (main): Ditto.
--

The supervised thing causes more trouble than it pretends to solve.
---
 agent/gpg-agent.c  | 5 ++++-
 dirmngr/dirmngr.c  | 5 ++++-
 doc/dirmngr.texi   | 3 +--
 doc/gpg-agent.texi | 5 ++---
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index 2690c0806..d2ea91307 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -167,7 +167,7 @@ static gpgrt_opt_t opts[] = {
   ARGPARSE_s_n (oDaemon,  "daemon", N_("run in daemon mode (background)")),
   ARGPARSE_s_n (oServer,  "server", N_("run in server mode (foreground)")),
 #ifndef HAVE_W32_SYSTEM
-  ARGPARSE_s_n (oSupervised,  "supervised", N_("run in supervised mode")),
+  ARGPARSE_s_n (oSupervised,  "supervised", "@"),
 #endif
   ARGPARSE_s_n (oNoDetach,  "no-detach", N_("do not detach from the console")),
   ARGPARSE_s_n (oSh,	  "sh",        N_("sh-style command output")),
@@ -1378,6 +1378,9 @@ main (int argc, char **argv)
       agent_exit (0);
     }
 
+  if (is_supervised && !opt.quiet)
+    log_info(_("WARNING: \"%s\" is a deprecated option\n"), "--supervised");
+
   if (is_supervised)
     ;
   else if (!opt.extra_socket)
diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
index dec5c57d9..b36d263f7 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
@@ -173,7 +173,7 @@ static gpgrt_opt_t opts[] = {
   ARGPARSE_c (aServer,   "server",  N_("run in server mode (foreground)") ),
   ARGPARSE_c (aDaemon,   "daemon",  N_("run in daemon mode (background)") ),
 #ifndef HAVE_W32_SYSTEM
-  ARGPARSE_c (aSupervised,  "supervised", N_("run in supervised mode")),
+  ARGPARSE_c (aSupervised,  "supervised", "@"),
 #endif
   ARGPARSE_c (aListCRLs, "list-crls", N_("list the contents of the CRL cache")),
   ARGPARSE_c (aLoadCRL,  "load-crl", N_("|FILE|load CRL from FILE into cache")),
@@ -1275,6 +1275,9 @@ main (int argc, char **argv)
 #ifndef HAVE_W32_SYSTEM
   else if (cmd == aSupervised)
     {
+      if (!opt.quiet)
+        log_info(_("WARNING: \"%s\" is a deprecated option\n"), "--supervised");
+
       /* In supervised mode, we expect file descriptor 3 to be an
          already opened, listening socket.
 
diff --git a/doc/dirmngr.texi b/doc/dirmngr.texi
index bc6f0ba39..6c1c59b82 100644
--- a/doc/dirmngr.texi
+++ b/doc/dirmngr.texi
@@ -90,8 +90,7 @@ general best to use @code{gpgconf --launch dirmngr}.
 @opindex supervised
 Run in the foreground, sending logs to stderr, and listening on file
 descriptor 3, which must already be bound to a listening socket.  This
-is useful when running under systemd or other similar process
-supervision schemes.  This option is not supported on Windows.
+option is deprecated and not supported on Windows.
 
 @item --list-crls
 @opindex list-crls
diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi
index 6a3f0bf19..98d024265 100644
--- a/doc/gpg-agent.texi
+++ b/doc/gpg-agent.texi
@@ -171,9 +171,8 @@ shell, gpg-agent terminates within a few seconds.
 @opindex supervised
 Run in the foreground, sending logs by default to stderr, and
 listening on provided file descriptors, which must already be bound to
-listening sockets.  This command is useful when running under systemd
-or other similar process supervision schemes.  This option is not
-supported on Windows.
+listening sockets.  This option is deprecated and not supported on
+Windows.
 
 In --supervised mode, different file descriptors can be provided for
 use as different socket types (e.g. ssh, extra) as long as they are