Patchwork lcdproc: bump version to 0.5.6

login
register
mail settings
Submitter Simon Dawson
Date Nov. 6, 2012, 1:14 p.m.
Message ID <1352207698-3407-1-git-send-email-spdawson@gmail.com>
Download mbox | patch
Permalink /patch/197477/
State Accepted
Commit b8a304a9f9089bf03e3649582cee7ea96718e92f
Headers show

Comments

Simon Dawson - Nov. 6, 2012, 1:14 p.m.
From: Simon Dawson <spdawson@gmail.com>

Signed-off-by: Simon Dawson <spdawson@gmail.com>
---
 .../lcdproc/lcdproc-0.5.5-fix-menu-segfault.patch   |   19 -------------------
 package/lcdproc/lcdproc.mk                          |    2 +-
 2 files changed, 1 insertion(+), 20 deletions(-)
 delete mode 100644 package/lcdproc/lcdproc-0.5.5-fix-menu-segfault.patch
Thomas Petazzoni - Nov. 11, 2012, 8:08 p.m.
Hello Simon,

On Tue,  6 Nov 2012 13:14:58 +0000, spdawson@gmail.com wrote:
> From: Simon Dawson <spdawson@gmail.com>
> 
> Signed-off-by: Simon Dawson <spdawson@gmail.com>
> ---
>  .../lcdproc/lcdproc-0.5.5-fix-menu-segfault.patch   |   19 -------------------
>  package/lcdproc/lcdproc.mk                          |    2 +-
>  2 files changed, 1 insertion(+), 20 deletions(-)
>  delete mode 100644 package/lcdproc/lcdproc-0.5.5-fix-menu-segfault.patch

There are apparently build issues with lcdproc 0.5.6. Not sure if they
are new or if they were present in older versions. See
http://autobuild.buildroot.org/results/9967bc20a6094e836c4c18ff2cd30edef143bb8e/build-end.log.
Basically, lcdproc uses -I<foo>/host/usr/include -L<foo>/host/usr/lib
to build things for the target.

Thomas
Simon Dawson - Nov. 11, 2012, 9:02 p.m.
Hi Thomas.

On 11 November 2012 20:08, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> There are apparently build issues with lcdproc 0.5.6. Not sure if they
> are new or if they were present in older versions. See
> http://autobuild.buildroot.org/results/9967bc20a6094e836c4c18ff2cd30edef143bb8e/build-end.log.
> Basically, lcdproc uses -I<foo>/host/usr/include -L<foo>/host/usr/lib
> to build things for the target.

Okay; I'll have a look. (I must have missed this problem because I'm
applying quite a large local patch to lcdproc, which necessitates an
autoreconf.)

Simon.

Patch

diff --git a/package/lcdproc/lcdproc-0.5.5-fix-menu-segfault.patch b/package/lcdproc/lcdproc-0.5.5-fix-menu-segfault.patch
deleted file mode 100644
index f0ebe2d..0000000
--- a/package/lcdproc/lcdproc-0.5.5-fix-menu-segfault.patch
+++ /dev/null
@@ -1,19 +0,0 @@ 
-Trying to add a menu item using menu_add_item causes a segmentation fault
-in the LCDd server. This is caused by a read beyond the end of an array.
-
-This patch adds a safety check on the size of the argument array.
-
-Signed-off-by: Simon Dawson <spdawson@gmail.com>
-
-diff -Nurp a/server/commands/menu_commands.c b/server/commands/menu_commands.c
---- a/server/commands/menu_commands.c	2011-08-14 13:29:16.000000000 +0100
-+++ b/server/commands/menu_commands.c	2012-10-04 22:19:07.997409193 +0100
-@@ -198,7 +198,7 @@ menu_add_item_func(Client *c, int argc,
- 
- 	/* call menu_set_item() with a temporarily allocated argv
- 	 * to process the remaining options */
--	if ((argc > 5) || (argv[4][0] == '-')) {
-+	if ((argc > 5) || ((argc == 5) && argv[4][0] == '-')) {
- 		// menu_add_item <menuid> <newitemid> <type> [<text>]
- 		// menu_set_item <menuid> <itemid> {<option>}+
- 		int i, j;
diff --git a/package/lcdproc/lcdproc.mk b/package/lcdproc/lcdproc.mk
index 7914c85..aa204f1 100644
--- a/package/lcdproc/lcdproc.mk
+++ b/package/lcdproc/lcdproc.mk
@@ -3,7 +3,7 @@ 
 # lcdproc
 #
 #############################################################
-LCDPROC_VERSION = 0.5.5
+LCDPROC_VERSION = 0.5.6
 LCDPROC_SOURCE = lcdproc-$(LCDPROC_VERSION).tar.gz
 LCDPROC_SITE = http://downloads.sourceforge.net/project/lcdproc/lcdproc/$(LCDPROC_VERSION)
 LCDPROC_LICENSE = GPLv2+