From d77fd44e3593c9b42e5acae39f15768f46628217 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sun, 12 Jan 2020 05:52:16 +0000
Subject: user/networkmanager: Bump to 1.22.0

---
 user/networkmanager/editline.patch | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'user/networkmanager/editline.patch')

diff --git a/user/networkmanager/editline.patch b/user/networkmanager/editline.patch
index e727f374a..7508e9b9a 100644
--- a/user/networkmanager/editline.patch
+++ b/user/networkmanager/editline.patch
@@ -1,6 +1,6 @@
 --- NetworkManager-1.18.1/clients/cli/agent.c.old	2019-04-18 09:19:11.000000000 +0000
 +++ NetworkManager-1.18.1/clients/cli/agent.c	2019-05-10 06:15:55.614930112 +0000
-@@ -25,8 +25,7 @@
+@@ -9,8 +9,7 @@
  
  #include <stdio.h>
  #include <stdlib.h>
@@ -12,7 +12,7 @@
  #include "utils.h"
 --- NetworkManager-1.18.1/clients/cli/common.c.old	2019-04-20 19:01:59.000000000 +0000
 +++ NetworkManager-1.18.1/clients/cli/common.c	2019-05-10 07:07:34.506620687 +0000
-@@ -26,8 +26,7 @@
+@@ -10,8 +10,7 @@
  #include <stdio.h>
  #include <stdlib.h>
  #include <sys/ioctl.h>
@@ -22,7 +22,7 @@
  
  #include "nm-vpn-helpers.h"
  #include "nm-client-utils.h"
-@@ -1008,7 +1007,7 @@
+@@ -992,7 +991,7 @@
   * nmc_readline_echo:
   *
   * The same as nmc_readline() except it can disable echoing of input characters if @echo_on is %FALSE.
@@ -31,7 +31,7 @@
   */
  char *
  nmc_readline_echo (const NmcConfig *nmc_config,
-@@ -1019,8 +1018,7 @@
+@@ -1003,8 +1002,7 @@
  	va_list args;
  	gs_free char *prompt = NULL;
  	char *str;
@@ -41,7 +41,7 @@
  
  	va_start (args, prompt_fmt);
  	prompt = g_strdup_vprintf (prompt_fmt, args);
-@@ -1030,8 +1028,7 @@
+@@ -1014,8 +1012,7 @@
  
  	/* Hide the actual password */
  	if (!echo_on) {
@@ -51,7 +51,7 @@
  		rl_redisplay_function = nmc_secret_redisplay;
  	}
  
-@@ -1040,7 +1037,10 @@
+@@ -1024,7 +1021,10 @@
  	/* Restore the non-hiding behavior */
  	if (!echo_on) {
  		rl_redisplay_function = rl_redisplay;
@@ -65,7 +65,7 @@
  	return str;
 --- NetworkManager-1.18.1/clients/cli/connections.c.old	2019-04-20 19:01:59.000000000 +0000
 +++ NetworkManager-1.18.1/clients/cli/connections.c	2019-05-10 07:05:43.058781503 +0000
-@@ -26,8 +26,7 @@
+@@ -12,8 +12,7 @@
  #include <unistd.h>
  #include <signal.h>
  #include <netinet/ether.h>
@@ -75,7 +75,7 @@
  #include <fcntl.h>
  
  #include "nm-client-utils.h"
-@@ -6050,9 +6049,6 @@
+@@ -6110,9 +6109,6 @@
  	return nmc_rl_gen_func_basic (text, state, avals);
  }
  
@@ -85,7 +85,7 @@
  /*
   * Attempt to complete on the contents of TEXT.  START and END show the
   * region of TEXT that contains the word to complete.  We can use the
-@@ -6079,9 +6075,6 @@
+@@ -6139,9 +6135,6 @@
  	/* Disable default filename completion */
  	rl_attempted_completion_over = 1;
  
@@ -95,7 +95,7 @@
  	/* Filter out possible ANSI color escape sequences */
  	prompt_tmp = nmc_filter_out_colors ((const char *) rl_prompt);
  
-@@ -9150,7 +9143,6 @@
+@@ -9243,7 +9236,6 @@
  		generator_func = _meta_abstract_generator;
  	} else if (g_strcmp0 (rl_prompt, PROMPT_IMPORT_FILE) == 0) {
  		rl_attempted_completion_over = 0;
@@ -105,7 +105,7 @@
  	}
 --- NetworkManager-1.18.1/clients/cli/devices.c.old	2019-04-20 19:01:59.000000000 +0000
 +++ NetworkManager-1.18.1/clients/cli/devices.c	2019-05-10 06:16:21.432108032 +0000
-@@ -23,7 +23,7 @@
+@@ -9,7 +9,7 @@
  
  #include <stdio.h>
  #include <stdlib.h>
@@ -116,7 +116,7 @@
  #include "nm-client-utils.h"
 --- NetworkManager-1.18.1/clients/cli/nmcli.c.old	2019-04-20 19:01:59.000000000 +0000
 +++ NetworkManager-1.18.1/clients/cli/nmcli.c	2019-05-10 06:16:29.211257692 +0000
-@@ -30,8 +30,7 @@
+@@ -15,8 +15,7 @@
  #include <unistd.h>
  #include <locale.h>
  #include <glib-unix.h>
-- 
cgit v1.2.3-70-g09d2