1 files changed, 0 insertions, 71 deletions
diff --git a/debian/patches/gpg0001-utils-settrans-add-option-to-specify-the-underlying-.patch b/debian/patches/gpg0001-utils-settrans-add-option-to-specify-the-underlying-.patch
deleted file mode 100644
index 8985114a..00000000
--- a/debian/patches/gpg0001-utils-settrans-add-option-to-specify-the-underlying-.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 97c9770f4cffcdaf11caef628ca9e231c07cd5e0 Mon Sep 17 00:00:00 2001
-From: Justus Winter <justus@gnupg.org>
-Date: Thu, 24 Mar 2016 20:45:01 +0100
-Subject: [PATCH hurd 1/3] utils/settrans: add option to specify the underlying
- node
-
-* utils/settrans.c (options): Add '--underlying'.
-(main): Handle new option.
-(open_node): Open the node if given.
----
- utils/settrans.c | 23 ++++++++++++++++++++++-
- 1 file changed, 22 insertions(+), 1 deletion(-)
-
-diff --git a/utils/settrans.c b/utils/settrans.c
-index 00cc358..b3d3eb7 100644
---- a/utils/settrans.c
-+++ b/utils/settrans.c
-@@ -64,6 +64,8 @@ static struct argp_option options[] =
-   {"exclusive",   'x', 0, 0, "Only set the translator if there is not one already"},
-   {"orphan",      'o', 0, 0, "Disconnect old translator from the filesystem "
- 			     "(do not ask it to go away)"},
-+  {"underlying",  'U', "NODE", 0, "Open NODE and hand it to the translator "
-+				  "as the underlying node"},
- 
-   {"chroot",      'C', 0, 0,
-    "Instead of setting the node's translator, take following arguments up to"
-@@ -119,6 +121,7 @@ main(int argc, char *argv[])
-   char *pid_file = NULL;
-   int excl = 0;
-   int timeout = DEFAULT_TIMEOUT * 1000; /* ms */
-+  char *underlying_node_name = NULL;
-   char **chroot_command = 0;
-   char *chroot_chdir = "/";
- 
-@@ -164,6 +167,11 @@ main(int argc, char *argv[])
- 	  break;
- 
- 	case 'o': orphan = 1; break;
-+	case 'U':
-+	  underlying_node_name = strdup (arg);
-+	  if (underlying_node_name == NULL)
-+	    error(3, ENOMEM, "Failed to duplicate argument");
-+	  break;
- 
- 	case 'C':
- 	  if (chroot_command)
-@@ -292,7 +300,20 @@ main(int argc, char *argv[])
- 	      return open_err;
- 	    }
- 
--	  *underlying = node;
-+	  if (underlying_node_name)
-+	    {
-+	      *underlying = file_name_lookup (underlying_node_name,
-+					      flags | lookup_flags, 0666);
-+	      if (! MACH_PORT_VALID (*underlying))
-+		{
-+		  /* For the error message.  */
-+		  node_name = underlying_node_name;
-+		  open_err = errno;
-+		  return open_err;
-+		}
-+	    }
-+	  else
-+	    *underlying = node;
- 	  *underlying_type = MACH_MSG_TYPE_COPY_SEND;
- 
- 	  return 0;
--- 
-2.1.4
-