From 9f55811c01db994df701d2d19e347033f362b60d Mon Sep 17 00:00:00 2001
From: Ross Burton <ross@openedhand.com>
Date: Fri, 1 Aug 2008 14:12:38 +0000
Subject: gsmd: add a patch to fix initialisation segfault

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5006 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/gsm/files/fix_machine_init.patch | 23 +++++++++++++++++++++++
 meta/packages/gsm/gsmd.inc                     |  3 ++-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 meta/packages/gsm/files/fix_machine_init.patch

(limited to 'meta/packages')

diff --git a/meta/packages/gsm/files/fix_machine_init.patch b/meta/packages/gsm/files/fix_machine_init.patch
new file mode 100644
index 000000000..808bb17b4
--- /dev/null
+++ b/meta/packages/gsm/files/fix_machine_init.patch
@@ -0,0 +1,23 @@
+Index: src/gsmd/gsmd.c
+===================================================================
+--- a/src/gsmd/gsmd.c	(revision 4304)
++++ b/src/gsmd/gsmd.c	(working copy)
+@@ -196,13 +196,13 @@
+ 
+ 	sms_cb_init(gsmd);
+ 
+-	if (gsmd->vendorpl && gsmd->vendorpl->initsettings){
++	if (gsmd->vendorpl && gsmd->vendorpl->initsettings)
+ 		rc |= gsmd->vendorpl->initsettings(gsmd);
++
++	if (gsmd->machinepl && gsmd->machinepl->initsettings)
+ 		rc |= gsmd->machinepl->initsettings(gsmd);
+-		return rc;
+-	}	
+-	else
+-		return rc;
++
++	return rc;
+ }
+ 
+ static int firstcmd_response = 0;
diff --git a/meta/packages/gsm/gsmd.inc b/meta/packages/gsm/gsmd.inc
index 4ce23d51f..ac341ed7c 100644
--- a/meta/packages/gsm/gsmd.inc
+++ b/meta/packages/gsm/gsmd.inc
@@ -5,9 +5,10 @@ SECTION = "libs/gsm"
 PROVIDES += "gsmd"
 RPROVIDES_${PN} = "libgsmd0 libgsmd gsmd gsmd-devel"
 PV = "0.1+svnr${SRCREV}"
-PR = "r44"
+PR = "r45"
 
 SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
+           file://fix_machine_init.patch;patch=1 \
            file://gsmd \
            file://default"
 S = "${WORKDIR}/gsm"
-- 
cgit v1.2.3