Patchwork lcdproc: remove patch rejected upstream

login
register
mail settings
Submitter Simon Dawson
Date Nov. 12, 2012, 11:47 a.m.
Message ID <1352720842-5781-1-git-send-email-spdawson@gmail.com>
Download mbox | patch
Permalink /patch/198375/
State Accepted
Commit a5004bcab189b3dc72e682bd37f0adabeb71cb30
Headers show

Comments

Simon Dawson - Nov. 12, 2012, 11:47 a.m.
From: Simon Dawson <spdawson@gmail.com>

Remove an lcdproc patch which has been rejected upstream. It has been
decided by lcdproc developer Markus Dolze that the behaviour of the
client_add_key command when handling the minus key is "intentional to
some degree."

This patch also takes the opportunity to remove the version number from the
single remaining lcdproc patch.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
---
 ...cdproc-0.5.5-fix-client_add_key-for-minus.patch |   38 --------------------
 ...5.5-LCDd.conf.patch => lcdproc-LCDd.conf.patch} |    0
 2 files changed, 38 deletions(-)
 delete mode 100644 package/lcdproc/lcdproc-0.5.5-fix-client_add_key-for-minus.patch
 rename package/lcdproc/{lcdproc-0.5.5-LCDd.conf.patch => lcdproc-LCDd.conf.patch} (100%)

diff --git a/package/lcdproc/lcdproc-0.5.5-LCDd.conf.patch b/package/lcdproc/lcdproc-LCDd.conf.patch
similarity index 100%
rename from package/lcdproc/lcdproc-0.5.5-LCDd.conf.patch
rename to package/lcdproc/lcdproc-LCDd.conf.patch
Peter Korsgaard - Nov. 15, 2012, 11:07 p.m.
>>>>> "spdawson" == spdawson  <spdawson@gmail.com> writes:

 spdawson> From: Simon Dawson <spdawson@gmail.com>
 spdawson> Remove an lcdproc patch which has been rejected upstream. It has been
 spdawson> decided by lcdproc developer Markus Dolze that the behaviour of the
 spdawson> client_add_key command when handling the minus key is "intentional to
 spdawson> some degree."

 spdawson> This patch also takes the opportunity to remove the version
 spdawson> number from the single remaining lcdproc patch.

Committed, thanks.

Patch

diff --git a/package/lcdproc/lcdproc-0.5.5-fix-client_add_key-for-minus.patch b/package/lcdproc/lcdproc-0.5.5-fix-client_add_key-for-minus.patch
deleted file mode 100644
index c17ee83..0000000
--- a/package/lcdproc/lcdproc-0.5.5-fix-client_add_key-for-minus.patch
+++ /dev/null
@@ -1,38 +0,0 @@ 
-Calling client_add_key as follows
-
-  client_add_key -
-
-will fail. However using an explicit -shared option, like this:
-
-  client_add_key -shared -
-
-will succeed. This is caused by a failure to parse the - key token, which is
-mistaken for the first character of an option argument.
-
-The client_add_key command also returns a spurious "success" message when a
-malformed option is supplied.
-
-This patch fixes both issues.
-
-Signed-off-by: Simon Dawson <spdawson@gmail.com>
-
-diff -Nurp a/server/commands/client_commands.c b/server/commands/client_commands.c
---- a/server/commands/client_commands.c	2011-08-14 13:29:16.000000000 +0100
-+++ b/server/commands/client_commands.c	2012-10-05 07:50:40.357795535 +0100
-@@ -181,7 +181,7 @@ client_add_key_func(Client *c, int argc,
- 	}
- 
- 	argnr = 1;
--	if (argv[argnr][0] == '-') {
-+	if (argv[argnr][0] == '-' && strcmp(argv[argnr], "-") != 0) {
- 		if (strcmp( argv[argnr], "-shared") == 0) {
- 			exclusively = 0;
- 		}
-@@ -190,6 +190,7 @@ client_add_key_func(Client *c, int argc,
- 		}
- 		else {
- 			sock_printf_error(c->sock, "Invalid option: %s\n", argv[argnr]);
-+			return 0;
- 		}
- 		argnr++;
- 	}