Fix build with newer GCC

6 files changed, 59 insertions, 6 deletions

diff --git a/comms/gsmlib/distinfo b/comms/gsmlib/distinfo
index 7bd3c92a742..bb049c5a734 100644
--- a/comms/gsmlib/distinfo
+++ b/comms/gsmlib/distinfo
@@ -1,9 +1,13 @@
-$NetBSD: distinfo,v 1.8 2010/01/29 16:27:13 joerg Exp $
+$NetBSD: distinfo,v 1.9 2011/11/24 14:17:05 joerg Exp $
 
 SHA1 (gsmlib-1.10.tar.gz) = 0f329f6185c0dd5221f85ee0af7d95dea23bed8f
 RMD160 (gsmlib-1.10.tar.gz) = 8abd1cdb4b61ddbb6fffd3a4100edcc0f079b845
 Size (gsmlib-1.10.tar.gz) = 474591 bytes
-SHA1 (patch-aa) = 9b86282d92c91bdc017f6966471de4b3621cf8b5
+SHA1 (patch-aa) = b74c1fa6ca35d4261208487aa06e41e8337203f5
 SHA1 (patch-ab) = 3bfec0d0a3d82c7918e25bc46e83387203b5782b
 SHA1 (patch-ac) = aec51370b72ef60c086c3407b889bb54a720e07f
 SHA1 (patch-ad) = 537d1710ad71fd1f2e9b49f6d8c785c33c9e7ee2
+SHA1 (patch-apps_gsmsmsd.cc) = c95f4e7083b04136195225e87a260cfe527296e3
+SHA1 (patch-gsmlib_gsm__me__ta.cc) = ea7414ec1536e581c78c6418d029b8b754854fcb
+SHA1 (patch-gsmlib_gsm__sms__codec.cc) = 633d3bb0c592d96646566732a1fa61ddf1820769
+SHA1 (patch-gsmlib_gsm__sorted__phonebook.cc) = 0d8a145a4ebcda8428ec5391571293d3e5f81bc5
diff --git a/comms/gsmlib/patches/patch-aa b/comms/gsmlib/patches/patch-aa
index be00ba1fc86..c2c85824d5b 100644
--- a/comms/gsmlib/patches/patch-aa
+++ b/comms/gsmlib/patches/patch-aa
@@ -1,12 +1,13 @@
-$NetBSD: patch-aa,v 1.3 2004/03/17 07:35:23 soren Exp $
+$NetBSD: patch-aa,v 1.4 2011/11/24 14:17:05 joerg Exp $
 
---- gsmlib/gsm_unix_serial.cc.orig	2004-03-17 07:51:52.000000000 +0100
-+++ gsmlib/gsm_unix_serial.cc	2004-03-17 07:51:57.000000000 +0100
-@@ -26,6 +26,7 @@
+--- gsmlib/gsm_unix_serial.cc.orig	2002-09-22 11:51:10.000000000 +0000
++++ gsmlib/gsm_unix_serial.cc
+@@ -26,6 +26,8 @@
  #include <sys/ioctl.h>
  #include <signal.h>
  #include <pthread.h>
 +#include <assert.h>
++#include <string.h>
  
  using namespace std;
  using namespace gsmlib;
diff --git a/comms/gsmlib/patches/patch-apps_gsmsmsd.cc b/comms/gsmlib/patches/patch-apps_gsmsmsd.cc
new file mode 100644
index 00000000000..9d821665225
--- /dev/null
+++ b/comms/gsmlib/patches/patch-apps_gsmsmsd.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-apps_gsmsmsd.cc,v 1.1 2011/11/24 14:17:06 joerg Exp $
+
+--- apps/gsmsmsd.cc.orig	2011-11-23 15:42:49.000000000 +0000
++++ apps/gsmsmsd.cc
+@@ -34,6 +34,7 @@
+ #include <stdio.h>
+ #include <errno.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <signal.h>
+ #include <fstream>
+ #include <iostream>
diff --git a/comms/gsmlib/patches/patch-gsmlib_gsm__me__ta.cc b/comms/gsmlib/patches/patch-gsmlib_gsm__me__ta.cc
new file mode 100644
index 00000000000..79a7b26c63b
--- /dev/null
+++ b/comms/gsmlib/patches/patch-gsmlib_gsm__me__ta.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-gsmlib_gsm__me__ta.cc,v 1.1 2011/11/24 14:17:06 joerg Exp $
+
+--- gsmlib/gsm_me_ta.cc.orig	2002-10-22 20:48:39.000000000 +0000
++++ gsmlib/gsm_me_ta.cc
+@@ -18,6 +18,7 @@
+ #include <gsmlib/gsm_me_ta.h>
+ #include <gsmlib/gsm_parser.h>
+ #include <gsmlib/gsm_sysdep.h>
++#include <stdlib.h>
+ 
+ using namespace std;
+ using namespace gsmlib;
diff --git a/comms/gsmlib/patches/patch-gsmlib_gsm__sms__codec.cc b/comms/gsmlib/patches/patch-gsmlib_gsm__sms__codec.cc
new file mode 100644
index 00000000000..e57a5a84e78
--- /dev/null
+++ b/comms/gsmlib/patches/patch-gsmlib_gsm__sms__codec.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-gsmlib_gsm__sms__codec.cc,v 1.1 2011/11/24 14:17:06 joerg Exp $
+
+--- gsmlib/gsm_sms_codec.cc.orig	2011-11-23 15:41:35.000000000 +0000
++++ gsmlib/gsm_sms_codec.cc
+@@ -20,6 +20,7 @@
+ #include <time.h>
+ #include <strstream>
+ #include <iomanip>
++#include <limits.h>
+ #ifdef HAVE_STRING_H
+ #include <string.h>
+ #endif
diff --git a/comms/gsmlib/patches/patch-gsmlib_gsm__sorted__phonebook.cc b/comms/gsmlib/patches/patch-gsmlib_gsm__sorted__phonebook.cc
new file mode 100644
index 00000000000..b3cef69a236
--- /dev/null
+++ b/comms/gsmlib/patches/patch-gsmlib_gsm__sorted__phonebook.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-gsmlib_gsm__sorted__phonebook.cc,v 1.1 2011/11/24 14:17:06 joerg Exp $
+
+--- gsmlib/gsm_sorted_phonebook.cc.orig	2011-11-23 15:42:03.000000000 +0000
++++ gsmlib/gsm_sorted_phonebook.cc
+@@ -20,6 +20,7 @@
+ #include <iostream>
+ #include <fstream>
+ #include <limits.h>
++#include <string.h>
+ 
+ const int MAX_LINE_SIZE = 1000;
+