summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2006-02-20 21:45:59 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-02-20 21:45:59 +0000
commit5cfbe5d6c94414f35d58c1007da1557e748a1e6f (patch)
tree9be68ad5ebc613b4e5fbef4067fb52f0ff62df85
parentb55c28e67e38ddb92f72ef5a8570f7da87281d45 (diff)
parentfedb098e475aa7f95353d14aaa57b13d3e5151b3 (diff)
merge of 50ca43556e311a226bcabbf74fef8be758ad8982
and 98e42d2d4e7f7bb636244875058f5bef36a594bc
-rw-r--r--packages/gpe-conf/files/fixsegfault.patch44
-rw-r--r--packages/gpe-conf/gpe-conf_0.1.30.bb6
2 files changed, 47 insertions, 3 deletions
diff --git a/packages/gpe-conf/files/fixsegfault.patch b/packages/gpe-conf/files/fixsegfault.patch
new file mode 100644
index 0000000000..7f1ccbe432
--- /dev/null
+++ b/packages/gpe-conf/files/fixsegfault.patch
@@ -0,0 +1,44 @@
+Index: network.c
+===================================================================
+RCS file: /cvs/gpe/base/gpe-conf/network.c,v
+retrieving revision 1.55.2.2
+retrieving revision 1.55.2.3
+diff -u -r1.55.2.2 -r1.55.2.3
+--- network.c 16 Feb 2006 22:32:30 -0000 1.55.2.2
++++ network.c 20 Feb 2006 01:34:44 -0000 1.55.2.3
+@@ -289,19 +289,23 @@
+ i = iflen-1;
+
+ fd = fopen(_PATH_PROCNET_WIRELESS, "r");
+- fgets(buffer, 256, fd); // chuck first two lines;
+- fgets(buffer, 256, fd);
+- while (!feof(fd)) {
+- if (fgets(buffer, 256, fd) == NULL)
+- break;
+- name = buffer;
+- sep = strrchr(buffer, ':');
+- if (sep) *sep = 0;
+- while(*name == ' ') name++;
+- if (!strcmp(name, ifname))
+- iflist[iflen - 1].iswireless = TRUE;
+- }
++ if (fd != NULL)
++ {
++ fgets(buffer, 256, fd); // chuck first two lines;
++ fgets(buffer, 256, fd);
++ while (!feof(fd))
++ {
++ if (fgets(buffer, 256, fd) == NULL)
++ break;
++ name = buffer;
++ sep = strrchr(buffer, ':');
++ if (sep) *sep = 0;
++ while(*name == ' ') name++;
++ if (!strcmp(name, ifname))
++ iflist[iflen - 1].iswireless = TRUE;
++ }
+ fclose(fd);
++ }
+ }
+ else
+ i = existing;
diff --git a/packages/gpe-conf/gpe-conf_0.1.30.bb b/packages/gpe-conf/gpe-conf_0.1.30.bb
index 8eb1360e92..c0ee7e2ea0 100644
--- a/packages/gpe-conf/gpe-conf_0.1.30.bb
+++ b/packages/gpe-conf/gpe-conf_0.1.30.bb
@@ -3,9 +3,11 @@ LICENSE = "GPL"
SECTION = "gpe"
PRIORITY = "optional"
MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
+PR="r1"
inherit gpe
-PR="r0"
+
+SRC_URI += " file://fixsegfault.patch;patch=1;pnum=0"
DEPENDS = "gtk+ libgpewidget libxsettings libxsettings-client pcmcia-cs xst xset ipaq-sleep ntp gpe-login gpe-icons"
RDEPENDS_${PN} = "xst xset ipaq-sleep ntpdate gpe-login gpe-icons"
@@ -23,5 +25,3 @@ do_compile () {
do_install () {
oe_runmake MACHINE=${MACHINE} PREFIX=${prefix} DESTDIR=${D} install-program
}
-
-