From patchwork Tue Nov 6 13:14:58 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Dawson X-Patchwork-Id: 197477 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 8B6BF2C007D for ; Wed, 7 Nov 2012 00:15:12 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 92E3F10210A; Tue, 6 Nov 2012 13:15:05 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HWrUP-xArk4X; Tue, 6 Nov 2012 13:15:03 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id C166B100065; Tue, 6 Nov 2012 13:15:03 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 4A1888F74A for ; Tue, 6 Nov 2012 13:15:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 589918C4D3 for ; Tue, 6 Nov 2012 13:15:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id e0Qxq46KpHGb for ; Tue, 6 Nov 2012 13:15:07 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-bk0-f43.google.com (mail-bk0-f43.google.com [209.85.214.43]) by whitealder.osuosl.org (Postfix) with ESMTPS id D04DF8C5C1 for ; Tue, 6 Nov 2012 13:15:06 +0000 (UTC) Received: by mail-bk0-f43.google.com with SMTP id w5so224973bku.16 for ; Tue, 06 Nov 2012 05:15:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:x-mailer; bh=1Q7LCQo+fKufHj0mZaV3e1xhiHR3DL2MlUhnPw6t1AY=; b=f9nSLLEel434SHHu4uQRnmQ3ow6UsRZz6PFlq/xa8kXK+H9+aIjNLfa9VH45MBInkr /53zKZqaSfNA1rAfyRaOOWt6ZlQYZ6jmUAaDK3Cjm8wrHiXf89IqCMj5OK8CEZ3XVzqL WHN6cRQi8b5Yq6Gz614JT4DLWz0+6h7mxfdXCHevxs4s0CN94HdVlc9xhOLISBMTijbQ QS09GrZdy7MdQDCCYjZbelmxTnuPG5mGsxUEtm4KWSqP5pWUywkLvfnmlRrhuknKuKrr rESHEAaLrlEIzyFVmZDZbY9YL3dqCm1QSFv4u94yz2phjcfABSLUFZXdwtMI6nOinqZg 7q8w== Received: by 10.204.147.5 with SMTP id j5mr282618bkv.21.1352207704980; Tue, 06 Nov 2012 05:15:04 -0800 (PST) Received: from percy.vlan14.pylonone.local (79.Red-88-2-49.staticIP.rima-tde.net. [88.2.49.79]) by mx.google.com with ESMTPS id k21sm12023754bkv.1.2012.11.06.05.15.02 (version=SSLv3 cipher=OTHER); Tue, 06 Nov 2012 05:15:03 -0800 (PST) From: spdawson@gmail.com To: buildroot@busybox.net Date: Tue, 6 Nov 2012 13:14:58 +0000 Message-Id: <1352207698-3407-1-git-send-email-spdawson@gmail.com> X-Mailer: git-send-email 1.7.10.4 Subject: [Buildroot] [PATCH] lcdproc: bump version to 0.5.6 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net From: Simon Dawson Signed-off-by: Simon Dawson --- .../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 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 - -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 [] - // menu_set_item {