summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Dawson <spdawson@gmail.com>2012-11-06 03:14:58 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2012-11-08 15:41:59 (GMT)
commitb8a304a9f9089bf03e3649582cee7ea96718e92f (patch)
tree0ea4b41cd825b9e63c355c3b823880b466ef6d16
parent2fc64312d4840eb777df7e10b8405a364e813b9e (diff)
downloadbuildroot-b8a304a9f9089bf03e3649582cee7ea96718e92f.tar.gz
buildroot-b8a304a9f9089bf03e3649582cee7ea96718e92f.tar.bz2
lcdproc: bump version to 0.5.6
Signed-off-by: Simon Dawson <spdawson@gmail.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/lcdproc/lcdproc-0.5.5-fix-menu-segfault.patch19
-rw-r--r--package/lcdproc/lcdproc.mk2
2 files changed, 1 insertions, 20 deletions
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+